Merge pull request #97 from johngatti/master

Bob Hewett · Bob Hewett · commit 9f1969216643 · 2014-11-21T16:18:16.000-06:00
Unit tests, integration tests and some fixes to code based on tests
diff --git a/mozu-java-sdk/src/main/java/com/mozu/api/utils/MozuHttpClientPool.java b/mozu-java-sdk/src/main/java/com/mozu/api/utils/MozuHttpClientPool.java
@@ -1,4 +1,4 @@
-package com.mozu.client;
+package com.mozu.api.utils;
 
 import java.io.IOException;
 import java.util.concurrent.ArrayBlockingQueue;
diff --git a/mozu-java-sdk/src/main/java/com/mozu/client/MozuClientImpl.java b/mozu-java-sdk/src/main/java/com/mozu/client/MozuClientImpl.java
@@ -47,6 +47,7 @@
 import com.mozu.api.security.UserAuthenticator;
 import com.mozu.api.utils.HttpHelper;
 import com.mozu.api.utils.JsonUtils;
+import com.mozu.api.utils.MozuHttpClientPool;
 
 public class MozuClientImpl<TResult> implements MozuClient<TResult> {
     private static final ObjectMapper mapper = JsonUtils.initObjectMapper();
diff --git a/mozu-java-toolkit/build.gradle b/mozu-java-toolkit/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     compile ("org.springframework.batch:spring-batch-core:2.2.3.RELEASE");
     compile ("org.springframework.integration:spring-integration-core:3.0.2.RELEASE");
 
-    compile ("com.mozu:mozu-api-java:1.12.0") {
+    compile ("com.mozu:mozu-api-java:1.13.0") {
         exclude group: 'mysql'
         exclude group: 'xerces'
         exclude group: 'berkeleydb'
diff --git a/mozu-java-toolkit/src/integrationtest/java/com/mozu/base/handlers/EntityHandlerIntegrationTest.java b/mozu-java-toolkit/src/integrationtest/java/com/mozu/base/handlers/EntityHandlerIntegrationTest.java
@@ -5,9 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
 
-import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -18,24 +16,18 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.mozu.api.ApiContext;
-import com.mozu.api.ApiException;
 import com.mozu.api.MozuApiContext;
 import com.mozu.api.contracts.mzdb.EntityList;
 import com.mozu.api.contracts.mzdb.IndexedProperty;
-import com.mozu.api.resources.platform.EntityListResource;
-import com.mozu.base.models.AppInfo;
 import com.mozu.base.models.EntityCollection;
 import com.mozu.base.models.EntityDataTypes;
 import com.mozu.base.models.EntityScope;
-import com.mozu.base.models.ExtensionParent;
 import com.mozu.base.models.Contact;
-import com.mozu.base.utils.ApplicationUtils;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations= {"file:src/main/resources/servlet-context.xml" })
-public class EntityHandlerTest {
+public class EntityHandlerIntegrationTest {
 
 	@Autowired
 	EntitySchemaHandler entitySchemaHandler;
diff --git a/mozu-java-toolkit/src/integrationtest/java/com/mozu/base/handlers/ExtensionHandlerTest.java b/mozu-java-toolkit/src/integrationtest/java/com/mozu/base/handlers/ExtensionHandlerTest.java
diff --git a/mozu-java-toolkit/src/integrationtest/java/com/mozu/base/models/Contact.java b/mozu-java-toolkit/src/integrationtest/java/com/mozu/base/models/Contact.java
diff --git a/mozu-java-toolkit/src/main/java/com/mozu/base/handlers/EncryptDecryptHandler.java b/mozu-java-toolkit/src/main/java/com/mozu/base/handlers/EncryptDecryptHandler.java
@@ -20,11 +20,7 @@ public class EncryptDecryptHandler {
      * @return an encrypted String
      */
 	public String encrypt( String value)  {
-		
-		BasicTextEncryptor textEncryptor = new BasicTextEncryptor();
-		textEncryptor.setPassword(AppAuthenticator.getInstance().getAppAuthInfo().getSharedSecret());
-		
-		return textEncryptor.encrypt(value);
+		return encrypt(null, value);
 	}
 	
 	/**
@@ -34,9 +30,17 @@ public String encrypt( String value)  {
 	 * @return an encrypted string.
 	 */
 	public String encrypt(String key, String value)  {
+        if (value==null) {
+            throw new IllegalArgumentException("String to be encrypted required");
+        }
 		
 		BasicTextEncryptor textEncryptor = new BasicTextEncryptor();
-		textEncryptor.setPassword(AppAuthenticator.getInstance().getAppAuthInfo().getSharedSecret()+key);
+
+		String sharedSecret = AppAuthenticator.getInstance().getAppAuthInfo().getSharedSecret();
+		if (sharedSecret==null && key==null) {
+		    throw new IllegalArgumentException("Password key required");
+		}
+		textEncryptor.setPassword(sharedSecret+key);
 		
 		return textEncryptor.encrypt(value);
 	}
@@ -47,11 +51,7 @@ public String encrypt(String key, String value)  {
 	 * @return the decrypted 
 	 */
 	public String decrypt( String encryptedStr)  {
-	
-		BasicTextEncryptor textEncryptor = new BasicTextEncryptor();
-		textEncryptor.setPassword(AppAuthenticator.getInstance().getAppAuthInfo().getSharedSecret());
-		
-		return textEncryptor.decrypt(encryptedStr);
+	    return decrypt(null, encryptedStr);
 	}
 	
 	/**
@@ -61,6 +61,9 @@ public String decrypt( String encryptedStr)  {
 	 * @return a string in clear text.
 	 */
 	public String decrypt(String key, String encryptedStr)  {
+	    if (encryptedStr==null) {
+	        throw new IllegalArgumentException("String to be decrypted required");
+	    }
 		
 		BasicTextEncryptor textEncryptor = new BasicTextEncryptor();
 		textEncryptor.setPassword(AppAuthenticator.getInstance().getAppAuthInfo().getSharedSecret()+key);
diff --git a/mozu-java-toolkit/src/main/java/com/mozu/base/handlers/EntityHandler.java b/mozu-java-toolkit/src/main/java/com/mozu/base/handlers/EntityHandler.java
@@ -1,12 +1,10 @@
 package com.mozu.base.handlers;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/mozu-java-toolkit/src/main/java/com/mozu/base/handlers/EntitySchemaHandler.java b/mozu-java-toolkit/src/main/java/com/mozu/base/handlers/EntitySchemaHandler.java
@@ -1,6 +1,5 @@
 package com.mozu.base.handlers;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -53,8 +52,11 @@ public EntityList installSchema(ApiContext apiContext, EntityList entityList, En
 		if (StringUtils.isEmpty(entityList.getNameSpace())) entityList.setNameSpace(appInfo.getNameSpace());
 		
 		String entityFqn = getEntityListNameFQN(entityList.getName(), entityList.getNameSpace());
-		if (idProperty == null) entityList.setUseSystemAssignedId(true);
-		else entityList.setIdProperty(idProperty);
+		if (idProperty == null) {
+		    entityList.setUseSystemAssignedId(true);
+		} else {
+		    entityList.setIdProperty(idProperty);
+		}
 		
 		if (indexedProperties != null) { 
 			entityList.setIndexA(indexedProperties.size() >=1 ? indexedProperties.get(0) : null);
diff --git a/mozu-java-toolkit/src/main/resources/mozu-base.xml b/mozu-java-toolkit/src/main/resources/mozu-base.xml
@@ -20,9 +20,4 @@
          </mvc:interceptor>
     </mvc:interceptors>
 
-	<beans:bean id="cacheManagerImpl" name="cacheManagerImpl"
-		class="com.mozu.api.cache.impl.CacheManagerImpl" init-method="startCache"
-		destroy-method="stopCache" lazy-init="false">
-	</beans:bean>
-
 </beans:beans>
diff --git a/mozu-java-toolkit/src/test/java/com/mozu/base/controllers/ConfigurationSecurityInterceptorTest.java b/mozu-java-toolkit/src/test/java/com/mozu/base/controllers/ConfigurationSecurityInterceptorTest.java
@@ -0,0 +1,99 @@
+package com.mozu.base.controllers;
+
+import static org.junit.Assert.*;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import mockit.Deencapsulation;
+import mockit.Expectations;
+import mockit.Mocked;
+
+import org.joda.time.DateTime;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ConfigurationSecurityInterceptorTest {
+    protected static final String RESULT_URI = "/result/uri";
+    protected static final String SHARED_SECRET = "ThisIsTheSharedSecret";
+    
+    @Mocked HttpServletRequest mockHttpServletRequest;
+    @Mocked HttpServletResponse mockHttpServletResponse;
+
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void noCookieTest() {
+        final Cookie[] cookies = {};
+        
+        new Expectations() {
+            {mockHttpServletRequest.getRequestURI(); result=RESULT_URI;}
+            {mockHttpServletRequest.getCookies(); result=cookies;}
+            {mockHttpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);}
+        };
+        
+        ConfigurationSecurityInterceptor interceptor = new ConfigurationSecurityInterceptor();
+        boolean isValid = interceptor.preHandle(mockHttpServletRequest, mockHttpServletResponse, null);
+        assertFalse(isValid);
+    }
+
+    @Test
+    public void invalidCookieValueTest() throws Exception {
+        String encryptedValue = ConfigurationSecurityInterceptor.encrypt("Test", SHARED_SECRET); 
+        final Cookie[] cookies = {new Cookie(AdminControllerHelper.SECURITY_COOKIE, encryptedValue)};
+        
+        new Expectations() {
+            {mockHttpServletRequest.getRequestURI(); result=RESULT_URI;}
+            {mockHttpServletRequest.getCookies(); result=cookies;}
+            {mockHttpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);}
+        };
+        
+        ConfigurationSecurityInterceptor interceptor = new ConfigurationSecurityInterceptor();
+        Deencapsulation.setField(interceptor, "sharedSecret", SHARED_SECRET);
+        boolean isValid = interceptor.preHandle(mockHttpServletRequest, mockHttpServletResponse, null);
+        assertFalse(isValid);
+    }
+
+    @Test
+    public void expiredDateTest() throws Exception {
+        String oldDateString = new DateTime().minusDays(2).toString();
+        String encryptedValue = ConfigurationSecurityInterceptor.encrypt(oldDateString, SHARED_SECRET); 
+        final Cookie[] cookies = {new Cookie(AdminControllerHelper.SECURITY_COOKIE, encryptedValue)};
+        
+        new Expectations() {
+            {mockHttpServletRequest.getRequestURI(); result=RESULT_URI;}
+            {mockHttpServletRequest.getCookies(); result=cookies;}
+            {mockHttpServletResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED);}
+        };
+        
+        ConfigurationSecurityInterceptor interceptor = new ConfigurationSecurityInterceptor();
+        Deencapsulation.setField(interceptor, "sharedSecret", SHARED_SECRET);
+        boolean isValid = interceptor.preHandle(mockHttpServletRequest, mockHttpServletResponse, null);
+        assertFalse(isValid);
+    }
+
+    @Test
+    public void validTest() throws Exception {
+        String oldDateString = new DateTime().toString();
+        String encryptedValue = ConfigurationSecurityInterceptor.encrypt(oldDateString, SHARED_SECRET); 
+        final Cookie[] cookies = {new Cookie(AdminControllerHelper.SECURITY_COOKIE, encryptedValue)};
+        
+        new Expectations() {
+            {mockHttpServletRequest.getRequestURI(); result=RESULT_URI;}
+            {mockHttpServletRequest.getCookies(); result=cookies;}
+        };
+        
+        ConfigurationSecurityInterceptor interceptor = new ConfigurationSecurityInterceptor();
+        Deencapsulation.setField(interceptor, "sharedSecret", SHARED_SECRET);
+        boolean isValid = interceptor.preHandle(mockHttpServletRequest, mockHttpServletResponse, null);
+        assertTrue(isValid);
+    }
+}
diff --git a/mozu-java-toolkit/src/test/java/com/mozu/base/controllers/EventControllerTest.java b/mozu-java-toolkit/src/test/java/com/mozu/base/controllers/EventControllerTest.java
@@ -0,0 +1,62 @@
+package com.mozu.base.controllers;
+
+import static org.junit.Assert.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+
+import org.apache.http.HttpStatus;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.http.ResponseEntity;
+
+import com.mozu.api.events.model.EventHandlerStatus;
+import com.mozu.api.events.service.EventService;
+
+public class EventControllerTest {
+    protected static final String TEST_MESSAGE = "Test Event Message";
+    @Mocked HttpServletRequest mockHttpServletRequest;
+
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    @Test
+    public void processEventRequestNoMessageTest() {
+        
+        new MockUp<EventService>() {
+            @Mock void $init() {}
+            @Mock EventHandlerStatus dispatchEvent(HttpServletRequest httpRequest) {
+                EventHandlerStatus status = new EventHandlerStatus(null, HttpStatus.SC_OK);
+                return status;
+            }
+        };
+        EventController controller = new EventController();
+        ResponseEntity<String> entity = controller.processEventRequest(mockHttpServletRequest);
+        assertEquals(org.springframework.http.HttpStatus.valueOf(HttpStatus.SC_OK), entity.getStatusCode());
+        assertNull(entity.getBody());
+    }
+
+    @Test
+    public void processEventRequestMessageTest() {
+        new MockUp<EventService>() {
+            @Mock void $init() {}
+            @Mock EventHandlerStatus dispatchEvent(HttpServletRequest httpRequest) {
+                EventHandlerStatus status = new EventHandlerStatus(TEST_MESSAGE, HttpStatus.SC_OK);
+                return status;
+            }
+        };
+        EventController controller = new EventController();
+        ResponseEntity<String> entity = controller.processEventRequest(mockHttpServletRequest);
+        assertEquals(org.springframework.http.HttpStatus.valueOf(HttpStatus.SC_OK), entity.getStatusCode());
+        assertEquals(TEST_MESSAGE, entity.getBody());
+    }
+}
diff --git a/mozu-java-toolkit/src/test/java/com/mozu/base/handlers/EncryptDecryptHandlerTest.java b/mozu-java-toolkit/src/test/java/com/mozu/base/handlers/EncryptDecryptHandlerTest.java
diff --git a/mozu-java-toolkit/src/test/java/com/mozu/base/handlers/EntityHandlerTest.java b/mozu-java-toolkit/src/test/java/com/mozu/base/handlers/EntityHandlerTest.java
diff --git a/mozu-java-toolkit/src/test/java/com/mozu/base/handlers/EntitySchemaHandlerTest.java b/mozu-java-toolkit/src/test/java/com/mozu/base/handlers/EntitySchemaHandlerTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.mozu.client;`
	`1`	`+package com.mozu.api.utils;`
`2`	`2`
`3`	`3`	`import java.io.IOException;`
`4`	`4`	`import java.util.concurrent.ArrayBlockingQueue;`