chore: move generator into jdbc package (#2055)

Author: olavloite

clirr-ignored-differences.xml

@@ -123,4 +123,8 @@
     <className>com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection</className>
     <method>com.google.cloud.spanner.DatabaseId getDatabaseId()</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/spanner/connection/ConnectionPropertiesHelper</className>
+  </difference>
 </differences>

pom.xml

@@ -351,7 +351,7 @@
               <goal>java</goal>
             </goals>
             <configuration>
-              <mainClass>com.google.cloud.spanner.connection.ConnectionPropertiesFileGenerator</mainClass>
+              <mainClass>com.google.cloud.spanner.jdbc.ConnectionPropertiesFileGenerator</mainClass>
               <classpathScope>test</classpathScope>
               <skip>false</skip>
             </configuration>

…nnection/ConnectionPropertiesHelper.java …ner/jdbc/ConnectionPropertiesHelper.javasrc/main/java/com/google/cloud/spanner/connection/ConnectionPropertiesHelper.java renamed to src/main/java/com/google/cloud/spanner/jdbc/ConnectionPropertiesHelper.java src/main/java/com/google/cloud/spanner/connection/ConnectionPropertiesHelper.java renamed to src/main/java/com/google/cloud/spanner/jdbc/ConnectionPropertiesHelper.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.cloud.spanner.connection;
+package com.google.cloud.spanner.jdbc;
 
-import com.google.api.core.InternalApi;
+import com.google.cloud.spanner.connection.ConnectionProperties;
+import com.google.cloud.spanner.connection.ConnectionProperty;
 import com.google.common.collect.ImmutableList;
 import java.sql.DriverPropertyInfo;
 import java.util.Arrays;
@@ -26,16 +27,14 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-// TODO: Remove this class when the Connection API has made the list of properties public.
-@InternalApi
-public class ConnectionPropertiesHelper {
-  public static ImmutableList<ConnectionProperty<?>> VALID_CONNECTION_PROPERTIES =
+class ConnectionPropertiesHelper {
+  static ImmutableList<ConnectionProperty<?>> VALID_CONNECTION_PROPERTIES =
       ImmutableList.copyOf(
-          ConnectionProperties.CONNECTION_PROPERTIES.values().stream()
+          ConnectionProperties.VALID_CONNECTION_PROPERTIES.stream()
               .sorted(Comparator.comparing(ConnectionProperty::getName))
               .collect(Collectors.toList()));
 
-  public static DriverPropertyInfo toDriverPropertyInfo(
+  static DriverPropertyInfo toDriverPropertyInfo(
       String connectionUri, ConnectionProperty<?> connectionProperty) {
     DriverPropertyInfo result =
         new DriverPropertyInfo(
@@ -56,7 +55,7 @@ public static DriverPropertyInfo toDriverPropertyInfo(
     return result;
   }
 
-  public static String getConnectionPropertyName(ConnectionProperty<?> connectionProperty) {
+  static String getConnectionPropertyName(ConnectionProperty<?> connectionProperty) {
     return connectionProperty.getName();
   }
 

src/main/java/com/google/cloud/spanner/jdbc/JdbcDriver.java

@@ -23,7 +23,6 @@
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.connection.ConnectionOptions;
 import com.google.cloud.spanner.connection.ConnectionOptionsHelper;
-import com.google.cloud.spanner.connection.ConnectionPropertiesHelper;
 import com.google.cloud.spanner.connection.ConnectionProperty;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Suppliers;

…n/ConnectionPropertiesFileGenerator.java …c/ConnectionPropertiesFileGenerator.javasrc/test/java/com/google/cloud/spanner/connection/ConnectionPropertiesFileGenerator.java renamed to src/test/java/com/google/cloud/spanner/jdbc/ConnectionPropertiesFileGenerator.java src/test/java/com/google/cloud/spanner/connection/ConnectionPropertiesFileGenerator.java renamed to src/test/java/com/google/cloud/spanner/jdbc/ConnectionPropertiesFileGenerator.java

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.cloud.spanner.connection;
+package com.google.cloud.spanner.jdbc;
 
+import com.google.cloud.spanner.connection.ConnectionProperty;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;

src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java

@@ -26,7 +26,6 @@
 
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.spanner.MockSpannerServiceImpl;
-import com.google.cloud.spanner.connection.ConnectionPropertiesHelper;
 import com.google.cloud.spanner.connection.SpannerPool;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;