Report driver version in metadata

src/main/java/software/aws/neptune/NeptuneDatabaseMetadata.java

@@ -16,12 +16,11 @@
 
 package software.aws.neptune;
 
-import software.aws.neptune.jdbc.Connection;
 import software.aws.neptune.jdbc.DatabaseMetaData;
 import java.sql.SQLException;
 
 public class NeptuneDatabaseMetadata extends DatabaseMetaData implements java.sql.DatabaseMetaData {
-    private final Connection connection;
+    private static final String DRIVER_NAME = "Amazon Neptune JDBC";
 
     /**
      * NeptuneDatabaseMetadata constructor, initializes super class.
@@ -30,7 +29,6 @@ public class NeptuneDatabaseMetadata extends DatabaseMetaData implements java.sq
      */
     public NeptuneDatabaseMetadata(final java.sql.Connection connection) {
         super(connection);
-        this.connection = (Connection) connection;
     }
 
     @Override
@@ -55,6 +53,6 @@ public String getCatalogSeparator() throws SQLException {
 
     @Override
     public String getDriverName() {
-        return connection.getDriverName();
+        return DRIVER_NAME;
     }
 }

src/main/java/software/aws/neptune/gremlin/GremlinConnection.java

@@ -56,9 +56,4 @@ public DatabaseMetaData getMetaData() {
     public QueryExecutor getQueryExecutor() throws SQLException {
         return new GremlinQueryExecutor(getGremlinConnectionProperties());
     }
-
-    @Override
-    public String getDriverName() {
-        return "neptune:gremlin";
-    }
 }

src/main/java/software/aws/neptune/gremlin/sql/SqlGremlinConnection.java

@@ -50,9 +50,4 @@ public DatabaseMetaData getMetaData() {
     public QueryExecutor getQueryExecutor() throws SQLException {
         return new SqlGremlinQueryExecutor(getGremlinConnectionProperties());
     }
-
-    @Override
-    public String getDriverName() {
-        return "neptune:sqlgremlin";
-    }
 }

src/main/java/software/aws/neptune/jdbc/Connection.java

@@ -71,13 +71,6 @@ protected Connection(@NonNull final ConnectionProperties connectionProperties) t
      */
     public abstract QueryExecutor getQueryExecutor() throws SQLException;
 
-    /**
-     * Function to get Driver name as a String.
-     *
-     * @return Driver name as String.
-     */
-    public abstract String getDriverName();
-
     protected ConnectionProperties getConnectionProperties() {
         return this.connectionProperties;
     }

src/main/java/software/aws/neptune/jdbc/DatabaseMetaData.java

@@ -78,7 +78,7 @@ public int getDriverMinorVersion() {
 
     @Override
     public String getDriverVersion() {
-        return Driver.DRIVER_VERSION;
+        return Driver.DRIVER_FULL_VERSION;
     }
 
     @Override

src/main/java/software/aws/neptune/jdbc/Driver.java

@@ -20,6 +20,8 @@
 import software.aws.neptune.jdbc.utilities.SqlError;
 import software.aws.neptune.jdbc.utilities.SqlState;
 import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.management.ManagementFactory;
 import java.nio.charset.StandardCharsets;
@@ -36,18 +38,32 @@
 public abstract class Driver implements java.sql.Driver {
     public static final int DRIVER_MAJOR_VERSION;
     public static final int DRIVER_MINOR_VERSION;
-    public static final String DRIVER_VERSION;
-    public static final String APP_NAME_SUFFIX;
+    public static final String DRIVER_FULL_VERSION;
     public static final String APPLICATION_NAME;
+    private static final String PROPERTIES_PATH = "/project.properties";
+    private static final String MAJOR_VERSION_KEY = "driver.major.version";
+    private static final String MINOR_VERSION_KEY = "driver.minor.version";
+    private static final String FULL_VERSION_KEY = "driver.full.version";
     private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(Driver.class);
 
     static {
+        int majorVersion = 0;
+        int minorVersion = 0;
+        String fullVersion = "";
+        try (InputStream input = Driver.class.getResourceAsStream(PROPERTIES_PATH)) {
+            final Properties properties = new Properties();
+            properties.load(input);
+            majorVersion = Integer.parseInt(properties.getProperty(MAJOR_VERSION_KEY));
+            minorVersion = Integer.parseInt(properties.getProperty(MINOR_VERSION_KEY));
+            fullVersion = properties.getProperty(FULL_VERSION_KEY);
+        } catch (IOException e) {
+            LOGGER.error("Error loading driver version: ", e);
+        }
+
+        DRIVER_MAJOR_VERSION = majorVersion;
+        DRIVER_MINOR_VERSION = minorVersion;
+        DRIVER_FULL_VERSION = fullVersion;
         APPLICATION_NAME = getApplicationName();
-        // TODO: Get driver version, suffix
-        DRIVER_MAJOR_VERSION = 1;
-        DRIVER_MINOR_VERSION = 1;
-        APP_NAME_SUFFIX = "TODO";
-        DRIVER_VERSION = "0.0.0";
     }
 
     /**
@@ -101,15 +117,14 @@ public java.sql.DriverPropertyInfo[] getPropertyInfo(final String url, final Pro
         return new java.sql.DriverPropertyInfo[0];
     }
 
-    // TODO: Fix functions below.
     @Override
     public int getMajorVersion() {
-        return 0;
+        return DRIVER_MAJOR_VERSION;
     }
 
     @Override
     public int getMinorVersion() {
-        return 0;
+        return DRIVER_MINOR_VERSION;
     }
 
     @Override

src/main/java/software/aws/neptune/opencypher/OpenCypherConnection.java

@@ -56,9 +56,4 @@ public DatabaseMetaData getMetaData() {
     public QueryExecutor getQueryExecutor() throws SQLException {
         return new OpenCypherQueryExecutor(getOpenCypherConnectionProperties());
     }
-
-    @Override
-    public String getDriverName() {
-        return "neptune:opencypher";
-    }
 }

src/main/java/software/aws/neptune/sparql/SparqlConnection.java

@@ -53,9 +53,4 @@ public DatabaseMetaData getMetaData() throws SQLException {
     public QueryExecutor getQueryExecutor() throws SQLException {
         return new SparqlQueryExecutor(getSparqlConnectionProperties());
     }
-
-    @Override
-    public String getDriverName() {
-        return "neptune:sparql";
-    }
 }

src/test/java/software/aws/neptune/NeptuneDriverTestBase.java

@@ -19,11 +19,15 @@
 import com.google.common.collect.ImmutableList;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import software.aws.neptune.jdbc.Driver;
 import software.aws.neptune.jdbc.helpers.HelperFunctions;
 import software.aws.neptune.jdbc.utilities.AuthScheme;
 import software.aws.neptune.jdbc.utilities.SqlError;
 import software.aws.neptune.opencypher.OpenCypherConnection;
 import software.aws.neptune.opencypher.mock.MockOpenCypherDatabase;
+
+import java.io.IOException;
+import java.io.InputStream;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.List;
@@ -32,6 +36,10 @@
 public abstract class NeptuneDriverTestBase {
     private static MockOpenCypherDatabase database;
     private static String validEndpoint;
+    private static final String PROPERTIES_PATH = "/project.properties";
+    private static final String MAJOR_VERSION_KEY = "driver.major.version";
+    private static final String MINOR_VERSION_KEY = "driver.minor.version";
+    private static final String FULL_VERSION_KEY = "driver.full.version";
     private final List<String> invalidUrls = ImmutableList.of(
             "jbdc:neptune:opencyher://;", "jdbc:netune:opencyher://;", "jdbc:neptune:openyher://;",
             "jdbc:neptune:opencyher//;", "jdbc:neptune:opencypher:/");
@@ -136,4 +144,20 @@ void testDriverManagerGetDriver(final boolean useEncryption) throws SQLException
     void testDriverProperties() {
         HelperFunctions.expectFunctionThrows(SqlError.FEATURE_NOT_SUPPORTED, () -> driver.getParentLogger());
     }
+
+    @Test
+    void testDriverVersion() {
+        try (InputStream input = Driver.class.getResourceAsStream(PROPERTIES_PATH)) {
+            final Properties properties = new Properties();
+            properties.load(input);
+            Assertions.assertEquals(driver.getMajorVersion(), Integer.parseInt(properties.getProperty(MAJOR_VERSION_KEY)));
+            Assertions.assertEquals(driver.getMinorVersion(), Integer.parseInt(properties.getProperty(MINOR_VERSION_KEY)));
+
+            // Ensure the version did not default
+            Assertions.assertNotEquals(driver.getMajorVersion(), 0);
+            Assertions.assertTrue(properties.containsKey(FULL_VERSION_KEY));
+        } catch (IOException e) {
+            Assertions.fail(e.getMessage());
+        }
+    }
 }

src/test/java/software/aws/neptune/jdbc/DatabaseMetaDataTest.java

@@ -192,7 +192,7 @@ void testDriverVersion() {
                 .expectFunctionDoesntThrow(() -> databaseMetaData.getDriverMajorVersion(), Driver.DRIVER_MAJOR_VERSION);
         HelperFunctions
                 .expectFunctionDoesntThrow(() -> databaseMetaData.getDriverMinorVersion(), Driver.DRIVER_MINOR_VERSION);
-        HelperFunctions.expectFunctionDoesntThrow(() -> databaseMetaData.getDriverVersion(), Driver.DRIVER_VERSION);
+        HelperFunctions.expectFunctionDoesntThrow(() -> databaseMetaData.getDriverVersion(), Driver.DRIVER_FULL_VERSION);
     }
 
     @Test

src/test/java/software/aws/neptune/jdbc/mock/MockConnection.java

@@ -43,11 +43,6 @@ public QueryExecutor getQueryExecutor() {
         return new MockQueryExecutor();
     }
 
-    @Override
-    public String getDriverName() {
-        return "neptune:mock";
-    }
-
     @Override
     protected void doClose() {
     }