You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/12/16 22:02:20 UTC
[12/51] [abbrv] ambari git commit: AMBARI-19149. Code cleanup:
compiler warnings (Attila Doroszlai via ncole)
AMBARI-19149. Code cleanup: compiler warnings (Attila Doroszlai via ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edce0b11
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edce0b11
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edce0b11
Branch: refs/heads/branch-dev-patch-upgrade
Commit: edce0b1173b6629e50b053be140490fa288ec361
Parents: 4a5b2f6
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Dec 16 11:18:40 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Dec 16 11:18:40 2016 -0500
----------------------------------------------------------------------
ambari-server/pom.xml | 6 +
.../api/predicate/operators/InOperator.java | 2 +-
.../RepositoryVersionEventCreator.java | 8 +-
.../checks/DatabaseConsistencyCheckHelper.java | 7 +-
.../server/collections/PredicateUtils.java | 7 +-
.../AmbariManagementControllerImpl.java | 2 +-
.../controller/ExtensionLinkResponse.java | 2 +-
.../controller/ExtensionVersionResponse.java | 2 +-
.../ActiveWidgetLayoutResourceProvider.java | 2 +-
.../scheduler/ExecutionScheduleManager.java | 6 +-
.../kerberos/IPAKerberosOperationHandler.java | 2 +-
.../users/PostUserCreationHookServerAction.java | 2 +-
.../ambari/server/stack/ExtensionModule.java | 2 +-
.../apache/ambari/server/state/ServiceInfo.java | 6 +-
.../server/state/fsm/StateMachineFactory.java | 20 ++-
.../kerberos/KerberosIdentityDescriptor.java | 2 +-
.../server/topology/AsyncCallableService.java | 2 +-
.../ambari/server/update/HostUpdateHelper.java | 2 +-
.../server/upgrade/StackUpgradeHelper.java | 2 +-
.../server/upgrade/UpgradeCatalog221.java | 2 +-
.../server/upgrade/UpgradeCatalog240.java | 2 +-
.../apache/ambari/server/utils/Parallel.java | 4 +-
.../server/view/ViewDirectoryWatcher.java | 3 +-
.../ambari/server/StateRecoveryManagerTest.java | 35 ++---
.../actionmanager/TestActionScheduler.java | 4 +-
.../server/agent/HeartbeatProcessorTest.java | 29 ++--
.../server/agent/TestHeartbeatHandler.java | 27 ++--
.../api/handlers/QueryCreateHandlerTest.java | 3 +-
.../server/api/handlers/ReadHandlerTest.java | 3 +-
.../server/api/predicate/QueryParserTest.java | 12 +-
.../ambari/server/api/query/QueryImplTest.java | 13 +-
.../resources/BaseResourceDefinitionTest.java | 7 +-
.../server/api/services/AmbariMetaInfoTest.java | 4 +-
.../server/api/services/BaseServiceTest.java | 2 +-
.../audit/request/DefaultEventCreatorTest.java | 2 +-
.../creator/AuditEventCreatorTestBase.java | 2 +-
.../cleanup/CleanupServiceFunctionalTest.java | 2 +-
.../server/cleanup/CleanupServiceImplTest.java | 2 +-
.../functors/ContainsPredicateTest.java | 6 +-
.../functors/EqualsPredicateTest.java | 6 +-
.../controller/AmbariHandlerListTest.java | 7 +-
.../AmbariManagementControllerImplTest.java | 87 ++++++------
.../AmbariManagementControllerTest.java | 6 +-
.../server/controller/KerberosHelperTest.java | 131 ++++++++++---------
.../AlertDefinitionResourceProviderTest.java | 12 +-
.../AlertGroupResourceProviderTest.java | 14 +-
.../AlertHistoryResourceProviderTest.java | 2 +-
.../AlertNoticeResourceProviderTest.java | 2 +-
.../AmbariPrivilegeResourceProviderTest.java | 3 +-
.../internal/BlueprintResourceProviderTest.java | 3 +-
.../ClientConfigResourceProviderTest.java | 5 +-
.../internal/ClusterControllerImplTest.java | 2 +-
.../internal/ClusterResourceProviderTest.java | 12 +-
...ClusterStackVersionResourceProviderTest.java | 38 +++---
.../ConfigGroupResourceProviderTest.java | 5 +-
.../ConfigurationResourceProviderTest.java | 5 +-
.../internal/HostResourceProviderTest.java | 12 +-
.../HostStackVersionResourceProviderTest.java | 9 +-
.../KerberosDescriptorResourceProviderTest.java | 7 +-
.../internal/MemberResourceProviderTest.java | 9 +-
.../RemoteClusterResourceProviderTest.java | 2 +-
.../internal/RequestResourceProviderTest.java | 12 +-
.../RequestScheduleResourceProviderTest.java | 7 +-
...erviceHostComponentResourceProviderTest.java | 3 +-
.../internal/ServiceResourceProviderTest.java | 2 +-
.../SimplifyingPredicateVisitorTest.java | 3 +-
.../StackServiceResourceProviderTest.java | 7 +-
.../server/controller/internal/StackTest.java | 33 +++--
.../internal/UpgradeResourceProviderTest.java | 4 +-
.../ViewInstanceResourceProviderTest.java | 7 +-
.../internal/ViewURLResourceProviderTest.java | 2 +-
.../WidgetLayoutResourceProviderTest.java | 10 +-
.../internal/WidgetResourceProviderTest.java | 24 ++--
.../LogSearchDataRetrievalServiceTest.java | 2 +-
.../logging/LoggingRequestHelperImplTest.java | 17 +--
.../server/controller/logging/UtilsTest.java | 13 +-
.../timeline/MetricsRequestHelperTest.java | 5 +-
.../server/hooks/users/UserHookServiceTest.java | 2 +-
.../dispatchers/AmbariSNMPDispatcherTest.java | 21 ++-
.../dispatchers/SNMPDispatcherTest.java | 21 ++-
.../orm/AmbariJpaLocalTxnInterceptorTest.java | 27 ++--
.../scheduler/ExecutionScheduleManagerTest.java | 6 +-
.../ldap/AmbariLdapDataPopulatorTest.java | 82 ++++++------
.../MITKerberosOperationHandlerTest.java | 20 +--
.../UpdateKerberosConfigsServerActionTest.java | 3 +-
.../upgrades/HiveZKQuorumConfigActionTest.java | 2 +-
.../PostUserCreationHookServerActionTest.java | 2 +-
.../ambari/server/stack/RepoUtilTest.java | 2 +-
.../ambari/server/stack/StackModuleTest.java | 3 +-
.../server/state/cluster/ClusterTest.java | 5 +-
.../state/scheduler/BatchRequestJobTest.java | 9 +-
.../server/topology/AmbariContextTest.java | 16 +--
.../topology/AsyncCallableServiceTest.java | 10 +-
.../server/topology/BlueprintImplTest.java | 43 +++---
.../topology/BlueprintValidatorImplTest.java | 10 +-
.../ClusterConfigurationRequestTest.java | 13 +-
.../ClusterDeployWithStartOnlyTest.java | 3 +-
...InstallWithoutStartOnComponentLevelTest.java | 3 +-
.../ClusterInstallWithoutStartTest.java | 3 +-
.../topology/ConfigureClusterTaskTest.java | 8 +-
.../server/topology/HostGroupInfoTest.java | 2 +-
.../server/topology/TopologyManagerTest.java | 2 +-
.../server/upgrade/UpgradeCatalog200Test.java | 57 ++++----
.../server/upgrade/UpgradeCatalog210Test.java | 71 +++++-----
.../server/upgrade/UpgradeCatalog211Test.java | 21 +--
.../server/upgrade/UpgradeCatalog212Test.java | 3 +-
.../server/upgrade/UpgradeCatalog220Test.java | 14 +-
.../server/upgrade/UpgradeCatalog221Test.java | 8 +-
.../server/upgrade/UpgradeCatalog222Test.java | 8 +-
.../server/upgrade/UpgradeCatalog240Test.java | 64 ++++-----
.../server/upgrade/UpgradeCatalog250Test.java | 12 +-
.../ambari/server/utils/SetUtilsTest.java | 2 +-
.../server/view/RemoteAmbariClusterTest.java | 8 +-
.../view/ViewDataMigrationContextImplTest.java | 4 +-
.../ambari/server/view/ViewRegistryTest.java | 7 +-
.../view/persistence/DataStoreImplTest.java | 70 +++++-----
116 files changed, 746 insertions(+), 699 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 48ddb52..c2ecfe2 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -48,6 +48,7 @@
<hadoop.version>2.7.2</hadoop.version>
<empty.dir>src/main/package</empty.dir> <!-- any directory in project with not very big amount of files (not to waste-load them) -->
<el.log>ALL</el.log> <!-- log level for EclipseLink eclipselink-staticweave-maven-plugin -->
+ <xlint>none</xlint> <!-- passed to Java compiler -Xlint: flag -->
</properties>
<build>
<plugins>
@@ -109,6 +110,11 @@
<version>3.2</version>
<configuration>
<useIncrementalCompilation>false</useIncrementalCompilation>
+ <compilerArgs>
+ <arg>-Xlint:${xlint}</arg>
+ <arg>-Xmaxwarns</arg>
+ <arg>50000</arg>
+ </compilerArgs>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
index 9a6ed9a..b3f7ef6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
@@ -53,7 +53,7 @@ public class InOperator extends AbstractOperator implements RelationalOperator {
String[] tokens = val.split(",");
List<EqualsPredicate> listPredicates = new ArrayList<EqualsPredicate>();
for (String token : tokens) {
- listPredicates.add(new EqualsPredicate(prop, token.trim()));
+ listPredicates.add(new EqualsPredicate<>(prop, token.trim()));
}
return listPredicates.size() == 1 ? listPredicates.get(0) :
buildOrPredicate(listPredicates);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
index bfe3226..f5a9de7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
@@ -144,7 +144,7 @@ public class RepositoryVersionEventCreator implements RequestAuditEventCreator {
Map<String, Object> first = Iterables.getFirst(request.getBody().getPropertySets(), null);
if (first != null && first.get("operating_systems") instanceof Set) {
- Set<Object> set = (Set<Object>) first.get("operating_systems");
+ Set<?> set = (Set<?>) first.get("operating_systems");
result = createResultForOperationSystems(set);
}
return result;
@@ -155,17 +155,17 @@ public class RepositoryVersionEventCreator implements RequestAuditEventCreator {
* @param set
* @return
*/
- private SortedMap<String, List<Map<String, String>>> createResultForOperationSystems(Set<Object> set) {
+ private SortedMap<String, List<Map<String, String>>> createResultForOperationSystems(Set<?> set) {
SortedMap<String, List<Map<String, String>>> result = new TreeMap<String, List<Map<String, String>>>();
for (Object entry : set) {
if (entry instanceof Map) {
- Map<String, Object> map = (Map<String, Object>) entry;
+ Map<?, ?> map = (Map<?, ?>) entry;
String osType = (String) map.get(OperatingSystemResourceProvider.OPERATING_SYSTEM_OS_TYPE_PROPERTY_ID);
if (!result.containsKey(osType)) {
result.put(osType, new LinkedList<Map<String, String>>());
}
if (map.get("repositories") instanceof Set) {
- Set<Object> repos = (Set<Object>) map.get("repositories");
+ Set<?> repos = (Set<?>) map.get("repositories");
for (Object repo : repos) {
if (repo instanceof Map) {
Map<String, String> resultMap = buildResultRepo((Map<String, String>) repo);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 84f5966..ea5fa15 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -36,7 +36,7 @@ import java.util.Set;
import javax.inject.Provider;
import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
@@ -466,9 +466,10 @@ public class DatabaseConsistencyCheckHelper {
Provider<EntityManager> entityManagerProvider = injector.getProvider(EntityManager.class);
EntityManager entityManager = entityManagerProvider.get();
- Query query = entityManager.createNamedQuery("ClusterConfigEntity.findNotMappedClusterConfigsToService",ClusterConfigEntity.class);
+ String queryName = "ClusterConfigEntity.findNotMappedClusterConfigsToService";
+ TypedQuery<ClusterConfigEntity> query = entityManager.createNamedQuery(queryName, ClusterConfigEntity.class);
- return (List<ClusterConfigEntity>) query.getResultList();
+ return query.getResultList();
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/collections/PredicateUtils.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/collections/PredicateUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/collections/PredicateUtils.java
index 8461433..e5cacbe 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/collections/PredicateUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/collections/PredicateUtils.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.Map;
+import java.util.Objects;
import org.apache.ambari.server.collections.functors.PredicateClassFactory;
import org.apache.commons.lang.StringUtils;
@@ -53,13 +54,13 @@ public class PredicateUtils {
* @param map a map containing the details of the predicate to create.
* @return a {@link Predicate}
*/
- public static Predicate fromMap(Map<String, Object> map) {
+ public static Predicate fromMap(Map<?, ?> map) {
Predicate predicate = null;
if ((map != null) && !map.isEmpty()) {
if (map.size() == 1) {
- Map.Entry<String, Object> entry = map.entrySet().iterator().next();
- String name = entry.getKey();
+ Map.Entry<?, ?> entry = map.entrySet().iterator().next();
+ String name = Objects.toString(entry.getKey());
Class<? extends Predicate> predicateClass = PredicateClassFactory.getPredicateClass(name);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 5fe7585..5f64c18 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -3805,7 +3805,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
*/
@Override
public List<String> selectHealthyHosts(Set<String> hostList) throws AmbariException {
- List<String> healthyHosts = new ArrayList();
+ List<String> healthyHosts = new ArrayList<>();
for (String candidateHostName : hostList) {
Host candidateHost = clusters.getHost(candidateHostName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
index df262b8..10e0383 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
@@ -46,7 +46,7 @@ public class ExtensionLinkResponse implements Validable {
private Set<String> errorSet = new HashSet<String>();
public ExtensionLinkResponse(String linkId, String stackName, String stackVersion, String extensionName,
- String extensionVersion, boolean valid, Collection errorSet) {
+ String extensionVersion, boolean valid, Collection<String> errorSet) {
setLinkId(linkId);
setStackName(stackName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionVersionResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionVersionResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionVersionResponse.java
index 860a0f7..986acc6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionVersionResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionVersionResponse.java
@@ -37,7 +37,7 @@ public class ExtensionVersionResponse implements Validable{
private String parentVersion;
public ExtensionVersionResponse(String extensionVersion, String parentVersion,
- boolean valid, Collection errorSet) {
+ boolean valid, Collection<String> errorSet) {
setExtensionVersion(extensionVersion);
setParentVersion(parentVersion);
setValid(valid);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
index 13d6f98..d9a7997 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
@@ -217,7 +217,7 @@ public class ActiveWidgetLayoutResourceProvider extends AbstractControllerResour
throw new AuthorizationException();
}
- Set<HashMap> widgetLayouts = (Set) propertyMap.get(WIDGETLAYOUT);
+ Set<HashMap<String, String>> widgetLayouts = (Set) propertyMap.get(WIDGETLAYOUT);
for (HashMap<String, String> widgetLayout : widgetLayouts) {
final Long layoutId;
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
index 1d0605e..cab467f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
@@ -572,13 +572,13 @@ public class ExecutionScheduleManager {
String responseString = clientResponse.getEntity(String.class);
LOG.debug("Processing API response: status={}, body={}", retCode, responseString);
- Map httpResponseMap;
+ Map<String, Object> httpResponseMap;
try {
- httpResponseMap = gson.fromJson(responseString, Map.class);
+ httpResponseMap = gson.<Map<String, Object>>fromJson(responseString, Map.class);
LOG.debug("Processing responce as JSON");
} catch (JsonSyntaxException e) {
LOG.debug("Response is not valid JSON object. Recording as is");
- httpResponseMap = new HashMap();
+ httpResponseMap = new HashMap<>();
httpResponseMap.put("message", responseString);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
index 8cdef0e..e118747 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/IPAKerberosOperationHandler.java
@@ -996,7 +996,7 @@ public class IPAKerberosOperationHandler extends KerberosOperationHandler {
*/
class CredentialsContext {
private PrincipalKeyCredential credentials;
- Map<String, String> env = new HashMap();
+ Map<String, String> env = new HashMap<>();
private String fileName;
private List<Process> processes = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java
index b7a04e8..45bc0eb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerAction.java
@@ -70,7 +70,7 @@ public class PostUserCreationHookServerAction extends AbstractServerAction {
validateCommandParams(commandParams);
//persist user data to csv
- CollectionPersisterService csvPersisterService = collectionPersisterServiceFactory.createCsvFilePersisterService(commandParams.get(UserHookParams.CMD_INPUT_FILE.param()));
+ CollectionPersisterService<String, List<String>> csvPersisterService = collectionPersisterServiceFactory.createCsvFilePersisterService(commandParams.get(UserHookParams.CMD_INPUT_FILE.param()));
csvPersisterService.persistMap(getPayload(commandParams));
String[] cmd = assembleCommand(commandParams);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
index f67d5d2..fb38150 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionModule.java
@@ -520,7 +520,7 @@ public class ExtensionModule extends BaseModule<ExtensionModule, ExtensionInfo>
private Set<String> errorSet = new HashSet<String>();
@Override
- public Collection getErrors() {
+ public Collection<String> getErrors() {
return errorSet;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
index 00c7a64..c9d497f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
@@ -56,9 +56,9 @@ import com.google.common.collect.Multimaps;
@JsonFilter("propertiesfilter")
public class ServiceInfo implements Validable{
- public static final AbstractMap.SimpleEntry<String, String> DEFAULT_SERVICE_INSTALLABLE_PROPERTY = new AbstractMap.SimpleEntry("installable", "true");
- public static final AbstractMap.SimpleEntry<String, String> DEFAULT_SERVICE_MANAGED_PROPERTY = new AbstractMap.SimpleEntry("managed", "true");
- public static final AbstractMap.SimpleEntry<String, String> DEFAULT_SERVICE_MONITORED_PROPERTY = new AbstractMap.SimpleEntry("monitored", "true");
+ public static final AbstractMap.SimpleEntry<String, String> DEFAULT_SERVICE_INSTALLABLE_PROPERTY = new AbstractMap.SimpleEntry<>("installable", "true");
+ public static final AbstractMap.SimpleEntry<String, String> DEFAULT_SERVICE_MANAGED_PROPERTY = new AbstractMap.SimpleEntry<>("managed", "true");
+ public static final AbstractMap.SimpleEntry<String, String> DEFAULT_SERVICE_MONITORED_PROPERTY = new AbstractMap.SimpleEntry<>("monitored", "true");
/**
* Format version. Added at schema ver 2
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java
index 4f6c54b..c67b829 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java
@@ -92,11 +92,11 @@ final public class StateMachineFactory
}
private class TransitionsListNode {
- final ApplicableTransition transition;
+ final ApplicableTransition<OPERAND, STATE, EVENTTYPE, EVENT> transition;
final TransitionsListNode next;
TransitionsListNode
- (ApplicableTransition transition, TransitionsListNode next) {
+ (ApplicableTransition<OPERAND, STATE, EVENTTYPE, EVENT> transition, TransitionsListNode next) {
this.transition = transition;
this.next = next;
}
@@ -221,8 +221,8 @@ final public class StateMachineFactory
addTransition(STATE preState, STATE postState,
EVENTTYPE eventType,
SingleArcTransition<OPERAND, EVENT> hook){
- return new StateMachineFactory
- (this, new ApplicableSingleOrMultipleTransition
+ return new StateMachineFactory<>
+ (this, new ApplicableSingleOrMultipleTransition<>
(preState, eventType, new SingleInternalArc(postState, hook)));
}
@@ -244,9 +244,9 @@ final public class StateMachineFactory
addTransition(STATE preState, Set<STATE> postStates,
EVENTTYPE eventType,
MultipleArcTransition<OPERAND, EVENT, STATE> hook){
- return new StateMachineFactory
+ return new StateMachineFactory<>
(this,
- new ApplicableSingleOrMultipleTransition
+ new ApplicableSingleOrMultipleTransition<>
(preState, eventType, new MultipleInternalArc(postStates, hook)));
}
@@ -269,7 +269,7 @@ final public class StateMachineFactory
public StateMachineFactory
<OPERAND, STATE, EVENTTYPE, EVENT>
installTopology() {
- return new StateMachineFactory(this, true);
+ return new StateMachineFactory<>(this, true);
}
/**
@@ -304,7 +304,7 @@ final public class StateMachineFactory
}
private void makeStateMachineTable() {
- Stack<ApplicableTransition> stack = new Stack<ApplicableTransition>();
+ Stack<ApplicableTransition<OPERAND, STATE, EVENTTYPE, EVENT>> stack = new Stack<>();
Map<STATE, Map<EVENTTYPE, Transition<OPERAND, STATE, EVENTTYPE, EVENT>>>
prototype = new HashMap<STATE, Map<EVENTTYPE, Transition<OPERAND, STATE, EVENTTYPE, EVENT>>>();
@@ -313,9 +313,7 @@ final public class StateMachineFactory
// I use EnumMap here because it'll be faster and denser. I would
// expect most of the states to have at least one transition.
- stateMachineTable
- = new EnumMap<STATE, Map<EVENTTYPE,
- Transition<OPERAND, STATE, EVENTTYPE, EVENT>>>(prototype);
+ stateMachineTable = new EnumMap<>(prototype);
for (TransitionsListNode cursor = transitionsListNode;
cursor != null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
index fea8cfe..ae78de6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosIdentityDescriptor.java
@@ -150,7 +150,7 @@ public class KerberosIdentityDescriptor extends AbstractKerberosDescriptor {
item = data.get("when");
if (item instanceof Map) {
- setWhen(PredicateUtils.fromMap((Map<String, Object>) item));
+ setWhen(PredicateUtils.fromMap((Map<?, ?>) item));
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/topology/AsyncCallableService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/AsyncCallableService.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/AsyncCallableService.java
index 95ab6b0..9a68ea7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/AsyncCallableService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/AsyncCallableService.java
@@ -72,7 +72,7 @@ public class AsyncCallableService<T> implements Callable<T> {
LOG.info("Task execution started at: {}", startTimeInMillis);
// task execution started on a new thread
- Future future = executorService.submit(task);
+ Future<T> future = executorService.submit(task);
while (!taskCompleted(future)) {
if (!timeoutExceeded(startTimeInMillis)) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
index 4c1ef5a..119651b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/update/HostUpdateHelper.java
@@ -364,7 +364,7 @@ public class HostUpdateHelper {
for (Map.Entry<String, JsonElement> clusterEntry : hostChangesJsonObject.entrySet()) {
try {
Gson gson = new Gson();
- hostChangesFileMap.put(clusterEntry.getKey(), gson.fromJson(clusterEntry.getValue(), Map.class));
+ hostChangesFileMap.put(clusterEntry.getKey(), gson.<Map<String, String>>fromJson(clusterEntry.getValue(), Map.class));
} catch(Exception e) {
throw new AmbariException("Error occurred during mapping Json to Map structure. Please check json structure in file.", e);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeHelper.java
index f36fc85..0aab0b5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeHelper.java
@@ -151,7 +151,7 @@ public class StackUpgradeHelper {
stackUpgradeHelper.startPersistenceService();
- Map values = gson.fromJson(valueMap, Map.class);
+ Map<String, String> values = gson.<Map<String, String>>fromJson(valueMap, Map.class);
if (action.equals(STACK_ID_UPDATE_ACTION)) {
stackUpgradeHelper.updateStackVersion(values);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 50a5be7..3d263cf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -180,7 +180,7 @@ public class UpgradeCatalog221 extends AbstractUpgradeCatalog {
final AlertDefinitionEntity hiveServerProcessAlertDefinitionEntity = alertDefinitionDAO.findByName(
clusterID, "hive_server_process");
- List<AlertDefinitionEntity> hiveAlertDefinitions = new ArrayList();
+ List<AlertDefinitionEntity> hiveAlertDefinitions = new ArrayList<>();
if(hiveMetastoreProcessAlertDefinitionEntity != null) {
hiveAlertDefinitions.add(hiveMetastoreProcessAlertDefinitionEntity);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index fc724ab..66bdd76 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -1726,7 +1726,7 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
* @return
*/
private String sqlStringListFromArrayList(List<String> list) {
- List sqlList = new ArrayList<String>(list.size());
+ List<String> sqlList = new ArrayList<>(list.size());
for (String item : list) {
sqlList.add(String.format("'%s'", item.trim()));
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/utils/Parallel.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/Parallel.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/Parallel.java
index 0a3e6c4..ee69681 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/Parallel.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/Parallel.java
@@ -125,7 +125,7 @@ public class Parallel {
final LoopBody<T, R> loopBody) {
if(source == null || source.isEmpty()) {
- return new ParallelLoopResult<R>(true, (List<R>) Collections.emptyList());
+ return new ParallelLoopResult<>(true, Collections.<R>emptyList());
}
return forLoop(source, 0, source.size(), loopBody);
}
@@ -149,7 +149,7 @@ public class Parallel {
final LoopBody<T, R> loopBody) {
if(source == null || source.isEmpty() || startIndex == endIndex) {
- return new ParallelLoopResult<R>(true, (List<R>) Collections.emptyList());
+ return new ParallelLoopResult<>(true, Collections.<R>emptyList());
}
if(startIndex < 0 || startIndex >= source.size()) {
throw new IndexOutOfBoundsException("startIndex is out of bounds");
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
index 171e873..2ccf757 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
@@ -29,6 +29,7 @@ import java.nio.file.StandardWatchEventKinds;
import java.nio.file.WatchEvent;
import java.nio.file.WatchKey;
import java.nio.file.WatchService;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -69,7 +70,7 @@ public class ViewDirectoryWatcher implements DirectoryWatcher {
private static Log LOG = LogFactory.getLog(ViewDirectoryWatcher.class);
// Callbacks to hook into file processing
- private List<Function<Path, Boolean>> hooks = Lists.newArrayList(loggingHook());
+ private List<Function<Path, Boolean>> hooks = Lists.newArrayList(Collections.singleton(loggingHook()));
public void addHook(Function<Path, Boolean> hook) {
hooks.add(hook);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
index 57b57b0..a413ce3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
@@ -38,6 +38,7 @@ import org.apache.ambari.server.orm.entities.HostVersionEntity;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
import org.apache.ambari.server.state.RepositoryVersionState;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -76,14 +77,14 @@ public class StateRecoveryManagerTest {
// Adding all possible host version states
- final Capture<RepositoryVersionState> installFailedHostVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> installingHostVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> installedHostVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> outOfSyncHostVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> upgradeFailedHostVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> upgradingHostVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> upgradedHostVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> currentHostVersionCapture = new Capture<RepositoryVersionState>();
+ final Capture<RepositoryVersionState> installFailedHostVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> installingHostVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> installedHostVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> outOfSyncHostVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> upgradeFailedHostVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> upgradingHostVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> upgradedHostVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> currentHostVersionCapture = EasyMock.newCapture();
expect(hostVersionDAOMock.findAll()).andReturn(new ArrayList<HostVersionEntity>() {{
add(getHostVersionMock("install_failed_version", RepositoryVersionState.INSTALL_FAILED, installFailedHostVersionCapture));
@@ -95,14 +96,14 @@ public class StateRecoveryManagerTest {
// Adding all possible cluster version states
- final Capture<RepositoryVersionState> installFailedClusterVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> installingClusterVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> installedClusterVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> outOfSyncClusterVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> upgradeFailedClusterVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> upgradingClusterVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> upgradedClusterVersionCapture = new Capture<RepositoryVersionState>();
- final Capture<RepositoryVersionState> currentClusterVersionCapture = new Capture<RepositoryVersionState>();
+ final Capture<RepositoryVersionState> installFailedClusterVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> installingClusterVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> installedClusterVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> outOfSyncClusterVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> upgradeFailedClusterVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> upgradingClusterVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> upgradedClusterVersionCapture = EasyMock.newCapture();
+ final Capture<RepositoryVersionState> currentClusterVersionCapture = EasyMock.newCapture();
expect(clusterVersionDAOMock.findAll()).andReturn(new ArrayList<ClusterVersionEntity>() {{
add(getClusterVersionMock("install_failed_version", RepositoryVersionState.INSTALL_FAILED, installFailedClusterVersionCapture));
@@ -189,4 +190,4 @@ public class StateRecoveryManagerTest {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
index f86c02e..d73a3db 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
@@ -420,7 +420,7 @@ public class TestActionScheduler {
mock(HostRoleCommandDAO.class), mock(HostRoleCommandFactory.class)).
addMockedMethod("cancelHostRoleCommands").
createMock();
- scheduler.cancelHostRoleCommands((Collection<HostRoleCommand>)EasyMock.anyObject(),EasyMock.anyObject(String.class));
+ scheduler.cancelHostRoleCommands(EasyMock.<Collection<HostRoleCommand>>anyObject(),EasyMock.anyObject(String.class));
EasyMock.expectLastCall();
EasyMock.replay(scheduler);
scheduler.setTaskTimeoutAdjustment(false);
@@ -1419,7 +1419,7 @@ public class TestActionScheduler {
Properties properties = new Properties();
Configuration conf = new Configuration(properties);
- Capture<Collection<HostRoleCommand>> cancelCommandList = new Capture<Collection<HostRoleCommand>>();
+ Capture<Collection<HostRoleCommand>> cancelCommandList = EasyMock.newCapture();
ActionScheduler scheduler = EasyMock.createMockBuilder(ActionScheduler.class).
withConstructor((long)100, (long)50, db, aq, fsm, 3,
new HostsMap((String) null),
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
index 6ebd11a..4a5cb06 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
@@ -30,7 +30,6 @@ import static org.apache.ambari.server.agent.DummyHeartbeatConstants.HDFS;
import static org.apache.ambari.server.agent.DummyHeartbeatConstants.HDFS_CLIENT;
import static org.apache.ambari.server.agent.DummyHeartbeatConstants.NAMENODE;
import static org.apache.ambari.server.agent.DummyHeartbeatConstants.SECONDARY_NAMENODE;
-import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.junit.Assert.assertEquals;
@@ -208,7 +207,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}});
@@ -270,7 +269,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -354,7 +353,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -436,7 +435,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -511,7 +510,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -625,7 +624,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}}).anyTimes();
@@ -744,7 +743,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}}).anyTimes();
@@ -847,7 +846,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}}).anyTimes();
@@ -944,7 +943,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -1059,7 +1058,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -1148,7 +1147,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -1177,7 +1176,7 @@ public class HeartbeatProcessorTest {
public void testHeartBeatWithAlertAndInvalidCluster() throws Exception {
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>());
replay(am);
@@ -1239,7 +1238,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
Collections.singletonList(command)).anyTimes();
replay(am);
@@ -1346,7 +1345,7 @@ public class HeartbeatProcessorTest {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
index ac58f64..a7f8a21 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
@@ -30,7 +30,6 @@ import static org.apache.ambari.server.agent.DummyHeartbeatConstants.HDFS;
import static org.apache.ambari.server.agent.DummyHeartbeatConstants.HDFS_CLIENT;
import static org.apache.ambari.server.agent.DummyHeartbeatConstants.NAMENODE;
import static org.apache.ambari.server.agent.DummyHeartbeatConstants.SECONDARY_NAMENODE;
-import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.reset;
@@ -170,7 +169,7 @@ public class TestHeartbeatHandler {
@SuppressWarnings("unchecked")
public void testHeartbeat() throws Exception {
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(new ArrayList<HostRoleCommand>());
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(new ArrayList<HostRoleCommand>());
replay(am);
Cluster cluster = heartbeatTestHelper.getDummyCluster();
@@ -252,7 +251,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}}).anyTimes();
@@ -336,7 +335,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -834,7 +833,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, RoleCommand.INSTALL);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}});
@@ -904,7 +903,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}});
@@ -974,7 +973,7 @@ public class TestHeartbeatHandler {
ActionQueue aq = new ActionQueue();
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
}});
replay(am);
@@ -1014,7 +1013,7 @@ public class TestHeartbeatHandler {
final HostRoleCommand command = hostRoleCommandFactory.create(DummyHostname1, Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -1096,7 +1095,7 @@ public class TestHeartbeatHandler {
final HostRoleCommand command = hostRoleCommandFactory.create(DummyHostname1,
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -1231,7 +1230,7 @@ public class TestHeartbeatHandler {
assertEquals(HostHealthStatus.HealthStatus.HEALTHY.name(), hostObject.getStatus());
reset(am);
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}}).anyTimes();
@@ -1328,7 +1327,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
add(command);
@@ -1446,7 +1445,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}});
@@ -1533,7 +1532,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}});
@@ -1564,7 +1563,7 @@ public class TestHeartbeatHandler {
Role.DATANODE, null, null);
ActionManager am = actionManagerTestHelper.getMockActionManager();
- expect(am.getTasks(anyObject(List.class))).andReturn(
+ expect(am.getTasks(EasyMock.<List<Long>>anyObject())).andReturn(
new ArrayList<HostRoleCommand>() {{
add(command);
}});
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java
index 7afbf11..7f6a03d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java
@@ -57,6 +57,7 @@ import org.apache.ambari.server.controller.spi.Schema;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.security.authorization.AuthorizationException;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.Test;
@@ -92,7 +93,7 @@ public class QueryCreateHandlerTest {
Resource statusResource2 = createNiceMock(Resource.class);
RequestHandler readHandler = createStrictMock(RequestHandler.class);
ResultStatus resultStatus = createNiceMock(ResultStatus.class);
- Capture<RequestBody> bodyCapture = new Capture<RequestBody>();
+ Capture<RequestBody> bodyCapture = EasyMock.newCapture();
// test request body
// {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java
index 595ea15..1b2a080 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java
@@ -50,6 +50,7 @@ import org.apache.ambari.server.controller.spi.TemporalInfo;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.security.authorization.AuthorizationException;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.Test;
/**
@@ -98,7 +99,7 @@ public class ReadHandlerTest {
Result result = createStrictMock(Result.class);
RequestBody body = createStrictMock(RequestBody.class);
Renderer renderer = new DefaultRenderer();
- Capture<ResultStatus> resultStatusCapture = new Capture<ResultStatus>();
+ Capture<ResultStatus> resultStatusCapture = EasyMock.newCapture();
Map<String, String> requestInfoProperties = Collections.singletonMap("directive", "value");
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryParserTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryParserTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryParserTest.java
index cf332e7..046abcb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryParserTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryParserTest.java
@@ -174,9 +174,9 @@ public class QueryParserTest {
QueryParser parser = new QueryParser();
Predicate p = parser.parse(listTokens.toArray(new Token[listTokens.size()]));
- EqualsPredicate ep1 = new EqualsPredicate("foo", "one");
- EqualsPredicate ep2 = new EqualsPredicate("foo", "two");
- EqualsPredicate ep3 = new EqualsPredicate("foo", "3");
+ EqualsPredicate ep1 = new EqualsPredicate<>("foo", "one");
+ EqualsPredicate ep2 = new EqualsPredicate<>("foo", "two");
+ EqualsPredicate ep3 = new EqualsPredicate<>("foo", "3");
OrPredicate orPredicate = new OrPredicate(ep1, ep2, ep3);
@@ -195,9 +195,9 @@ public class QueryParserTest {
QueryParser parser = new QueryParser();
Predicate p = parser.parse(listTokens.toArray(new Token[listTokens.size()]));
- EqualsPredicate ep1 = new EqualsPredicate("HostRoles/host_name", "host1");
- EqualsPredicate ep2 = new EqualsPredicate("HostRoles/host_name", "host2");
- EqualsPredicate ep3 = new EqualsPredicate("HostRoles/host_name", "host3");
+ EqualsPredicate ep1 = new EqualsPredicate<>("HostRoles/host_name", "host1");
+ EqualsPredicate ep2 = new EqualsPredicate<>("HostRoles/host_name", "host2");
+ EqualsPredicate ep3 = new EqualsPredicate<>("HostRoles/host_name", "host3");
OrPredicate orPredicate = new OrPredicate(ep1, ep2, ep3);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java
index 068e8d0..fe3b773 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java
@@ -74,6 +74,7 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Assert;
import org.junit.Test;
@@ -290,8 +291,8 @@ public class QueryImplTest {
expect(schema.getKeyPropertyId(Resource.Type.Cluster)).andReturn("Clusters/cluster_name").anyTimes();
- TreeNode<Set<String>> treeNode = new TreeNodeImpl<Set<String>>(null, Collections.EMPTY_SET, null);
- expect(renderer.finalizeProperties(anyObject(TreeNode.class), anyBoolean())).andReturn(treeNode).anyTimes();
+ TreeNode<Set<String>> treeNode = new TreeNodeImpl<>(null, Collections.<String>emptySet(), null);
+ expect(renderer.finalizeProperties(EasyMock.<TreeNode<QueryInfo>>anyObject(), anyBoolean())).andReturn(treeNode).anyTimes();
replay(clusterController, queryResponse, schema, renderer);
@@ -358,8 +359,8 @@ public class QueryImplTest {
expect(clusterResource.getPropertyValue("Clusters/cluster_name")).andReturn("c1").anyTimes();
- TreeNode<Set<String>> treeNode = new TreeNodeImpl<Set<String>>(null, Collections.EMPTY_SET, null);
- expect(renderer.finalizeProperties(anyObject(TreeNode.class), anyBoolean())).andReturn(treeNode).anyTimes();
+ TreeNode<Set<String>> treeNode = new TreeNodeImpl<>(null, Collections.<String>emptySet(), null);
+ expect(renderer.finalizeProperties(EasyMock.<TreeNode<QueryInfo>>anyObject(), anyBoolean())).andReturn(treeNode).anyTimes();
expect(clusterController.getIterable(eq(Resource.Type.Cluster), anyObject(QueryResponse.class),
anyObject(org.apache.ambari.server.controller.spi.Request.class), anyObject(Predicate.class),
@@ -412,9 +413,9 @@ public class QueryImplTest {
expect(schema.getKeyPropertyId(Resource.Type.Cluster)).andReturn("Clusters/cluster_name").anyTimes();
TreeNode<Set<String>> treeNode = new TreeNodeImpl<Set<String>>(null, Collections.<String>emptySet(), null);
- expect(renderer.finalizeProperties(anyObject(TreeNode.class), anyBoolean())).andReturn(treeNode).anyTimes();
+ expect(renderer.finalizeProperties(EasyMock.<TreeNode<QueryInfo>>anyObject(), anyBoolean())).andReturn(treeNode).anyTimes();
- Capture<Result> resultCapture = new Capture<Result>();
+ Capture<Result> resultCapture = EasyMock.newCapture();
expect(renderer.finalizeResult(capture(resultCapture))).andReturn(null);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java
index 9173423..83aca19 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java
@@ -54,6 +54,7 @@ import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.view.ViewRegistry;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -98,8 +99,8 @@ public class BaseResourceDefinitionTest {
PropertyHelper.getKeyPropertyIds(Resource.Type.Service),
managementController, maintenanceStateHelper);
- expect(factory.getServiceResourceProvider(anyObject(Set.class),
- anyObject(Map.class),
+ expect(factory.getServiceResourceProvider(EasyMock.<Set<String>>anyObject(),
+ EasyMock.<Map<Resource.Type, String>>anyObject(),
anyObject(AmbariManagementController.class))).andReturn(serviceResourceProvider);
AbstractControllerResourceProvider.init(factory);
@@ -148,7 +149,7 @@ public class BaseResourceDefinitionTest {
public void testReadDirectives() {
ResourceDefinition resource = getResourceDefinition();
- assertEquals(Collections.EMPTY_SET, resource.getReadDirectives());
+ assertEquals(Collections.emptySet(), resource.getReadDirectives());
Map<BaseResourceDefinition.DirectiveType, List<String>> directives = new HashMap<BaseResourceDefinition.DirectiveType, List<String>>();
directives.put(BaseResourceDefinition.DirectiveType.DELETE, Arrays.asList("do_something_delete", "do_something_else_delete"));
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 4641dfc..d93953c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -318,7 +318,7 @@ public class AmbariMetaInfoTest {
}
}
- Capture<MetainfoEntity> c = new Capture<MetainfoEntity>();
+ Capture<MetainfoEntity> c = EasyMock.newCapture();
metainfoDAO = ambariMetaInfo.metaInfoDAO;
reset(metainfoDAO);
@@ -378,7 +378,7 @@ public class AmbariMetaInfoTest {
}
}
- Capture<MetainfoEntity> c = new Capture<MetainfoEntity>();
+ Capture<MetainfoEntity> c = EasyMock.newCapture();
metainfoDAO = ambariMetaInfo.metaInfoDAO;
reset(metainfoDAO);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/api/services/BaseServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/BaseServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/BaseServiceTest.java
index 0b376eb..fe28735 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/BaseServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/BaseServiceTest.java
@@ -151,7 +151,7 @@ public abstract class BaseServiceTest {
private void testMethod_bodyParseException(ServiceTestInvocation testMethod) throws Exception {
addExpectForInitialRequest(testMethod);
- Capture<Result> resultCapture = new Capture<Result>();
+ Capture<Result> resultCapture = EasyMock.newCapture();
BodyParseException e = new BodyParseException("TEST MSG");
expect(bodyParser.parse(testMethod.getBody())).andThrow(e);
expect(serializer.serialize(capture(resultCapture))).andReturn(serializedResult);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
index 2c7366f..b023394 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
@@ -96,7 +96,7 @@ public class DefaultEventCreatorTest {
@Override
public Object getPrincipal() {
- return new User("testuser", "password", Collections.EMPTY_LIST);
+ return new User("testuser", "password", Collections.<GrantedAuthority>emptyList());
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/audit/request/creator/AuditEventCreatorTestBase.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/creator/AuditEventCreatorTestBase.java b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/creator/AuditEventCreatorTestBase.java
index 2fdbe40..3a5cc34 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/creator/AuditEventCreatorTestBase.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/creator/AuditEventCreatorTestBase.java
@@ -55,7 +55,7 @@ public class AuditEventCreatorTestBase {
@Override
public Object getPrincipal() {
- return new User(userName, "password", Collections.EMPTY_LIST);
+ return new User(userName, "password", Collections.<GrantedAuthority>emptyList());
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceFunctionalTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceFunctionalTest.java b/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceFunctionalTest.java
index e04871d..7fadbab 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceFunctionalTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceFunctionalTest.java
@@ -132,7 +132,7 @@ public class CleanupServiceFunctionalTest {
@Test
public void testRunCleanup() throws Exception {
// GIVEN
- CleanupService cleanupService = injector.getInstance(CleanupServiceImpl.class);
+ CleanupService<TimeBasedCleanupPolicy> cleanupService = injector.getInstance(CleanupServiceImpl.class);
TimeBasedCleanupPolicy cleanupPolicy = new TimeBasedCleanupPolicy("cluster-1", 1455891250758L);
// WHEN
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceImplTest.java
index 6d5e567..fdc670e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/cleanup/CleanupServiceImplTest.java
@@ -51,7 +51,7 @@ public class CleanupServiceImplTest {
private CleanupServiceImpl cleanupServiceImpl;
private TimeBasedCleanupPolicy cleanupPolicy;
private Capture<TimeBasedCleanupPolicy> timeBasedCleanupPolicyCapture;
- private Set cleanables;
+ private Set<Cleanable> cleanables;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/ContainsPredicateTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/ContainsPredicateTest.java b/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/ContainsPredicateTest.java
index 0be0977..4d32af1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/ContainsPredicateTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/ContainsPredicateTest.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.collections.functors;
-import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
import java.util.ArrayList;
@@ -29,6 +28,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Assert;
import org.junit.Test;
@@ -41,8 +41,8 @@ public class ContainsPredicateTest extends EasyMockSupport {
Set<String> data2 = new HashSet<String>(Arrays.asList("TWO", "THREE"));
ContextTransformer transformer = createStrictMock(ContextTransformer.class);
- expect(transformer.transform(anyObject(Map.class))).andReturn(data1).times(1);
- expect(transformer.transform(anyObject(Map.class))).andReturn(data2).times(1);
+ expect(transformer.transform(EasyMock.<Map<?, ?>>anyObject())).andReturn(data1).times(1);
+ expect(transformer.transform(EasyMock.<Map<?, ?>>anyObject())).andReturn(data2).times(1);
replayAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/EqualsPredicateTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/EqualsPredicateTest.java b/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/EqualsPredicateTest.java
index a521e4e..83c17b3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/EqualsPredicateTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/collections/functors/EqualsPredicateTest.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.collections.functors;
-import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
import java.util.ArrayList;
@@ -27,6 +26,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Assert;
import org.junit.Test;
@@ -39,8 +39,8 @@ public class EqualsPredicateTest extends EasyMockSupport {
String data2 = "value2";
ContextTransformer transformer = createStrictMock(ContextTransformer.class);
- expect(transformer.transform(anyObject(Map.class))).andReturn(data1).times(1);
- expect(transformer.transform(anyObject(Map.class))).andReturn(data2).times(1);
+ expect(transformer.transform(EasyMock.<Map<?, ?>>anyObject())).andReturn(data1).times(1);
+ expect(transformer.transform(EasyMock.<Map<?, ?>>anyObject())).andReturn(data2).times(1);
replayAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java
index aa828a2..9fe240e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariHandlerListTest.java
@@ -39,6 +39,7 @@ import org.apache.ambari.server.orm.entities.ViewInstanceEntityTest;
import org.apache.ambari.server.security.AmbariViewsSecurityHeaderFilter;
import org.apache.ambari.server.view.ViewRegistry;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
@@ -69,9 +70,9 @@ public class AmbariHandlerListTest {
expect(handler.getServer()).andReturn(server);
handler.setServer(null);
- Capture<FilterHolder> securityHeaderFilterCapture = new Capture<FilterHolder>();
- Capture<FilterHolder> persistFilterCapture = new Capture<FilterHolder>();
- Capture<FilterHolder> securityFilterCapture = new Capture<FilterHolder>();
+ Capture<FilterHolder> securityHeaderFilterCapture = EasyMock.newCapture();
+ Capture<FilterHolder> persistFilterCapture = EasyMock.newCapture();
+ Capture<FilterHolder> securityFilterCapture = EasyMock.newCapture();
handler.addFilter(capture(securityHeaderFilterCapture), eq("/*"), eq(AmbariServer.DISPATCHER_TYPES));
handler.addFilter(capture(persistFilterCapture), eq("/*"), eq(AmbariServer.DISPATCHER_TYPES));