Upgrade to OML 0.8.0

.travis.yml

@@ -4,9 +4,6 @@ install: true
 jdk:
 - openjdk11
 
-before_script:
-- cd owl-adapter
-
 script:
   - ./gradlew build
 

owl-adapter/build.gradle → build.gradle

@@ -11,13 +11,14 @@ buildscript {
 }
 
 subprojects {
-	group = 'io.opencaesar.owl'
-	version = '0.7.11'
+	group = 'io.opencaesar.adapters'
+	version = '0.8.0'
 
 	ext.versions = [
-	    oml: '0.7.+',
+	    oml: '0.8.+',
+		oml_tools: '0.8.+',
 		owl: '5.1.+',
-		owl_tools: '0.7.+',
+		owl_tools: '+',
 		jcommander: '1.72',
 		log4j: '1.2.17',
 		slf4j: '1.7.30',
@@ -27,6 +28,7 @@ subprojects {
 
 	repositories {
     	mavenLocal()
+		maven { url 'https://dl.bintray.com/opencaesar/oml-tools' }
 		maven { url 'https://dl.bintray.com/opencaesar/owl-tools' }
 		maven { url 'https://dl.bintray.com/opencaesar/oml' }
   		mavenCentral()

owl-adapter/gradle/source-layout.gradle → gradle/source-layout.gradle

@@ -2,19 +2,13 @@ sourceSets {
 	main {
 		java.srcDirs = ['src/main/java']
 		resources.srcDirs = ['src/main/resources']
-		xtendOutputDir = 'src/main/xtend-gen'
 	}
 	test {
 		java.srcDirs = ['src/test/java']
 		resources.srcDirs = ['src/test/resources']
-		xtendOutputDir = 'src/test/xtend-gen'
 	}
 }
 
-sourceSets.all {
-	resources.exclude '**/*.xtend', '**/*._trace'
-}
-
 task sourcesJar(type: Jar, dependsOn: classes) {
     classifier = 'sources'
     from sourceSets.main.allSource

owl-adapter/oml2owl-gradle/.classpath → oml2owl-gradle/.classpath

@@ -6,7 +6,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/*.xtend|**/*._trace" kind="src" output="bin/main" path="src/main/resources">
+	<classpathentry kind="src" output="bin/main" path="src/main/resources">
 		<attributes>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>

oml2owl-gradle/src/main/resources/version.txt

@@ -0,0 +1 @@
+0.8.0

owl-adapter/oml2owl/.classpath → oml2owl/.classpath

@@ -6,13 +6,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="bin/main" path="src/main/xtend-gen">
-		<attributes>
-			<attribute name="gradle_scope" value="main"/>
-			<attribute name="gradle_used_by_scope" value="main,test"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**/*.xtend|**/*._trace" kind="src" output="bin/main" path="src/main/resources">
+	<classpathentry kind="src" output="bin/main" path="src/main/resources">
 		<attributes>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>

owl-adapter/oml2owl/build.gradle → oml2owl/build.gradle

@@ -7,6 +7,7 @@ applicationName = 'oml2owl'
 
 dependencies {
 	implementation "io.opencaesar.oml:io.opencaesar.oml.dsl:${versions.oml}"
+	implementation "io.opencaesar.oml:oml-validate:${versions.oml_tools}"
 	implementation "io.opencaesar.owl:owl-close-world:${versions.owl_tools}"
 	implementation "net.sourceforge.owlapi:owlapi-distribution:${versions.owl}"
 	implementation "org.jgrapht:jgrapht-core:${versions.jgrapht}"

owl-adapter/oml2owl/src/main/java/io/opencaesar/oml2owl/CloseDescriptionBundle.java → oml2owl/src/main/java/io/opencaesar/oml2owl/CloseDescriptionBundle.java

@@ -286,18 +286,21 @@ private final static HashMap<Relation, Graph<Relation, DefaultEdge>> getRelation
 		toStream(allOntologies.iterator()).forEach(g -> {
 			toStream(g.eAllContents()).filter(e -> e instanceof RelationEntity).map(e -> (RelationEntity) e)
 					.forEach(re -> {
-						final Relation f = re.getForward();
-						final Relation r = re.getReverse();
-						graph.addVertex(f);
+						final Relation f = re.getForwardRelation();
+						final Relation r = re.getReverseRelation();
+						if (Objects.nonNull(f))
+							graph.addVertex(f);
 						if (Objects.nonNull(r))
 							graph.addVertex(r);
 						OmlRead.getSpecializedTerms(re).forEach(s -> {
 							if (s instanceof RelationEntity) {
 								final RelationEntity sre = (RelationEntity) s;
-								final Relation sf = sre.getForward();
-								final Relation sr = sre.getReverse();
-								graph.addVertex(sf);
-								graph.addEdge(sf, f);
+								final Relation sf = sre.getForwardRelation();
+								final Relation sr = sre.getReverseRelation();
+								if (Objects.nonNull(f) && Objects.nonNull(sf)) {
+									graph.addVertex(sf);
+									graph.addEdge(sf, f);
+								}
 								if (Objects.nonNull(r) && Objects.nonNull(sr)) {
 									graph.addVertex(sr);
 									graph.addEdge(sr, r);