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

[DEV] correct insert on right

Browse Source
This commit is contained in:
Edouard DUPIN 2023-05-25 23:13:08 +02:00
parent 6cf67a1143
commit f510537964
3 changed files with 11 additions and 8 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.3.5</version> <version>0.3.6</version>
<properties> <properties>
<jersey.version>3.1.1</jersey.version> <jersey.version>3.1.1</jersey.version>
<jaxb.version>2.3.1</jaxb.version> <jaxb.version>2.3.1</jaxb.version>

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

@ -388,9 +388,9 @@ public class SqlWrapper {
String tableName = getTableName(clazz); String tableName = getTableName(clazz);
//boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0; //boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0;
StringBuilder query = new StringBuilder(); StringBuilder query = new StringBuilder();
query.append("INSERT INTO "); query.append("INSERT INTO `");
query.append(tableName); query.append(tableName);
query.append(" ("); query.append("` (");
boolean firstField = true; boolean firstField = true;
int count = 0; int count = 0;
@ -439,7 +439,7 @@ public class SqlWrapper {
query.append("?"); query.append("?");
} }
query.append(")"); query.append(")");
// logger.debug("generate the query: '{}'", query.toString()); //LOGGER.warn("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;
@ -560,9 +560,9 @@ public class SqlWrapper {
String tableName = getTableName(clazz); String tableName = getTableName(clazz);
//boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0; //boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0;
StringBuilder query = new StringBuilder(); StringBuilder query = new StringBuilder();
query.append("UPDATE "); query.append("UPDATE `");
query.append(tableName); query.append(tableName);
query.append(" SET "); query.append("` SET ");
boolean firstField = true; boolean firstField = true;
Field primaryKeyField = null; Field primaryKeyField = null;

7
src/org/kar/archidata/util/JWTWrapper.java
View File

@ -84,12 +84,15 @@ public class JWTWrapper {
try { try {
String generatedStringForKey = baseUUID; String generatedStringForKey = baseUUID;
if (generatedStringForKey == null) { if (generatedStringForKey == null) {
logger.error(" Generate new UUID : {}", generatedStringForKey);
generatedStringForKey = UUID.randomUUID().toString(); generatedStringForKey = UUID.randomUUID().toString();
} else {
logger.error("USE UUID : {}", generatedStringForKey);
} }
rsaJWK = new RSAKeyGenerator(2048).keyID(generatedStringForKey).generate(); rsaJWK = new RSAKeyGenerator(2048).keyID(generatedStringForKey).generate();
rsaPublicJWK = rsaJWK.toPublicJWK(); rsaPublicJWK = rsaJWK.toPublicJWK();
//logger.debug("RSA key (all): " + rsaJWK.toJSONString()); logger.error("RSA key (all): " + rsaJWK.toJSONString());
//logger.debug("RSA key (pub): " + rsaPublicJWK.toJSONString()); logger.error("RSA key (pub): " + rsaPublicJWK.toJSONString());
} catch (JOSEException e) { } catch (JOSEException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();