http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java index 9ccbc11..54726df 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java @@ -42,7 +42,6 @@ import org.apache.ambari.server.orm.dao.PrivilegeDAO; import org.apache.ambari.server.orm.dao.UserDAO; import org.apache.ambari.server.orm.dao.ViewInstanceDAO; import org.apache.ambari.server.orm.entities.ClusterEntity; -import org.apache.ambari.server.orm.entities.MemberEntity; import org.apache.ambari.server.orm.entities.PermissionEntity; import org.apache.ambari.server.orm.entities.PrincipalEntity; import org.apache.ambari.server.orm.entities.PrincipalTypeEntity; @@ -391,7 +390,7 @@ public class UserPrivilegeResourceProviderTest extends AbstractPrivilegeResource final UserDAO userDAO = createNiceMock(UserDAO.class); expect(userDAO.findLocalUserByName("jdoe")).andReturn(userEntity).anyTimes(); expect(userDAO.findUserByPrincipal(anyObject(PrincipalEntity.class))).andReturn(userEntity).anyTimes(); - expect(userDAO.findAll()).andReturn(Collections.<UserEntity>emptyList()).anyTimes(); + expect(userDAO.findAll()).andReturn(Collections.emptyList()).anyTimes(); final PrivilegeDAO privilegeDAO = createMock(PrivilegeDAO.class); final MemberDAO memberDAO = createMock(MemberDAO.class); @@ -414,7 +413,7 @@ public class UserPrivilegeResourceProviderTest extends AbstractPrivilegeResource andReturn(Collections.singletonList(implicitPrivilegeEntity)) .once(); expect(memberDAO.findAllMembersByUser(userEntity)). - andReturn(Collections.<MemberEntity>emptyList()) + andReturn(Collections.emptyList()) .atLeastOnce(); replayAll(); @@ -469,12 +468,12 @@ public class UserPrivilegeResourceProviderTest extends AbstractPrivilegeResource andReturn(Collections.singletonList(privilegeEntity)) .atLeastOnce(); expect(memberDAO.findAllMembersByUser(userEntity)). - andReturn(Collections.<MemberEntity>emptyList()) + andReturn(Collections.emptyList()) .atLeastOnce(); expect(userDAO.findLocalUserByName(requestedUsername)).andReturn(userEntity).anyTimes(); - expect(userDAO.findAll()).andReturn(Collections.<UserEntity>emptyList()).anyTimes(); + expect(userDAO.findAll()).andReturn(Collections.emptyList()).anyTimes(); expect(userEntity.getPrincipal()).andReturn(principalEntity).anyTimes(); - expect(userEntity.getMemberEntities()).andReturn(Collections.<MemberEntity>emptySet()).anyTimes(); + expect(userEntity.getMemberEntities()).andReturn(Collections.emptySet()).anyTimes(); expect(privilegeEntity.getPermission()).andReturn(permissionEntity).anyTimes(); expect(privilegeEntity.getPrincipal()).andReturn(principalEntity).anyTimes(); expect(principalEntity.getPrincipalType()).andReturn(principalTypeEntity).anyTimes(); @@ -489,7 +488,7 @@ public class UserPrivilegeResourceProviderTest extends AbstractPrivilegeResource expect(privilegeEntity.getResource()).andReturn(resourceEntity).anyTimes(); expect(resourceEntity.getResourceType()).andReturn(resourceTypeEntity).anyTimes(); expect(resourceTypeEntity.getName()).andReturn(ResourceType.AMBARI.name()); - expect(viewInstanceDAO.findAll()).andReturn(new ArrayList<ViewInstanceEntity>()).anyTimes(); + expect(viewInstanceDAO.findAll()).andReturn(new ArrayList<>()).anyTimes(); replayAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java index d298b7f..9efad8a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java @@ -532,7 +532,7 @@ public class UserResourceProviderTest extends EasyMockSupport { expect(user.isLdapUser()).andReturn(false).anyTimes(); expect(user.isActive()).andReturn(true).anyTimes(); expect(user.isAdmin()).andReturn(false).anyTimes(); - expect(user.getGroups()).andReturn(Collections.<String>emptyList()).anyTimes(); + expect(user.getGroups()).andReturn(Collections.emptyList()).anyTimes(); return user; } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java index 60f416f..3d967d8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java @@ -46,7 +46,6 @@ import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException; import org.apache.ambari.server.controller.utilities.PredicateBuilder; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.apache.ambari.server.orm.entities.ViewEntity; -import org.apache.ambari.server.orm.entities.ViewInstanceDataEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.server.security.TestAuthenticationFactory; import org.apache.ambari.server.security.authorization.AuthorizationException; @@ -97,7 +96,7 @@ public class ViewInstanceResourceProviderTest { expect(viewInstanceEntity.getPropertyMap()).andReturn(propertyMap); - expect(viewInstanceEntity.getData()).andReturn(Collections.<ViewInstanceDataEntity>emptyList()).anyTimes(); + expect(viewInstanceEntity.getData()).andReturn(Collections.emptyList()).anyTimes(); expect(viewregistry.checkAdmin()).andReturn(true); expect(viewregistry.checkAdmin()).andReturn(false); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java index 9891a7b..8a2af27 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewURLResourceProviderTest.java @@ -142,7 +142,7 @@ public class ViewURLResourceProviderTest { expect(viewEntity.getVersion()).andReturn("1.0.0").once(); expect(viewInstanceEntity.getName()).andReturn("test").once(); expect(viewInstanceEntity.getViewUrl()).andReturn(null).once(); - expect(viewURLDAO.findByName("test")).andReturn(Optional.<ViewURLEntity>absent()); + expect(viewURLDAO.findByName("test")).andReturn(Optional.absent()); Capture<ViewURLEntity> urlEntityCapture = newCapture(); viewURLDAO.save(capture(urlEntityCapture)); viewregistry.updateViewInstance(viewInstanceEntity); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java index 38e4838..40d949e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java @@ -164,7 +164,7 @@ public class WidgetLayoutResourceProviderTest { WidgetEntity widgetEntity = new WidgetEntity(); widgetEntity.setId(1l); - widgetEntity.setListWidgetLayoutUserWidgetEntity(new ArrayList<WidgetLayoutUserWidgetEntity>()); + widgetEntity.setListWidgetLayoutUserWidgetEntity(new ArrayList<>()); expect(widgetDAO.findById(anyLong())).andReturn(widgetEntity).anyTimes(); replay(amc, clusters, cluster, dao, widgetDAO); @@ -224,10 +224,10 @@ public class WidgetLayoutResourceProviderTest { WidgetEntity widgetEntity = new WidgetEntity(); widgetEntity.setId(1L); - widgetEntity.setListWidgetLayoutUserWidgetEntity(new ArrayList<WidgetLayoutUserWidgetEntity>()); + widgetEntity.setListWidgetLayoutUserWidgetEntity(new ArrayList<>()); WidgetEntity widgetEntity2 = new WidgetEntity(); widgetEntity2.setId(2L); - widgetEntity2.setListWidgetLayoutUserWidgetEntity(new ArrayList<WidgetLayoutUserWidgetEntity>()); + widgetEntity2.setListWidgetLayoutUserWidgetEntity(new ArrayList<>()); expect(widgetDAO.findById(1L)).andReturn(widgetEntity).atLeastOnce(); replay(amc, clusters, cluster, dao, widgetDAO); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java index 8444923..de4c354 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java @@ -558,7 +558,7 @@ public class LogSearchDataRetrievalServiceTest { expect(helperFactoryMock.getHelper(controllerMock, expectedClusterName)).andReturn(helperMock); // return null to simulate an error occurring during the LogSearch data request - expect(helperMock.sendGetLogFileNamesRequest(expectedComponentName, expectedHostName)).andReturn(Collections.<String>emptySet()); + expect(helperMock.sendGetLogFileNamesRequest(expectedComponentName, expectedHostName)).andReturn(Collections.emptySet()); // expect that the completed request is removed from the current request set, // even in the event of a failure to obtain the LogSearch data expect(currentRequestsMock.remove(expectedComponentAndHostName)).andReturn(true).once(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java index adc79b4..7c7bd84 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperFactoryImplTest.java @@ -199,7 +199,7 @@ public class LoggingRequestHelperFactoryImplTest { expect(controllerMock.getClusters()).andReturn(clustersMock).atLeastOnce(); expect(clustersMock.getCluster(expectedClusterName)).andReturn(clusterMock).atLeastOnce(); expect(clusterMock.getDesiredConfigByType("logsearch-properties")).andReturn(logSearchEnvConfig).atLeastOnce(); - expect(clusterMock.getServiceComponentHosts("LOGSEARCH", "LOGSEARCH_SERVER")).andReturn(Collections.<ServiceComponentHost>emptyList()).atLeastOnce(); + expect(clusterMock.getServiceComponentHosts("LOGSEARCH", "LOGSEARCH_SERVER")).andReturn(Collections.emptyList()).atLeastOnce(); expect(clusterMock.getServices()).andReturn(Collections.singletonMap("LOGSEARCH", (Service)null)).atLeastOnce(); mockSupport.replayAll(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java index 55c730a..1f67337 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java @@ -168,7 +168,7 @@ public class LoggingRequestHelperImplTest { // invoke query request LogQueryResponse result = - helper.sendQueryRequest(Collections.<String,String>emptyMap()); + helper.sendQueryRequest(Collections.emptyMap()); // verify that the HttpURLConnection was created with the proper values HttpURLConnection httpURLConnection = @@ -508,7 +508,7 @@ public class LoggingRequestHelperImplTest { expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce(); expect(clusterMock.getClusterName()).andReturn(expectedClusterName).atLeastOnce(); - expect(adminPropertiesConfigMock.getProperties()).andReturn(Collections.<String, String>emptyMap()).atLeastOnce(); + expect(adminPropertiesConfigMock.getProperties()).andReturn(Collections.emptyMap()).atLeastOnce(); expect(networkConnectionMock.readQueryResponseFromServer(capture(captureURLConnection))).andReturn(new StringBuffer(TEST_JSON_INPUT_TWO_LIST_ENTRIES)).atLeastOnce(); // the credential store service should be consulted in this case, in order // to attempt to obtain the LogSearch credential from the store @@ -524,7 +524,7 @@ public class LoggingRequestHelperImplTest { // invoke query request LogQueryResponse result = - helper.sendQueryRequest(Collections.<String,String>emptyMap()); + helper.sendQueryRequest(Collections.emptyMap()); // verify that the HttpURLConnection was created with the proper values HttpURLConnection httpURLConnection = http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java index 156ee66..265c443 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java @@ -217,7 +217,7 @@ public class JMXPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); List<String> expectedSpecs = new ArrayList<>(); @@ -244,7 +244,7 @@ public class JMXPropertyProviderTest { resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "DATANODE"); // request with an empty set should get all supported properties - request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + request = PropertyHelper.getReadRequest(Collections.emptySet()); propertyProvider.populateResources(Collections.singleton(resource), request, null); @@ -457,7 +457,7 @@ public class JMXPropertyProviderTest { resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "NAMENODE"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -498,7 +498,7 @@ public class JMXPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "INSTALLED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -537,7 +537,7 @@ public class JMXPropertyProviderTest { resources.add(resource); } // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> resourceSet = propertyProvider.populateResources(resources, request, null); @@ -581,7 +581,7 @@ public class JMXPropertyProviderTest { resources.add(resource); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> resourceSet = propertyProvider.populateResources(resources, request, null); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java index e118097..90c8392 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java @@ -159,7 +159,7 @@ public class RestMetricsPropertyProviderTest { Collections.singletonMap("tag", "version1"))).anyTimes(); expect(amc.getConfigHelper()).andReturn(configHelperMock).anyTimes(); expect(configHelperMock.getEffectiveConfigProperties(eq(c1), - EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(Collections.singletonMap("storm-site", + EasyMock.anyObject())).andReturn(Collections.singletonMap("storm-site", Collections.singletonMap("ui.port", DEFAULT_STORM_UI_PORT))).anyTimes(); replay(amc, configHelperMock); } @@ -307,7 +307,7 @@ public class RestMetricsPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, restMetricsPropertyProvider.populateResources(Collections.singleton(resource), request, null).size()); Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/api/cluster/summary", "wrong.metric"))); @@ -345,7 +345,7 @@ public class RestMetricsPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, restMetricsPropertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -411,7 +411,7 @@ public class RestMetricsPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "INSTALLED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, restMetricsPropertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -450,7 +450,7 @@ public class RestMetricsPropertyProviderTest { } // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> resourceSet = restMetricsPropertyProvider.populateResources(resources, request, null); @@ -493,7 +493,7 @@ public class RestMetricsPropertyProviderTest { resources.add(resource); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> resourceSet = restMetricsPropertyProvider.populateResources(resources, request, null); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java index ce60c98..e53cfd3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProviderTest.java @@ -651,7 +651,7 @@ public class GangliaPropertyProviderTest { resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER"); Map<String, TemporalInfo> temporalInfoMap = new HashMap<>(); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), temporalInfoMap); + Request request = PropertyHelper.getReadRequest(Collections.emptySet(), temporalInfoMap); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java index 1d464e3..45b18e3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelperTest.java @@ -24,8 +24,6 @@ import static org.easymock.EasyMock.replay; import java.io.InputStream; import java.net.HttpURLConnection; -import java.util.List; -import java.util.Map; import java.util.TreeMap; import org.apache.ambari.server.controller.internal.URLStreamProvider; @@ -73,7 +71,7 @@ public class MetricsRequestHelperTest { URLStreamProvider urlStreamProviderMock = createMock(URLStreamProvider.class); expect(urlStreamProviderMock.processURL(EasyMock.isA(String.class), EasyMock.isA(String.class), - isNull(String.class), EasyMock.<Map<String, List<String>>>anyObject())).andReturn(httpURLConnectionMock).once(); + isNull(String.class), EasyMock.anyObject())).andReturn(httpURLConnectionMock).once(); replay(httpURLConnectionMock, urlStreamProviderMock); @@ -104,7 +102,7 @@ public class MetricsRequestHelperTest { urlStreamProviderMock = createMock(URLStreamProvider.class); expect(urlStreamProviderMock.processURL(EasyMock.isA(String.class), EasyMock.isA(String.class), - isNull(String.class), EasyMock.<Map<String, List<String>>>anyObject())).andReturn(httpURLConnectionMock).times(2); + isNull(String.class), EasyMock.anyObject())).andReturn(httpURLConnectionMock).times(2); replay(httpURLConnectionMock, urlStreamProviderMock); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java index 436434d..934e38b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/tasks/TaskStatusListenerTest.java @@ -38,7 +38,6 @@ import org.apache.ambari.server.orm.dao.HostDAO; import org.apache.ambari.server.orm.dao.RequestDAO; import org.apache.ambari.server.orm.dao.StageDAO; import org.apache.ambari.server.orm.entities.RequestEntity; -import org.apache.ambari.server.orm.entities.RoleSuccessCriteriaEntity; import org.apache.ambari.server.orm.entities.StageEntity; import org.apache.ambari.server.orm.entities.StageEntityPK; import org.apache.ambari.server.state.ServiceComponentHostEvent; @@ -91,7 +90,7 @@ public class TaskStatusListenerTest extends EasyMockSupport { EasyMock.expect(stageEntity.getStatus()).andReturn(hostRoleStatus).anyTimes();; EasyMock.expect(stageEntity.getDisplayStatus()).andReturn(hostRoleStatus).anyTimes(); EasyMock.expect(stageEntity.isSkippable()).andReturn(Boolean.FALSE).anyTimes();; - EasyMock.expect(stageEntity.getRoleSuccessCriterias()).andReturn(Collections.<RoleSuccessCriteriaEntity>emptyList()).anyTimes(); + EasyMock.expect(stageEntity.getRoleSuccessCriterias()).andReturn(Collections.emptyList()).anyTimes(); EasyMock.expect(stageDAO.findByPK(anyObject(StageEntityPK.class))).andReturn(stageEntity).anyTimes(); EasyMock.expect(requestEntity.getStatus()).andReturn(hostRoleStatus).anyTimes();; EasyMock.expect(requestEntity.getDisplayStatus()).andReturn(hostRoleStatus).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java index 2b6fe2a..effe078 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/hooks/users/UserHookServiceTest.java @@ -158,7 +158,7 @@ public class UserHookServiceTest extends EasyMockSupport { replayAll(); // WHEN - Boolean triggered = hookService.execute(new PostUserCreationHookContext(Collections.<String, Set<String>>emptyMap())); + Boolean triggered = hookService.execute(new PostUserCreationHookContext(Collections.emptyMap())); //THEN Assert.assertFalse("The hook should not be triggered if there is no users in the context!", triggered); @@ -216,7 +216,7 @@ public class UserHookServiceTest extends EasyMockSupport { // TBD refine expectations to validate the logic / eg capture arguments stageMock.addServerActionCommand(EasyMock.anyString(), EasyMock.anyString(), EasyMock.anyObject(Role.class), EasyMock.anyObject(RoleCommand.class), EasyMock.anyString(), EasyMock.anyObject(ServiceComponentHostServerActionEvent.class), - EasyMock.<Map<String, String>>anyObject(), EasyMock.anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject(), EasyMock.anyInt(), EasyMock.anyBoolean(), EasyMock.anyBoolean()); + EasyMock.anyObject(), EasyMock.anyString(), EasyMock.anyObject(), EasyMock.anyInt(), EasyMock.anyBoolean(), EasyMock.anyBoolean()); EasyMock.expect(requestFactoryMock.createNewFromStages(Arrays.asList(stageMock), "{}")).andReturn(null); EasyMock.expect(stageFactoryMock.createNew(1, "/var/lib/ambari-server/tmp:1", "test-cluster", 1, "Post user creation hook for [ 1 ] users", "{}", "{}")).andReturn(stageMock); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java index 271d536..2c6c096 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java @@ -299,7 +299,7 @@ public class OrmTestHelper { commandEntity2.setStage(stageEntity); commandEntity3.setStage(stageEntity); - stageEntity.setHostRoleCommands(new ArrayList<HostRoleCommandEntity>()); + stageEntity.setHostRoleCommands(new ArrayList<>()); stageEntity.getHostRoleCommands().add(commandEntity); stageEntity.getHostRoleCommands().add(commandEntity2); stageEntity.getHostRoleCommands().add(commandEntity3); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java index 3b59b73..8d453c4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java @@ -91,12 +91,12 @@ public class HostRoleCommandDAOTest { RequestEntity requestEntity = new RequestEntity(); requestEntity.setRequestId(requestId); requestEntity.setClusterId(clusterEntity.getClusterId()); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); m_requestDAO.create(requestEntity); AtomicLong stageId = new AtomicLong(1); HostEntity host = m_hostDAO.findByName("test_host1"); - host.setHostRoleCommandEntities(new ArrayList<HostRoleCommandEntity>()); + host.setHostRoleCommandEntities(new ArrayList<>()); createStage(stageId.getAndIncrement(), 3, host, requestEntity, HostRoleStatus.COMPLETED); createStage(stageId.getAndIncrement(), 2, host, requestEntity, HostRoleStatus.SKIPPED_FAILED); @@ -126,12 +126,12 @@ public class HostRoleCommandDAOTest { RequestEntity requestEntity = new RequestEntity(); requestEntity.setRequestId(requestId); requestEntity.setClusterId(clusterEntity.getClusterId()); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); m_requestDAO.create(requestEntity); AtomicLong stageId = new AtomicLong(1); HostEntity host = m_hostDAO.findByName("test_host1"); - host.setHostRoleCommandEntities(new ArrayList<HostRoleCommandEntity>()); + host.setHostRoleCommandEntities(new ArrayList<>()); // start out with a stage that is skippable, supports auto skip, and has // auto skip tasks @@ -205,7 +205,7 @@ public class HostRoleCommandDAOTest { stageEntity.setClusterId(clusterEntity.getClusterId()); stageEntity.setRequest(requestEntity); stageEntity.setStageId(stageId); - stageEntity.setHostRoleCommands(new ArrayList<HostRoleCommandEntity>()); + stageEntity.setHostRoleCommands(new ArrayList<>()); stageEntity.setSkippable(skipStage); stageEntity.setAutoSkipFailureSupported(supportsAutoSkipOnFailure); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java index 432a646..c711302 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java @@ -175,11 +175,11 @@ public class RequestDAOTest { RequestEntity requestEntity = new RequestEntity(); requestEntity.setRequestId(requestId); requestEntity.setClusterId(clusterEntity.getClusterId()); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); requestDAO.create(requestEntity); HostEntity host = hostDAO.findByName(hostName); - host.setHostRoleCommandEntities(new ArrayList<HostRoleCommandEntity>()); + host.setHostRoleCommandEntities(new ArrayList<>()); long stageId = 1L; @@ -202,7 +202,7 @@ public class RequestDAOTest { stageEntity.setClusterId(clusterEntity.getClusterId()); stageEntity.setRequest(re); stageEntity.setStageId(stageId); - stageEntity.setHostRoleCommands(new ArrayList<HostRoleCommandEntity>()); + stageEntity.setHostRoleCommands(new ArrayList<>()); stageEntity.setSkippable(skipStage); stageDAO.create(stageEntity); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java index e0a490c..1a6eece 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java @@ -134,7 +134,7 @@ public class StageDAOTest { sortProperties.add(new SortRequestProperty( StageResourceProvider.STAGE_LOG_INFO, SortRequest.Order.ASC)); - Request request = PropertyHelper.getReadRequest(new HashSet<>(Arrays.<String>asList()), + Request request = PropertyHelper.getReadRequest(new HashSet<>(Arrays.asList()), null, null, null, sortRequest); // get back all 5 http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java index 59e018a..f23e10d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java @@ -35,7 +35,6 @@ import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.OrmTestHelper; import org.apache.ambari.server.orm.entities.RepositoryVersionEntity; import org.apache.ambari.server.orm.entities.RequestEntity; -import org.apache.ambari.server.orm.entities.StageEntity; import org.apache.ambari.server.orm.entities.UpgradeEntity; import org.apache.ambari.server.orm.entities.UpgradeGroupEntity; import org.apache.ambari.server.orm.entities.UpgradeItemEntity; @@ -86,7 +85,7 @@ public class UpgradeDAOTest { requestEntity.setRequestId(99L); requestEntity.setClusterId(clusterId.longValue()); requestEntity.setStatus(HostRoleStatus.PENDING); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); requestDAO.create(requestEntity); repositoryVersion2200 = helper.getOrCreateRepositoryVersion(new StackId("HDP", "2.2.0"), "2.2.0.0-1234"); @@ -167,7 +166,7 @@ public class UpgradeDAOTest { requestEntity.setRequestId(1L); requestEntity.setClusterId(clusterId.longValue()); requestEntity.setStatus(HostRoleStatus.PENDING); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); requestDAO.create(requestEntity); UpgradeEntity entity1 = new UpgradeEntity(); @@ -216,7 +215,7 @@ public class UpgradeDAOTest { requestEntity.setRequestId(1L); requestEntity.setClusterId(clusterId.longValue()); requestEntity.setStatus(HostRoleStatus.PENDING); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); requestDAO.create(requestEntity); UpgradeEntity upgradeEntity = new UpgradeEntity(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java index 2941d3d..c635697 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java @@ -73,7 +73,7 @@ public class WidgetDAOTest { widgetEntity.setWidgetName("widget" + i); widgetEntity.setWidgetType("GAUGE"); widgetEntity.setWidgetValues("${`jvmMemoryHeapUsed + jvmMemoryHeapMax`}"); - widgetEntity.setListWidgetLayoutUserWidgetEntity(new LinkedList<WidgetLayoutUserWidgetEntity>()); + widgetEntity.setListWidgetLayoutUserWidgetEntity(new LinkedList<>()); final WidgetLayoutEntity widgetLayoutEntity = new WidgetLayoutEntity(); widgetLayoutEntity.setClusterId(clusterId); widgetLayoutEntity.setLayoutName("layout name" + i); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTests.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTests.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTests.java index 6d017ce..8c20f4c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTests.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTests.java @@ -227,7 +227,7 @@ public class DDLTests { } static <T> Set<T> toSet(Optional<T> arg) { - return arg.isPresent() ? ImmutableSet.of(arg.get()) : ImmutableSet.<T>of(); + return arg.isPresent() ? ImmutableSet.of(arg.get()) : ImmutableSet.of(); } static <ContentType> List<String> compareSets(String message, Set<ContentType> base, Set<ContentType> other) { http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/HostEntityTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/HostEntityTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/HostEntityTest.java index 0758017..4a2fad0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/HostEntityTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/HostEntityTest.java @@ -36,7 +36,7 @@ public class HostEntityTest { HostEntity hostEntity = new HostEntity(); HostComponentDesiredStateEntity stateEntity = new HostComponentDesiredStateEntity(); - hostEntity.setHostComponentDesiredStateEntities(new HashSet<HostComponentDesiredStateEntity>()); + hostEntity.setHostComponentDesiredStateEntities(new HashSet<>()); Collection<HostComponentDesiredStateEntity> stateEntities = hostEntity.getHostComponentDesiredStateEntities(); assertTrue(stateEntities.isEmpty()); @@ -53,7 +53,7 @@ public class HostEntityTest { HostEntity hostEntity = new HostEntity(); HostComponentDesiredStateEntity stateEntity = new HostComponentDesiredStateEntity(); - hostEntity.setHostComponentDesiredStateEntities(new HashSet<HostComponentDesiredStateEntity>()); + hostEntity.setHostComponentDesiredStateEntities(new HashSet<>()); Collection<HostComponentDesiredStateEntity> stateEntities = hostEntity.getHostComponentDesiredStateEntities(); assertTrue(stateEntities.isEmpty()); @@ -69,7 +69,7 @@ public class HostEntityTest { HostEntity hostEntity = new HostEntity(); HostComponentDesiredStateEntity stateEntity = new HostComponentDesiredStateEntity(); - hostEntity.setHostComponentDesiredStateEntities(new HashSet<HostComponentDesiredStateEntity>()); + hostEntity.setHostComponentDesiredStateEntities(new HashSet<>()); Collection<HostComponentDesiredStateEntity> stateEntities = hostEntity.getHostComponentDesiredStateEntities(); assertTrue(stateEntities.isEmpty()); @@ -90,7 +90,7 @@ public class HostEntityTest { HostEntity hostEntity = new HostEntity(); HostComponentStateEntity stateEntity = new HostComponentStateEntity(); - hostEntity.setHostComponentStateEntities(new HashSet<HostComponentStateEntity>()); + hostEntity.setHostComponentStateEntities(new HashSet<>()); Collection<HostComponentStateEntity> stateEntities = hostEntity.getHostComponentStateEntities(); assertTrue(stateEntities.isEmpty()); @@ -108,7 +108,7 @@ public class HostEntityTest { HostEntity hostEntity = new HostEntity(); HostComponentStateEntity stateEntity = new HostComponentStateEntity(); - hostEntity.setHostComponentStateEntities(new HashSet<HostComponentStateEntity>()); + hostEntity.setHostComponentStateEntities(new HashSet<>()); Collection<HostComponentStateEntity> stateEntities = hostEntity.getHostComponentStateEntities(); assertTrue(stateEntities.isEmpty()); @@ -125,7 +125,7 @@ public class HostEntityTest { HostEntity hostEntity = new HostEntity(); HostComponentStateEntity stateEntity = new HostComponentStateEntity(); - hostEntity.setHostComponentStateEntities(new HashSet<HostComponentStateEntity>()); + hostEntity.setHostComponentStateEntities(new HashSet<>()); Collection<HostComponentStateEntity> stateEntities = hostEntity.getHostComponentStateEntities(); assertTrue(stateEntities.isEmpty()); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncEventEntityTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncEventEntityTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncEventEntityTest.java index 374b1ef..676dd1f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncEventEntityTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncEventEntityTest.java @@ -63,7 +63,7 @@ public class LdapSyncEventEntityTest { public void testSetGetSpecs() throws Exception { LdapSyncEventEntity event = new LdapSyncEventEntity(1L); LdapSyncSpecEntity spec = new LdapSyncSpecEntity(LdapSyncSpecEntity.PrincipalType.GROUPS, - LdapSyncSpecEntity.SyncType.ALL, Collections.<String>emptyList()); + LdapSyncSpecEntity.SyncType.ALL, Collections.emptyList()); event.setSpecs(Collections.singletonList(spec)); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncSpecEntityTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncSpecEntityTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncSpecEntityTest.java index f863ffb..bacee4a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncSpecEntityTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/LdapSyncSpecEntityTest.java @@ -32,22 +32,22 @@ public class LdapSyncSpecEntityTest { @Test public void testGetPrincipalType() throws Exception { LdapSyncSpecEntity entity = new LdapSyncSpecEntity(LdapSyncSpecEntity.PrincipalType.USERS, - LdapSyncSpecEntity.SyncType.ALL, Collections.<String>emptyList()); + LdapSyncSpecEntity.SyncType.ALL, Collections.emptyList()); Assert.assertEquals(LdapSyncSpecEntity.PrincipalType.USERS, entity.getPrincipalType()); entity = new LdapSyncSpecEntity(LdapSyncSpecEntity.PrincipalType.GROUPS, - LdapSyncSpecEntity.SyncType.ALL, Collections.<String>emptyList()); + LdapSyncSpecEntity.SyncType.ALL, Collections.emptyList()); Assert.assertEquals(LdapSyncSpecEntity.PrincipalType.GROUPS, entity.getPrincipalType()); } @Test public void testGetSyncType() throws Exception { LdapSyncSpecEntity entity = new LdapSyncSpecEntity(LdapSyncSpecEntity.PrincipalType.USERS, - LdapSyncSpecEntity.SyncType.ALL, Collections.<String>emptyList()); + LdapSyncSpecEntity.SyncType.ALL, Collections.emptyList()); Assert.assertEquals(LdapSyncSpecEntity.SyncType.ALL, entity.getSyncType()); entity = new LdapSyncSpecEntity(LdapSyncSpecEntity.PrincipalType.USERS, - LdapSyncSpecEntity.SyncType.EXISTING, Collections.<String>emptyList()); + LdapSyncSpecEntity.SyncType.EXISTING, Collections.emptyList()); Assert.assertEquals(LdapSyncSpecEntity.SyncType.EXISTING, entity.getSyncType()); } @@ -66,7 +66,7 @@ public class LdapSyncSpecEntityTest { public void testIllegalConstruction() throws Exception { try { new LdapSyncSpecEntity(LdapSyncSpecEntity.PrincipalType.USERS, - LdapSyncSpecEntity.SyncType.SPECIFIC, Collections.<String>emptyList()); + LdapSyncSpecEntity.SyncType.SPECIFIC, Collections.emptyList()); Assert.fail("expected IllegalArgumentException"); } catch (IllegalArgumentException e) { // expected http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java index 966123e..f901bda 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java @@ -615,13 +615,13 @@ public class ExecutionScheduleManagerTest { expect(context.getJobDetail()).andReturn(jobDetail).anyTimes(); expect(context.getMergedJobDataMap()).andReturn(jobDataMap).anyTimes(); expect(jobDetail.getKey()).andReturn(new JobKey("TestJob")); - expect(jobDataMap.getWrappedMap()).andReturn(new HashMap<String,Object>()); + expect(jobDataMap.getWrappedMap()).andReturn(new HashMap<>()); expect(scheduleManagerMock.continueOnMisfire(context)).andReturn(true); - executionJob.doWork(EasyMock.<Map<String, Object>>anyObject()); + executionJob.doWork(EasyMock.anyObject()); expectLastCall().andThrow(new AmbariException("Test Exception")).anyTimes(); - executionJob.finalizeExecution(EasyMock.<Map<String, Object>>anyObject()); + executionJob.finalizeExecution(EasyMock.anyObject()); expectLastCall().once(); replay(scheduleManagerMock, executionJob, context, jobDataMap, jobDetail); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthenticationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthenticationTest.java index e7681e8..64ec201 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthenticationTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthenticationTest.java @@ -37,7 +37,6 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.web.context.request.RequestAttributes; @@ -123,7 +122,7 @@ public class AmbariAuthenticationTest extends EasyMockSupport { @Test public void testGetUserDetailPrincipal() throws Exception { // Given - UserDetails userDetails = new User("user", "password", Collections.<GrantedAuthority>emptyList()); + UserDetails userDetails = new User("user", "password", Collections.emptyList()); Authentication authentication = new TestingAuthenticationToken(userDetails, userDetails.getPassword()); Authentication ambariAuthentication = new AmbariAuthentication(authentication, DEFAULT_USER_ID); @@ -138,7 +137,7 @@ public class AmbariAuthenticationTest extends EasyMockSupport { @Test public void testGetUserDetailPrincipalWithLoginAlias() throws Exception { // Given - UserDetails userDetails = new User("loginAlias", "password", Collections.<GrantedAuthority>emptyList()); + UserDetails userDetails = new User("loginAlias", "password", Collections.emptyList()); Authentication authentication = new TestingAuthenticationToken(userDetails, userDetails.getPassword()); expect(servletRequestAttributes.getAttribute(eq("loginAlias"), eq(RequestAttributes.SCOPE_SESSION))) @@ -153,7 +152,7 @@ public class AmbariAuthenticationTest extends EasyMockSupport { // Then verify(); - UserDetails expectedUserDetails = new User("user", "password", Collections.<GrantedAuthority>emptyList()); // user detail with login alias resolved + UserDetails expectedUserDetails = new User("user", "password", Collections.emptyList()); // user detail with login alias resolved assertEquals(expectedUserDetails, principal); } @@ -214,7 +213,7 @@ public class AmbariAuthenticationTest extends EasyMockSupport { @Test public void testGetNameWithUserDetailsPrincipal() throws Exception { // Given - UserDetails userDetails = new User("user", "password", Collections.<GrantedAuthority>emptyList()); + UserDetails userDetails = new User("user", "password", Collections.emptyList()); Authentication authentication = new TestingAuthenticationToken(userDetails, userDetails.getPassword()); Authentication ambariAuthentication = new AmbariAuthentication(authentication, DEFAULT_USER_ID); @@ -229,7 +228,7 @@ public class AmbariAuthenticationTest extends EasyMockSupport { @Test public void testGetNameWithUserDetailsPrincipalWithLoginAlias() throws Exception { // Given - UserDetails userDetails = new User("loginAlias", "password", Collections.<GrantedAuthority>emptyList()); + UserDetails userDetails = new User("loginAlias", "password", Collections.emptyList()); Authentication authentication = new TestingAuthenticationToken(userDetails, userDetails.getPassword()); expect(servletRequestAttributes.getAttribute(eq("loginAlias"), eq(RequestAttributes.SCOPE_SESSION))) http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java index 15e243e..e6c3099 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariAuthorizationFilterTest.java @@ -29,8 +29,6 @@ import java.util.Collections; import javax.persistence.EntityManager; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -309,7 +307,7 @@ public class AmbariAuthorizationFilterTest { expect(request.getQueryString()).andReturn(null).anyTimes(); expect(request.getMethod()).andReturn("GET").anyTimes(); - chain.doFilter(EasyMock.<ServletRequest>anyObject(), EasyMock.<ServletResponse>anyObject()); + chain.doFilter(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().once(); final Configuration configuration = EasyMock.createMock(Configuration.class); @@ -321,7 +319,7 @@ public class AmbariAuthorizationFilterTest { final Users users = EasyMock.createMock(Users.class); expect(users.getUser("user1", UserType.LOCAL)).andReturn(user).once(); - expect(users.getUserAuthorities("user1", UserType.LOCAL)).andReturn(Collections.<AmbariGrantedAuthority>emptyList()).once(); + expect(users.getUserAuthorities("user1", UserType.LOCAL)).andReturn(Collections.emptyList()).once(); replay(request, response, chain, configuration, users, user); @@ -385,7 +383,7 @@ public class AmbariAuthorizationFilterTest { expect(filter.getSecurityContext()).andReturn(securityContext).anyTimes(); expect(filter.getViewRegistry()).andReturn(viewRegistry).anyTimes(); expect(securityContext.getAuthentication()).andReturn(authentication).anyTimes(); - expect(viewRegistry.checkPermission(EasyMock.eq("DeniedView"), EasyMock.<String>anyObject(), EasyMock.<String>anyObject(), EasyMock.anyBoolean())).andReturn(false).anyTimes(); + expect(viewRegistry.checkPermission(EasyMock.eq("DeniedView"), EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyBoolean())).andReturn(false).anyTimes(); replay(filterConfig, filter, securityContext, viewRegistry, configuration, auditLogger); @@ -408,7 +406,7 @@ public class AmbariAuthorizationFilterTest { } if (urlTest.getValue()) { - chain.doFilter(EasyMock.<ServletRequest>anyObject(), EasyMock.<ServletResponse>anyObject()); + chain.doFilter(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().once(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java index 0483b04..f2e2e00 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariUserAuthenticationFilterTest.java @@ -75,7 +75,7 @@ public class AmbariUserAuthenticationFilterTest { User user = combineUser(); expect(users.getUser(TEST_USER_ID)).andReturn(user); - expect(users.getUserAuthorities(user.getUserName(), user.getUserType())).andReturn(new HashSet<AmbariGrantedAuthority>()); + expect(users.getUserAuthorities(user.getUserName(), user.getUserType())).andReturn(new HashSet<>()); Capture<String> userHeaderValue = newCapture(); response.setHeader(eq("User"), capture(userHeaderValue)); expectLastCall(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/UsersTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/UsersTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/UsersTest.java index ac91c90..29c21a7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/UsersTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/UsersTest.java @@ -164,9 +164,9 @@ public class UsersTest extends EasyMockSupport { existing.setUserName(UserName.fromString(SERVICEOP_USER_NAME)); existing.setUserType(UserType.LDAP); existing.setUserId(1); - existing.setMemberEntities(Collections.<MemberEntity>emptySet()); + existing.setMemberEntities(Collections.emptySet()); PrincipalEntity principal = new PrincipalEntity(); - principal.setPrivileges(Collections.<PrivilegeEntity>emptySet()); + principal.setPrivileges(Collections.emptySet()); existing.setPrincipal(principal); initForCreateUser(existing); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java index 63b6927..afd6f6d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulatorTest.java @@ -52,7 +52,6 @@ import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.orm.entities.GroupEntity; import org.apache.ambari.server.orm.entities.MemberEntity; import org.apache.ambari.server.orm.entities.PrincipalEntity; -import org.apache.ambari.server.orm.entities.PrivilegeEntity; import org.apache.ambari.server.orm.entities.UserEntity; import org.apache.ambari.server.security.authorization.AmbariLdapUtils; import org.apache.ambari.server.security.authorization.Group; @@ -154,7 +153,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(configuration.isLdapConfigured()).andReturn(true); - expect(ldapTemplate.search(EasyMock.<String>anyObject(), EasyMock.<String>anyObject(), EasyMock.<AttributesMapper>anyObject())).andThrow(new NullPointerException()).once(); + expect(ldapTemplate.search(EasyMock.<String>anyObject(), EasyMock.anyObject(), EasyMock.<AttributesMapper>anyObject())).andThrow(new NullPointerException()).once(); replay(ldapTemplate, configuration, ldapServerProperties); final AmbariLdapDataPopulatorTestInstance populator = new AmbariLdapDataPopulatorTestInstance(configuration, users); @@ -201,7 +200,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(configuration.isLdapConfigured()).andReturn(true); - expect(ldapTemplate.search(EasyMock.<String>anyObject(), EasyMock.<String>anyObject(), EasyMock.<AttributesMapper>anyObject())).andReturn(Collections.emptyList()).once(); + expect(ldapTemplate.search(EasyMock.<String>anyObject(), EasyMock.anyObject(), EasyMock.<AttributesMapper>anyObject())).andReturn(Collections.emptyList()).once(); replay(ldapTemplate, configuration); final AmbariLdapDataPopulatorTestInstance populator = new AmbariLdapDataPopulatorTestInstance(configuration, users); @@ -261,7 +260,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3, group4, group5); @@ -272,13 +271,13 @@ public class AmbariLdapDataPopulatorTest { .withConstructor(configuration, users) .createNiceMock(); - expect(populator.getLdapGroups("group2")).andReturn(Collections.<LdapGroupDto>emptySet()); + expect(populator.getLdapGroups("group2")).andReturn(Collections.emptySet()); LdapGroupDto externalGroup1 = createNiceMock(LdapGroupDto.class); LdapBatchDto batchInfo = new LdapBatchDto(); - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup1), EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup1), EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); expect(populator.getLdapGroups("group4")).andReturn(Collections.singleton(externalGroup1)); - expect(populator.getLdapGroups("group5")).andReturn(Collections.<LdapGroupDto>emptySet()); + expect(populator.getLdapGroups("group5")).andReturn(Collections.emptySet()); replay(populator); populator.setLdapTemplate(ldapTemplate); @@ -315,7 +314,7 @@ public class AmbariLdapDataPopulatorTest { Configuration configuration = createNiceMock(Configuration.class); Users users = createNiceMock(Users.class); expect(users.getAllGroups()).andReturn(Arrays.asList(group1, group2)); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); expect(configuration.getLdapServerProperties()).andReturn(new LdapServerProperties()).anyTimes(); LdapGroupDto group1Dto = new LdapGroupDto(); @@ -326,7 +325,7 @@ public class AmbariLdapDataPopulatorTest { LdapGroupDto group2Dto = new LdapGroupDto(); group2Dto.setGroupName("group2"); - group2Dto.setMemberAttributes(Collections.<String>emptySet()); + group2Dto.setMemberAttributes(Collections.emptySet()); Set<LdapGroupDto> groupDtos2 = Sets.newHashSet(); groupDtos2.add(group2Dto); @@ -375,7 +374,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3, group4); @@ -400,14 +399,14 @@ public class AmbariLdapDataPopulatorTest { Set<LdapGroupDto> externalGroups = createSet(externalGroup3, externalGroup4); for (LdapGroupDto externalGroup : externalGroups) { populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), - EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); } populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup1), - EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + EasyMock.anyObject(), EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), EasyMock.<Map<String, User>>anyObject(), - EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), EasyMock.anyObject(), + EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); expect(populator.getLdapGroups("x*")).andReturn(externalGroups); expect(populator.getLdapGroups("group1")).andReturn(Collections.singleton(externalGroup1)); @@ -460,7 +459,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3, group4); @@ -485,12 +484,12 @@ public class AmbariLdapDataPopulatorTest { LdapBatchDto batchInfo = new LdapBatchDto(); Set<LdapGroupDto> externalGroups = createSet(externalGroup3, externalGroup4); for (LdapGroupDto externalGroup : externalGroups) { - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(), - EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.anyObject(), EasyMock.anyObject(), + EasyMock.anyObject(), anyBoolean()); expectLastCall(); } - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), EasyMock.<Map<String, User>>anyObject(), - EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), EasyMock.anyObject(), + EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); expect(populator.getLdapGroups("x*")).andReturn(externalGroups); expect(populator.getLdapGroups("group2")).andReturn(Collections.singleton(externalGroup2)); @@ -537,7 +536,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3, group4); @@ -561,8 +560,8 @@ public class AmbariLdapDataPopulatorTest { LdapBatchDto batchInfo = new LdapBatchDto(); Set<LdapGroupDto> externalGroups = createSet(externalGroup1, externalGroup2, externalGroup3, externalGroup4); for (LdapGroupDto externalGroup : externalGroups) { - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(), - EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.anyObject(), + EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); } expect(populator.getLdapGroups("group*")).andReturn(externalGroups); @@ -609,7 +608,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3, group4); @@ -633,7 +632,7 @@ public class AmbariLdapDataPopulatorTest { LdapBatchDto batchInfo = new LdapBatchDto(); Set<LdapGroupDto> externalGroups = createSet(externalGroup3, externalGroup4); expect(populator.getLdapGroups("x*")).andReturn(externalGroups); - expect(populator.getLdapGroups("group1")).andReturn(Collections.<LdapGroupDto>emptySet()); + expect(populator.getLdapGroups("group1")).andReturn(Collections.emptySet()); expect(populator.getLdapGroups("group2")).andReturn(Collections.singleton(externalGroup2)); replay(populator); @@ -669,7 +668,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3, group4, group5); @@ -692,8 +691,8 @@ public class AmbariLdapDataPopulatorTest { LdapBatchDto batchInfo = new LdapBatchDto(); Set<LdapGroupDto> externalGroups = createSet(externalGroup1, externalGroup2, externalGroup3, externalGroup4); for (LdapGroupDto externalGroup : externalGroups) { - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(), - EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.anyObject(), + EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); } @@ -736,7 +735,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(Arrays.asList(group1, group2)); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2); @@ -754,8 +753,8 @@ public class AmbariLdapDataPopulatorTest { LdapBatchDto batchInfo = new LdapBatchDto(); Set<LdapGroupDto> externalGroups = createSet(externalGroup1, externalGroup2); for (LdapGroupDto externalGroup : externalGroups) { - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(), - EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.anyObject(), + EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); } expect(populator.getExternalLdapGroupInfo()).andReturn(externalGroups); @@ -803,7 +802,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3, group4); @@ -819,8 +818,8 @@ public class AmbariLdapDataPopulatorTest { LdapBatchDto batchInfo = new LdapBatchDto(); Set<LdapGroupDto> externalGroups = createSet(externalGroup1); for (LdapGroupDto externalGroup : externalGroups) { - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(), - EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.anyObject(), + EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); } expect(populator.getExternalLdapGroupInfo()).andReturn(externalGroups); @@ -865,7 +864,7 @@ public class AmbariLdapDataPopulatorTest { LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class); LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class); expect(users.getAllGroups()).andReturn(groupList); - expect(users.getAllUsers()).andReturn(Collections.<User>emptyList()); + expect(users.getAllUsers()).andReturn(Collections.emptyList()); replay(ldapTemplate, ldapServerProperties, users, configuration); replay(group1, group2, group3); @@ -883,8 +882,8 @@ public class AmbariLdapDataPopulatorTest { LdapBatchDto batchInfo = new LdapBatchDto(); Set<LdapGroupDto> externalGroups = createSet(externalGroup1, externalGroup2); for (LdapGroupDto externalGroup : externalGroups) { - populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(), - EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean()); + populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.anyObject(), + EasyMock.anyObject(), EasyMock.anyObject(), anyBoolean()); expectLastCall(); } expect(populator.getExternalLdapGroupInfo()).andReturn(externalGroups); @@ -1117,7 +1116,7 @@ public class AmbariLdapDataPopulatorTest { .createNiceMock(); - expect(populator.getExternalLdapUserInfo()).andReturn(Collections.<LdapUserDto>emptySet()); + expect(populator.getExternalLdapUserInfo()).andReturn(Collections.emptySet()); replay(populator); populator.setLdapTemplate(ldapTemplate); @@ -1228,7 +1227,7 @@ public class AmbariLdapDataPopulatorTest { .withConstructor(configuration, users) .createNiceMock(); - expect(populator.getLdapUsers("synced_user1")).andReturn(Collections.<LdapUserDto>emptySet()); + expect(populator.getLdapUsers("synced_user1")).andReturn(Collections.emptySet()); expect(populator.getLdapUsers("synced_user2")).andReturn(Collections.singleton(createNiceMock(LdapUserDto.class))); replay(populator); @@ -1470,7 +1469,7 @@ public class AmbariLdapDataPopulatorTest { expect(populator.getLdapUsers("xuser*")).andReturn(createSet(externalUser3, externalUser4)); expect(populator.getLdapUsers("user1")).andReturn(Collections.singleton(externalUser1)); - expect(populator.getLdapUsers("user2")).andReturn(Collections.<LdapUserDto>emptySet()); + expect(populator.getLdapUsers("user2")).andReturn(Collections.emptySet()); replay(populator); populator.setLdapTemplate(ldapTemplate); @@ -1592,7 +1591,7 @@ public class AmbariLdapDataPopulatorTest { ldapGroup.setGroupId(1); ldapGroup.setGroupName("ldapGroup"); ldapGroup.setGroupType(GroupType.LDAP); - ldapGroup.setMemberEntities(new HashSet<MemberEntity>()); + ldapGroup.setMemberEntities(new HashSet<>()); final User ldapUserWithoutGroup = createLdapUserWithoutGroup(); final User ldapUserWithGroup = createLdapUserWithGroup(ldapGroup); @@ -1975,9 +1974,9 @@ public class AmbariLdapDataPopulatorTest { userEntity.setCreateTime(new Date()); userEntity.setLdapUser(ldapUser); userEntity.setActive(true); - userEntity.setMemberEntities(new HashSet<MemberEntity>()); + userEntity.setMemberEntities(new HashSet<>()); final PrincipalEntity principalEntity = new PrincipalEntity(); - principalEntity.setPrivileges(new HashSet<PrivilegeEntity>()); + principalEntity.setPrivileges(new HashSet<>()); userEntity.setPrincipal(principalEntity); if (group != null) { final MemberEntity member = new MemberEntity(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java index 4d1b48b..33321db 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java @@ -133,7 +133,7 @@ public class ServerActionExecutorTest { stage.addServerActionCommand(ManualStageAction.class.getName(), null, Role.AMBARI_SERVER_ACTION, RoleCommand.EXECUTE, "cluster1", new ServiceComponentHostServerActionEvent(StageUtils.getHostName(), System.currentTimeMillis()), - Collections.<String, String> emptyMap(), null, null, 1200, false, false); + Collections.emptyMap(), null, null, 1200, false, false); final List<Stage> stages = new ArrayList<Stage>() { { http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java index 49f8d56..483cc0a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java @@ -687,7 +687,7 @@ public class ADKerberosOperationHandlerTest extends KerberosOperationHandlerTest replayAll(); - Map<String, String> kerberosConfiguration = new HashMap<String, String>(); + Map<String, String> kerberosConfiguration = new HashMap<>(); kerberosConfiguration.put(ADKerberosOperationHandler.KERBEROS_ENV_LDAP_URL, DEFAULT_LDAP_URL); kerberosConfiguration.put(ADKerberosOperationHandler.KERBEROS_ENV_PRINCIPAL_CONTAINER_DN, DEFAULT_PRINCIPAL_CONTAINER_DN); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java index 53d2a1b..8b679bf 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java @@ -149,7 +149,7 @@ public class FinalizeKerberosServerActionTest extends EasyMockSupport { expect(executionCommand.getCommandParams()).andReturn(commandParams).anyTimes(); expect(executionCommand.getRoleCommand()).andReturn(RoleCommand.EXECUTE).anyTimes(); expect(executionCommand.getRole()).andReturn(Role.AMBARI_SERVER_ACTION.name()).anyTimes(); - expect(executionCommand.getConfigurationTags()).andReturn(Collections.<String, Map<String, String>>emptyMap()).anyTimes(); + expect(executionCommand.getConfigurationTags()).andReturn(Collections.emptyMap()).anyTimes(); expect(executionCommand.getServiceName()).andReturn("AMBARI_SERVER").anyTimes(); expect(executionCommand.getTaskId()).andReturn(3L).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java index 68f6f6d..88c841c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java @@ -260,7 +260,7 @@ public abstract class KerberosOperationHandlerTest extends EasyMockSupport { Assert.assertEquals("\\/\\,\\\\\\#\\+\\<\\>\\;\\\"\\=\\ ", handler.escapeCharacters("/,\\#+<>;\"= ", specialCharacters, '\\')); Assert.assertEquals("nothing<>special#here!", handler.escapeCharacters("nothing<>special#here!", null, '\\')); - Assert.assertEquals("nothing<>special#here!", handler.escapeCharacters("nothing<>special#here!", Collections.<Character>emptySet(), '\\')); + Assert.assertEquals("nothing<>special#here!", handler.escapeCharacters("nothing<>special#here!", Collections.emptySet(), '\\')); Assert.assertEquals("nothing<>special#here!", handler.escapeCharacters("nothing<>special#here!", Collections.singleton('?'), '\\')); Assert.assertEquals("\\A's are special!", handler.escapeCharacters("A's are special!", Collections.singleton('A'), '\\')); }
