Feature/query microservices (#9)

* bumped release version

* bumped versions for some modules

* Updated with latest changes from main/integration

* Added qualifier for cache inspector factory

* Implemented authorization and query federation for the query microservices

Author: jwomeara

client/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>4.0.4</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-client</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <scm>
         <connection>scm:git:https://github.com/NationalSecurityAgency/datawave-hazelcast-service.git</connection>
@@ -18,7 +18,7 @@
     </scm>
     <properties>
         <version.hazelcast-kubernetes>2.2.3</version.hazelcast-kubernetes>
-        <version.microservice.hazelcast>3.0.0</version.microservice.hazelcast>
+        <version.microservice.hazelcast>4.0.0-SNAPSHOT</version.microservice.hazelcast>
     </properties>
     <dependencyManagement>
         <dependencies>

common/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>4.0.4</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-common</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <scm>
         <connection>scm:git:https://github.com/NationalSecurityAgency/datawave-hazelcast-service.git</connection>
@@ -17,7 +17,7 @@
         <url>https://github.com/NationalSecurityAgency/datawave-hazelcast-service</url>
     </scm>
     <properties>
-        <version.microservice.starter>3.0.0</version.microservice.starter>
+        <version.microservice.starter>4.0.0-SNAPSHOT</version.microservice.starter>
     </properties>
     <dependencies>
         <dependency>

common/src/main/java/datawave/microservice/cached/CacheInspectorConfiguration.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.function.Function;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
@@ -18,6 +19,7 @@
 public class CacheInspectorConfiguration {
 
     @Bean
+    @Qualifier("cacheInspectorFactory")
     public Function<CacheManager,CacheInspector> cacheInspectorFactory() {
         return cacheManager -> {
             if (cacheManager instanceof HazelcastCacheManager)

common/src/test/java/datawave/microservice/cached/HazelcastCacheInspectorTest.java

@@ -1,6 +1,7 @@
 package datawave.microservice.cached;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.List;
@@ -11,10 +12,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.test.annotation.DirtiesContext;
@@ -23,18 +24,22 @@
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.spring.cache.HazelcastCacheManager;
+
+import datawave.autoconfigure.DatawaveCacheAutoConfiguration;
 
 @DirtiesContext
-@EnableCaching
 @ExtendWith(SpringExtension.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = HazelcastCacheInspectorTest.InspectorConfiguration.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
+                classes = {HazelcastCacheInspectorTest.InspectorConfiguration.class, DatawaveCacheAutoConfiguration.class})
 public class HazelcastCacheInspectorTest {
     private static final String CACHE_NAME = "cacheinspector-test";
 
     @Autowired
     private CacheManager cacheManager;
 
     @Autowired
+    @Qualifier("cacheInspectorFactory")
     private Function<CacheManager,CacheInspector> cacheInspectorFactory;
 
     private CacheInspector cacheInspector;
@@ -55,6 +60,11 @@ public void setup() {
         cache.put("key5", "value5");
     }
 
+    @Test
+    public void testCacheManagerType() {
+        assertTrue(cacheManager instanceof HazelcastCacheManager);
+    }
+    
     @Test
     public void testGet() {
         String value = cacheInspector.list(CACHE_NAME, String.class, "key3a");

pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-parent</artifactId>
-        <version>3.0.4</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../../microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-service-parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <modules>

service/pom.xml

@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>4.0.4</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>hazelcast-service</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <description>DATAWAVE Hazelcast Server</description>
     <url>https://code.nsa.gov/datawave-hazelcast-service</url>
     <scm>
@@ -20,7 +20,7 @@
     <properties>
         <start-class>datawave.microservice.cached.server.HazelcastService</start-class>
         <version.hazelcast-kubernetes>2.2.3</version.hazelcast-kubernetes>
-        <version.microservice.hazelcast-common>3.0.0</version.microservice.hazelcast-common>
+        <version.microservice.hazelcast-common>4.0.0-SNAPSHOT</version.microservice.hazelcast-common>
         <version.zookeeper>3.8.0</version.zookeeper>
     </properties>
     <dependencyManagement>