Update pom and code to glob v5 to managed removal of GlobTypeLoader (introspection) and GlobTypeBuilder init change (no more incomplete GlobType)

MarcGuiot · MarcGuiot · commit d09d1806331d · 2026-01-17T13:30:45.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <packaging>jar</packaging>
     <artifactId>globs-sql</artifactId>
     <name>db access</name>
-    <version>4.7-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
 
     <developers>
         <developer>
@@ -131,12 +131,12 @@
         <dependency>
             <groupId>org.globsframework</groupId>
             <artifactId>globs</artifactId>
-            <version>4.14.1</version>
+            <version>5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.globsframework</groupId>
             <artifactId>globs-gson</artifactId>
-            <version>4.5.0</version>
+            <version>5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
@@ -166,7 +166,7 @@
         <dependency>
             <groupId>org.globsframework</groupId>
             <artifactId>globs</artifactId>
-            <version>4.14.1</version>
+            <version>5.0-SNAPSHOT</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
@@ -185,7 +185,7 @@
         <dependency>
             <groupId>org.globsframework</groupId>
             <artifactId>saxstack</artifactId>
-            <version>4.1.1</version>
+            <version>5.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/globsframework/sql/DefaultGlobTypeExtractor.java b/src/main/java/org/globsframework/sql/DefaultGlobTypeExtractor.java
@@ -66,7 +66,7 @@ public GlobType createFrom() {
         if (!completeGlobTypeBuilder()) {
             return null;
         }
-        return globTypeBuilder.get();
+        return globTypeBuilder.build();
     }
 
     private boolean completeGlobTypeBuilder() {
diff --git a/src/main/java/org/globsframework/sql/SqlConnection.java b/src/main/java/org/globsframework/sql/SqlConnection.java
@@ -4,7 +4,7 @@
 import org.globsframework.core.metamodel.fields.Field;
 import org.globsframework.core.model.Glob;
 import org.globsframework.sql.constraints.Constraint;
-import org.globsframework.sql.exceptions.DbConstraintViolation;
+import org.globsframework.sql.exceptions.ConstraintViolation;
 import org.globsframework.sql.exceptions.RollbackFailed;
 
 import java.util.Arrays;
@@ -25,9 +25,9 @@ public interface SqlConnection {
 
     SqlRequest getDeleteRequest(GlobType globType, Constraint constraint);
 
-    void commit() throws RollbackFailed, DbConstraintViolation;
+    void commit() throws RollbackFailed, ConstraintViolation;
 
-    void commitAndClose() throws RollbackFailed, DbConstraintViolation;
+    void commitAndClose() throws RollbackFailed, ConstraintViolation;
 
     void rollbackAndClose();
 
@@ -54,6 +54,6 @@ default void createTable(GlobType... types) {
     }
 
     default void emptyTable(GlobType... types) {
-        Arrays.stream(types).forEach(this::createTable);
+        Arrays.stream(types).forEach(this::emptyTable);
     }
 }
diff --git a/src/main/java/org/globsframework/sql/annotations/DbFieldIndex.java b/src/main/java/org/globsframework/sql/annotations/DbFieldIndex.java
@@ -19,12 +19,9 @@ public class DbFieldIndex {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbFieldIndex");
-        TYPE = typeBuilder.unCompleteType();
         INDEX = typeBuilder.declareIntegerField("index");
-        typeBuilder.complete();
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-//        GlobTypeLoaderFactory.create(DbFieldIndex.class, "DbFieldIndex")
-//                .load();
     }
 
     public static MutableGlob create(int fieldIndex) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbFieldName.java b/src/main/java/org/globsframework/sql/annotations/DbFieldName.java
@@ -23,14 +23,10 @@ public class DbFieldName {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbFieldName");
-        TYPE = typeBuilder.unCompleteType();
         NAME = typeBuilder.declareStringField("name");
-        typeBuilder.complete();
         typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> create((DbFieldName_) annotation));
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-//        GlobTypeLoaderFactory.create(DbFieldName.class, "DbFieldName")
-//                .register(GlobCreateFromAnnotation.class, annotation -> create((DbFieldName_) annotation))
-//                .load();
     }
 
     private static MutableGlob create(DbFieldName_ annotation) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbIndex.java b/src/main/java/org/globsframework/sql/annotations/DbIndex.java
@@ -37,15 +37,11 @@ public class DbIndex {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbIndex");
-        TYPE = typeBuilder.unCompleteType();
         NAME = typeBuilder.declareStringField("name");
         FIELDS = typeBuilder.declareStringArrayField("fields");
         IS_UNIQUE = typeBuilder.declareBooleanField("isUnique");
-        typeBuilder.complete();
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-
-//        GlobTypeLoaderFactory.create(DbIndex.class, "DbIndex")
-//                .load();
     }
 
     static public Index createIndex(GlobType globType, Glob index) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbIsNullable.java b/src/main/java/org/globsframework/sql/annotations/DbIsNullable.java
@@ -6,6 +6,7 @@
 import org.globsframework.core.metamodel.annotations.GlobCreateFromAnnotation;
 import org.globsframework.core.metamodel.annotations.InitUniqueKey;
 import org.globsframework.core.metamodel.fields.BooleanField;
+import org.globsframework.core.model.Glob;
 import org.globsframework.core.model.Key;
 import org.globsframework.core.model.KeyBuilder;
 import org.globsframework.core.model.MutableGlob;
@@ -15,19 +16,29 @@ public class DbIsNullable {
 
     public static final BooleanField IS_NULLABLE;
 
+    public static Glob nullable() {
+        return nullable;
+    }
+
+    public static Glob notNullable() {
+        return notNullable;
+    }
+
     @InitUniqueKey
     public static final Key KEY;
 
+    public static final Glob nullable;
+
+    public static final Glob notNullable;
+
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbIsNullable");
-        TYPE = typeBuilder.unCompleteType();
         IS_NULLABLE = typeBuilder.declareBooleanField("isNullable");
-        typeBuilder.complete();
         typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> create(true));
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-//        GlobTypeLoaderFactory.create(DbIsNullable.class, "DbIsNullable")
-//                .register(GlobCreateFromAnnotation.class, annotation -> create(true))
-//                .load();
+        nullable = create(true);
+        notNullable = create(false);
     }
 
     public static MutableGlob create(boolean isNullable) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbMaxCharSize.java b/src/main/java/org/globsframework/sql/annotations/DbMaxCharSize.java
@@ -19,12 +19,9 @@ public class DbMaxCharSize {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbMaxCharSize");
-        TYPE = typeBuilder.unCompleteType();
         SIZE = typeBuilder.declareIntegerField("size");
-        typeBuilder.complete();
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-//        GlobTypeLoaderFactory.create(DbMaxCharSize.class, "DbMaxCharSize")
-//                .load();
     }
 
     public static MutableGlob create(int size) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbMinCharSize.java b/src/main/java/org/globsframework/sql/annotations/DbMinCharSize.java
@@ -19,12 +19,9 @@ public class DbMinCharSize {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbMinCharSize");
-        TYPE = typeBuilder.unCompleteType();
         SIZE = typeBuilder.declareIntegerField("size");
-        typeBuilder.complete();
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-//        GlobTypeLoaderFactory.create(DbMinCharSize.class, "DbMinCharSize")
-//                .load();
     }
 
     public static MutableGlob create(int size) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbNumericDigit.java b/src/main/java/org/globsframework/sql/annotations/DbNumericDigit.java
@@ -19,12 +19,9 @@ public class DbNumericDigit {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbNumericDigit");
-        TYPE = typeBuilder.unCompleteType();
         SIZE = typeBuilder.declareIntegerField("size");
-        typeBuilder.complete();
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-//        GlobTypeLoaderFactory.create(DbNumericDigit.class, "DbNumericDigit")
-//                .load();
     }
 
     public static MutableGlob create(int size) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbNumericPrecision.java b/src/main/java/org/globsframework/sql/annotations/DbNumericPrecision.java
@@ -19,13 +19,9 @@ public class DbNumericPrecision {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbNumericPrecision");
-        TYPE = typeBuilder.unCompleteType();
         SIZE = typeBuilder.declareIntegerField("size");
-        typeBuilder.complete();
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-
-//        GlobTypeLoaderFactory.create(DbNumericPrecision.class, "DbNumericPrecision")
-//                .load();
     }
 
     public static MutableGlob create(int size) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbRef.java b/src/main/java/org/globsframework/sql/annotations/DbRef.java
@@ -24,14 +24,10 @@ public class DbRef {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbRef");
-        TYPE = typeBuilder.unCompleteType();
         TO = typeBuilder.declareStringField("to");
-        typeBuilder.complete();
         typeBuilder.register(GlobCreateFromAnnotation.class, DbRef::create);
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
-//        GlobTypeLoaderFactory.create(DbRef.class, "DbRef")
-//                .register(GlobCreateFromAnnotation.class, DbRef::create)
-//                .load();
     }
 
     private static MutableGlob create(Annotation annotation) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbSqlType.java b/src/main/java/org/globsframework/sql/annotations/DbSqlType.java
@@ -19,13 +19,9 @@ public class DbSqlType {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbSqlType");
-        TYPE = typeBuilder.unCompleteType();
         SQL_TYPE = typeBuilder.declareIntegerField("sqlType");
-        typeBuilder.complete();
+        TYPE = typeBuilder.build();
         UNIQUE_KEY = KeyBuilder.newEmptyKey(TYPE);
-
-//        GlobTypeLoaderFactory.create(DbSqlType.class, "DbSqlType")
-//                .load();
     }
 
     public static MutableGlob create(int sqlFieldType) {
diff --git a/src/main/java/org/globsframework/sql/annotations/DbTableName.java b/src/main/java/org/globsframework/sql/annotations/DbTableName.java
@@ -23,15 +23,10 @@ public class DbTableName {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("DbTableName");
-        TYPE = typeBuilder.unCompleteType();
         NAME = typeBuilder.declareStringField("name");
-        typeBuilder.complete();
         typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> create(((DbTableName_) annotation).value()));
+        TYPE = typeBuilder.build();
         UNIQUE_KEY = KeyBuilder.newEmptyKey(TYPE);
-
-//        GlobTypeLoaderFactory.create(DbTableName.class, "DbTableName")
-//                .register(GlobCreateFromAnnotation.class, annotation -> create(((DbTableName_) annotation).value()))
-//                .load();
     }
 
     public static Glob get(Annotations annotations) {
diff --git a/src/main/java/org/globsframework/sql/annotations/IsBigDecimal.java b/src/main/java/org/globsframework/sql/annotations/IsBigDecimal.java
@@ -21,13 +21,13 @@ public class IsBigDecimal {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("IsBigDecimal");
-        TYPE = typeBuilder.unCompleteType();
-        typeBuilder.complete();
+        typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> getUnique());
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
         UNIQUE = TYPE.instantiate();
-        typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> UNIQUE);
-//        GlobTypeLoaderFactory.create(IsBigDecimal.class, "IsBigDecimal")
-//                .register(GlobCreateFromAnnotation.class, annotation -> UNIQUE)
-//                .load();
+    }
+
+    private static Glob getUnique() {
+        return UNIQUE;
     }
 }
diff --git a/src/main/java/org/globsframework/sql/annotations/IsDbKey.java b/src/main/java/org/globsframework/sql/annotations/IsDbKey.java
@@ -21,13 +21,13 @@ public class IsDbKey {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("IsDbKey");
-        TYPE = typeBuilder.unCompleteType();
-        typeBuilder.complete();
+        typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> getUniqueGlob());
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
         UNIQUE_GLOB = TYPE.instantiate();
-        typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> UNIQUE_GLOB);
-//        GlobTypeLoaderFactory.create(IsDbKey.class, "IsDbKey")
-//                .register(GlobCreateFromAnnotation.class, annotation -> UNIQUE_GLOB)
-//                .load();
+    }
+
+    private static Glob getUniqueGlob() {
+        return UNIQUE_GLOB;
     }
 }
diff --git a/src/main/java/org/globsframework/sql/annotations/IsTimestamp.java b/src/main/java/org/globsframework/sql/annotations/IsTimestamp.java
@@ -21,13 +21,13 @@ public class IsTimestamp {
 
     static {
         GlobTypeBuilder typeBuilder = GlobTypeBuilderFactory.create("IsTimestamp");
-        TYPE = typeBuilder.unCompleteType();
-        typeBuilder.complete();
+        typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> getUnique());
+        TYPE = typeBuilder.build();
         KEY = KeyBuilder.newEmptyKey(TYPE);
         UNIQUE = TYPE.instantiate();
-        typeBuilder.register(GlobCreateFromAnnotation.class, annotation -> UNIQUE);
-//        GlobTypeLoaderFactory.create(IsTimestamp.class, "IsTimestamp")
-//                .register(GlobCreateFromAnnotation.class, annotation -> UNIQUE)
-//                .load();
+    }
+
+    private static Glob getUnique() {
+        return UNIQUE;
     }
 }
diff --git a/src/main/java/org/globsframework/sql/constraints/Constraints.java b/src/main/java/org/globsframework/sql/constraints/Constraints.java
@@ -6,6 +6,7 @@
 import org.globsframework.core.utils.exceptions.UnexpectedApplicationState;
 import org.globsframework.sql.constraints.impl.*;
 
+import java.time.LocalDate;
 import java.util.Set;
 
 public class Constraints {
@@ -40,6 +41,10 @@ public static Constraint equalsObject(Field field, Object value) {
         return new EqualConstraint(new FieldOperand(field), new ValueOperand(field, value));
     }
 
+    public static Constraint equals(DateField field, LocalDate localDate) {
+        return new EqualConstraint(new FieldOperand(field), new ValueOperand(field, localDate));
+    }
+
     public static Constraint equalsObject(Field field, Accessor accessor) {
         return new EqualConstraint(new FieldOperand(field), new AccessorOperand(field, accessor));
     }
diff --git a/src/main/java/org/globsframework/sql/exceptions/DbConstraintViolation.java b/src/main/java/org/globsframework/sql/exceptions/DbConstraintViolation.java
diff --git a/src/main/java/org/globsframework/sql/utils/ExtractType.java b/src/main/java/org/globsframework/sql/utils/ExtractType.java
@@ -112,7 +112,7 @@ static public GlobType createFromMetaData(ResultSetMetaData resultSetMetaData) {
                 }
             }
 
-            return globTypeBuilder.get();
+            return globTypeBuilder.build();
         } catch (SQLException e) {
             throw new RuntimeException("Fail to retrieve data from request", e);
         }
diff --git a/src/test/java/org/globsframework/PostgresTestCase.java b/src/test/java/org/globsframework/PostgresTestCase.java
@@ -112,7 +112,7 @@ public void name() throws IOException {
         Glob idDateTime = IsDateTime.TYPE.instantiate();
         LongField f3 = globTypeBuilder.declareLongField("f3", idDateTime);
 
-        GlobType globType = globTypeBuilder.get();
+        GlobType globType = globTypeBuilder.build();
 
         MutableGlob data = globType.instantiate()
                 .set(f1, "ééé")
diff --git a/src/test/java/org/globsframework/sql/drivers/jdbc/SqlSelectQueryTest.java b/src/test/java/org/globsframework/sql/drivers/jdbc/SqlSelectQueryTest.java
diff --git a/src/test/java/org/globsframework/sql/drivers/jdbc/request/SchemaTest.java b/src/test/java/org/globsframework/sql/drivers/jdbc/request/SchemaTest.java
diff --git a/src/test/java/org/globsframework/sql/drivers/oracle/OracleTest.java b/src/test/java/org/globsframework/sql/drivers/oracle/OracleTest.java
diff --git a/src/test/java/org/globsframework/sql/model/DummyObject.java b/src/test/java/org/globsframework/sql/model/DummyObject.java
diff --git a/src/test/java/org/globsframework/sql/model/DummyObject2.java b/src/test/java/org/globsframework/sql/model/DummyObject2.java
diff --git a/src/test/java/org/globsframework/sql/model/DummyObjectWithGlob.java b/src/test/java/org/globsframework/sql/model/DummyObjectWithGlob.java
diff --git a/src/test/java/org/globsframework/sql/model/DummyObjectWithString.java b/src/test/java/org/globsframework/sql/model/DummyObjectWithString.java
diff --git a/src/test/java/org/globsframework/sql/model/DummyWithDateTime.java b/src/test/java/org/globsframework/sql/model/DummyWithDateTime.java

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public GlobType createFrom() {`
`66`	`66`	`if (!completeGlobTypeBuilder()) {`
`67`	`67`	`return null;`
`68`	`68`	`}`
`69`		`- return globTypeBuilder.get();`
	`69`	`+ return globTypeBuilder.build();`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private boolean completeGlobTypeBuilder() {`