TSI-2200 ODataContextEngine is now initialized only for Context Service claims provider

Author: Alexey Zarakovskiy

dxa-framework/dxa-web8-provider/src/main/java/com/sdl/webapp/tridion/SpringContextConfiguration.java

@@ -1,6 +1,5 @@
 package com.sdl.webapp.tridion;
 
-import com.sdl.context.odata.client.api.ODataContextEngine;
 import com.sdl.web.api.content.BinaryContentRetriever;
 import com.sdl.web.api.dynamic.BinaryContentRetrieverImpl;
 import com.sdl.web.api.dynamic.DynamicMappingsRetriever;
@@ -39,7 +38,7 @@ public TaxonomyFactory webTaxonomyFactory() {
     public TaxonomyRelationManager taxonomyRelationManager() {
         return new TaxonomyRelationManager();
     }
-    
+
     @Bean
     public BrokerLinkProvider linkProvider() {
         BrokerLinkProvider linkProvider = new BrokerLinkProvider();
@@ -110,11 +109,6 @@ public DynamicMappingsRetriever dynamicMappingsRetriever() {
         return new DynamicMappingsRetrieverImpl();
     }
 
-    @Bean
-    public ODataContextEngine oDataContextEngine() {
-        return new ODataContextEngine();
-    }
-
     @Configuration
     @Profile("dxa.no-cache")
     public static class NoCacheConfiguration {

dxa-framework/dxa-web8-provider/src/main/java/com/sdl/webapp/tridion/contextengine/ContextServiceClaimsProvider.java

@@ -17,6 +17,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Collections;
@@ -33,7 +34,7 @@ public class ContextServiceClaimsProvider implements ContextClaimsProvider {
     @Value("${dxa.context.service.publication.id:false}")
     private boolean isPublicationIdExpected;
 
-    @Autowired
+    //todo dxa2 replace with bean initialization based on negated Spring profile
     private ODataContextEngine oDataContextEngine;
 
     @Autowired
@@ -72,6 +73,11 @@ private static Map<String, Object> getClaimsForAspect(ContextMap<? extends Aspec
         return result;
     }
 
+    @PostConstruct
+    public void init() {
+        oDataContextEngine = new ODataContextEngine();
+    }
+
     @Override
     public Map<String, Object> getContextClaims(String aspectName) throws DxaException {
         HttpServletRequest request = HttpUtils.getCurrentRequest();

dxa-framework/dxa-web8-provider/src/test/java/com/sdl/webapp/tridion/contextengine/ContextServiceClaimsProviderTest.java

@@ -3,6 +3,7 @@
 import com.sdl.context.api.exception.ResolverException;
 import com.sdl.context.api.resolution.Evidence;
 import com.sdl.context.odata.client.api.ODataContextEngine;
+import com.sdl.odata.client.api.exception.ODataClientRuntimeException;
 import com.sdl.webapp.common.api.WebRequestContext;
 import com.sdl.webapp.common.api.localization.Localization;
 import com.sdl.webapp.common.exceptions.DxaException;
@@ -19,6 +20,7 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -54,6 +56,7 @@ public void init() {
         when(localization.getId()).thenReturn("1");
 
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpServletRequest));
+        ReflectionTestUtils.setField(contextServiceClaimsProvider, "oDataContextEngine", oDataContextEngine);
     }
 
     @Test
@@ -113,4 +116,10 @@ public void describeTo(Description description) {
             }
         }));
     }
+
+    @Test(expected = ODataClientRuntimeException.class)
+    public void shouldInitContextEngineOnStart() throws NoSuchMethodException {
+        assertTrue(contextServiceClaimsProvider.getClass().getDeclaredMethod("init").isAnnotationPresent(PostConstruct.class));
+        contextServiceClaimsProvider.init();
+    }
 }