From d1dded0694abe93a15df41f075b45ca45d8ac1c1 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Thu, 19 Jan 2023 00:01:12 +0100
Subject: [PATCH] [DEV] correct json parining include

---
 pom.xml                                   | 2 +-
 src/org/kar/archidata/SqlWrapper.java     | 6 +++---
 src/org/kar/archidata/model/Data.java     | 7 ++-----
 src/org/kar/archidata/model/GetToken.java | 4 ++--
 src/org/kar/archidata/model/User.java     | 4 ++--
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index cf2c051..f353996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>kangaroo-and-rabbit</groupId>
   <artifactId>archidata</artifactId>
-  <version>0.2.4</version>
+  <version>0.2.6</version>
 	<properties>
 		<jaxrs.version>2.1</jaxrs.version>
 		<jersey.version>2.32</jersey.version>
diff --git a/src/org/kar/archidata/SqlWrapper.java b/src/org/kar/archidata/SqlWrapper.java
index 4f11e1d..dae1b4c 100644
--- a/src/org/kar/archidata/SqlWrapper.java
+++ b/src/org/kar/archidata/SqlWrapper.java
@@ -244,7 +244,7 @@ public class SqlWrapper {
 		}
 		return decorators[0].value();
 	}
-	
+
 	public static <T> T insert(T data) throws Exception {
 		Class<?> clazz = data.getClass();
 		//public static NodeSmall createNode(String typeInNode, String name, String descrition, Long parentId) {
@@ -306,7 +306,7 @@ public class SqlWrapper {
 				query.append("?");
    		 	}
    		    query.append(")");
-   		    // System.out.println("generate the querry: '" + query.toString() + "'");
+   		    // System.out.println("generate the query: '" + query.toString() + "'");
             // prepare the request:
             PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
             Field primaryKeyField = null;
@@ -357,7 +357,7 @@ public class SqlWrapper {
                 throw new SQLException("Creating node failed, no rows affected.");
             }
             Long uniqueSQLID = null;
-            // retreive uid inserted
+            // Retrieve uid inserted
             try (ResultSet generatedKeys = ps.getGeneratedKeys()) {
                 if (generatedKeys.next()) {
                     uniqueSQLID = generatedKeys.getLong(1);
diff --git a/src/org/kar/archidata/model/Data.java b/src/org/kar/archidata/model/Data.java
index eabda46..a63502f 100644
--- a/src/org/kar/archidata/model/Data.java
+++ b/src/org/kar/archidata/model/Data.java
@@ -1,20 +1,17 @@
 package org.kar.archidata.model;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 import org.kar.archidata.annotation.SQLComment;
 import org.kar.archidata.annotation.SQLIfNotExists;
 import org.kar.archidata.annotation.SQLLimitSize;
 import org.kar.archidata.annotation.SQLNotNull;
 import org.kar.archidata.annotation.SQLTableName;
-import org.kar.archidata.model.GenericTable;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 @SQLTableName ("data")
 @SQLIfNotExists
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Data extends GenericTable {
 
     @SQLNotNull
diff --git a/src/org/kar/archidata/model/GetToken.java b/src/org/kar/archidata/model/GetToken.java
index 88cbd27..a86ead5 100644
--- a/src/org/kar/archidata/model/GetToken.java
+++ b/src/org/kar/archidata/model/GetToken.java
@@ -1,8 +1,8 @@
 package org.kar.archidata.model;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public final class GetToken {
 	public final String jwt;
 
diff --git a/src/org/kar/archidata/model/User.java b/src/org/kar/archidata/model/User.java
index 3cb7cfa..30a44c6 100644
--- a/src/org/kar/archidata/model/User.java
+++ b/src/org/kar/archidata/model/User.java
@@ -22,11 +22,11 @@ import org.kar.archidata.annotation.SQLLimitSize;
 import org.kar.archidata.annotation.SQLNotNull;
 import org.kar.archidata.annotation.SQLTableName;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 @SQLTableName ("user")
 @SQLIfNotExists
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class User extends GenericTable {
     @SQLLimitSize(128)
     public String login = null;