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 18:46:29 UTC
[1/5] ambari git commit: AMBARI-19149. Code cleanup: compiler
warnings (Attila Doroszlai via ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 4a5b2f6f5 -> edce0b117
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
index 20ec68b..e687b10 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
@@ -496,7 +496,7 @@ public class UpgradeCatalog220Test {
UpgradeCatalog220 upgradeMock = createMockBuilder(UpgradeCatalog220.class).createMock();
- Capture<Map<String, Object>> updatedData = new Capture<Map<String, Object>>();
+ Capture<Map<String, Object>> updatedData = EasyMock.newCapture();
ArtifactEntity artifactEntity = createNiceMock(ArtifactEntity.class);
expect(artifactEntity.getArtifactData())
@@ -698,12 +698,12 @@ public class UpgradeCatalog220Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog220(injector2).updateAMSConfigs();
@@ -759,12 +759,12 @@ public class UpgradeCatalog220Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog220(injector2).updateAMSConfigs();
@@ -1128,8 +1128,8 @@ public class UpgradeCatalog220Test {
*/
class UpgradeSectionDDL implements SectionDDL {
- Capture<DBAccessor.DBColumnInfo> upgradeTablePackageNameColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> upgradeTableUpgradeTypeColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
+ Capture<DBAccessor.DBColumnInfo> upgradeTablePackageNameColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> upgradeTableUpgradeTypeColumnCapture = EasyMock.newCapture();
/**
* {@inheritDoc}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
index bbf696a..27b1174 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
@@ -451,12 +451,12 @@ public class UpgradeCatalog221Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).anyTimes();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).anyTimes();
replay(controller, injector2);
new UpgradeCatalog221(injector2).updateAMSConfigs();
@@ -510,12 +510,12 @@ public class UpgradeCatalog221Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog221(injector2).updateAMSConfigs();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
index 00a4215..9d4fb3e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
@@ -523,12 +523,12 @@ public class UpgradeCatalog222Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog222(injector2).updateAMSConfigs();
@@ -582,12 +582,12 @@ public class UpgradeCatalog222Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog222(injector2).updateAMSConfigs();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
index 190a810..496a8ef 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
@@ -762,9 +762,9 @@ public class UpgradeCatalog240Test {
Capture<Map<String, String>> oozieCapture = newCapture();
Capture<Map<String, String>> hiveCapture = newCapture();
expect(mockAmbariManagementController.createConfig(eq(mockClusterExpected), eq("oozie-env"),
- capture(oozieCapture), anyString(), (Map<String, Map<String, String>>)anyObject())).andReturn(null).once();
+ capture(oozieCapture), anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).once();
expect(mockAmbariManagementController.createConfig(eq(mockClusterExpected), eq("hive-env"),
- capture(hiveCapture), anyString(), (Map<String, Map<String, String>>)anyObject())).andReturn(null).once();
+ capture(hiveCapture), anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).once();
easyMockSupport.replayAll();
mockInjector.getInstance(UpgradeCatalog240.class).removeHiveOozieDBConnectionConfigs();
@@ -846,15 +846,15 @@ public class UpgradeCatalog240Test {
Capture<Map<String, String>> falconCapture = newCapture();
expect(mockAmbariManagementController.createConfig(eq(mockClusterExpected), eq("falcon-env"),
- capture(falconCapture), anyString(), (Map<String, Map<String, String>>) anyObject())).andReturn(null).once();
+ capture(falconCapture), anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).once();
Capture<Map<String, String>> falconCapture2 = newCapture();
expect(mockAmbariManagementController.createConfig(eq(mockClusterExpected), eq("falcon-env"),
- capture(falconCapture2), anyString(), (Map<String, Map<String, String>>) anyObject())).andReturn(null).once();
+ capture(falconCapture2), anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).once();
Capture<Map<String, String>> falconStartupCapture = newCapture();
expect(mockAmbariManagementController.createConfig(eq(mockClusterExpected), eq("falcon-startup.properties"),
- capture(falconStartupCapture), anyString(), (Map<String, Map<String, String>>)anyObject())).andReturn(null).once();
+ capture(falconStartupCapture), anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).once();
easyMockSupport.replayAll();
mockInjector.getInstance(UpgradeCatalog240.class).updateFalconConfigs();
@@ -935,7 +935,7 @@ public class UpgradeCatalog240Test {
Capture<Map<String, String>> hbaseCapture = newCapture();
expect(mockAmbariManagementController.createConfig(eq(mockCluster), eq("hbase-site"),
- capture(hbaseCapture), anyString(), (Map<String, Map<String, String>>)anyObject())).andReturn(null).once();
+ capture(hbaseCapture), anyString(), EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).once();
easyMockSupport.replayAll();
mockInjector.getInstance(UpgradeCatalog240.class).updateHBaseConfigs();
@@ -1016,12 +1016,12 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateHDFSConfigs();
@@ -1091,15 +1091,15 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCaptureHdfsSite = EasyMock.newCapture();
- Capture<Map> propertiesCaptureHadoopEnv = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCaptureHdfsSite = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCaptureHadoopEnv = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), eq("hdfs-site"), capture(propertiesCaptureHdfsSite), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
expect(controller.createConfig(anyObject(Cluster.class), eq("hadoop-env"), capture(propertiesCaptureHadoopEnv), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateHDFSConfigs();
@@ -1160,12 +1160,12 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateYarnEnv();
@@ -1291,15 +1291,15 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesSparkDefaultsCapture = EasyMock.newCapture();
- Capture<Map> propertiesSparkJavaOptsCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesSparkDefaultsCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesSparkJavaOptsCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), eq("spark-defaults"), capture(propertiesSparkDefaultsCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
expect(controller.createConfig(anyObject(Cluster.class), eq("spark-javaopts-properties"), capture(propertiesSparkJavaOptsCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateSparkConfigs();
@@ -1353,12 +1353,12 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateAMSConfigs();
@@ -1412,12 +1412,12 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateAMSConfigs();
@@ -1469,12 +1469,12 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateAMSConfigs();
@@ -1568,9 +1568,9 @@ public class UpgradeCatalog240Test {
Capture<Cluster> clusterCapture = newCapture(CaptureType.ALL);
Capture<String> typeCapture = newCapture(CaptureType.ALL);
- Capture<Map> propertiesCapture = newCapture(CaptureType.ALL);
+ Capture<Map<String, String>> propertiesCapture = newCapture(CaptureType.ALL);
Capture<String> tagCapture = newCapture(CaptureType.ALL);
- Capture<Map> attributesCapture = newCapture(CaptureType.ALL);
+ Capture<Map<String, Map<String, String>>> attributesCapture = newCapture(CaptureType.ALL);
expect(controller.createConfig(capture(clusterCapture), capture(typeCapture),
capture(propertiesCapture), capture(tagCapture), capture(attributesCapture) ))
@@ -1615,7 +1615,7 @@ public class UpgradeCatalog240Test {
Assert.assertEquals("kerberos-env", typeCaptureValues.get(0));
Assert.assertEquals("krb5-conf", typeCaptureValues.get(1));
- List<Map> propertiesCaptureValues = propertiesCapture.getValues();
+ List<Map<String, String>> propertiesCaptureValues = propertiesCapture.getValues();
Assert.assertEquals(2, propertiesCaptureValues.size());
Map<String, String> capturedCRProperties;
@@ -1719,9 +1719,9 @@ public class UpgradeCatalog240Test {
Capture<Cluster> clusterCapture = newCapture(CaptureType.ALL);
Capture<String> typeCapture = newCapture(CaptureType.ALL);
- Capture<Map> propertiesCapture = newCapture(CaptureType.ALL);
+ Capture<Map<String, String>> propertiesCapture = newCapture(CaptureType.ALL);
Capture<String> tagCapture = newCapture(CaptureType.ALL);
- Capture<Map> attributesCapture = newCapture(CaptureType.ALL);
+ Capture<Map<String, Map<String, String>>> attributesCapture = newCapture(CaptureType.ALL);
expect(controller.createConfig(capture(clusterCapture), capture(typeCapture),
@@ -1752,7 +1752,7 @@ public class UpgradeCatalog240Test {
Assert.assertEquals(1, typeCaptureValues.size());
Assert.assertEquals("kerberos-env", typeCaptureValues.get(0));
- List<Map> propertiesCaptureValues = propertiesCapture.getValues();
+ List<Map<String, String>> propertiesCaptureValues = propertiesCapture.getValues();
Assert.assertEquals(1, propertiesCaptureValues.size());
Map<String, String> capturedCRProperties;
@@ -2549,12 +2549,12 @@ public class UpgradeCatalog240Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(createNiceMock(Config.class)).once();
replay(controller, injector2);
new UpgradeCatalog240(injector2).updateRangerHbasePluginProperties();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
index 1f3858f..5e89039 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java
@@ -355,12 +355,12 @@ public class UpgradeCatalog250Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(config).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(config).once();
replay(controller, injector2);
new UpgradeCatalog250(injector2).updateAMSConfigs();
@@ -405,12 +405,12 @@ public class UpgradeCatalog250Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(config).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(config).once();
replay(controller, injector2);
new UpgradeCatalog250(injector2).updateKafkaConfigs();
@@ -484,12 +484,12 @@ public class UpgradeCatalog250Test {
.createNiceMock();
Injector injector2 = easyMockSupport.createNiceMock(Injector.class);
- Capture<Map> propertiesCapture = EasyMock.newCapture();
+ Capture<Map<String, String>> propertiesCapture = EasyMock.newCapture();
expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes();
expect(controller.getClusters()).andReturn(clusters).anyTimes();
expect(controller.createConfig(anyObject(Cluster.class), anyString(), capture(propertiesCapture), anyString(),
- anyObject(Map.class))).andReturn(config).once();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(config).once();
replay(controller, injector2);
new UpgradeCatalog250(injector2).updateAtlasConfigs();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/utils/SetUtilsTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/utils/SetUtilsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/utils/SetUtilsTest.java
index 698baf9..67bcf4b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/utils/SetUtilsTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/SetUtilsTest.java
@@ -45,7 +45,7 @@ public class SetUtilsTest {
List<Set<Integer>> subsets = SetUtils.split(null, size);
Assert.assertEquals(0, subsets.size());
- subsets = SetUtils.split(Collections.EMPTY_SET, size);
+ subsets = SetUtils.split(Collections.<Integer>emptySet(), size);
Assert.assertEquals(0, subsets.size());
subsets = SetUtils.split(Collections.singleton(0), size);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/view/RemoteAmbariClusterTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/RemoteAmbariClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/RemoteAmbariClusterTest.java
index d61123f..029811b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/view/RemoteAmbariClusterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/view/RemoteAmbariClusterTest.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.view;
-import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
@@ -36,6 +35,7 @@ import java.util.Map;
import org.apache.ambari.server.orm.entities.RemoteAmbariClusterEntity;
import org.apache.ambari.view.AmbariHttpException;
import org.apache.ambari.view.AmbariStreamProvider;
+import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Assert;
import org.junit.Rule;
@@ -60,7 +60,7 @@ public class RemoteAmbariClusterTest {
final String clusterPath = "/api/v1/clusters/Test";
expect(clusterStreamProvider.readFrom(eq( clusterPath + "?fields=services/ServiceInfo,hosts,Clusters"),
- eq("GET"), (String) isNull(), (Map<String, String>) anyObject())).andAnswer(new IAnswer<InputStream>() {
+ eq("GET"), (String) isNull(), EasyMock.<Map<String, String>>anyObject())).andAnswer(new IAnswer<InputStream>() {
@Override
public InputStream answer() throws Throwable {
desiredConfigPolls[0] += 1;
@@ -69,7 +69,7 @@ public class RemoteAmbariClusterTest {
}).anyTimes();
expect(clusterStreamProvider.readFrom(eq(clusterPath + "/configurations?(type=test-site&tag=TAG)"),
- eq("GET"), (String)isNull(), (Map<String, String>) anyObject())).andAnswer(new IAnswer<InputStream>() {
+ eq("GET"), (String)isNull(), EasyMock.<Map<String, String>>anyObject())).andAnswer(new IAnswer<InputStream>() {
@Override
public InputStream answer() throws Throwable {
testConfigPolls[0] += 1;
@@ -113,7 +113,7 @@ public class RemoteAmbariClusterTest {
expect(clusterStreamProvider.readFrom(eq(String.format("%s/services/%s/components/%s?" +
"fields=host_components/HostRoles/host_name", clusterPath, service, component)),
- eq("GET"), (String) isNull(), (Map<String, String>) anyObject()))
+ eq("GET"), (String) isNull(), EasyMock.<Map<String, String>>anyObject()))
.andReturn(new ByteArrayInputStream(componentHostsString.getBytes()));
RemoteAmbariClusterEntity entity = createNiceMock(RemoteAmbariClusterEntity.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationContextImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationContextImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationContextImplTest.java
index ef8eb14..4da5f39 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationContextImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewDataMigrationContextImplTest.java
@@ -295,8 +295,8 @@ public class ViewDataMigrationContextImplTest {
ViewInstanceDataEntity dataEntity2User2 = new ViewInstanceDataEntity();
dataEntity2User2.setName("key2");
dataEntity2User2.setUser("user2");
- Collection data2 = Arrays.asList(dataEntityUser2, dataEntity2User2);
- Collection data1 = Arrays.asList(dataEntityUser1, dataEntityUser2, dataEntity2User2);
+ Collection<ViewInstanceDataEntity> data2 = Arrays.asList(dataEntityUser2, dataEntity2User2);
+ Collection<ViewInstanceDataEntity> data1 = Arrays.asList(dataEntityUser1, dataEntityUser2, dataEntity2User2);
ViewInstanceEntity instanceEntity1 = getViewInstanceEntityMock(entity1);
expect(instanceEntity1.getData()).andReturn(data1);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
index 351c513..132dd7e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
@@ -96,6 +96,7 @@ import org.apache.ambari.view.events.Listener;
import org.apache.ambari.view.validation.ValidationResult;
import org.apache.ambari.view.validation.Validator;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -401,7 +402,7 @@ public class ViewRegistryTest {
Cluster cluster = createNiceMock(Cluster.class);
Service service = createNiceMock(Service.class);
ViewInstanceEntity viewAutoInstanceEntity = createNiceMock(ViewInstanceEntity.class);
- Capture<ViewInstanceEntity> viewAutoInstanceCapture = new Capture<ViewInstanceEntity>();
+ Capture<ViewInstanceEntity> viewAutoInstanceCapture = EasyMock.newCapture();
ViewInstanceDataEntity autoInstanceDataEntity = createNiceMock(ViewInstanceDataEntity.class);
expect(autoInstanceDataEntity.getName()).andReturn("p1").anyTimes();
@@ -1593,7 +1594,7 @@ public class ViewRegistryTest {
expect(archiveDir.getAbsolutePath()).andReturn("/var/lib/ambari-server/resources/views/work/MY_VIEW{1.0.0}").anyTimes();
}
- Capture<ViewEntity> viewEntityCapture = new Capture<ViewEntity>();
+ Capture<ViewEntity> viewEntityCapture = EasyMock.newCapture();
if (System.getProperty("os.name").contains("Windows")) {
expect(viewExtractor.ensureExtractedArchiveDirectory("\\var\\lib\\ambari-server\\resources\\views\\work")).andReturn(true);
}
@@ -1843,7 +1844,7 @@ public class ViewRegistryTest {
expect(cluster.getCurrentStackVersion()).andReturn(stackId).anyTimes();
expect(cluster.getServices()).andReturn(serviceMap).anyTimes();
- Capture<ViewInstanceEntity> viewInstanceCapture = new Capture<ViewInstanceEntity>();
+ Capture<ViewInstanceEntity> viewInstanceCapture = EasyMock.newCapture();
expect(viewInstanceDAO.merge(capture(viewInstanceCapture))).andReturn(viewInstanceEntity).anyTimes();
expect(viewInstanceDAO.findByName("MY_VIEW{1.0.0}", "AUTO-INSTANCE")).andReturn(viewInstanceEntity).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
index fb37e9d..60643b3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
@@ -118,11 +118,11 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicEntity> entityCapture = new Capture<DynamicEntity>();
+ Capture<DynamicEntity> entityCapture = EasyMock.newCapture();
entityManager.persist(capture(entityCapture));
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
@Override
@@ -133,7 +133,7 @@ public class DataStoreImplTest {
}
});
- Capture<DynamicEntity> entityCapture2 = new Capture<DynamicEntity>();
+ Capture<DynamicEntity> entityCapture2 = EasyMock.newCapture();
entityManager.persist(capture(entityCapture2));
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
@Override
@@ -144,8 +144,8 @@ public class DataStoreImplTest {
}
});
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
@@ -193,12 +193,12 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
@@ -252,12 +252,12 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
@@ -306,21 +306,21 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
expect(entityManager.getTransaction()).andReturn(transaction).anyTimes();
- Capture<Class> entityClassCapture = new Capture<Class>();
+ Capture<Class> entityClassCapture = EasyMock.newCapture();
expect(entityManager.find(capture(entityClassCapture), eq(100))).andReturn(dynamicEntity);
- Capture<Class> entityClassCapture2 = new Capture<Class>();
+ Capture<Class> entityClassCapture2 = EasyMock.newCapture();
expect(entityManager.find(capture(entityClassCapture2), eq(99))).andReturn(dynamicSubEntity);
entityManager.close();
@@ -331,7 +331,7 @@ public class DataStoreImplTest {
expect(dynamicSubEntity.set("DS_id", 99)).andReturn(dynamicSubEntity);
expect(dynamicSubEntity.set("DS_name", "bar")).andReturn(dynamicSubEntity);
- Capture<DynamicEntity> subEntityCapture = new Capture<DynamicEntity>();
+ Capture<DynamicEntity> subEntityCapture = EasyMock.newCapture();
expect(dynamicEntity.set(eq("DS_subEntity"), capture(subEntityCapture))).andReturn(dynamicSubEntity);
expect(dynamicEntity.get("DS_id")).andReturn(100);
@@ -380,18 +380,18 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
expect(entityManager.getTransaction()).andReturn(transaction).anyTimes();
- Capture<Class> entityClassCapture2 = new Capture<Class>();
+ Capture<Class> entityClassCapture2 = EasyMock.newCapture();
expect(entityManager.find(capture(entityClassCapture2), eq(99))).andReturn(dynamicEntity);
entityManager.close();
@@ -445,17 +445,17 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
expect(entityManager.getTransaction()).andReturn(transaction).anyTimes();
- Capture<Class> entityClassCapture = new Capture<Class>();
+ Capture<Class> entityClassCapture = EasyMock.newCapture();
expect(entityManager.getReference(capture(entityClassCapture), eq(99))).andReturn(dynamicEntity);
entityManager.remove(dynamicEntity);
entityManager.close();
@@ -496,16 +496,16 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
- Capture<Class> entityClassCapture = new Capture<Class>();
+ Capture<Class> entityClassCapture = EasyMock.newCapture();
expect(entityManager.find(capture(entityClassCapture), eq(99))).andReturn(dynamicEntity);
entityManager.close();
@@ -550,11 +550,11 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
@@ -610,11 +610,11 @@ public class DataStoreImplTest {
PowerMock.replay(JpaHelper.class);
expect(jpaEntityManager.getServerSession()).andReturn(session).anyTimes();
expect(session.getLogin()).andReturn(databaseLogin).anyTimes();
- Capture<Sequence> sequenceCapture = new Capture<Sequence>();
+ Capture<Sequence> sequenceCapture = EasyMock.newCapture();
databaseLogin.addSequence(capture(sequenceCapture));
EasyMock.expectLastCall().anyTimes();
- Capture<DynamicType> typeCapture = new Capture<DynamicType>();
- Capture<DynamicType> typeCapture2 = new Capture<DynamicType>();
+ Capture<DynamicType> typeCapture = EasyMock.newCapture();
+ Capture<DynamicType> typeCapture2 = EasyMock.newCapture();
jpaDynamicHelper.addTypes(eq(true), eq(true), capture(typeCapture), capture(typeCapture2));
expect(entityManagerFactory.createEntityManager()).andReturn(entityManager).anyTimes();
[5/5] ambari git commit: AMBARI-19149. Code cleanup: compiler
warnings (Attila Doroszlai via ncole)
Posted by nc...@apache.org.
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/trunk
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));
[2/5] ambari git commit: AMBARI-19149. Code cleanup: compiler
warnings (Attila Doroszlai via ncole)
Posted by nc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/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 d217456..6143cf8 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
@@ -259,7 +259,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3, group4, group5);
@@ -270,13 +270,13 @@ public class AmbariLdapDataPopulatorTest {
.withConstructor(configuration, users)
.createNiceMock();
- expect(populator.getLdapGroups("group2")).andReturn(Collections.EMPTY_SET);
+ expect(populator.getLdapGroups("group2")).andReturn(Collections.<LdapGroupDto>emptySet());
LdapGroupDto externalGroup1 = createNiceMock(LdapGroupDto.class);
LdapBatchDto batchInfo = new LdapBatchDto();
- populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup1), anyObject(Map.class), anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup1), EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
expect(populator.getLdapGroups("group4")).andReturn(Collections.singleton(externalGroup1));
- expect(populator.getLdapGroups("group5")).andReturn(Collections.EMPTY_SET);
+ expect(populator.getLdapGroups("group5")).andReturn(Collections.<LdapGroupDto>emptySet());
replay(populator);
populator.setLdapTemplate(ldapTemplate);
@@ -313,7 +313,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.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
expect(configuration.getLdapServerProperties()).andReturn(new LdapServerProperties()).anyTimes();
LdapGroupDto group1Dto = new LdapGroupDto();
@@ -324,7 +324,7 @@ public class AmbariLdapDataPopulatorTest {
LdapGroupDto group2Dto = new LdapGroupDto();
group2Dto.setGroupName("group2");
- group2Dto.setMemberAttributes(Collections.EMPTY_SET);
+ group2Dto.setMemberAttributes(Collections.<String>emptySet());
Set<LdapGroupDto> groupDtos2 = Sets.newHashSet();
groupDtos2.add(group2Dto);
@@ -373,7 +373,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3, group4);
@@ -398,14 +398,14 @@ public class AmbariLdapDataPopulatorTest {
Set<LdapGroupDto> externalGroups = createSet(externalGroup3, externalGroup4);
for (LdapGroupDto externalGroup : externalGroups) {
populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup),
- anyObject(Map.class), anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
}
populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup1),
- anyObject(Map.class), anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
- populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), anyObject(Map.class),
- anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), EasyMock.<Map<String, User>>anyObject(),
+ EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
expect(populator.getLdapGroups("x*")).andReturn(externalGroups);
expect(populator.getLdapGroups("group1")).andReturn(Collections.singleton(externalGroup1));
@@ -458,7 +458,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3, group4);
@@ -483,12 +483,12 @@ public class AmbariLdapDataPopulatorTest {
LdapBatchDto batchInfo = new LdapBatchDto();
Set<LdapGroupDto> externalGroups = createSet(externalGroup3, externalGroup4);
for (LdapGroupDto externalGroup : externalGroups) {
- populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), anyObject(Map.class), anyObject(Map.class),
- anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(), EasyMock.<Map<String, Group>>anyObject(),
+ EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
}
- populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), anyObject(Map.class),
- anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup2), EasyMock.<Map<String, User>>anyObject(),
+ EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
expect(populator.getLdapGroups("x*")).andReturn(externalGroups);
expect(populator.getLdapGroups("group2")).andReturn(Collections.singleton(externalGroup2));
@@ -535,7 +535,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3, group4);
@@ -559,8 +559,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), anyObject(Map.class),
- anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(),
+ EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
}
expect(populator.getLdapGroups("group*")).andReturn(externalGroups);
@@ -607,7 +607,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3, group4);
@@ -631,7 +631,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.EMPTY_SET);
+ expect(populator.getLdapGroups("group1")).andReturn(Collections.<LdapGroupDto>emptySet());
expect(populator.getLdapGroups("group2")).andReturn(Collections.singleton(externalGroup2));
replay(populator);
@@ -667,7 +667,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3, group4, group5);
@@ -690,8 +690,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), anyObject(Map.class),
- anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(),
+ EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
}
@@ -734,7 +734,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.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2);
@@ -752,8 +752,8 @@ public class AmbariLdapDataPopulatorTest {
LdapBatchDto batchInfo = new LdapBatchDto();
Set<LdapGroupDto> externalGroups = createSet(externalGroup1, externalGroup2);
for (LdapGroupDto externalGroup : externalGroups) {
- populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), anyObject(Map.class),
- anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(),
+ EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
}
expect(populator.getExternalLdapGroupInfo()).andReturn(externalGroups);
@@ -801,7 +801,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3, group4);
@@ -817,8 +817,8 @@ public class AmbariLdapDataPopulatorTest {
LdapBatchDto batchInfo = new LdapBatchDto();
Set<LdapGroupDto> externalGroups = createSet(externalGroup1);
for (LdapGroupDto externalGroup : externalGroups) {
- populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), anyObject(Map.class),
- anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(),
+ EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
}
expect(populator.getExternalLdapGroupInfo()).andReturn(externalGroups);
@@ -863,7 +863,7 @@ public class AmbariLdapDataPopulatorTest {
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
expect(users.getAllGroups()).andReturn(groupList);
- expect(users.getAllUsers()).andReturn(Collections.EMPTY_LIST);
+ expect(users.getAllUsers()).andReturn(Collections.<User>emptyList());
replay(ldapTemplate, ldapServerProperties, users, configuration);
replay(group1, group2, group3);
@@ -881,8 +881,8 @@ public class AmbariLdapDataPopulatorTest {
LdapBatchDto batchInfo = new LdapBatchDto();
Set<LdapGroupDto> externalGroups = createSet(externalGroup1, externalGroup2);
for (LdapGroupDto externalGroup : externalGroups) {
- populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), anyObject(Map.class),
- anyObject(Map.class), anyObject(Set.class), anyBoolean());
+ populator.refreshGroupMembers(eq(batchInfo), eq(externalGroup), EasyMock.<Map<String, User>>anyObject(),
+ EasyMock.<Map<String, Group>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean());
expectLastCall();
}
expect(populator.getExternalLdapGroupInfo()).andReturn(externalGroups);
@@ -1115,7 +1115,7 @@ public class AmbariLdapDataPopulatorTest {
.createNiceMock();
- expect(populator.getExternalLdapUserInfo()).andReturn(Collections.EMPTY_SET);
+ expect(populator.getExternalLdapUserInfo()).andReturn(Collections.<LdapUserDto>emptySet());
replay(populator);
populator.setLdapTemplate(ldapTemplate);
@@ -1226,7 +1226,7 @@ public class AmbariLdapDataPopulatorTest {
.withConstructor(configuration, users)
.createNiceMock();
- expect(populator.getLdapUsers("synced_user1")).andReturn(Collections.EMPTY_SET);
+ expect(populator.getLdapUsers("synced_user1")).andReturn(Collections.<LdapUserDto>emptySet());
expect(populator.getLdapUsers("synced_user2")).andReturn(Collections.singleton(createNiceMock(LdapUserDto.class)));
replay(populator);
@@ -1468,7 +1468,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.EMPTY_SET);
+ expect(populator.getLdapUsers("user2")).andReturn(Collections.<LdapUserDto>emptySet());
replay(populator);
populator.setLdapTemplate(ldapTemplate);
@@ -1608,7 +1608,7 @@ public class AmbariLdapDataPopulatorTest {
expect(users.getAllUsers()).andReturn(new ArrayList<User>(allUsers));
final List<User> removedUsers = new ArrayList<User>();
- final Capture<User> userCapture = new Capture<User>();
+ final Capture<User> userCapture = EasyMock.newCapture();
users.removeUser(capture(userCapture));
expectLastCall().andAnswer(new IAnswer<Void>() {
@Override
@@ -1643,8 +1643,8 @@ public class AmbariLdapDataPopulatorTest {
Users users = createNiceMock(Users.class);
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
- Capture<ContextMapper> contextMapperCapture = new Capture<ContextMapper>();
- Capture<SearchControls> searchControlsCapture = new Capture<SearchControls>();
+ Capture<ContextMapper> contextMapperCapture = EasyMock.newCapture();
+ Capture<SearchControls> searchControlsCapture = EasyMock.newCapture();
PagedResultsDirContextProcessor processor = createNiceMock(PagedResultsDirContextProcessor.class);
PagedResultsCookie cookie = createNiceMock(PagedResultsCookie.class);
LdapUserDto dto = new LdapUserDto();
@@ -1682,8 +1682,8 @@ public class AmbariLdapDataPopulatorTest {
Users users = createNiceMock(Users.class);
LdapTemplate ldapTemplate = createNiceMock(LdapTemplate.class);
LdapServerProperties ldapServerProperties = createNiceMock(LdapServerProperties.class);
- Capture<ContextMapper> contextMapperCapture = new Capture<ContextMapper>();
- Capture<SearchControls> searchControlsCapture = new Capture<SearchControls>();
+ Capture<ContextMapper> contextMapperCapture = EasyMock.newCapture();
+ Capture<SearchControls> searchControlsCapture = EasyMock.newCapture();
PagedResultsDirContextProcessor processor = createNiceMock(PagedResultsDirContextProcessor.class);
PagedResultsCookie cookie = createNiceMock(PagedResultsCookie.class);
LdapUserDto dto = new LdapUserDto();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java
index 17b9535..14e06aa 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/MITKerberosOperationHandlerTest.java
@@ -135,7 +135,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
.addMockedMethod(methodExecuteCommand)
.createNiceMock();
injector.injectMembers(handler);
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -198,7 +198,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testCreatePrincipalPrincipalAlreadyNotExists() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -263,7 +263,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsIncorrectAdminPassword() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -294,7 +294,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsIncorrectAdminPrincipal() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -325,7 +325,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsInvalidRealm() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -356,7 +356,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsInvalidRealm2() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -387,7 +387,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsKDCConnectionException() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -418,7 +418,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsKDCConnectionException2() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -449,7 +449,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsNotFound() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
@@ -480,7 +480,7 @@ public class MITKerberosOperationHandlerTest extends KerberosOperationHandlerTes
public void testTestAdministratorCredentialsSuccess() throws Exception {
MITKerberosOperationHandler handler = createMock();
- expect(handler.executeCommand(anyObject(String[].class), anyObject(Map.class), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
+ expect(handler.executeCommand(anyObject(String[].class), EasyMock.<Map<String, String>>anyObject(), anyObject(MITKerberosOperationHandler.InteractivePasswordHandler.class)))
.andAnswer(new IAnswer<ShellCommandUtil.Result>() {
@Override
public ShellCommandUtil.Result answer() throws Throwable {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
index 1a38d87..fc9c857 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
@@ -34,6 +34,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.stack.OsFamily;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Before;
import org.junit.Rule;
@@ -100,7 +101,7 @@ public class UpdateKerberosConfigsServerActionTest extends EasyMockSupport{
ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
configHelper.updateConfigType(anyObject(Cluster.class), anyObject(AmbariManagementController.class),
- anyObject(String.class), anyObject(Map.class), anyObject(Collection.class), anyObject(String.class), anyObject(String.class));
+ anyObject(String.class), EasyMock.<Map<String, String>>anyObject(), EasyMock.<Collection<String>>anyObject(), anyObject(String.class), anyObject(String.class));
expectLastCall().atLeastOnce();
replayAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/HiveZKQuorumConfigActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/HiveZKQuorumConfigActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/HiveZKQuorumConfigActionTest.java
index cd5eb9d..fd61c57 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/HiveZKQuorumConfigActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/HiveZKQuorumConfigActionTest.java
@@ -88,7 +88,7 @@ public class HiveZKQuorumConfigActionTest {
EasyMock.expect(m_hiveSiteConfig.getProperties()).andReturn(hiveSiteProperties).atLeastOnce();
- m_hiveSiteConfig.setProperties(EasyMock.anyObject(Map.class));
+ m_hiveSiteConfig.setProperties(EasyMock.<Map<String, String>>anyObject());
EasyMock.expectLastCall().once();
m_hiveSiteConfig.save();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java
index f5cdf48..a4d50ef 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/users/PostUserCreationHookServerActionTest.java
@@ -128,7 +128,7 @@ public class PostUserCreationHookServerActionTest extends EasyMockSupport {
customScriptServerAction.setExecutionCommand(executionCommand);
EasyMock.expect(collectionPersisterServiceFactoryMock.createCsvFilePersisterService(EasyMock.anyString())).andReturn(collectionPersisterService);
- EasyMock.expect(collectionPersisterService.persistMap(EasyMock.anyObject(Map.class))).andReturn(Boolean.TRUE);
+ EasyMock.expect(collectionPersisterService.persistMap(EasyMock.<Map<String, List<String>>>anyObject())).andReturn(Boolean.TRUE);
replayAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java
index 9e18cd0..f7cb524 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/RepoUtilTest.java
@@ -150,7 +150,7 @@ public class RepoUtilTest {
private static ListMultimap<String, RepositoryInfo> serviceRepos(List<String> operatingSystems,
String repoName, String repoId, String baseUrl) {
- ArrayListMultimap multimap = ArrayListMultimap.create();
+ ListMultimap<String, RepositoryInfo> multimap = ArrayListMultimap.create();
for (String os: operatingSystems) {
RepositoryInfo repoInfo = new RepositoryInfo();
repoInfo.setOsType(os);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/stack/StackModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackModuleTest.java
index 4698178..43acb67 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackModuleTest.java
@@ -131,7 +131,8 @@ public class StackModuleTest {
assertEquals(removedServices.size(), 0);
}
- private StackModule createStackModule(String stackName, String stackVersion, Optional<? extends List<RepositoryInfo>> stackRepos,
+ @SafeVarargs
+ private static StackModule createStackModule(String stackName, String stackVersion, Optional<? extends List<RepositoryInfo>> stackRepos,
List<RepositoryInfo>... serviceRepoLists) throws AmbariException {
StackDirectory sd = mock(StackDirectory.class);
List<ServiceDirectory> serviceDirectories = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
index daa3abc..6772a68 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
@@ -78,6 +78,7 @@ import org.apache.ambari.server.orm.entities.HostEntity;
import org.apache.ambari.server.orm.entities.HostStateEntity;
import org.apache.ambari.server.orm.entities.HostVersionEntity;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
+import org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
import org.apache.ambari.server.orm.entities.ServiceDesiredStateEntity;
import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.state.AgentVersion;
@@ -282,7 +283,7 @@ public class ClusterTest {
hostEntities.add(host2);
clusterEntity.setHostEntities(hostEntities);
- clusterEntity.setClusterConfigEntities(Collections.EMPTY_LIST);
+ clusterEntity.setClusterConfigEntities(Collections.<ClusterConfigEntity>emptyList());
//both sides of relation should be set when modifying in runtime
host1.setClusterEntities(Arrays.asList(clusterEntity));
host2.setClusterEntities(Arrays.asList(clusterEntity));
@@ -300,7 +301,7 @@ public class ClusterTest {
clusterServiceEntity.setServiceName("HDFS");
clusterServiceEntity.setClusterEntity(clusterEntity);
clusterServiceEntity.setServiceComponentDesiredStateEntities(
- Collections.EMPTY_LIST);
+ Collections.<ServiceComponentDesiredStateEntity>emptyList());
ServiceDesiredStateEntity stateEntity = mock(ServiceDesiredStateEntity.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java
index 0d0e03c..2281785 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/scheduler/BatchRequestJobTest.java
@@ -36,6 +36,7 @@ import java.util.Map;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
import org.apache.ambari.server.scheduler.ExecutionScheduleManager;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
import org.quartz.JobDataMap;
@@ -72,9 +73,9 @@ public class BatchRequestJobTest {
BatchRequestResponse completedResponse = new BatchRequestResponse();
completedResponse.setStatus(HostRoleStatus.COMPLETED.toString());
- Capture<Long> executionIdCapture = new Capture<Long>();
- Capture<Long> batchIdCapture = new Capture<Long>();
- Capture<String> clusterNameCapture = new Capture<String>();
+ Capture<Long> executionIdCapture = EasyMock.newCapture();
+ Capture<Long> batchIdCapture = EasyMock.newCapture();
+ Capture<String> clusterNameCapture = EasyMock.newCapture();
expect(scheduleManagerMock.executeBatchRequest(captureLong(executionIdCapture),
@@ -127,7 +128,7 @@ public class BatchRequestJobTest {
expect(jobDataMap.getWrappedMap()).andReturn(properties);
expect(jobDataMap.getString((String) anyObject())).andReturn("testJob").anyTimes();
- Capture<Trigger> triggerCapture = new Capture<Trigger>();
+ Capture<Trigger> triggerCapture = EasyMock.newCapture();
scheduleManagerMock.scheduleJob(capture(triggerCapture));
expectLastCall().once();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
index fac5185..b0c4729 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
@@ -121,7 +121,7 @@ public class AmbariContextTest {
private Configuration group1Configuration = null;
private static final Collection<String> group1Hosts = Arrays.asList(HOST1, HOST2);
- private Capture<Set<ConfigGroupRequest>> configGroupRequestCapture = new Capture<Set<ConfigGroupRequest>>();
+ private Capture<Set<ConfigGroupRequest>> configGroupRequestCapture = EasyMock.newCapture();
@Before
public void setUp() throws Exception {
@@ -266,23 +266,23 @@ public class AmbariContextTest {
@Test
public void testCreateAmbariResources() throws Exception {
// expectations
- Capture<ClusterRequest> clusterRequestCapture = new Capture<ClusterRequest>();
+ Capture<ClusterRequest> clusterRequestCapture = EasyMock.newCapture();
controller.createCluster(capture(clusterRequestCapture));
expectLastCall().once();
expect(cluster.getServices()).andReturn(clusterServices).anyTimes();
- Capture<Set<ServiceRequest>> serviceRequestCapture = new Capture<Set<ServiceRequest>>();
- Capture<Set<ServiceComponentRequest>> serviceComponentRequestCapture = new Capture<Set<ServiceComponentRequest>>();
+ Capture<Set<ServiceRequest>> serviceRequestCapture = EasyMock.newCapture();
+ Capture<Set<ServiceComponentRequest>> serviceComponentRequestCapture = EasyMock.newCapture();
serviceResourceProvider.createServices(capture(serviceRequestCapture));
expectLastCall().once();
componentResourceProvider.createComponents(capture(serviceComponentRequestCapture));
expectLastCall().once();
- Capture<Request> serviceInstallRequestCapture = new Capture<Request>();
- Capture<Request> serviceStartRequestCapture = new Capture<Request>();
- Capture<Predicate> installPredicateCapture = new Capture<Predicate>();
- Capture<Predicate> startPredicateCapture = new Capture<Predicate>();
+ Capture<Request> serviceInstallRequestCapture = EasyMock.newCapture();
+ Capture<Request> serviceStartRequestCapture = EasyMock.newCapture();
+ Capture<Predicate> installPredicateCapture = EasyMock.newCapture();
+ Capture<Predicate> startPredicateCapture = EasyMock.newCapture();
expect(serviceResourceProvider.updateResources(capture(serviceInstallRequestCapture),
capture(installPredicateCapture))).andReturn(null).once();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java
index 0f795b6..60bb2ba 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java
@@ -88,7 +88,7 @@ public class AsyncCallableServiceTest extends EasyMockSupport {
replayAll();
- asyncCallableService = new AsyncCallableService(taskMock, timeout, delay, executorServiceMock);
+ asyncCallableService = new AsyncCallableService<>(taskMock, timeout, delay, executorServiceMock);
// WHEN
Boolean serviceResult = asyncCallableService.call();
@@ -111,7 +111,7 @@ public class AsyncCallableServiceTest extends EasyMockSupport {
}
};
- asyncCallableService = new AsyncCallableService(hangingTask, timeout, delay, Executors.newScheduledThreadPool(2));
+ asyncCallableService = new AsyncCallableService<>(hangingTask, timeout, delay, Executors.newScheduledThreadPool(2));
// WHEN
Boolean serviceResult = asyncCallableService.call();
@@ -128,7 +128,7 @@ public class AsyncCallableServiceTest extends EasyMockSupport {
expect(taskMock.call()).andReturn(Boolean.TRUE).times(1);
replayAll();
- asyncCallableService = new AsyncCallableService(taskMock, timeout, delay, Executors.newScheduledThreadPool(2));
+ asyncCallableService = new AsyncCallableService<>(taskMock, timeout, delay, Executors.newScheduledThreadPool(2));
// WHEN
Boolean serviceResult = asyncCallableService.call();
@@ -146,7 +146,7 @@ public class AsyncCallableServiceTest extends EasyMockSupport {
// the task to be throws exception
expect(taskMock.call()).andThrow(new IllegalStateException("****************** TESTING ****************")).times(2, 3);
replayAll();
- asyncCallableService = new AsyncCallableService(taskMock, timeout, delay, Executors.newScheduledThreadPool(2));
+ asyncCallableService = new AsyncCallableService<>(taskMock, timeout, delay, Executors.newScheduledThreadPool(2));
// WHEN
Boolean serviceResult = asyncCallableService.call();
@@ -170,7 +170,7 @@ public class AsyncCallableServiceTest extends EasyMockSupport {
}
};
- asyncCallableService = new AsyncCallableService(hangingTask, timeout, delay, Executors.newScheduledThreadPool(2));
+ asyncCallableService = new AsyncCallableService<>(hangingTask, timeout, delay, Executors.newScheduledThreadPool(2));
// WHEN
Boolean serviceResult = asyncCallableService.call();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintImplTest.java
index 0efa94b..1ffd8f7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintImplTest.java
@@ -37,6 +37,7 @@ import java.util.Set;
import org.apache.ambari.server.controller.internal.Stack;
import org.apache.ambari.server.orm.entities.BlueprintEntity;
import org.apache.ambari.server.state.SecurityType;
+import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -408,10 +409,10 @@ public class BlueprintImplTest {
// iter.remove();
//
// AmbariManagementController managementController = createMock(AmbariManagementController.class);
-// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>();
-// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = new Capture<Set<StackServiceComponentRequest>>();
-// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = new Capture<StackConfigurationRequest>();
-// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = new Capture<StackLevelConfigurationRequest>();
+// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = EasyMock.newCapture();
+// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = EasyMock.newCapture();
+// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = EasyMock.newCapture();
+// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = EasyMock.newCapture();
// Request request = createMock(Request.class);
// StackServiceResponse stackServiceResponse = createMock(StackServiceResponse.class);
// StackServiceComponentResponse stackServiceComponentResponse = createNiceMock(StackServiceComponentResponse.class);
@@ -433,7 +434,7 @@ public class BlueprintImplTest {
// serviceComponents.add(component1);
// serviceComponents.add(component2);
//
-// Capture<BlueprintEntity> entityCapture = new Capture<BlueprintEntity>();
+// Capture<BlueprintEntity> entityCapture = EasyMock.newCapture();
//
// // set expectations
// expect(blueprintFactory.createBlueprint(setProperties.iterator().next())).andReturn(blueprint).once();
@@ -516,10 +517,10 @@ public class BlueprintImplTest {
// setConfigurationProperties(setProperties);
//
// AmbariManagementController managementController = createMock(AmbariManagementController.class);
-// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>();
-// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = new Capture<Set<StackServiceComponentRequest>>();
-// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = new Capture<StackConfigurationRequest>();
-// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = new Capture<StackLevelConfigurationRequest>();
+// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = EasyMock.newCapture();
+// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = EasyMock.newCapture();
+// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = EasyMock.newCapture();
+// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = EasyMock.newCapture();
// Request request = createMock(Request.class);
// StackServiceResponse stackServiceResponse = createMock(StackServiceResponse.class);
// StackServiceComponentResponse stackServiceComponentResponse = createNiceMock(StackServiceComponentResponse.class);
@@ -548,7 +549,7 @@ public class BlueprintImplTest {
// serviceComponents.add(component1);
// serviceComponents.add(component2);
//
-// Capture<BlueprintEntity> entityCapture = new Capture<BlueprintEntity>();
+// Capture<BlueprintEntity> entityCapture = EasyMock.newCapture();
//
// // set expectations
// expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(
@@ -634,10 +635,10 @@ public class BlueprintImplTest {
// iter.remove();
//
// AmbariManagementController managementController = createMock(AmbariManagementController.class);
-// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>();
-// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = new Capture<Set<StackServiceComponentRequest>>();
-// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = new Capture<StackConfigurationRequest>();
-// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = new Capture<StackLevelConfigurationRequest>();
+// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = EasyMock.newCapture();
+// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = EasyMock.newCapture();
+// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = EasyMock.newCapture();
+// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = EasyMock.newCapture();
// Request request = createMock(Request.class);
// StackServiceResponse stackServiceResponse = createMock(StackServiceResponse.class);
// StackServiceComponentResponse stackServiceComponentResponse = createNiceMock(StackServiceComponentResponse.class);
@@ -667,7 +668,7 @@ public class BlueprintImplTest {
// serviceComponents.add(component1);
// serviceComponents.add(component2);
//
-// Capture<BlueprintEntity> entityCapture = new Capture<BlueprintEntity>();
+// Capture<BlueprintEntity> entityCapture = EasyMock.newCapture();
//
// // set expectations
// expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(
@@ -752,10 +753,10 @@ public class BlueprintImplTest {
// iter.remove();
//
// AmbariManagementController managementController = createMock(AmbariManagementController.class);
-// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>();
-// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = new Capture<Set<StackServiceComponentRequest>>();
-// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = new Capture<StackConfigurationRequest>();
-// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = new Capture<StackLevelConfigurationRequest>();
+// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = EasyMock.newCapture();
+// Capture<Set<StackServiceComponentRequest>> serviceComponentRequestCapture = EasyMock.newCapture();
+// Capture<StackConfigurationRequest> stackConfigurationRequestCapture = EasyMock.newCapture();
+// Capture<StackLevelConfigurationRequest> stackLevelConfigurationRequestCapture = EasyMock.newCapture();
// Request request = createMock(Request.class);
// StackServiceResponse stackServiceResponse = createMock(StackServiceResponse.class);
// StackServiceComponentResponse stackServiceComponentResponse = createNiceMock(StackServiceComponentResponse.class);
@@ -849,7 +850,7 @@ public class BlueprintImplTest {
// {
// Request request = createMock(Request.class);
// AmbariManagementController managementController = createMock(AmbariManagementController.class);
-// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>();
+// Capture<Set<StackServiceRequest>> stackServiceRequestCapture = EasyMock.newCapture();
//
// Map<String, ServiceInfo> services = new HashMap<String, ServiceInfo>();
// ServiceInfo service = new ServiceInfo();
@@ -870,7 +871,7 @@ public class BlueprintImplTest {
// BlueprintResourceProvider.HOST_GROUP_PROPERTY_ID)).iterator().next().get("components")).
// iterator().next().put("name", "AMBARI_SERVER");
//
-// Capture<BlueprintEntity> entityCapture = new Capture<BlueprintEntity>();
+// Capture<BlueprintEntity> entityCapture = EasyMock.newCapture();
//
// // set expectations
// expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java
index 4ca5b5f..08b9889 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintValidatorImplTest.java
@@ -228,7 +228,8 @@ public class BlueprintValidatorImplTest {
services.addAll(Arrays.asList("HIVE"));
- expect(group1.getConfiguration()).andReturn(new Configuration(new HashMap(), new HashMap())).anyTimes();
+ Configuration config = new Configuration(new HashMap<String, Map<String, String>>(), new HashMap<String, Map<String, Map<String, String>>>());
+ expect(group1.getConfiguration()).andReturn(config).anyTimes();
expect(stack.getComponents("HIVE")).andReturn(Collections.singleton("HIVE_METASTORE")).anyTimes();
expect(stack.getVersion()).andReturn("2.2").once();
@@ -251,7 +252,8 @@ public class BlueprintValidatorImplTest {
services.addAll(Arrays.asList("OOZIE"));
- expect(group1.getConfiguration()).andReturn(new Configuration(new HashMap(), new HashMap())).anyTimes();
+ Configuration config = new Configuration(new HashMap<String, Map<String, String>>(), new HashMap<String, Map<String, Map<String, String>>>());
+ expect(group1.getConfiguration()).andReturn(config).anyTimes();
expect(stack.getComponents("OOZIE")).andReturn(Collections.singleton("OOZIE_SERVER")).anyTimes();
expect(stack.getVersion()).andReturn("2.2").once();
@@ -398,8 +400,8 @@ public class BlueprintValidatorImplTest {
expect(dependency2.getName()).andReturn("dependency-2").anyTimes();
expect(dependency2.hasDependencyConditions()).andReturn(false).anyTimes();
- expect(dependencyConditionInfo1.isResolved(EasyMock.anyObject(Map.class))).andReturn(true).anyTimes();
- expect(dependencyConditionInfo2.isResolved(EasyMock.anyObject(Map.class))).andReturn(false).anyTimes();
+ expect(dependencyConditionInfo1.isResolved(EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(true).anyTimes();
+ expect(dependencyConditionInfo2.isResolved(EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(false).anyTimes();
expect(dependencyComponentInfo.isClient()).andReturn(false).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java
index 74f3115..c97c568 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java
@@ -32,6 +32,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -254,7 +255,7 @@ public class ClusterConfigurationRequestTest {
.anyTimes();
expect(ambariContext.getClusterName(Long.valueOf(1))).andReturn("testCluster").anyTimes();
- expect(ambariContext.createConfigurationRequests(anyObject(Map.class))).andReturn(Collections
+ expect(ambariContext.createConfigurationRequests(EasyMock.<Map<String, Object>>anyObject())).andReturn(Collections
.<ConfigurationRequest>emptyList()).anyTimes();
if (kerberosConfig == null) {
@@ -263,10 +264,10 @@ public class ClusterConfigurationRequestTest {
properties.put("testProperty", "KERBEROStestValue");
kerberosConfig.put("testConfigType", properties);
}
- expect(kerberosHelper.ensureHeadlessIdentities(anyObject(Cluster.class), anyObject(Map.class), anyObject
- (Set.class))).andReturn(true).once();
- expect(kerberosHelper.getServiceConfigurationUpdates(anyObject(Cluster.class), anyObject(Map.class), anyObject
- (Map.class), anyObject(Map.class), anyObject(Set.class), anyBoolean(), eq(false))).andReturn(kerberosConfig).once();
+ expect(kerberosHelper.ensureHeadlessIdentities(anyObject(Cluster.class), EasyMock.<Map<String, Map<String, String>>>anyObject(),
+ EasyMock.<Set<String>>anyObject())).andReturn(true).once();
+ expect(kerberosHelper.getServiceConfigurationUpdates(anyObject(Cluster.class), EasyMock.<Map<String, Map<String, String>>>anyObject(),
+ EasyMock.<Map<String, Set<String>>>anyObject(), EasyMock.<Map<String, Collection<String>>>anyObject(), EasyMock.<Set<String>>anyObject(), anyBoolean(), eq(false))).andReturn(kerberosConfig).once();
Capture<? extends String> captureClusterName = newCapture(CaptureType.ALL);
Capture<? extends Set<String>> captureUpdatedConfigTypes = newCapture(CaptureType.ALL);
@@ -334,7 +335,7 @@ public class ClusterConfigurationRequestTest {
expect(topology.getHostGroupInfo()).andReturn(Collections.<String, HostGroupInfo>emptyMap()).anyTimes();
expect(topology.getClusterId()).andReturn(Long.valueOf(1)).anyTimes();
expect(ambariContext.getClusterName(Long.valueOf(1))).andReturn("testCluster").anyTimes();
- expect(ambariContext.createConfigurationRequests(anyObject(Map.class))).andReturn(Collections
+ expect(ambariContext.createConfigurationRequests(EasyMock.<Map<String, Object>>anyObject())).andReturn(Collections
.<ConfigurationRequest>emptyList()).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
index dd9b703..c205e57 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java
@@ -67,6 +67,7 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.SecurityType;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockRule;
import org.easymock.EasyMockSupport;
import org.easymock.Mock;
@@ -210,7 +211,7 @@ public class ClusterDeployWithStartOnlyTest {
topoConfiguration.setProperty("service2-site", "s2-prop", "s2-prop-value");
topoConfiguration.setProperty("cluster-env", "g-prop", "g-prop-value");
- //clusterRequestCapture = new Capture<ClusterRequest>();
+ //clusterRequestCapture = EasyMock.newCapture();
// group 1 has fqdn specified
group1Info.addHost("host1");
group1Info.setConfiguration(topoGroup1Config);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
index 8ba608b..b276ecf 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java
@@ -68,6 +68,7 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.SecurityType;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockRule;
import org.easymock.EasyMockSupport;
import org.easymock.Mock;
@@ -206,7 +207,7 @@ public class ClusterInstallWithoutStartOnComponentLevelTest {
topoConfiguration.setProperty("service2-site", "s2-prop", "s2-prop-value");
topoConfiguration.setProperty("cluster-env", "g-prop", "g-prop-value");
- //clusterRequestCapture = new Capture<ClusterRequest>();
+ //clusterRequestCapture = EasyMock.newCapture();
// group 1 has fqdn specified
group1Info.addHost("host1");
group1Info.setConfiguration(topoGroup1Config);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
index 63dd0a0..58862f1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java
@@ -68,6 +68,7 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.SecurityType;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockRule;
import org.easymock.EasyMockSupport;
import org.easymock.Mock;
@@ -206,7 +207,7 @@ public class ClusterInstallWithoutStartTest {
topoConfiguration.setProperty("service2-site", "s2-prop", "s2-prop-value");
topoConfiguration.setProperty("cluster-env", "g-prop", "g-prop-value");
- //clusterRequestCapture = new Capture<ClusterRequest>();
+ //clusterRequestCapture = EasyMock.newCapture();
// group 1 has fqdn specified
group1Info.addHost("host1");
group1Info.setConfiguration(topoGroup1Config);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigureClusterTaskTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigureClusterTaskTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigureClusterTaskTest.java
index 53bcdc3..aa7ba0e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigureClusterTaskTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigureClusterTaskTest.java
@@ -74,8 +74,8 @@ public class ConfigureClusterTaskTest {
Exception {
// GIVEN
// is it OK to handle the non existence of hostgroups as a success?!
- expect(clusterConfigurationRequest.getRequiredHostGroups()).andReturn(Collections.EMPTY_LIST);
- expect(clusterTopology.getHostGroupInfo()).andReturn(Collections.EMPTY_MAP);
+ expect(clusterConfigurationRequest.getRequiredHostGroups()).andReturn(Collections.<String>emptyList());
+ expect(clusterTopology.getHostGroupInfo()).andReturn(Collections.<String, HostGroupInfo>emptyMap());
// this is only called if the "prerequisites" are satisfied
clusterConfigurationRequest.process();
@@ -94,8 +94,8 @@ public class ConfigureClusterTaskTest {
public void testsShouldConfigureClusterTaskExecuteWhenCalledFromAsyncCallableService() throws Exception {
// GIVEN
// is it OK to handle the non existence of hostgroups as a success?!
- expect(clusterConfigurationRequest.getRequiredHostGroups()).andReturn(Collections.EMPTY_LIST);
- expect(clusterTopology.getHostGroupInfo()).andReturn(Collections.EMPTY_MAP);
+ expect(clusterConfigurationRequest.getRequiredHostGroups()).andReturn(Collections.<String>emptyList());
+ expect(clusterTopology.getHostGroupInfo()).andReturn(Collections.<String, HostGroupInfo>emptyMap());
// this is only called if the "prerequisites" are satisfied
clusterConfigurationRequest.process();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/HostGroupInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/HostGroupInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/HostGroupInfoTest.java
index 0efa9ad..93015e2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/HostGroupInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/HostGroupInfoTest.java
@@ -112,7 +112,7 @@ public class HostGroupInfoTest {
group.setPredicate("Hosts/host_name=awesome.host.com");
assertEquals("Hosts/host_name=awesome.host.com", group.getPredicateString());
- assertEquals(new EqualsPredicate("Hosts/host_name", "awesome.host.com"), group.getPredicate());
+ assertEquals(new EqualsPredicate<>("Hosts/host_name", "awesome.host.com"), group.getPredicate());
}
@Test(expected=InvalidQueryException.class)
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
index dad660c..7e6e5a3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
@@ -189,7 +189,7 @@ public class TopologyManagerTest {
topoConfiguration.setProperty("service2-site", "s2-prop", "s2-prop-value");
topoConfiguration.setProperty("cluster-env", "g-prop", "g-prop-value");
- //clusterRequestCapture = new Capture<ClusterRequest>();
+ //clusterRequestCapture = EasyMock.newCapture();
// group 1 has fqdn specified
group1Info.addHost("host1");
group1Info.setConfiguration(topoGroup1Config);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
index b00f9f0..87cea1b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
@@ -84,6 +84,7 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.stack.OsFamily;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.After;
import org.junit.Assert;
@@ -138,34 +139,34 @@ public class UpgradeCatalog200Test {
expect(configuration.getDatabaseUrl()).andReturn(Configuration.JDBC_IN_MEMORY_URL).anyTimes();
- Capture<DBAccessor.DBColumnInfo> alertDefinitionIgnoreColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> alertDefinitionDescriptionColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> alertTargetGlobalColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostComponentStateColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostComponentVersionColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> clustersSecurityTypeColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostComponentStateSecurityStateColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostComponentDesiredStateSecurityStateColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostRoleCommandRetryColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> stageSkippableColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
-
- Capture<DBAccessor.DBColumnInfo> viewparameterLabelColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> viewparameterPlaceholderColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> viewparameterDefaultValueColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
-
- Capture<DBAccessor.DBColumnInfo> serviceDesiredStateSecurityStateColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<List<DBAccessor.DBColumnInfo>> clusterVersionCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
- Capture<List<DBAccessor.DBColumnInfo>> hostVersionCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
- Capture<DBAccessor.DBColumnInfo> valueColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> dataValueColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<List<DBAccessor.DBColumnInfo>> alertTargetStatesCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
- Capture<List<DBAccessor.DBColumnInfo>> artifactCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
- Capture<List<DBAccessor.DBColumnInfo>> kerberosPrincipalCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
- Capture<List<DBAccessor.DBColumnInfo>> kerberosPrincipalHostCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
-
- Capture<List<DBAccessor.DBColumnInfo>> upgradeCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
- Capture<List<DBAccessor.DBColumnInfo>> upgradeGroupCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
- Capture<List<DBAccessor.DBColumnInfo>> upgradeItemCapture = new Capture<List<DBAccessor.DBColumnInfo>>();
+ Capture<DBAccessor.DBColumnInfo> alertDefinitionIgnoreColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> alertDefinitionDescriptionColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> alertTargetGlobalColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostComponentStateColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostComponentVersionColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> clustersSecurityTypeColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostComponentStateSecurityStateColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostComponentDesiredStateSecurityStateColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostRoleCommandRetryColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> stageSkippableColumnCapture = EasyMock.newCapture();
+
+ Capture<DBAccessor.DBColumnInfo> viewparameterLabelColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> viewparameterPlaceholderColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> viewparameterDefaultValueColumnCapture = EasyMock.newCapture();
+
+ Capture<DBAccessor.DBColumnInfo> serviceDesiredStateSecurityStateColumnCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> clusterVersionCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> hostVersionCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> valueColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> dataValueColumnCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> alertTargetStatesCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> artifactCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> kerberosPrincipalCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> kerberosPrincipalHostCapture = EasyMock.newCapture();
+
+ Capture<List<DBAccessor.DBColumnInfo>> upgradeCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> upgradeGroupCapture = EasyMock.newCapture();
+ Capture<List<DBAccessor.DBColumnInfo>> upgradeItemCapture = EasyMock.newCapture();
// Alert Definition
dbAccessor.addColumn(eq("alert_definition"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
index 0835823..36f66c6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
@@ -87,6 +87,7 @@ import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
import org.apache.ambari.server.state.stack.OsFamily;
import org.easymock.Capture;
import org.easymock.CaptureType;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Assert;
import org.junit.Test;
@@ -353,9 +354,9 @@ public class UpgradeCatalog210Test {
put("normal", mockClusterExpected);
}}).once();
- Capture<String> configTypeEnv = new Capture<String>();
- Capture<String> configTypeSite = new Capture<String>();
- Capture<String> configTypeServerSite = new Capture<String>();
+ Capture<String> configTypeEnv = EasyMock.newCapture();
+ Capture<String> configTypeSite = EasyMock.newCapture();
+ Capture<String> configTypeServerSite = EasyMock.newCapture();
expect(mockClusterExpected.getDesiredConfigByType("hive-env")).andReturn(mockHiveEnv).atLeastOnce();
expect(mockClusterExpected.getDesiredConfigByType("hiveserver2-site")).andReturn(mockHiveServerSite).atLeastOnce();
@@ -517,7 +518,7 @@ public class UpgradeCatalog210Test {
anyString(),
capture(configCreation),
anyString(),
- (Map<String, Map<String, String>>)anyObject())).andReturn(null).atLeastOnce();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).atLeastOnce();
easyMockSupport.replayAll();
upgradeCatalog210.updateHiveConfigs();
@@ -602,7 +603,7 @@ public class UpgradeCatalog210Test {
anyString(),
capture(configCreation),
anyString(),
- (Map<String, Map<String, String>>) anyObject())).andReturn(null).atLeastOnce();
+ EasyMock.<Map<String, Map<String, String>>>anyObject())).andReturn(null).atLeastOnce();
easyMockSupport.replayAll();
upgradeCatalog210.updateHiveConfigs();
@@ -792,8 +793,8 @@ public class UpgradeCatalog210Test {
expect(mockHBaseSite.getProperties()).andReturn(propertiesExpectedHBaseSite).anyTimes();
expect(mockHBaseEnv.getProperties()).andReturn(propertiesExpectedHBaseEnv).anyTimes();
- Capture<String> configType = new Capture<String>();
- Capture<String> configTag = new Capture<String>();
+ Capture<String> configType = EasyMock.newCapture();
+ Capture<String> configTag = EasyMock.newCapture();
expect(mockClusterExpected.getConfig(capture(configType), capture(configTag))).
andReturn(mockHBaseSite).atLeastOnce();
@@ -977,7 +978,7 @@ public class UpgradeCatalog210Test {
UpgradeCatalog210 upgradeMock = createMockBuilder(UpgradeCatalog210.class).createMock();
- Capture<Map<String, Object>> updatedData = new Capture<Map<String, Object>>();
+ Capture<Map<String, Object>> updatedData = EasyMock.newCapture();
ArtifactEntity artifactEntity = createNiceMock(ArtifactEntity.class);
expect(artifactEntity.getArtifactData())
@@ -1029,7 +1030,7 @@ public class UpgradeCatalog210Test {
UpgradeCatalog210 upgradeMock = createMockBuilder(UpgradeCatalog210.class).createMock();
- Capture<Map<String, Object>> updatedData = new Capture<Map<String, Object>>();
+ Capture<Map<String, Object>> updatedData = EasyMock.newCapture();
ArtifactEntity artifactEntity = createNiceMock(ArtifactEntity.class);
expect(artifactEntity.getArtifactData())
@@ -1074,18 +1075,18 @@ public class UpgradeCatalog210Test {
// Column Capture section
// Hosts
- Capture<DBAccessor.DBColumnInfo> clusterHostMappingColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> configGroupHostMappingColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostConfigMappingColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostsColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostComponentStateColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostComponentDesiredStateColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostRoleCommandColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostStateColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> hostVersionColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> kerberosPrincipalHostColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> requestOperationLevelColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> serviceConfigHostsColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
+ Capture<DBAccessor.DBColumnInfo> clusterHostMappingColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> configGroupHostMappingColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostConfigMappingColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostsColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostComponentStateColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostComponentDesiredStateColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostRoleCommandColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostStateColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> hostVersionColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> kerberosPrincipalHostColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> requestOperationLevelColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> serviceConfigHostsColumnCapture = EasyMock.newCapture();
captures.put("ClusterHostMapping", clusterHostMappingColumnCapture);
captures.put("configgrouphostmapping", configGroupHostMappingColumnCapture);
@@ -1156,14 +1157,14 @@ public class UpgradeCatalog210Test {
public WidgetSectionDDL() {
captures = new HashMap<String, Capture<List<DBColumnInfo>>>();
- Capture<List<DBColumnInfo>> userWidgetColumnsCapture = new Capture<List<DBColumnInfo>>();
- Capture<List<DBColumnInfo>> widgetLayoutColumnsCapture = new Capture<List<DBColumnInfo>>();
- Capture<List<DBColumnInfo>> widgetLayoutUserWidgetColumnsCapture = new Capture<List<DBColumnInfo>>();
+ Capture<List<DBColumnInfo>> userWidgetColumnsCapture = EasyMock.newCapture();
+ Capture<List<DBColumnInfo>> widgetLayoutColumnsCapture = EasyMock.newCapture();
+ Capture<List<DBColumnInfo>> widgetLayoutUserWidgetColumnsCapture = EasyMock.newCapture();
captures.put("widget", userWidgetColumnsCapture);
captures.put("widget_layout", widgetLayoutColumnsCapture);
captures.put("widget_layout_user_widget", widgetLayoutUserWidgetColumnsCapture);
- userActiveLayoutsColumnCapture = new Capture<DBColumnInfo>();
+ userActiveLayoutsColumnCapture = EasyMock.newCapture();
}
/**
@@ -1220,10 +1221,10 @@ public class UpgradeCatalog210Test {
public ViewSectionDDL() {
captures = new HashMap<String, Capture<DBColumnInfo>>();
- Capture<DBAccessor.DBColumnInfo> viewInstanceColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> viewInstanceAlterNamesColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> viewParamColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
- Capture<DBAccessor.DBColumnInfo> viewBuildColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
+ Capture<DBAccessor.DBColumnInfo> viewInstanceColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> viewInstanceAlterNamesColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> viewParamColumnCapture = EasyMock.newCapture();
+ Capture<DBAccessor.DBColumnInfo> viewBuildColumnCapture = EasyMock.newCapture();
captures.put("viewinstance", viewInstanceColumnCapture);
captures.put("viewinstance_alter_names", viewInstanceAlterNamesColumnCapture);
@@ -1295,12 +1296,12 @@ public class UpgradeCatalog210Test {
stringCaptures = new HashMap<String, Capture<String>>();
classCaptures = new HashMap<String, Capture<Class>>();
- Capture<String> textCaptureC = new Capture<String>();
- Capture<String> textCaptureH = new Capture<String>();
- Capture<Class> classFromC = new Capture<Class>();
- Capture<Class> classFromH = new Capture<Class>();
- Capture<Class> classToC = new Capture<Class>();
- Capture<Class> classToH = new Capture<Class>();
+ Capture<String> textCaptureC = EasyMock.newCapture();
+ Capture<String> textCaptureH = EasyMock.newCapture();
+ Capture<Class> classFromC = EasyMock.newCapture();
+ Capture<Class> classFromH = EasyMock.newCapture();
+ Capture<Class> classToC = EasyMock.newCapture();
+ Capture<Class> classToH = EasyMock.newCapture();
stringCaptures.put("textCaptureC", textCaptureC);
stringCaptures.put("textCaptureH", textCaptureH);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog211Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog211Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog211Test.java
index 094a2d9..c705d89 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog211Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog211Test.java
@@ -50,6 +50,7 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.stack.OsFamily;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Assert;
import org.junit.Test;
@@ -96,7 +97,7 @@ public class UpgradeCatalog211Test extends EasyMockSupport {
statement.executeQuery(anyObject(String.class));
expectLastCall().andReturn(rs1).anyTimes();
- Capture<String> queryCapture = new Capture<String>();
+ Capture<String> queryCapture = EasyMock.newCapture();
dbAccessor.executeQuery(capture(queryCapture));
expectLastCall().once();
@@ -259,12 +260,12 @@ public class UpgradeCatalog211Test extends EasyMockSupport {
.andReturn(configKerberosEnv)
.once();
- Capture<ConfigurationRequest> captureCR = new Capture<ConfigurationRequest>();
+ Capture<ConfigurationRequest> captureCR = EasyMock.newCapture();
Capture<Cluster> clusterCapture = newCapture();
Capture<String> typeCapture = newCapture();
- Capture<Map> propertiesCapture = newCapture();
+ Capture<Map<String, String>> propertiesCapture = newCapture();
Capture<String> tagCapture = newCapture();
- Capture<Map> attributesCapture = newCapture();
+ Capture<Map<String, Map<String, String>>> attributesCapture = newCapture();
expect(controller.createConfig(capture(clusterCapture), capture(typeCapture),
@@ -394,12 +395,12 @@ public class UpgradeCatalog211Test extends EasyMockSupport {
stringCaptures = new HashMap<String, Capture<String>>();
classCaptures = new HashMap<String, Capture<Class>>();
- Capture<String> textCaptureC = new Capture<String>();
- Capture<String> textCaptureH = new Capture<String>();
- Capture<Class> classFromC = new Capture<Class>();
- Capture<Class> classFromH = new Capture<Class>();
- Capture<Class> classToC = new Capture<Class>();
- Capture<Class> classToH = new Capture<Class>();
+ Capture<String> textCaptureC = EasyMock.newCapture();
+ Capture<String> textCaptureH = EasyMock.newCapture();
+ Capture<Class> classFromC = EasyMock.newCapture();
+ Capture<Class> classFromH = EasyMock.newCapture();
+ Capture<Class> classToC = EasyMock.newCapture();
+ Capture<Class> classToH = EasyMock.newCapture();
stringCaptures.put("textCaptureC", textCaptureC);
stringCaptures.put("textCaptureH", textCaptureH);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
index 90a2549..d15ca25 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
@@ -59,6 +59,7 @@ import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.stack.OsFamily;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockRule;
import org.easymock.EasyMockSupport;
import org.easymock.Mock;
@@ -466,7 +467,7 @@ public class UpgradeCatalog212Test {
public HostRoleCommandDDL() {
captures = new HashMap<String, Capture<DBColumnInfo>>();
- Capture<DBAccessor.DBColumnInfo> hostRoleCommandAutoSkipColumnCapture = new Capture<DBAccessor.DBColumnInfo>();
+ Capture<DBAccessor.DBColumnInfo> hostRoleCommandAutoSkipColumnCapture = EasyMock.newCapture();
captures.put("host_role_command", hostRoleCommandAutoSkipColumnCapture);
}
[3/5] ambari git commit: AMBARI-19149. Code cleanup: compiler
warnings (Attila Doroszlai via ncole)
Posted by nc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
index 534a899..2f8c69f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
@@ -49,6 +49,7 @@ import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.security.TestAuthenticationFactory;
import org.apache.ambari.server.state.StackId;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -170,8 +171,8 @@ public class ConfigurationResourceProviderTest {
orResponse.add(new ConfigurationResponse("Cluster100", stackId, "type",
"tag2", 2L, null, null));
- Capture<Set<ConfigurationRequest>> configRequestCapture1 = new Capture<Set<ConfigurationRequest>>();
- Capture<Set<ConfigurationRequest>> configRequestCapture2 = new Capture<Set<ConfigurationRequest>>();
+ Capture<Set<ConfigurationRequest>> configRequestCapture1 = EasyMock.newCapture();
+ Capture<Set<ConfigurationRequest>> configRequestCapture2 = EasyMock.newCapture();
// set expectations
//equals predicate
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
index 377d160..977c3f8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
@@ -74,7 +74,9 @@ import org.apache.ambari.server.state.HostConfig;
import org.apache.ambari.server.state.HostHealthStatus;
import org.apache.ambari.server.state.HostHealthStatus.HealthStatus;
import org.apache.ambari.server.state.MaintenanceState;
+import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.stack.OsFamily;
+import org.apache.ambari.server.topology.LogicalRequest;
import org.apache.ambari.server.topology.TopologyManager;
import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
@@ -1074,7 +1076,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(clusters.getHost("Host100")).andReturn(host1).anyTimes();
expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes();
expect(clusters.getClustersForHost("Host100")).andReturn(clusterSet).anyTimes();
- expect(cluster.getServiceComponentHosts("Host100")).andReturn(Collections.EMPTY_LIST);
+ expect(cluster.getServiceComponentHosts("Host100")).andReturn(Collections.<ServiceComponentHost>emptyList());
expect(cluster.getClusterId()).andReturn(100L).anyTimes();
expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes();
clusters.deleteHost("Host100");
@@ -1082,7 +1084,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(host1.getHostName()).andReturn("Host100").anyTimes();
expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
- expect(topologyManager.getRequests(Collections.EMPTY_LIST)).andReturn(Collections.EMPTY_LIST).anyTimes();
+ expect(topologyManager.getRequests(Collections.<Long>emptyList())).andReturn(Collections.<LogicalRequest>emptyList()).anyTimes();
// replay
replayAll();
@@ -1334,7 +1336,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
public static void deleteHosts(AmbariManagementController controller, Set<HostRequest> requests)
throws AmbariException {
TopologyManager topologyManager = EasyMock.createNiceMock(TopologyManager.class);
- expect(topologyManager.getRequests(Collections.EMPTY_LIST)).andReturn(Collections.EMPTY_LIST).anyTimes();
+ expect(topologyManager.getRequests(Collections.<Long>emptyList())).andReturn(Collections.<LogicalRequest>emptyList()).anyTimes();
replay(topologyManager);
@@ -1347,7 +1349,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<HostRequest> requests, boolean dryRun, boolean forceDelete)
throws AmbariException {
TopologyManager topologyManager = EasyMock.createNiceMock(TopologyManager.class);
- expect(topologyManager.getRequests(Collections.EMPTY_LIST)).andReturn(Collections.EMPTY_LIST).anyTimes();
+ expect(topologyManager.getRequests(Collections.<Long>emptyList())).andReturn(Collections.<LogicalRequest>emptyList()).anyTimes();
replay(topologyManager);
@@ -1415,7 +1417,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
try {
expect(host.getDesiredHostConfigs(EasyMock.<Cluster> anyObject(),
- EasyMock.<Map> anyObject())).andReturn(desiredConfigs).anyTimes();
+ EasyMock.<Map<String, DesiredConfig>> anyObject())).andReturn(desiredConfigs).anyTimes();
} catch (AmbariException e) {
Assert.fail(e.getMessage());
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
index 7fc8a90..b7fd051 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
@@ -71,6 +71,7 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.cluster.ClusterImpl;
import org.apache.ambari.server.topology.TopologyManager;
import org.apache.ambari.server.utils.StageUtils;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -223,9 +224,9 @@ public class HostStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- anyObject(Map.class), anyObject(String.class))).andReturn(packages).anyTimes();
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes();
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -317,9 +318,9 @@ public class HostStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- anyObject(Map.class), anyObject(String.class))).andReturn(packages).anyTimes();
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes();
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java
index 747c379..d9b3af7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java
@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.controller.spi.Request;
+import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.orm.dao.KerberosDescriptorDAO;
import org.apache.ambari.server.orm.entities.KerberosDescriptorEntity;
@@ -80,7 +81,7 @@ public class KerberosDescriptorResourceProviderTest {
EasyMock.replay(request);
kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO,
- kerberosDescriptorFactory, Collections.EMPTY_SET, Collections.EMPTY_MAP, null);
+ kerberosDescriptorFactory, Collections.<String>emptySet(), Collections.<Resource.Type, String>emptyMap(), null);
// WHEN
kerberosDescriptorResourceProvider.createResources(request);
@@ -97,7 +98,7 @@ public class KerberosDescriptorResourceProviderTest {
EasyMock.replay(request);
kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO,
- kerberosDescriptorFactory, Collections.EMPTY_SET, Collections.EMPTY_MAP, null);
+ kerberosDescriptorFactory, Collections.<String>emptySet(), Collections.<Resource.Type, String>emptyMap(), null);
// WHEN
kerberosDescriptorResourceProvider.createResources(request);
@@ -112,7 +113,7 @@ public class KerberosDescriptorResourceProviderTest {
// GIVEN
kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO,
- kerberosDescriptorFactory, Collections.EMPTY_SET, Collections.EMPTY_MAP, null);
+ kerberosDescriptorFactory, Collections.<String>emptySet(), Collections.<Resource.Type, String>emptyMap(), null);
EasyMock.expect(request.getProperties())
.andReturn(requestPropertySet(KERBEROS_DESCRIPTORS_KERBEROS_DESCRIPTOR_NAME, TEST_KERBEROS_DESCRIPTOR_NAME))
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
index a0bc694..438e073 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
@@ -45,6 +45,7 @@ import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.security.TestAuthenticationFactory;
import org.apache.ambari.server.security.authorization.AuthorizationException;
+import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
import org.springframework.security.core.Authentication;
@@ -79,7 +80,7 @@ public class MemberResourceProviderTest {
AbstractControllerResourceProvider.init(resourceProviderFactory);
- expect(resourceProviderFactory.getMemberResourceProvider(anyObject(Set.class), anyObject(Map.class), eq(managementController)))
+ expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController)))
.andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes();
managementController.createMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", "joe"));
@@ -135,7 +136,7 @@ public class MemberResourceProviderTest {
AbstractControllerResourceProvider.init(resourceProviderFactory);
- expect(resourceProviderFactory.getMemberResourceProvider(anyObject(Set.class), anyObject(Map.class), eq(managementController)))
+ expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController)))
.andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes();
expect(managementController.getMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet(null, null)))
@@ -184,7 +185,7 @@ public class MemberResourceProviderTest {
AbstractControllerResourceProvider.init(resourceProviderFactory);
// set expectations
- expect(resourceProviderFactory.getMemberResourceProvider(anyObject(Set.class), anyObject(Map.class), eq(managementController)))
+ expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController)))
.andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes();
managementController.updateMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", "joe"));
@@ -239,7 +240,7 @@ public class MemberResourceProviderTest {
AbstractControllerResourceProvider.init(resourceProviderFactory);
// set expectations
- expect(resourceProviderFactory.getMemberResourceProvider(anyObject(Set.class), anyObject(Map.class), eq(managementController)))
+ expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController)))
.andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes();
managementController.deleteMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", null));
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java
index 1d44fc0..65e122a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java
@@ -168,7 +168,7 @@ public class RemoteClusterResourceProviderTest {
setField(RemoteClusterResourceProvider.class.getDeclaredField("remoteAmbariClusterDAO"), clusterDAO);
- EqualsPredicate equalsPredicate = new EqualsPredicate(RemoteClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID,"test");
+ EqualsPredicate equalsPredicate = new EqualsPredicate<>(RemoteClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID,"test");
RemoteAmbariClusterRegistry clusterRegistry = createMock(RemoteAmbariClusterRegistry.class);
setField(RemoteClusterResourceProvider.class.getDeclaredField("remoteAmbariClusterRegistry"), clusterRegistry);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
index f7dff11..e6f2ed5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
@@ -612,7 +612,7 @@ public class RequestResourceProviderTest {
expect(requestMock1.getRequestContext()).andReturn("this is a context").anyTimes();
expect(requestMock1.getRequestId()).andReturn(101L).anyTimes();
- Capture<Collection<Long>> requestIdsCapture = new Capture<Collection<Long>>();
+ Capture<Collection<Long>> requestIdsCapture = EasyMock.newCapture();
// set expectations
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
@@ -692,7 +692,7 @@ public class RequestResourceProviderTest {
expect(requestMock1.getRequestContext()).andReturn("this is a context").anyTimes();
expect(requestMock1.getRequestId()).andReturn(101L).anyTimes();
- Capture<Collection<Long>> requestIdsCapture = new Capture<Collection<Long>>();
+ Capture<Collection<Long>> requestIdsCapture = EasyMock.newCapture();
// set expectations
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
@@ -1124,10 +1124,10 @@ public class RequestResourceProviderTest {
public void testCreateResourcesForCommandWithHostPredicate() throws Exception {
Resource.Type type = Resource.Type.Request;
- Capture<ExecuteActionRequest> actionRequest = new Capture<ExecuteActionRequest>();
- Capture<HashMap<String, String>> propertyMap = new Capture<HashMap<String, String>>();
- Capture<Request> requestCapture = new Capture<>();
- Capture<Predicate> predicateCapture = new Capture<>();
+ Capture<ExecuteActionRequest> actionRequest = EasyMock.newCapture();
+ Capture<HashMap<String, String>> propertyMap = EasyMock.newCapture();
+ Capture<Request> requestCapture = EasyMock.newCapture();
+ Capture<Predicate> predicateCapture = EasyMock.newCapture();
AmbariManagementController managementController = createMock(AmbariManagementController.class);
RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
index 8a1e1f0..e3fec23 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
@@ -49,6 +49,7 @@ import org.apache.ambari.server.state.scheduler.RequestExecution;
import org.apache.ambari.server.state.scheduler.RequestExecutionFactory;
import org.apache.ambari.server.state.scheduler.Schedule;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Test;
@@ -91,9 +92,9 @@ public class RequestScheduleResourceProviderTest {
expect(managementController.getAuthName()).andReturn("admin").anyTimes();
expect(managementController.getAuthId()).andReturn(1).anyTimes();
- Capture<Cluster> clusterCapture = new Capture<Cluster>();
- Capture<Batch> batchCapture = new Capture<Batch>();
- Capture<Schedule> scheduleCapture = new Capture<Schedule>();
+ Capture<Cluster> clusterCapture = EasyMock.newCapture();
+ Capture<Batch> batchCapture = EasyMock.newCapture();
+ Capture<Schedule> scheduleCapture = EasyMock.newCapture();
expect(executionFactory.createNew(capture(clusterCapture),
capture(batchCapture), capture(scheduleCapture))).andReturn(requestExecution);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
index cb7051c..9ce2b7b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
@@ -44,6 +44,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.HostHealthStatus;
+import org.easymock.EasyMock;
import org.junit.Test;
public class RootServiceHostComponentResourceProviderTest {
@@ -78,7 +79,7 @@ public class RootServiceHostComponentResourceProviderTest {
expect(managementController.getClusters()).andReturn(clusters).anyTimes();
expect(clusters.getHosts()).andReturn(hosts).anyTimes();
- expect(factory.getRootServiceHostComponent((RootServiceHostComponentRequest) anyObject(), (Set<HostResponse>) anyObject())).
+ expect(factory.getRootServiceHostComponent((RootServiceHostComponentRequest) anyObject(), EasyMock.<Set<HostResponse>>anyObject())).
andReturn(responseSet).anyTimes();
expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
index 716be62..994f221 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
@@ -529,7 +529,7 @@ public class ServiceResourceProviderTest {
// set expectations
expect(managementController.getClusters()).andReturn(clusters).anyTimes();
expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes();
- expect(managementController.getHostComponents((Set<ServiceComponentHostRequest>) anyObject())).
+ expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).
andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes();
expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
index 9fad095..c5ccc3c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
@@ -38,6 +38,7 @@ import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PredicateHelper;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.Test;
import junit.framework.Assert;
@@ -73,7 +74,7 @@ public class SimplifyingPredicateVisitorTest {
public void testVisit() {
ResourceProvider provider = createStrictMock(ResourceProvider.class);
- Capture<Set<String>> propertiesCapture = new Capture<Set<String>>();
+ Capture<Set<String>> propertiesCapture = EasyMock.newCapture();
SimplifyingPredicateVisitor visitor = new SimplifyingPredicateVisitor(provider);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java
index bb8527a..9cca08d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java
@@ -19,7 +19,6 @@
package org.apache.ambari.server.controller.internal;
-import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
@@ -31,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.controller.StackServiceRequest;
import org.apache.ambari.server.controller.StackServiceResponse;
import org.apache.ambari.server.controller.spi.Request;
import org.apache.ambari.server.controller.spi.Resource;
@@ -38,6 +38,7 @@ import org.apache.ambari.server.controller.spi.ResourceProvider;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.ServicePropertyInfo;
+import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
@@ -78,7 +79,7 @@ public class StackServiceResourceProviderTest {
StackServiceResponse stackServiceResponse = createNiceMock(StackServiceResponse.class);
expect(stackServiceResponse.getServiceProperties()).andReturn(TEST_SERVICE_PROPERTIES);
- expect(managementController.getStackServices(anyObject(Set.class)))
+ expect(managementController.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject()))
.andReturn(ImmutableSet.of(stackServiceResponse));
replay(managementController, stackServiceResponse);
@@ -121,7 +122,7 @@ public class StackServiceResourceProviderTest {
- expect(managementController.getStackServices(anyObject(Set.class)))
+ expect(managementController.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject()))
.andReturn(ImmutableSet.of(stackServiceResponse));
replay(managementController);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java
index 0f4ea96..b67d019 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.controller.internal;
-import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
@@ -68,12 +67,12 @@ public class StackTest {
public void testTestXmlExtensionStrippedOff() throws Exception {
AmbariManagementController controller = createNiceMock(AmbariManagementController.class);
AmbariMetaInfo metaInfo = createNiceMock(AmbariMetaInfo.class);
- Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>();
+ Capture<Set<StackServiceRequest>> stackServiceRequestCapture = EasyMock.newCapture();
StackServiceResponse stackServiceResponse = createNiceMock(StackServiceResponse.class);
- Capture<Set<StackServiceComponentRequest>> stackComponentRequestCapture = new Capture<Set<StackServiceComponentRequest>>();
+ Capture<Set<StackServiceComponentRequest>> stackComponentRequestCapture = EasyMock.newCapture();
StackServiceComponentResponse stackComponentResponse = createNiceMock(StackServiceComponentResponse.class);
- Capture<Set<StackConfigurationRequest>> stackConfigurationRequestCapture = new Capture<Set<StackConfigurationRequest>>();
- Capture<Set<StackLevelConfigurationRequest>> stackLevelConfigurationRequestCapture = new Capture<Set<StackLevelConfigurationRequest>>();
+ Capture<Set<StackConfigurationRequest>> stackConfigurationRequestCapture = EasyMock.newCapture();
+ Capture<Set<StackLevelConfigurationRequest>> stackLevelConfigurationRequestCapture = EasyMock.newCapture();
StackConfigurationResponse stackConfigurationResponse = EasyMock.createNiceMock(StackConfigurationResponse.class);
expect(controller.getStackServices(capture(stackServiceRequestCapture))).
@@ -163,12 +162,12 @@ public class StackTest {
public void testGetRequiredProperties_serviceAndPropertyType() throws Exception {
AmbariManagementController controller = createNiceMock(AmbariManagementController.class);
AmbariMetaInfo metaInfo = createNiceMock(AmbariMetaInfo.class);
- Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>();
+ Capture<Set<StackServiceRequest>> stackServiceRequestCapture = EasyMock.newCapture();
StackServiceResponse stackServiceResponse = createNiceMock(StackServiceResponse.class);
- Capture<Set<StackServiceComponentRequest>> stackComponentRequestCapture = new Capture<Set<StackServiceComponentRequest>>();
+ Capture<Set<StackServiceComponentRequest>> stackComponentRequestCapture = EasyMock.newCapture();
StackServiceComponentResponse stackComponentResponse = createNiceMock(StackServiceComponentResponse.class);
- Capture<Set<StackConfigurationRequest>> stackConfigurationRequestCapture = new Capture<Set<StackConfigurationRequest>>();
- Capture<Set<StackLevelConfigurationRequest>> stackLevelConfigurationRequestCapture = new Capture<Set<StackLevelConfigurationRequest>>();
+ Capture<Set<StackConfigurationRequest>> stackConfigurationRequestCapture = EasyMock.newCapture();
+ Capture<Set<StackLevelConfigurationRequest>> stackLevelConfigurationRequestCapture = EasyMock.newCapture();
StackConfigurationResponse stackConfigurationResponse = EasyMock.createNiceMock(StackConfigurationResponse.class);
StackConfigurationResponse stackConfigurationResponse2 = EasyMock.createNiceMock(StackConfigurationResponse.class);
@@ -263,14 +262,14 @@ public class StackTest {
expect(controller.getAmbariMetaInfo()).andReturn(metaInfo).anyTimes();
- expect(controller.getStackServices(anyObject(Set.class))).andReturn(Collections.singleton(stackServiceResponse)).anyTimes();
+ expect(controller.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject())).andReturn(Collections.singleton(stackServiceResponse)).anyTimes();
expect(stackServiceResponse.getServiceName()).andReturn(testServiceName).anyTimes();
expect(stackServiceResponse.getExcludedConfigTypes()).andReturn(Collections.<String>emptySet());
// stack components
expect(stackComponentResponse.getComponentName()).andReturn("component1").anyTimes();
expect(stackComponentResponse.getComponentCategory()).andReturn(testSiteConfigFile).anyTimes();
- expect(controller.getStackComponents(anyObject(Set.class))).andReturn(Collections.singleton(stackComponentResponse)).anyTimes();
+ expect(controller.getStackComponents(EasyMock.<Set<StackServiceComponentRequest>>anyObject())).andReturn(Collections.singleton(stackComponentResponse)).anyTimes();
// stack configurations
@@ -289,13 +288,13 @@ public class StackTest {
expect(stackConfigurationResponse2.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes();
expect(stackConfigurationResponse2.isRequired()).andReturn(true).anyTimes();
- expect(controller.getStackConfigurations(anyObject(Set.class))).andReturn(Sets.newHashSet(stackConfigurationResponse1, stackConfigurationResponse2)).anyTimes();
+ expect(controller.getStackConfigurations(EasyMock.<Set<StackConfigurationRequest>>anyObject())).andReturn(Sets.newHashSet(stackConfigurationResponse1, stackConfigurationResponse2)).anyTimes();
// empty stack service config type
expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.singletonMap(testEmptyConfigType, Collections.<String, Map<String,String>>emptyMap()));
// no stack level configs for this test
- expect(controller.getStackLevelConfigurations(anyObject(Set.class))).andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes();
+ expect(controller.getStackLevelConfigurations(EasyMock.<Set<StackLevelConfigurationRequest>>anyObject())).andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes();
expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")).andReturn(Collections.<DependencyInfo>emptyList()).anyTimes();
@@ -332,7 +331,7 @@ public class StackTest {
expect(controller.getAmbariMetaInfo()).andReturn(metaInfo).anyTimes();
- expect(controller.getStackServices(anyObject(Set.class))).andReturn(Collections.singleton(stackServiceResponse)).anyTimes();
+ expect(controller.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject())).andReturn(Collections.singleton(stackServiceResponse)).anyTimes();
expect(stackServiceResponse.getServiceName()).andReturn(testServiceName).anyTimes();
// Config type test-site is excluded for the service service1
@@ -341,7 +340,7 @@ public class StackTest {
// stack components
expect(stackComponentResponse.getComponentName()).andReturn("component1").anyTimes();
expect(stackComponentResponse.getComponentCategory()).andReturn(testSiteConfigFile).anyTimes();
- expect(controller.getStackComponents(anyObject(Set.class))).andReturn(Collections.singleton(stackComponentResponse)).anyTimes();
+ expect(controller.getStackComponents(EasyMock.<Set<StackServiceComponentRequest>>anyObject())).andReturn(Collections.singleton(stackComponentResponse)).anyTimes();
expect(stackConfigurationResponse1.getPropertyName()).andReturn("prop1").anyTimes();
expect(stackConfigurationResponse1.getPropertyValue()).andReturn(null).anyTimes();
@@ -350,13 +349,13 @@ public class StackTest {
expect(stackConfigurationResponse1.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes();
expect(stackConfigurationResponse1.isRequired()).andReturn(true).anyTimes();
- expect(controller.getStackConfigurations(anyObject(Set.class))).andReturn(Collections.singleton(stackConfigurationResponse1)).anyTimes();
+ expect(controller.getStackConfigurations(EasyMock.<Set<StackConfigurationRequest>>anyObject())).andReturn(Collections.singleton(stackConfigurationResponse1)).anyTimes();
// empty stack service config type
expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.singletonMap(testEmptyConfigType, Collections.<String, Map<String, String>>emptyMap()));
// no stack level configs for this test
- expect(controller.getStackLevelConfigurations(anyObject(Set.class))).andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes();
+ expect(controller.getStackLevelConfigurations(EasyMock.<Set<StackLevelConfigurationRequest>>anyObject())).andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes();
expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")).andReturn(Collections.<DependencyInfo>emptyList()).anyTimes();
replay(controller, stackServiceResponse, stackComponentResponse, stackConfigurationResponse1, metaInfo);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
index e23ba62..1861c0e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
@@ -719,7 +719,7 @@ public class UpgradeResourceProviderTest {
Gson gson = new Gson();
for (StageEntity se : stages) {
- Map<String, String> map = gson.fromJson(se.getCommandParamsStage(), Map.class);
+ Map<String, String> map = gson.<Map<String, String>>fromJson(se.getCommandParamsStage(), Map.class);
assertTrue(map.containsKey("upgrade_direction"));
assertEquals("downgrade", map.get("upgrade_direction"));
}
@@ -1169,7 +1169,7 @@ public class UpgradeResourceProviderTest {
configHelper.getDefaultProperties(EasyMock.eq(stack220), EasyMock.anyObject(Cluster.class), EasyMock.anyBoolean())).andReturn(
stack220Configs).anyTimes();
- Capture<Map<String, Map<String, String>>> expectedConfigurationsCapture = new Capture<Map<String, Map<String, String>>>();
+ Capture<Map<String, Map<String, String>>> expectedConfigurationsCapture = EasyMock.newCapture();
configHelper.createConfigTypes(EasyMock.anyObject(Cluster.class),
EasyMock.anyObject(AmbariManagementController.class),
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/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 b954c7c..330d567 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
@@ -54,6 +54,7 @@ import org.apache.ambari.server.view.ViewRegistry;
import org.apache.ambari.server.view.configuration.ViewConfig;
import org.apache.ambari.view.ViewDefinition;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -173,12 +174,12 @@ public class ViewInstanceResourceProviderTest {
expect(viewregistry.getDefinition("V1", "1.0.0")).andReturn(viewEntity).anyTimes();
expect(viewregistry.getDefinition("V1", null)).andReturn(viewEntity).anyTimes();
- Capture<Map<String, String>> captureProperties = new Capture<Map<String, String>>();
+ Capture<Map<String, String>> captureProperties = EasyMock.newCapture();
viewregistry.setViewInstanceProperties(eq(viewInstanceEntity), capture(captureProperties),
anyObject(ViewConfig.class), anyObject(ClassLoader.class));
- Capture<ViewInstanceEntity> instanceEntityCapture = new Capture<ViewInstanceEntity>();
+ Capture<ViewInstanceEntity> instanceEntityCapture = EasyMock.newCapture();
viewregistry.installViewInstance(capture(instanceEntityCapture));
expectLastCall().anyTimes();
@@ -362,4 +363,4 @@ public class ViewInstanceResourceProviderTest {
verify(viewregistry);
}
-}
\ 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/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 6c589b5..6080080 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
@@ -245,7 +245,7 @@ public class ViewURLResourceProviderTest {
ViewURLResourceProvider provider = new ViewURLResourceProvider();
ViewURLEntity viewURLEntity = createNiceMock(ViewURLEntity.class);
ViewURLDAO viewURLDAO = createNiceMock(ViewURLDAO.class);
- EqualsPredicate equalsPredicate = new EqualsPredicate(ViewURLResourceProvider.URL_NAME_PROPERTY_ID,"test");
+ EqualsPredicate<String> equalsPredicate = new EqualsPredicate<>(ViewURLResourceProvider.URL_NAME_PROPERTY_ID,"test");
setDao(ViewURLResourceProvider.class.getDeclaredField("viewURLDAO"), viewURLDAO);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/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 33603d7..eb04935 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
@@ -158,7 +158,7 @@ public class WidgetLayoutResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes();
- Capture<WidgetLayoutEntity> entityCapture = new Capture<WidgetLayoutEntity>();
+ Capture<WidgetLayoutEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -178,7 +178,7 @@ public class WidgetLayoutResourceProviderTest {
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID, "section_name");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_USERNAME_PROPERTY_ID, "admin");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SCOPE_PROPERTY_ID, "CLUSTER");
- Set widgetsInfo = new LinkedHashSet();
+ Set<Map<String, String>> widgetsInfo = new LinkedHashSet<>();
Map<String, String> widget = new HashMap<String, String>();
widget.put("id","1");
widgetsInfo.add(widget);
@@ -218,7 +218,7 @@ public class WidgetLayoutResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).atLeastOnce();
- Capture<WidgetLayoutEntity> entityCapture = new Capture<WidgetLayoutEntity>();
+ Capture<WidgetLayoutEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -239,7 +239,7 @@ public class WidgetLayoutResourceProviderTest {
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID, "section_name");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_USERNAME_PROPERTY_ID, "admin");
requestProps.put(WidgetLayoutResourceProvider.WIDGETLAYOUT_SCOPE_PROPERTY_ID, "CLUSTER");
- Set widgetsInfo = new LinkedHashSet();
+ Set<Map<String, String>> widgetsInfo = new LinkedHashSet<>();
Map<String, String> widget = new HashMap<String, String>();
widget.put("id","1");
widgetsInfo.add(widget);
@@ -304,7 +304,7 @@ public class WidgetLayoutResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes();
- Capture<WidgetLayoutEntity> entityCapture = new Capture<WidgetLayoutEntity>();
+ Capture<WidgetLayoutEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
index 3ff7da7..a4f6469 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
@@ -222,7 +222,7 @@ public class WidgetResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes();
- Capture<WidgetEntity> entityCapture = new Capture<WidgetEntity>();
+ Capture<WidgetEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -236,8 +236,8 @@ public class WidgetResourceProviderTest {
requestProps.put(WidgetResourceProvider.WIDGET_WIDGET_TYPE_PROPERTY_ID, "GAUGE");
requestProps.put(WidgetResourceProvider.WIDGET_AUTHOR_PROPERTY_ID, "admin");
requestProps.put(WidgetResourceProvider.WIDGET_SCOPE_PROPERTY_ID, "USER");
- Set testSet = new LinkedHashSet();
- HashMap testMap = new HashMap();
+ Set<Map<String, String>> testSet = new LinkedHashSet<>();
+ Map<String, String> testMap = new HashMap<>();
testMap.put("name","value");
testMap.put("name2","value2");
testSet.add(testMap);
@@ -279,7 +279,7 @@ public class WidgetResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).atLeastOnce();
- Capture<WidgetEntity> entityCapture = new Capture<WidgetEntity>();
+ Capture<WidgetEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -291,8 +291,8 @@ public class WidgetResourceProviderTest {
requestProps.put(WidgetResourceProvider.WIDGET_WIDGET_TYPE_PROPERTY_ID, "GAUGE");
requestProps.put(WidgetResourceProvider.WIDGET_AUTHOR_PROPERTY_ID, "admin");
requestProps.put(WidgetResourceProvider.WIDGET_SCOPE_PROPERTY_ID, "USER");
- Set testSet = new LinkedHashSet();
- HashMap testMap = new HashMap();
+ Set<Map<String, String>> testSet = new LinkedHashSet<>();
+ Map<String, String> testMap = new HashMap<>();
testMap.put("name","value");
testMap.put("name2","value2");
testSet.add(testMap);
@@ -336,8 +336,8 @@ public class WidgetResourceProviderTest {
requestProps.put(WidgetResourceProvider.WIDGET_WIDGET_TYPE_PROPERTY_ID, "GAUGE");
requestProps.put(WidgetResourceProvider.WIDGET_AUTHOR_PROPERTY_ID, "admin");
requestProps.put(WidgetResourceProvider.WIDGET_SCOPE_PROPERTY_ID, "USER");
- testSet = new LinkedHashSet();
- testMap = new HashMap();
+ testSet = new LinkedHashSet<>();
+ testMap = new HashMap<>();
testMap.put("name","new_value");
testMap.put("new_name","new_value2");
testSet.add(testMap);
@@ -374,7 +374,7 @@ public class WidgetResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes();
- Capture<WidgetEntity> entityCapture = new Capture<WidgetEntity>();
+ Capture<WidgetEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -388,8 +388,8 @@ public class WidgetResourceProviderTest {
requestProps.put(WidgetResourceProvider.WIDGET_WIDGET_TYPE_PROPERTY_ID, "GAUGE");
requestProps.put(WidgetResourceProvider.WIDGET_AUTHOR_PROPERTY_ID, "admin");
requestProps.put(WidgetResourceProvider.WIDGET_SCOPE_PROPERTY_ID, "USER");
- Set testSet = new LinkedHashSet();
- HashMap testMap = new HashMap();
+ Set<Map<String, String>> testSet = new LinkedHashSet<>();
+ Map<String, String> testMap = new HashMap<>();
testMap.put("name","value");
testMap.put("name2","value2");
testSet.add(testMap);
@@ -439,7 +439,7 @@ public class WidgetResourceProviderTest {
WidgetResourceProvider widgetResourceProvider = PowerMock.createPartialMock(WidgetResourceProvider.class, "isScopeAllowedForUser");
PowerMock.expectPrivate(widgetResourceProvider, "isScopeAllowedForUser", "CLUSTER").andReturn(false);
- Capture<WidgetEntity> entityCapture = new Capture<WidgetEntity>();
+ Capture<WidgetEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/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 59aa9c8..1b365e5 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
@@ -313,7 +313,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.EMPTY_SET);
+ expect(helperMock.sendGetLogFileNamesRequest(expectedComponentName, expectedHostName)).andReturn(Collections.<String>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/edce0b11/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 654c02d..cb65780 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
@@ -38,6 +38,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Config;
import org.apache.commons.codec.binary.Base64;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Test;
@@ -149,8 +150,8 @@ public class LoggingRequestHelperImplTest {
testConfigProperties.put("logsearch_admin_password", EXPECTED_ADMIN_PASSWORD);
testConfigProperties = Collections.unmodifiableMap(testConfigProperties);
- Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>();
- Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>();
+ Capture<HttpURLConnection> captureURLConnection = EasyMock.newCapture();
+ Capture<HttpURLConnection> captureURLConnectionForAuthentication = EasyMock.newCapture();
expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce();
expect(adminPropertiesConfigMock.getProperties()).andReturn(testConfigProperties).atLeastOnce();
@@ -328,8 +329,8 @@ public class LoggingRequestHelperImplTest {
testConfigProperties.put("logsearch_admin_password", "admin-pwd");
testConfigProperties = Collections.unmodifiableMap(testConfigProperties);
- Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>();
- Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>();
+ Capture<HttpURLConnection> captureURLConnection = EasyMock.newCapture();
+ Capture<HttpURLConnection> captureURLConnectionForAuthentication = EasyMock.newCapture();
expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce();
expect(adminPropertiesConfigMock.getProperties()).andReturn(testConfigProperties).atLeastOnce();
@@ -421,8 +422,8 @@ public class LoggingRequestHelperImplTest {
testConfigProperties.put("logsearch_admin_password", "admin-pwd");
testConfigProperties = Collections.unmodifiableMap(testConfigProperties);
- Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>();
- Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>();
+ Capture<HttpURLConnection> captureURLConnection = EasyMock.newCapture();
+ Capture<HttpURLConnection> captureURLConnectionForAuthentication = EasyMock.newCapture();
expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce();
expect(adminPropertiesConfigMock.getProperties()).andReturn(testConfigProperties).atLeastOnce();
@@ -584,8 +585,8 @@ public class LoggingRequestHelperImplTest {
Config adminPropertiesConfigMock =
mockSupport.createMock(Config.class);
- Capture<HttpURLConnection> captureURLConnection = new Capture<HttpURLConnection>();
- Capture<HttpURLConnection> captureURLConnectionForAuthentication = new Capture<HttpURLConnection>();
+ Capture<HttpURLConnection> captureURLConnection = EasyMock.newCapture();
+ Capture<HttpURLConnection> captureURLConnectionForAuthentication = EasyMock.newCapture();
expect(clusterMock.getDesiredConfigByType("logsearch-admin-json")).andReturn(adminPropertiesConfigMock).atLeastOnce();
expect(clusterMock.getClusterName()).andReturn(expectedClusterName).atLeastOnce();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/UtilsTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/UtilsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/UtilsTest.java
index 60f4725..1507e8b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/UtilsTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/UtilsTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertSame;
import java.util.concurrent.atomic.AtomicInteger;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.Test;
import org.slf4j.Logger;
@@ -148,7 +149,7 @@ public class UtilsTest {
AtomicInteger testAtomicInteger = new AtomicInteger(0);
- Capture<Exception> exceptionCaptureOne = new Capture<Exception>();
+ Capture<Exception> exceptionCaptureOne = EasyMock.newCapture();
// expect that the the call to the logger is only
// executed once in this test
@@ -180,8 +181,8 @@ public class UtilsTest {
AtomicInteger testAtomicInteger = new AtomicInteger(0);
- Capture<Exception> exceptionCaptureOne = new Capture<Exception>();
- Capture<Exception> exceptionCaptureTwo = new Capture<Exception>();
+ Capture<Exception> exceptionCaptureOne = EasyMock.newCapture();
+ Capture<Exception> exceptionCaptureTwo = EasyMock.newCapture();
// expect that the the call to the logger is only
// executed twice in this test
@@ -215,7 +216,7 @@ public class UtilsTest {
AtomicInteger testAtomicInteger = new AtomicInteger(0);
- Capture<Exception> exceptionCaptureOne = new Capture<Exception>();
+ Capture<Exception> exceptionCaptureOne = EasyMock.newCapture();
// expect that the the call to the logger is only
// executed once in this test
@@ -247,8 +248,8 @@ public class UtilsTest {
AtomicInteger testAtomicInteger = new AtomicInteger(0);
- Capture<Exception> exceptionCaptureOne = new Capture<Exception>();
- Capture<Exception> exceptionCaptureTwo = new Capture<Exception>();
+ Capture<Exception> exceptionCaptureOne = EasyMock.newCapture();
+ Capture<Exception> exceptionCaptureTwo = EasyMock.newCapture();
// expect that the the call to the logger is only
// executed twice in this test
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/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 653cae1..5d55e41 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,6 +24,7 @@ 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;
@@ -72,7 +73,7 @@ public class MetricsRequestHelperTest {
URLStreamProvider urlStreamProviderMock = createMock(URLStreamProvider.class);
expect(urlStreamProviderMock.processURL(EasyMock.isA(String.class), EasyMock.isA(String.class),
- isNull(String.class), EasyMock.isA(Map.class))).andReturn(httpURLConnectionMock).once();
+ isNull(String.class), EasyMock.<Map<String, List<String>>>anyObject())).andReturn(httpURLConnectionMock).once();
replay(httpURLConnectionMock, urlStreamProviderMock);
@@ -103,7 +104,7 @@ public class MetricsRequestHelperTest {
urlStreamProviderMock = createMock(URLStreamProvider.class);
expect(urlStreamProviderMock.processURL(EasyMock.isA(String.class), EasyMock.isA(String.class),
- isNull(String.class), EasyMock.isA(Map.class))).andReturn(httpURLConnectionMock).times(2);
+ isNull(String.class), EasyMock.<Map<String, List<String>>>anyObject())).andReturn(httpURLConnectionMock).times(2);
replay(httpURLConnectionMock, urlStreamProviderMock);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/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 293b22a..834f930 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
@@ -207,7 +207,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.anyObject(Map.class), EasyMock.anyString(), EasyMock.anyObject(Map.class), EasyMock.anyInt(), EasyMock.anyBoolean(), EasyMock.anyBoolean());
+ EasyMock.<Map<String, String>>anyObject(), EasyMock.anyString(), EasyMock.<Map<String, Map<String, String>>>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/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
index 1caa0bf..6cf4990 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
@@ -35,7 +35,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.ambari.server.notifications.DispatchCallback;
@@ -75,7 +74,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher dispatcher = new AmbariSNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
dispatcher.dispatch(notification);
verify(notification.Callback).onFailure(notification.CallbackIds);
verify(notification.Callback, never()).onSuccess(notification.CallbackIds);
@@ -87,7 +86,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher.SnmpVersion snmpVersion = AmbariSNMPDispatcher.SnmpVersion.SNMPv1;
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
@@ -106,7 +105,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher dispatcher = new AmbariSNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
notification.DispatchProperties = new HashMap<String, String>();
dispatcher.dispatch(notification);
verify(notification.Callback).onFailure(notification.CallbackIds);
@@ -118,7 +117,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher dispatcher = new AmbariSNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = getAlertNotification(true);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
@@ -134,7 +133,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher dispatcher = new AmbariSNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = getAlertNotification(true);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
@@ -151,7 +150,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher dispatcher = spy(new AmbariSNMPDispatcher(DEFAULT_SNMP_PORT));
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
@@ -169,7 +168,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher dispatcher = spy(new AmbariSNMPDispatcher(DEFAULT_SNMP_PORT));
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
@@ -187,7 +186,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher.SnmpVersion snmpVersion = AmbariSNMPDispatcher.SnmpVersion.SNMPv1;
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
@@ -206,7 +205,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher.SnmpVersion snmpVersion = AmbariSNMPDispatcher.SnmpVersion.SNMPv2c;
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
@@ -224,7 +223,7 @@ public class AmbariSNMPDispatcherTest {
AmbariSNMPDispatcher dispatcher = new AmbariSNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = getAlertNotification(true);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "162");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "public");
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcherTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcherTest.java b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcherTest.java
index c06472f..22d677c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcherTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcherTest.java
@@ -34,7 +34,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.ambari.server.notifications.DispatchCallback;
@@ -59,7 +58,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher dispatcher = new SNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
dispatcher.dispatch(notification);
verify(notification.Callback).onFailure(notification.CallbackIds);
verify(notification.Callback, never()).onSuccess(notification.CallbackIds);
@@ -71,7 +70,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher.SnmpVersion snmpVersion = SNMPDispatcher.SnmpVersion.SNMPv1;
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(SNMPDispatcher.SUBJECT_OID_PROPERTY, "1");
properties.put(SNMPDispatcher.BODY_OID_PROPERTY, "2");
@@ -95,7 +94,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher dispatcher = new SNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
notification.DispatchProperties = new HashMap<String, String>();
dispatcher.dispatch(notification);
verify(notification.Callback).onFailure(notification.CallbackIds);
@@ -107,7 +106,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher dispatcher = new SNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(SNMPDispatcher.SUBJECT_OID_PROPERTY, "1");
properties.put(SNMPDispatcher.BODY_OID_PROPERTY, "2");
@@ -128,7 +127,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher dispatcher = new SNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(SNMPDispatcher.SUBJECT_OID_PROPERTY, "1");
properties.put(SNMPDispatcher.BODY_OID_PROPERTY, "2");
@@ -150,7 +149,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher dispatcher = spy(new SNMPDispatcher(DEFAULT_SNMP_PORT));
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(SNMPDispatcher.SUBJECT_OID_PROPERTY, "1");
properties.put(SNMPDispatcher.BODY_OID_PROPERTY, "2");
@@ -173,7 +172,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher dispatcher = spy(new SNMPDispatcher(DEFAULT_SNMP_PORT));
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(SNMPDispatcher.SUBJECT_OID_PROPERTY, "1");
properties.put(SNMPDispatcher.BODY_OID_PROPERTY, "2");
@@ -196,7 +195,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher.SnmpVersion snmpVersion = SNMPDispatcher.SnmpVersion.SNMPv1;
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(SNMPDispatcher.SUBJECT_OID_PROPERTY, "1");
properties.put(SNMPDispatcher.BODY_OID_PROPERTY, "2");
@@ -220,7 +219,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher.SnmpVersion snmpVersion = SNMPDispatcher.SnmpVersion.SNMPv2c;
Notification notification = mock(Notification.class);
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
Map<String, String> properties = new HashMap<String, String>();
properties.put(SNMPDispatcher.SUBJECT_OID_PROPERTY, "1");
properties.put(SNMPDispatcher.BODY_OID_PROPERTY, "2");
@@ -243,7 +242,7 @@ public class SNMPDispatcherTest {
SNMPDispatcher dispatcher = new SNMPDispatcher(DEFAULT_SNMP_PORT);
Notification notification = new Notification();
notification.Callback = mock(DispatchCallback.class);
- notification.CallbackIds = mock(List.class);
+ notification.CallbackIds = new ArrayList<>();
notification.Body = "body";
notification.Subject = "subject";
Map<String, String> properties = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptorTest.java
index d0f9513..3f5286d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptorTest.java
@@ -39,7 +39,7 @@ public class AmbariJpaLocalTxnInterceptorTest extends EasyMockSupport {
EntityTransaction transaction = createStrictMock(EntityTransaction.class);
expect(transaction.getRollbackOnly()).andReturn(false);
- expect(transactional.rollbackOn()).andReturn(new Class[0]);
+ expect(transactional.rollbackOn()).andReturn(asArray());
replayAll();
@@ -55,7 +55,7 @@ public class AmbariJpaLocalTxnInterceptorTest extends EasyMockSupport {
EntityTransaction transaction = createStrictMock(EntityTransaction.class);
expect(transaction.getRollbackOnly()).andReturn(false);
- expect(transactional.rollbackOn()).andReturn(new Class[] { IllegalArgumentException.class });
+ expect(transactional.rollbackOn()).andReturn(asArray(IllegalArgumentException.class));
replayAll();
@@ -71,10 +71,8 @@ public class AmbariJpaLocalTxnInterceptorTest extends EasyMockSupport {
EntityTransaction transaction = createStrictMock(EntityTransaction.class);
expect(transaction.getRollbackOnly()).andReturn(false);
- expect(transactional.rollbackOn()).andReturn(new Class[] {
- NullPointerException.class, IllegalArgumentException.class
- });
- expect(transactional.ignore()).andReturn(new Class[0]);
+ expect(transactional.rollbackOn()).andReturn(asArray(NullPointerException.class, IllegalArgumentException.class));
+ expect(transactional.ignore()).andReturn(asArray());
transaction.rollback();
replayAll();
@@ -91,8 +89,8 @@ public class AmbariJpaLocalTxnInterceptorTest extends EasyMockSupport {
EntityTransaction transaction = createStrictMock(EntityTransaction.class);
expect(transaction.getRollbackOnly()).andReturn(false);
- expect(transactional.rollbackOn()).andReturn(new Class[] { RuntimeException.class });
- expect(transactional.ignore()).andReturn(new Class[0]);
+ expect(transactional.rollbackOn()).andReturn(asArray(RuntimeException.class));
+ expect(transactional.ignore()).andReturn(asArray());
transaction.rollback();
replayAll();
@@ -109,8 +107,8 @@ public class AmbariJpaLocalTxnInterceptorTest extends EasyMockSupport {
EntityTransaction transaction = createStrictMock(EntityTransaction.class);
expect(transaction.getRollbackOnly()).andReturn(false);
- expect(transactional.rollbackOn()).andReturn(new Class[] { IllegalArgumentException.class });
- expect(transactional.ignore()).andReturn(new Class[] { NumberFormatException.class });
+ expect(transactional.rollbackOn()).andReturn(asArray(IllegalArgumentException.class));
+ expect(transactional.ignore()).andReturn(asArray(NumberFormatException.class));
replayAll();
@@ -126,8 +124,8 @@ public class AmbariJpaLocalTxnInterceptorTest extends EasyMockSupport {
EntityTransaction transaction = createStrictMock(EntityTransaction.class);
expect(transaction.getRollbackOnly()).andReturn(false);
- expect(transactional.rollbackOn()).andReturn(new Class[] { Exception.class });
- expect(transactional.ignore()).andReturn(new Class[] { IOException.class });
+ expect(transactional.rollbackOn()).andReturn(asArray(Exception.class));
+ expect(transactional.ignore()).andReturn(asArray(IOException.class));
replayAll();
@@ -153,4 +151,9 @@ public class AmbariJpaLocalTxnInterceptorTest extends EasyMockSupport {
verifyAll();
}
+ @SafeVarargs
+ private static Class<? extends Exception>[] asArray(Class<? extends Exception>... exceptions) {
+ return exceptions;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/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 c77f28d..aa6ab1c 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
@@ -464,7 +464,7 @@ public class ExecutionScheduleManagerTest {
long requestId = 5L;
String clusterName = "mycluster";
String apiUri = "api/v1/clusters/mycluster/requests/5";
- Capture<String> uriCapture = new Capture<String>();
+ Capture<String> uriCapture = EasyMock.newCapture();
BatchRequestResponse batchRequestResponse = new BatchRequestResponse();
batchRequestResponse.setStatus(HostRoleStatus.IN_PROGRESS.toString());
@@ -618,10 +618,10 @@ public class ExecutionScheduleManagerTest {
expect(jobDataMap.getWrappedMap()).andReturn(new HashMap<String,Object>());
expect(scheduleManagerMock.continueOnMisfire(context)).andReturn(true);
- executionJob.doWork((Map<String, Object>) anyObject());
+ executionJob.doWork(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().andThrow(new AmbariException("Test Exception")).anyTimes();
- executionJob.finalizeExecution((Map<String, Object>) anyObject());
+ executionJob.finalizeExecution(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
replay(scheduleManagerMock, executionJob, context, jobDataMap, jobDetail);
[4/5] ambari git commit: AMBARI-19149. Code cleanup: compiler
warnings (Attila Doroszlai via ncole)
Posted by nc...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
index 78b804c..abae5a1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
@@ -105,6 +105,7 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.State;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -152,7 +153,7 @@ public class AmbariManagementControllerImplTest {
public void testgetAmbariServerURI() throws Exception {
// create mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
// set expectations
injector.injectMembers(capture(controllerCapture));
@@ -222,7 +223,7 @@ public class AmbariManagementControllerImplTest {
public void testGetClusters() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
ClusterRequest request1 = new ClusterRequest(null, "cluster1", "1", Collections.<String>emptySet());
Cluster cluster = createNiceMock(Cluster.class);
@@ -383,7 +384,7 @@ public class AmbariManagementControllerImplTest {
componentsMap.put("component1", component1);
componentsMap.put("component2", component2);
expect(service.getServiceComponents()).andReturn(componentsMap);
- expect(component1.getServiceComponentHosts()).andReturn(Collections.EMPTY_MAP);
+ expect(component1.getServiceComponentHosts()).andReturn(Collections.<String, ServiceComponentHost>emptyMap());
expect(component2.getServiceComponentHosts()).andReturn(
Collections.<String, ServiceComponentHost>singletonMap("anyHost", null));
@@ -421,7 +422,7 @@ public class AmbariManagementControllerImplTest {
componentsMap.put("component1", component1);
componentsMap.put("component2", component2);
expect(service.getServiceComponents()).andReturn(componentsMap);
- expect(component1.getServiceComponentHosts()).andReturn(Collections.EMPTY_MAP);
+ expect(component1.getServiceComponentHosts()).andReturn(Collections.<String, ServiceComponentHost>emptyMap());
expect(component2.getServiceComponentHosts()).andReturn(
Collections.<String, ServiceComponentHost>singletonMap("anyHost", null));
@@ -447,7 +448,7 @@ public class AmbariManagementControllerImplTest {
public void testGetClusters___ClusterNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
// requests
ClusterRequest request1 = new ClusterRequest(null, "cluster1", "1", Collections.<String>emptySet());
@@ -490,7 +491,7 @@ public class AmbariManagementControllerImplTest {
public void testGetClusters___OR_Predicate_ClusterNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Cluster cluster = createNiceMock(Cluster.class);
Cluster cluster2 = createNiceMock(Cluster.class);
@@ -556,7 +557,7 @@ public class AmbariManagementControllerImplTest {
@Test
public void testUpdateClusters() throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createNiceMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -576,7 +577,7 @@ public class AmbariManagementControllerImplTest {
expect(clusters.getClusterById(1L)).andReturn(cluster).times(2);
expect(cluster.getClusterName()).andReturn("clusterOld").times(1);
- cluster.addSessionAttributes(anyObject(Map.class));
+ cluster.addSessionAttributes(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
cluster.setClusterName("clusterNew");
@@ -605,7 +606,7 @@ public class AmbariManagementControllerImplTest {
@Ignore
public void testUpdateClustersWithNullConfigPropertyValues() throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createNiceMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -639,7 +640,7 @@ public class AmbariManagementControllerImplTest {
expect(config.getPropertiesAttributes()).andReturn(new HashMap<String,Map<String,String>>()).anyTimes();
expect(cluster.getDesiredConfigByType(anyObject(String.class))).andReturn(config).anyTimes();
- cluster.addSessionAttributes(anyObject(Map.class));
+ cluster.addSessionAttributes(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
cluster.setClusterName("clusterNew");
@@ -664,7 +665,7 @@ public class AmbariManagementControllerImplTest {
@Test
public void testUpdateClustersToggleKerberosNotInvoked() throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createNiceMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -683,7 +684,7 @@ public class AmbariManagementControllerImplTest {
expect(clusters.getClusterById(1L)).andReturn(cluster).times(2);
expect(cluster.getClusterName()).andReturn("cluster").times(1);
- cluster.addSessionAttributes(anyObject(Map.class));
+ cluster.addSessionAttributes(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
// replay mocks
@@ -706,7 +707,7 @@ public class AmbariManagementControllerImplTest {
@Test
public void testUpdateClustersToggleKerberosReenable() throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createNiceMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -727,13 +728,13 @@ public class AmbariManagementControllerImplTest {
expect(cluster.getClusterName()).andReturn("cluster").times(1);
expect(cluster.getSecurityType()).andReturn(SecurityType.KERBEROS).anyTimes();
- cluster.addSessionAttributes(anyObject(Map.class));
+ cluster.addSessionAttributes(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.KERBEROS, null))
.andReturn(false)
.once();
- expect(kerberosHelper.getForceToggleKerberosDirective(anyObject(Map.class)))
+ expect(kerberosHelper.getForceToggleKerberosDirective(EasyMock.<Map<String, String>>anyObject()))
.andReturn(false)
.once();
// Note: kerberosHelper.toggleKerberos is not called
@@ -756,7 +757,7 @@ public class AmbariManagementControllerImplTest {
@Test
public void testUpdateClustersToggleKerberosEnable() throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createNiceMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -777,7 +778,7 @@ public class AmbariManagementControllerImplTest {
expect(cluster.getClusterName()).andReturn("cluster").times(1);
expect(cluster.getSecurityType()).andReturn(SecurityType.NONE).anyTimes();
- cluster.addSessionAttributes(anyObject(Map.class));
+ cluster.addSessionAttributes(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.KERBEROS, null))
@@ -838,7 +839,7 @@ public class AmbariManagementControllerImplTest {
*/
private void testUpdateClustersToggleKerberosDisable(Boolean manageIdentities) throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createNiceMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -847,7 +848,7 @@ public class AmbariManagementControllerImplTest {
// requests
Set<ClusterRequest> setRequests = Collections.singleton(clusterRequest);
- Capture<Boolean> manageIdentitiesCapture = new Capture<Boolean>();
+ Capture<Boolean> manageIdentitiesCapture = EasyMock.newCapture();
KerberosHelper kerberosHelper = createStrictMock(KerberosHelper.class);
// expectations
@@ -861,16 +862,16 @@ public class AmbariManagementControllerImplTest {
expect(cluster.getClusterName()).andReturn("cluster").times(1);
expect(cluster.getSecurityType()).andReturn(SecurityType.KERBEROS).anyTimes();
- cluster.addSessionAttributes(anyObject(Map.class));
+ cluster.addSessionAttributes(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.NONE, null))
.andReturn(false)
.once();
- expect(kerberosHelper.getForceToggleKerberosDirective(anyObject(Map.class)))
+ expect(kerberosHelper.getForceToggleKerberosDirective(EasyMock.<Map<String, String>>anyObject()))
.andReturn(false)
.once();
- expect(kerberosHelper.getManageIdentitiesDirective(anyObject(Map.class)))
+ expect(kerberosHelper.getManageIdentitiesDirective(EasyMock.<Map<String, String>>anyObject()))
.andReturn(manageIdentities)
.once();
expect(kerberosHelper.toggleKerberos(anyObject(Cluster.class), anyObject(SecurityType.class), anyObject(RequestStageContainer.class), captureBoolean(manageIdentitiesCapture)))
@@ -897,7 +898,7 @@ public class AmbariManagementControllerImplTest {
@Test
public void testUpdateClustersToggleKerberos_Fail() throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -928,16 +929,16 @@ public class AmbariManagementControllerImplTest {
cluster.setClusterName(anyObject(String.class));
expectLastCall().once();
- cluster.addSessionAttributes(anyObject(Map.class));
+ cluster.addSessionAttributes(EasyMock.<Map<String, Object>>anyObject());
expectLastCall().once();
expect(kerberosHelper.shouldExecuteCustomOperations(SecurityType.NONE, null))
.andReturn(false)
.once();
- expect(kerberosHelper.getForceToggleKerberosDirective(anyObject(Map.class)))
+ expect(kerberosHelper.getForceToggleKerberosDirective(EasyMock.<Map<String, String>>anyObject()))
.andReturn(false)
.once();
- expect(kerberosHelper.getManageIdentitiesDirective(anyObject(Map.class)))
+ expect(kerberosHelper.getManageIdentitiesDirective(EasyMock.<Map<String, String>>anyObject()))
.andReturn(null)
.once();
expect(kerberosHelper.toggleKerberos(anyObject(Cluster.class), anyObject(SecurityType.class), anyObject(RequestStageContainer.class), anyBoolean()))
@@ -969,7 +970,7 @@ public class AmbariManagementControllerImplTest {
@Test
public void testUpdateClusters__RollbackException() throws Exception {
// member state mocks
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
Cluster cluster = createNiceMock(Cluster.class);
ActionManager actionManager = createNiceMock(ActionManager.class);
@@ -1010,7 +1011,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1084,7 +1085,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___ServiceComponentHostNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1146,7 +1147,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___ServiceComponentHostFilteredByState() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1221,7 +1222,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___ServiceComponentHostFilteredByMaintenanceState() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1295,7 +1296,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___OR_Predicate_ServiceComponentHostNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1402,7 +1403,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___OR_Predicate_ServiceNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1505,7 +1506,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___OR_Predicate_ServiceComponentNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1613,7 +1614,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___OR_Predicate_HostNotFoundException_hostProvidedInQuery() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1711,7 +1712,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___OR_Predicate_HostNotFoundException_hostProvidedInURL() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class);
@@ -1768,7 +1769,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___OR_Predicate_ClusterNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class);
@@ -1822,7 +1823,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___NullHostName() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1901,7 +1902,7 @@ public class AmbariManagementControllerImplTest {
public void testGetHostComponents___NullHostName_NullComponentName() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
StackId stack = createNiceMock(StackId.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -1992,7 +1993,7 @@ public class AmbariManagementControllerImplTest {
@Test
public void testPopulateServicePackagesInfo() throws Exception {
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Injector injector = createStrictMock(Injector.class);
MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class);
@@ -2155,7 +2156,7 @@ public class AmbariManagementControllerImplTest {
LdapBatchDto ldapBatchDto = createNiceMock(LdapBatchDto.class);
- Capture<LdapBatchDto> ldapBatchDtoCapture = new Capture<LdapBatchDto>();
+ Capture<LdapBatchDto> ldapBatchDtoCapture = EasyMock.newCapture();
// set expectations
expect(ldapDataPopulator.synchronizeAllLdapUsers(capture(ldapBatchDtoCapture))).andReturn(ldapBatchDto);
@@ -2231,7 +2232,7 @@ public class AmbariManagementControllerImplTest {
public void testVerifyRepositories() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
// expectations
// constructor init
@@ -2287,7 +2288,7 @@ public class AmbariManagementControllerImplTest {
ServiceComponent serviceComponent = createNiceMock(ServiceComponent.class);
ServiceComponentHost serviceComponentHost = createNiceMock(ServiceComponentHost.class);
StackId stackId = createNiceMock(StackId.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
// expectations
// constructor init
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index f351b27..d956953 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -9744,7 +9744,7 @@ public class AmbariManagementControllerTest {
public void testGetServices2() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Clusters clusters = createNiceMock(Clusters.class);
MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class);
@@ -9792,7 +9792,7 @@ public class AmbariManagementControllerTest {
public void testGetServices___ServiceNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Clusters clusters = createNiceMock(Clusters.class);
MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class);
Cluster cluster = createNiceMock(Cluster.class);
@@ -9839,7 +9839,7 @@ public class AmbariManagementControllerTest {
public void testGetServices___OR_Predicate_ServiceNotFoundException() throws Exception {
// member state mocks
Injector injector = createStrictMock(Injector.class);
- Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Capture<AmbariManagementController> controllerCapture = EasyMock.newCapture();
Clusters clusters = createNiceMock(Clusters.class);
MaintenanceStateHelper maintHelper = createNiceMock(MaintenanceStateHelper.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
index 90f8098..ba152e6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
@@ -123,6 +123,7 @@ import org.apache.ambari.server.utils.StageUtils;
import org.apache.directory.server.kerberos.shared.keytab.Keytab;
import org.easymock.Capture;
import org.easymock.CaptureType;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.easymock.IAnswer;
import org.junit.After;
@@ -1093,36 +1094,36 @@ public class KerberosHelperTest extends EasyMockSupport {
// Create Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
if (identitiesManaged) {
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
}
// Update Configs Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// TODO: Add more of these when more stages are added.
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
replayAll();
@@ -1284,36 +1285,36 @@ public class KerberosHelperTest extends EasyMockSupport {
// Create Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
if (identitiesManaged) {
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
}
// Update Configs Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// TODO: Add more of these when more stages are added.
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
replayAll();
@@ -1468,33 +1469,33 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Update Configs Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Destroy Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Delete Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Cleanup Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
replayAll();
@@ -1666,32 +1667,32 @@ public class KerberosHelperTest extends EasyMockSupport {
// Create Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Update Configurations Stage
expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
} else {
requestStageContainer = null;
@@ -1879,15 +1880,15 @@ public class KerberosHelperTest extends EasyMockSupport {
final KerberosIdentityDescriptor identityDescriptor1 = createMock(KerberosIdentityDescriptor.class);
expect(identityDescriptor1.getPrincipalDescriptor()).andReturn(principalDescriptor1).times(1);
- expect(identityDescriptor1.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes();
+ expect(identityDescriptor1.shouldInclude(EasyMock.<Map<String, Object>>anyObject())).andReturn(true).anyTimes();
final KerberosIdentityDescriptor identityDescriptor2 = createMock(KerberosIdentityDescriptor.class);
expect(identityDescriptor2.getPrincipalDescriptor()).andReturn(principalDescriptor2).times(1);
- expect(identityDescriptor2.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes();
+ expect(identityDescriptor2.shouldInclude(EasyMock.<Map<String, Object>>anyObject())).andReturn(true).anyTimes();
final KerberosIdentityDescriptor identityDescriptor3 = createMock(KerberosIdentityDescriptor.class);
expect(identityDescriptor3.getPrincipalDescriptor()).andReturn(principalDescriptor3).times(1);
- expect(identityDescriptor3.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes();
+ expect(identityDescriptor3.shouldInclude(EasyMock.<Map<String, Object>>anyObject())).andReturn(true).anyTimes();
final KerberosComponentDescriptor componentDescriptor1 = createMockComponentDescriptor(
"COMPONENT1",
@@ -1899,7 +1900,7 @@ public class KerberosHelperTest extends EasyMockSupport {
null);
final KerberosServiceDescriptor serviceDescriptor1 = createMock(KerberosServiceDescriptor.class);
- expect(serviceDescriptor1.getIdentities(eq(true), anyObject(Map.class))).andReturn(Arrays.asList(
+ expect(serviceDescriptor1.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(Arrays.asList(
identityDescriptor1,
identityDescriptor2
)).times(1);
@@ -1917,7 +1918,7 @@ public class KerberosHelperTest extends EasyMockSupport {
final KerberosDescriptor kerberosDescriptor = createMock(KerberosDescriptor.class);
expect(kerberosDescriptor.getProperty("additional_realms")).andReturn(null).times(1);
- expect(kerberosDescriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(null).times(1);
+ expect(kerberosDescriptor.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(null).times(1);
expect(kerberosDescriptor.getAuthToLocalProperties()).andReturn(null).times(1);
expect(kerberosDescriptor.getService("SERVICE1")).andReturn(serviceDescriptor1).times(1);
@@ -2182,7 +2183,7 @@ public class KerberosHelperTest extends EasyMockSupport {
expect(kerberosDescriptor.getService("SERVICE2")).andReturn(serviceDescriptor2).atLeastOnce();
expect(kerberosDescriptor.getService("SERVICE3")).andReturn(serviceDescriptor3).atLeastOnce();
expect(kerberosDescriptor.getProperty("additional_realms")).andReturn(null).atLeastOnce();
- expect(kerberosDescriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(null).atLeastOnce();
+ expect(kerberosDescriptor.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(null).atLeastOnce();
expect(kerberosDescriptor.getAuthToLocalProperties()).andReturn(Collections.singleton("core-site/auth.to.local")).atLeastOnce();
setupKerberosDescriptor(kerberosDescriptor, 2);
@@ -2281,7 +2282,7 @@ public class KerberosHelperTest extends EasyMockSupport {
final Cluster cluster = createMockCluster("c1", hosts, SecurityType.KERBEROS, krb5ConfConfig, kerberosEnvConfig);
expect(cluster.getServices()).andReturn(services).anyTimes();
- expect(cluster.getServiceComponentHostMap(anyObject(Set.class), anyObject(Set.class))).andReturn(serviceComponentHostMap).anyTimes();
+ expect(cluster.getServiceComponentHostMap(EasyMock.<Set<String>>anyObject(), EasyMock.<Set<String>>anyObject())).andReturn(serviceComponentHostMap).anyTimes();
final Map<String, Map<String, String>> existingConfigurations = new HashMap<String, Map<String, String>>() {
{
@@ -2632,20 +2633,20 @@ public class KerberosHelperTest extends EasyMockSupport {
Capture<? extends String> capturePrincipalForKeytab = newCapture(CaptureType.ALL);
CreatePrincipalsServerAction createPrincipalsServerAction = injector.getInstance(CreatePrincipalsServerAction.class);
- expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
+ expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), EasyMock.<Map<String, String>>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
.andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1))
.times(3);
if(createAmbariIdentities) {
if (ambariServerPrincipalAsService) {
- expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
+ expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), EasyMock.<Map<String, String>>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
.andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1))
.times(2);
} else {
- expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
+ expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(true), EasyMock.<Map<String, String>>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
.andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1))
.times(1);
- expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), anyObject(Map.class), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
+ expect(createPrincipalsServerAction.createPrincipal(capture(capturePrincipal), eq(false), EasyMock.<Map<String, String>>anyObject(), anyObject(KerberosOperationHandler.class), eq(false), isNull(ActionLog.class)))
.andReturn(new CreatePrincipalsServerAction.CreatePrincipalResult("anything", "password", 1))
.times(1);
}
@@ -3039,27 +3040,27 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
replayAll();
@@ -3231,22 +3232,22 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Delete Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Delete Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
replayAll();
@@ -3379,7 +3380,7 @@ public class KerberosHelperTest extends EasyMockSupport {
.once();
final ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
- expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), anyObject(Map.class)))
+ expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), EasyMock.<Map<String, Map<String, String>>>anyObject()))
.andReturn(new HashMap<String, Map<String, String>>() {
{
put("cluster-env", new HashMap<String, String>() {{
@@ -3398,27 +3399,27 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
}
@@ -3537,7 +3538,7 @@ public class KerberosHelperTest extends EasyMockSupport {
.once();
final ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
- expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), anyObject(Map.class)))
+ expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), EasyMock.<Map<String, Map<String, String>>>anyObject()))
.andReturn(new HashMap<String, Map<String, String>>() {
{
put("cluster-env", new HashMap<String, String>() {
@@ -3560,22 +3561,22 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Delete Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Delete Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.addStages(anyObject(List.class));
+ requestStageContainer.addStages(EasyMock.<List<Stage>>anyObject());
expectLastCall().once();
replayAll();
@@ -3751,7 +3752,7 @@ public class KerberosHelperTest extends EasyMockSupport {
.anyTimes();
final ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
- expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), anyObject(Map.class)))
+ expect(configHelper.getEffectiveConfigProperties(anyObject(Cluster.class), EasyMock.<Map<String, Map<String, String>>>anyObject()))
.andReturn(new HashMap<String, Map<String, String>>() {
{
put("cluster-env", new HashMap<String, String>() {{
@@ -3811,7 +3812,7 @@ public class KerberosHelperTest extends EasyMockSupport {
expect(identityDescriptor1.getReference()).andReturn(null).anyTimes();
expect(identityDescriptor1.getPrincipalDescriptor()).andReturn(principalDescriptor1).anyTimes();
expect(identityDescriptor1.getKeytabDescriptor()).andReturn(keytabDescriptor1).anyTimes();
- expect(identityDescriptor1.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes();
+ expect(identityDescriptor1.shouldInclude(EasyMock.<Map<String, Object>>anyObject())).andReturn(true).anyTimes();
expect(identityDescriptor1.getWhen()).andReturn(null).anyTimes();
final KerberosIdentityDescriptor identityDescriptor2 = createMock(KerberosIdentityDescriptor.class);
@@ -3819,7 +3820,7 @@ public class KerberosHelperTest extends EasyMockSupport {
expect(identityDescriptor2.getReference()).andReturn(null).anyTimes();
expect(identityDescriptor2.getPrincipalDescriptor()).andReturn(principalDescriptor2).anyTimes();
expect(identityDescriptor2.getKeytabDescriptor()).andReturn(keytabDescriptor2).anyTimes();
- expect(identityDescriptor2.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes();
+ expect(identityDescriptor2.shouldInclude(EasyMock.<Map<String, Object>>anyObject())).andReturn(true).anyTimes();
expect(identityDescriptor2.getWhen()).andReturn(null).anyTimes();
final KerberosIdentityDescriptor identityDescriptorService1 = createMock(KerberosIdentityDescriptor.class);
@@ -3827,22 +3828,22 @@ public class KerberosHelperTest extends EasyMockSupport {
expect(identityDescriptorService1.getReference()).andReturn(null).anyTimes();
expect(identityDescriptorService1.getPrincipalDescriptor()).andReturn(principalDescriptorService1).anyTimes();
expect(identityDescriptorService1.getKeytabDescriptor()).andReturn(keytabDescriptorService1).anyTimes();
- expect(identityDescriptorService1.shouldInclude(anyObject(Map.class))).andReturn(true).anyTimes();
+ expect(identityDescriptorService1.shouldInclude(EasyMock.<Map<String, Object>>anyObject())).andReturn(true).anyTimes();
expect(identityDescriptorService1.getWhen()).andReturn(null).anyTimes();
final KerberosComponentDescriptor componentDescriptor1 = createMock(KerberosComponentDescriptor.class);
- expect(componentDescriptor1.getIdentities(eq(true), anyObject(Map.class))).andReturn(Collections.singletonList(identityDescriptor1)).anyTimes();
+ expect(componentDescriptor1.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(Collections.singletonList(identityDescriptor1)).anyTimes();
final KerberosComponentDescriptor componentDescriptor2 = createMock(KerberosComponentDescriptor.class);
- expect(componentDescriptor2.getIdentities(eq(true), anyObject(Map.class))).andReturn(Collections.singletonList(identityDescriptor2)).anyTimes();
+ expect(componentDescriptor2.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(Collections.singletonList(identityDescriptor2)).anyTimes();
final KerberosServiceDescriptor serviceDescriptor1 = createMock(KerberosServiceDescriptor.class);
expect(serviceDescriptor1.getComponent("COMPONENT1")).andReturn(componentDescriptor1).anyTimes();
- expect(serviceDescriptor1.getIdentities(eq(true), anyObject(Map.class))).andReturn(Collections.singletonList(identityDescriptorService1)).anyTimes();
+ expect(serviceDescriptor1.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(Collections.singletonList(identityDescriptorService1)).anyTimes();
final KerberosServiceDescriptor serviceDescriptor2 = createMock(KerberosServiceDescriptor.class);
expect(serviceDescriptor2.getComponent("COMPONENT2")).andReturn(componentDescriptor2).anyTimes();
- expect(serviceDescriptor2.getIdentities(eq(true), anyObject(Map.class))).andReturn(null).anyTimes();
+ expect(serviceDescriptor2.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(null).anyTimes();
final KerberosDescriptor kerberosDescriptor = createMock(KerberosDescriptor.class);
expect(kerberosDescriptor.getProperties()).andReturn(new HashMap<String, String>() {
@@ -3960,7 +3961,7 @@ public class KerberosHelperTest extends EasyMockSupport {
KerberosServiceDescriptor descriptor = createMock(KerberosServiceDescriptor.class);
expect(descriptor.getName()).andReturn(serviceName).anyTimes();
expect(descriptor.getComponents()).andReturn(componentMap).anyTimes();
- expect(descriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(identities).anyTimes();
+ expect(descriptor.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(identities).anyTimes();
expect(descriptor.getAuthToLocalProperties()).andReturn(null).anyTimes();
return descriptor;
}
@@ -3981,7 +3982,7 @@ public class KerberosHelperTest extends EasyMockSupport {
throws AmbariException {
KerberosComponentDescriptor descriptor = createMock(KerberosComponentDescriptor.class);
expect(descriptor.getName()).andReturn(componentName).anyTimes();
- expect(descriptor.getIdentities(eq(true), anyObject(Map.class))).andReturn(identities).anyTimes();
+ expect(descriptor.getIdentities(eq(true), EasyMock.<Map<String, Object>>anyObject())).andReturn(identities).anyTimes();
expect(descriptor.getConfigurations(true)).andReturn(configurations).anyTimes();
expect(descriptor.getAuthToLocalProperties()).andReturn(null).anyTimes();
return descriptor;
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
index be73a50..05fdb01 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
@@ -355,7 +355,7 @@ public class AlertDefinitionResourceProviderTest {
Assert.assertEquals("my_def",
resource.getPropertyValue(AlertDefinitionResourceProvider.ALERT_DEF_NAME));
- Map<String, String> reporting = (Map<String, String>) resource.getPropertyValue("AlertDefinition/source/reporting");
+ Map<?, ?> reporting = (Map<?, ?>) resource.getPropertyValue("AlertDefinition/source/reporting");
Assert.assertTrue(reporting.containsKey("ok"));
Assert.assertTrue(reporting.containsKey("critical"));
@@ -379,7 +379,7 @@ public class AlertDefinitionResourceProviderTest {
"my_def",
resource.getPropertyValue(AlertDefinitionResourceProvider.ALERT_DEF_NAME));
- Map<String, String> reporting = (Map<String, String>) resource.getPropertyValue("AlertDefinition/source/reporting");
+ Map<?, ?> reporting = (Map<?, ?>) resource.getPropertyValue("AlertDefinition/source/reporting");
Assert.assertNull(reporting);
}
@@ -421,7 +421,7 @@ public class AlertDefinitionResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes();
- Capture<AlertDefinitionEntity> entityCapture = new Capture<AlertDefinitionEntity>();
+ Capture<AlertDefinitionEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -571,7 +571,7 @@ public class AlertDefinitionResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).atLeastOnce();
- Capture<AlertDefinitionEntity> entityCapture = new Capture<AlertDefinitionEntity>();
+ Capture<AlertDefinitionEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -706,7 +706,7 @@ public class AlertDefinitionResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).atLeastOnce();
- Capture<AlertDefinitionEntity> entityCapture = new Capture<AlertDefinitionEntity>();
+ Capture<AlertDefinitionEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
@@ -789,7 +789,7 @@ public class AlertDefinitionResourceProviderTest {
expect(clusters.getCluster((String) anyObject())).andReturn(cluster).atLeastOnce();
expect(cluster.getClusterId()).andReturn(Long.valueOf(1)).anyTimes();
- Capture<AlertDefinitionEntity> entityCapture = new Capture<AlertDefinitionEntity>();
+ Capture<AlertDefinitionEntity> entityCapture = EasyMock.newCapture();
dao.create(capture(entityCapture));
expectLastCall();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
index 23fe65f..8ad5df2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
@@ -308,7 +308,7 @@ public class AlertGroupResourceProviderTest {
// verify definitions and targets come back when requested
List<AlertDefinitionResponse> definitions = (List<AlertDefinitionResponse>) r.getPropertyValue(AlertGroupResourceProvider.ALERT_GROUP_DEFINITIONS);
- List<AlertTarget> targets = (List<AlertTarget>) r.getPropertyValue(AlertGroupResourceProvider.ALERT_GROUP_TARGETS);
+ List<?> targets = (List<?>) r.getPropertyValue(AlertGroupResourceProvider.ALERT_GROUP_TARGETS);
assertNotNull(definitions);
assertEquals(1, definitions.size());
@@ -433,7 +433,7 @@ public class AlertGroupResourceProviderTest {
* @throws Exception
*/
public void testCreateResources(Authentication authentication) throws Exception {
- Capture<List<AlertGroupEntity>> listCapture = new Capture<List<AlertGroupEntity>>();
+ Capture<List<AlertGroupEntity>> listCapture = EasyMock.newCapture();
// the definition IDs to associate with the group
List<Long> definitionIds = new ArrayList<Long>();
@@ -525,7 +525,7 @@ public class AlertGroupResourceProviderTest {
*/
@SuppressWarnings("unchecked")
public void testUpdateResources(Authentication authentication) throws Exception {
- Capture<AlertGroupEntity> entityCapture = new Capture<AlertGroupEntity>();
+ Capture<AlertGroupEntity> entityCapture = EasyMock.newCapture();
// the definition IDs to associate with the group
List<Long> definitionIds = new ArrayList<Long>();
@@ -543,7 +543,7 @@ public class AlertGroupResourceProviderTest {
List<AlertTargetEntity> targetEntities = new ArrayList<AlertTargetEntity>();
targetEntities.addAll(getMockTargets());
- m_dao.createGroups(EasyMock.anyObject(List.class));
+ m_dao.createGroups(EasyMock.<List<AlertGroupEntity>>anyObject());
expectLastCall().times(1);
AlertGroupEntity group = new AlertGroupEntity();
@@ -639,7 +639,7 @@ public class AlertGroupResourceProviderTest {
*/
@SuppressWarnings("unchecked")
private void testUpdateDefaultGroup(Authentication authentication) throws Exception {
- Capture<AlertGroupEntity> entityCapture = new Capture<AlertGroupEntity>();
+ Capture<AlertGroupEntity> entityCapture = EasyMock.newCapture();
// the definition IDs to associate with the group
List<Long> definitionIds = new ArrayList<Long>();
@@ -750,8 +750,8 @@ public class AlertGroupResourceProviderTest {
* @throws Exception
*/
private void testDeleteResources(Authentication authentication) throws Exception {
- Capture<AlertGroupEntity> entityCapture = new Capture<AlertGroupEntity>();
- Capture<List<AlertGroupEntity>> listCapture = new Capture<List<AlertGroupEntity>>();
+ Capture<AlertGroupEntity> entityCapture = EasyMock.newCapture();
+ Capture<List<AlertGroupEntity>> listCapture = EasyMock.newCapture();
m_dao.createGroups(capture(listCapture));
expectLastCall();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java
index 2a4a681..e2ce25f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProviderTest.java
@@ -124,7 +124,7 @@ public class AlertHistoryResourceProviderTest {
"AlertHistory/cluster_name", "AlertHistory/id");
expect(m_dao.findAll(EasyMock.anyObject(AlertHistoryRequest.class))).andReturn(
- Collections.EMPTY_LIST);
+ Collections.<AlertHistoryEntity>emptyList());
replay(m_dao);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java
index 45b4737..901d7b4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProviderTest.java
@@ -128,7 +128,7 @@ public class AlertNoticeResourceProviderTest {
"AlertHistory/cluster_name", "AlertHistory/id");
expect(m_dao.findAllNotices(EasyMock.anyObject(AlertNoticeRequest.class))).andReturn(
- Collections.EMPTY_LIST);
+ Collections.<AlertNoticeEntity>emptyList());
replay(m_dao);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
index 4705825..e777d5c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
@@ -73,6 +73,7 @@ import org.apache.ambari.server.security.authorization.ResourceType;
import org.apache.ambari.server.view.ViewInstanceHandlerList;
import org.apache.ambari.server.view.ViewRegistry;
import org.apache.ambari.server.view.ViewRegistryTest;
+import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
import org.junit.After;
import org.junit.Assert;
@@ -273,7 +274,7 @@ public class AmbariPrivilegeResourceProviderTest extends EasyMockSupport {
expect(privilegeDAO.findAll()).andReturn(privilegeEntities).atLeastOnce();
UserDAO userDAO = injector.getInstance(UserDAO.class);
- expect(userDAO.findUsersByPrincipal(anyObject(List.class))).andReturn(userEntities).atLeastOnce();
+ expect(userDAO.findUsersByPrincipal(EasyMock.<List<PrincipalEntity>>anyObject())).andReturn(userEntities).atLeastOnce();
replayAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
index 5272eb8..a386e7f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
@@ -82,6 +82,7 @@ import org.apache.ambari.server.topology.SecurityConfiguration;
import org.apache.ambari.server.topology.SecurityConfigurationFactory;
import org.apache.ambari.server.topology.Setting;
import org.apache.ambari.server.utils.StageUtils;
+import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -394,7 +395,7 @@ public class BlueprintResourceProviderTest {
SecurityConfiguration securityConfiguration = new SecurityConfiguration(SecurityType.KERBEROS, "testRef", null);
// set expectations
- expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn
+ expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn
(securityConfiguration).once();
expect(blueprintFactory.createBlueprint(setProperties.iterator().next(), securityConfiguration)).andReturn(blueprint).once();
blueprint.validateRequiredProperties();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
index 4be5013..cb88ae1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
@@ -71,6 +71,7 @@ import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.ServiceOsSpecific;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.utils.StageUtils;
+import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -280,7 +281,7 @@ public class ClientConfigResourceProviderTest {
expect(clusterConfig.getProperties()).andReturn(props);
expect(configHelper.getEffectiveDesiredTags(cluster, hostName)).andReturn(allConfigTags);
expect(cluster.getClusterName()).andReturn(clusterName);
- expect(managementController.getHostComponents((Set<ServiceComponentHostRequest>) anyObject())).andReturn(responses).anyTimes();
+ expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(responses).anyTimes();
expect(cluster.getCurrentStackVersion()).andReturn(stackId);
PowerMock.mockStaticPartial(StageUtils.class, "getClusterHostInfo");
@@ -483,7 +484,7 @@ public class ClientConfigResourceProviderTest {
expect(clusterConfig.getProperties()).andReturn(props);
expect(configHelper.getEffectiveDesiredTags(cluster, hostName)).andReturn(allConfigTags);
expect(cluster.getClusterName()).andReturn(clusterName);
- expect(managementController.getHostComponents((Set<ServiceComponentHostRequest>) anyObject())).andReturn(responses).anyTimes();
+ expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(responses).anyTimes();
expect(cluster.getCurrentStackVersion()).andReturn(stackId);
PowerMock.mockStaticPartial(StageUtils.class, "getClusterHostInfo");
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
index 9919c8e..0c9f152 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
@@ -894,7 +894,7 @@ public class ClusterControllerImplTest {
anyObject(Predicate.class))).andReturn(
Collections.<Resource> emptySet()).anyTimes();
- expect(resourceProvider.checkPropertyIds(EasyMock.anyObject(Set.class))).andReturn(
+ expect(resourceProvider.checkPropertyIds(EasyMock.<Set<String>>anyObject())).andReturn(
new HashSet<String>()).anyTimes();
// strict pageRequest mock to ensure that paging is not performed on
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
index 70f0332..9948bf8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
@@ -152,7 +152,7 @@ public class ClusterResourceProviderTest {
expect(request.getProperties()).andReturn(requestProperties).anyTimes();
expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes();
- expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn(null)
+ expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn(null)
.once();
expect(topologyFactory.createProvisionClusterRequest(properties, null)).andReturn(topologyRequest).once();
expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once();
@@ -185,7 +185,7 @@ public class ClusterResourceProviderTest {
expect(request.getProperties()).andReturn(requestProperties).anyTimes();
expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes();
- expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn
+ expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn
(securityConfiguration).once();
expect(topologyFactory.createProvisionClusterRequest(properties, securityConfiguration)).andReturn(topologyRequest).once();
expect(topologyRequest.getBlueprint()).andReturn(blueprint).anyTimes();
@@ -212,7 +212,7 @@ public class ClusterResourceProviderTest {
expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes();
expect(topologyFactory.createProvisionClusterRequest(properties, securityConfiguration)).andReturn(topologyRequest).once();
- expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn
+ expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn
(securityConfiguration).once();
expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once();
expect(requestStatusResponse.getRequestId()).andReturn(5150L).anyTimes();
@@ -346,7 +346,7 @@ public class ClusterResourceProviderTest {
idResponse.add(new ClusterResponse(103L, "Cluster103", State.INSTALLED, SecurityType.NONE, null, null, null, null));
// set expectations
- Capture<Set<ClusterRequest>> captureClusterRequests = new Capture<Set<ClusterRequest>>();
+ Capture<Set<ClusterRequest>> captureClusterRequests = EasyMock.newCapture();
expect(managementController.getClusters(capture(captureClusterRequests))).andReturn(allResponse).once();
expect(managementController.getClusters(capture(captureClusterRequests))).andReturn(nameResponse).once();
@@ -501,7 +501,7 @@ public class ClusterResourceProviderTest {
expect(request.getProperties()).andReturn(requestProperties).anyTimes();
expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes();
- expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn(null)
+ expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn(null)
.once();
expect(topologyFactory.createProvisionClusterRequest(properties, null)).andReturn(topologyRequest).once();
expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once();
@@ -844,7 +844,7 @@ public class ClusterResourceProviderTest {
expect(request.getProperties()).andReturn(requestProperties).anyTimes();
expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes();
- expect(securityFactory.createSecurityConfigurationFromRequest(anyObject(HashMap.class), anyBoolean())).andReturn(null)
+ expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn(null)
.once();
expect(topologyFactory.createProvisionClusterRequest(properties, null)).andReturn(topologyRequest).once();
expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
index c157258..98ee64d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
@@ -278,11 +278,11 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).
andReturn(packages).times((hostCount - 1) * 2); // 1 host has no versionable components, other hosts have 2 services
// // that's why we don't send commands to it
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -498,10 +498,10 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).
andReturn(packages).times(1); // only one host has the versionable component
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -715,10 +715,10 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).
andReturn(packages).anyTimes(); // only one host has the versionable component
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -947,10 +947,10 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).
andReturn(packages).anyTimes(); // only one host has the versionable component
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -1159,15 +1159,15 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).andReturn(packages).anyTimes();
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes();
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(cluster.getCurrentStackVersion()).andReturn(stackId);
expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(schs).anyTimes();
- Capture<StackId> capturedStackId = new Capture<StackId>();
+ Capture<StackId> capturedStackId = EasyMock.newCapture();
cluster.setDesiredStackVersion(capture(capturedStackId));
expectLastCall().once();
expect(cluster.getHosts()).andReturn(hosts).anyTimes();
@@ -1312,9 +1312,9 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).andReturn(packages).anyTimes();
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes();
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(cluster.getCurrentStackVersion()).andReturn(stackId);
@@ -1325,7 +1325,7 @@ public class ClusterStackVersionResourceProviderTest {
ClusterVersionEntity current = new ClusterVersionEntity();
current.setRepositoryVersion(currentRepo);
- Capture<StackId> capturedStackId = new Capture<StackId>();
+ Capture<StackId> capturedStackId = EasyMock.newCapture();
cluster.setDesiredStackVersion(capture(capturedStackId));
expectLastCall().once();
expect(cluster.getHosts()).andReturn(hosts).anyTimes();
@@ -1480,11 +1480,11 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).
andReturn(packages).times((hostCount - 1) * 2); // 1 host has no versionable components, other hosts have 2 services
// // that's why we don't send commands to it
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class),
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
@@ -1699,11 +1699,11 @@ public class ClusterStackVersionResourceProviderTest {
expect(managementController.getAuthName()).andReturn("admin").anyTimes();
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
- (Map<String, String>) anyObject(List.class), anyObject(String.class))).andReturn(
+ EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn(
packages).anyTimes(); // only one host has the versionable component
- expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class),
- anyObject(Map.class), eq(managementController))).andReturn(csvResourceProvider).anyTimes();
+ expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(),
+ EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes();
expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster);
expect(clusters.getHostsForCluster(anyObject(String.class))).andReturn(
http://git-wip-us.apache.org/repos/asf/ambari/blob/edce0b11/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
index fb640f2..1d7a50b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
@@ -66,6 +66,7 @@ import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
import org.apache.ambari.server.state.configgroup.ConfigGroupFactory;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Assert;
import org.junit.Before;
@@ -279,8 +280,8 @@ public class ConfigGroupResourceProviderTest {
expect(cluster.getConfigGroups()).andReturn(configGroupMap);
expect(configGroupFactory.createNew((Cluster) anyObject(), (String) anyObject(),
- (String) anyObject(), (String) anyObject(), (HashMap) anyObject(),
- (HashMap) anyObject())).andReturn(configGroup).anyTimes();
+ (String) anyObject(), (String) anyObject(), EasyMock.<Map<String, Config>>anyObject(),
+ EasyMock.<Map<Long, Host>>anyObject())).andReturn(configGroup).anyTimes();
expect(configGroup.getClusterName()).andReturn("Cluster100").anyTimes();
expect(configGroup.getName()).andReturn("test-1").anyTimes();