Merge branch 'ent_v2_cutover' into 'master'

Entitlements v2 cutover

See merge request !41

crs-catalog-core/src/main/java/org/opengroup/osdu/crs/middleware/AuthenticationRequestFilter.java

 package org.opengroup.osdu.crs.middleware;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.opengroup.osdu.core.common.entitlements.EntitlementsAPIConfig;
 import org.opengroup.osdu.core.common.entitlements.EntitlementsFactory;
 import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory;
 import org.opengroup.osdu.core.common.entitlements.IEntitlementsService;
+import org.opengroup.osdu.core.common.http.json.HttpResponseBodyMapper;
 import org.opengroup.osdu.core.common.model.entitlements.EntitlementsException;
 import org.opengroup.osdu.core.common.model.entitlements.Groups;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
@@ -36,11 +38,13 @@ public class AuthenticationRequestFilter extends OncePerRequestFilter {
 
     private final String entitlementsUrl;
     private final HandlerExceptionResolver handlerExceptionResolver;
+    private HttpResponseBodyMapper httpResponseBodyMapper;
 
     public AuthenticationRequestFilter(String entitlementsUrl,
                                        HandlerExceptionResolver handlerExceptionResolver) {
         this.entitlementsUrl = entitlementsUrl;
         this.handlerExceptionResolver = handlerExceptionResolver;
+        httpResponseBodyMapper = new HttpResponseBodyMapper(new ObjectMapper());
     }
 
     @Override
@@ -85,7 +89,7 @@ public class AuthenticationRequestFilter extends OncePerRequestFilter {
     }
 
     private IEntitlementsFactory getEntitlementsFactory() {
-        return new EntitlementsFactory(EntitlementsAPIConfig.builder().rootUrl(entitlementsUrl).build());
+        return new EntitlementsFactory(EntitlementsAPIConfig.builder().rootUrl(entitlementsUrl).build(), httpResponseBodyMapper);
     }
 
     private void putAuthenticationIntoContext(Groups groups) {

devops/azure/chart/templates/deployment.yaml

@@ -65,6 +65,6 @@ spec:
               name: active-directory
               key: application-appid
         - name: ENTITLEMENT_URL
-          value: http://entitlements-azure/entitlements/v1
+          value: http://entitlements/api/entitlements/v2
         - name: azure_istioauth_enabled
           value: "true"

pom.xml

@@ -15,7 +15,7 @@
         <docker.image.prefix>org.opengroup.osdu</docker.image.prefix>
         <powermock.version>2.0.6</powermock.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <os-core-common.version>0.3.8</os-core-common.version>
+        <os-core-common.version>0.6.9</os-core-common.version>
         <snakeyaml.version>1.26</snakeyaml.version>
         <jackson.version>2.11.2</jackson.version>
         <nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>