kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[DEV] correct json parining include
All checks were successful
WEB karideo and rabbit/archidata/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Edouard DUPIN 2023-01-19 00:01:12 +01:00
parent 25fa3f8298
commit d1dded0694
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>kangaroo-and-rabbit</groupId> <groupId>kangaroo-and-rabbit</groupId>
<artifactId>archidata</artifactId> <artifactId>archidata</artifactId>
<version>0.2.4</version> <version>0.2.6</version>
<properties> <properties>
<jaxrs.version>2.1</jaxrs.version> <jaxrs.version>2.1</jaxrs.version>
<jersey.version>2.32</jersey.version> <jersey.version>2.32</jersey.version>

6
src/org/kar/archidata/SqlWrapper.java
View File

@ -244,7 +244,7 @@ public class SqlWrapper {
} }
return decorators[0].value(); return decorators[0].value();
} }
public static <T> T insert(T data) throws Exception { public static <T> T insert(T data) throws Exception {
Class<?> clazz = data.getClass(); Class<?> clazz = data.getClass();
//public static NodeSmall createNode(String typeInNode, String name, String descrition, Long parentId) { //public static NodeSmall createNode(String typeInNode, String name, String descrition, Long parentId) {
@ -306,7 +306,7 @@ public class SqlWrapper {
query.append("?"); query.append("?");
} }
query.append(")"); query.append(")");
// System.out.println("generate the querry: '" + query.toString() + "'"); // System.out.println("generate the query: '" + query.toString() + "'");
// prepare the request: // prepare the request:
PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS); PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
Field primaryKeyField = null; Field primaryKeyField = null;
@ -357,7 +357,7 @@ public class SqlWrapper {
throw new SQLException("Creating node failed, no rows affected."); throw new SQLException("Creating node failed, no rows affected.");
} }
Long uniqueSQLID = null; Long uniqueSQLID = null;
// retreive uid inserted // Retrieve uid inserted
try (ResultSet generatedKeys = ps.getGeneratedKeys()) { try (ResultSet generatedKeys = ps.getGeneratedKeys()) {
if (generatedKeys.next()) { if (generatedKeys.next()) {
uniqueSQLID = generatedKeys.getLong(1); uniqueSQLID = generatedKeys.getLong(1);

7
src/org/kar/archidata/model/Data.java
View File

@ -1,20 +1,17 @@
package org.kar.archidata.model; package org.kar.archidata.model;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.kar.archidata.annotation.SQLComment; import org.kar.archidata.annotation.SQLComment;
import org.kar.archidata.annotation.SQLIfNotExists; import org.kar.archidata.annotation.SQLIfNotExists;
import org.kar.archidata.annotation.SQLLimitSize; import org.kar.archidata.annotation.SQLLimitSize;
import org.kar.archidata.annotation.SQLNotNull; import org.kar.archidata.annotation.SQLNotNull;
import org.kar.archidata.annotation.SQLTableName; 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") @SQLTableName ("data")
@SQLIfNotExists @SQLIfNotExists
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class Data extends GenericTable { public class Data extends GenericTable {
@SQLNotNull @SQLNotNull

4
src/org/kar/archidata/model/GetToken.java
View File

@ -1,8 +1,8 @@
package org.kar.archidata.model; 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 class GetToken {
public final String jwt; public final String jwt;

4
src/org/kar/archidata/model/User.java
View File

@ -22,11 +22,11 @@ import org.kar.archidata.annotation.SQLLimitSize;
import org.kar.archidata.annotation.SQLNotNull; import org.kar.archidata.annotation.SQLNotNull;
import org.kar.archidata.annotation.SQLTableName; import org.kar.archidata.annotation.SQLTableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.annotation.JsonInclude;
@SQLTableName ("user") @SQLTableName ("user")
@SQLIfNotExists @SQLIfNotExists
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class User extends GenericTable { public class User extends GenericTable {
@SQLLimitSize(128) @SQLLimitSize(128)
public String login = null; public String login = null;