You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ni...@apache.org on 2017/09/19 17:33:51 UTC
ambari git commit: Revert "AMBARI-21971. Fix compilation with java7"
Repository: ambari
Updated Branches:
refs/heads/trunk 9be7569b9 -> baa165672
Revert "AMBARI-21971. Fix compilation with java7"
This reverts commit f7c9e1ee5799632ce8ce2d68a56dbdb2aabf29d4.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/baa16567
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/baa16567
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/baa16567
Branch: refs/heads/trunk
Commit: baa16567244e7246f5cc7cd964b1fba81bc21447
Parents: 9be7569
Author: Nishant <ni...@gmail.com>
Authored: Tue Sep 19 23:03:04 2017 +0530
Committer: Nishant <ni...@gmail.com>
Committed: Tue Sep 19 23:03:04 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/baa16567/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 0e8c934..28a3f29 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.<CheckQualification>asList(
+ return Arrays.asList(
new PriorCheckQualification(CheckDescription.DRUID_HA_WARNING));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/baa16567/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 e90931b..dfb18ed 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.<String,ServiceComponentHost>singletonMap("host", null));
+ Mockito.when(serviceComponent.getServiceComponentHosts()).thenReturn(Collections.singletonMap("host", null));
Mockito.when(haComponent.getServiceComponentHosts()).thenReturn(ImmutableMap.<String,ServiceComponentHost>of("host1", serviceComponentHost, "host2", serviceComponentHost));
// All Components Not HA