Merge branch 'code-cleanup' into 'master'

Code cleanup

See merge request genesys-pgr/application-blocks!77

auditlog/pom.xml

@@ -56,7 +56,12 @@
 					<dependency>
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
-						<version>4.1.4</version>
+						<version>${querydsl.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>javax.annotation</groupId>
+						<artifactId>javax.annotation-api</artifactId>
+						<version>1.3.2</version>
 					</dependency>
 				</dependencies>
 			</plugin>

core/pom.xml

@@ -73,7 +73,12 @@
 					<dependency>
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
-						<version>4.1.4</version>
+						<version>${querydsl.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>javax.annotation</groupId>
+						<artifactId>javax.annotation-api</artifactId>
+						<version>1.3.2</version>
 					</dependency>
 				</dependencies>
 			</plugin>

security/pom.xml

@@ -57,7 +57,12 @@
 					<dependency>
 						<groupId>com.querydsl</groupId>
 						<artifactId>querydsl-apt</artifactId>
-						<version>4.1.4</version>
+						<version>${querydsl.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>javax.annotation</groupId>
+						<artifactId>javax.annotation-api</artifactId>
+						<version>1.3.2</version>
 					</dependency>
 				</dependencies>
 			</plugin>

security/src/test/java/org/genesys/blocks/oauth/OAuth2GrantTypeTest.java

@@ -15,11 +15,9 @@
  */
 package org.genesys.blocks.oauth;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 
 import org.genesys.blocks.oauth.model.OAuthClient;
 import org.genesys.blocks.oauth.model.OAuthRole;
@@ -39,7 +37,6 @@ import org.springframework.web.context.WebApplicationContext;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 
 /**
  * The Class OAuth2GrantTypeTest.
@@ -65,7 +62,6 @@ public class OAuth2GrantTypeTest extends AbstractRestTest {
 		objectMapper = new ObjectMapper();
 		objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 		objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
-		objectMapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
 		objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
 	}
 

security/src/test/java/org/genesys/blocks/security/rest/AbstractRestTest.java

@@ -15,6 +15,7 @@
  */
 package org.genesys.blocks.security.rest;
 
+import java.util.Collections;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -87,7 +88,8 @@ public abstract class AbstractRestTest extends ServiceTest {
 
 		@Override
 		public void configureContentNegotiation(final ContentNegotiationConfigurer configurer) {
-			configurer.favorPathExtension(false);
+			configurer.useRegisteredExtensionsOnly(true);
+			configurer.replaceMediaTypes(Collections.emptyMap());
 		}
 	}
 }
\ No newline at end of file

security/src/test/java/org/genesys/blocks/security/test/BasicUserServiceTest.java

@@ -15,31 +15,23 @@
  */
 package org.genesys.blocks.security.test;
 
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.util.Calendar;
 
-import com.google.common.collect.Sets;
-
 import org.genesys.blocks.security.NotUniqueUserException;
 import org.genesys.blocks.security.UserException;
 import org.genesys.blocks.security.model.AclSid;
+import org.genesys.blocks.security.model.BasicUser.AccountType;
 import org.genesys.blocks.security.model.TestUser;
 import org.genesys.blocks.security.model.UserRole;
-import org.genesys.blocks.security.model.BasicUser.AccountType;
 import org.genesys.blocks.security.service.PasswordPolicy.PasswordPolicyException;
 import org.junit.Test;
 import org.springframework.security.core.userdetails.UserDetails;
 
+import com.google.common.collect.Sets;
+
 /**
  * The Class BasicUserServiceTest.
  *