Merge pull request #109 from nls-jajuko/bugfix/1.4.1

Support for PostgreSQL uuid arrays #108
nlsfi · May 24, 2024 · 3e16b95 · 3e16b95
2 parents 5557866 + 51af30f
commit 3e16b95
Show file tree

Hide file tree

Showing 33 changed files with 37 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>fi.nls.hakunapi</groupId>
 	<artifactId>hakunapi</artifactId>
-	<version>1.4.0</version>
+	<version>1.4.1</version>
 	<packaging>pom</packaging>
 
 	<name>Hakunapi</name>

diff --git a/src/hakunapi-config-test/pom.xml b/src/hakunapi-config-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-config-test</artifactId>
 

diff --git a/src/hakunapi-core/pom.xml b/src/hakunapi-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-core</artifactId>
 

diff --git a/src/hakunapi-cql2-functions/pom.xml b/src/hakunapi-cql2-functions/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>src</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>hakunapi-cql2-functions</artifactId>
 

diff --git a/src/hakunapi-cql2/pom.xml b/src/hakunapi-cql2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-cql2</artifactId>
 

diff --git a/src/hakunapi-csv/pom.xml b/src/hakunapi-csv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-csv</artifactId>
 

diff --git a/src/hakunapi-esbulk/pom.xml b/src/hakunapi-esbulk/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-esbulk</artifactId>
 

diff --git a/src/hakunapi-geojson/pom.xml b/src/hakunapi-geojson/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-geojson</artifactId>
 

diff --git a/src/hakunapi-gml/pom.xml b/src/hakunapi-gml/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-gml</artifactId>
 

diff --git a/src/hakunapi-gpkg/pom.xml b/src/hakunapi-gpkg/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-gpkg</artifactId>
 

diff --git a/src/hakunapi-html/pom.xml b/src/hakunapi-html/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-html</artifactId>
 

diff --git a/src/hakunapi-jsonfg/pom.xml b/src/hakunapi-jsonfg/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-jsonfg</artifactId>
 

diff --git a/src/hakunapi-proj-gt/pom.xml b/src/hakunapi-proj-gt/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-proj-gt</artifactId>
 

diff --git a/src/hakunapi-proj-jhe/pom.xml b/src/hakunapi-proj-jhe/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-proj-jhe</artifactId>
 

diff --git a/src/hakunapi-smile/pom.xml b/src/hakunapi-smile/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-smile</artifactId>
 

diff --git a/src/hakunapi-source-oracle/pom.xml b/src/hakunapi-source-oracle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-source-oracle</artifactId>
 

diff --git a/src/hakunapi-source-postgis/pom.xml b/src/hakunapi-source-postgis/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>src</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-source-postgis</artifactId>
 

diff --git a/...napi-source-postgis/src/main/java/fi/nls/hakunapi/simple/postgis/PostGISSimpleSource.java b/...napi-source-postgis/src/main/java/fi/nls/hakunapi/simple/postgis/PostGISSimpleSource.java
@@ -24,6 +24,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.UUID;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -440,6 +441,8 @@ private static List<HakunaPropertyType> parseArrayType(Class<?> cls) {
             chain.add(HakunaPropertyType.BOOLEAN);
         } else if (cls.equals(String.class)) {
             chain.add(HakunaPropertyType.STRING);
+        } else if(cls.equals(UUID.class)) {
+            chain.add(HakunaPropertyType.UUID);
         } else {
             throw new IllegalArgumentException("Unsupported array type from class!");
         }
@@ -463,6 +466,8 @@ private static HakunaPropertyType parseArrayType(String typeName) {
         case "_varchar":
         case "_text":
             return HakunaPropertyType.STRING;
+        case "_uuid":
+            return HakunaPropertyType.UUID;
         }
         throw new IllegalArgumentException("Can not determine array type from " + typeName);
     }

diff --git a/src/hakunapi-telemetry-opentelemetry/pom.xml b/src/hakunapi-telemetry-opentelemetry/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>fi.nls.hakunapi</groupId>
     <artifactId>src</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
   </parent>
   <artifactId>hakunapi-telemetry-opentelemetry</artifactId>
 

diff --git a/src/hakunapi-telemetry/pom.xml b/src/hakunapi-telemetry/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>fi.nls.hakunapi</groupId>
     <artifactId>src</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
   </parent>
   <artifactId>hakunapi-telemetry</artifactId>
     <dependencies>

diff --git a/src/pom.xml b/src/pom.xml
@@ -5,7 +5,7 @@
         <parent>
             <groupId>fi.nls.hakunapi</groupId>
             <artifactId>hakunapi</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
         </parent>
 	<artifactId>src</artifactId>
 	<packaging>pom</packaging>

diff --git a/webapp-jakarta/hakunapi-oracle-webapp-jakarta/pom.xml b/webapp-jakarta/hakunapi-oracle-webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-jakarta</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>hakunapi-oracle-webapp-jakarta</artifactId>
 	<packaging>war</packaging>

diff --git a/webapp-jakarta/hakunapi-simple-servlet-jakarta/pom.xml b/webapp-jakarta/hakunapi-simple-servlet-jakarta/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>fi.nls.hakunapi</groupId>
     <artifactId>webapp-jakarta</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
   </parent>
   <artifactId>hakunapi-simple-servlet-jakarta</artifactId>
 

diff --git a/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml b/webapp-jakarta/hakunapi-simple-webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-jakarta</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-simple-webapp-jakarta</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-jakarta/hakunapi-simple-webapp-test-jakarta/pom.xml b/webapp-jakarta/hakunapi-simple-webapp-test-jakarta/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-jakarta</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>hakunapi-simple-webapp-test-jakarta</artifactId>
 

diff --git a/webapp-jakarta/hakunapi-telemetry-webapp-jakarta/pom.xml b/webapp-jakarta/hakunapi-telemetry-webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-jakarta</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>hakunapi-telemetry-webapp-jakarta</artifactId>
 	<packaging>war</packaging>

diff --git a/webapp-jakarta/pom.xml b/webapp-jakarta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>hakunapi</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>webapp-jakarta</artifactId>
     <packaging>pom</packaging>

diff --git a/webapp-javax/hakunapi-oracle-webapp-javax/pom.xml b/webapp-javax/hakunapi-oracle-webapp-javax/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
   <artifactId>hakunapi-oracle-webapp-javax</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-javax/hakunapi-simple-servlet-javax/pom.xml b/webapp-javax/hakunapi-simple-servlet-javax/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-simple-servlet-javax</artifactId>
     <packaging>jar</packaging>

diff --git a/webapp-javax/hakunapi-simple-webapp-javax/pom.xml b/webapp-javax/hakunapi-simple-webapp-javax/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-simple-webapp-javax</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-javax/hakunapi-simple-webapp-test-javax/pom.xml b/webapp-javax/hakunapi-simple-webapp-test-javax/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>webapp-javax</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>hakunapi-simple-webapp-test-javax</artifactId>
 	<packaging>jar</packaging>

diff --git a/webapp-javax/hakunapi-telemetry-webapp-javax/pom.xml b/webapp-javax/hakunapi-telemetry-webapp-javax/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>fi.nls.hakunapi</groupId>
         <artifactId>webapp-javax</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
     <artifactId>hakunapi-telemetry-webapp-javax</artifactId>
     <packaging>war</packaging>

diff --git a/webapp-javax/pom.xml b/webapp-javax/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>fi.nls.hakunapi</groupId>
 		<artifactId>hakunapi</artifactId>
-		<version>1.4.0</version>
+		<version>1.4.1</version>
 	</parent>
 	<artifactId>webapp-javax</artifactId>
 	<packaging>pom</packaging>