You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2017/05/19 20:33:35 UTC
[1/3] ambari git commit: AMBARI-21077: Refactor API endpoint to have
a single entry point for an API version (jluniya)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-14714 d35ea3560 -> ea3dc9a0d
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/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 f9375aa..2230e8e 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
@@ -90,6 +90,7 @@ import org.apache.ambari.server.agent.ExecutionCommand;
import org.apache.ambari.server.agent.ExecutionCommand.KeyNames;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.api.services.LoggingService;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.configuration.Configuration.DatabaseType;
import org.apache.ambari.server.controller.internal.DeleteStatusMetaData;
@@ -5202,14 +5203,20 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
return injector.getInstance(MetricPropertyProviderFactory.class);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public LoggingSearchPropertyProvider getLoggingSearchPropertyProvider() {
return injector.getInstance(LoggingSearchPropertyProvider.class);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public LoggingService getLoggingService(String clusterName) {
- LoggingService loggingService = new LoggingService(clusterName);
+ public LoggingService getLoggingService(ApiVersion apiVersion, String clusterName) {
+ LoggingService loggingService = new LoggingService(apiVersion, clusterName);
injector.injectMembers(loggingService);
return loggingService;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 2f799b7..f334c98 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -169,7 +169,10 @@ import com.sun.jersey.spi.container.servlet.ServletContainer;
@Singleton
public class AmbariServer {
- public static final String VIEWS_URL_PATTERN = "/api/v1/views/*";
+ public static final String VIEWS_V1_URL_PATTERN = "/api/v1/views/*";
+ public static final String VIEWS_V2_URL_PATTERN = "/api/v2/views/*";
+ public static final String USERS_V1_URL_PATTERN = "/api/v1/users/*";
+ public static final String USERS_V2_URL_PATTERN = "/api/v2/users/*";
private static Logger LOG = LoggerFactory.getLogger(AmbariServer.class);
/**
@@ -391,18 +394,25 @@ public class AmbariServer {
// The security header filter - conditionally adds security-related headers to the HTTP response for Ambari Views
// requests.
- root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsSecurityHeaderFilter.class)), VIEWS_URL_PATTERN,
+ root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsSecurityHeaderFilter.class)),
+ VIEWS_V1_URL_PATTERN,
+ DISPATCHER_TYPES);
+ root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsSecurityHeaderFilter.class)), VIEWS_V2_URL_PATTERN,
DISPATCHER_TYPES);
// since views share the REST API threadpool, a misbehaving view could
// consume all of the available threads and effectively cause a loss of
// service for Ambari
root.addFilter(new FilterHolder(injector.getInstance(ViewThrottleFilter.class)),
- VIEWS_URL_PATTERN, DISPATCHER_TYPES);
+ VIEWS_V1_URL_PATTERN, DISPATCHER_TYPES);
+ root.addFilter(new FilterHolder(injector.getInstance(ViewThrottleFilter.class)),
+ VIEWS_V2_URL_PATTERN, DISPATCHER_TYPES);
// adds MDC info for views logging
root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsMDCLoggingFilter.class)),
- VIEWS_URL_PATTERN, DISPATCHER_TYPES);
+ VIEWS_V1_URL_PATTERN, DISPATCHER_TYPES);
+ root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsMDCLoggingFilter.class)),
+ VIEWS_V2_URL_PATTERN, DISPATCHER_TYPES);
// session-per-request strategy for api
root.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/api/*", DISPATCHER_TYPES);
@@ -412,7 +422,8 @@ public class AmbariServer {
root.addEventListener(new RequestContextListener());
root.addFilter(new FilterHolder(springSecurityFilter), "/api/*", DISPATCHER_TYPES);
- root.addFilter(new FilterHolder(new UserNameOverrideFilter()), "/api/v1/users/*", DISPATCHER_TYPES);
+ root.addFilter(new FilterHolder(new UserNameOverrideFilter()), USERS_V1_URL_PATTERN, DISPATCHER_TYPES);
+ root.addFilter(new FilterHolder(new UserNameOverrideFilter()), USERS_V2_URL_PATTERN, DISPATCHER_TYPES);
// session-per-request strategy for agents
agentroot.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/agent/*", DISPATCHER_TYPES);
@@ -449,7 +460,7 @@ public class AmbariServer {
"org.apache.ambari.server.api");
sh.setInitParameter("com.sun.jersey.api.json.POJOMappingFeature", "true");
- root.addServlet(sh, "/api/v1/*");
+ root.addServlet(sh, "/api/*");
sh.setInitOrder(2);
SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index 0125d54..bea2884 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -52,6 +52,7 @@ import org.apache.ambari.server.api.resources.ViewExternalSubResourceDefinition;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.api.services.ViewExternalSubResourceService;
import org.apache.ambari.server.api.services.ViewSubResourceService;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.AmbariServer;
@@ -1339,7 +1340,7 @@ public class ViewRegistry {
ViewContext viewInstanceContext = new ViewContextImpl(viewInstanceDefinition, this);
ViewExternalSubResourceService externalSubResourceService =
- new ViewExternalSubResourceService(viewDefinition.getExternalResourceType(), viewInstanceDefinition);
+ new ViewExternalSubResourceService(ApiVersion.Default, viewDefinition.getExternalResourceType(), viewInstanceDefinition);
viewInstanceDefinition.addService(ResourceConfig.EXTERNAL_RESOURCE_PLURAL_NAME, externalSubResourceService);
@@ -1349,7 +1350,7 @@ public class ViewRegistry {
Resource.Type type = resourceDefinition.getType();
ResourceConfig resourceConfig = resourceDefinition.getResourceConfiguration();
- ViewResourceHandler viewResourceService = new ViewSubResourceService(type, viewInstanceDefinition);
+ ViewResourceHandler viewResourceService = new ViewSubResourceService(ApiVersion.Default, type, viewInstanceDefinition);
ClassLoader cl = viewDefinition.getClassLoader();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
index b5fb6f8..4f81c95 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ServiceService.
@@ -76,6 +77,7 @@ public class ActionServiceTest extends BaseServiceTest {
private String m_actionName;
private TestActionDefinitionService(String actionName) {
+ super(ApiVersion.Default);
m_actionName = actionName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
index adae956..f111afd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
@@ -25,6 +25,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.WidgetLayoutEntity;
import org.junit.Test;
@@ -46,7 +47,7 @@ public class ActiveWidgetLayoutServiceTest {
private class TestActiveWidgetLayoutService extends ActiveWidgetLayoutService {
public TestActiveWidgetLayoutService(String username) {
- super(username);
+ super(ApiVersion.Default, username);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
index 165dd6c..e69055a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for BlueprintService.
@@ -78,6 +79,7 @@ public class BlueprintServiceTest extends BaseServiceTest {
private String m_blueprintId;
private TestBlueprintService(String blueprintId) {
+ super(ApiVersion.Default);
m_blueprintId = blueprintId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
index ab83dfd..47b70d9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for CredentialService.
@@ -64,7 +65,7 @@ public class ClusterKerberosDescriptorServiceTest extends BaseServiceTest {
private String type;
private TestService(String type) {
- super("C1");
+ super(ApiVersion.Default, "C1");
this.type = type;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
index a1c8d6c..06f337e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ClusterPrivilegeService.
@@ -69,7 +70,7 @@ public class ClusterPrivilegeServiceTest extends BaseServiceTest {
private class TestClusterPrivilegeService extends ClusterPrivilegeService {
private TestClusterPrivilegeService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.Default, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
index cfc43f5..cfc6a2e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.orm.dao.ClusterDAO;
import org.apache.ambari.server.orm.dao.HostDAO;
import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -145,7 +146,7 @@ public class ClusterServiceTest extends BaseServiceTest {
private String m_clusterId;
private TestClusterService(Clusters clusters, String clusterId) {
- super(clusters);
+ super(ApiVersion.Default, clusters);
m_clusterId = clusterId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
index ac607fb..fa21156 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -72,7 +73,7 @@ public class ClusterStackVersionServiceTest extends BaseServiceTest {
private class TestClusterStackVersionService extends ClusterStackVersionService {
public TestClusterStackVersionService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.Default, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
index 9ced9b3..dda130a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ComponentService.
@@ -92,7 +93,7 @@ public class ComponentServiceTest extends BaseServiceTest {
private String m_componentId;
private TestComponentService(String clusterId, String serviceId, String componentId) {
- super(clusterId, serviceId);
+ super(ApiVersion.Default, clusterId, serviceId);
m_clusterId = clusterId;
m_serviceId = serviceId;
m_componentId = componentId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
index 88ee500..b0ad67c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
public class ConfigGroupServiceTest extends BaseServiceTest {
@@ -85,7 +86,7 @@ public class ConfigGroupServiceTest extends BaseServiceTest {
private String m_groupId;
public TestConfigGroupService(String m_clusterName, String groupId) {
- super(m_clusterName);
+ super(ApiVersion.Default, m_clusterName);
this.m_clusterName = m_clusterName;
this.m_groupId = groupId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
index adaffff..eda6cc9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
@@ -29,7 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
-
+import org.apache.ambari.server.api.util.ApiVersion;
public class ConfigurationServiceTest extends BaseServiceTest {
@@ -56,7 +56,7 @@ public class ConfigurationServiceTest extends BaseServiceTest {
private String m_clusterId;
private TestConfigurationService(String clusterId) {
- super(clusterId);
+ super(ApiVersion.Default, clusterId);
m_clusterId = clusterId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
index 73d3383..8aa1303 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for CredentialService.
@@ -72,7 +73,7 @@ public class CredentialServiceTest extends BaseServiceTest {
private String alias;
private TestCredentialService(String alias) {
- super("C1");
+ super(ApiVersion.Default, "C1");
this.alias = alias;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ExtensionsServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ExtensionsServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ExtensionsServiceTest.java
index 7a696a6..00a028e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ExtensionsServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ExtensionsServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ExtensionsService.
@@ -73,6 +74,7 @@ public class ExtensionsServiceTest extends BaseServiceTest {
private String m_extensionVersion;
private TestExtensionsService(String extensionName, String extensionVersion) {
+ super(ApiVersion.Default);
m_extensionId = extensionName;
m_extensionVersion = extensionVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
index c899b93..31e0edf 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
-
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for FeedService.
@@ -79,6 +79,7 @@ public class FeedServiceTest extends BaseServiceTest {
private String m_feedId;
private TestFeedService(String feedId) {
+ super(ApiVersion.Default);
m_feedId = feedId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
index 89545a5..8cdbf75 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -85,7 +86,7 @@ public class GroupPrivilegeServiceTest extends BaseServiceTest {
private class TestGroupPrivilegeService extends GroupPrivilegeService {
public TestGroupPrivilegeService() {
- super("group");
+ super(ApiVersion.Default, "group");
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
index f46d358..0753f1c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
/**
@@ -78,6 +79,10 @@ public class GroupServiceTest extends BaseServiceTest {
}
private class TestGroupService extends GroupService {
+ public TestGroupService() {
+ super(ApiVersion.Default);
+ }
+
@Override
protected ResourceInstance createResource(Type type, Map<Type, String> mapIds) {
return getTestResource();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
index 01ccd6a..670eab1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for HostComponentService.
@@ -91,7 +92,7 @@ public class HostComponentServiceTest extends BaseServiceTest {
private String m_hostComponentId;
private TestHostComponentService(String clusterId, String hostId, String hostComponentId) {
- super(clusterId, hostId);
+ super(ApiVersion.Default, clusterId, hostId);
m_clusterId = clusterId;
m_hostId = hostId;
m_hostComponentId = hostComponentId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
index c9200b0..1550e0a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for HostKerberosIdentity.
@@ -62,7 +63,7 @@ public class HostKerberosIdentityServiceTest extends BaseServiceTest {
private String identityId;
private TestHostKerberosIdentityService(String clusterId, String hostId, String identityId) {
- super(clusterId, hostId);
+ super(ApiVersion.Default, clusterId, hostId);
this.clusterId = clusterId;
this.hostId = hostId;
this.identityId = identityId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
index 6aef04d..8209227 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for HostService.
@@ -90,7 +91,7 @@ public class HostServiceTest extends BaseServiceTest {
private String m_hostId;
private TestHostService(String clusterId, String hostId) {
- super(clusterId);
+ super(ApiVersion.Default, clusterId);
m_clusterId = clusterId;
m_hostId = hostId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
index 8367a94..83de4e3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
/**
@@ -60,7 +61,7 @@ public class HostStackVersionServiceTest extends BaseServiceTest {
private class TestHostStackVersionService extends HostStackVersionService {
public TestHostStackVersionService(String hostName, String clusterName) {
- super(hostName, clusterName);
+ super(ApiVersion.Default, hostName, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
index ee42b57..8f0e004 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for InstanceService.
@@ -78,7 +79,7 @@ public class InstanceServiceTest extends BaseServiceTest {
private String m_instanceId;
private TestInstanceService(String feedName, String instanceId) {
- super(feedName);
+ super(ApiVersion.Default, feedName);
m_feedName = feedName;
m_instanceId = instanceId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
index 128b345..1c7c01b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for JobService.
@@ -62,7 +63,7 @@ public class JobServiceTest extends BaseServiceTest {
private String clusterName;
public TestJobService(String clusterName, String workflowId) {
- super(clusterName, workflowId);
+ super(ApiVersion.Default, clusterName, workflowId);
this.clusterName = clusterName;
this.workflowId = workflowId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
index 9085bf5..e129aff 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -70,7 +71,7 @@ public class LdapSyncEventServiceTest extends BaseServiceTest {
private class TestLdapSyncEventService extends LdapSyncEventService {
private TestLdapSyncEventService() {
- super();
+ super(ApiVersion.Default);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/LoggingServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/LoggingServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/LoggingServiceTest.java
index 800aca2..183ea3f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/LoggingServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/LoggingServiceTest.java
@@ -26,6 +26,7 @@ import java.net.HttpURLConnection;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.logging.LoggingRequestHelperFactory;
import org.apache.ambari.server.security.TestAuthenticationFactory;
@@ -125,7 +126,7 @@ public class LoggingServiceTest {
SecurityContextHolder.getContext().setAuthentication(authentication);
LoggingService loggingService =
- new LoggingService(expectedClusterName, controllerFactoryMock);
+ new LoggingService(ApiVersion.Default, expectedClusterName, controllerFactoryMock);
loggingService.setLoggingRequestHelperFactory(helperFactoryMock);
Response resource = loggingService.getSearchEngine("", null, uriInfoMock);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
index f9543df..9f9e31c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
/**
@@ -84,7 +85,7 @@ public class MemberServiceTest extends BaseServiceTest {
private class TestMemberService extends MemberService {
public TestMemberService(String groupName) {
- super(groupName);
+ super(ApiVersion.Default, groupName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
index bbb4578..bf64c4f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
-
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for PermissionService.
@@ -78,6 +78,7 @@ public class PermissionServiceTest extends BaseServiceTest {
private String id;
private TestPermissionService(String id) {
+ super(ApiVersion.Default);
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
index 23c99d9..4be5f7c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
/**
@@ -56,7 +57,7 @@ public class PreUpgradeCheckServiceTest extends BaseServiceTest {
private class TestPreUpgradeCheckService extends PreUpgradeCheckService {
public TestPreUpgradeCheckService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.Default, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
index 134c753..23e644a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
-
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for PrivilegeService.
@@ -91,6 +91,7 @@ public class PrivilegeServiceTest extends BaseServiceTest {
private String id;
private TestPrivilegeService(String id) {
+ super(ApiVersion.Default);
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
index 779a320..eb5c92b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for RecommendationService.
@@ -42,8 +43,8 @@ public class RecommendationServiceTest extends BaseServiceTest {
//getRecommendation
RecommendationService service = new TestRecommendationService("stackName", "stackVersion");
- Method m = service.getClass().getMethod("getRecommendation", String.class, HttpHeaders.class, UriInfo.class, String.class, String.class);
- Object[] args = new Object[] {"body", getHttpHeaders(), getUriInfo(), "stackName", "stackVersion"};
+ Method m = service.getClass().getMethod("getRecommendation", String.class, HttpHeaders.class, UriInfo.class);
+ Object[] args = new Object[] {"body", getHttpHeaders(), getUriInfo()};
listInvocations.add(new ServiceTestInvocation(Request.Type.POST, service, m, args, "body"));
return listInvocations;
@@ -54,7 +55,7 @@ public class RecommendationServiceTest extends BaseServiceTest {
private String stackVersion;
private TestRecommendationService(String stackName, String stackVersion) {
- super();
+ super(ApiVersion.Default, stackName, stackVersion);
this.stackName = stackName;
this.stackVersion = stackVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
index 6d6ba7b..e035947 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
/**
@@ -81,7 +82,7 @@ public class RepositoryServiceTest extends BaseServiceTest {
private class TestRepositoryService extends RepositoryService {
public TestRepositoryService() {
- super(new HashMap<Type, String>());
+ super(ApiVersion.Default, new HashMap<Type, String>());
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
index 517a6a0..063fa05 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
-
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for RoleAuthorizationService.
@@ -60,6 +60,7 @@ public class RoleAuthorizationServiceTest extends BaseServiceTest {
private String id;
private TestRoleAuthorizationService(String id) {
+ super(ApiVersion.Default);
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
index 64898c8..b2598c6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for RootServiceService.
@@ -93,6 +94,7 @@ public class RootServiceServiceTest extends BaseServiceTest {
private String m_hostName;
private TestRootServiceService(String serviceName, String componentName, String hostName) {
+ super(ApiVersion.Default);
m_serviceName = serviceName;
m_componentName = componentName;
m_hostName = hostName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
index deda3eb..ddb22eb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ServiceService.
@@ -133,13 +134,13 @@ public class ServiceServiceTest extends BaseServiceTest {
private String m_artifact_id;
private TestServiceService(String clusterId, String serviceId) {
- super(clusterId);
+ super(ApiVersion.Default, clusterId);
m_clusterId = clusterId;
m_serviceId = serviceId;
}
private TestServiceService(String clusterId, String serviceId, String artifactId) {
- super(clusterId);
+ super(ApiVersion.Default, clusterId);
m_clusterId = clusterId;
m_serviceId = serviceId;
m_artifact_id = artifactId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
index 1bc75ff..c53b852 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit test for {@link SettingService}
@@ -75,6 +76,7 @@ public class SettingServiceTest extends BaseServiceTest {
private String settingName;
private TestSettingService(String settingName) {
+ super(ApiVersion.Default);
this.settingName = settingName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
index ff62712..b828879 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for StacksService.
@@ -141,6 +142,7 @@ public class StacksServiceTest extends BaseServiceTest {
private String m_stackVersion;
private TestStacksService(String stackName, String stackVersion) {
+ super(ApiVersion.Default);
m_stackId = stackName;
m_stackVersion = stackVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
index a71b062..2b72570 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
-
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for TargetClusterService.
@@ -79,6 +79,7 @@ public class TargetClusterServiceTest extends BaseServiceTest {
private String m_targetClusterId;
private TestTargetClusterService(String targetClusterId) {
+ super(ApiVersion.Default);
m_targetClusterId = targetClusterId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
index 072cd65..0d41be7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for TaskAttemptService.
@@ -65,7 +66,7 @@ public class TaskAttemptServiceTest extends BaseServiceTest {
public TestTaskAttemptService(String clusterName, String workflowId,
String jobId) {
- super(clusterName, workflowId, jobId);
+ super(ApiVersion.Default, clusterName, workflowId, jobId);
this.clusterName = clusterName;
this.workflowId = workflowId;
this.jobId = jobId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
index 25f67a4..4bd7dde 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.junit.Assert;
/**
@@ -50,7 +51,7 @@ public class UpgradeItemServiceTest extends BaseServiceTest {
private Long m_upgradeItemId;
private TestUpgradeItemService(String clusterName, String upgradeId, String upgradeGroupId, Long upgradeItemId) {
- super(clusterName, upgradeId, upgradeGroupId);
+ super(ApiVersion.Default, clusterName, upgradeId, upgradeGroupId);
m_upgradeItemId = upgradeItemId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
index c0fb6ff..bf712c8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.junit.Test;
@@ -60,7 +61,7 @@ public class UserAuthorizationServiceTest extends BaseServiceTest {
@Test
public void testCreateAuthorizationResourceWithUppercaseUsername() {
// GIVEN
- UserAuthorizationService userAuthorizationService= new UserAuthorizationService("Jdoe");
+ UserAuthorizationService userAuthorizationService= new UserAuthorizationService(ApiVersion.Default, "Jdoe");
// WHEN
ResourceInstance result = userAuthorizationService.createAuthorizationResource("id");
// THEN
@@ -72,7 +73,7 @@ public class UserAuthorizationServiceTest extends BaseServiceTest {
private String id;
private TestUserAuthorizationService(String id) {
- super("jdoe");
+ super(ApiVersion.Default, "jdoe");
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
index 909a4ba..23e1062 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.Resource.Type;
import org.easymock.EasyMock;
@@ -88,7 +89,7 @@ public class UserPrivilegeServiceTest extends BaseServiceTest {
@Test
public void testCreatePrivilegeResourcesWithUppercaseUsername() {
// GIVEN
- UserPrivilegeService userPrivilegeService = new UserPrivilegeService("User");
+ UserPrivilegeService userPrivilegeService = new UserPrivilegeService(ApiVersion.Default, "User");
// WHEN
ResourceInstance result = userPrivilegeService.createPrivilegeResource("test");
// THEN
@@ -98,7 +99,7 @@ public class UserPrivilegeServiceTest extends BaseServiceTest {
private class TestUserPrivilegeService extends UserPrivilegeService {
public TestUserPrivilegeService() {
- super("user");
+ super(ApiVersion.Default, "user");
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
index 722e4bc..ef6aef0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ValidationService.
@@ -42,8 +43,8 @@ public class ValidationServiceTest extends BaseServiceTest {
//getValidation
ValidationService service = new TestValidationService("stackName", "stackVersion");
- Method m = service.getClass().getMethod("getValidation", String.class, HttpHeaders.class, UriInfo.class, String.class, String.class);
- Object[] args = new Object[] {"body", getHttpHeaders(), getUriInfo(), "stackName", "stackVersion"};
+ Method m = service.getClass().getMethod("getValidation", String.class, HttpHeaders.class, UriInfo.class);
+ Object[] args = new Object[] {"body", getHttpHeaders(), getUriInfo()};
listInvocations.add(new ServiceTestInvocation(Request.Type.POST, service, m, args, "body"));
return listInvocations;
@@ -54,7 +55,7 @@ public class ValidationServiceTest extends BaseServiceTest {
private String stackVersion;
private TestValidationService(String stackName, String stackVersion) {
- super();
+ super(ApiVersion.Default, stackName, stackVersion);
this.stackName = stackName;
this.stackVersion = stackVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
index e1eb0de..2672410 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
@@ -27,6 +27,7 @@ import static org.easymock.EasyMock.verify;
import javax.ws.rs.WebApplicationException;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.view.ViewDataMigrationUtility;
import org.apache.ambari.server.view.ViewRegistry;
@@ -54,7 +55,7 @@ public class ViewDataMigrationServiceTest {
replay(viewRegistry);
ViewRegistry.initInstance(viewRegistry);
- ViewDataMigrationService service = new ViewDataMigrationService(viewName, version1, instanceName);
+ ViewDataMigrationService service = new ViewDataMigrationService(ApiVersion.Default, viewName, version1, instanceName);
ViewDataMigrationUtility migrationUtility = createStrictMock(ViewDataMigrationUtility.class);
migrationUtility.migrateData(anyObject(ViewInstanceEntity.class), anyObject(ViewInstanceEntity.class), eq(false));
@@ -73,7 +74,7 @@ public class ViewDataMigrationServiceTest {
replay(viewRegistry);
ViewRegistry.initInstance(viewRegistry);
- ViewDataMigrationService service = new ViewDataMigrationService(viewName, version1, instanceName);
+ ViewDataMigrationService service = new ViewDataMigrationService(ApiVersion.Default, viewName, version1, instanceName);
thrown.expect(WebApplicationException.class);
service.migrateData(version2, instanceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
index 155f91e..74711e6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
@@ -17,6 +17,7 @@
*/
package org.apache.ambari.server.api.services;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.orm.entities.ViewInstanceEntityTest;
@@ -32,7 +33,7 @@ public class ViewExternalSubResourceServiceTest {
Resource.Type type = new Resource.Type("resource");
ViewInstanceEntity definition = ViewInstanceEntityTest.getViewInstanceEntity();
- ViewExternalSubResourceService service = new ViewExternalSubResourceService(type, definition);
+ ViewExternalSubResourceService service = new ViewExternalSubResourceService(ApiVersion.Default, type, definition);
Object fooService = new Object();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
index 1c9e589..befa939 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ViewPermissionService.
@@ -73,7 +74,7 @@ public class ViewPermissionServiceTest extends BaseServiceTest {
private TestViewPermissionService(String viewName, String version, String permissionId) {
- super(viewName, version);
+ super(ApiVersion.Default, viewName, version);
this.permissionId = permissionId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
index 97943df..6c23960 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
@@ -43,6 +43,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.api.util.TreeNode;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
@@ -132,7 +133,7 @@ public class ViewSubResourceServiceTest extends BaseServiceTest {
Resource.Type type = new Resource.Type("subResource");
// get resource
- ViewSubResourceService service = new ViewSubResourceService(type, viewInstanceEntity);
+ ViewSubResourceService service = new ViewSubResourceService(ApiVersion.Default, type, viewInstanceEntity);
ResultSerializer serializer = service.getResultSerializer(MediaType.TEXT_PLAIN_TYPE);
@@ -190,7 +191,7 @@ public class ViewSubResourceServiceTest extends BaseServiceTest {
Resource.Type type = new Resource.Type("subResource");
// get resource
- ViewSubResourceService service = new ViewSubResourceService(type, viewInstanceEntity);
+ ViewSubResourceService service = new ViewSubResourceService(ApiVersion.Default, type, viewInstanceEntity);
ResultSerializer serializer = service.getResultSerializer(MediaType.APPLICATION_JSON_TYPE);
@@ -219,7 +220,7 @@ public class ViewSubResourceServiceTest extends BaseServiceTest {
* Construct a view sub-resource service.
*/
public TestViewSubResourceService(Resource.Type type, ViewInstanceEntity viewInstanceDefinition) {
- super(type, viewInstanceDefinition);
+ super(ApiVersion.Default, type, viewInstanceDefinition);
}
public Response getSubResource1(@Context HttpHeaders headers, @Context UriInfo ui,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
index b9cc545..250812f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for WorkflowService.
@@ -61,7 +62,7 @@ public class WorkflowServiceTest extends BaseServiceTest {
private String clusterName;
public TestWorkflowService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.Default, clusterName);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommandTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommandTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommandTest.java
index 8f608aa..a63f011 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommandTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommandTest.java
@@ -34,6 +34,7 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.junit.Test;
public class ConfigurationRecommendationCommandTest {
@@ -43,7 +44,7 @@ public class ConfigurationRecommendationCommandTest {
StackAdvisorRunner saRunner = mock(StackAdvisorRunner.class);
File file = mock(File.class);
AmbariMetaInfo metaInfo = mock(AmbariMetaInfo.class);
- ConfigurationRecommendationCommand command = new ConfigurationRecommendationCommand(file, "1w", "script", 1, saRunner, metaInfo);
+ ConfigurationRecommendationCommand command = new ConfigurationRecommendationCommand(ApiVersion.Default, file, "1w", "script", 1, saRunner, metaInfo);
StackAdvisorRequest request = mock(StackAdvisorRequest.class);
Map<String, Set<String>> componentHostGroupMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java
index 67048ad..81c36b3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommandTest.java
@@ -46,6 +46,7 @@ import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequestExc
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorResponse;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
import org.apache.ambari.server.api.services.stackadvisor.commands.StackAdvisorCommand.StackAdvisorData;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.commons.io.FileUtils;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -267,7 +268,7 @@ public class StackAdvisorCommandTest {
class TestStackAdvisorCommand extends StackAdvisorCommand<TestResource> {
public TestStackAdvisorCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript,
int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) {
- super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
+ super(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
}
@Override
[2/3] ambari git commit: AMBARI-21077: Refactor API endpoint to have
a single entry point for an API version (jluniya)
Posted by jl...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java
index b43fc93..3071c5f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java
@@ -27,6 +27,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -44,7 +45,8 @@ public class PreUpgradeCheckService extends BaseService {
*
* @param clusterName cluster name
*/
- public PreUpgradeCheckService(String clusterName) {
+ public PreUpgradeCheckService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java
index ab07bce..a2a970b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
@@ -38,6 +39,10 @@ import org.apache.ambari.server.api.resources.ResourceInstance;
*/
public abstract class PrivilegeService extends BaseService {
+ public PrivilegeService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /privileges/{privilegeID}
* Get a specific privilege.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java
index 8c8fb7f..4bb4b09 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java
@@ -22,8 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
@@ -32,32 +30,50 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
- * Service responsible for preparing recommendations for host-layout and
- * configurations.
+ * Service responsible for preparing recommendations for host-layout and configurations.
*/
-@Path("/stacks/{stackName}/versions/{stackVersion}/recommendations")
public class RecommendationService extends BaseService {
/**
+ * Stack name.
+ */
+ private String m_stackName;
+
+ /**
+ * Stack version.
+ */
+ private String m_stackVersion;
+
+ /**
+ * Constructor.
+ *
+ * @param apiVersion API version
+ * @param stackName Stack name
+ * @param stackVersion Stack version
+ */
+ public RecommendationService(final ApiVersion apiVersion, String stackName, String stackVersion) {
+ super(apiVersion);
+ this.m_stackName = stackName;
+ this.m_stackVersion = stackVersion;
+ }
+
+ /**
* Returns host-layout recommendations for list of hosts and services.
*
* @param body http body
* @param headers http headers
* @param ui uri info
- * @param stackName stack name
- * @param stackVersion stack version
* @return recommendations for host-layout
*/
@POST
@Produces(MediaType.TEXT_PLAIN)
- public Response getRecommendation(String body, @Context HttpHeaders headers, @Context UriInfo ui,
- @PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) {
-
+ public Response getRecommendation(String body, @Context HttpHeaders headers, @Context UriInfo ui) {
return handleRequest(headers, body, ui, Request.Type.POST,
- createRecommendationResource(stackName, stackVersion));
+ createRecommendationResource(m_stackName, m_stackVersion));
}
ResourceInstance createRecommendationResource(String stackName, String stackVersion) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java
index 799ae5f..d6b26fd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java
@@ -33,15 +33,19 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for Remote Cluster resource requests.
*/
-@Path("/remoteclusters")
public class RemoteClustersService extends BaseService {
+ public RemoteClustersService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Get the list of all Remote Clusters
* @param headers
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java
index c88ca14..882d9b3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java
@@ -49,6 +49,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -66,7 +67,8 @@ public class RepositoryService extends BaseService {
*
* @param parentKeyProperties extra properties to be inserted into created resource
*/
- public RepositoryService(Map<Resource.Type, String> parentKeyProperties) {
+ public RepositoryService(ApiVersion apiVersion, Map<Resource.Type, String> parentKeyProperties) {
+ super(apiVersion);
this.parentKeyProperties = parentKeyProperties;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java
index a3e707d..396f209 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -48,9 +49,11 @@ public class RepositoryVersionService extends BaseService {
/**
* Constructor.
*
+ * @param apiVersion API version
* @param parentKeyProperties extra properties to be inserted into created resource
*/
- public RepositoryVersionService(Map<Resource.Type, String> parentKeyProperties) {
+ public RepositoryVersionService(ApiVersion apiVersion, Map<Resource.Type, String> parentKeyProperties) {
+ super(apiVersion);
this.parentKeyProperties = parentKeyProperties;
}
@@ -141,7 +144,7 @@ public class RepositoryVersionService extends BaseService {
final Map<Resource.Type, String> mapIds = new HashMap<>();
mapIds.putAll(parentKeyProperties);
mapIds.put(Resource.Type.RepositoryVersion, repositoryVersionId);
- return new OperatingSystemService(mapIds);
+ return new OperatingSystemService(m_apiVersion, mapIds);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java
index cfcc2d7..d418214 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -48,7 +49,8 @@ public class RequestScheduleService extends BaseService {
* Constructor
* @param m_clusterName
*/
- public RequestScheduleService(String m_clusterName) {
+ public RequestScheduleService(ApiVersion apiVersion, String m_clusterName) {
+ super(apiVersion);
this.m_clusterName = m_clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
index 936b857..4a63ff0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
@@ -34,13 +34,13 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for request resource requests.
*/
-@Path("/requests/")
public class RequestService extends BaseService {
/**
* Parent cluster name.
@@ -48,7 +48,8 @@ public class RequestService extends BaseService {
private String m_clusterName;
- public RequestService() {
+ public RequestService(ApiVersion apiVersion) {
+ super(apiVersion);
}
/**
@@ -56,7 +57,8 @@ public class RequestService extends BaseService {
*
* @param clusterName cluster id
*/
- public RequestService(String clusterName) {
+ public RequestService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
m_clusterName = clusterName;
}
@@ -102,7 +104,7 @@ public class RequestService extends BaseService {
*/
@Path("{requestId}/stages")
public StageService getStageHandler(@PathParam("requestId") String requestId) {
- return new StageService(m_clusterName, requestId);
+ return new StageService(m_apiVersion, m_clusterName, requestId);
}
/**
@@ -110,7 +112,7 @@ public class RequestService extends BaseService {
*/
@Path("{requestId}/tasks")
public TaskService getTaskHandler(@PathParam("requestId") String requestId) {
- return new TaskService(m_clusterName, requestId, null);
+ return new TaskService(m_apiVersion, m_clusterName, requestId, null);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java
index f7365a1..8f6985c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -39,15 +40,14 @@ import org.apache.ambari.server.controller.spi.Resource;
* The result sets returned by this service are either the full set of available authorizations or
* those related to a particular permission.
*/
-@Path("/authorizations/")
public class RoleAuthorizationService extends BaseService {
private String permissionId;
/**
* Constructs a new RoleAuthorizationService that is not linked to any role (or permission)
*/
- public RoleAuthorizationService() {
- this(null);
+ public RoleAuthorizationService(ApiVersion apiVersion) {
+ this(apiVersion, null);
}
/**
@@ -55,7 +55,8 @@ public class RoleAuthorizationService extends BaseService {
*
* @param permissionId the permission id of a permission (or role)
*/
- public RoleAuthorizationService(String permissionId) {
+ public RoleAuthorizationService(ApiVersion apiVersion, String permissionId) {
+ super(apiVersion);
this.permissionId = permissionId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
index ce9240c..96ca167 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
@@ -32,11 +32,15 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
-@Path("/services/")
public class RootServiceService extends BaseService {
-
+
+ public RootServiceService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
@GET
@Produces("text/plain")
public Response getServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java
index 43eabdc..6a76cf8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
public class ServiceConfigVersionService extends BaseService {
@@ -37,7 +38,8 @@ public class ServiceConfigVersionService extends BaseService {
*/
private String m_clusterName;
- public ServiceConfigVersionService(String m_clusterName) {
+ public ServiceConfigVersionService(ApiVersion apiVersion, String m_clusterName) {
+ super(apiVersion);
this.m_clusterName = m_clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
index 52871f2..adbd31d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -50,7 +51,8 @@ public class ServiceService extends BaseService {
*
* @param clusterName cluster id
*/
- public ServiceService(String clusterName) {
+ public ServiceService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
m_clusterName = clusterName;
}
@@ -187,7 +189,7 @@ public class ServiceService extends BaseService {
@Path("{serviceName}/components")
public ComponentService getComponentHandler(@PathParam("serviceName") String serviceName) {
- return new ComponentService(m_clusterName, serviceName);
+ return new ComponentService(m_apiVersion, m_clusterName, serviceName);
}
/**
@@ -196,7 +198,7 @@ public class ServiceService extends BaseService {
@Path("{serviceName}/alerts")
public AlertService getAlertHandler(
@PathParam("serviceName") String serviceName) {
- return new AlertService(m_clusterName, serviceName, null);
+ return new AlertService(m_apiVersion, m_clusterName, serviceName, null);
}
/**
@@ -379,7 +381,7 @@ public class ServiceService extends BaseService {
@Context javax.ws.rs.core.Request request,
@PathParam("serviceName") String serviceName) {
- return new AlertHistoryService(m_clusterName, serviceName, null);
+ return new AlertHistoryService(m_apiVersion, m_clusterName, serviceName, null);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
index e186be2..57bce21 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
@@ -33,19 +33,19 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for setting resource requests.
*/
-@Path("/settings/")
public class SettingService extends BaseService {
/**
* Construct a SettingService.
*/
- public SettingService() {
-
+ public SettingService(ApiVersion apiVersion) {
+ super(apiVersion);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java
index 86bacf1..990bdd0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java
@@ -32,14 +32,18 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service for stacks management.
*/
-@Path("/stacks/")
public class StacksService extends BaseService {
+ public StacksService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
@GET
@Produces("text/plain")
public Response getStacks(String body, @Context HttpHeaders headers, @Context UriInfo ui) {
@@ -345,7 +349,33 @@ public class StacksService extends BaseService {
final Map<Resource.Type, String> stackProperties = new HashMap<>();
stackProperties.put(Resource.Type.Stack, stackName);
stackProperties.put(Resource.Type.StackVersion, stackVersion);
- return new OperatingSystemService(stackProperties);
+ return new OperatingSystemService(m_apiVersion, stackProperties);
+ }
+
+ /**
+ * Returns host-layout recommendations for list of hosts and services.
+ *
+ * @param stackName stack name
+ * @param stackVersion stack version
+ * @return recommendations for host-layout
+ */
+ @Path("{stackName}/versions/{stackVersion}/recommendations")
+ public RecommendationService getRecommendationHandler(@PathParam("stackName") String stackName,
+ @PathParam("stackVersion") String stackVersion) {
+ return new RecommendationService(m_apiVersion, stackName, stackVersion);
+ }
+
+ /**
+ * Returns validation of host-layout.
+ *
+ * @param stackName stack name
+ * @param stackVersion stack version
+ * @return validation items if any
+ */
+ @Path("{stackName}/versions/{stackVersion}/validations")
+ public ValidationService getValidationHandler(@PathParam("stackName") String stackName,
+ @PathParam("stackVersion") String stackVersion) {
+ return new ValidationService(m_apiVersion, stackName, stackVersion);
}
/**
@@ -360,7 +390,7 @@ public class StacksService extends BaseService {
final Map<Resource.Type, String> stackProperties = new HashMap<>();
stackProperties.put(Resource.Type.Stack, stackName);
stackProperties.put(Resource.Type.StackVersion, stackVersion);
- return new RepositoryVersionService(stackProperties);
+ return new RepositoryVersionService(m_apiVersion, stackProperties);
}
/**
@@ -377,7 +407,7 @@ public class StacksService extends BaseService {
final Map<Resource.Type, String> stackProperties = new HashMap<>();
stackProperties.put(Resource.Type.Stack, stackName);
stackProperties.put(Resource.Type.StackVersion, stackVersion);
- return new CompatibleRepositoryVersionService(stackProperties);
+ return new CompatibleRepositoryVersionService(m_apiVersion, stackProperties);
}
ResourceInstance createStackServiceComponentResource(
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java
index 6dc9010..428f8ae 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
@@ -60,7 +61,8 @@ public class StageService extends BaseService {
* @param clusterName cluster id
* @param requestId request id
*/
- public StageService(String clusterName, String requestId) {
+ public StageService(ApiVersion apiVersion, String clusterName, String requestId) {
+ super(apiVersion);
m_clusterName = clusterName;
m_requestId = requestId;
}
@@ -110,7 +112,7 @@ public class StageService extends BaseService {
*/
@Path("{stageId}/tasks")
public TaskService getTaskHandler(@PathParam("stageId") String stageId) {
- return new TaskService(m_clusterName, m_requestId, stageId);
+ return new TaskService(m_apiVersion, m_clusterName, m_requestId, stageId);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java
index d022d73..abbd715 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java
@@ -33,14 +33,18 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* DR target cluster service.
*/
-@Path("/targets/")
public class TargetClusterService extends BaseService {
+ public TargetClusterService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /targets/{targetName}
* Get a specific target.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java
index af7f378..9a5d9be 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -51,7 +52,8 @@ public class TaskAttemptService extends BaseService {
* @param jobId
* job id
*/
- public TaskAttemptService(String clusterName, String workflowId, String jobId) {
+ public TaskAttemptService(ApiVersion apiVersion, String clusterName, String workflowId, String jobId) {
+ super(apiVersion);
this.clusterName = clusterName;
this.workflowId = workflowId;
this.jobId = jobId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java
index acc4eef..8a9749e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -58,7 +59,8 @@ public class TaskService extends BaseService {
* @param requestId request id
* @param stageId stage id
*/
- public TaskService(String clusterName, String requestId, String stageId) {
+ public TaskService(ApiVersion apiVersion, String clusterName, String requestId, String stageId) {
+ super(apiVersion);
m_clusterName = clusterName;
m_requestId = requestId;
m_stageId = stageId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java
index a3866be..4bd77bf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -40,7 +41,8 @@ public class UpgradeGroupService extends BaseService {
private String m_clusterName = null;
private String m_upgradeId = null;
- UpgradeGroupService(String clusterName, String upgradeId) {
+ UpgradeGroupService(ApiVersion apiVersion, String clusterName, String upgradeId) {
+ super(apiVersion);
m_clusterName = clusterName;
m_upgradeId = upgradeId;
}
@@ -68,7 +70,7 @@ public class UpgradeGroupService extends BaseService {
public UpgradeItemService getUpgradeItemService(
@Context HttpHeaders headers,
@PathParam("upgradeGroupId") Long groupId) {
- return new UpgradeItemService(m_clusterName, m_upgradeId, groupId.toString());
+ return new UpgradeItemService(m_apiVersion, m_clusterName, m_upgradeId, groupId.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java
index 6d6c5e3..61c545a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -42,7 +43,8 @@ public class UpgradeItemService extends BaseService {
private String m_upgradeId = null;
private String m_upgradeGroupId = null;
- UpgradeItemService(String clusterName, String upgradeId, String upgradeGroupId) {
+ UpgradeItemService(ApiVersion apiVersion, String clusterName, String upgradeId, String upgradeGroupId) {
+ super(apiVersion);
m_clusterName = clusterName;
m_upgradeId = upgradeId;
m_upgradeGroupId = upgradeGroupId;
@@ -94,7 +96,7 @@ public class UpgradeItemService extends BaseService {
@Context HttpHeaders headers,
@Context UriInfo ui,
@PathParam("upgradeItemId") Long id) {
- return new TaskService(m_clusterName, m_upgradeId, id.toString());
+ return new TaskService(m_apiVersion, m_clusterName, m_upgradeId, id.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java
index dc54a0b..bb90d8a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -46,7 +47,8 @@ public class UpgradeService extends BaseService {
*
* @param clusterName the cluster name (not {@code null}).
*/
- UpgradeService(String clusterName) {
+ UpgradeService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
m_clusterName = clusterName;
}
@@ -90,7 +92,7 @@ public class UpgradeService extends BaseService {
*/
@Path("{upgradeId}/upgrade_groups")
public UpgradeGroupService getUpgradeGroupHandler(@PathParam("upgradeId") String upgradeId) {
- return new UpgradeGroupService(m_clusterName, upgradeId);
+ return new UpgradeGroupService(m_apiVersion, m_clusterName, upgradeId);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java
index 36d0074..7e6c964 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
@@ -45,7 +46,8 @@ public class UpgradeSummaryService extends BaseService {
*
* @param clusterName the cluster name (not {@code null}).
*/
- UpgradeSummaryService(String clusterName) {
+ UpgradeSummaryService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
m_clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java
index 26d9c1d..910777c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.commons.lang.StringUtils;
@@ -53,7 +54,8 @@ public class UserAuthorizationService extends BaseService {
*
* @param username the username of the user to link thi UserAuthorizationService to
*/
- public UserAuthorizationService(String username) {
+ public UserAuthorizationService(ApiVersion apiVersion, String username) {
+ super(apiVersion);
this.username = username;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java
index 7df806d..30a791f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.api.services;
+
import java.util.HashMap;
import java.util.Map;
@@ -27,6 +28,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.commons.lang.StringUtils;
/**
@@ -36,7 +38,8 @@ public class UserPrivilegeService extends PrivilegeService {
private final String userName;
- public UserPrivilegeService(String userName) {
+ public UserPrivilegeService(ApiVersion apiVersion, String userName) {
+ super(apiVersion);
this.userName = userName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserService.java
index 31f3a8c..9c7c9bc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserService.java
@@ -32,14 +32,18 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for user requests.
*/
-@Path("/users/")
public class UserService extends BaseService {
+ public UserService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Gets all users.
* Handles: GET /users requests.
@@ -135,7 +139,7 @@ public class UserService extends BaseService {
public PrivilegeService getPrivilegeService(@Context javax.ws.rs.core.Request request,
@PathParam ("userName") String userName) {
- return new UserPrivilegeService(userName);
+ return new UserPrivilegeService(m_apiVersion, userName);
}
/**
@@ -145,7 +149,7 @@ public class UserService extends BaseService {
public ActiveWidgetLayoutService getWidgetLayoutService(@Context javax.ws.rs.core.Request request,
@PathParam ("userName") String userName) {
- return new ActiveWidgetLayoutService(userName);
+ return new ActiveWidgetLayoutService(m_apiVersion, userName);
}
/**
@@ -158,7 +162,7 @@ public class UserService extends BaseService {
@Path("{userName}/authorizations")
public UserAuthorizationService getUserAuthorizations(
@Context javax.ws.rs.core.Request request, @PathParam("userName") String username) {
- return new UserAuthorizationService(username);
+ return new UserAuthorizationService(m_apiVersion, username);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/V1Service.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/V1Service.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/V1Service.java
new file mode 100644
index 0000000..9f8839c
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/V1Service.java
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import javax.ws.rs.Path;
+
+/**
+ * Entry point for v1 API version
+ */
+@Path("/{apiVersion : v1}")
+public class V1Service extends AbstractVersionService {
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/V2Service.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/V2Service.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/V2Service.java
new file mode 100644
index 0000000..b6ba06d
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/V2Service.java
@@ -0,0 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import javax.ws.rs.Path;
+
+/**
+ * Entry point for v2 API version
+ */
+@Path("/{apiVersion : v2}")
+public class V2Service extends AbstractVersionService {
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
index b5b4a42..3bfdbc0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
@@ -22,8 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
@@ -32,31 +30,50 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for validation of host-layout and configurations.
*/
-@Path("/stacks/{stackName}/versions/{stackVersion}/validations")
public class ValidationService extends BaseService {
/**
+ * Stack name.
+ */
+ private String m_stackName;
+
+ /**
+ * Stack version.
+ */
+ private String m_stackVersion;
+
+ /**
+ * Constructor.
+ *
+ * @param apiVersion API version
+ * @param stackName Stack name
+ * @param stackVersion Stack version
+ */
+ public ValidationService(final ApiVersion apiVersion, String stackName, String stackVersion) {
+ super(apiVersion);
+ this.m_stackName = stackName;
+ this.m_stackVersion = stackVersion;
+ }
+
+ /**
* Returns validation of host-layout.
*
* @param body http body
* @param headers http headers
* @param ui uri info
- * @param stackName stack name
- * @param stackVersion stack version
* @return validation items if any
*/
@POST
@Produces(MediaType.TEXT_PLAIN)
- public Response getValidation(String body, @Context HttpHeaders headers, @Context UriInfo ui,
- @PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) {
-
+ public Response getValidation(String body, @Context HttpHeaders headers, @Context UriInfo ui) {
return handleRequest(headers, body, ui, Request.Type.POST,
- createValidationResource(stackName, stackVersion));
+ createValidationResource(m_stackName, m_stackVersion));
}
ResourceInstance createValidationResource(String stackName, String stackVersion) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
index af1eb07..0573278 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
@@ -35,15 +35,19 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.internal.VersionDefinitionResourceProvider;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.commons.codec.binary.Base64;
import com.google.gson.JsonObject;
-@Path("/version_definitions/")
public class VersionDefinitionService extends BaseService {
+ public VersionDefinitionService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
@GET
@Produces(MediaType.TEXT_PLAIN)
public Response getServices(@Context HttpHeaders headers, @Context UriInfo ui) {
@@ -72,7 +76,7 @@ public class VersionDefinitionService extends BaseService {
public OperatingSystemService getOperatingSystemsHandler(@PathParam("versionNumber") String versionNumber) {
final Map<Resource.Type, String> mapIds = new HashMap<>();
mapIds.put(Resource.Type.VersionDefinition, versionNumber);
- return new OperatingSystemService(mapIds);
+ return new OperatingSystemService(m_apiVersion, mapIds);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewDataMigrationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewDataMigrationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewDataMigrationService.java
index 2a9aa64..8303edf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewDataMigrationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewDataMigrationService.java
@@ -23,6 +23,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.view.ViewDataMigrationUtility;
import org.apache.ambari.server.view.ViewRegistry;
@@ -71,7 +72,8 @@ public class ViewDataMigrationService extends BaseService {
* @param viewVersion the current view version
* @param instanceName the current view instance name
*/
- public ViewDataMigrationService(String viewName, String viewVersion, String instanceName) {
+ public ViewDataMigrationService(ApiVersion apiVersion, String viewName, String viewVersion, String instanceName) {
+ super(apiVersion);
this.viewName = viewName;
this.viewVersion = viewVersion;
this.instanceName = instanceName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
index 515d4ac..b301fd7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewEntity;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
@@ -69,7 +70,8 @@ public class ViewExternalSubResourceService extends BaseService {
// ----- Constructors ------------------------------------------------------
- public ViewExternalSubResourceService(Resource.Type type, ViewInstanceEntity viewInstanceDefinition) {
+ public ViewExternalSubResourceService(ApiVersion apiVersion, Resource.Type type, ViewInstanceEntity viewInstanceDefinition) {
+ super(apiVersion);
ViewEntity viewEntity = viewInstanceDefinition.getViewEntity();
this.type = type;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
index b10738d..2a3731e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
@@ -35,6 +35,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.security.authorization.AuthorizationException;
@@ -67,7 +68,8 @@ public class ViewInstanceService extends BaseService {
* @param viewName the view id
* @param version the version
*/
- public ViewInstanceService(String viewName, String version) {
+ public ViewInstanceService(ApiVersion apiVersion, String viewName, String version) {
+ super(apiVersion);
this.viewName = viewName;
this.version = version;
@@ -238,13 +240,13 @@ public class ViewInstanceService extends BaseService {
hasPermission(Request.Type.valueOf(request.getMethod()), instanceName);
- return new ViewPrivilegeService(viewName, version, instanceName);
+ return new ViewPrivilegeService(m_apiVersion, viewName, version, instanceName);
}
@Path("{instanceName}/migrate")
public ViewDataMigrationService migrateData(@Context javax.ws.rs.core.Request request,
@PathParam ("instanceName") String instanceName) {
- return new ViewDataMigrationService(viewName, version, instanceName);
+ return new ViewDataMigrationService(m_apiVersion, viewName, version, instanceName);
}
// ----- helper methods ----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPermissionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPermissionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPermissionService.java
index 86bfa14..04bbdcc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPermissionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPermissionService.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
@@ -61,7 +62,8 @@ public class ViewPermissionService extends BaseService {
* @param viewName the view id
* @param version the version
*/
- public ViewPermissionService(String viewName, String version) {
+ public ViewPermissionService(ApiVersion apiVersion, String viewName, String version) {
+ super(apiVersion);
this.viewName = viewName;
this.version = version;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPrivilegeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPrivilegeService.java
index 34dd4c2..8e64388 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPrivilegeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPrivilegeService.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -33,7 +34,8 @@ public class ViewPrivilegeService extends PrivilegeService {
private final String viewVersion;
private final String instanceName;
- public ViewPrivilegeService(String viewName, String viewVersion, String instanceName) {
+ public ViewPrivilegeService(ApiVersion apiVersion, String viewName, String viewVersion, String instanceName) {
+ super(apiVersion);
this.viewName = viewName;
this.viewVersion = viewVersion;
this.instanceName = instanceName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewService.java
index 17a9f34..8e16fa6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewService.java
@@ -33,15 +33,19 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for view resource requests.
*/
-@Path("/views/")
public class ViewService extends BaseService {
+ public ViewService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /views/{viewID}
* Get a specific view.
@@ -142,7 +146,7 @@ public class ViewService extends BaseService {
*/
@Path("{viewName}/versions")
public ViewVersionService getInstanceHandler(@PathParam("viewName") String viewName) {
- return new ViewVersionService(viewName);
+ return new ViewVersionService(m_apiVersion, viewName);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewSubResourceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewSubResourceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewSubResourceService.java
index 6e00d10..2532a28 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewSubResourceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewSubResourceService.java
@@ -26,6 +26,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewEntity;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
@@ -61,7 +62,8 @@ public class ViewSubResourceService extends BaseService implements ViewResourceH
/**
* Construct a view sub-resource service.
*/
- public ViewSubResourceService(Resource.Type type, ViewInstanceEntity viewInstanceDefinition) {
+ public ViewSubResourceService(ApiVersion apiVersion, Resource.Type type, ViewInstanceEntity viewInstanceDefinition) {
+ super(apiVersion);
ViewEntity viewEntity = viewInstanceDefinition.getViewEntity();
this.type = type;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java
index fa0be7d..8eaf496 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.security.authorization.AuthorizationException;
@@ -42,9 +43,12 @@ import com.google.common.base.Optional;
/**
* Service responsible for view resource requests.
*/
-@Path("/view/urls")
public class ViewUrlsService extends BaseService {
+ public ViewUrlsService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Get the list of all registered view URLs
* @param headers
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewVersionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewVersionService.java
index c10bf00..72b1d6e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewVersionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewVersionService.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
@@ -55,7 +56,8 @@ public class ViewVersionService extends BaseService {
*
* @param viewName the view name
*/
- public ViewVersionService(String viewName) {
+ public ViewVersionService(ApiVersion apiVersion, String viewName) {
+ super(apiVersion);
this.viewName = viewName;
}
@@ -164,7 +166,7 @@ public class ViewVersionService extends BaseService {
@Path("{version}/instances")
public ViewInstanceService getInstanceHandler(@PathParam("version") String version) {
- return new ViewInstanceService(viewName, version);
+ return new ViewInstanceService(m_apiVersion, viewName, version);
}
/**
@@ -177,7 +179,7 @@ public class ViewVersionService extends BaseService {
@Path("{version}/permissions")
public ViewPermissionService getPermissionHandler(@PathParam("version") String version) {
- return new ViewPermissionService(viewName, version);
+ return new ViewPermissionService(m_apiVersion, viewName, version);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
index 4886165..cccab69 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -42,7 +43,8 @@ public class WidgetLayoutService extends BaseService {
private final String clusterName;
- public WidgetLayoutService(String clusterName) {
+ public WidgetLayoutService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java
index e0fe801..1e7777b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -42,7 +43,8 @@ public class WidgetService extends BaseService {
private final String clusterName;
- public WidgetService(String clusterName) {
+ public WidgetService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java
index abffedd..31faf96 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -45,7 +46,8 @@ public class WorkflowService extends BaseService {
* @param clusterName
* cluster id
*/
- public WorkflowService(String clusterName) {
+ public WorkflowService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
@@ -90,7 +92,7 @@ public class WorkflowService extends BaseService {
*/
@Path("{workflowId}/jobs")
public JobService getJobHandler(@PathParam("workflowId") String workflowId) {
- return new JobService(clusterName, workflowId);
+ return new JobService(m_apiVersion, clusterName, workflowId);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java
index 05e7598..7ff2112 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java
@@ -31,6 +31,7 @@ import org.apache.ambari.server.api.services.stackadvisor.commands.Configuration
import org.apache.ambari.server.api.services.stackadvisor.commands.StackAdvisorCommand;
import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse;
import org.apache.ambari.server.api.services.stackadvisor.validations.ValidationResponse;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.configuration.Configuration;
import com.google.inject.Inject;
@@ -82,10 +83,10 @@ public class StackAdvisorHelper {
StackAdvisorRequestType requestType) throws StackAdvisorException {
StackAdvisorCommand<ValidationResponse> command;
if (requestType == StackAdvisorRequestType.HOST_GROUPS) {
- command = new ComponentLayoutValidationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
+ command = new ComponentLayoutValidationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
requestId, saRunner, metaInfo);
} else if (requestType == StackAdvisorRequestType.CONFIGURATIONS) {
- command = new ConfigurationValidationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
+ command = new ConfigurationValidationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
requestId, saRunner, metaInfo);
} else {
throw new StackAdvisorRequestException(String.format("Unsupported request type, type=%s",
@@ -117,13 +118,13 @@ public class StackAdvisorHelper {
StackAdvisorRequestType requestType) throws StackAdvisorException {
StackAdvisorCommand<RecommendationResponse> command;
if (requestType == StackAdvisorRequestType.HOST_GROUPS) {
- command = new ComponentLayoutRecommendationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
+ command = new ComponentLayoutRecommendationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
requestId, saRunner, metaInfo);
} else if (requestType == StackAdvisorRequestType.CONFIGURATIONS) {
- command = new ConfigurationRecommendationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
+ command = new ConfigurationRecommendationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
requestId, saRunner, metaInfo);
} else if (requestType == StackAdvisorRequestType.CONFIGURATION_DEPENDENCIES) {
- command = new ConfigurationDependenciesRecommendationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
+ command = new ConfigurationDependenciesRecommendationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript,
requestId, saRunner, metaInfo);
} else {
throw new StackAdvisorRequestException(String.format("Unsupported request type, type=%s",
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutRecommendationCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutRecommendationCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutRecommendationCommand.java
index 87725dc..35f7e0d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutRecommendationCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutRecommendationCommand.java
@@ -25,6 +25,7 @@ import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorException;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* {@link StackAdvisorCommand} implementation for component-layout
@@ -33,13 +34,13 @@ import org.apache.ambari.server.api.services.stackadvisor.recommendations.Recomm
public class ComponentLayoutRecommendationCommand extends
StackAdvisorCommand<RecommendationResponse> {
- public ComponentLayoutRecommendationCommand(File recommendationsDir,
+ public ComponentLayoutRecommendationCommand(ApiVersion apiVersion, File recommendationsDir,
String recommendationsArtifactsLifetime,
String stackAdvisorScript,
int requestId,
StackAdvisorRunner saRunner,
AmbariMetaInfo metaInfo) {
- super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
+ super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java
index 310046f..b93cd81 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ComponentLayoutValidationCommand.java
@@ -25,15 +25,16 @@ import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorException;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
import org.apache.ambari.server.api.services.stackadvisor.validations.ValidationResponse;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* {@link StackAdvisorCommand} implementation for component-layout validation.
*/
public class ComponentLayoutValidationCommand extends StackAdvisorCommand<ValidationResponse> {
- public ComponentLayoutValidationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript,
+ public ComponentLayoutValidationCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript,
int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) {
- super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
+ super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationDependenciesRecommendationCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationDependenciesRecommendationCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationDependenciesRecommendationCommand.java
index 6a2adfa..b765689 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationDependenciesRecommendationCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationDependenciesRecommendationCommand.java
@@ -32,6 +32,7 @@ import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorException;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* {@link StackAdvisorCommand} implementation for
@@ -40,9 +41,9 @@ import org.apache.ambari.server.api.services.stackadvisor.recommendations.Recomm
public class ConfigurationDependenciesRecommendationCommand extends
StackAdvisorCommand<RecommendationResponse> {
- public ConfigurationDependenciesRecommendationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId,
+ public ConfigurationDependenciesRecommendationCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId,
StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) {
- super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
+ super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
index 6eaf19e..70b14fd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationRecommendationCommand.java
@@ -32,6 +32,7 @@ import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorException;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* {@link org.apache.ambari.server.api.services.stackadvisor.commands.StackAdvisorCommand} implementation for
@@ -40,9 +41,9 @@ import org.apache.ambari.server.api.services.stackadvisor.recommendations.Recomm
public class ConfigurationRecommendationCommand extends
StackAdvisorCommand<RecommendationResponse> {
- public ConfigurationRecommendationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId,
+ public ConfigurationRecommendationCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId,
StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) {
- super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
+ super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationValidationCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationValidationCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationValidationCommand.java
index 60132a1..a5717b9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationValidationCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/ConfigurationValidationCommand.java
@@ -25,15 +25,16 @@ import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorException;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
import org.apache.ambari.server.api.services.stackadvisor.validations.ValidationResponse;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* {@link StackAdvisorCommand} implementation for configuration validation.
*/
public class ConfigurationValidationCommand extends StackAdvisorCommand<ValidationResponse> {
- public ConfigurationValidationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript,
+ public ConfigurationValidationCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript,
int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) {
- super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
+ super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
index 74a2cf2..85fc13f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
@@ -45,6 +45,7 @@ import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorException;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorResponse;
import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.utils.DateUtils;
@@ -109,8 +110,9 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend
private final AmbariMetaInfo metaInfo;
@SuppressWarnings("unchecked")
- public StackAdvisorCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId,
+ public StackAdvisorCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId,
StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) {
+ super(apiVersion);
this.type = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass())
.getActualTypeArguments()[0];
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/util/ApiVersion.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/util/ApiVersion.java b/ambari-server/src/main/java/org/apache/ambari/server/api/util/ApiVersion.java
new file mode 100644
index 0000000..f66f32e
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/util/ApiVersion.java
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.util;
+
+import java.util.EnumSet;
+
+public enum ApiVersion {
+ v1,
+ v2;
+
+ public static ApiVersion Default = v1;
+ public static EnumSet<ApiVersion> all = EnumSet.allOf(ApiVersion.class);
+ public static EnumSet<ApiVersion> v1Only = EnumSet.of(v1);
+ public static EnumSet<ApiVersion> v2Only = EnumSet.of(v2);
+ public static EnumSet<ApiVersion> v2Plus = EnumSet.complementOf(v1Only);
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
index 96bab85..b6b481f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
@@ -29,6 +29,7 @@ import org.apache.ambari.server.actionmanager.ActionManager;
import org.apache.ambari.server.agent.ExecutionCommand;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.api.services.LoggingService;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.internal.DeleteStatusMetaData;
import org.apache.ambari.server.controller.internal.RequestStageContainer;
import org.apache.ambari.server.controller.logging.LoggingSearchPropertyProvider;
@@ -878,11 +879,12 @@ public interface AmbariManagementController {
/**
* Gets the LoggingService instance from the dependency injection framework.
*
+ * @param apiVersion API version
* @param clusterName the cluster name associated with this LoggingService instance
*
* @return an instance of LoggingService associated with the specified cluster.
*/
- LoggingService getLoggingService(String clusterName);
+ LoggingService getLoggingService(ApiVersion apiVersion, String clusterName);
/**
[3/3] ambari git commit: AMBARI-21077: Refactor API endpoint to have
a single entry point for an API version (jluniya)
Posted by jl...@apache.org.
AMBARI-21077: Refactor API endpoint to have a single entry point for an API version (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea3dc9a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea3dc9a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea3dc9a0
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: ea3dc9a0dd0c952e8465374e3b26a50cc2d32d19
Parents: d35ea35
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Fri May 19 13:33:28 2017 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Fri May 19 13:33:28 2017 -0700
----------------------------------------------------------------------
.../ambari/server/api/rest/HealthCheck.java | 2 -
.../api/rest/KdcServerReachabilityCheck.java | 1 -
.../api/services/AbstractVersionService.java | 352 +++++++++++++++++++
.../server/api/services/ActionService.java | 7 +-
.../api/services/ActiveWidgetLayoutService.java | 4 +-
.../api/services/AlertDefinitionService.java | 4 +-
.../server/api/services/AlertGroupService.java | 4 +-
.../api/services/AlertHistoryService.java | 4 +-
.../server/api/services/AlertNoticeService.java | 4 +-
.../server/api/services/AlertService.java | 4 +-
.../server/api/services/AlertTargetService.java | 6 +-
.../api/services/AmbariPrivilegeService.java | 7 +-
.../ambari/server/api/services/BaseService.java | 17 +
.../server/api/services/BlueprintService.java | 6 +-
.../ClusterKerberosDescriptorService.java | 4 +-
.../api/services/ClusterPrivilegeService.java | 4 +-
.../server/api/services/ClusterService.java | 58 +--
.../services/ClusterStackVersionService.java | 6 +-
.../CompatibleRepositoryVersionService.java | 6 +-
.../server/api/services/ComponentService.java | 4 +-
.../server/api/services/ConfigGroupService.java | 4 +-
.../api/services/ConfigurationService.java | 6 +-
.../server/api/services/CredentialService.java | 4 +-
.../api/services/ExtensionLinksService.java | 6 +-
.../server/api/services/ExtensionsService.java | 6 +-
.../ambari/server/api/services/FeedService.java | 8 +-
.../api/services/GroupPrivilegeService.java | 4 +-
.../server/api/services/GroupService.java | 10 +-
.../api/services/HostComponentService.java | 4 +-
.../services/HostKerberosIdentityService.java | 4 +-
.../ambari/server/api/services/HostService.java | 18 +-
.../api/services/HostStackVersionService.java | 6 +-
.../server/api/services/InstanceService.java | 8 +-
.../ambari/server/api/services/JobService.java | 6 +-
.../api/services/KerberosDescriptorService.java | 6 +-
.../ambari/server/api/services/KeyService.java | 1 -
.../api/services/LdapSyncEventService.java | 6 +-
.../server/api/services/LoggingService.java | 8 +-
.../server/api/services/LogoutService.java | 2 -
.../server/api/services/MemberService.java | 4 +-
.../api/services/OperatingSystemService.java | 6 +-
.../server/api/services/PermissionService.java | 8 +-
.../api/services/PreUpgradeCheckService.java | 4 +-
.../server/api/services/PrivilegeService.java | 5 +
.../api/services/RecommendationService.java | 38 +-
.../api/services/RemoteClustersService.java | 6 +-
.../server/api/services/RepositoryService.java | 4 +-
.../api/services/RepositoryVersionService.java | 7 +-
.../api/services/RequestScheduleService.java | 4 +-
.../server/api/services/RequestService.java | 12 +-
.../api/services/RoleAuthorizationService.java | 9 +-
.../server/api/services/RootServiceService.java | 8 +-
.../services/ServiceConfigVersionService.java | 4 +-
.../server/api/services/ServiceService.java | 10 +-
.../server/api/services/SettingService.java | 6 +-
.../server/api/services/StacksService.java | 38 +-
.../server/api/services/StageService.java | 6 +-
.../api/services/TargetClusterService.java | 6 +-
.../server/api/services/TaskAttemptService.java | 4 +-
.../ambari/server/api/services/TaskService.java | 4 +-
.../api/services/UpgradeGroupService.java | 6 +-
.../server/api/services/UpgradeItemService.java | 6 +-
.../server/api/services/UpgradeService.java | 6 +-
.../api/services/UpgradeSummaryService.java | 4 +-
.../api/services/UserAuthorizationService.java | 4 +-
.../api/services/UserPrivilegeService.java | 5 +-
.../ambari/server/api/services/UserService.java | 12 +-
.../ambari/server/api/services/V1Service.java | 28 ++
.../ambari/server/api/services/V2Service.java | 28 ++
.../server/api/services/ValidationService.java | 35 +-
.../api/services/VersionDefinitionService.java | 8 +-
.../api/services/ViewDataMigrationService.java | 4 +-
.../ViewExternalSubResourceService.java | 4 +-
.../api/services/ViewInstanceService.java | 8 +-
.../api/services/ViewPermissionService.java | 4 +-
.../api/services/ViewPrivilegeService.java | 4 +-
.../ambari/server/api/services/ViewService.java | 8 +-
.../api/services/ViewSubResourceService.java | 4 +-
.../server/api/services/ViewUrlsService.java | 6 +-
.../server/api/services/ViewVersionService.java | 8 +-
.../api/services/WidgetLayoutService.java | 4 +-
.../server/api/services/WidgetService.java | 4 +-
.../server/api/services/WorkflowService.java | 6 +-
.../stackadvisor/StackAdvisorHelper.java | 11 +-
.../ComponentLayoutRecommendationCommand.java | 5 +-
.../ComponentLayoutValidationCommand.java | 5 +-
...rationDependenciesRecommendationCommand.java | 5 +-
.../ConfigurationRecommendationCommand.java | 5 +-
.../ConfigurationValidationCommand.java | 5 +-
.../commands/StackAdvisorCommand.java | 4 +-
.../ambari/server/api/util/ApiVersion.java | 32 ++
.../controller/AmbariManagementController.java | 4 +-
.../AmbariManagementControllerImpl.java | 11 +-
.../ambari/server/controller/AmbariServer.java | 23 +-
.../apache/ambari/server/view/ViewRegistry.java | 5 +-
.../server/api/services/ActionServiceTest.java | 2 +
.../services/ActiveWidgetLayoutServiceTest.java | 3 +-
.../api/services/BlueprintServiceTest.java | 2 +
.../ClusterKerberosDescriptorServiceTest.java | 3 +-
.../services/ClusterPrivilegeServiceTest.java | 3 +-
.../server/api/services/ClusterServiceTest.java | 3 +-
.../ClusterStackVersionServiceTest.java | 3 +-
.../api/services/ComponentServiceTest.java | 3 +-
.../api/services/ConfigGroupServiceTest.java | 3 +-
.../api/services/ConfigurationServiceTest.java | 4 +-
.../api/services/CredentialServiceTest.java | 3 +-
.../api/services/ExtensionsServiceTest.java | 2 +
.../server/api/services/FeedServiceTest.java | 3 +-
.../api/services/GroupPrivilegeServiceTest.java | 3 +-
.../server/api/services/GroupServiceTest.java | 5 +
.../api/services/HostComponentServiceTest.java | 3 +-
.../HostKerberosIdentityServiceTest.java | 3 +-
.../server/api/services/HostServiceTest.java | 3 +-
.../services/HostStackVersionServiceTest.java | 3 +-
.../api/services/InstanceServiceTest.java | 3 +-
.../server/api/services/JobServiceTest.java | 3 +-
.../api/services/LdapSyncEventServiceTest.java | 3 +-
.../server/api/services/LoggingServiceTest.java | 3 +-
.../server/api/services/MemberServiceTest.java | 3 +-
.../api/services/PermissionServiceTest.java | 3 +-
.../services/PreUpgradeCheckServiceTest.java | 3 +-
.../api/services/PrivilegeServiceTest.java | 3 +-
.../api/services/RecommendationServiceTest.java | 7 +-
.../api/services/RepositoryServiceTest.java | 3 +-
.../services/RoleAuthorizationServiceTest.java | 3 +-
.../api/services/RootServiceServiceTest.java | 2 +
.../server/api/services/ServiceServiceTest.java | 5 +-
.../server/api/services/SettingServiceTest.java | 2 +
.../server/api/services/StacksServiceTest.java | 2 +
.../api/services/TargetClusterServiceTest.java | 3 +-
.../api/services/TaskAttemptServiceTest.java | 3 +-
.../api/services/UpgradeItemServiceTest.java | 3 +-
.../services/UserAuthorizationServiceTest.java | 5 +-
.../api/services/UserPrivilegeServiceTest.java | 5 +-
.../api/services/ValidationServiceTest.java | 7 +-
.../services/ViewDataMigrationServiceTest.java | 5 +-
.../ViewExternalSubResourceServiceTest.java | 3 +-
.../api/services/ViewPermissionServiceTest.java | 3 +-
.../services/ViewSubResourceServiceTest.java | 7 +-
.../api/services/WorkflowServiceTest.java | 3 +-
.../ConfigurationRecommendationCommandTest.java | 3 +-
.../commands/StackAdvisorCommandTest.java | 3 +-
142 files changed, 1035 insertions(+), 258 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java
index 2f31611..1b4fc03 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java
@@ -19,7 +19,6 @@
package org.apache.ambari.server.api.rest;
import javax.ws.rs.GET;
-import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
@@ -28,7 +27,6 @@ import javax.ws.rs.core.MediaType;
* or not
*/
-@Path("/check")
public class HealthCheck {
private static final String status = "RUNNING";
// This method is called if TEXT_PLAIN is request
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java
index 898e7e6..bb08a0a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java
@@ -36,7 +36,6 @@ import com.google.inject.Inject;
* Service responsible for kerberos related resource requests.
*/
@StaticallyInject
-@Path("/kdc_check/")
public class KdcServerReachabilityCheck {
private static final String REACHABLE = "REACHABLE";
private static final String UNREACHABLE = "UNREACHABLE";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AbstractVersionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AbstractVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AbstractVersionService.java
new file mode 100644
index 0000000..915595a
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AbstractVersionService.java
@@ -0,0 +1,352 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+import org.apache.ambari.server.api.rest.BootStrapResource;
+import org.apache.ambari.server.api.rest.HealthCheck;
+import org.apache.ambari.server.api.rest.KdcServerReachabilityCheck;
+import org.apache.ambari.server.api.util.ApiVersion;
+
+/**
+ * Abstract class for single entry point for an API version
+ */
+public abstract class AbstractVersionService {
+
+ /**
+ * Handles /actions request.
+ *
+ * @return action service
+ */
+ @Path("/actions")
+ public ActionService getActionService(@PathParam("apiVersion") String apiVersion) {
+ return new ActionService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /alert_targets request.
+ *
+ * @return alert targets service
+ */
+ @Path("/alert_targets")
+ public AlertTargetService getAlertTargetService(@PathParam("apiVersion") String apiVersion) {
+ return new AlertTargetService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /privileges request.
+ *
+ * @return privileges service
+ */
+ @Path("/privileges")
+ public AmbariPrivilegeService getAmbariPrivilegeService(@PathParam("apiVersion") String apiVersion) {
+ return new AmbariPrivilegeService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /blueprints request.
+ *
+ * @return blueprints service
+ */
+ @Path("/blueprints")
+ public BlueprintService getBlueprintService(@PathParam("apiVersion") String apiVersion) {
+ return new BlueprintService(ApiVersion.valueOf(apiVersion));
+ }
+
+
+ /**
+ * Handles /links request.
+ *
+ * @return extension links service
+ */
+ @Path("/links")
+ public ExtensionLinksService getExtensionLinksService(@PathParam("apiVersion") String apiVersion) {
+ return new ExtensionLinksService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /extensions request.
+ *
+ * @return extensions service
+ */
+ @Path("/extensions")
+ public ExtensionsService getExtensionsService(@PathParam("apiVersion") String apiVersion) {
+ return new ExtensionsService(ApiVersion.valueOf(apiVersion));
+ }
+
+
+ /**
+ * Handles /clusters request.
+ *
+ * @return cluster service
+ */
+ @Path("/clusters")
+ public ClusterService getClusterService(@PathParam("apiVersion") String apiVersion) {
+ return new ClusterService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /feeds request.
+ * TODO: Cleanup?
+ *
+ * @return feed service
+ */
+ @Path("/feeds")
+ public FeedService getFeedService(@PathParam("apiVersion") String apiVersion) {
+ return new FeedService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /groups request.
+ *
+ * @return group service
+ */
+ @Path("/groups")
+ public GroupService getGroupService(@PathParam("apiVersion") String apiVersion) {
+ return new GroupService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /hosts request.
+ *
+ * @return host service
+ */
+ @Path("/hosts")
+ public HostService getHostService(@PathParam("apiVersion") String apiVersion) {
+ return new HostService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /instances request.
+ * TODO: Cleanup?
+ *
+ * @return instance service
+ */
+ @Path("/instances")
+ public InstanceService getInstanceService(@PathParam("apiVersion") String apiVersion) {
+ return new InstanceService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /kerberos_descriptors request.
+ *
+ * @return kerberos descriptor service
+ */
+ @Path("/kerberos_descriptors")
+ public KerberosDescriptorService getKerberosDescriptorService(@PathParam("apiVersion") String apiVersion) {
+ return new KerberosDescriptorService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /keys request.
+ *
+ * @return key service
+ */
+ @Path("/keys")
+ public KeyService getKeyService(@PathParam("apiVersion") String apiVersion) {
+ return new KeyService();
+ }
+
+ /**
+ * Handles /ldap_sync_events request.
+ *
+ * @return Ldap sync event service
+ */
+ @Path("/ldap_sync_events")
+ public LdapSyncEventService getLdapSyncEventService(@PathParam("apiVersion") String apiVersion) {
+ return new LdapSyncEventService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /logout request.
+ *
+ * @return logout service
+ */
+ @Path("/logout")
+ public LogoutService getLogoutService(@PathParam("apiVersion") String apiVersion) {
+ return new LogoutService();
+ }
+
+ /**
+ * Handles /permissions request.
+ *
+ * @return permission service
+ */
+ @Path("/permissions")
+ public PermissionService getPermissionService(@PathParam("apiVersion") String apiVersion) {
+ return new PermissionService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /persist request.
+ *
+ * @return persist service
+ */
+ @Path("/persist")
+ public PersistKeyValueService getPersistKeyValueService(@PathParam("apiVersion") String apiVersion) {
+ return new PersistKeyValueService();
+ }
+
+ /**
+ * Handles /remoteclusters request
+ *
+ * @return remote clusters service
+ */
+ @Path("/remoteclusters")
+ public RemoteClustersService getRemoteClustersService(@PathParam("apiVersion") String apiVersion) {
+ return new RemoteClustersService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /requests request.
+ *
+ * @return request service
+ */
+ @Path("/requests")
+ public RequestService getRequestService(@PathParam("apiVersion") String apiVersion) {
+ return new RequestService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /settings request.
+ *
+ * @return request service
+ */
+ @Path("/settings")
+ public SettingService getSettingService(@PathParam("apiVersion") String apiVersion) {
+ return new SettingService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /authorizations request.
+ *
+ * @return role authorization service
+ */
+ @Path("/authorizations")
+ public RoleAuthorizationService getRoleAuthorizationService(@PathParam("apiVersion") String apiVersion) {
+ return new RoleAuthorizationService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /services request.
+ *
+ * @return root service service
+ */
+ @Path("/services")
+ public RootServiceService getRootServiceService(@PathParam("apiVersion") String apiVersion) {
+ return new RootServiceService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /targets request.
+ * TODO: Cleanup?
+ *
+ * @return target cluster service
+ */
+ @Path("/targets")
+ public TargetClusterService getTargetClusterService(@PathParam("apiVersion") String apiVersion) {
+ return new TargetClusterService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /users request.
+ *
+ * @return user service
+ */
+ @Path("/users")
+ public UserService getUserService(@PathParam("apiVersion") String apiVersion) {
+ return new UserService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /version_definitions request.
+ *
+ * @return version definition service
+ */
+ @Path("/version_definitions")
+ public VersionDefinitionService getVersionDefinitionService(@PathParam("apiVersion") String apiVersion) {
+ return new VersionDefinitionService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /views request.
+ *
+ * @return view service
+ */
+ @Path("/views")
+ public ViewService getViewService(@PathParam("apiVersion") String apiVersion) {
+ return new ViewService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /view/urls request.
+ *
+ * @return view urls service
+ */
+ @Path("/view/urls")
+ public ViewUrlsService getViewUrlsService(@PathParam("apiVersion") String apiVersion) {
+ return new ViewUrlsService(ApiVersion.valueOf(apiVersion));
+ }
+
+ /**
+ * Handles /stacks request.
+ *
+ * @return stacks service
+ */
+ @Path("/stacks")
+ public StacksService getStacksService(@PathParam("apiVersion") String apiVersion) {
+ return new StacksService(ApiVersion.valueOf(apiVersion));
+ }
+
+
+ /**
+ * Handles /bootstrap request.
+ *
+ * @return bootstrap service
+ */
+ @Path("/bootstrap")
+ public BootStrapResource getBootStrapResource(@PathParam("apiVersion") String apiVersion) {
+ return new BootStrapResource();
+ }
+
+
+ /**
+ * Handles /check request.
+ *
+ * @return health check service
+ */
+ @Path("/check")
+ public HealthCheck getHealthCheck(@PathParam("apiVersion") String apiVersion) {
+ return new HealthCheck();
+ }
+
+ /**
+ * Handles /kdc_check request.
+ *
+ * @return kdc server reachability service
+ */
+ @Path("/kdc_check")
+ public KdcServerReachabilityCheck getKdcServerReachabilityCheck(@PathParam("apiVersion") String apiVersion) {
+ return new KdcServerReachabilityCheck();
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
index 0290151..2b6cf36 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
@@ -33,15 +33,18 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
-
/**
* Service responsible for action definition resource requests.
*/
-@Path("/actions/")
public class ActionService extends BaseService {
+ public ActionService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /actions/{actionName}
* Get a specific action definition.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
index dd7c917..0996abb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.commons.lang.StringUtils;
@@ -39,7 +40,8 @@ public class ActiveWidgetLayoutService extends BaseService {
private final String userName;
- public ActiveWidgetLayoutService(String userName) {
+ public ActiveWidgetLayoutService(ApiVersion apiVersion, String userName) {
+ super(apiVersion);
this.userName = userName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java
index fb5423b..aae23cc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -42,7 +43,8 @@ public class AlertDefinitionService extends BaseService {
private String clusterName = null;
- AlertDefinitionService(String clusterName) {
+ AlertDefinitionService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java
index 97a61ba..439c3d4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -51,7 +52,8 @@ public class AlertGroupService extends BaseService {
*
* @param clusterName
*/
- AlertGroupService(String clusterName) {
+ AlertGroupService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
m_clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java
index 6f7e2fa..31f1019 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -52,7 +53,8 @@ public class AlertHistoryService extends BaseService {
* @param hostName
* the host name, or {@code null} to return history across all hosts.
*/
- AlertHistoryService(String clusterName, String serviceName, String hostName) {
+ AlertHistoryService(ApiVersion apiVersion, String clusterName, String serviceName, String hostName) {
+ super(apiVersion);
this.clusterName = clusterName;
this.serviceName = serviceName;
this.hostName = hostName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java
index 3a4cda6..d5e6642 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -45,7 +46,8 @@ public class AlertNoticeService extends BaseService {
* @param clusterName
* the cluster name (not {@code null}).
*/
- AlertNoticeService(String clusterName) {
+ AlertNoticeService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java
index babf42c..6a583d4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -41,7 +42,8 @@ public class AlertService extends BaseService {
private String serviceName = null;
private String hostName = null;
- AlertService(String clusterName, String serviceName, String hostName) {
+ AlertService(ApiVersion apiVersion, String clusterName, String serviceName, String hostName) {
+ super(apiVersion);
this.clusterName = clusterName;
this.serviceName = serviceName;
this.hostName = hostName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java
index 3d995b3..b08db6f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.state.alert.AlertTarget;
@@ -40,9 +41,12 @@ import org.apache.ambari.server.state.alert.AlertTarget;
* The {@link AlertTargetService} handles CRUD operation requests for alert
* targets.
*/
-@Path("/alert_targets/")
public class AlertTargetService extends BaseService {
+ public AlertTargetService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
@GET
@Produces("text/plain")
public Response getTargets(@Context HttpHeaders headers,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java
index be46ad5..62d8149 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java
@@ -20,16 +20,17 @@ package org.apache.ambari.server.api.services;
import java.util.Collections;
-import javax.ws.rs.Path;
-
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for Ambari privilege resource requests.
*/
-@Path("/privileges/")
public class AmbariPrivilegeService extends PrivilegeService {
+ public AmbariPrivilegeService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
// ----- PrivilegeService --------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index 0185d37..c9bc978 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Pattern;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
@@ -36,6 +37,7 @@ import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.CsvSerializer;
import org.apache.ambari.server.api.services.serializers.JsonSerializer;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.audit.request.RequestAuditLogger;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.utils.RetryHelper;
@@ -50,6 +52,12 @@ public abstract class BaseService {
public final static MediaType MEDIA_TYPE_TEXT_CSV_TYPE = new MediaType("text", "csv");
/**
+ * Regex for checking API version from the request URI
+ */
+ public static final Pattern API_VERSION_REGEX = Pattern.compile("^(/api/)(v[0-9\\.]+)");
+
+
+ /**
* Logger instance.
*/
protected final static Logger LOG = LoggerFactory.getLogger(BaseService.class);
@@ -66,6 +74,15 @@ public abstract class BaseService {
protected static RequestAuditLogger requestAuditLogger;
+ /**
+ * Api version
+ */
+ protected ApiVersion m_apiVersion;
+
+ public BaseService(ApiVersion apiVersion) {
+ m_apiVersion = apiVersion;
+ }
+
public static void init(RequestAuditLogger instance) {
requestAuditLogger = instance;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
index 8159ea4..27f5f17 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -40,9 +41,12 @@ import org.apache.ambari.server.controller.spi.Resource;
* any cluster specific information. Updates are not permitted as blueprints are
* immutable.
*/
-@Path("/blueprints/")
public class BlueprintService extends BaseService {
+ public BlueprintService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /blueprints
* Get all blueprints.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java
index 0aeb52b..3e7cbdc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -54,7 +55,8 @@ public class ClusterKerberosDescriptorService extends BaseService {
*
* @param clusterName cluster id
*/
- public ClusterKerberosDescriptorService(String clusterName) {
+ public ClusterKerberosDescriptorService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java
index 2efd392..4ac27ec 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -42,7 +43,8 @@ public class ClusterPrivilegeService extends PrivilegeService {
*
* @param clusterName the cluster name
*/
- public ClusterPrivilegeService(String clusterName) {
+ public ClusterPrivilegeService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
index 5577633..a0c27f0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
@@ -35,6 +35,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.AmbariServer;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.state.Clusters;
@@ -43,7 +44,6 @@ import org.apache.ambari.server.state.Clusters;
/**
* Service responsible for cluster resource requests.
*/
-@Path("/clusters/")
public class ClusterService extends BaseService {
/**
@@ -57,7 +57,8 @@ public class ClusterService extends BaseService {
/**
* Construct a ClusterService.
*/
- public ClusterService() {
+ public ClusterService(ApiVersion apiVersion) {
+ super(apiVersion);
clusters = AmbariServer.getController().getClusters();
}
@@ -66,7 +67,8 @@ public class ClusterService extends BaseService {
*
* @param clusters the clusters utilities
*/
- protected ClusterService(Clusters clusters) {
+ protected ClusterService(ApiVersion apiVersion, Clusters clusters) {
+ super(apiVersion);
this.clusters = clusters;
}
@@ -326,7 +328,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/hosts")
public HostService getHostHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new HostService(clusterName);
+ return new HostService(m_apiVersion, clusterName);
}
/**
@@ -339,7 +341,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/services")
public ServiceService getServiceHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new ServiceService(clusterName);
+ return new ServiceService(m_apiVersion, clusterName);
}
/**
@@ -352,7 +354,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/configurations")
public ConfigurationService getConfigurationHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new ConfigurationService(clusterName);
+ return new ConfigurationService(m_apiVersion, clusterName);
}
/**
@@ -365,7 +367,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/requests")
public RequestService getRequestHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new RequestService(clusterName);
+ return new RequestService(m_apiVersion, clusterName);
}
/**
@@ -379,7 +381,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/host_components")
public HostComponentService getHostComponentHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new HostComponentService(clusterName, null);
+ return new HostComponentService(m_apiVersion, clusterName, null);
}
/**
@@ -393,7 +395,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/kerberos_identities")
public HostKerberosIdentityService getHostKerberosIdentityHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new HostKerberosIdentityService(clusterName, null);
+ return new HostKerberosIdentityService(m_apiVersion, clusterName, null);
}
/**
@@ -407,7 +409,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/components")
public ComponentService getComponentHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new ComponentService(clusterName, null);
+ return new ComponentService(m_apiVersion, clusterName, null);
}
/**
@@ -420,7 +422,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/workflows")
public WorkflowService getWorkflowHandler(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new WorkflowService(clusterName);
+ return new WorkflowService(m_apiVersion, clusterName);
}
/**
@@ -433,7 +435,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/config_groups")
public ConfigGroupService getConfigGroupService(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new ConfigGroupService(clusterName);
+ return new ConfigGroupService(m_apiVersion, clusterName);
}
/**
@@ -447,7 +449,7 @@ public class ClusterService extends BaseService {
@Path("{clusterName}/request_schedules")
public RequestScheduleService getRequestScheduleService
(@Context javax.ws.rs.core.Request request, @PathParam ("clusterName") String clusterName) {
- return new RequestScheduleService(clusterName);
+ return new RequestScheduleService(m_apiVersion, clusterName);
}
/**
@@ -461,7 +463,7 @@ public class ClusterService extends BaseService {
@Path("{clusterName}/alert_definitions")
public AlertDefinitionService getAlertDefinitionService(
@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new AlertDefinitionService(clusterName);
+ return new AlertDefinitionService(m_apiVersion, clusterName);
}
/**
@@ -477,7 +479,7 @@ public class ClusterService extends BaseService {
public AlertGroupService getAlertGroups(
@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new AlertGroupService(clusterName);
+ return new AlertGroupService(m_apiVersion, clusterName);
}
/**
@@ -492,7 +494,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/privileges")
public PrivilegeService getPrivilegeService(@Context javax.ws.rs.core.Request request, @PathParam ("clusterName") String clusterName) {
- return new ClusterPrivilegeService(clusterName);
+ return new ClusterPrivilegeService(m_apiVersion, clusterName);
}
/**
@@ -506,7 +508,7 @@ public class ClusterService extends BaseService {
@Path("{clusterName}/alerts")
public AlertService getAlertService(
@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new AlertService(clusterName, null, null);
+ return new AlertService(m_apiVersion, clusterName, null, null);
}
/**
@@ -523,7 +525,7 @@ public class ClusterService extends BaseService {
public AlertHistoryService getAlertHistoryService(
@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new AlertHistoryService(clusterName, null, null);
+ return new AlertHistoryService(m_apiVersion, clusterName, null, null);
}
/**
@@ -540,7 +542,7 @@ public class ClusterService extends BaseService {
public AlertNoticeService getAlertNoticeService(
@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new AlertNoticeService(clusterName);
+ return new AlertNoticeService(m_apiVersion, clusterName);
}
/**
@@ -556,7 +558,7 @@ public class ClusterService extends BaseService {
@Path("{clusterName}/stack_versions")
public ClusterStackVersionService getClusterStackVersionService(@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new ClusterStackVersionService(clusterName);
+ return new ClusterStackVersionService(m_apiVersion, clusterName);
}
/**
@@ -571,7 +573,7 @@ public class ClusterService extends BaseService {
public UpgradeService getUpgradeService(
@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new UpgradeService(clusterName);
+ return new UpgradeService(m_apiVersion, clusterName);
}
/**
@@ -586,7 +588,7 @@ public class ClusterService extends BaseService {
public UpgradeSummaryService getUpgradeSummaryService(
@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new UpgradeSummaryService(clusterName);
+ return new UpgradeSummaryService(m_apiVersion, clusterName);
}
/**
@@ -599,7 +601,7 @@ public class ClusterService extends BaseService {
*/
@Path("{clusterName}/rolling_upgrades_check")
public PreUpgradeCheckService getPreUpgradeCheckService(@Context javax.ws.rs.core.Request request, @PathParam("clusterName") String clusterName) {
- return new PreUpgradeCheckService(clusterName);
+ return new PreUpgradeCheckService(m_apiVersion, clusterName);
}
/**
@@ -609,7 +611,7 @@ public class ClusterService extends BaseService {
public WidgetLayoutService getWidgetLayoutService(@Context javax.ws.rs.core.Request request,
@PathParam ("clusterName") String clusterName) {
- return new WidgetLayoutService(clusterName);
+ return new WidgetLayoutService(m_apiVersion, clusterName);
}
/**
@@ -619,7 +621,7 @@ public class ClusterService extends BaseService {
public WidgetService getWidgetService(@Context javax.ws.rs.core.Request request,
@PathParam ("clusterName") String clusterName) {
- return new WidgetService(clusterName);
+ return new WidgetService(m_apiVersion, clusterName);
}
/**
@@ -633,7 +635,7 @@ public class ClusterService extends BaseService {
public CredentialService getCredentials(
@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new CredentialService(clusterName);
+ return new CredentialService(m_apiVersion, clusterName);
}
/**
@@ -648,7 +650,7 @@ public class ClusterService extends BaseService {
public ClusterKerberosDescriptorService getCompositeKerberosDescriptor(
@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return new ClusterKerberosDescriptorService(clusterName);
+ return new ClusterKerberosDescriptorService(m_apiVersion, clusterName);
}
/**
@@ -662,7 +664,7 @@ public class ClusterService extends BaseService {
@Path("{clusterName}/logging")
public LoggingService getLogging(@Context javax.ws.rs.core.Request request,
@PathParam("clusterName") String clusterName) {
- return AmbariServer.getController().getLoggingService(clusterName);
+ return AmbariServer.getController().getLoggingService(m_apiVersion, clusterName);
}
// ----- helper methods ----------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
index 0821f7c..8f96503 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -48,7 +49,8 @@ public class ClusterStackVersionService extends BaseService {
*
* @param clusterName name of the cluster
*/
- public ClusterStackVersionService(String clusterName) {
+ public ClusterStackVersionService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
@@ -102,7 +104,7 @@ public class ClusterStackVersionService extends BaseService {
final Map<Resource.Type, String> mapIds = new HashMap<>();
mapIds.put(Resource.Type.Cluster, clusterName);
mapIds.put(Resource.Type.ClusterStackVersion, stackVersion);
- return new RepositoryVersionService(mapIds);
+ return new RepositoryVersionService(m_apiVersion, mapIds);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java
index c6748bc..bdde7a2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -47,7 +48,8 @@ public class CompatibleRepositoryVersionService extends BaseService {
*
* @param parentProperties extra properties to be inserted into created resource
*/
- public CompatibleRepositoryVersionService(Map<Resource.Type, String> parentProperties) {
+ public CompatibleRepositoryVersionService(ApiVersion apiVersion, Map<Resource.Type, String> parentProperties) {
+ super(apiVersion);
parentKeyProperties = parentProperties;
}
@@ -94,7 +96,7 @@ public class CompatibleRepositoryVersionService extends BaseService {
mapIds.putAll(parentKeyProperties);
mapIds.put(Resource.Type.CompatibleRepositoryVersion, repositoryVersionId);
- return new OperatingSystemService(mapIds);
+ return new OperatingSystemService(m_apiVersion, mapIds);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
index f29b396..8f6dc51 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
@@ -39,6 +39,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.commons.lang.StringUtils;
@@ -64,7 +65,8 @@ public class ComponentService extends BaseService {
* @param clusterName cluster id
* @param serviceName service id
*/
- public ComponentService(String clusterName, String serviceName) {
+ public ComponentService(ApiVersion apiVersion, String clusterName, String serviceName) {
+ super(apiVersion);
m_clusterName = clusterName;
m_serviceName = serviceName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java
index ae5ea53..56ef41f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -48,7 +49,8 @@ public class ConfigGroupService extends BaseService {
* Constructor
* @param m_clusterName
*/
- public ConfigGroupService(String m_clusterName) {
+ public ConfigGroupService(ApiVersion apiVersion, String m_clusterName) {
+ super(apiVersion);
this.m_clusterName = m_clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java
index bebcb03..eac9686 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -47,13 +48,14 @@ public class ConfigurationService extends BaseService {
*
* @param clusterName cluster id
*/
- public ConfigurationService(String clusterName) {
+ public ConfigurationService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
m_clusterName = clusterName;
}
@Path("service_config_versions")
public ServiceConfigVersionService getServiceConfigVersionService() {
- return new ServiceConfigVersionService(m_clusterName);
+ return new ServiceConfigVersionService(m_apiVersion, m_clusterName);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java
index 449c292..dc720c9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -43,7 +44,8 @@ public class CredentialService extends BaseService {
private final String clusterName;
- public CredentialService(String clusterName) {
+ public CredentialService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
this.clusterName = clusterName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java
index 457313d..c5b7f4c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -43,9 +44,12 @@ import org.apache.ambari.server.controller.spi.Resource;
* version to the current stack version allows the cluster to install the custom services contained in
* the extension version.
*/
-@Path("/links/")
public class ExtensionLinksService extends BaseService {
+ public ExtensionLinksService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
@GET
@Produces("text/plain")
public Response getExtensionLinks(String body, @Context HttpHeaders headers, @Context UriInfo ui) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java
index 5ba7341..9fad03e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -41,9 +42,12 @@ import org.apache.ambari.server.controller.spi.Resource;
* version to the current stack version allows the cluster to install the custom services contained in
* the extension version.
*/
-@Path("/extensions/")
public class ExtensionsService extends BaseService {
+ public ExtensionsService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
@GET
@Produces("text/plain")
public Response getExtensions(String body, @Context HttpHeaders headers, @Context UriInfo ui) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java
index 4a87c32..9e0aa16 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java
@@ -33,14 +33,18 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* DR feed service.
*/
-@Path("/feeds/")
public class FeedService extends BaseService {
+ public FeedService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /feeds/{feedName}
* Get a specific feed.
@@ -135,7 +139,7 @@ public class FeedService extends BaseService {
*/
@Path("{feedName}/instances")
public InstanceService getHostHandler(@PathParam("feedName") String feedName) {
- return new InstanceService(feedName);
+ return new InstanceService(m_apiVersion, feedName);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
index 0c7c2e9..eae68ee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java
@@ -27,6 +27,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -36,7 +37,8 @@ public class GroupPrivilegeService extends PrivilegeService {
private final String groupName;
- public GroupPrivilegeService(String groupName) {
+ public GroupPrivilegeService(ApiVersion apiVersion, String groupName) {
+ super(apiVersion);
this.groupName = groupName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupService.java
index 8ec0097..47414b3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupService.java
@@ -31,13 +31,17 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for user groups requests.
*/
-@Path("/groups/")
public class GroupService extends BaseService {
+ public GroupService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Gets all groups.
* Handles: GET /groups requests.
@@ -127,7 +131,7 @@ public class GroupService extends BaseService {
*/
@Path("{groupName}/members")
public MemberService getMemberHandler(@PathParam("groupName") String groupName) {
- return new MemberService(groupName);
+ return new MemberService(m_apiVersion, groupName);
}
/**
@@ -137,7 +141,7 @@ public class GroupService extends BaseService {
public PrivilegeService getPrivilegeService(@Context javax.ws.rs.core.Request request,
@PathParam ("groupName") String groupName) {
- return new GroupPrivilegeService(groupName);
+ return new GroupPrivilegeService(m_apiVersion, groupName);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java
index e4f2be9..62f2f89 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java
@@ -39,6 +39,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.commons.lang.StringUtils;
@@ -64,7 +65,8 @@ public class HostComponentService extends BaseService {
* @param clusterName cluster id
* @param hostName host id
*/
- public HostComponentService(String clusterName, String hostName) {
+ public HostComponentService(ApiVersion apiVersion, String clusterName, String hostName) {
+ super(apiVersion);
m_clusterName = clusterName;
m_hostName = hostName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java
index a99d269..35a5e07 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -56,7 +57,8 @@ public class HostKerberosIdentityService extends BaseService {
* @param clusterName cluster name
* @param hostName host name
*/
- public HostKerberosIdentityService(String clusterName, String hostName) {
+ public HostKerberosIdentityService(ApiVersion apiVersion, String clusterName, String hostName) {
+ super(apiVersion);
this.clusterName = clusterName;
this.hostName = hostName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
index c26c5d8..9c25445 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
@@ -34,12 +34,12 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for hosts resource requests.
*/
-@Path("/hosts/")
public class HostService extends BaseService {
/**
@@ -50,7 +50,8 @@ public class HostService extends BaseService {
/**
* Constructor.
*/
- public HostService() {
+ public HostService(ApiVersion apiVersion) {
+ super(apiVersion);
}
/**
@@ -58,7 +59,8 @@ public class HostService extends BaseService {
*
* @param clusterName cluster id
*/
- public HostService(String clusterName) {
+ public HostService(ApiVersion apiVersion, String clusterName) {
+ super(apiVersion);
m_clusterName = clusterName;
}
@@ -211,7 +213,7 @@ public class HostService extends BaseService {
*/
@Path("{hostName}/host_components")
public HostComponentService getHostComponentHandler(@PathParam("hostName") String hostName) {
- return new HostComponentService(m_clusterName, hostName);
+ return new HostComponentService(m_apiVersion, m_clusterName, hostName);
}
/**
@@ -222,7 +224,7 @@ public class HostService extends BaseService {
*/
@Path("{hostName}/kerberos_identities")
public HostKerberosIdentityService getHostKerberosIdentityHandler(@PathParam("hostName") String hostName) {
- return new HostKerberosIdentityService(m_clusterName, hostName);
+ return new HostKerberosIdentityService(m_apiVersion, m_clusterName, hostName);
}
/**
@@ -233,7 +235,7 @@ public class HostService extends BaseService {
*/
@Path("{hostName}/alerts")
public AlertService getAlertHandler(@PathParam("hostName") String hostName) {
- return new AlertService(m_clusterName, null, hostName);
+ return new AlertService(m_apiVersion, m_clusterName, null, hostName);
}
/**
@@ -251,7 +253,7 @@ public class HostService extends BaseService {
@Context javax.ws.rs.core.Request request,
@PathParam("hostName") String hostName) {
- return new AlertHistoryService(m_clusterName, null, hostName);
+ return new AlertHistoryService(m_apiVersion, m_clusterName, null, hostName);
}
/**
@@ -268,7 +270,7 @@ public class HostService extends BaseService {
public HostStackVersionService getHostStackVersionService(@Context javax.ws.rs.core.Request request,
@PathParam("hostName") String hostName) {
- return new HostStackVersionService(hostName, m_clusterName);
+ return new HostStackVersionService(m_apiVersion, hostName, m_clusterName);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java
index 1c91eee..6d1a445 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -52,7 +53,8 @@ public class HostStackVersionService extends BaseService {
*
* @param hostName name of the host
*/
- public HostStackVersionService(String hostName, String clusterName) {
+ public HostStackVersionService(ApiVersion apiVersion, String hostName, String clusterName) {
+ super(apiVersion);
this.hostName = hostName;
this.clusterName = clusterName;
}
@@ -116,7 +118,7 @@ public class HostStackVersionService extends BaseService {
final Map<Resource.Type, String> stackVersionProperties = new HashMap<>();
stackVersionProperties.put(Resource.Type.Host, hostName);
stackVersionProperties.put(Resource.Type.HostStackVersion, stackVersionId);
- return new RepositoryVersionService(stackVersionProperties);
+ return new RepositoryVersionService(m_apiVersion, stackVersionProperties);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java
index f216e67..afa31dc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java
@@ -34,12 +34,12 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for instances resource requests.
*/
-@Path("/instances/")
public class InstanceService extends BaseService {
/**
@@ -50,7 +50,8 @@ public class InstanceService extends BaseService {
/**
* Constructor.
*/
- public InstanceService() {
+ public InstanceService(ApiVersion apiVersion) {
+ super(apiVersion);
}
/**
@@ -58,7 +59,8 @@ public class InstanceService extends BaseService {
*
* @param feedName feed id
*/
- public InstanceService(String feedName) {
+ public InstanceService(ApiVersion apiVersion, String feedName) {
+ super(apiVersion);
m_feedName = feedName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java
index 2ea83e2..6a856b8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -48,7 +49,8 @@ public class JobService extends BaseService {
* @param workflowId
* workflow id
*/
- public JobService(String clusterName, String workflowId) {
+ public JobService(ApiVersion apiVersion, String clusterName, String workflowId) {
+ super(apiVersion);
this.clusterName = clusterName;
this.workflowId = workflowId;
}
@@ -95,7 +97,7 @@ public class JobService extends BaseService {
@Path("{jobId}/taskattempts")
public TaskAttemptService getTaskAttemptHandler(
@PathParam("jobId") String jobId) {
- return new TaskAttemptService(clusterName, workflowId, jobId);
+ return new TaskAttemptService(m_apiVersion, clusterName, workflowId, jobId);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java
index 5f20c4f..012c27a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java
@@ -14,6 +14,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -34,9 +35,12 @@ import org.apache.ambari.server.controller.spi.Resource;
* limitations under the License.
*/
-@Path("/kerberos_descriptors/")
public class KerberosDescriptorService extends BaseService {
+ public KerberosDescriptorService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /kerberos_descriptors
* Get all kerberos descriptors.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java
index 9ddcc79..1a2b523 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java
@@ -32,7 +32,6 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
-@Path("/keys/")
public class KeyService {
private static final Logger log = LoggerFactory.getLogger(KeyService.class);
private static PersistKeyValueImpl persistKeyVal;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java
index 61f5ba7..85da59a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java
@@ -33,13 +33,17 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for ldap sync event resource requests.
*/
-@Path("/ldap_sync_events/")
public class LdapSyncEventService extends BaseService {
+ public LdapSyncEventService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /ldap_sync_events/{eventId}
* Get a specific view.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
index 83853d2..f2ddfdc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java
@@ -36,6 +36,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.AmbariServer;
import org.apache.ambari.server.controller.internal.ResourceImpl;
@@ -75,11 +76,12 @@ public class LoggingService extends BaseService {
private final String clusterName;
- public LoggingService(String clusterName) {
- this(clusterName, new DefaultControllerFactory());
+ public LoggingService(ApiVersion apiVersion, String clusterName) {
+ this(apiVersion, clusterName, new DefaultControllerFactory());
}
- public LoggingService(String clusterName, ControllerFactory controllerFactory) {
+ public LoggingService(ApiVersion apiVersion, String clusterName, ControllerFactory controllerFactory) {
+ super(apiVersion);
this.clusterName = clusterName;
this.controllerFactory = controllerFactory;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java
index f2f5e0e..4354b34 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java
@@ -19,7 +19,6 @@ package org.apache.ambari.server.api.services;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.GET;
-import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
@@ -37,7 +36,6 @@ import com.google.inject.Inject;
* Service performing logout of current user
*/
@StaticallyInject
-@Path("/logout")
public class LogoutService {
@Inject
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java
index 836aa9c..e9246de 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -49,7 +50,8 @@ public class MemberService extends BaseService {
*
* @param groupName name of the group
*/
- public MemberService(String groupName) {
+ public MemberService(ApiVersion apiVersion, String groupName) {
+ super(apiVersion);
this.groupName = groupName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java
index 3117054..b72b4c2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java
@@ -47,6 +47,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
@@ -64,7 +65,8 @@ public class OperatingSystemService extends BaseService {
*
* @param parentKeyProperties extra properties to be inserted into created resource
*/
- public OperatingSystemService(Map<Resource.Type, String> parentKeyProperties) {
+ public OperatingSystemService(ApiVersion apiVersion, Map<Resource.Type, String> parentKeyProperties) {
+ super(apiVersion);
this.parentKeyProperties = parentKeyProperties;
}
@@ -108,7 +110,7 @@ public class OperatingSystemService extends BaseService {
final Map<Resource.Type, String> mapIds = new HashMap<>();
mapIds.putAll(parentKeyProperties);
mapIds.put(Resource.Type.OperatingSystem, osType);
- return new RepositoryService(mapIds);
+ return new RepositoryService(m_apiVersion, mapIds);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea3dc9a0/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java
index bb33884..c8f46a2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java
@@ -33,15 +33,19 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
/**
* Service responsible for permission resource requests.
*/
-@Path("/permissions/")
public class PermissionService extends BaseService {
+ public PermissionService(ApiVersion apiVersion) {
+ super(apiVersion);
+ }
+
/**
* Handles: GET /permissions/{permissionID}
* Get a specific permission.
@@ -143,7 +147,7 @@ public class PermissionService extends BaseService {
@Path("{permissionId}/authorizations")
public RoleAuthorizationService getRoleAuthorizations(
@Context javax.ws.rs.core.Request request, @PathParam("permissionId") String permissionId) {
- return new RoleAuthorizationService(permissionId);
+ return new RoleAuthorizationService(m_apiVersion, permissionId);
}
// ----- helper methods ----------------------------------------------------