AMBARI-4363 - support the new version of Ambari Server

contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java

@@ -385,21 +385,19 @@ public class AmbariServer {
         databaseDriver = configuration.getLocalDatabaseUrl();
         databaseUrl    = Configuration.JDBC_LOCAL_DRIVER;
 
-      } else {
-        databaseDriver = configuration.getDatabaseDriver();
-        databaseUrl    = configuration.getDatabaseUrl();
-
+      }
+      else {
         if (persistenceType == PersistenceType.IN_MEMORY) {
-          if(databaseDriver == null){
-            databaseDriver = Configuration.JDBC_IN_MEMROY_DRIVER;
-          }
-          if (databaseUrl == null) {
-            databaseUrl = Configuration.JDBC_IN_MEMORY_URL;
-          }
+          databaseDriver = Configuration.JDBC_IN_MEMROY_DRIVER;
+          databaseUrl = Configuration.JDBC_IN_MEMORY_URL;
+        }
+        else {
+          databaseDriver = configuration.getDatabaseDriver();
+          databaseUrl    = configuration.getDatabaseUrl();
         }
       }
-      if (databaseDriver != null && databaseUrl != null) {
 
+      if (databaseDriver != null && databaseUrl != null) {
         properties.setProperty("javax.persistence.jdbc.url",    databaseUrl);
         properties.setProperty("javax.persistence.jdbc.driver", databaseDriver);
 

contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java

@@ -104,7 +104,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
       case Component:
 
         providers.add(new JMXPropertyProvider(
-            PropertyHelper.getJMXPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+            PropertyHelper.getJMXPropertyIds(type),
             urlStreamProvider,
             this,
             PropertyHelper.getPropertyId("ServiceComponentInfo", "cluster_name"),
@@ -114,7 +114,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
             Collections.singleton("STARTED")));
 
         providers.add(new SQLPropertyProvider(
-            PropertyHelper.getGangliaPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+            PropertyHelper.getGangliaPropertyIds(type),
             this,
             PropertyHelper.getPropertyId("ServiceComponentInfo", "cluster_name"),
             null,
@@ -124,7 +124,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
       case HostComponent:
 
         providers.add(new JMXPropertyProvider(
-            PropertyHelper.getJMXPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+            PropertyHelper.getJMXPropertyIds(type),
             urlStreamProvider,
             this,
             PropertyHelper.getPropertyId("HostRoles", "cluster_name"),
@@ -134,7 +134,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
             Collections.singleton("STARTED")));
 
         providers.add(new SQLPropertyProvider(
-            PropertyHelper.getGangliaPropertyIds(type, PropertyHelper.MetricsVersion.HDP1),
+            PropertyHelper.getGangliaPropertyIds(type),
             this,
             PropertyHelper.getPropertyId("HostRoles", "cluster_name"),
             PropertyHelper.getPropertyId("HostRoles", "host_name"),

contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/scom/SQLPropertyProviderTest.java

@@ -85,7 +85,7 @@ public class SQLPropertyProviderTest {
     replay(connectionFactory, connection, statement, resultSet);
 
     SQLPropertyProvider provider = new SQLPropertyProvider(
-        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
         new TestHostInfoProvider(),
         CLUSTER_NAME_PROPERTY_ID,
         HOST_NAME_PROPERTY_ID,
@@ -151,7 +151,7 @@ public class SQLPropertyProviderTest {
     TestHostInfoProvider hostProvider = new TestHostInfoProvider();
 
     SQLPropertyProvider provider = new SQLPropertyProvider(
-        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
         hostProvider,
         CLUSTER_NAME_PROPERTY_ID,
         HOST_NAME_PROPERTY_ID,
@@ -217,7 +217,7 @@ public class SQLPropertyProviderTest {
     TestHostInfoProvider hostProvider = new TestHostInfoProvider();
 
     SQLPropertyProvider provider = new SQLPropertyProvider(
-        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
         hostProvider,
         CLUSTER_NAME_PROPERTY_ID,
         HOST_NAME_PROPERTY_ID,
@@ -278,7 +278,7 @@ public class SQLPropertyProviderTest {
     TestHostInfoProvider hostProvider = new TestHostInfoProvider();
 
     SQLPropertyProvider provider = new SQLPropertyProvider(
-        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
         hostProvider,
         CLUSTER_NAME_PROPERTY_ID,
         null,
@@ -336,7 +336,7 @@ public class SQLPropertyProviderTest {
     replay(connectionFactory, connection, statement, resultSet);
 
     SQLPropertyProvider provider = new SQLPropertyProvider(
-        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
         new TestHostInfoProvider(),
         CLUSTER_NAME_PROPERTY_ID,
         HOST_NAME_PROPERTY_ID,
@@ -397,7 +397,7 @@ public class SQLPropertyProviderTest {
     replay(connectionFactory, connection, statement, resultSet);
 
     SQLPropertyProvider provider = new SQLPropertyProvider(
-        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent, PropertyHelper.MetricsVersion.HDP1),
+        PropertyHelper.getGangliaPropertyIds(Resource.Type.HostComponent),
         new TestHostInfoProvider(),
         CLUSTER_NAME_PROPERTY_ID,
         HOST_NAME_PROPERTY_ID,