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

[DEV] add list at insert

Browse Source
This commit is contained in:
Edouard DUPIN 2024-01-03 00:17:49 +01:00
parent eff5513705
commit c99fb84ef4
2 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/org/kar/archidata/dataAccess/DataAccess.java
View File

@ -1,6 +1,7 @@
package org.kar.archidata.dataAccess; package org.kar.archidata.dataAccess;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -9,9 +10,7 @@ import java.sql.Statement;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.sql.Types; import java.sql.Types;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -482,10 +481,11 @@ public class DataAccess {
} }
DBEntry entry = DBEntry.createInterface(GlobalConfiguration.dbConfig); DBEntry entry = DBEntry.createInterface(GlobalConfiguration.dbConfig);
final List<Field> needAsyncInsert = new ArrayList<>(); final List<Field> asyncFieldUpdate = new ArrayList<>();
Long uniqueSQLID = null;
final String tableName = AnnotationTools.getTableName(clazz, options);
// real add in the BDD: // real add in the BDD:
try { try {
final String tableName = AnnotationTools.getTableName(clazz, options);
// boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0; // boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(SQLIfNotExists.class).length != 0;
final StringBuilder query = new StringBuilder(); final StringBuilder query = new StringBuilder();
query.append("INSERT INTO `"); query.append("INSERT INTO `");
@ -494,37 +494,37 @@ public class DataAccess {
boolean firstField = true; boolean firstField = true;
int count = 0; int count = 0;
for (final Field elem : clazz.getFields()) { for (final Field field : clazz.getFields()) {
// static field is only for internal global declaration ==> remove it .. // static field is only for internal global declaration ==> remove it ..
if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) { if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
continue; continue;
} }
if (AnnotationTools.isPrimaryKey(elem)) { if (AnnotationTools.isPrimaryKey(field)) {
continue; continue;
} }
final DataAccessAddOn addOn = findAddOnforField(elem); final DataAccessAddOn addOn = findAddOnforField(field);
if (addOn != null && !addOn.canInsert(elem)) { if (addOn != null && !addOn.canInsert(field)) {
if (addOn.isInsertAsync(elem)) { if (addOn.isInsertAsync(field)) {
needAsyncInsert.add(elem); asyncFieldUpdate.add(field);
} }
continue; continue;
} }
final boolean createTime = elem.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0; final boolean createTime = field.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
if (createTime) { if (createTime) {
continue; continue;
} }
final boolean updateTime = elem.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0; final boolean updateTime = field.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
if (updateTime) { if (updateTime) {
continue; continue;
} }
if (!elem.getClass().isPrimitive()) { if (!field.getClass().isPrimitive()) {
final Object tmp = elem.get(data); final Object tmp = field.get(data);
if (tmp == null && elem.getDeclaredAnnotationsByType(DataDefault.class).length != 0) { if (tmp == null && field.getDeclaredAnnotationsByType(DataDefault.class).length != 0) {
continue; continue;
} }
} }
count++; count++;
final String name = AnnotationTools.getFieldName(elem); final String name = AnnotationTools.getFieldName(field);
if (firstField) { if (firstField) {
firstField = false; firstField = false;
} else { } else {
@ -596,7 +596,6 @@ public class DataAccess {
if (affectedRows == 0) { if (affectedRows == 0) {
throw new SQLException("Creating node failed, no rows affected."); throw new SQLException("Creating node failed, no rows affected.");
} }
Long uniqueSQLID = null;
// Retrieve uid inserted // Retrieve uid inserted
try (ResultSet generatedKeys = ps.getGeneratedKeys()) { try (ResultSet generatedKeys = ps.getGeneratedKeys()) {
if (generatedKeys.next()) { if (generatedKeys.next()) {
@ -619,24 +618,20 @@ public class DataAccess {
} }
} }
// ps.execute(); // ps.execute();
if (needAsyncInsert.size() != 0) {
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
LOGGER.error("Need to insert async !!!!");
}
} catch (final SQLException ex) { } catch (final SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
} finally { } finally {
entry.close(); entry.close();
entry = null; entry = null;
} }
final List<LazyGetter> asyncActions = new ArrayList<>();
for (final Field field : asyncFieldUpdate) {
final DataAccessAddOn addOn = findAddOnforField(field);
addOn.asyncInsert(tableName, uniqueSQLID, field, field.get(data), asyncActions);
}
for (final LazyGetter action : asyncActions) {
action.doRequest();
}
return data; return data;
} }
@ -1034,7 +1029,15 @@ public class DataAccess {
final List<LazyGetter> lazyCall) throws Exception { final List<LazyGetter> lazyCall) throws Exception {
final boolean readAllfields = QueryOptions.readAllColomn(options); final boolean readAllfields = QueryOptions.readAllColomn(options);
// TODO: manage class that is defined inside a class ==> Not manage for now... // TODO: manage class that is defined inside a class ==> Not manage for now...
final Object data = clazz.getConstructors()[0].newInstance(); Object data = null;
for (final Constructor<?> contructor : clazz.getConstructors()) {
if (contructor.getParameterCount() == 0) {
data = contructor.newInstance();
}
}
if (data == null) {
throw new DataAccessException("Can not find the default constructor for the class: " + clazz.getCanonicalName());
}
for (final Field elem : clazz.getFields()) { for (final Field elem : clazz.getFields()) {
// static field is only for internal global declaration ==> remove it .. // static field is only for internal global declaration ==> remove it ..
if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) { if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) {
@ -1114,10 +1117,6 @@ public class DataAccess {
return DataAccess.getWhere(clazz, options.getAllArray()); return DataAccess.getWhere(clazz, options.getAllArray());
} }
public static String getCurrentTimeStamp() {
return LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
}
public static <T> List<T> gets(final Class<T> clazz) throws Exception { public static <T> List<T> gets(final Class<T> clazz) throws Exception {
return getsWhere(clazz); return getsWhere(clazz);
} }
@ -1280,7 +1279,7 @@ public class DataAccess {
final String tableName = AnnotationTools.getTableName(clazz, options); final String tableName = AnnotationTools.getTableName(clazz, options);
DBEntry entry = DBEntry.createInterface(GlobalConfiguration.dbConfig); DBEntry entry = DBEntry.createInterface(GlobalConfiguration.dbConfig);
final StringBuilder query = new StringBuilder(); final StringBuilder query = new StringBuilder();
query.append("DROP TABLE `"); query.append("DROP TABLE IF EXISTS `");
query.append(tableName); query.append(tableName);
query.append("`"); query.append("`");
try { try {

2
src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
View File

@ -234,7 +234,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
final List<LinkTable> insertElements = new ArrayList<>(); final List<LinkTable> insertElements = new ArrayList<>();
for (final Long remoteKey : dataCasted) { for (final Long remoteKey : dataCasted) {
if (remoteKey == null) { if (remoteKey == null) {
continue; throw new DataAccessException("Try to insert remote key with null value");
} }
if (localKey instanceof final Long localKeyLong) { if (localKey instanceof final Long localKeyLong) {
insertElements.add(new LinkTable(localKeyLong, remoteKey)); insertElements.add(new LinkTable(localKeyLong, remoteKey));