diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
new file mode 100644
index 0000000..3cd3e9d
--- /dev/null
+++ b/.idea/dbnavigator.xml
@@ -0,0 +1,409 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..ce1c62c
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..c3dfb30
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..d64cd49
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..1af9e09
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/src/main/java/fr/doap/jdb/JDB.java b/src/main/java/fr/doap/jdb/JDB.java
index 04ec531..41dbac6 100644
--- a/src/main/java/fr/doap/jdb/JDB.java
+++ b/src/main/java/fr/doap/jdb/JDB.java
@@ -1,16 +1,13 @@
package fr.doap.jdb;
+import fr.doap.jdb.utils.*;
import fr.doap.slog.*;
-import javax.sql.rowset.serial.*;
-import javax.swing.plaf.*;
import java.lang.reflect.*;
import java.sql.*;
import java.util.*;
import java.util.concurrent.*;
-import static fr.doap.jdb.Utils.*;
-
public class JDB {
/* public static */
static public void init(String aConn, String aUser, String aPass) {
@@ -32,12 +29,16 @@ public class JDB {
Optional> lOpt = mDBWrap.query("SELECT MAX("+DBWrap.sJID+")+1 AS NEXTID FROM OBJECTS").findFirst();
Object lNID = lOpt.get().get("NEXTID");
- if (lNID != null) mNextID = (int)lNID;
- else mNextID = 1;
+ if (lNID != null) mDBWOC.setNextID((int)lNID);
+ else mDBWOC.setNextID(1);
}
protected void _save(Object aObject) {
- new ObjectMapBuilder(aObject);
+ Objects2Maps lO2M = new Objects2Maps(mDBWOC);
+ lO2M.add(aObject);
+ mSQLTypes.putAll(lO2M.getColumnSQLTypes());
+ lO2M.getInserts().values().forEach(aProps -> mDBWrap.insert(aProps));
+ lO2M.getUpdates().values().forEach(aProps -> mDBWrap.update(aProps));
}
// aConds = String: le SQL et ensuite les paramètres
@@ -63,7 +64,7 @@ public class JDB {
mRS.next();
int lID = mRS.getInt(mDBWrap.sJID);
L.i("ID: {}", lID);
- Object lCached = mWeakObjectCache.getObject(lID);
+ Object lCached = mDBWOC.getObject(lID);
if (lCached != null) return (T)lCached;
L.i("NOT CACHED ! Loading...");
@@ -85,7 +86,7 @@ L.i("Props: {}", lMap);
byte[] lBA = mRS.getBytes("_SUBS_");
if (lBA != null) {
int[] lIDs = (int[]) Utils.fromByteArray(lBA);
- for (int i=0; i aID.toString()).toList())+")").get();
@@ -103,10 +104,10 @@ L.i(" --> Props: {}", lMap);
Class lClass = Class.forName(lLoadRS.getString("_CLASS_"));
Object lO = lClass.getDeclaredConstructor().newInstance();
- mWeakObjectCache.put(lSID, lO);
+ mDBWOC.put(lSID, lO);
}
lProps.forEach((aID, aProps) -> {
- Object lO = mWeakObjectCache.getId(aID);
+ Object lO = mDBWOC.getId(aID);
if ((lO instanceof Collection)&&(lO.getClass().getCanonicalName().startsWith("java."))) {
} else {
@@ -122,7 +123,7 @@ L.i(" --> Props: {}", lMap);
}
});
- return (T)mWeakObjectCache.getObject(lID);
+ return (T) mDBWOC.getObject(lID);
} catch (Exception aE) { L.w(aE); }
return null;
}
@@ -142,146 +143,7 @@ L.i(" --> Props: {}", lMap);
return mDBWrap._query(lSQL, lParams);
}
- static final Map, String> sTypeMap = Utils.HashMapOf(
- Boolean.class, "BOOLEAN",
- Integer.class, "INTEGER",
- Long.class, "BIGINT",
- byte[].class, "VARBINARY",
- Blob.class, "BLOB",
- String.class, "VARCHAR");
-
- class ObjectMapBuilder {
- ObjectMapBuilder(Object aObject) {
- Map> lReach=new HashMap<>();
- Map> lInserts=new HashMap<>();
- Map> lUpdates=new HashMap<>();
-
- add(aObject);
-
- while (mPos < mProcessingList.size()) {
- Object lO = mProcessingList.get(mPos);
- try {
- Constructor lCons = lO.getClass().getDeclaredConstructor(); // ensure at least a default constructor...
- } catch (Exception aE) {
- throw new RuntimeException("No constructor for class "+lO.getClass().getCanonicalName());
- }
-
- Set