http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariStreamProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariStreamProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariStreamProvider.java index f043521..7b38cae 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariStreamProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/RemoteAmbariStreamProvider.java @@ -18,14 +18,6 @@ package org.apache.ambari.server.view; -import org.apache.ambari.server.configuration.ComponentSSLConfiguration; -import org.apache.ambari.server.controller.internal.URLStreamProvider; -import org.apache.ambari.server.proxy.ProxyService; -import org.apache.ambari.view.AmbariHttpException; -import org.apache.ambari.view.AmbariStreamProvider; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.IOUtils; - import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; @@ -34,6 +26,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ambari.server.configuration.ComponentSSLConfiguration; +import org.apache.ambari.server.controller.internal.URLStreamProvider; +import org.apache.ambari.server.proxy.ProxyService; +import org.apache.ambari.view.AmbariHttpException; +import org.apache.ambari.view.AmbariStreamProvider; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; + /** * Provider of an input stream for a request to the Remote Ambari server. */
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java index 9f9f54c..5dc8e31 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewAmbariStreamProvider.java @@ -18,6 +18,14 @@ package org.apache.ambari.server.view; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.AmbariSessionManager; import org.apache.ambari.server.controller.internal.URLStreamProvider; @@ -28,14 +36,6 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * Provider of an input stream for a request to the Ambari server. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewArchiveUtility.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewArchiveUtility.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewArchiveUtility.java index d1ead32..1e6fe1d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewArchiveUtility.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewArchiveUtility.java @@ -18,16 +18,6 @@ package org.apache.ambari.server.view; -import org.apache.ambari.server.view.configuration.ViewConfig; -import org.xml.sax.SAXException; - -import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -38,6 +28,17 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.jar.JarInputStream; +import javax.xml.XMLConstants; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; + +import org.apache.ambari.server.view.configuration.ViewConfig; +import org.xml.sax.SAXException; + /** * Helper class for basic view archive utility. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java index 692f728..54613dc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.view; +import java.io.IOException; +import java.net.URL; + import org.apache.ambari.server.view.configuration.ViewConfig; import org.eclipse.jetty.webapp.WebAppClassLoader; import org.eclipse.jetty.webapp.WebAppContext; -import java.io.IOException; -import java.net.URL; - /** * Class loader used to load classes and resources from a search path of URLs referring to both JAR files * and directories. The URLs will be searched in the order specified for classes and resources before http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java index f1d5c35..ecb5ed9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java @@ -18,9 +18,16 @@ package org.apache.ambari.server.view; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.Transactional; +import java.io.StringWriter; +import java.io.Writer; +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; + import org.apache.ambari.server.orm.entities.PermissionEntity; import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; @@ -56,15 +63,9 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.exception.ParseErrorException; -import java.io.StringWriter; -import java.io.Writer; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.Transactional; /** * View context implementation. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java index 4502fc8..06eb9de 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationContextImpl.java @@ -18,11 +18,10 @@ package org.apache.ambari.server.view; -import com.google.inject.Binding; -import com.google.inject.ConfigurationException; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.Transactional; +import java.util.HashMap; +import java.util.Map; +import java.util.WeakHashMap; + import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.orm.entities.ViewInstanceDataEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; @@ -31,19 +30,17 @@ import org.apache.ambari.server.view.configuration.PersistenceConfig; import org.apache.ambari.server.view.persistence.DataStoreImpl; import org.apache.ambari.server.view.persistence.DataStoreModule; import org.apache.ambari.view.DataStore; -import org.apache.ambari.view.migration.EntityConverter; import org.apache.ambari.view.PersistenceException; +import org.apache.ambari.view.migration.EntityConverter; import org.apache.ambari.view.migration.ViewDataMigrationContext; import org.apache.ambari.view.migration.ViewDataMigrationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeanUtils; -import javax.persistence.EntityManagerFactory; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import java.util.WeakHashMap; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.Transactional; /** * View data migration context implementation. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java index 2906100..16eab8b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDataMigrationUtility.java @@ -18,6 +18,8 @@ package org.apache.ambari.server.view; +import java.util.Map; + import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.view.PersistenceException; import org.apache.ambari.view.ViewInstanceDefinition; @@ -26,7 +28,6 @@ import org.apache.ambari.view.migration.ViewDataMigrationException; import org.apache.ambari.view.migration.ViewDataMigrator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; /** * Helper class for view data migration. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java index 48cb853..171e873 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java @@ -20,7 +20,6 @@ package org.apache.ambari.server.view; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.Thread.sleep; -import javax.annotation.Nullable; import java.io.File; import java.io.IOException; @@ -36,6 +35,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.zip.ZipFile; +import javax.annotation.Nullable; + import org.apache.ambari.server.configuration.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java index 7aad0b6..a09d9ef 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java @@ -18,6 +18,13 @@ package org.apache.ambari.server.view; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.controller.internal.AbstractResourceProvider; import org.apache.ambari.server.controller.internal.ResourceImpl; import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; @@ -32,13 +39,6 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * External view sub-resource provider. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java index 0dabf90..27f9cf5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExtractor.java @@ -17,13 +17,6 @@ */ package org.apache.ambari.server.view; -import org.apache.ambari.server.orm.entities.ViewEntity; -import org.apache.ambari.server.view.configuration.ViewConfig; -import org.apache.commons.io.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -33,6 +26,14 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; +import javax.inject.Inject; + +import org.apache.ambari.server.orm.entities.ViewEntity; +import org.apache.ambari.server.view.configuration.ViewConfig; +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Extractor for view archives. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java index 5fadf22..35b82b0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java @@ -18,14 +18,14 @@ package org.apache.ambari.server.view; +import java.util.List; +import java.util.Map; + import org.apache.ambari.server.controller.spi.PropertyProvider; import org.apache.ambari.server.controller.spi.ProviderModule; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.ResourceProvider; -import java.util.List; -import java.util.Map; - /** * Module which allows for discovery of view resource providers. * This module wraps another module and delegates to it for http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java index ab83696..551096c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java @@ -18,11 +18,6 @@ package org.apache.ambari.server.view; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; -import javax.xml.bind.JAXBException; - import java.beans.IntrospectionException; import java.io.File; import java.io.IOException; @@ -43,6 +38,11 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; +import javax.inject.Provider; +import javax.inject.Singleton; +import javax.xml.bind.JAXBException; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ClusterNotFoundException; import org.apache.ambari.server.api.resources.ResourceInstanceFactoryImpl; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceDefinition.java index 15b389d..85ea1fb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceDefinition.java @@ -18,16 +18,16 @@ package org.apache.ambari.server.view; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.apache.ambari.server.api.resources.BaseResourceDefinition; import org.apache.ambari.server.api.resources.SubResourceDefinition; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.view.configuration.ResourceConfig; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * View sub-resource definition based on a view resource configuration. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java index c498652..040b4dd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java @@ -18,6 +18,18 @@ package org.apache.ambari.server.view; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; +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.controller.internal.AbstractResourceProvider; import org.apache.ambari.server.controller.internal.RequestStatusImpl; import org.apache.ambari.server.controller.internal.ResourceImpl; @@ -36,18 +48,6 @@ import org.apache.ambari.server.orm.entities.ViewEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.view.ReadRequest; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - /** * An SPI resource provider implementation used to adapt a * view resource provider to the SPI interfaces for view http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/AutoInstanceConfig.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/AutoInstanceConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/AutoInstanceConfig.java index f934ed5..1e82ea0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/AutoInstanceConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/AutoInstanceConfig.java @@ -18,14 +18,15 @@ package org.apache.ambari.server.view.configuration; +import java.util.List; +import java.util.Set; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.List; -import java.util.Set; /** * View auto instance configuration. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/InstanceConfig.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/InstanceConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/InstanceConfig.java index 764d697..a1d8e41 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/InstanceConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/InstanceConfig.java @@ -18,11 +18,12 @@ package org.apache.ambari.server.view.configuration; +import java.util.Collections; +import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; -import java.util.Collections; -import java.util.List; /** * View instance configuration. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/PersistenceConfig.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/PersistenceConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/PersistenceConfig.java index 77ad4ef..1e3a14c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/PersistenceConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/PersistenceConfig.java @@ -17,11 +17,12 @@ */ package org.apache.ambari.server.view.configuration; +import java.util.Collections; +import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; -import java.util.Collections; -import java.util.List; /** * View persistence configuration. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ResourceConfig.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ResourceConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ResourceConfig.java index 1d40eeb..48deff8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ResourceConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ResourceConfig.java @@ -19,13 +19,14 @@ package org.apache.ambari.server.view.configuration; -import org.apache.ambari.view.ResourceProvider; +import java.util.Collections; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; -import java.util.Collections; -import java.util.List; + +import org.apache.ambari.view.ResourceProvider; /** * View resource configuration. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java index f63c962..72bf892 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java @@ -18,12 +18,8 @@ package org.apache.ambari.server.view.configuration; -import org.apache.ambari.server.view.DefaultMasker; -import org.apache.ambari.view.migration.ViewDataMigrator; -import org.apache.ambari.view.validation.Validator; -import org.apache.ambari.view.Masker; -import org.apache.ambari.view.View; -import org.apache.commons.lang.StringUtils; +import java.util.Collections; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -31,8 +27,12 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; -import java.util.Collections; -import java.util.List; +import org.apache.ambari.server.view.DefaultMasker; +import org.apache.ambari.view.Masker; +import org.apache.ambari.view.View; +import org.apache.ambari.view.migration.ViewDataMigrator; +import org.apache.ambari.view.validation.Validator; +import org.apache.commons.lang.StringUtils; /** * View configuration. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java index c4eab26..804e6bf 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.view.events; +import java.util.Collections; +import java.util.Map; + import org.apache.ambari.view.ViewDefinition; import org.apache.ambari.view.ViewInstanceDefinition; import org.apache.ambari.view.events.Event; -import java.util.Collections; -import java.util.Map; - /** * View event implementation. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java index a604458..3a69e06 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreImpl.java @@ -18,6 +18,29 @@ package org.apache.ambari.server.view.persistence; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.util.ArrayList; +import java.util.Collection; +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 java.util.StringTokenizer; + +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.EntityTransaction; +import javax.persistence.Query; + import org.apache.ambari.server.orm.entities.ViewEntityEntity; import org.apache.ambari.server.orm.entities.ViewInstanceEntity; import org.apache.ambari.view.DataStore; @@ -36,20 +59,6 @@ import org.eclipse.persistence.sessions.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityTransaction; -import javax.persistence.Query; -import java.beans.IntrospectionException; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.util.*; - /** * A data store implementation that uses dynamic JPA entities to http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreModule.java b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreModule.java index 488c511..cb0a03f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/persistence/DataStoreModule.java @@ -18,9 +18,14 @@ package org.apache.ambari.server.view.persistence; -import com.google.common.base.Optional; -import com.google.inject.Binder; -import com.google.inject.Module; +import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_PASSWORD; +import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_USER; + +import java.util.Map; + +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; + import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.ControllerModule; import org.apache.ambari.server.orm.PersistenceType; @@ -32,12 +37,9 @@ import org.eclipse.persistence.jpa.dynamic.JPADynamicHelper; import org.eclipse.persistence.sessions.DatabaseSession; import org.eclipse.persistence.tools.schemaframework.SchemaManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import java.util.Map; - -import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_PASSWORD; -import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_USER; +import com.google.common.base.Optional; +import com.google.inject.Binder; +import com.google.inject.Module; /** * Module used for data store creation and injection. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/view/validation/InstanceValidationResultImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/validation/InstanceValidationResultImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/validation/InstanceValidationResultImpl.java index c536ae5..0eb6116 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/validation/InstanceValidationResultImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/validation/InstanceValidationResultImpl.java @@ -18,10 +18,11 @@ package org.apache.ambari.server.view.validation; -import com.google.gson.Gson; +import java.util.Map; + import org.apache.ambari.view.validation.ValidationResult; -import java.util.Map; +import com.google.gson.Gson; /** * View instance validation result. This result includes the validation results http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/RandomPortJerseyTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/RandomPortJerseyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/RandomPortJerseyTest.java index b4269f1..7bea1e3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/RandomPortJerseyTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/RandomPortJerseyTest.java @@ -19,12 +19,12 @@ package org.apache.ambari.server; -import com.sun.jersey.test.framework.AppDescriptor; -import com.sun.jersey.test.framework.JerseyTest; - import java.io.IOException; import java.net.ServerSocket; +import com.sun.jersey.test.framework.AppDescriptor; +import com.sun.jersey.test.framework.JerseyTest; + /** * Makes JerseyTest use random port in case default one is unavailable. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java index 44008de..57b57b0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java @@ -18,11 +18,16 @@ package org.apache.ambari.server; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; -import com.google.inject.util.Modules; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import java.util.ArrayList; + import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.dao.ClusterVersionDAO; @@ -37,15 +42,11 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; - -import static org.easymock.EasyMock.and; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.junit.Assert.*; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.PersistService; +import com.google.inject.util.Modules; public class StateRecoveryManagerTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java index b8e9bc3..1047a73 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java @@ -17,11 +17,11 @@ */ package org.apache.ambari.server.actionmanager; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; + +import java.util.Map; +import java.util.TreeMap; -import com.google.inject.Guice; -import com.google.inject.Inject; -import com.google.inject.Injector; import org.apache.ambari.server.Role; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.agent.ExecutionCommand; @@ -31,8 +31,9 @@ import org.apache.ambari.server.utils.StageUtils; import org.junit.Before; import org.junit.Test; -import java.util.Map; -import java.util.TreeMap; +import com.google.inject.Guice; +import com.google.inject.Inject; +import com.google.inject.Injector; public class TestStage { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java index a8dac31..4c62a8b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentHostInfoTest.java @@ -21,14 +21,14 @@ package org.apache.ambari.server.agent; import java.io.IOException; -import junit.framework.Assert; - import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.map.DeserializationConfig; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; +import junit.framework.Assert; + /** * This tests makes sure the contract between the server and agent for info * is in tact. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java index 869f5fd..9851664 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java @@ -19,6 +19,7 @@ package org.apache.ambari.server.agent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -27,7 +28,6 @@ import java.util.List; import org.apache.ambari.server.agent.AgentCommand.AgentCommandType; import org.easymock.EasyMock; -import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilterTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilterTest.java index f3ac9d9..84ed5d3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilterTest.java @@ -18,16 +18,17 @@ package org.apache.ambari.server.api; -import com.sun.jersey.core.header.InBoundHeaders; -import com.sun.jersey.spi.container.ContainerRequest; -import org.junit.Test; - -import javax.ws.rs.WebApplicationException; - import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; + +import javax.ws.rs.WebApplicationException; + +import org.junit.Test; + +import com.sun.jersey.core.header.InBoundHeaders; +import com.sun.jersey.spi.container.ContainerRequest; public class AmbariCsrfProtectionFilterTest { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java index c22558f..239bfcb 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/AmbariErrorHandlerTest.java @@ -18,27 +18,29 @@ package org.apache.ambari.server.api; -import com.google.gson.Gson; -import com.google.gson.JsonSyntaxException; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.WebResource; -import org.apache.ambari.server.configuration.Configuration; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.util.Map; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import org.apache.ambari.server.configuration.Configuration; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.servlet.DefaultServlet; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.junit.Test; + +import com.google.gson.Gson; +import com.google.gson.JsonSyntaxException; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.WebResource; public class AmbariErrorHandlerTest { Gson gson = new Gson(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java index 1e0fe90..33ead81 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/UserNameOverrideFilterTest.java @@ -18,6 +18,15 @@ package org.apache.ambari.server.api; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.same; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.net.URLEncoder; import java.util.regex.Matcher; @@ -40,15 +49,6 @@ import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.same; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - @RunWith(PowerMockRunner.class) // Allow mocking static methods @PrepareForTest(AuthorizationHelper.class) // This class has a static method that will be mocked public class UserNameOverrideFilterTest extends EasyMockSupport { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java index 757bc36..8362325 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java @@ -18,12 +18,29 @@ package org.apache.ambari.server.api.handlers; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; + +import java.util.HashSet; +import java.util.Set; + import org.apache.ambari.server.api.query.Query; import org.apache.ambari.server.api.query.render.DefaultRenderer; 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.api.services.*; +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.ResultStatus; import org.apache.ambari.server.api.services.persistence.PersistenceManager; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.RequestStatus; @@ -34,11 +51,6 @@ import org.apache.ambari.server.view.ViewRegistry; import org.junit.Before; import org.junit.Test; -import java.util.*; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - /** * Unit tests for CreateHandler. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java index b891d9c..5b1ba0b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java @@ -18,6 +18,21 @@ package org.apache.ambari.server.api.handlers; * limitations under the License. */ +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.ambari.server.ConfigGroupNotFoundException; import org.apache.ambari.server.api.query.Query; import org.apache.ambari.server.api.query.render.DefaultRenderer; import org.apache.ambari.server.api.query.render.Renderer; @@ -29,6 +44,7 @@ import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.api.services.persistence.PersistenceManager; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.internal.DeleteStatusMetaData; +import org.apache.ambari.server.controller.spi.NoSuchResourceException; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.RequestStatus; import org.apache.ambari.server.controller.spi.Resource; @@ -38,14 +54,6 @@ import org.apache.ambari.server.view.ViewRegistry; import org.junit.Before; import org.junit.Test; -import java.util.*; -import org.apache.ambari.server.ConfigGroupNotFoundException; -import org.apache.ambari.server.controller.spi.NoSuchResourceException; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; - /** * Unit tests for DeleteHandler. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java index 89d13c3..7afbf11 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java @@ -19,26 +19,46 @@ package org.apache.ambari.server.api.handlers; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.same; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +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.query.Query; import org.apache.ambari.server.api.resources.ResourceDefinition; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.resources.ResourceInstanceFactory; -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.ResultStatus; import org.apache.ambari.server.api.services.persistence.PersistenceManager; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.api.util.TreeNodeImpl; -import org.apache.ambari.server.controller.spi.*; +import org.apache.ambari.server.controller.spi.ClusterController; +import org.apache.ambari.server.controller.spi.Predicate; +import org.apache.ambari.server.controller.spi.RequestStatus; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.controller.spi.Schema; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.apache.ambari.server.security.authorization.AuthorizationException; -import org.easymock.*; +import org.easymock.Capture; import org.junit.Test; -import java.util.*; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - /** * Unit tests for QueryCreateHandler. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java index ee97de3..595ea15 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java @@ -18,6 +18,21 @@ package org.apache.ambari.server.api.handlers; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.apache.ambari.server.api.query.Query; import org.apache.ambari.server.api.query.render.DefaultRenderer; import org.apache.ambari.server.api.query.render.Renderer; @@ -26,20 +41,17 @@ 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.ResultStatus; -import org.apache.ambari.server.controller.spi.*; +import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; +import org.apache.ambari.server.controller.spi.NoSuchResourceException; +import org.apache.ambari.server.controller.spi.Predicate; +import org.apache.ambari.server.controller.spi.Resource; +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 org.apache.ambari.server.security.authorization.AuthorizationException; import org.easymock.Capture; import org.junit.Test; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - /** * Unit tests for ReadHandler. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java index 797ba65..0e11c17 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java @@ -18,11 +18,28 @@ package org.apache.ambari.server.api.handlers; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; + +import java.util.HashSet; +import java.util.Set; + import org.apache.ambari.server.api.query.Query; import org.apache.ambari.server.api.query.render.DefaultRenderer; import org.apache.ambari.server.api.query.render.Renderer; import org.apache.ambari.server.api.resources.ResourceInstance; -import org.apache.ambari.server.api.services.*; +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.ResultStatus; import org.apache.ambari.server.api.services.persistence.PersistenceManager; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.Predicate; @@ -34,11 +51,6 @@ import org.apache.ambari.server.view.ViewRegistry; import org.junit.Before; import org.junit.Test; -import java.util.*; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - /** * Unit tests for UpdateHandler. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryLexerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryLexerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryLexerTest.java index 2150c25..ccd9b80 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryLexerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryLexerTest.java @@ -19,16 +19,16 @@ package org.apache.ambari.server.api.predicate; -import org.junit.Test; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.Test; /** * QueryLexer unit tests http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/AndOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/AndOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/AndOperatorTest.java index 3c4d587..c72fdf1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/AndOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/AndOperatorTest.java @@ -19,12 +19,13 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.AndPredicate; import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * AND operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/EqualsOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/EqualsOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/EqualsOperatorTest.java index 7982a66..8651626 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/EqualsOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/EqualsOperatorTest.java @@ -19,11 +19,12 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * EQUALS operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/FilterOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/FilterOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/FilterOperatorTest.java index f673030..55dc6d0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/FilterOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/FilterOperatorTest.java @@ -17,11 +17,12 @@ */ package org.apache.ambari.server.api.predicate.operators; -import org.apache.ambari.server.controller.predicate.FilterPredicate; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; +import org.apache.ambari.server.controller.predicate.FilterPredicate; +import org.junit.Test; + public class FilterOperatorTest { @Test public void testGetName() { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperatorTest.java index 6ac1014..7efdeb6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperatorTest.java @@ -19,11 +19,12 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.GreaterEqualsPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * GreaterEquals operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterOperatorTest.java index 59dce15..5690b49 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterOperatorTest.java @@ -19,11 +19,12 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.GreaterPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * GREATER operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java index ae0e14f..256fecb 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java @@ -19,12 +19,13 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.apache.ambari.server.controller.predicate.OrPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * IN operator test. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperatorTest.java index d31169f..43814f9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperatorTest.java @@ -19,13 +19,14 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.api.predicate.InvalidQueryException; import org.apache.ambari.server.controller.predicate.CategoryIsEmptyPredicate; import org.apache.ambari.server.controller.spi.Predicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * IsEmpty operator test. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java index ef90a23..6e017b9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java @@ -19,11 +19,12 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.LessEqualsPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * LessEquals operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java index 753d988..5311ea7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java @@ -19,11 +19,12 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.LessPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * LESS operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java index 0ac1002..d8e1f6a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java @@ -19,12 +19,13 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.apache.ambari.server.controller.predicate.NotPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * NOT EQUALS operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java index 5dcfe6d..c23bc3a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java @@ -19,12 +19,13 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.apache.ambari.server.controller.predicate.NotPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * NOT operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/OrOperatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/OrOperatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/OrOperatorTest.java index c047062..74ec171 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/OrOperatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/OrOperatorTest.java @@ -19,12 +19,13 @@ package org.apache.ambari.server.api.predicate.operators; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.apache.ambari.server.controller.predicate.OrPredicate; import org.junit.Test; -import static org.junit.Assert.*; - /** * OR operator test. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitorTest.java index 8cdd286..4127806 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitorTest.java @@ -17,6 +17,11 @@ */ package org.apache.ambari.server.api.query; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.controller.internal.ResourceImpl; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Resource; @@ -25,11 +30,6 @@ import org.apache.ambari.server.controller.utilities.PredicateHelper; import org.junit.Assert; import org.junit.Test; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * ExtendedResourcePredicateVisitor tests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitorTest.java index 714b16f..045f172 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitorTest.java @@ -17,6 +17,11 @@ */ package org.apache.ambari.server.api.query; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.resources.HostResourceDefinition; import org.apache.ambari.server.api.resources.ResourceDefinition; import org.apache.ambari.server.api.resources.StackResourceDefinition; @@ -28,11 +33,6 @@ import org.apache.ambari.server.controller.utilities.PredicateHelper; import org.junit.Assert; import org.junit.Test; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * ProcessingPredicateVisitor tests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryInfoTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryInfoTest.java index 4dfdc29..15b798b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryInfoTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryInfoTest.java @@ -18,15 +18,15 @@ package org.apache.ambari.server.api.query; -import org.apache.ambari.server.api.resources.ClusterResourceDefinition; -import org.apache.ambari.server.api.resources.ResourceDefinition; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; import java.util.HashSet; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import org.apache.ambari.server.api.resources.ClusterResourceDefinition; +import org.apache.ambari.server.api.resources.ResourceDefinition; +import org.junit.Test; /** * QueryInfo unit tests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java index 1fe48df..19a6b5c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java @@ -18,6 +18,31 @@ package org.apache.ambari.server.api.query.render; +import static org.easymock.EasyMock.anyLong; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +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.QueryInfo; import org.apache.ambari.server.api.resources.ClusterResourceDefinition; import org.apache.ambari.server.api.resources.HostComponentResourceDefinition; @@ -54,31 +79,6 @@ import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.easymock.EasyMock.anyLong; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - /** * ClusterBlueprintRenderer unit tests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/DefaultRendererTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/DefaultRendererTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/DefaultRendererTest.java index 78efa1c..add1919 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/DefaultRendererTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/DefaultRendererTest.java @@ -18,6 +18,17 @@ package org.apache.ambari.server.api.query.render; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.util.HashSet; +import java.util.Set; + import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.resources.ComponentResourceDefinition; import org.apache.ambari.server.api.resources.ServiceResourceDefinition; @@ -29,14 +40,6 @@ import org.apache.ambari.server.controller.spi.Schema; import org.apache.ambari.server.controller.spi.SchemaFactory; import org.junit.Test; -import java.util.HashSet; -import java.util.Set; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - /** * DefaultRenderer unit tests. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MetricsPaddingRendererTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MetricsPaddingRendererTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MetricsPaddingRendererTest.java index dafc605..e99271e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MetricsPaddingRendererTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MetricsPaddingRendererTest.java @@ -17,6 +17,16 @@ */ package org.apache.ambari.server.api.query.render; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.HashSet; +import java.util.Set; + import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.resources.ServiceResourceDefinition; import org.apache.ambari.server.api.util.TreeNode; @@ -25,14 +35,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 org.junit.Test; -import java.util.HashSet; -import java.util.Set; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; public class MetricsPaddingRendererTest { @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java index 9b9b614..687dcbb 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/MinimalRendererTest.java @@ -19,6 +19,18 @@ package org.apache.ambari.server.api.query.render; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.api.query.QueryInfo; import org.apache.ambari.server.api.resources.ClusterResourceDefinition; import org.apache.ambari.server.api.resources.ComponentResourceDefinition; @@ -34,18 +46,6 @@ import org.apache.ambari.server.controller.spi.Schema; import org.apache.ambari.server.controller.spi.SchemaFactory; import org.junit.Test; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - /** * MinimalRenderer unit tests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java index 46f3ef7..9173423 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java @@ -18,15 +18,24 @@ package org.apache.ambari.server.api.resources; +import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.anyObject; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +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.AmbariException; import org.apache.ambari.server.api.handlers.BaseManagementHandler; import org.apache.ambari.server.api.query.render.DefaultRenderer; @@ -49,15 +58,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * BaseResourceDefinition tests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinitionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinitionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinitionTest.java index bfcb822..f5a5122 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinitionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BlueprintResourceDefinitionTest.java @@ -18,13 +18,12 @@ package org.apache.ambari.server.api.resources; +import java.util.Collection; + import org.apache.ambari.server.controller.spi.Resource; import org.junit.Assert; import org.junit.Test; -import java.util.Collection; -import java.util.Set; - /** * BlueprintResourceDefinition tests. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/test/java/org/apache/ambari/server/api/resources/ClusterResourceDefinitionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/ClusterResourceDefinitionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/ClusterResourceDefinitionTest.java index 2d69028..1c3ef0e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/ClusterResourceDefinitionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/ClusterResourceDefinitionTest.java @@ -18,18 +18,18 @@ package org.apache.ambari.server.api.resources; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.Set; + import org.apache.ambari.server.api.query.render.ClusterBlueprintRenderer; import org.apache.ambari.server.api.query.render.DefaultRenderer; import org.apache.ambari.server.api.query.render.MinimalRenderer; import org.apache.ambari.server.controller.spi.Resource; import org.junit.Test; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * ClusterResourceDefinition unit tests. */
