Cleanup build warnings (#356)

Fix all the build warnings: - "scheduling-manager:compileTestJavaNote: Some input files use or override a deprecated API." - "EnvironmentRepositoryDDBTest.java uses unchecked or unsafe operations." - "ERROR StatusLogger No log4j2 configuration file found....."
blox · Jan 26, 2018 · fc1507c · fc1507c
1 parent c57c1ef
commit fc1507c
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 25 deletions.
diff --git a/buildSrc/src/main/resources/log4j2.xml b/buildSrc/src/main/resources/log4j2.xml
@@ -0,0  1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="WARN">
 <Appenders>
   <Console name="Console" target="SYSTEM_OUT">
     <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
   </Console>
 </Appenders>
 <Loggers>
   <Root level="error">
     <AppenderRef ref="Console"/>
   </Root>
 </Loggers>
 </Configuration>
diff --git a/...src/test/java/com/amazonaws/blox/dataservice/repository/EnvironmentRepositoryDDBTest.java b/...src/test/java/com/amazonaws/blox/dataservice/repository/EnvironmentRepositoryDDBTest.java
@@ -16,9  16,10 @@
 
 import static com.amazonaws.blox.dataservice.repository.model.EnvironmentDDBRecord.ENVIRONMENT_NAME_RANGE_KEY;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
@@ -38,7  39,6 @@
 import com.amazonaws.blox.dataservicemodel.v1.exception.InternalServiceException;
 import com.amazonaws.blox.dataservicemodel.v1.exception.ResourceNotFoundException;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
-import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;
 import com.amazonaws.services.dynamodbv2.datamodeling.PaginatedQueryList;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
@@ -64,8  64,6 @@ public class EnvironmentRepositoryDDBTest {
   private static final String CLUSTER = "mycluster";
   private static final String ENVIRONMENT_NAME = "myenv";
   private static final String ENVIRONMENT_REVISION_ID = "revision-id";
-  private static final DynamoDBMapperConfig CONFIG =
-      DynamoDBMapperConfig.SaveBehavior.CLOBBER.config();
 
   @Rule public ExpectedException thrown = ExpectedException.none();
 
@@ -79,7  77,9 @@ public class EnvironmentRepositoryDDBTest {
 
   @InjectMocks private EnvironmentRepositoryDDB environmentRepositoryDDB;
 
-  @Captor private ArgumentCaptor<DynamoDBQueryExpression> ddbQueryExpressionCaptor;
   @Captor
   private ArgumentCaptor<DynamoDBQueryExpression<EnvironmentDDBRecord>> ddbQueryExpressionCaptor;
 
   @Captor private ArgumentCaptor<EnvironmentDDBRecord> environmentDDBRecordArgumentCaptor;
 
   private EnvironmentId environmentId;
@@ -163,8  163,9 @@ public void testListEnvironmentsWithEnvironmentNamePrefix() throws Exception {
     final String environmentNamePrefix = "environmentNamePrefix";
 
     when(environmentDDBRecords.stream()).thenReturn(Stream.of(environmentDDBRecord));
-    when(dynamoDBMapper.query(eq(EnvironmentDDBRecord.class), any(DynamoDBQueryExpression.class)))
-        .thenReturn(environmentDDBRecords);
     doReturn(environmentDDBRecords)
         .when(dynamoDBMapper)
         .query(eq(EnvironmentDDBRecord.class), any());
     when(environmentMapper.toEnvironment(environmentDDBRecord)).thenReturn(environment);
 
     final List<Environment> result =
@@ -175,7  176,7 @@ public void testListEnvironmentsWithEnvironmentNamePrefix() throws Exception {
     verify(environmentMapper).toEnvironment(environmentDDBRecord);
 
     final EnvironmentDDBRecord queriedEnvironmentDDBRecord =
-        (EnvironmentDDBRecord) ddbQueryExpressionCaptor.getValue().getHashKeyValues();
         ddbQueryExpressionCaptor.getValue().getHashKeyValues();
     final Map<String, Condition> queryConditions =
         ddbQueryExpressionCaptor.getValue().getRangeKeyConditions();
 
@@ -195,8  196,9 @@ public void testListEnvironmentsWithEnvironmentNamePrefix() throws Exception {
   @Test
   public void testListEnvironmentsWithoutEnvironmentNamePrefix() throws Exception {
     when(environmentDDBRecords.stream()).thenReturn(Stream.of(environmentDDBRecord));
-    when(dynamoDBMapper.query(eq(EnvironmentDDBRecord.class), any(DynamoDBQueryExpression.class)))
-        .thenReturn(environmentDDBRecords);
     doReturn(environmentDDBRecords)
         .when(dynamoDBMapper)
         .query(eq(EnvironmentDDBRecord.class), any());
     when(environmentMapper.toEnvironment(environmentDDBRecord)).thenReturn(environment);
 
     final List<Environment> result = environmentRepositoryDDB.listEnvironments(cluster, null);
@@ -206,7  208,7 @@ public void testListEnvironmentsWithoutEnvironmentNamePrefix() throws Exception
     verify(environmentMapper).toEnvironment(environmentDDBRecord);
 
     final EnvironmentDDBRecord queriedEnvironmentDDBRecord =
-        (EnvironmentDDBRecord) ddbQueryExpressionCaptor.getValue().getHashKeyValues();
         ddbQueryExpressionCaptor.getValue().getHashKeyValues();
 
     assertThat(ddbQueryExpressionCaptor.getValue().getRangeKeyConditions()).isNull();
     assertThat(queriedEnvironmentDDBRecord.getAccountIdCluster())
@@ -218,8  220,9 @@ public void testListEnvironmentsWithoutEnvironmentNamePrefix() throws Exception
   @Test
   public void testListEnvironmentsEmptyResult() throws Exception {
     when(environmentDDBRecords.stream()).thenReturn(Stream.empty());
-    when(dynamoDBMapper.query(eq(EnvironmentDDBRecord.class), any(DynamoDBQueryExpression.class)))
-        .thenReturn(environmentDDBRecords);
     doReturn(environmentDDBRecords)
         .when(dynamoDBMapper)
         .query(eq(EnvironmentDDBRecord.class), any());
 
     final List<Environment> result = environmentRepositoryDDB.listEnvironments(cluster, null);
 
@@ -230,8  233,9 @@ public void testListEnvironmentsEmptyResult() throws Exception {
 
   @Test
   public void testListEnvironmentsInternalError() throws Exception {
-    when(dynamoDBMapper.query(eq(EnvironmentDDBRecord.class), any(DynamoDBQueryExpression.class)))
-        .thenThrow(AmazonServiceException.class);
     doThrow(AmazonServiceException.class)
         .when(dynamoDBMapper)
         .query(eq(EnvironmentDDBRecord.class), any());
 
     thrown.expect(InternalServiceException.class);
     thrown.expectMessage(

diff --git a/scheduling-manager/src/test/java/com/amazonaws/blox/lambda/AwsSdkV2LambdaFunctionTest.java b/scheduling-manager/src/test/java/com/amazonaws/blox/lambda/AwsSdkV2LambdaFunctionTest.java
@@ -16,7  16,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

diff --git a/scheduling-manager/src/test/java/com/amazonaws/blox/scheduling/SchedulingSystemTest.java b/scheduling-manager/src/test/java/com/amazonaws/blox/scheduling/SchedulingSystemTest.java
@@ -17,7  17,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

diff --git a/...ng-manager/src/test/java/com/amazonaws/blox/scheduling/manager/ManagerEntrypointTest.java b/...ng-manager/src/test/java/com/amazonaws/blox/scheduling/manager/ManagerEntrypointTest.java
@@ -16,7  16,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...uling-manager/src/test/java/com/amazonaws/blox/scheduling/manager/ManagerHandlerTest.java b/...uling-manager/src/test/java/com/amazonaws/blox/scheduling/manager/ManagerHandlerTest.java
@@ -35,7  35,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ManagerHandlerTest {

diff --git a/...manager/src/test/java/com/amazonaws/blox/scheduling/reconciler/ReconcilerHandlerTest.java b/...manager/src/test/java/com/amazonaws/blox/scheduling/reconciler/ReconcilerHandlerTest.java
@@ -16,7  16,7 @@
 
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.when;
 
 import com.amazonaws.blox.dataservicemodel.v1.client.DataService;
@@ -31,7  31,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ReconcilerHandlerTest {

diff --git a/...anager/src/test/java/com/amazonaws/blox/scheduling/scheduler/SchedulerEntrypointTest.java b/...anager/src/test/java/com/amazonaws/blox/scheduling/scheduler/SchedulerEntrypointTest.java
@@ -16,7  16,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...g-manager/src/test/java/com/amazonaws/blox/scheduling/scheduler/SchedulerHandlerTest.java b/...g-manager/src/test/java/com/amazonaws/blox/scheduling/scheduler/SchedulerHandlerTest.java
@@ -46,7  46,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.junit.MockitoJUnitRunner;
 import software.amazon.awssdk.services.ecs.ECSAsyncClient;
 
 @RunWith(MockitoJUnitRunner.class)

diff --git a/...anager/src/test/java/com/amazonaws/blox/scheduling/state/ContainerInstanceListerTest.java b/...anager/src/test/java/com/amazonaws/blox/scheduling/state/ContainerInstanceListerTest.java
@@ -17,7  17,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/scheduling-manager/src/test/java/com/amazonaws/blox/scheduling/state/TaskListerTest.java b/scheduling-manager/src/test/java/com/amazonaws/blox/scheduling/state/TaskListerTest.java
@@ -17,7  17,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;