http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java index c4a80f2..3f40ac8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java @@ -18,9 +18,13 @@ package org.apache.ambari.server.api; -import com.google.gson.Gson; -import com.google.inject.Inject; -import com.google.inject.name.Named; +import java.io.IOException; +import java.util.LinkedHashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.security.authorization.jwt.JwtAuthenticationProperties; import org.eclipse.jetty.http.HttpStatus; @@ -29,11 +33,9 @@ import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.ErrorHandler; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.LinkedHashMap; -import java.util.Map; +import com.google.gson.Gson; +import com.google.inject.Inject; +import com.google.inject.name.Named; /** * Custom error handler for Jetty to return response as JSON instead of stub http page
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java index a5ab041..5643f7b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariPersistFilter.java @@ -17,13 +17,19 @@ */ package org.apache.ambari.server.api; +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.persist.UnitOfWork; -import javax.servlet.*; -import java.io.IOException; - /** * Replacement for Guice built-in PersistFilter as PersistService is started on Ambari start */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java index e793957..8b9ddee 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/GsonJsonProvider.java @@ -19,19 +19,6 @@ package org.apache.ambari.server.api; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -42,6 +29,21 @@ import java.io.Writer; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import javax.ws.rs.Consumes; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.ext.MessageBodyReader; +import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.ext.Provider; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + @Provider @Consumes({MediaType.APPLICATION_JSON, "text/json"}) @Produces({MediaType.APPLICATION_JSON, "text/json"}) http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java index c2e04ab..2865bcd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/MethodOverrideFilter.java @@ -18,7 +18,9 @@ package org.apache.ambari.server.api; -import org.springframework.http.HttpMethod; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -29,9 +31,8 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; + +import org.springframework.http.HttpMethod; public class MethodOverrideFilter implements Filter { private static final String HEADER_NAME = "X-Http-Method-Override"; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java index 20daf10..366ff13 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java @@ -18,9 +18,15 @@ package org.apache.ambari.server.api.handlers; +import java.util.Set; + import org.apache.ambari.server.api.query.Query; -import org.apache.ambari.server.api.resources.*; -import org.apache.ambari.server.api.services.*; +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.api.services.Request; +import org.apache.ambari.server.api.services.RequestBody; +import org.apache.ambari.server.api.services.Result; +import org.apache.ambari.server.api.services.ResultImpl; +import org.apache.ambari.server.api.services.ResultMetadata; import org.apache.ambari.server.api.services.persistence.PersistenceManager; import org.apache.ambari.server.api.services.persistence.PersistenceManagerImpl; import org.apache.ambari.server.api.util.TreeNode; @@ -30,12 +36,9 @@ import org.apache.ambari.server.controller.spi.RequestStatus; import org.apache.ambari.server.controller.spi.RequestStatusMetaData; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Set; - /** * Base handler for operations that persist state to the back-end. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java index 3498a90..069baa0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/CreateHandler.java @@ -18,10 +18,18 @@ package org.apache.ambari.server.api.handlers; -import org.apache.ambari.server.api.resources.*; -import org.apache.ambari.server.api.services.*; +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.api.services.RequestBody; +import org.apache.ambari.server.api.services.Result; +import org.apache.ambari.server.api.services.ResultImpl; +import org.apache.ambari.server.api.services.ResultMetadata; import org.apache.ambari.server.api.services.ResultStatus; -import org.apache.ambari.server.controller.spi.*; +import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; +import org.apache.ambari.server.controller.spi.RequestStatus; +import org.apache.ambari.server.controller.spi.RequestStatusMetaData; +import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException; +import org.apache.ambari.server.controller.spi.SystemException; +import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; import org.apache.ambari.server.security.authorization.AuthorizationException; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java index d933c27..96dab1c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/DeleteHandler.java @@ -20,12 +20,11 @@ package org.apache.ambari.server.api.handlers; import org.apache.ambari.server.ConfigGroupNotFoundException; import org.apache.ambari.server.api.resources.ResourceInstance; - import org.apache.ambari.server.api.services.DeleteResultMetadata; import org.apache.ambari.server.api.services.RequestBody; import org.apache.ambari.server.api.services.Result; -import org.apache.ambari.server.api.services.ResultMetadata; import org.apache.ambari.server.api.services.ResultImpl; +import org.apache.ambari.server.api.services.ResultMetadata; import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.controller.internal.DeleteStatusMetaData; import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java index b04754e..beb8ea2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java @@ -19,17 +19,33 @@ package org.apache.ambari.server.api.handlers; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.resources.ResourceInstanceFactory; import org.apache.ambari.server.api.resources.ResourceInstanceFactoryImpl; -import org.apache.ambari.server.api.services.*; +import org.apache.ambari.server.api.services.NamedPropertySet; import org.apache.ambari.server.api.services.Request; +import org.apache.ambari.server.api.services.RequestBody; +import org.apache.ambari.server.api.services.Result; +import org.apache.ambari.server.api.services.ResultImpl; +import org.apache.ambari.server.api.services.ResultMetadata; +import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.api.util.TreeNode; -import org.apache.ambari.server.controller.spi.*; +import org.apache.ambari.server.controller.spi.ClusterController; +import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; +import org.apache.ambari.server.controller.spi.RequestStatus; +import org.apache.ambari.server.controller.spi.RequestStatusMetaData; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException; +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 java.util.*; - /** * Handler for creates that are applied to the results of a query. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java index a93951e..947289e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java @@ -18,12 +18,14 @@ package org.apache.ambari.server.api.handlers; +import java.util.Map; + +import org.apache.ambari.server.api.query.Query; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.services.RequestBody; +import org.apache.ambari.server.api.services.Result; import org.apache.ambari.server.api.services.ResultImpl; import org.apache.ambari.server.api.services.ResultStatus; -import org.apache.ambari.server.api.services.Result; -import org.apache.ambari.server.api.query.Query; import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; import org.apache.ambari.server.controller.spi.NoSuchResourceException; import org.apache.ambari.server.controller.spi.Predicate; @@ -34,8 +36,6 @@ import org.apache.ambari.server.security.authorization.AuthorizationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - /** * Responsible for read requests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java index 8f858a7..7f6a484 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/UpdateHandler.java @@ -21,8 +21,8 @@ package org.apache.ambari.server.api.handlers; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.RequestBody; import org.apache.ambari.server.api.services.Result; -import org.apache.ambari.server.api.services.ResultMetadata; import org.apache.ambari.server.api.services.ResultImpl; +import org.apache.ambari.server.api.services.ResultMetadata; import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; import org.apache.ambari.server.controller.spi.NoSuchResourceException; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java index adb6b4a..2282c6f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java @@ -18,10 +18,10 @@ package org.apache.ambari.server.api.predicate; -import org.apache.ambari.server.controller.spi.Predicate; - import java.util.Collection; +import org.apache.ambari.server.controller.spi.Predicate; + /** * Compiler which takes a query expression as input and produces a predicate instance as output. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java index afaae58..f767454 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java @@ -18,7 +18,16 @@ package org.apache.ambari.server.api.predicate; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java index ddaaf7c..db4220e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.predicate.expressions; -import org.apache.ambari.server.api.predicate.operators.Operator; - import java.util.ArrayList; import java.util.List; +import org.apache.ambari.server.api.predicate.operators.Operator; + /** * Base class for expressions. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java index 56cdba0..206f267 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java @@ -18,12 +18,12 @@ package org.apache.ambari.server.api.predicate.expressions; +import java.util.List; + import org.apache.ambari.server.api.predicate.InvalidQueryException; import org.apache.ambari.server.api.predicate.operators.Operator; import org.apache.ambari.server.controller.spi.Predicate; -import java.util.List; - /** * Expression representation. * There are two types of expressions, relational and logical. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java index 465d151..08fbd75 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.api.predicate.expressions; +import java.util.Collections; +import java.util.List; + import org.apache.ambari.server.api.predicate.InvalidQueryException; import org.apache.ambari.server.api.predicate.operators.LogicalOperator; import org.apache.ambari.server.controller.spi.Predicate; -import java.util.Collections; -import java.util.List; - /** * Logical expression implementation. * Always a binary expression that consists of a logical operator and http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java index 0816eb7..2253570 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java @@ -18,14 +18,14 @@ package org.apache.ambari.server.api.predicate.expressions; +import java.util.ArrayList; +import java.util.List; + import org.apache.ambari.server.api.predicate.InvalidQueryException; import org.apache.ambari.server.api.predicate.operators.LogicalOperator; import org.apache.ambari.server.controller.predicate.NotPredicate; import org.apache.ambari.server.controller.spi.Predicate; -import java.util.ArrayList; -import java.util.List; - /** * A 'NOT' logical expression representation. * Negates a corresponding right operand. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java index 629c3fc..9a6ed9a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java @@ -17,14 +17,14 @@ */ package org.apache.ambari.server.api.predicate.operators; +import java.util.ArrayList; +import java.util.List; + import org.apache.ambari.server.api.predicate.InvalidQueryException; import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.apache.ambari.server.controller.predicate.OrPredicate; import org.apache.ambari.server.controller.spi.Predicate; -import java.util.ArrayList; -import java.util.List; - /** * IN relational operator. * This is a binary operator which takes a comma delimited right operand and http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java index fe016a1..e952ffe 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java @@ -18,6 +18,11 @@ package org.apache.ambari.server.api.query; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.controller.internal.ResourceImpl; import org.apache.ambari.server.controller.predicate.AlwaysPredicate; import org.apache.ambari.server.controller.predicate.ArrayPredicate; @@ -29,11 +34,6 @@ import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.PredicateHelper; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * A predicate visitor used to generate a new predicate so that the resources * referenced by the predicate will be extended to include the joined properties http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java index 8924840..5b97e84 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java @@ -18,6 +18,12 @@ package org.apache.ambari.server.api.query; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.controller.predicate.AlwaysPredicate; import org.apache.ambari.server.controller.predicate.ArrayPredicate; import org.apache.ambari.server.controller.predicate.CategoryPredicate; @@ -27,12 +33,6 @@ import org.apache.ambari.server.controller.predicate.UnaryPredicate; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.utilities.PredicateHelper; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * A predicate visitor used to process a predicate to do the following : * http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/Query.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/Query.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/Query.java index 698b055..8ac38ac 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/Query.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/Query.java @@ -18,20 +18,20 @@ package org.apache.ambari.server.api.query; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.query.render.Renderer; import org.apache.ambari.server.api.services.Result; import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; import org.apache.ambari.server.controller.spi.NoSuchResourceException; -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.SystemException; import org.apache.ambari.server.controller.spi.TemporalInfo; import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; -import java.util.Map; -import java.util.Set; - /** * Responsible for querying the back end for read requests http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java index 80b79f0..fb48077 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.query; -import org.apache.ambari.server.api.resources.ResourceDefinition; - import java.util.HashSet; import java.util.Set; +import org.apache.ambari.server.api.resources.ResourceDefinition; + /** * Query related information. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java index 070cb40..15a3396 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java @@ -18,19 +18,19 @@ package org.apache.ambari.server.api.query; +import java.util.LinkedList; +import java.util.List; + import org.apache.ambari.server.controller.predicate.AlwaysPredicate; import org.apache.ambari.server.controller.predicate.ArrayPredicate; import org.apache.ambari.server.controller.predicate.CategoryPredicate; import org.apache.ambari.server.controller.predicate.ComparisonPredicate; +import org.apache.ambari.server.controller.predicate.NotPredicate; import org.apache.ambari.server.controller.predicate.PredicateVisitor; import org.apache.ambari.server.controller.predicate.UnaryPredicate; -import org.apache.ambari.server.controller.predicate.NotPredicate; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.utilities.PredicateHelper; -import java.util.LinkedList; -import java.util.List; - /** * A predicate visitor used to extract the sub resource elements from a given predicate * and produce a new predicate that can be evaluated with a sub resource of the http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java index 03bce14..632249a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java @@ -18,6 +18,9 @@ package org.apache.ambari.server.api.query.render; +import java.util.HashSet; +import java.util.Set; + import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.resources.ResourceDefinition; import org.apache.ambari.server.api.resources.SubResourceDefinition; @@ -26,9 +29,6 @@ import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.Schema; import org.apache.ambari.server.controller.spi.SchemaFactory; -import java.util.HashSet; -import java.util.Set; - /** * Base renderer. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java index 1a9ea91..342df44 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java @@ -18,6 +18,16 @@ package org.apache.ambari.server.api.query.render; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.services.Request; @@ -59,16 +69,6 @@ import org.apache.ambari.server.topology.SecurityConfigurationFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Renderer which renders a cluster resource as a blueprint. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java index 1b996a2..801c28f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java @@ -18,6 +18,8 @@ package org.apache.ambari.server.api.query.render; +import java.util.Set; + import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.services.Result; @@ -25,7 +27,6 @@ import org.apache.ambari.server.api.services.ResultPostProcessor; import org.apache.ambari.server.api.services.ResultPostProcessorImpl; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.api.util.TreeNodeImpl; -import java.util.Set; /** * Default resource renderer. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/HostKerberosIdentityCsvRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/HostKerberosIdentityCsvRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/HostKerberosIdentityCsvRenderer.java index 31e95e1..7134399 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/HostKerberosIdentityCsvRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/HostKerberosIdentityCsvRenderer.java @@ -18,16 +18,16 @@ package org.apache.ambari.server.api.query.render; -import org.apache.ambari.server.api.services.Result; -import org.apache.ambari.server.api.services.serializers.CsvSerializer; -import org.apache.ambari.server.api.util.TreeNode; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ambari.server.api.services.Result; +import org.apache.ambari.server.api.services.serializers.CsvSerializer; +import org.apache.ambari.server.api.util.TreeNode; +import org.apache.ambari.server.controller.spi.Resource; + /** * Renderer which updates a KerberosHostIdentity resource so it may be serialized using a CSV serializer. * <p/> http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MetricsPaddingRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MetricsPaddingRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MetricsPaddingRenderer.java index ff776c7..aa2d4c0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MetricsPaddingRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MetricsPaddingRenderer.java @@ -17,11 +17,12 @@ */ package org.apache.ambari.server.api.query.render; -import org.apache.ambari.server.api.query.QueryInfo; -import org.apache.ambari.server.api.util.TreeNode; +import static org.apache.ambari.server.controller.metrics.MetricsPaddingMethod.PADDING_STRATEGY; + import java.util.Set; -import static org.apache.ambari.server.controller.metrics.MetricsPaddingMethod.PADDING_STRATEGY; +import org.apache.ambari.server.api.query.QueryInfo; +import org.apache.ambari.server.api.util.TreeNode; public class MetricsPaddingRenderer extends DefaultRenderer { PADDING_STRATEGY paddingMethod = PADDING_STRATEGY.ZEROS; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java index 2e51061..98452e5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java @@ -18,6 +18,13 @@ package org.apache.ambari.server.api.query.render; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.services.Result; @@ -28,13 +35,6 @@ import org.apache.ambari.server.api.util.TreeNodeImpl; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.PropertyHelper; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - /** * Minimal Renderer. * http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/Renderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/Renderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/Renderer.java index 2ba245c..b71d96f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/Renderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/Renderer.java @@ -19,6 +19,8 @@ package org.apache.ambari.server.api.query.render; +import java.util.Set; + import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.services.Result; @@ -26,8 +28,6 @@ import org.apache.ambari.server.api.services.ResultPostProcessor; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.SchemaFactory; -import java.util.Set; - /** * Responsible for the rendering of a result. * This includes both the content (which properties), and the format http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ActiveWidgetLayoutResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ActiveWidgetLayoutResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ActiveWidgetLayoutResourceDefinition.java index a867221..7233426 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ActiveWidgetLayoutResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ActiveWidgetLayoutResourceDefinition.java @@ -17,15 +17,15 @@ */ package org.apache.ambari.server.api.resources; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.WidgetResponse; import org.apache.ambari.server.controller.spi.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - /** * Resource Definition for WidgetLayout types. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java index aaeed43..5d1a6a0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java @@ -19,6 +19,15 @@ package org.apache.ambari.server.api.resources; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +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.query.render.DefaultRenderer; import org.apache.ambari.server.api.query.render.MetricsPaddingRenderer; import org.apache.ambari.server.api.query.render.MinimalRenderer; @@ -32,15 +41,6 @@ import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.net.URLCodec; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Base resource definition. Contains behavior common to all resource types. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinition.java index adf9eca..1dd2ad1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinition.java @@ -18,10 +18,10 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collection; +import org.apache.ambari.server.controller.spi.Resource; + /** * Blueprint resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentResourceDefinition.java index 12673e8..7def435 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentResourceDefinition.java @@ -19,13 +19,15 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; +import java.util.Collections; +import java.util.List; +import java.util.Set; + import org.apache.ambari.server.api.services.Request; +import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.Schema; -import org.apache.ambari.server.api.util.TreeNode; - -import java.util.*; +import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; /** * Component resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigGroupResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigGroupResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigGroupResourceDefinition.java index d7bb57d..a56232f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigGroupResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigGroupResourceDefinition.java @@ -17,16 +17,16 @@ */ package org.apache.ambari.server.api.resources; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.Schema; import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class ConfigGroupResourceDefinition extends BaseResourceDefinition { /** * Constructor. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigurationResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigurationResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigurationResourceDefinition.java index 9d2495f..556b25b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigurationResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ConfigurationResourceDefinition.java @@ -18,7 +18,7 @@ package org.apache.ambari.server.api.resources; -import java.util.*; +import java.util.List; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.util.TreeNode; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/CredentialResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/CredentialResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/CredentialResourceDefinition.java index 6d4f83e..67989f7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/CredentialResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/CredentialResourceDefinition.java @@ -20,8 +20,6 @@ package org.apache.ambari.server.api.resources; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Collection; - /** * Credential resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java index 4f86136..b7638ff 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.HashSet; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * DR feed resource definition. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java index 33d4c46..e028d31 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java @@ -18,15 +18,19 @@ package org.apache.ambari.server.api.resources; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.apache.ambari.server.api.services.Request; -import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; +import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.Schema; -import org.apache.ambari.server.api.util.TreeNode; +import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; import org.apache.ambari.server.controller.utilities.PropertyHelper; -import java.util.*; - /** * Host_Component resource definition. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/InstanceResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/InstanceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/InstanceResourceDefinition.java index e0fc099..7df113e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/InstanceResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/InstanceResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * DR instance resource definition. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java index 554c688..df5f6ff 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * LDAP sync event resource definition. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LoggingResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LoggingResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LoggingResourceDefinition.java index b2c1a94..598230f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LoggingResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LoggingResourceDefinition.java @@ -21,9 +21,6 @@ package org.apache.ambari.server.api.resources; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Collections; -import java.util.Set; - public class LoggingResourceDefinition extends BaseResourceDefinition { public LoggingResourceDefinition() { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java index abae71e..e111d96 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.HashSet; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * Permission resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PrivilegeResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PrivilegeResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PrivilegeResourceDefinition.java index 61588f1..97d2dff 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PrivilegeResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PrivilegeResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * Privilege resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestResourceDefinition.java index 7837ded..99bfc5e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestResourceDefinition.java @@ -19,14 +19,14 @@ package org.apache.ambari.server.api.resources; +import java.util.Arrays; +import java.util.List; + import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.internal.RequestResourceProvider; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Arrays; -import java.util.List; - /** * Request resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java index 5b1af91..6de5e25 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java @@ -17,11 +17,12 @@ */ package org.apache.ambari.server.api.resources; +import java.util.Collections; +import java.util.List; + import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Collections; -import java.util.List; public class RequestScheduleResourceDefinition extends BaseResourceDefinition { /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceDefinition.java index e437a03..1acadd8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceDefinition.java @@ -18,17 +18,16 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.api.query.render.Renderer; -import org.apache.ambari.server.api.services.Request; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.api.util.TreeNode; - -import org.apache.ambari.server.api.services.ResultPostProcessor; - import java.util.Collection; import java.util.List; import java.util.Set; +import org.apache.ambari.server.api.query.render.Renderer; +import org.apache.ambari.server.api.services.Request; +import org.apache.ambari.server.api.services.ResultPostProcessor; +import org.apache.ambari.server.api.util.TreeNode; +import org.apache.ambari.server.controller.spi.Resource; + /** * Resource Definition. * Provides information specific to a specific resource type. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstance.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstance.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstance.java index 2722679..3695807 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstance.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstance.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; +import java.util.Map; + import org.apache.ambari.server.api.query.Query; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Map; - /** * Resource instance which contains request specific state. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactory.java index 23c581d..0b5859b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactory.java @@ -19,10 +19,10 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Map; +import org.apache.ambari.server.controller.spi.Resource; + /** * Factory for creating resource instances. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java index b8252fa..297e7d7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.Schema; import org.apache.ambari.server.controller.spi.Resource.Type; +import org.apache.ambari.server.controller.spi.Schema; import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; public class RootServiceHostComponentResourceDefinition extends http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java index 9abf3a7..cebe83b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java @@ -18,9 +18,10 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; +import java.util.HashSet; +import java.util.Set; -import java.util.*; +import org.apache.ambari.server.controller.spi.Resource; /** * Service resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SimpleResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SimpleResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SimpleResourceDefinition.java index 68cbb54..f868cd6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SimpleResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SimpleResourceDefinition.java @@ -18,12 +18,12 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Arrays; import java.util.Collection; import java.util.Map; +import org.apache.ambari.server.controller.spi.Resource; + /** * Simple concrete resource definition. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java index 537f916..7cf5926 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java @@ -19,12 +19,12 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.Resource.Type; - import java.util.HashSet; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.controller.spi.Resource.Type; + public class StackConfigurationResourceDefinition extends BaseResourceDefinition { public StackConfigurationResourceDefinition(Type resourceType) { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceComponentResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceComponentResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceComponentResourceDefinition.java index ad14d52..87bf02d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceComponentResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceComponentResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + public class StackServiceComponentResourceDefinition extends BaseResourceDefinition { public StackServiceComponentResourceDefinition() { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SubResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SubResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SubResourceDefinition.java index 6f01772..a49fadc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SubResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/SubResourceDefinition.java @@ -19,11 +19,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * Definition of a sub-resource. * Defines a resource instance that is added to another resource as a sub-resource. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/TargetClusterResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/TargetClusterResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/TargetClusterResourceDefinition.java index 3b15210..3e8f615 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/TargetClusterResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/TargetClusterResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * DR target cluster resource definition. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java index 7018818..64d8ee1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Arrays; import java.util.Collections; +import org.apache.ambari.server.controller.spi.Resource; + /** * Upgrade resource definition. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewExternalSubResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewExternalSubResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewExternalSubResourceDefinition.java index 83577f2..8e28892 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewExternalSubResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewExternalSubResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * View external sub-resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java index 7b1008c..c825497 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.HashSet; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * View instance resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewPermissionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewPermissionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewPermissionResourceDefinition.java index 1ff360d..a43af5b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewPermissionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewPermissionResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * Permission resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewResourceDefinition.java index 4951b03..1b3b932 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * View resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewUrlResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewUrlResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewUrlResourceDefinition.java index d2c7b62..1650892 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewUrlResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewUrlResourceDefinition.java @@ -20,9 +20,6 @@ package org.apache.ambari.server.api.resources; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Collections; -import java.util.Set; - /** * View resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java index be21d1b..f3df120 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.api.resources; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.HashSet; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * View version resource definition. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java index cc7df23..c5e1de2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetLayoutResourceDefinition.java @@ -17,19 +17,14 @@ */ package org.apache.ambari.server.api.resources; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import org.apache.ambari.server.api.services.Request; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.WidgetResponse; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.Schema; -import org.apache.ambari.server.controller.utilities.ClusterControllerHelper; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; /** * Resource Definition for WidgetLayout types. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetResourceDefinition.java index 10f287c..9f33bce 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WidgetResourceDefinition.java @@ -20,11 +20,6 @@ package org.apache.ambari.server.api.resources; import org.apache.ambari.server.controller.spi.Resource; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - /** * Resource Definition for Widget types. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java index 0126d3f..0290151 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java @@ -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/ActiveWidgetLayoutService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java index a0c3386..40cd6e0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java @@ -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.PUT; @@ -27,9 +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; 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/AmbariPrivilegeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java index db28f4f..be46ad5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariPrivilegeService.java @@ -18,11 +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.Collections; import javax.ws.rs.Path; -import java.util.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for Ambari 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/BaseService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java index 139cf43..0185d37 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java @@ -18,6 +18,15 @@ package org.apache.ambari.server.api.services; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +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 org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.resources.ResourceInstanceFactory; import org.apache.ambari.server.api.resources.ResourceInstanceFactoryImpl; @@ -34,16 +43,6 @@ import org.eclipse.jetty.util.ajax.JSON; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.Iterator; -import java.util.Map; -import java.util.Set; - -import com.google.inject.Inject; - /** * Provides common functionality to all services. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java index f40f858..8159ea4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java @@ -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; @@ -31,7 +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.Collections; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.controller.spi.Resource; /** * Service responsible for handling REST requests for the /blueprints endpoint. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java index 1452118..23d8aad 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java @@ -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; /** * Read-only service responsible for Kerberos descriptor resource requests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java index 11b4a46..8c91878 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java @@ -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 cluster 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/ConfigGroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java index 39f1f55..8f3ec45 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java @@ -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.DELETE; import javax.ws.rs.GET; @@ -31,8 +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.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 Config Groups
