#136: removed deprecated properties CONNECTION_STRING, USERNAME and PASSWORD

Author: AnastasiiaSergienko

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.exasol</groupId>
   <artifactId>virtual-schema-common-java</artifactId>
-  <version>9.0.0</version>
+  <version>10.0.0</version>
   <name>Common module of Exasol Virtual Schemas Adapters</name>
   <description>This is one of the modules of Virtual Schemas Adapters. The libraries provided by this project are the foundation of the adapter development, i.e. adapters must be implemented on top of them.</description>
   <url>https://github.com/exasol/virtual-schema-common-java</url>

src/main/java/com/exasol/adapter/AdapterProperties.java

@@ -15,17 +15,13 @@ public class AdapterProperties extends AbstractAdapterProperties {
     public static final String CATALOG_NAME_PROPERTY = "CATALOG_NAME";
     public static final String SCHEMA_NAME_PROPERTY = "SCHEMA_NAME";
     public static final String CONNECTION_NAME_PROPERTY = "CONNECTION_NAME";
-    public static final String CONNECTION_STRING_PROPERTY = "CONNECTION_STRING";
     public static final String DEBUG_ADDRESS_PROPERTY = "DEBUG_ADDRESS";
     public static final String LOG_LEVEL_PROPERTY = "LOG_LEVEL";
     public static final String SQL_DIALECT_PROPERTY = "SQL_DIALECT";
     public static final String EXCLUDED_CAPABILITIES_PROPERTY = "EXCLUDED_CAPABILITIES";
     public static final String EXCEPTION_HANDLING_PROPERTY = "EXCEPTION_HANDLING";
     public static final String IGNORE_ERRORS_PROPERTY = "IGNORE_ERRORS";
     public static final String IS_LOCAL_PROPERTY = "IS_LOCAL";
-    public static final String USERNAME_PROPERTY = "USERNAME";
-    @SuppressWarnings("squid:S2068") // Sonar mistakes this for a hard-coded credential
-    public static final String PASSWORD_PROPERTY = "PASSWORD";
     public static final String BINARY_COLUMN_HANDLING_PROPERTY = "BINARY_COLUMN_HANDLING";
 
     /**
@@ -64,33 +60,6 @@ public String getConnectionName() {
         return get(CONNECTION_NAME_PROPERTY);
     }
 
-    /**
-     * Get the connection string
-     *
-     * @return connection string
-     */
-    public String getConnectionString() {
-        return get(CONNECTION_STRING_PROPERTY);
-    }
-
-    /**
-     * Get the user name
-     *
-     * @return user name
-     */
-    public String getUsername() {
-        return get(USERNAME_PROPERTY);
-    }
-
-    /**
-     * Get the password
-     *
-     * @return password
-     */
-    public String getPassword() {
-        return get(PASSWORD_PROPERTY);
-    }
-
     /**
      * Get the debug address
      *
@@ -171,10 +140,7 @@ public List<String> getFilteredTables() {
      * @return <code>true</code> if any of the changes makes refreshing the virtual schema necessary
      */
     public static boolean isRefreshingVirtualSchemaRequired(final Map<String, String> changedProperties) {
-        return changedProperties.containsKey(CONNECTION_STRING_PROPERTY) //
-                || changedProperties.containsKey(CONNECTION_NAME_PROPERTY) //
-                || changedProperties.containsKey(USERNAME_PROPERTY) //
-                || changedProperties.containsKey(PASSWORD_PROPERTY) //
+        return  changedProperties.containsKey(CONNECTION_NAME_PROPERTY) //
                 || changedProperties.containsKey(SCHEMA_NAME_PROPERTY) //
                 || changedProperties.containsKey(CATALOG_NAME_PROPERTY) //
                 || changedProperties.containsKey(TABLE_FILTER_PROPERTY)
@@ -204,33 +170,6 @@ public BinaryColumnHandling getBinaryColumnHandling() {
         }
     }
 
-    /**
-     * Check if the username property is set
-     *
-     * @return <code>true</code> if username property is set
-     */
-    public boolean hasUsername() {
-        return containsKey(USERNAME_PROPERTY);
-    }
-
-    /**
-     * Check if the password property is set
-     *
-     * @return <code>true</code> if password property is set
-     */
-    public boolean hasPassword() {
-        return containsKey(PASSWORD_PROPERTY);
-    }
-
-    /**
-     * Check if the connection string property is set
-     *
-     * @return <code>true</code> if connection string property is set
-     */
-    public boolean hasConnectionString() {
-        return containsKey(CONNECTION_STRING_PROPERTY);
-    }
-
     /**
      * Check if the table filter property is set
      *

src/test/java/com/exasol/adapter/AdapterPropertiesTest.java

@@ -1,8 +1,8 @@
 package com.exasol.adapter;
 
 import static com.exasol.adapter.AdapterProperties.*;
-import static org.hamcrest.Matchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.lang.reflect.*;
@@ -31,8 +31,8 @@ void testEmptyProperties() {
     }
 
     @ValueSource(strings = { CATALOG_NAME_PROPERTY, SCHEMA_NAME_PROPERTY, CONNECTION_NAME_PROPERTY,
-            CONNECTION_STRING_PROPERTY, USERNAME_PROPERTY, PASSWORD_PROPERTY, DEBUG_ADDRESS_PROPERTY,
-            LOG_LEVEL_PROPERTY, SQL_DIALECT_PROPERTY, EXCLUDED_CAPABILITIES_PROPERTY, EXCEPTION_HANDLING_PROPERTY })
+            DEBUG_ADDRESS_PROPERTY, LOG_LEVEL_PROPERTY, SQL_DIALECT_PROPERTY, EXCLUDED_CAPABILITIES_PROPERTY,
+            EXCEPTION_HANDLING_PROPERTY })
     @ParameterizedTest
     void testGetStringProperty(final String property) throws IllegalAccessException, IllegalArgumentException,
             InvocationTargetException, NoSuchMethodException, SecurityException {
@@ -55,8 +55,8 @@ void testGetFilteredTables() {
         assertThat(properties.getFilteredTables(), containsInAnyOrder("Table a", "Table B", "TABLE  C", "table d"));
     }
 
-    @ValueSource(strings = { CONNECTION_STRING_PROPERTY, CONNECTION_NAME_PROPERTY, USERNAME_PROPERTY, PASSWORD_PROPERTY,
-            SCHEMA_NAME_PROPERTY, CATALOG_NAME_PROPERTY, TABLE_FILTER_PROPERTY, BINARY_COLUMN_HANDLING_PROPERTY })
+    @ValueSource(strings = { CONNECTION_NAME_PROPERTY, SCHEMA_NAME_PROPERTY, CATALOG_NAME_PROPERTY,
+            TABLE_FILTER_PROPERTY, BINARY_COLUMN_HANDLING_PROPERTY })
     @ParameterizedTest
     void testIsRefreshingVirtualSchemaRequiredTrue(final String propertyName) {
         this.rawProperties.put(propertyName, "");
@@ -120,8 +120,7 @@ void testHasNamedPropertyFalseByDefault(final String propertyName) throws NoSuch
     }
 
     static public Stream<String> getAdapterPropertyNames() {
-        return Arrays.asList(AdapterProperties.class.getDeclaredFields()) //
-                .stream() //
+        return Arrays.stream(AdapterProperties.class.getDeclaredFields()) //
                 .map(Field::getName) //
                 .filter(name -> name.endsWith(PROPERTY_SUFFIX)) //
                 .map(name -> name.replace(PROPERTY_SUFFIX, ""));