Merge pull request #41 from wreulicke/feature/fix-deprecations

Fix deprecations

Author: dai0304

spar-wings-awscli-config/src/main/java/jp/xet/sparwings/aws/auth/AwsCliProfile.java

@@ -19,18 +19,15 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import org.apache.http.annotation.Immutable;
-
 import com.amazonaws.auth.AWSCredentialsProvider;
 
 /**
  * TODO for daisuke
- * 
+ *
  * @since 0.10
  * @version $Id$
  * @author daisuke
  */
-@Immutable
 @RequiredArgsConstructor
 @EqualsAndHashCode
 public class AwsCliProfile {

spar-wings-dynamodb-json-patch/src/test/java/jp/xet/sparwings/dynamodb/patch/JsonPatchToExpressionSpecBuilderRemoveIT.java

@@ -23,13 +23,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
-import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
@@ -65,10 +64,10 @@ public class JsonPatchToExpressionSpecBuilderRemoveIT {
 
 
 	@Before
-	public void setUp() throws Exception {
+	public void setUp() {
 		try {
-			AmazonDynamoDB amazonDynamoDB = new AmazonDynamoDBClient();
-			amazonDynamoDB.setRegion(Region.getRegion(Regions.AP_NORTHEAST_1));
+			AmazonDynamoDB amazonDynamoDB = AmazonDynamoDBClient.builder()
+				.withRegion(Regions.AP_NORTHEAST_1).build();
 			table = new Table(amazonDynamoDB, "json_patch_test");
 			table.deleteItem(PK);
 		} catch (AmazonClientException e) {

spar-wings-dynamodb-json-patch/src/test/java/jp/xet/sparwings/dynamodb/patch/JsonPatchToExpressionSpecBuilderReplaceIT.java

@@ -24,13 +24,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.internal.AssumptionViolatedException;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
-import com.amazonaws.regions.Region;
 import com.amazonaws.regions.Regions;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
@@ -68,10 +67,10 @@ public class JsonPatchToExpressionSpecBuilderReplaceIT {
 
 
 	@Before
-	public void setUp() throws Exception {
+	public void setUp() {
 		try {
-			AmazonDynamoDB amazonDynamoDB = new AmazonDynamoDBClient();
-			amazonDynamoDB.setRegion(Region.getRegion(Regions.AP_NORTHEAST_1));
+			AmazonDynamoDB amazonDynamoDB = AmazonDynamoDBClient.builder()
+				.withRegion(Regions.AP_NORTHEAST_1).build();
 			table = new Table(amazonDynamoDB, "json_patch_test");
 			table.deleteItem(PK);
 		} catch (AmazonClientException e) {

spar-wings-monolith/src/main/java/jp/xet/sparwings/spring/web/error/handler/DefaultRestErrorResolver.java

@@ -37,7 +37,6 @@
 import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
 
 /**
  * Default {@code RestErrorResolver} implementation that converts discovered Exceptions to
@@ -104,7 +103,6 @@ protected final Map<String, String> createDefaultExceptionMappingDefinitions() {
 		applyDef(m, "javax.validation.ValidationException", HttpStatus.BAD_REQUEST);
 
 		// 404
-		applyDef(m, NoSuchRequestHandlingMethodException.class, HttpStatus.NOT_FOUND);
 		applyDef(m, "org.hibernate.ObjectNotFoundException", HttpStatus.NOT_FOUND);
 
 		// 405
@@ -230,9 +228,9 @@ protected String getMessage(String msg, ServletWebRequest webRequest, Exception
 	/**
 	 * Returns the config-time 'template' RestError instance configured for the specified Exception, or
 	 * {@code null} if a match was not found.
-	 * 
+	 *
 	 * <p>The config-time template is used as the basis for the RestError constructed at runtime.</p>
-	 * 
+	 *
 	 * @param ex
 	 * @return the template to use for the RestError instance to be constructed.
 	 */
@@ -263,10 +261,10 @@ private RestError getRestErrorTemplate(Exception ex) {
 
 	/**
 	 * Return the depth to the superclass matching.
-	 * 
+	 *
 	 * <p>0 means ex matches exactly. Returns -1 if there's no match.
 	 * Otherwise, returns depth. Lowest depth wins.</p>
-	 * 
+	 *
 	 * @param exceptionMapping
 	 * @param ex
 	 * @return