Repository: ambari Updated Branches: refs/heads/branch-2.6 f961d8ecb -> 13880851e
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/13880851 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13880851 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/13880851 Branch: refs/heads/branch-2.6 Commit: 13880851ee914ebba0dd387860f6a1119136d0b0 Parents: f961d8e Author: Nishant <nishant.mon...@gmail.com> Authored: Tue Sep 19 21:36:36 2017 +0530 Committer: Nishant <nishant.mon...@gmail.com> Committed: Tue Sep 19 21:55:16 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/13880851/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/13880851/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
