Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 42377200BFF for ; Mon, 12 Dec 2016 18:25:31 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 40E8F160B2A; Mon, 12 Dec 2016 17:25:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A0B06160B44 for ; Mon, 12 Dec 2016 18:25:28 +0100 (CET) Received: (qmail 33244 invoked by uid 500); 12 Dec 2016 17:25:27 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 32440 invoked by uid 99); 12 Dec 2016 17:25:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Dec 2016 17:25:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5FCAEEEE2F; Mon, 12 Dec 2016 17:25:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Mon, 12 Dec 2016 17:25:44 -0000 Message-Id: In-Reply-To: <17f1cbce1f1645d7815a1a00ad9df784@git.apache.org> References: <17f1cbce1f1645d7815a1a00ad9df784@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/21] ambari git commit: AMBARI-19149 - Clean up Ambari Server source code warnings (Attila Doroszlai via jonathanhurley) archived-at: Mon, 12 Dec 2016 17:25:31 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 cfbfc7f..946c444 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 @@ -18,6 +18,9 @@ package org.apache.ambari.server.api.services; +import java.util.HashMap; +import java.util.Map; + import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -30,9 +33,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; -import java.util.HashMap; -import java.util.Map; - /** * Service responsible for services resource requests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 01f8e8f..27786ae 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,8 +32,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for handling REST requests for the /clusters/{cluster_name}/credentials endpoint. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteRequest.java index da31f26..fad8853 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteRequest.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.api.services; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.UriInfo; + import org.apache.ambari.server.api.handlers.DeleteHandler; import org.apache.ambari.server.api.handlers.RequestHandler; import org.apache.ambari.server.api.resources.ResourceInstance; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; - /** * A DELETE request. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteResultMetadata.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteResultMetadata.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteResultMetadata.java index e910234..3dfd292 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteResultMetadata.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/DeleteResultMetadata.java @@ -18,14 +18,6 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.ObjectNotFoundException; -import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; -import org.apache.ambari.server.controller.spi.NoSuchResourceException; -import org.apache.ambari.server.controller.spi.SystemException; -import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; -import org.apache.ambari.server.security.authorization.AuthorizationException; -import org.apache.commons.lang.Validate; - import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -33,6 +25,12 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.ambari.server.ObjectNotFoundException; +import org.apache.ambari.server.controller.spi.SystemException; +import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; +import org.apache.ambari.server.security.authorization.AuthorizationException; +import org.apache.commons.lang.Validate; + /** * Implementation of ResultDetails for DELETE API requests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 6741303..4a87c32 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 @@ -18,8 +18,7 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,7 +31,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * DR feed service. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/GetRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GetRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GetRequest.java index 1bae595..2d24a8d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GetRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GetRequest.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.api.services; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.UriInfo; + import org.apache.ambari.server.api.handlers.ReadHandler; import org.apache.ambari.server.api.handlers.RequestHandler; import org.apache.ambari.server.api.resources.ResourceInstance; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; - /** * A GET request. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 290d488..9c1f1a3 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 @@ -18,15 +18,16 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for group privilege resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 7ecd87f..8ec0097 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 @@ -17,6 +17,8 @@ */ package org.apache.ambari.server.api.services; +import java.util.Collections; + import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -31,8 +33,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Collections; - /** * Service responsible for user groups requests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 624a335..418b4d5 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -31,8 +31,9 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for kerberos identity resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 e771ccc..5c48824 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 @@ -18,6 +18,9 @@ package org.apache.ambari.server.api.services; +import java.util.HashMap; +import java.util.Map; + import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -33,9 +36,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; -import java.util.HashMap; -import java.util.Map; - /** * Service responsible for instances resource requests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 91e1dc5..5f20c4f 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 @@ -1,7 +1,6 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -13,7 +12,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 6d2d22f..9ddcc79 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 @@ -17,18 +17,20 @@ */ package org.apache.ambari.server.api.services; -import com.google.inject.Inject; -import org.apache.ambari.server.utils.StageUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.util.Collection; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.util.Collection; + +import org.apache.ambari.server.utils.StageUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.inject.Inject; @Path("/keys/") public class KeyService { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 bf4bcff..61f5ba7 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 @@ -18,8 +18,7 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,7 +31,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for ldap sync event resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 bfa6975..ea4960f 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 @@ -18,6 +18,22 @@ package org.apache.ambari.server.api.services; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +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.HttpHeaders; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Response; +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.controller.AmbariManagementController; @@ -36,21 +52,6 @@ import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.utils.RetryHelper; import org.apache.commons.lang.StringUtils; -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.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * This Service provides access to the LogSearch query services, including: * - Access to all service log files in a given cluster http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 02403f9..f2f5e0e 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 @@ -29,9 +29,9 @@ import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.audit.event.LogoutAuditEvent; import org.apache.ambari.server.security.authorization.AuthorizationHelper; import org.apache.ambari.server.utils.RequestUtils; +import org.springframework.security.core.context.SecurityContextHolder; import com.google.inject.Inject; -import org.springframework.security.core.context.SecurityContextHolder; /** * Service performing logout of current user http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 3a1a875..bb33884 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 @@ -18,8 +18,7 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,7 +31,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java index 3a6cd88..52a20df 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java @@ -18,15 +18,21 @@ package org.apache.ambari.server.api.services; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.dao.KeyValueDAO; -import org.apache.ambari.server.orm.entities.KeyValueEntity; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; -import java.util.*; + +import org.apache.ambari.server.orm.dao.KeyValueDAO; +import org.apache.ambari.server.orm.entities.KeyValueEntity; + +import com.google.inject.Inject; +import com.google.inject.Singleton; @Singleton public class PersistKeyValueImpl { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/PostRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PostRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PostRequest.java index ef7a306..8ac7b83 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PostRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PostRequest.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.api.services; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.UriInfo; + import org.apache.ambari.server.api.handlers.CreateHandler; import org.apache.ambari.server.api.handlers.RequestHandler; import org.apache.ambari.server.api.resources.ResourceInstance; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; - /** * A POST request. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 2caa5d2..ab07bce 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 @@ -18,8 +18,6 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; - import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -32,6 +30,8 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.server.api.resources.ResourceInstance; + /** * Service responsible for privilege requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/PutRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PutRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PutRequest.java index f7c4064..b98fdbb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PutRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PutRequest.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.api.services; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.UriInfo; + import org.apache.ambari.server.api.handlers.RequestHandler; import org.apache.ambari.server.api.handlers.UpdateHandler; import org.apache.ambari.server.api.resources.ResourceInstance; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; - /** * A PUT request. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/QueryPostRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/QueryPostRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/QueryPostRequest.java index 04a007c..c721e75 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/QueryPostRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/QueryPostRequest.java @@ -19,13 +19,13 @@ package org.apache.ambari.server.api.services; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.UriInfo; + import org.apache.ambari.server.api.handlers.QueryCreateHandler; import org.apache.ambari.server.api.handlers.RequestHandler; import org.apache.ambari.server.api.resources.ResourceInstance; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; - /** * Request for creating sub-resources of instances based on a query. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 d7c7a20..799ae5f 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 @@ -18,10 +18,7 @@ package org.apache.ambari.server.api.services; -import com.google.common.base.Optional; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.security.authorization.AuthorizationException; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -34,7 +31,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java index 771875a..3c5524f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java @@ -18,17 +18,17 @@ package org.apache.ambari.server.api.services; +import java.util.List; +import java.util.Map; + import org.apache.ambari.server.api.query.render.Renderer; import org.apache.ambari.server.api.resources.ResourceDefinition; import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.SortRequest; import org.apache.ambari.server.controller.spi.PageRequest; import org.apache.ambari.server.controller.spi.Predicate; +import org.apache.ambari.server.controller.spi.SortRequest; import org.apache.ambari.server.controller.spi.TemporalInfo; -import java.util.List; -import java.util.Map; - /** * Provides information on the current request. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java index 2f71776..05b9d9c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java @@ -18,16 +18,17 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceDefinition; -import org.apache.ambari.server.api.resources.ResourceInstance; - -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.UriInfo; + +import org.apache.ambari.server.api.resources.ResourceDefinition; +import org.apache.ambari.server.api.resources.ResourceInstance; + /** * Factory for {@link Request} instances. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 3ad589c..90bc3ee 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 @@ -17,13 +17,12 @@ */ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; -import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; @@ -31,8 +30,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for management of a batch of requests with attached http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 e1bccec..f6d62d8 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 @@ -19,8 +19,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -32,8 +32,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java index 6078667..8355dcf 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/Result.java @@ -19,8 +19,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.api.util.TreeNode; +import org.apache.ambari.server.controller.spi.Resource; /** * Represents a result from a request handler invocation. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java index 6de1492..4b46387 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java @@ -19,9 +19,9 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.api.util.TreeNodeImpl; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java index 4d469d7..a1a0392 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java @@ -18,12 +18,6 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.RequestResourceDefinition; -import org.apache.ambari.server.api.resources.ResourceDefinition; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.api.util.TreeNode; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.ArrayList; @@ -31,6 +25,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ambari.server.api.resources.RequestResourceDefinition; +import org.apache.ambari.server.api.resources.ResourceDefinition; +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.api.util.TreeNode; +import org.apache.ambari.server.controller.spi.Resource; + /** * Processes returned results to add href's and other content. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 60f8a36..8bc2041 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -29,8 +29,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * RoleAuthorizationService is a read-only service responsible for role authorization resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 03a64e2..569a3d7 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Produces; @@ -27,8 +27,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; public class ServiceConfigVersionService extends BaseService { /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 db6f002..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 @@ -18,9 +18,7 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; - +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -33,7 +31,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for setting resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 6c24d4d..76f605d 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 @@ -19,8 +19,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -32,8 +32,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 34c8c26..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 @@ -18,8 +18,7 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,7 +31,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * DR target cluster service. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 9151415..8f0bcdd 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -29,8 +29,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for task resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 b8b3e86..d91ac1b 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 @@ -17,8 +17,8 @@ */ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -28,8 +28,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 c288fdb..26a7107 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -29,9 +29,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; import org.apache.commons.lang.StringUtils; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 86c4995..f9c95e7 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,9 +18,6 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.HashMap; import java.util.Map; @@ -29,6 +26,8 @@ import javax.ws.rs.core.HttpHeaders; 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.controller.spi.Resource; import org.apache.commons.lang.StringUtils; /** * Service responsible for user privilege resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 a0fccad..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 @@ -17,6 +17,8 @@ */ package org.apache.ambari.server.api.services; +import java.util.Collections; + import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -32,10 +34,6 @@ import javax.ws.rs.core.UriInfo; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.commons.lang.StringUtils; - -import java.util.Collections; - /** * Service responsible for user requests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 4a71ce2..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 @@ -17,6 +17,12 @@ */ package org.apache.ambari.server.api.services; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; + import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.server.view.ViewDataMigrationUtility; import org.apache.ambari.server.view.ViewRegistry; @@ -24,12 +30,6 @@ import org.apache.ambari.view.migration.ViewDataMigrationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; - /** * Service responsible for data migration between view instances. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 47ac0df..66ccae7 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 @@ -18,10 +18,9 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.orm.entities.ViewEntity; -import org.apache.ambari.server.orm.entities.ViewInstanceEntity; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -31,9 +30,11 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.orm.entities.ViewEntity; +import org.apache.ambari.server.orm.entities.ViewInstanceEntity; /** * Service responsible for view sub-resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 fa0850e..53d4918 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 @@ -18,11 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.orm.entities.ViewInstanceEntity; -import org.apache.ambari.server.security.authorization.AuthorizationException; -import org.apache.ambari.server.view.ViewRegistry; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -36,8 +33,12 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.orm.entities.ViewInstanceEntity; +import org.apache.ambari.server.security.authorization.AuthorizationException; +import org.apache.ambari.server.view.ViewRegistry; /** * Service responsible for instances resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 711e85b..8f7f4ef 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,8 +32,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 9181467..7393745 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 @@ -18,12 +18,12 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.HashMap; import java.util.Map; +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; + /** * Service responsible for view privilege resource requests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 b7edbe3..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 @@ -18,8 +18,7 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,7 +31,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 dae586b..76d28fe 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 @@ -18,18 +18,19 @@ package org.apache.ambari.server.api.services; +import java.util.HashMap; +import java.util.Map; + +import javax.ws.rs.core.HttpHeaders; +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.controller.spi.Resource; import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.view.ViewResourceHandler; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; - /** * View sub-resource service. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 3827c18..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 @@ -18,10 +18,7 @@ package org.apache.ambari.server.api.services; -import com.google.common.base.Optional; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.security.authorization.AuthorizationException; +import java.util.Collections; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -34,7 +31,12 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.security.authorization.AuthorizationException; + +import com.google.common.base.Optional; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 8152ae6..3554da1 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 @@ -18,8 +18,8 @@ package org.apache.ambari.server.api.services; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -32,8 +32,9 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 3902236..51d85ea 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 @@ -17,19 +17,23 @@ */ package org.apache.ambari.server.api.services; -import com.sun.jersey.core.util.Base64; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashMap; +import java.util.Map; -import javax.ws.rs.*; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +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; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * WidgetLayout Service http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 e6907db..d6aa768 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 @@ -17,20 +17,23 @@ */ package org.apache.ambari.server.api.services; -import com.sun.jersey.core.util.Base64; -import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.security.authorization.AuthorizationHelper; +import java.util.HashMap; +import java.util.Map; -import javax.ws.rs.*; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +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; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Widget Service http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/RequestBodyParser.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/RequestBodyParser.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/RequestBodyParser.java index 6e9c4c5..dc16b3e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/RequestBodyParser.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/parsers/RequestBodyParser.java @@ -18,10 +18,10 @@ package org.apache.ambari.server.api.services.parsers; -import org.apache.ambari.server.api.services.RequestBody; - import java.util.Set; +import org.apache.ambari.server.api.services.RequestBody; + /** * Parse the provided String into a map of properties and associated values. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java index 0dd8643..4dcfe75 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java @@ -18,6 +18,11 @@ package org.apache.ambari.server.api.services.persistence; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.NamedPropertySet; import org.apache.ambari.server.api.services.RequestBody; @@ -37,11 +42,6 @@ import org.apache.ambari.server.security.authorization.AuthorizationHelper; import org.apache.ambari.server.security.authorization.ResourceType; import org.apache.ambari.server.security.authorization.RoleAuthorization; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - /** * Persistence Manager implementation. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/CsvSerializer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/CsvSerializer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/CsvSerializer.java index 04dd1ab..92d8b69 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/CsvSerializer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/CsvSerializer.java @@ -18,22 +18,19 @@ package org.apache.ambari.server.api.services.serializers; -import org.apache.ambari.server.api.services.Result; -import org.apache.ambari.server.api.services.ResultStatus; -import org.apache.ambari.server.api.util.TreeNode; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVPrinter; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; + +import org.apache.ambari.server.api.services.Result; +import org.apache.ambari.server.api.services.ResultStatus; +import org.apache.ambari.server.api.util.TreeNode; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVPrinter; /** * CSV serializer used to generate a CSV-formatted document from a result. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java index 5a75874..3ee7951 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/JsonSerializer.java @@ -18,23 +18,25 @@ package org.apache.ambari.server.api.services.serializers; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.nio.charset.Charset; +import java.util.LinkedHashMap; +import java.util.Map; + import org.apache.ambari.server.api.services.DeleteResultMetadata; +import org.apache.ambari.server.api.services.Result; import org.apache.ambari.server.api.services.ResultMetadata; import org.apache.ambari.server.api.services.ResultStatus; -import org.apache.ambari.server.api.services.Result; +import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.api.util.TreeNodeImpl; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.api.util.TreeNode; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.util.DefaultPrettyPrinter; -import java.io.*; -import java.nio.charset.Charset; -import java.util.LinkedHashMap; -import java.util.Map; - /** * JSON serializer. * Responsible for representing a result as JSON. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/ResultSerializer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/ResultSerializer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/ResultSerializer.java index 53b3b80..2ef0c41 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/ResultSerializer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/serializers/ResultSerializer.java @@ -19,8 +19,8 @@ package org.apache.ambari.server.api.services.serializers; -import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.api.services.Result; +import org.apache.ambari.server.api.services.ResultStatus; /** * Format internal result to format expected by client. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java index 67dfded..4bb4f39 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java @@ -18,26 +18,18 @@ package org.apache.ambari.server.api.services.stackadvisor; -import com.google.common.base.Preconditions; -import com.google.common.base.Predicates; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import com.google.inject.Singleton; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; - import java.util.Set; + import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRequest.StackAdvisorRequestType; import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse; import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.BlueprintConfigurations; import org.apache.ambari.server.controller.internal.ConfigurationTopologyException; import org.apache.ambari.server.controller.internal.Stack; -import org.apache.ambari.server.orm.entities.BlueprintConfiguration; import org.apache.ambari.server.state.ValueAttributesInfo; import org.apache.ambari.server.topology.AdvisedConfiguration; import org.apache.ambari.server.topology.Blueprint; @@ -49,6 +41,13 @@ import org.apache.ambari.server.topology.HostGroupInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; +import com.google.common.base.Predicates; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.google.inject.Singleton; + /** * Generate advised configurations for blueprint cluster provisioning by the stack advisor. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java index b804c7e..6c48007 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java @@ -28,7 +28,6 @@ import java.util.Set; import org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse; import org.apache.ambari.server.state.ChangedConfigInfo; -import org.apache.ambari.server.state.PropertyDependencyInfo; import org.apache.commons.lang.StringUtils; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 dd2a7d2..381062f 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 @@ -18,11 +18,8 @@ package org.apache.ambari.server.api.services.stackadvisor.commands; -import org.apache.ambari.server.api.services.AmbariMetaInfo; -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 static org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.BindingHostGroup; +import static org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.HostGroup; import java.io.File; import java.util.HashMap; @@ -30,8 +27,11 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.BindingHostGroup; -import static org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.HostGroup; +import org.apache.ambari.server.api.services.AmbariMetaInfo; +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; /** * {@link StackAdvisorCommand} implementation for http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 e6279c4..4299282 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 @@ -18,12 +18,8 @@ package org.apache.ambari.server.api.services.stackadvisor.commands; -import org.apache.ambari.server.api.services.AmbariMetaInfo; -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 static org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.*; +import static org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.BindingHostGroup; +import static org.apache.ambari.server.api.services.stackadvisor.recommendations.RecommendationResponse.HostGroup; import java.io.File; import java.util.HashMap; @@ -31,6 +27,12 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.ambari.server.api.services.AmbariMetaInfo; +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; + /** * {@link org.apache.ambari.server.api.services.stackadvisor.commands.StackAdvisorCommand} implementation for * configuration recommendation. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 6f612af..5a498ac 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 @@ -50,13 +50,9 @@ import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.filefilter.AgeFileFilter; -import org.apache.commons.io.filefilter.FalseFileFilter; -import org.apache.commons.io.filefilter.TrueFileFilter; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.derby.iapi.util.StringUtil; import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerModule.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerModule.java index 1ab53a9..d8b8466 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/AuditLoggerModule.java @@ -23,9 +23,9 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.apache.ambari.server.audit.request.eventcreator.RequestAuditEventCreator; import org.apache.ambari.server.audit.request.RequestAuditLogger; import org.apache.ambari.server.audit.request.RequestAuditLoggerImpl; +import org.apache.ambari.server.audit.request.eventcreator.RequestAuditEventCreator; import org.apache.ambari.server.cleanup.ClasspathScannerUtils; import com.google.inject.AbstractModule; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java index 26a856b..c426397 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java @@ -31,8 +31,6 @@ import org.apache.ambari.server.controller.internal.AlertTargetResourceProvider; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.notifications.dispatchers.EmailDispatcher; import org.apache.ambari.server.state.services.AlertNoticeDispatchService; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.User; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java index f0ea4ec..492066c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java @@ -18,6 +18,7 @@ package org.apache.ambari.server.audit.request.eventcreator; +import java.util.Map; import java.util.Set; import org.apache.ambari.server.api.services.Request; @@ -26,9 +27,9 @@ import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.audit.event.AuditEvent; import org.apache.ambari.server.audit.event.request.AddRequestRequestAuditEvent; import org.apache.ambari.server.controller.internal.RequestOperationLevel; -import org.apache.ambari.server.controller.spi.Resource; -import java.util.Map; import org.apache.ambari.server.controller.internal.RequestResourceProvider; +import org.apache.ambari.server.controller.spi.Resource; + import com.google.common.collect.ImmutableSet; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java index 46b9e81..6c77dee 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BSRunner.java @@ -21,7 +21,10 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java index c24eb49..0394074 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/BootStrapImpl.java @@ -32,7 +32,6 @@ import org.apache.commons.logging.LogFactory; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.apache.ambari.server.controller.AmbariServer; @Singleton public class BootStrapImpl { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java index 4bc64d4..3fc8650 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java @@ -24,8 +24,8 @@ import java.util.Set; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.services.AmbariMetaInfo; -import org.apache.ambari.server.controller.PrereqCheckRequest; import org.apache.ambari.server.configuration.Configuration; +import org.apache.ambari.server.controller.PrereqCheckRequest; import org.apache.ambari.server.orm.dao.ClusterVersionDAO; import org.apache.ambari.server.orm.dao.HostVersionDAO; import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; @@ -35,7 +35,6 @@ import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.DesiredConfig; import org.apache.ambari.server.state.ServiceInfo; -import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.stack.PrereqCheckType; import org.apache.ambari.server.state.stack.PrerequisiteCheck; import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;