Rethinking QuotingStrategy to remove dependency on the ORM model...

cleanup

Author: andrus

cayenne/src/main/java/org/apache/cayenne/dba/DbAdapter.java

@@ -26,7 +26,6 @@
 import org.apache.cayenne.access.translator.procedure.ProcedureTranslator;
 import org.apache.cayenne.access.translator.select.SelectTranslator;
 import org.apache.cayenne.access.types.ExtendedTypeMap;
-import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
@@ -304,14 +303,10 @@ default int preferredBindingType(int jdbcType) {
      *
      * @since 5.0
      */
-    default QuotingStrategy getQuotingStrategy(DbEntity entity) {
-        DataMap dataMap = entity != null ? entity.getDataMap() : null;
-        return dataMap != null && dataMap.isQuotingSQLIdentifiers() ? getQuotingStrategy() : QuotingStrategy.NONE;
-    }
+    QuotingStrategy getQuotingStrategy(DbEntity entity);
 
     /**
-     * Allows the users to get access to the adapter decorated by a given
-     * adapter.
+     * Allows the users to get access to the adapter decorated by a given adapter.
      *
      * @since 4.0
      */

cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java

@@ -38,6 +38,7 @@
 import org.apache.cayenne.configuration.RuntimeProperties;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.log.JdbcEventLogger;
+import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbJoin;
@@ -709,6 +710,12 @@ public QuotingStrategy getQuotingStrategy() {
         return quotingStrategy;
     }
 
+    @Override
+    public QuotingStrategy getQuotingStrategy(DbEntity entity) {
+        DataMap dataMap = entity != null ? entity.getDataMap() : null;
+        return dataMap != null && dataMap.isQuotingSQLIdentifiers() ? quotingStrategy : QuotingStrategy.NONE;
+    }
+
     /**
      * Simply returns this, as JdbcAdapter is not a wrapper.
      *