Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues #205, #206 and #216 #210

Merged
merged 14 commits into from
Sep 29, 2023
Merged

Fix issues #205, #206 and #216 #210

merged 14 commits into from
Sep 29, 2023

Conversation

kostobog
Copy link
Contributor

@kostobog kostobog commented Sep 11, 2023 •
edited
Loading

Fixes #205, #206, #211 and #216

#205

  • delete incorrect sharing of parameter declaration among modules in writeConstraintsToModel
  • set constraint predicate as IRI instead of string
  • add subClassOf triple to modules extending other modules, including abstract ones, to share parameter declaratoin with their super classes.
  • Note that tools using the generated descriptions of modules that extend other modules will have to query the super classes for their parameter declaration.

#206

  • Add SPipesModule and Param

#216 - resolved by commit ae5869a

#211 - resolved by commit 5ebec09

@kostobog
[#205] Fix declaring parameters from unrelated modules in RDF module …
b217480 
…descriptions

- delete incorrect sharing of parameter declaration among modules in writeConstraintsToModel
- set constraint predicate as IRI instead of string
- add subClassOf triple to modules extending other modules, including abstract ones, to share parameter declaratoin with their super classes.
- Note that tools using the generated descriptions of modules that extend other modules will have to query the super classes for their parameter declaration.
@kostobog
[#206] Add SPipesModule and Parameter annotations to all modules in s…
acc919f 
…-pipes-module subprojects.
@kostobog kostobog changed the title Issues/issue205 module creator plugin outputs wrong rdf [#205,#206] Fix declaring parameters from unrelated modules in RDF module descriptions. Sep 11, 2023
@kostobog kostobog changed the title [#205,#206] Fix declaring parameters from unrelated modules in RDF module descriptions. Fix issues #205 and #206 Sep 11, 2023
@kostobog kostobog requested a review from blcham September 11, 2023 10:21
@kostobog
Copy link
Contributor Author

kostobog commented Sep 11, 2023 •
edited
Loading

Review notes:

  • DONE c75a59e Abstract classes should not be converted to modules.

    • DONE e02285c additionally it was necessary to include parameter definitions from annotations in super classes which do not have the SPipesModule annotation, e.g. abstract classes.

  • DONE f627352 fix bug where the annotation processor of SPipesModule and Parameter annotations throws exception when loading test dependencies - specify comments of parameters from javadoc and s-pipes-modules project.

  • DONE 5ebec09 add comment field in Parameter annotation, implement generation of rdfs:comment triple based on the comment field in SPipes Module Annotation Processor.

  • DONE c75a59e merge description of java based SPipesModules from external s-pipes-modules project and javadoc comments parameters into comment field of Paramter annotation.

  • Revise comment field values of Parameter annotation - see TODOs in commit Mark comment field value of Parameter annotations that need to be revised/improved

  • this should be copied in all-modules.ttl do not include triples where the resource is the ontology. See module module-text-analysis.ttl in resource folder of moodule-text-analysis .

blcham
blcham requested changes Sep 12, 2023
View reviewed changes
Copy link
Contributor

@blcham blcham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not go over it extensively yet.

...es/module-dataset-discovery/src/main/java/cz/cvut/spipes/modules/DatasetDiscoveryModule.java Outdated Show resolved Hide resolved
...es-modules/module-form/src/main/java/cz/cvut/spipes/modules/ConstructFormMetadataModule.java Show resolved Hide resolved
...pes-modules/module-form/src/main/java/cz/cvut/spipes/modules/ConstructTextualViewModule.java Show resolved Hide resolved
s-pipes-modules/module-form/src/main/java/cz/cvut/spipes/modules/FetchPossibleValuesModule.java Show resolved Hide resolved
s-pipes-modules/module-form/src/main/java/cz/cvut/spipes/modules/MergeFormMetadataModule.java Show resolved Hide resolved
s-pipes-modules/module-rdf4j/src/main/java/cz/cvut/spipes/modules/Rdf4jDeployModule.java Show resolved Hide resolved
s-pipes-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/RDF2CSVModule.java Outdated Show resolved Hide resolved
@kostobog
[#205] Parameter annotations are also read from parent classes which …
e02285c 
…are not annotated with SPipesModules.
@kostobog
[#205] Bug fix, do not load test dependencies when processing Paramet…
f627352 
…er annotations.
@kostobog
[#205] Add comment field to Parameter annotation and use it to rdfs:c…
5ebec09 
…omment triples in RdfAnnotationProcessorMojo.
@kostobog
[#206] Fixing SPipesModule and Parameter annotations in java based s-…
c75a59e 
…pipe modules in s-pipe-modules.

- remove SPipesModule from abstract java classes
- moving javadoc comments to comment field in SPipesModule and Parameter annotation
- adding comment field to Parameter annotation from external s-pipes-modules project
- adding missing parameter annotations
- fixing some wrong Parameter annotations
@kostobog
[#206] Mark comment field value of Parameter annotations that need to…
7152270 
… be revised/improved
@kostobog kostobog mentioned this pull request Sep 19, 2023
Closed
@blcham
Copy link
Contributor

blcham commented Sep 27, 2023

@kostobog please create separate ticket for 7152270

@kostobog
[#206] Add javadoc comments to comment field of @SPipesModule and @pa…
a1c3763 
…rameter. Delete moved javadoc comments.
@kostobog
[#206] Fix typo
af2c0e7
@kostobog
[UPD] Copy manually managed ontologies with module descriptions into …
ae5869a 
…all-modules.ttl

- delete unused s-pipes-module-creator-maven-plugin configuration from s-pipes-text-analysis
@kostobog kostobog requested a review from blcham September 27, 2023 13:34
@kostobog
Copy link
Contributor Author

kostobog commented Sep 27, 2023 •
edited
Loading

Javadoc comments are moved into annotations.
Commit ae5869a resolves issue #216 - The s-pipes-module-creator-plugin should include triples from manually maintained ontologies in maven submodules of the s-pipes/s-pipes-modules project.
The output all-modules.ttl is formatted using frames.

@kostobog kostobog changed the title Fix issues #205 and #206 Fix issues #205, #206 and #216 Sep 28, 2023
blcham
blcham reviewed Sep 29, 2023
View reviewed changes
...ules-utils/s-pipes-module-creator-maven-plugin/src/main/java/RdfAnnotationProcessorMojo.java Outdated
/**
* Reads manually managed modules ontology from maven sub-project.
* The ontology is loaded from the resource folder of the sub-project and it is expected to start with the artifact
* id of the sub-project followed by the postfix ".sms.tll". For example, assume the input parameter project
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kostobog

sms.ttl is meant for scripts only and not for module definition files, thus:
sms.ttl --> ttl.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kostobog FYI, resolve when you read the comment

@blcham blcham merged commit d437843 into main Sep 29, 2023
@kostobog kostobog mentioned this pull request Oct 2, 2023
Closed
@blcham blcham deleted the issues/issue205-module-creator-plugin-outputs-wrong-rdf branch August 14, 2024 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blcham blcham blcham requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

s-pipes-module-creator-maven-plugin Generates Wrong Module RDF Description
2 participants
@kostobog @blcham