0003989: Java versions 11 and 12 should work with SymmetricDS

JumpMind · Jun 5, 2019 · c3e8df5 · c3e8df5
1 parent 0e0e92b
commit c3e8df5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSqlTemplate.java b/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSqlTemplate.java
@@ -21,13 +21,11 @@
 package org.jumpmind.symmetric.android;
 
 import java.sql.Timestamp;
-import java.sql.Types;
 import java.util.Date;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.NotImplementedException;
-import org.jumpmind.db.model.TypeMap;
 import org.jumpmind.db.sql.AbstractSqlTemplate;
 import org.jumpmind.db.sql.ISqlReadCursor;
 import org.jumpmind.db.sql.ISqlResultsListener;
@@ -67,10 +65,10 @@ public byte[] queryForBlob(String sql, Object... params) {
         return queryForObject(sql, byte[].class, params);
     }
 
-    @Override
-    public String queryForClob(String sql, Object... args) {
-        return queryForClob(sql, Types.CLOB, TypeMap.CLOB, args);
-    }
+//    @Override
+//    public String queryForClob(String sql, Object... args) {
+//        return queryForClob(sql, Types.CLOB, TypeMap.CLOB, args);
+//    }
 
     public String queryForClob(String sql, int jdbcTypeCode, String jdbcTypeName, Object... params) {
         return queryForString(sql, params);

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/AbstractJavaDriverSqlTemplate.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/AbstractJavaDriverSqlTemplate.java
@@ -7,20 +7,20 @@ public abstract class AbstractJavaDriverSqlTemplate extends AbstractSqlTemplate
 
 	public abstract String getDatabaseProductName();
 
-	@Override
-	public byte[] queryForBlob(String sql, Object... args) {
-		return null;
-	}
+//	@Override
+//	public byte[] queryForBlob(String sql, Object... args) {
+//		return null;
+//	}
 
 	@Override
 	public byte[] queryForBlob(String sql, int jdbcTypeCode, String jdbcTypeName, Object... args) {
 		return null;
 	}
 
-	@Override
-	public String queryForClob(String sql, Object... args) {
-		return null;
-	}
+//	@Override
+//	public String queryForClob(String sql, Object... args) {
+//		return null;
+//	}
 
 	@Override
 	public String queryForClob(String sql, int jdbcTypeCode, String jdbcTypeName, Object... args) {

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/sql/ISqlTemplate.java b/symmetric-db/src/main/java/org/jumpmind/db/sql/ISqlTemplate.java
@@ -29,13 +29,13 @@
  */
 public interface ISqlTemplate {
 
-    @Deprecated
-    public byte[] queryForBlob(String sql, Object... args);
+//    @Deprecated
+//    public byte[] queryForBlob(String sql, Object... args);
 
     public byte[] queryForBlob(String sql, int jdbcTypeCode, String jdbcTypeName, Object... args);
 
-    @Deprecated
-    public String queryForClob(final String sql, final Object... args);
+//    @Deprecated
+//    public String queryForClob(final String sql, final Object... args);
 
     public String queryForClob(String sql, int jdbcTypeCode, String jdbcTypeName, Object... args);