Feature/126 add new hashtype functions (#133)

* #126: added new HASHTYPE_* functions
* #126: added changelog, updated dependencies

Author: AnastasiiaSergienko

doc/changes/changelog.md

@@ -1,3 +1,4 @@
 # Changes
 
-* [10.1.0](changes-10.1.0.md)
+* [10.1.0](changes-10.1.0.md)
+* [10.2.0](changes-10.2.0.md)

doc/changes/changes-10.2.0.md

@@ -0,0 +1,15 @@
+# Virtual Schema Common Java 10.2.0, released 2020.07.28
+
+## Features / Enhancements
+
+* #126: Added capabilities for new scalar functions HASHTYPE_*. 
+
+## Dependency updates
+
+* Added `org.junit.jupiter:junit-jupiter:5.6.2`
+* Updated `org.junit.jupiter:junit-jupiter-engine` from 5.6.1 to 5.6.2
+* Updated `org.mockito:mockito-junit-jupiter` from 3.3.3 to 3.4.4
+* Removed `org.junit.jupiter:junit-jupiter-engine`
+* Removed `org.junit.jupiter:junit-jupiter-params`
+* Removed `org.junit.platform:junit-platform-runner`
+* Removed `org.mockito:mockito-core`

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.exasol</groupId>
     <artifactId>virtual-schema-common-java</artifactId>
-    <version>10.1.0</version>
+    <version>10.2.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.
@@ -14,8 +14,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>11</java.version>
-        <junit.version>5.6.2</junit.version>
-        <maven.surefire.version>3.0.0-M4</maven.surefire.version>
         <gpg.skip>true</gpg.skip>
     </properties>
     <licenses>
@@ -89,32 +87,14 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>1.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>3.3.3</version>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.6.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>3.3.3</version>
+            <version>3.4.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -163,7 +143,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
+                <version>3.0.0-M4</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

src/main/java/com/exasol/adapter/capabilities/ScalarFunctionCapability.java

@@ -32,8 +32,9 @@ public enum ScalarFunctionCapability {
 
     BIT_AND, BIT_CHECK, BIT_NOT, BIT_OR, BIT_SET, BIT_TO_NUM, BIT_XOR,
 
-    CASE, CURRENT_SCHEMA, CURRENT_SESSION, CURRENT_STATEMENT, CURRENT_USER, HASH_MD5, HASH_SHA, HASH_SHA1, HASH_SHA256,
-    HASH_SHA512, HASH_TIGER, NULLIFZERO, SYS_GUID, ZEROIFNULL, JSON_VALUE, SESSION_PARAMETER;
+    CASE, CURRENT_SCHEMA, CURRENT_SESSION, CURRENT_STATEMENT, CURRENT_USER, HASH_MD5, HASHTYPE_MD5, HASH_SHA, HASH_SHA1,
+    HASHTYPE_SHA1, HASH_SHA256, HASHTYPE_SHA256, HASH_SHA512, HASHTYPE_SHA512, HASH_TIGER, HASHTYPE_TIGER, NULLIFZERO,
+    SYS_GUID, ZEROIFNULL, JSON_VALUE, SESSION_PARAMETER;
 
     public ScalarFunction getFunction() {
         return ScalarFunction.valueOf(name());

src/main/java/com/exasol/adapter/sql/ScalarFunction.java

@@ -29,8 +29,9 @@ CURRENT_TIMESTAMP, DATE_TRUNC, DAY, DAYS_BETWEEN, DBTIMEZONE, EXTRACT(false), HO
 
     BIT_AND, BIT_CHECK, BIT_NOT, BIT_OR, BIT_SET, BIT_TO_NUM, BIT_XOR, //
 
-    CASE(false), CURRENT_SCHEMA, CURRENT_SESSION, CURRENT_STATEMENT, CURRENT_USER, HASH_MD5, HASH_SHA, HASH_SHA1,
-    HASH_SHA256, HASH_SHA512, HASH_TIGER, NULLIFZERO, SYS_GUID, ZEROIFNULL, JSON_VALUE, SESSION_PARAMETER;
+    CASE(false), CURRENT_SCHEMA, CURRENT_SESSION, CURRENT_STATEMENT, CURRENT_USER, HASH_MD5, HASHTYPE_MD5, HASH_SHA,
+    HASH_SHA1, HASHTYPE_SHA1, HASH_SHA256, HASHTYPE_SHA256, HASH_SHA512, HASHTYPE_SHA512, HASH_TIGER, HASHTYPE_TIGER,
+    NULLIFZERO, SYS_GUID, ZEROIFNULL, JSON_VALUE, SESSION_PARAMETER;
 
     private final boolean isSimple;
 

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

@@ -1,8 +1,8 @@
 package com.exasol.adapter;
 
-import static org.hamcrest.Matchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.Matchers.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.*;
 

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

@@ -1,8 +1,8 @@
 package com.exasol.adapter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.startsWith;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
@@ -43,7 +43,7 @@ class RequestDispatcherTest {
 
     @BeforeEach
     void beforeEach() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
         AdapterRegistry.getInstance().registerAdapterFactory(MOCKADAPTER,
                 new MockInjectingAdapterFactory(this.adapterMock));
     }

src/test/java/com/exasol/adapter/capabilities/AggregateFunctionCapabilityTest.java

@@ -1,9 +1,10 @@
 package com.exasol.adapter.capabilities;
 
-import com.exasol.adapter.sql.AggregateFunction;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import com.exasol.adapter.sql.AggregateFunction;
 
 class AggregateFunctionCapabilityTest {
     @Test
@@ -15,7 +16,7 @@ void testIfThereAreFunctionsWhereCapabilitiesMissing() {
                     foundCap = true;
                 }
             }
-            assertTrue("Did not find a capability for function " + func.name(), foundCap);
+            assertTrue(foundCap, "Did not find a capability for function " + func.name());
         }
     }
 

src/test/java/com/exasol/adapter/capabilities/PredicateCapabilityTest.java

@@ -1,9 +1,10 @@
 package com.exasol.adapter.capabilities;
 
-import com.exasol.adapter.sql.Predicate;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import com.exasol.adapter.sql.Predicate;
 
 class PredicateCapabilityTest {
     @Test
@@ -15,7 +16,7 @@ void testIfThereArePredicatesWhereCapabilitiesMissing() {
                     foundCap = true;
                 }
             }
-            assertTrue("Did not find a capability for predicate " + pred.name(), foundCap);
+            assertTrue(foundCap, "Did not find a capability for predicate " + pred.name());
         }
     }
 

src/test/java/com/exasol/adapter/capabilities/ScalarFunctionCapabilityTest.java

@@ -1,10 +1,11 @@
 package com.exasol.adapter.capabilities;
 
-import com.exasol.adapter.sql.ScalarFunction;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import com.exasol.adapter.sql.ScalarFunction;
 
 class ScalarFunctionCapabilityTest {
     @Test
@@ -17,7 +18,7 @@ void testCompleteness() {
                     foundCap = true;
                 }
             }
-            assertTrue("Did not find a capability for function " + function.name(), foundCap);
+            assertTrue(foundCap, "Did not find a capability for function " + function.name());
         }
     }
 
@@ -27,5 +28,4 @@ void testConsistentNaming() {
             assertEquals(cap.name(), cap.getFunction().name());
         }
     }
-
 }