Merge branch 'development'

kbss-cvut · Nov 10, 2022 · 78eaba9 · 78eaba9
2 parents c0a5b1d + 3e891ae
commit 78eaba9
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # JOPA - Release Notes
 
+## 0.19.2 - 2022-11-10
+- Fix issues in working with `LocalTime` values.
+
 ## 0.19.1 - 2022-11-08
 - Fix issues in working with `BigInteger` and `BigDecimal` values.
 - Fix a warning about illegal reflective operations on newer JDKs.

diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ This means that when you add an instance of some class during a transaction and
 transaction), you'll see the newly added instance as well. This is a feature not usually seen even in large triple stores.
 
 There are some limitations to this approach. Currently, pending changes are not taken into account when doing inference.
-Also, the current version of Sesame OntoDriver is not able to include pending changes into results of SPARQL queries.
+Also, the current version of RDF4J OntoDriver is not able to include pending changes into results of SPARQL queries.
 
 #### Separate storage access layer
 
@@ -110,7 +110,7 @@ The whole framework consists of several modules:
 * _OntoDriver RDF4J_ - OntoDriver implementation for RDF4J-accessed storages.
 * _OntoDriver OWLAPI_ - OntoDriver implementation for OWLAPI-accessed files.
 * _Ontodriver Jena_ - OntoDriver implementation for Jena-based storages.
-* _OWL2Java_ - generates JOPA entities based on integrity constraints in input ontology (see [Example01](https://github.com/kbss-cvut/jopa-examples/tree/master/example01-jopa-sesame-owl2java)).
+* _OWL2Java_ - generates JOPA entities based on integrity constraints in input ontology (see [Example01](https://github.com/kbss-cvut/jopa-examples/tree/master/example01-jopa-rdf4j-owl2java)).
 * _JOPA Maven plugin_ - Maven plugin for object model generation (using OWL2Java).
 
 Other modules represent integration tests and various utilities.

diff --git a/datatype/pom.xml b/datatype/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>jopa-all</artifactId>
         <groupId>cz.cvut.kbss.jopa</groupId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/jopa-api/pom.xml b/jopa-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/jopa-distribution/pom.xml b/jopa-distribution/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/jopa-impl/pom.xml b/jopa-impl/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/CloneBuilderImpl.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/CloneBuilderImpl.java
@@ -293,6 +293,7 @@ private static Set<Class<?>> getImmutableTypes() {
                          URI.class,
                          URL.class,
                          LocalDate.class,
+                         LocalTime.class,
                          LocalDateTime.class,
                          ZonedDateTime.class,
                          OffsetDateTime.class,

diff --git a/jopa-integration-tests-jena/pom.xml b/jopa-integration-tests-jena/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/jopa-integration-tests-owlapi/pom.xml b/jopa-integration-tests-owlapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/jopa-integration-tests-rdf4j/pom.xml b/jopa-integration-tests-rdf4j/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>jopa-integration-tests-rdf4j</artifactId>

diff --git a/jopa-integration-tests/pom.xml b/jopa-integration-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/jopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/environment/Generators.java b/jopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/environment/Generators.java
@@ -21,7 +21,9 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.time.LocalDate;
 import java.time.OffsetDateTime;
+import java.time.OffsetTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -132,7 +134,7 @@ public static Map<URI, Set<Object>> createTypedProperties(int size) {
     }
 
     private static Object generateRandomPropertyValue(int valueIndex, int propertyIndex) {
-        final int random = randomInt(8);
+        final int random = randomInt(10);
         switch (random) {
             case 0: // boolean
                 return valueIndex % 2 == 0;
@@ -142,14 +144,18 @@ private static Object generateRandomPropertyValue(int valueIndex, int propertyIn
                 return System.currentTimeMillis();
             case 3: //double
                 return ((double) propertyIndex + 1) / (valueIndex + 1);
-            case 4: // date
-                // Generate date rounded to seconds to prevent issues with time rounding
+            case 4: // datetime
+                // Generate date rounded to milliseconds to prevent issues with time rounding
                 return OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
-            case 5: // String
-                return "TypedProperty_" + propertyIndex + "Value_" + valueIndex;
+            case 5:
+                return OffsetTime.now().truncatedTo(ChronoUnit.MILLIS);
             case 6:
+                return LocalDate.now();
+            case 7: // String
+                return "TypedProperty_" + propertyIndex + "Value_" + valueIndex;
+            case 8:
                 return BigInteger.valueOf(valueIndex);
-            case 7:
+            case 9:
                 return BigDecimal.valueOf(Math.PI);
             default:
                 throw new IllegalArgumentException();

diff --git a/jopa-maven-plugin/pom.xml b/jopa-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jopa-all</artifactId>
         <groupId>cz.cvut.kbss.jopa</groupId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/jopa-owl2java/pom.xml b/jopa-owl2java/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/jopa-owlapi-utils/pom.xml b/jopa-owlapi-utils/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/ontodriver-api/pom.xml b/ontodriver-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>jopa-all</artifactId>
         <groupId>cz.cvut.kbss.jopa</groupId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/ontodriver-jena/pom.xml b/ontodriver-jena/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/ontodriver-owlapi/pom.xml b/ontodriver-owlapi/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/ontodriver-rdf4j/pom.xml b/ontodriver-rdf4j/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>jopa-all</artifactId>
         <groupId>cz.cvut.kbss.jopa</groupId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
     </parent>
 
     <properties>

diff --git a/ontodriver-sesame/pom.xml b/ontodriver-sesame/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>cz.cvut.kbss.jopa</groupId>
         <artifactId>jopa-all</artifactId>
-        <version>0.19.1</version>
+        <version>0.19.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cz.cvut.kbss.jopa</groupId>
-    <version>0.19.1</version>
+    <version>0.19.2</version>
     <artifactId>jopa-all</artifactId>
     <packaging>pom</packaging>
     <name>JOPA</name>