Increase visibility of members of Conversions class

Alexandre Dutra · olim7t · commit 072014aac1a8 · 2018-02-15T08:40:59.000-08:00
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/Conversions.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/Conversions.java
@@ -90,9 +90,9 @@
  *
  * <p>The main goal of this class is to move this code out of the request handlers.
  */
-class Conversions {
+public class Conversions {
 
-  static Message toMessage(
+  public static Message toMessage(
       Statement<?> statement, DriverConfigProfile config, InternalDriverContext context) {
     int consistency =
         context
@@ -174,7 +174,7 @@ static Message toMessage(
       }
       List<Object> queriesOrIds = new ArrayList<>(batchStatement.size());
       List<List<ByteBuffer>> values = new ArrayList<>(batchStatement.size());
-      for (BatchableStatement child : batchStatement) {
+      for (BatchableStatement<?> child : batchStatement) {
         if (child instanceof SimpleStatement) {
           SimpleStatement simpleStatement = (SimpleStatement) child;
           if (simpleStatement.getNamedValues().size() > 0) {
@@ -209,7 +209,7 @@ static Message toMessage(
     }
   }
 
-  private static List<ByteBuffer> encode(
+  public static List<ByteBuffer> encode(
       List<Object> values, CodecRegistry codecRegistry, ProtocolVersion protocolVersion) {
     if (values.isEmpty()) {
       return Collections.emptyList();
@@ -222,7 +222,7 @@ private static List<ByteBuffer> encode(
     }
   }
 
-  private static Map<String, ByteBuffer> encode(
+  public static Map<String, ByteBuffer> encode(
       Map<String, Object> values, CodecRegistry codecRegistry, ProtocolVersion protocolVersion) {
     if (values.isEmpty()) {
       return Collections.emptyMap();
@@ -235,7 +235,7 @@ private static Map<String, ByteBuffer> encode(
     }
   }
 
-  private static ByteBuffer encode(
+  public static ByteBuffer encode(
       Object value, CodecRegistry codecRegistry, ProtocolVersion protocolVersion) {
     if (value instanceof Token) {
       if (value instanceof Murmur3Token) {
@@ -252,7 +252,7 @@ private static ByteBuffer encode(
     }
   }
 
-  private static void ensureAllSet(BoundStatement boundStatement) {
+  public static void ensureAllSet(BoundStatement boundStatement) {
     for (int i = 0; i < boundStatement.size(); i++) {
       if (!boundStatement.isSet(i)) {
         throw new IllegalStateException(
@@ -264,15 +264,15 @@ private static void ensureAllSet(BoundStatement boundStatement) {
     }
   }
 
-  private static void ensureAllSet(BatchStatement batchStatement) {
+  public static void ensureAllSet(BatchStatement batchStatement) {
     for (BatchableStatement<?> batchableStatement : batchStatement) {
       if (batchableStatement instanceof BoundStatement) {
         ensureAllSet(((BoundStatement) batchableStatement));
       }
     }
   }
 
-  static AsyncResultSet toResultSet(
+  public static AsyncResultSet toResultSet(
       Result result,
       ExecutionInfo executionInfo,
       CqlSession session,
@@ -292,7 +292,7 @@ static AsyncResultSet toResultSet(
     }
   }
 
-  private static ColumnDefinitions getResultDefinitions(
+  public static ColumnDefinitions getResultDefinitions(
       Rows rows, Statement<?> statement, InternalDriverContext context) {
     RowsMetadata rowsMetadata = rows.getMetadata();
     if (rowsMetadata.columnSpecs.isEmpty()) {
@@ -315,7 +315,7 @@ private static ColumnDefinitions getResultDefinitions(
     }
   }
 
-  static DefaultPreparedStatement toPreparedStatement(
+  public static DefaultPreparedStatement toPreparedStatement(
       Prepared response, PrepareRequest request, InternalDriverContext context) {
     return new DefaultPreparedStatement(
         ByteBuffer.wrap(response.preparedQueryId).asReadOnlyBuffer(),
@@ -336,7 +336,7 @@ static DefaultPreparedStatement toPreparedStatement(
         ImmutableMap.copyOf(request.getCustomPayload()));
   }
 
-  private static ColumnDefinitions toColumnDefinitions(
+  public static ColumnDefinitions toColumnDefinitions(
       RowsMetadata metadata, InternalDriverContext context) {
     ImmutableList.Builder<ColumnDefinition> definitions = ImmutableList.builder();
     for (ColumnSpec columnSpec : metadata.columnSpecs) {
@@ -345,7 +345,7 @@ private static ColumnDefinitions toColumnDefinitions(
     return DefaultColumnDefinitions.valueOf(definitions.build());
   }
 
-  private static List<Integer> asList(int[] pkIndices) {
+  public static List<Integer> asList(int[] pkIndices) {
     if (pkIndices == null || pkIndices.length == 0) {
       return Collections.emptyList();
     } else {
@@ -357,7 +357,7 @@ private static List<Integer> asList(int[] pkIndices) {
     }
   }
 
-  static CoordinatorException toThrowable(
+  public static CoordinatorException toThrowable(
       Node node, Error errorMessage, InternalDriverContext context) {
     switch (errorMessage.code) {
       case ProtocolConstants.ErrorCode.UNPREPARED:

Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,9 @@`
`90`	`90`	`*`
`91`	`91`	`* <p>The main goal of this class is to move this code out of the request handlers.`
`92`	`92`	`*/`
`93`		`-class Conversions {`
	`93`	`+public class Conversions {`
`94`	`94`
`95`		`- static Message toMessage(`
	`95`	`+ public static Message toMessage(`
`96`	`96`	`Statement<?> statement, DriverConfigProfile config, InternalDriverContext context) {`
`97`	`97`	`int consistency =`
`98`	`98`	`context`
`@@ -174,7 +174,7 @@ static Message toMessage(`
`174`	`174`	`}`
`175`	`175`	`List<Object> queriesOrIds = new ArrayList<>(batchStatement.size());`
`176`	`176`	`List<List<ByteBuffer>> values = new ArrayList<>(batchStatement.size());`
`177`		`- for (BatchableStatement child : batchStatement) {`
	`177`	`+ for (BatchableStatement<?> child : batchStatement) {`
`178`	`178`	`if (child instanceof SimpleStatement) {`
`179`	`179`	`SimpleStatement simpleStatement = (SimpleStatement) child;`
`180`	`180`	`if (simpleStatement.getNamedValues().size() > 0) {`
`@@ -209,7 +209,7 @@ static Message toMessage(`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`- private static List<ByteBuffer> encode(`
	`212`	`+ public static List<ByteBuffer> encode(`
`213`	`213`	`List<Object> values, CodecRegistry codecRegistry, ProtocolVersion protocolVersion) {`
`214`	`214`	`if (values.isEmpty()) {`
`215`	`215`	`return Collections.emptyList();`
`@@ -222,7 +222,7 @@ private static List<ByteBuffer> encode(`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`225`		`- private static Map<String, ByteBuffer> encode(`
	`225`	`+ public static Map<String, ByteBuffer> encode(`
`226`	`226`	`Map<String, Object> values, CodecRegistry codecRegistry, ProtocolVersion protocolVersion) {`
`227`	`227`	`if (values.isEmpty()) {`
`228`	`228`	`return Collections.emptyMap();`
`@@ -235,7 +235,7 @@ private static Map<String, ByteBuffer> encode(`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`
`238`		`- private static ByteBuffer encode(`
	`238`	`+ public static ByteBuffer encode(`
`239`	`239`	`Object value, CodecRegistry codecRegistry, ProtocolVersion protocolVersion) {`
`240`	`240`	`if (value instanceof Token) {`
`241`	`241`	`if (value instanceof Murmur3Token) {`
`@@ -252,7 +252,7 @@ private static ByteBuffer encode(`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`- private static void ensureAllSet(BoundStatement boundStatement) {`
	`255`	`+ public static void ensureAllSet(BoundStatement boundStatement) {`
`256`	`256`	`for (int i = 0; i < boundStatement.size(); i++) {`
`257`	`257`	`if (!boundStatement.isSet(i)) {`
`258`	`258`	`throw new IllegalStateException(`
`@@ -264,15 +264,15 @@ private static void ensureAllSet(BoundStatement boundStatement) {`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
`267`		`- private static void ensureAllSet(BatchStatement batchStatement) {`
	`267`	`+ public static void ensureAllSet(BatchStatement batchStatement) {`
`268`	`268`	`for (BatchableStatement<?> batchableStatement : batchStatement) {`
`269`	`269`	`if (batchableStatement instanceof BoundStatement) {`
`270`	`270`	`ensureAllSet(((BoundStatement) batchableStatement));`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`
`275`		`- static AsyncResultSet toResultSet(`
	`275`	`+ public static AsyncResultSet toResultSet(`
`276`	`276`	`Result result,`
`277`	`277`	`ExecutionInfo executionInfo,`
`278`	`278`	`CqlSession session,`
`@@ -292,7 +292,7 @@ static AsyncResultSet toResultSet(`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
`295`		`- private static ColumnDefinitions getResultDefinitions(`
	`295`	`+ public static ColumnDefinitions getResultDefinitions(`
`296`	`296`	`Rows rows, Statement<?> statement, InternalDriverContext context) {`
`297`	`297`	`RowsMetadata rowsMetadata = rows.getMetadata();`
`298`	`298`	`if (rowsMetadata.columnSpecs.isEmpty()) {`
`@@ -315,7 +315,7 @@ private static ColumnDefinitions getResultDefinitions(`
`315`	`315`	`}`
`316`	`316`	`}`
`317`	`317`
`318`		`- static DefaultPreparedStatement toPreparedStatement(`
	`318`	`+ public static DefaultPreparedStatement toPreparedStatement(`
`319`	`319`	`Prepared response, PrepareRequest request, InternalDriverContext context) {`
`320`	`320`	`return new DefaultPreparedStatement(`
`321`	`321`	`ByteBuffer.wrap(response.preparedQueryId).asReadOnlyBuffer(),`
`@@ -336,7 +336,7 @@ static DefaultPreparedStatement toPreparedStatement(`
`336`	`336`	`ImmutableMap.copyOf(request.getCustomPayload()));`
`337`	`337`	`}`
`338`	`338`
`339`		`- private static ColumnDefinitions toColumnDefinitions(`
	`339`	`+ public static ColumnDefinitions toColumnDefinitions(`
`340`	`340`	`RowsMetadata metadata, InternalDriverContext context) {`
`341`	`341`	`ImmutableList.Builder<ColumnDefinition> definitions = ImmutableList.builder();`
`342`	`342`	`for (ColumnSpec columnSpec : metadata.columnSpecs) {`
`@@ -345,7 +345,7 @@ private static ColumnDefinitions toColumnDefinitions(`
`345`	`345`	`return DefaultColumnDefinitions.valueOf(definitions.build());`
`346`	`346`	`}`
`347`	`347`
`348`		`- private static List<Integer> asList(int[] pkIndices) {`
	`348`	`+ public static List<Integer> asList(int[] pkIndices) {`
`349`	`349`	`if (pkIndices == null \|\| pkIndices.length == 0) {`
`350`	`350`	`return Collections.emptyList();`
`351`	`351`	`} else {`
`@@ -357,7 +357,7 @@ private static List<Integer> asList(int[] pkIndices) {`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
`360`		`- static CoordinatorException toThrowable(`
	`360`	`+ public static CoordinatorException toThrowable(`
`361`	`361`	`Node node, Error errorMessage, InternalDriverContext context) {`
`362`	`362`	`switch (errorMessage.code) {`
`363`	`363`	`case ProtocolConstants.ErrorCode.UNPREPARED:`