Remove assert against "ASYNCDB key mismatch"

jaxdb · Sep 6, 2023 · a68b49c · a68b49c
1 parent aa587fa
commit a68b49c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 43 deletions.
diff --git a/ddlx/src/main/java/org/jaxdb/ddlx/Generator.java b/ddlx/src/main/java/org/jaxdb/ddlx/Generator.java
@@ -58,11 +58,10 @@ public final class Generator {
   }
 
   private static void trapPrintUsage() {
-    final String vendors = ArrayUtil.toString(DbVendor.values(), "|");
     System.err.println("Usage: Generator <-d DEST_DIR> <-v VENDOR> <SCHEMA.ddlx>");
     System.err.println();
     System.err.println("Mandatory arguments:");
-    System.err.println("  -v <VENDOR>        One of: <" + vendors + ">");
+    System.err.println("  -v <VENDOR>        One of: <" + ArrayUtil.toString(DbVendor.values(), "|") + ">");
     System.err.println("  -d <DEST_DIR>      Specify the destination directory.");
     System.exit(1);
   }

diff --git a/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/CachingTest.java b/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/CachingTest.java
@@ -43,7 +43,7 @@
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-public abstract class CachingTest {
+abstract class CachingTest {
   private static final int sleepCascade = 5;
 
   static final int iterations = 8;

diff --git a/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/ThrowingIntBooleanConsumer.java b/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/ThrowingIntBooleanConsumer.java
@@ -20,7 +20,7 @@
 import org.libj.util.function.Throwing;
 
 @FunctionalInterface
-public interface ThrowingIntBooleanConsumer<E extends Throwable> extends IntBooleanConsumer {
+interface ThrowingIntBooleanConsumer<E extends Throwable> extends IntBooleanConsumer {
   @Override
   default void accept(final int v1, final boolean v2) {
     try {

diff --git a/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/ThrowingIntConsumer.java b/jaxdb-maven-plugin/src/test/java/org/jaxdb/jsql/ThrowingIntConsumer.java
@@ -21,7 +21,7 @@
 import org.libj.util.function.Throwing;
 
 @FunctionalInterface
-public interface ThrowingIntConsumer<E extends Throwable> extends IntConsumer {
+interface ThrowingIntConsumer<E extends Throwable> extends IntConsumer {
   @Override
   default void accept(final int v1) {
     try {

diff --git a/jsql/src/main/java/org/jaxdb/jsql/Schema.java b/jsql/src/main/java/org/jaxdb/jsql/Schema.java
@@ -154,13 +154,4 @@ OnNotifyCallbackList getSession(final String sessionId) {
     if (logger.isTraceEnabled()) logger.trace(getClass().getSimpleName() + ".getSession(" + sessionId + "): " + ObjectUtil.simpleIdentityString(onNotifyCallbackList));
     return onNotifyCallbackList;
   }
-
-  // FIXME: Remove this when confidence is high
-  static data.Key assertKey(final data.Key k1, final data.Key k2) {
-    if (k1.equals(k2))
-      return k1;
-
-    if (logger.isErrorEnabled()) logger.error("ASYNCDB key mismatch: " + k1 + " " + k2, new Exception());
-    return k2;
-  }
 }
diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/KeyModels.java b/jsql/src/main/java/org/jaxdb/jsql/generator/KeyModels.java
@@ -37,6 +37,7 @@ class KeyModel {
     private final String fromArgs;
     private final String toArgs;
 
+    @SuppressWarnings("unchecked")
     private final LinkedHashSet<String>[] resets = new LinkedHashSet[] {new LinkedHashSet<>(), new LinkedHashSet<>()};
 
     private KeyModel(final String singletonInstanceName, final String cacheMethodName, final String toTableRefName, final ColumnModels columns, final IndexType indexType) {
@@ -88,24 +89,10 @@ private KeyModel(final String singletonInstanceName, final String cacheMethodNam
     }
 
     void writeReset(final StringBuilder b, final CurOld curlOld) {
-      for (final String reset : this.resets[curlOld.ordinal()])
+      for (final String reset : resets[curlOld.ordinal()])
         b.append("\n            ").append(reset);
     }
 
-    void audit() {
-//      if (this.declare[0] != null && !this.declareCalled[0])
-//        throw new IllegalStateException();
-
-//      if (this.declare[1] != null && !this.declareCalled[1])
-//        throw new IllegalStateException();
-
-//      if (this.reset[0] != null && !this.resetCalled[0])
-//        throw new IllegalStateException();
-
-//      if (this.reset[1] != null && !this.resetCalled[1])
-//        throw new IllegalStateException();
-    }
-
     String keyArgsExternal(final HashSet<String> declared) {
       if (keyArgs == null)
         return null;
@@ -144,15 +131,10 @@ String keyRefArgsInternal(final String cacheSingletonName, final String cacheMet
       if (!declared.add(cacheColumnsRef + ":" + args))
         return null;
 
-      final String key = data.Key.class.getCanonicalName() + ".with(" + cacheColumnsRef + ", " + args + ")";
-
-//      if (isForeign)
-//        return key;
-
       final String args2 = keyClauseValues.replace("{1}.this.", "").replace("{2}", curlOld.toString());
       final String args3 = args2.replace(".get" + curlOld, "").replace("()", "_").replace(", ", "");
       final String name = "_" + ColumnModels.getInstanceNameForCache(cacheMethodName, args3) + "ON_" + toTableRefName + curlOld + "_Key$";
-      return "assertKey(" + (addSelfRef ? "self." : "") + include(cacheColumnsRef, name, args2, curlOld) + ", " + key + ")";
+      return (addSelfRef ? "self." : "") + include(cacheColumnsRef, name, args2, curlOld);
     }
 
     @Override

diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/TableModel.java b/jsql/src/main/java/org/jaxdb/jsql/generator/TableModel.java
@@ -1386,14 +1386,6 @@ String makeTable() {
     }
 
     out.append("  }");
-
-    // Audit
-    for (final Map.Entry<ColumnModels,Relations<Relation>> entry : columnsToRelations.entrySet()) { // [S]
-      for (final Relation relation : entry.getValue()) { // [S]
-        relation.keyModel.audit();
-      }
-    }
-
     return out.toString();
   }