modify access to protected SQLMetadataConnector methods

extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java

@@ -179,13 +179,13 @@ public RewrittenStatement rewrite(String sql, Binding params, StatementContext c
   }
 
   @Override
-  protected String getPayloadType()
+  public String getPayloadType()
   {
     return PAYLOAD_TYPE;
   }
 
   @Override
-  protected String getSerialType()
+  public String getSerialType()
   {
     return SERIAL_TYPE;
   }
@@ -197,7 +197,7 @@ public String getQuoteString()
   }
 
   @Override
-  protected int getStreamingFetchSize()
+  public int getStreamingFetchSize()
   {
     return DEFAULT_STREAMING_RESULT_SIZE;
   }

extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java

@@ -148,19 +148,19 @@ public MySQLConnector(
   }
 
   @Override
-  protected String getPayloadType()
+  public String getPayloadType()
   {
     return PAYLOAD_TYPE;
   }
 
   @Override
-  protected String getSerialType()
+  public String getSerialType()
   {
     return SERIAL_TYPE;
   }
 
   @Override
-  protected String getCollation()
+  public String getCollation()
   {
     return COLLATION;
   }
@@ -172,7 +172,7 @@ public String getQuoteString()
   }
 
   @Override
-  protected int getStreamingFetchSize()
+  public int getStreamingFetchSize()
   {
     // this is MySQL's way of indicating you want results streamed back
     // see http://dev.mysql.com/doc/connector-j/5.1/en/connector-j-reference-implementation-notes.html

extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java

@@ -121,13 +121,13 @@ public PostgreSQLConnector(
   }
 
   @Override
-  protected String getPayloadType()
+  public String getPayloadType()
   {
     return PAYLOAD_TYPE;
   }
 
   @Override
-  protected String getSerialType()
+  public String getSerialType()
   {
     return SERIAL_TYPE;
   }
@@ -139,7 +139,7 @@ public String getQuoteString()
   }
 
   @Override
-  protected int getStreamingFetchSize()
+  public int getStreamingFetchSize()
   {
     return DEFAULT_STREAMING_RESULT_SIZE;
   }

server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java

@@ -71,14 +71,7 @@ public SQLMetadataConnector(
   {
     this.config = config;
     this.tablesConfigSupplier = tablesConfigSupplier;
-    this.shouldRetry = new Predicate<Throwable>()
-    {
-      @Override
-      public boolean apply(Throwable e)
-      {
-        return isTransientException(e);
-      }
-    };
+    this.shouldRetry = this::isTransientException;
   }
 
   /**
@@ -90,7 +83,7 @@ public boolean apply(Throwable e)
    *
    * @return String representing the SQL type
    */
-  protected String getPayloadType()
+  public String getPayloadType()
   {
     return PAYLOAD_TYPE;
   }
@@ -100,7 +93,7 @@ protected String getPayloadType()
    *
    * @return the collation for the character set
    */
-  protected String getCollation()
+  public String getCollation()
   {
     return COLLATION;
   }
@@ -114,15 +107,15 @@ protected String getCollation()
    *
    * @return String representing the SQL type and auto-increment statement
    */
-  protected abstract String getSerialType();
+  public abstract String getSerialType();
 
   /**
    * Returns the value that should be passed to statement.setFetchSize to ensure results
    * are streamed back from the database instead of fetching the entire result set in memory.
    *
    * @return optimal fetch size to stream results back
    */
-  protected abstract int getStreamingFetchSize();
+  public abstract int getStreamingFetchSize();
 
   /**
    * @return the string that should be used to quote string fields

server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java

@@ -84,7 +84,7 @@ public boolean tableExists(Handle handle, String tableName)
   }
 
   @Override
-  protected String getSerialType()
+  public String getSerialType()
   {
     return SERIAL_TYPE;
   }
@@ -102,7 +102,7 @@ public DBI getDBI()
   }
 
   @Override
-  protected int getStreamingFetchSize()
+  public int getStreamingFetchSize()
   {
     // Derby only supports fetch size of 1
     return 1;

server/src/test/java/org/apache/druid/metadata/SQLMetadataConnectorTest.java

@@ -159,13 +159,13 @@ public TestSQLMetadataConnector(
     }
 
     @Override
-    protected String getSerialType()
+    public String getSerialType()
     {
       return null;
     }
 
     @Override
-    protected int getStreamingFetchSize()
+    public int getStreamingFetchSize()
     {
       return 0;
     }