http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 4a63ff0..936b857 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,8 +48,7 @@ public class RequestService extends BaseService { private String m_clusterName; - public RequestService(ApiVersion apiVersion) { - super(apiVersion); + public RequestService() { } /** @@ -57,8 +56,7 @@ public class RequestService extends BaseService { * * @param clusterName cluster id */ - public RequestService(ApiVersion apiVersion, String clusterName) { - super(apiVersion); + public RequestService(String clusterName) { m_clusterName = clusterName; } @@ -104,7 +102,7 @@ public class RequestService extends BaseService { */ @Path("{requestId}/stages") public StageService getStageHandler(@PathParam("requestId") String requestId) { - return new StageService(m_apiVersion, m_clusterName, requestId); + return new StageService(m_clusterName, requestId); } /** @@ -112,7 +110,7 @@ public class RequestService extends BaseService { */ @Path("{requestId}/tasks") public TaskService getTaskHandler(@PathParam("requestId") String requestId) { - return new TaskService(m_apiVersion, m_clusterName, requestId, null); + return new TaskService(m_clusterName, requestId, null); } /**
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 8f6985c..f7365a1 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,7 +31,6 @@ 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,14 +39,15 @@ 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(ApiVersion apiVersion) { - this(apiVersion, null); + public RoleAuthorizationService() { + this(null); } /** @@ -55,8 +55,7 @@ public class RoleAuthorizationService extends BaseService { * * @param permissionId the permission id of a permission (or role) */ - public RoleAuthorizationService(ApiVersion apiVersion, String permissionId) { - super(apiVersion); + public RoleAuthorizationService(String permissionId) { this.permissionId = permissionId; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 96ca167..ce9240c 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,15 +32,11 @@ 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/bf0bb2ea/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 6a76cf8..43eabdc 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,7 +29,6 @@ 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 { @@ -38,8 +37,7 @@ public class ServiceConfigVersionService extends BaseService { */ private String m_clusterName; - public ServiceConfigVersionService(ApiVersion apiVersion, String m_clusterName) { - super(apiVersion); + public ServiceConfigVersionService(String m_clusterName) { this.m_clusterName = m_clusterName; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 adbd31d..52871f2 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,7 +34,6 @@ 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,8 +50,7 @@ public class ServiceService extends BaseService { * * @param clusterName cluster id */ - public ServiceService(ApiVersion apiVersion, String clusterName) { - super(apiVersion); + public ServiceService(String clusterName) { m_clusterName = clusterName; } @@ -189,7 +187,7 @@ public class ServiceService extends BaseService { @Path("{serviceName}/components") public ComponentService getComponentHandler(@PathParam("serviceName") String serviceName) { - return new ComponentService(m_apiVersion, m_clusterName, serviceName); + return new ComponentService(m_clusterName, serviceName); } /** @@ -198,7 +196,7 @@ public class ServiceService extends BaseService { @Path("{serviceName}/alerts") public AlertService getAlertHandler( @PathParam("serviceName") String serviceName) { - return new AlertService(m_apiVersion, m_clusterName, serviceName, null); + return new AlertService(m_clusterName, serviceName, null); } /** @@ -381,7 +379,7 @@ public class ServiceService extends BaseService { @Context javax.ws.rs.core.Request request, @PathParam("serviceName") String serviceName) { - return new AlertHistoryService(m_apiVersion, m_clusterName, serviceName, null); + return new AlertHistoryService(m_clusterName, serviceName, null); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 57bce21..e186be2 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(ApiVersion apiVersion) { - super(apiVersion); + public SettingService() { + } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 990bdd0..86bacf1 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,18 +32,14 @@ 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) { @@ -349,33 +345,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 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); + return new OperatingSystemService(stackProperties); } /** @@ -390,7 +360,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(m_apiVersion, stackProperties); + return new RepositoryVersionService(stackProperties); } /** @@ -407,7 +377,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(m_apiVersion, stackProperties); + return new CompatibleRepositoryVersionService(stackProperties); } ResourceInstance createStackServiceComponentResource( http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 428f8ae..6dc9010 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,7 +34,6 @@ 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,8 +60,7 @@ public class StageService extends BaseService { * @param clusterName cluster id * @param requestId request id */ - public StageService(ApiVersion apiVersion, String clusterName, String requestId) { - super(apiVersion); + public StageService(String clusterName, String requestId) { m_clusterName = clusterName; m_requestId = requestId; } @@ -112,7 +110,7 @@ public class StageService extends BaseService { */ @Path("{stageId}/tasks") public TaskService getTaskHandler(@PathParam("stageId") String stageId) { - return new TaskService(m_apiVersion, m_clusterName, m_requestId, stageId); + return new TaskService(m_clusterName, m_requestId, stageId); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 abbd715..d022d73 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,18 +33,14 @@ 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/bf0bb2ea/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 9a5d9be..af7f378 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,7 +31,6 @@ 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,8 +51,7 @@ public class TaskAttemptService extends BaseService { * @param jobId * job id */ - public TaskAttemptService(ApiVersion apiVersion, String clusterName, String workflowId, String jobId) { - super(apiVersion); + public TaskAttemptService(String clusterName, String workflowId, String jobId) { this.clusterName = clusterName; this.workflowId = workflowId; this.jobId = jobId; http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 8a9749e..acc4eef 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,7 +31,6 @@ 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; /** @@ -59,8 +58,7 @@ public class TaskService extends BaseService { * @param requestId request id * @param stageId stage id */ - public TaskService(ApiVersion apiVersion, String clusterName, String requestId, String stageId) { - super(apiVersion); + public TaskService(String clusterName, String requestId, String stageId) { m_clusterName = clusterName; m_requestId = requestId; m_stageId = stageId; http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 4bd77bf..a3866be 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,7 +30,6 @@ 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,8 +40,7 @@ public class UpgradeGroupService extends BaseService { private String m_clusterName = null; private String m_upgradeId = null; - UpgradeGroupService(ApiVersion apiVersion, String clusterName, String upgradeId) { - super(apiVersion); + UpgradeGroupService(String clusterName, String upgradeId) { m_clusterName = clusterName; m_upgradeId = upgradeId; } @@ -70,7 +68,7 @@ public class UpgradeGroupService extends BaseService { public UpgradeItemService getUpgradeItemService( @Context HttpHeaders headers, @PathParam("upgradeGroupId") Long groupId) { - return new UpgradeItemService(m_apiVersion, m_clusterName, m_upgradeId, groupId.toString()); + return new UpgradeItemService(m_clusterName, m_upgradeId, groupId.toString()); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 61c545a..6d6c5e3 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,7 +31,6 @@ 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,8 +42,7 @@ public class UpgradeItemService extends BaseService { private String m_upgradeId = null; private String m_upgradeGroupId = null; - UpgradeItemService(ApiVersion apiVersion, String clusterName, String upgradeId, String upgradeGroupId) { - super(apiVersion); + UpgradeItemService(String clusterName, String upgradeId, String upgradeGroupId) { m_clusterName = clusterName; m_upgradeId = upgradeId; m_upgradeGroupId = upgradeGroupId; @@ -96,7 +94,7 @@ public class UpgradeItemService extends BaseService { @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("upgradeItemId") Long id) { - return new TaskService(m_apiVersion, m_clusterName, m_upgradeId, id.toString()); + return new TaskService(m_clusterName, m_upgradeId, id.toString()); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 bb90d8a..dc54a0b 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,7 +32,6 @@ 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,8 +46,7 @@ public class UpgradeService extends BaseService { * * @param clusterName the cluster name (not {@code null}). */ - UpgradeService(ApiVersion apiVersion, String clusterName) { - super(apiVersion); + UpgradeService(String clusterName) { m_clusterName = clusterName; } @@ -92,7 +90,7 @@ public class UpgradeService extends BaseService { */ @Path("{upgradeId}/upgrade_groups") public UpgradeGroupService getUpgradeGroupHandler(@PathParam("upgradeId") String upgradeId) { - return new UpgradeGroupService(m_apiVersion, m_clusterName, upgradeId); + return new UpgradeGroupService(m_clusterName, upgradeId); } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 7e6c964..36d0074 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,7 +30,6 @@ 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,8 +45,7 @@ public class UpgradeSummaryService extends BaseService { * * @param clusterName the cluster name (not {@code null}). */ - UpgradeSummaryService(ApiVersion apiVersion, String clusterName) { - super(apiVersion); + UpgradeSummaryService(String clusterName) { m_clusterName = clusterName; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 910777c..26d9c1d 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,7 +31,6 @@ 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; @@ -54,8 +53,7 @@ public class UserAuthorizationService extends BaseService { * * @param username the username of the user to link thi UserAuthorizationService to */ - public UserAuthorizationService(ApiVersion apiVersion, String username) { - super(apiVersion); + public UserAuthorizationService(String username) { this.username = username; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 30a791f..7df806d 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,7 +18,6 @@ package org.apache.ambari.server.api.services; - import java.util.HashMap; import java.util.Map; @@ -28,7 +27,6 @@ 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; /** @@ -38,8 +36,7 @@ public class UserPrivilegeService extends PrivilegeService { private final String userName; - public UserPrivilegeService(ApiVersion apiVersion, String userName) { - super(apiVersion); + public UserPrivilegeService(String userName) { this.userName = userName; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 9c7c9bc..31f3a8c 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,18 +32,14 @@ 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. @@ -139,7 +135,7 @@ public class UserService extends BaseService { public PrivilegeService getPrivilegeService(@Context javax.ws.rs.core.Request request, @PathParam ("userName") String userName) { - return new UserPrivilegeService(m_apiVersion, userName); + return new UserPrivilegeService(userName); } /** @@ -149,7 +145,7 @@ public class UserService extends BaseService { public ActiveWidgetLayoutService getWidgetLayoutService(@Context javax.ws.rs.core.Request request, @PathParam ("userName") String userName) { - return new ActiveWidgetLayoutService(m_apiVersion, userName); + return new ActiveWidgetLayoutService(userName); } /** @@ -162,7 +158,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(m_apiVersion, username); + return new UserAuthorizationService(username); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 deleted file mode 100644 index 9f8839c..0000000 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/V1Service.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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/bf0bb2ea/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 deleted file mode 100644 index b6ba06d..0000000 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/V2Service.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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/bf0bb2ea/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 3bfdbc0..b5b4a42 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,6 +22,8 @@ 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; @@ -30,50 +32,31 @@ 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) { + public Response getValidation(String body, @Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) { + return handleRequest(headers, body, ui, Request.Type.POST, - createValidationResource(m_stackName, m_stackVersion)); + createValidationResource(stackName, stackVersion)); } ResourceInstance createValidationResource(String stackName, String stackVersion) { http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 0573278..af1eb07 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,19 +35,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.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) { @@ -76,7 +72,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(m_apiVersion, mapIds); + return new OperatingSystemService(mapIds); } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 8303edf..2a9aa64 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,7 +23,6 @@ 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; @@ -72,8 +71,7 @@ public class ViewDataMigrationService extends BaseService { * @param viewVersion the current view version * @param instanceName the current view instance name */ - public ViewDataMigrationService(ApiVersion apiVersion, String viewName, String viewVersion, String instanceName) { - super(apiVersion); + public ViewDataMigrationService(String viewName, String viewVersion, String instanceName) { this.viewName = viewName; this.viewVersion = viewVersion; this.instanceName = instanceName; http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 b301fd7..515d4ac 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,7 +32,6 @@ 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; @@ -70,8 +69,7 @@ public class ViewExternalSubResourceService extends BaseService { // ----- Constructors ------------------------------------------------------ - public ViewExternalSubResourceService(ApiVersion apiVersion, Resource.Type type, ViewInstanceEntity viewInstanceDefinition) { - super(apiVersion); + public ViewExternalSubResourceService(Resource.Type type, ViewInstanceEntity viewInstanceDefinition) { ViewEntity viewEntity = viewInstanceDefinition.getViewEntity(); this.type = type; http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 2a3731e..b10738d 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,7 +35,6 @@ 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; @@ -68,8 +67,7 @@ public class ViewInstanceService extends BaseService { * @param viewName the view id * @param version the version */ - public ViewInstanceService(ApiVersion apiVersion, String viewName, String version) { - super(apiVersion); + public ViewInstanceService(String viewName, String version) { this.viewName = viewName; this.version = version; @@ -240,13 +238,13 @@ public class ViewInstanceService extends BaseService { hasPermission(Request.Type.valueOf(request.getMethod()), instanceName); - return new ViewPrivilegeService(m_apiVersion, viewName, version, instanceName); + return new ViewPrivilegeService(viewName, version, instanceName); } @Path("{instanceName}/migrate") public ViewDataMigrationService migrateData(@Context javax.ws.rs.core.Request request, @PathParam ("instanceName") String instanceName) { - return new ViewDataMigrationService(m_apiVersion, viewName, version, instanceName); + return new ViewDataMigrationService(viewName, version, instanceName); } // ----- helper methods ---------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 04bbdcc..86bfa14 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,7 +34,6 @@ 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; @@ -62,8 +61,7 @@ public class ViewPermissionService extends BaseService { * @param viewName the view id * @param version the version */ - public ViewPermissionService(ApiVersion apiVersion, String viewName, String version) { - super(apiVersion); + public ViewPermissionService(String viewName, String version) { this.viewName = viewName; this.version = version; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 8e64388..34dd4c2 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,7 +22,6 @@ 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; /** @@ -34,8 +33,7 @@ public class ViewPrivilegeService extends PrivilegeService { private final String viewVersion; private final String instanceName; - public ViewPrivilegeService(ApiVersion apiVersion, String viewName, String viewVersion, String instanceName) { - super(apiVersion); + public ViewPrivilegeService(String viewName, String viewVersion, String instanceName) { this.viewName = viewName; this.viewVersion = viewVersion; this.instanceName = instanceName; http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 8e16fa6..17a9f34 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,19 +33,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; /** * 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. @@ -146,7 +142,7 @@ public class ViewService extends BaseService { */ @Path("{viewName}/versions") public ViewVersionService getInstanceHandler(@PathParam("viewName") String viewName) { - return new ViewVersionService(m_apiVersion, viewName); + return new ViewVersionService(viewName); } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 2532a28..6e00d10 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,7 +26,6 @@ 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; @@ -62,8 +61,7 @@ public class ViewSubResourceService extends BaseService implements ViewResourceH /** * Construct a view sub-resource service. */ - public ViewSubResourceService(ApiVersion apiVersion, Resource.Type type, ViewInstanceEntity viewInstanceDefinition) { - super(apiVersion); + public ViewSubResourceService(Resource.Type type, ViewInstanceEntity viewInstanceDefinition) { ViewEntity viewEntity = viewInstanceDefinition.getViewEntity(); this.type = type; http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 8eaf496..fa0be7d 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,7 +33,6 @@ 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; @@ -43,12 +42,9 @@ 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/bf0bb2ea/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 72b1d6e..c10bf00 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,7 +34,6 @@ 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,8 +55,7 @@ public class ViewVersionService extends BaseService { * * @param viewName the view name */ - public ViewVersionService(ApiVersion apiVersion, String viewName) { - super(apiVersion); + public ViewVersionService(String viewName) { this.viewName = viewName; } @@ -166,7 +164,7 @@ public class ViewVersionService extends BaseService { @Path("{version}/instances") public ViewInstanceService getInstanceHandler(@PathParam("version") String version) { - return new ViewInstanceService(m_apiVersion, viewName, version); + return new ViewInstanceService(viewName, version); } /** @@ -179,7 +177,7 @@ public class ViewVersionService extends BaseService { @Path("{version}/permissions") public ViewPermissionService getPermissionHandler(@PathParam("version") String version) { - return new ViewPermissionService(m_apiVersion, viewName, version); + return new ViewPermissionService(viewName, version); } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 cccab69..4886165 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,7 +33,6 @@ 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,8 +42,7 @@ public class WidgetLayoutService extends BaseService { private final String clusterName; - public WidgetLayoutService(ApiVersion apiVersion, String clusterName) { - super(apiVersion); + public WidgetLayoutService(String clusterName) { this.clusterName = clusterName; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 1e7777b..e0fe801 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,7 +33,6 @@ 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,8 +42,7 @@ public class WidgetService extends BaseService { private final String clusterName; - public WidgetService(ApiVersion apiVersion, String clusterName) { - super(apiVersion); + public WidgetService(String clusterName) { this.clusterName = clusterName; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 31faf96..abffedd 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,7 +31,6 @@ 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,8 +45,7 @@ public class WorkflowService extends BaseService { * @param clusterName * cluster id */ - public WorkflowService(ApiVersion apiVersion, String clusterName) { - super(apiVersion); + public WorkflowService(String clusterName) { this.clusterName = clusterName; } @@ -92,7 +90,7 @@ public class WorkflowService extends BaseService { */ @Path("{workflowId}/jobs") public JobService getJobHandler(@PathParam("workflowId") String workflowId) { - return new JobService(m_apiVersion, clusterName, workflowId); + return new JobService(clusterName, workflowId); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 7ff2112..05e7598 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,7 +31,6 @@ 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; @@ -83,10 +82,10 @@ public class StackAdvisorHelper { StackAdvisorRequestType requestType) throws StackAdvisorException { StackAdvisorCommand<ValidationResponse> command; if (requestType == StackAdvisorRequestType.HOST_GROUPS) { - command = new ComponentLayoutValidationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, + command = new ComponentLayoutValidationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } else if (requestType == StackAdvisorRequestType.CONFIGURATIONS) { - command = new ConfigurationValidationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, + command = new ConfigurationValidationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } else { throw new StackAdvisorRequestException(String.format("Unsupported request type, type=%s", @@ -118,13 +117,13 @@ public class StackAdvisorHelper { StackAdvisorRequestType requestType) throws StackAdvisorException { StackAdvisorCommand<RecommendationResponse> command; if (requestType == StackAdvisorRequestType.HOST_GROUPS) { - command = new ComponentLayoutRecommendationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, + command = new ComponentLayoutRecommendationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } else if (requestType == StackAdvisorRequestType.CONFIGURATIONS) { - command = new ConfigurationRecommendationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, + command = new ConfigurationRecommendationCommand(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } else if (requestType == StackAdvisorRequestType.CONFIGURATION_DEPENDENCIES) { - command = new ConfigurationDependenciesRecommendationCommand(ApiVersion.Default, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, + command = new ConfigurationDependenciesRecommendationCommand(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/bf0bb2ea/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 35f7e0d..87725dc 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,7 +25,6 @@ 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 @@ -34,13 +33,13 @@ import org.apache.ambari.server.api.util.ApiVersion; public class ComponentLayoutRecommendationCommand extends StackAdvisorCommand<RecommendationResponse> { - public ComponentLayoutRecommendationCommand(ApiVersion apiVersion, File recommendationsDir, + public ComponentLayoutRecommendationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) { - super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); + super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 b93cd81..310046f 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,16 +25,15 @@ 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(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, + public ComponentLayoutValidationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) { - super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); + super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 b765689..6a2adfa 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,7 +32,6 @@ 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 @@ -41,9 +40,9 @@ import org.apache.ambari.server.api.util.ApiVersion; public class ConfigurationDependenciesRecommendationCommand extends StackAdvisorCommand<RecommendationResponse> { - public ConfigurationDependenciesRecommendationCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, + public ConfigurationDependenciesRecommendationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) { - super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); + super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 70b14fd..6eaf19e 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,7 +32,6 @@ 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 @@ -41,9 +40,9 @@ import org.apache.ambari.server.api.util.ApiVersion; public class ConfigurationRecommendationCommand extends StackAdvisorCommand<RecommendationResponse> { - public ConfigurationRecommendationCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, + public ConfigurationRecommendationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) { - super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); + super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 a5717b9..60132a1 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,16 +25,15 @@ 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(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, + public ConfigurationValidationCommand(File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, StackAdvisorRunner saRunner, AmbariMetaInfo metaInfo) { - super(apiVersion, recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); + super(recommendationsDir, recommendationsArtifactsLifetime, stackAdvisorScript, requestId, saRunner, metaInfo); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 85fc13f..74a2cf2 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,7 +45,6 @@ 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; @@ -110,9 +109,8 @@ public abstract class StackAdvisorCommand<T extends StackAdvisorResponse> extend private final AmbariMetaInfo metaInfo; @SuppressWarnings("unchecked") - public StackAdvisorCommand(ApiVersion apiVersion, File recommendationsDir, String recommendationsArtifactsLifetime, String stackAdvisorScript, int requestId, + public StackAdvisorCommand(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/bf0bb2ea/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 deleted file mode 100644 index f66f32e..0000000 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/util/ApiVersion.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * 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/bf0bb2ea/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 ab4c256..d4e45a8 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 @@ -31,7 +31,6 @@ 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; @@ -899,12 +898,11 @@ 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(ApiVersion apiVersion, String clusterName); + LoggingService getLoggingService(String clusterName); /** http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 471e924..eed45dd 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,7 +90,6 @@ 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; @@ -5267,20 +5266,14 @@ 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(ApiVersion apiVersion, String clusterName) { - LoggingService loggingService = new LoggingService(apiVersion, clusterName); + public LoggingService getLoggingService(String clusterName) { + LoggingService loggingService = new LoggingService(clusterName); injector.injectMembers(loggingService); return loggingService; } http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 f334c98..2f799b7 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,10 +169,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer; @Singleton public class AmbariServer { - 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/*"; + public static final String VIEWS_URL_PATTERN = "/api/v1/views/*"; private static Logger LOG = LoggerFactory.getLogger(AmbariServer.class); /** @@ -394,25 +391,18 @@ 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_V1_URL_PATTERN, - DISPATCHER_TYPES); - root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsSecurityHeaderFilter.class)), VIEWS_V2_URL_PATTERN, + root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsSecurityHeaderFilter.class)), VIEWS_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_V1_URL_PATTERN, DISPATCHER_TYPES); - root.addFilter(new FilterHolder(injector.getInstance(ViewThrottleFilter.class)), - VIEWS_V2_URL_PATTERN, DISPATCHER_TYPES); + VIEWS_URL_PATTERN, DISPATCHER_TYPES); // adds MDC info for views logging root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsMDCLoggingFilter.class)), - VIEWS_V1_URL_PATTERN, DISPATCHER_TYPES); - root.addFilter(new FilterHolder(injector.getInstance(AmbariViewsMDCLoggingFilter.class)), - VIEWS_V2_URL_PATTERN, DISPATCHER_TYPES); + VIEWS_URL_PATTERN, DISPATCHER_TYPES); // session-per-request strategy for api root.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/api/*", DISPATCHER_TYPES); @@ -422,8 +412,7 @@ public class AmbariServer { root.addEventListener(new RequestContextListener()); root.addFilter(new FilterHolder(springSecurityFilter), "/api/*", 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); + root.addFilter(new FilterHolder(new UserNameOverrideFilter()), "/api/v1/users/*", DISPATCHER_TYPES); // session-per-request strategy for agents agentroot.addFilter(new FilterHolder(injector.getInstance(AmbariPersistFilter.class)), "/agent/*", DISPATCHER_TYPES); @@ -460,7 +449,7 @@ public class AmbariServer { "org.apache.ambari.server.api"); sh.setInitParameter("com.sun.jersey.api.json.POJOMappingFeature", "true"); - root.addServlet(sh, "/api/*"); + root.addServlet(sh, "/api/v1/*"); sh.setInitOrder(2); SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL); http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 bea2884..0125d54 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,7 +52,6 @@ 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; @@ -1340,7 +1339,7 @@ public class ViewRegistry { ViewContext viewInstanceContext = new ViewContextImpl(viewInstanceDefinition, this); ViewExternalSubResourceService externalSubResourceService = - new ViewExternalSubResourceService(ApiVersion.Default, viewDefinition.getExternalResourceType(), viewInstanceDefinition); + new ViewExternalSubResourceService(viewDefinition.getExternalResourceType(), viewInstanceDefinition); viewInstanceDefinition.addService(ResourceConfig.EXTERNAL_RESOURCE_PLURAL_NAME, externalSubResourceService); @@ -1350,7 +1349,7 @@ public class ViewRegistry { Resource.Type type = resourceDefinition.getType(); ResourceConfig resourceConfig = resourceDefinition.getResourceConfiguration(); - ViewResourceHandler viewResourceService = new ViewSubResourceService(ApiVersion.Default, type, viewInstanceDefinition); + ViewResourceHandler viewResourceService = new ViewSubResourceService(type, viewInstanceDefinition); ClassLoader cl = viewDefinition.getClassLoader(); http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 4f81c95..b5fb6f8 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,7 +30,6 @@ 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. @@ -77,7 +76,6 @@ 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/bf0bb2ea/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 f111afd..adae956 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,7 +25,6 @@ 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; @@ -47,7 +46,7 @@ public class ActiveWidgetLayoutServiceTest { private class TestActiveWidgetLayoutService extends ActiveWidgetLayoutService { public TestActiveWidgetLayoutService(String username) { - super(ApiVersion.Default, username); + super(username); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/bf0bb2ea/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 e69055a..165dd6c 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,7 +30,6 @@ 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. @@ -79,7 +78,6 @@ public class BlueprintServiceTest extends BaseServiceTest { private String m_blueprintId; private TestBlueprintService(String blueprintId) { - super(ApiVersion.Default); m_blueprintId = blueprintId; }
