Repository: ambari Updated Branches: refs/heads/trunk cc70c2b5b -> f7c9e1ee5
AMBARI-21971. Fix compilation with java7 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f7c9e1ee Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f7c9e1ee Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f7c9e1ee Branch: refs/heads/trunk Commit: f7c9e1ee5799632ce8ce2d68a56dbdb2aabf29d4 Parents: cc70c2b Author: Nishant <[email protected]> Authored: Tue Sep 19 21:36:36 2017 +0530 Committer: Nishant <[email protected]> Committed: Tue Sep 19 21:58:01 2017 +0530 ---------------------------------------------------------------------- .../apache/ambari/server/checks/DruidHighAvailabilityCheck.java | 2 +- .../ambari/server/checks/DruidHighAvailabilityCheckTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f7c9e1ee/ambari-server/src/main/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheck.java index 28a3f29..0e8c934 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheck.java @@ -76,7 +76,7 @@ public class DruidHighAvailabilityCheck extends AbstractCheckDescriptor @Override public List<CheckQualification> getQualifications() { - return Arrays.asList( + return Arrays.<CheckQualification>asList( new PriorCheckQualification(CheckDescription.DRUID_HA_WARNING)); } http://git-wip-us.apache.org/repos/asf/ambari/blob/f7c9e1ee/ambari-server/src/test/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheckTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheckTest.java index dfb18ed..e90931b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/DruidHighAvailabilityCheckTest.java @@ -128,7 +128,7 @@ public class DruidHighAvailabilityCheckTest final Service service = Mockito.mock(Service.class); final ServiceComponent serviceComponent = Mockito.mock(ServiceComponent.class); final ServiceComponent haComponent = Mockito.mock(ServiceComponent.class); - Mockito.when(serviceComponent.getServiceComponentHosts()).thenReturn(Collections.singletonMap("host", null)); + Mockito.when(serviceComponent.getServiceComponentHosts()).thenReturn(Collections.<String,ServiceComponentHost>singletonMap("host", null)); Mockito.when(haComponent.getServiceComponentHosts()).thenReturn(ImmutableMap.<String,ServiceComponentHost>of("host1", serviceComponentHost, "host2", serviceComponentHost)); // All Components Not HA
