http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java index f9bfa59..96e3621 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java @@ -17,9 +17,19 @@ */ package org.apache.ambari.server.controller.metrics.timeline; -import com.google.inject.Inject; +import static org.apache.ambari.server.controller.metrics.MetricsPaddingMethod.ZERO_PADDING_PARAM; +import static org.apache.ambari.server.controller.metrics.MetricsServiceProvider.MetricsService.TIMELINE_METRICS; + +import java.io.IOException; +import java.net.ConnectException; +import java.net.SocketTimeoutException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; + import org.apache.ambari.server.configuration.ComponentSSLConfiguration; -import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.AmbariServer; import org.apache.ambari.server.controller.internal.PropertyInfo; import org.apache.ambari.server.controller.internal.URLStreamProvider; @@ -42,18 +52,6 @@ import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.http.client.utils.URIBuilder; -import java.io.IOException; -import java.net.ConnectException; -import java.net.SocketTimeoutException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; - -import static org.apache.ambari.server.controller.metrics.MetricsPaddingMethod.ZERO_PADDING_PARAM; -import static org.apache.ambari.server.controller.metrics.MetricsServiceProvider.MetricsService.TIMELINE_METRICS; - public class AMSReportPropertyProvider extends MetricsReportPropertyProvider { private MetricsPaddingMethod metricsPaddingMethod; private final TimelineMetricCache metricCache;
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java index e7d6c0b..ecb59ac 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java @@ -17,22 +17,6 @@ */ package org.apache.ambari.server.controller.metrics.timeline; -import org.apache.ambari.server.controller.internal.URLStreamProvider; -import org.apache.http.HttpStatus; -import org.apache.hadoop.metrics2.sink.timeline.Precision; -import org.apache.http.NameValuePair; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; -import org.apache.http.client.utils.URIBuilder; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectReader; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.ws.rs.HttpMethod; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -46,6 +30,23 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import javax.ws.rs.HttpMethod; + +import org.apache.ambari.server.controller.internal.URLStreamProvider; +import org.apache.hadoop.metrics2.sink.timeline.Precision; +import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; +import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.utils.URIBuilder; +import org.codehaus.jackson.map.AnnotationIntrospector; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.ObjectReader; +import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Helper class to call AMS backend that is utilized by @AMSPropertyProvider * and @AMSReportPropertyProvider as well as @TimelineMetricCacheEntryFactory http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineAppMetricCacheKey.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineAppMetricCacheKey.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineAppMetricCacheKey.java index a5a2168..dd146ac 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineAppMetricCacheKey.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineAppMetricCacheKey.java @@ -17,11 +17,10 @@ */ package org.apache.ambari.server.controller.metrics.timeline.cache; -import org.apache.ambari.server.controller.spi.TemporalInfo; -import org.apache.http.client.utils.URIBuilder; - import java.util.Set; +import org.apache.ambari.server.controller.spi.TemporalInfo; + /** * Cache contents represent metrics for an App / Cluster. * This is designed to work on the premise that a client makes same requests http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java index b852cc2..9bfb56a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCache.java @@ -17,6 +17,15 @@ */ package org.apache.ambari.server.controller.metrics.timeline.cache; +import java.io.IOException; +import java.net.ConnectException; +import java.net.SocketTimeoutException; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.ehcache.CacheException; import net.sf.ehcache.Ehcache; import net.sf.ehcache.Element; @@ -24,17 +33,6 @@ import net.sf.ehcache.constructs.blocking.LockTimeoutException; import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory; import net.sf.ehcache.constructs.blocking.UpdatingSelfPopulatingCache; import net.sf.ehcache.statistics.StatisticsGateway; -import org.apache.ambari.server.AmbariException; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.net.ConnectException; -import java.net.SocketTimeoutException; -import java.util.ArrayList; -import java.util.concurrent.atomic.AtomicInteger; public class TimelineMetricCache extends UpdatingSelfPopulatingCache { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java index 4880d98..036962b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheEntryFactory.java @@ -17,15 +17,15 @@ */ package org.apache.ambari.server.controller.metrics.timeline.cache; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory; +import java.io.IOException; +import java.util.Date; +import java.util.TreeMap; + import org.apache.ambari.server.configuration.ComponentSSLConfiguration; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.internal.URLStreamProvider; import org.apache.ambari.server.controller.metrics.timeline.MetricsRequestHelper; import org.apache.ambari.server.controller.spi.TemporalInfo; -import org.apache.ambari.server.controller.utilities.StreamProvider; import org.apache.hadoop.metrics2.sink.timeline.Precision; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; @@ -33,15 +33,10 @@ import org.apache.http.client.utils.URIBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory; @Singleton public class TimelineMetricCacheEntryFactory implements UpdatingCacheEntryFactory { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheProvider.java index 6b94ffe..2cad21d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheProvider.java @@ -17,8 +17,15 @@ */ package org.apache.ambari.server.controller.metrics.timeline.cache; +import static net.sf.ehcache.config.PersistenceConfiguration.Strategy; + +import org.apache.ambari.server.configuration.Configuration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.inject.Inject; import com.google.inject.Singleton; + import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.config.CacheConfiguration; @@ -26,12 +33,6 @@ import net.sf.ehcache.config.PersistenceConfiguration; import net.sf.ehcache.config.SizeOfPolicyConfiguration; import net.sf.ehcache.config.SizeOfPolicyConfiguration.MaxDepthExceededBehavior; import net.sf.ehcache.store.MemoryStoreEvictionPolicy; -import org.apache.ambari.server.configuration.Configuration; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static net.sf.ehcache.config.PersistenceConfiguration.*; /** * Cache implementation that provides ability to perform incremental reads http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java index a1d29e4..19e0e60 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java @@ -17,17 +17,19 @@ */ package org.apache.ambari.server.controller.metrics.timeline.cache; +import java.util.Map; +import java.util.TreeMap; + +import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; +import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.ehcache.pool.Size; import net.sf.ehcache.pool.SizeOfEngine; import net.sf.ehcache.pool.impl.DefaultSizeOfEngine; import net.sf.ehcache.pool.sizeof.ReflectionSizeOf; import net.sf.ehcache.pool.sizeof.SizeOf; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import java.util.Map; -import java.util.TreeMap; /** * Cache sizing engine that reduces reflective calls over the Object graph to http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheValue.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheValue.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheValue.java index c20ccd3..ba64234 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheValue.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheValue.java @@ -17,13 +17,12 @@ */ package org.apache.ambari.server.controller.metrics.timeline.cache; +import java.util.Date; + import org.apache.hadoop.metrics2.sink.timeline.Precision; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; -import java.util.Date; -import java.util.Map; - /** * Wrapper object for metrics returned from AMS that includes the query time * window. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AlwaysPredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AlwaysPredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AlwaysPredicate.java index d9ecc36..ce70b2f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AlwaysPredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AlwaysPredicate.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.controller.predicate; * limitations under the License. */ -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Collections; import java.util.Set; +import org.apache.ambari.server.controller.spi.Resource; + /** * A predicate that always evaluates to true. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AndPredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AndPredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AndPredicate.java index e4bdd1e..70c0069 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AndPredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AndPredicate.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.controller.predicate; -import org.apache.ambari.server.controller.spi.Predicate; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import org.apache.ambari.server.controller.spi.Predicate; +import org.apache.ambari.server.controller.spi.Resource; + /** * Predicate which evaluates to true if all of the predicates in a predicate http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ArrayPredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ArrayPredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ArrayPredicate.java index c07c6a8..2bcf64e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ArrayPredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ArrayPredicate.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.controller.predicate; -import org.apache.ambari.server.controller.spi.Predicate; -import org.apache.ambari.server.controller.utilities.PredicateHelper; - import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import org.apache.ambari.server.controller.spi.Predicate; +import org.apache.ambari.server.controller.utilities.PredicateHelper; + /** * Predicate which evaluates an array of predicates. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/BasePredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/BasePredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/BasePredicate.java index 51748a2..9b3fbfe 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/BasePredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/BasePredicate.java @@ -18,10 +18,10 @@ package org.apache.ambari.server.controller.predicate; -import org.apache.ambari.server.controller.spi.Predicate; - import java.util.Set; +import org.apache.ambari.server.controller.spi.Predicate; + /** * An extended predicate interface which allows for the retrieval of any * associated property ids. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/CategoryIsEmptyPredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/CategoryIsEmptyPredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/CategoryIsEmptyPredicate.java index 6176ed4..67774e1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/CategoryIsEmptyPredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/CategoryIsEmptyPredicate.java @@ -18,10 +18,10 @@ package org.apache.ambari.server.controller.predicate; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Map; +import org.apache.ambari.server.controller.spi.Resource; + /** * Predicate that checks if the associated property category is empty. If the associated * property id references a Map property then treat the Map as a category. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/FilterPredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/FilterPredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/FilterPredicate.java index e343e80..1333c02 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/FilterPredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/FilterPredicate.java @@ -17,11 +17,12 @@ */ package org.apache.ambari.server.controller.predicate; -import org.apache.ambari.server.controller.spi.Resource; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import org.apache.ambari.server.controller.spi.Resource; + /** * Predicate that checks if current property matches the filter expression */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/OrPredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/OrPredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/OrPredicate.java index b3cdd802..ba85185 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/OrPredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/OrPredicate.java @@ -17,13 +17,13 @@ */ package org.apache.ambari.server.controller.predicate; -import org.apache.ambari.server.controller.spi.Predicate; -import org.apache.ambari.server.controller.spi.Resource; - import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import org.apache.ambari.server.controller.spi.Predicate; +import org.apache.ambari.server.controller.spi.Resource; + /** * Predicate which evaluates to true if any of the predicates in a predicate * array evaluate to true. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/UnaryPredicate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/UnaryPredicate.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/UnaryPredicate.java index ebc8a50..64f9f69 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/UnaryPredicate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/UnaryPredicate.java @@ -17,11 +17,11 @@ */ package org.apache.ambari.server.controller.predicate; +import java.util.Set; + import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.utilities.PredicateHelper; -import java.util.Set; - /** * Predicate that operates on one other predicate. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java index bb452bb..30cf073 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java @@ -19,12 +19,8 @@ package org.apache.ambari.server.controller.spi; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListMap; /** * The resource object represents a requested resource. The resource http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/SortRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/SortRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/SortRequest.java index 9f818b8..9f7f6ab 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/SortRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/SortRequest.java @@ -17,8 +17,6 @@ */ package org.apache.ambari.server.controller.spi; -import org.apache.ambari.server.controller.internal.SortRequestImpl; - import java.util.List; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ClusterControllerHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ClusterControllerHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ClusterControllerHelper.java index 3086eb8..e42fbe2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ClusterControllerHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ClusterControllerHelper.java @@ -18,9 +18,9 @@ package org.apache.ambari.server.controller.utilities; -import org.apache.ambari.server.controller.spi.ProviderModule; import org.apache.ambari.server.controller.internal.ClusterControllerImpl; import org.apache.ambari.server.controller.spi.ClusterController; +import org.apache.ambari.server.controller.spi.ProviderModule; import org.apache.ambari.server.view.ViewProviderModule; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java index 0aba68a..e0a3d55 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/KerberosChecker.java @@ -18,18 +18,20 @@ package org.apache.ambari.server.controller.utilities; -import com.google.inject.Inject; -import com.sun.security.auth.callback.TextCallbackHandler; +import java.io.File; +import java.util.Map; + +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.configuration.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; -import java.io.File; -import java.util.Map; +import com.google.inject.Inject; +import com.sun.security.auth.callback.TextCallbackHandler; public class KerberosChecker { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java index a6dcb50..6c28e38 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateBuilder.java @@ -17,6 +17,9 @@ */ package org.apache.ambari.server.controller.utilities; +import java.util.LinkedList; +import java.util.List; + import org.apache.ambari.server.controller.predicate.AndPredicate; import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.apache.ambari.server.controller.predicate.GreaterEqualsPredicate; @@ -27,9 +30,6 @@ import org.apache.ambari.server.controller.predicate.NotPredicate; import org.apache.ambari.server.controller.predicate.OrPredicate; import org.apache.ambari.server.controller.spi.Predicate; -import java.util.LinkedList; -import java.util.List; - /** * Builder for predicates. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateHelper.java index 381fcac..0851352 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PredicateHelper.java @@ -17,16 +17,16 @@ */ package org.apache.ambari.server.controller.utilities; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.controller.internal.PropertyPredicateVisitor; import org.apache.ambari.server.controller.predicate.BasePredicate; import org.apache.ambari.server.controller.predicate.PredicateVisitor; import org.apache.ambari.server.controller.predicate.PredicateVisitorAcceptor; import org.apache.ambari.server.controller.spi.Predicate; -import java.util.Collections; -import java.util.Map; -import java.util.Set; - /** * */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java index 4ded10e..4681b08 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java @@ -20,7 +20,6 @@ package org.apache.ambari.server.controller.utilities; import java.io.IOException; import java.util.Arrays; import java.util.Collections; -import java.util.EnumMap; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -31,13 +30,11 @@ import java.util.regex.Pattern; import org.apache.ambari.server.controller.internal.PropertyInfo; import org.apache.ambari.server.controller.internal.RequestImpl; -import org.apache.ambari.server.controller.jmx.JMXPropertyProvider; import org.apache.ambari.server.controller.spi.PageRequest; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.SortRequest; import org.apache.ambari.server.controller.spi.TemporalInfo; -import org.apache.ambari.server.state.stack.Metric; import org.apache.commons.lang.StringUtils; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java index 77c4d81..aab051a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/ServiceCalculatedStateFactory.java @@ -18,7 +18,8 @@ package org.apache.ambari.server.controller.utilities; -import net.sf.ehcache.util.concurrent.ConcurrentHashMap; +import java.util.Map; + import org.apache.ambari.server.controller.utilities.state.DefaultServiceCalculatedState; import org.apache.ambari.server.controller.utilities.state.FlumeServiceCalculatedState; import org.apache.ambari.server.controller.utilities.state.HBaseServiceCalculatedState; @@ -30,7 +31,8 @@ import org.apache.ambari.server.controller.utilities.state.YARNServiceCalculated import org.apache.ambari.server.state.Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; + +import net.sf.ehcache.util.concurrent.ConcurrentHashMap; public class ServiceCalculatedStateFactory { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java index beca114..264ba03 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java @@ -18,8 +18,9 @@ package org.apache.ambari.server.controller.utilities.state; -import com.google.inject.Inject; -import com.google.inject.Provider; +import java.util.Collections; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.StaticallyInject; @@ -36,8 +37,8 @@ import org.apache.ambari.server.state.State; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collections; -import java.util.Set; +import com.google.inject.Inject; +import com.google.inject.Provider; /** * Default calculator of service state. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java index bd0d42a..317da09 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/FlumeServiceCalculatedState.java @@ -18,6 +18,9 @@ package org.apache.ambari.server.controller.utilities.state; +import java.util.Collections; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.StaticallyInject; import org.apache.ambari.server.controller.ServiceComponentHostRequest; @@ -25,9 +28,6 @@ import org.apache.ambari.server.controller.ServiceComponentHostResponse; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.State; -import java.util.Collections; -import java.util.Set; - /** * Determines the service status for Flume. Generically, this means that * the state of Flume is the lowest ordinal state calculated. For example: http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java index 1514bdb..d44515c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HBaseServiceCalculatedState.java @@ -18,6 +18,9 @@ package org.apache.ambari.server.controller.utilities.state; +import java.util.Collections; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.StaticallyInject; @@ -29,9 +32,6 @@ import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.State; -import java.util.Collections; -import java.util.Set; - /** * Calculator of HBase service state. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java index e317dcb..89d4004 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HDFSServiceCalculatedState.java @@ -18,6 +18,9 @@ package org.apache.ambari.server.controller.utilities.state; +import java.util.Collections; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.StaticallyInject; @@ -29,9 +32,6 @@ import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.State; -import java.util.Collections; -import java.util.Set; - /** * Calculator of HDFS service state. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java index 0f280b3..0643c94 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/HiveServiceCalculatedState.java @@ -18,6 +18,9 @@ package org.apache.ambari.server.controller.utilities.state; +import java.util.Collections; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.StaticallyInject; @@ -29,9 +32,6 @@ import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.State; -import java.util.Collections; -import java.util.Set; - /** * Calculator of HIVE service state. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java index 3739516..4d0cf92 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/OozieServiceCalculatedState.java @@ -18,6 +18,9 @@ package org.apache.ambari.server.controller.utilities.state; +import java.util.Collections; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.StaticallyInject; @@ -29,9 +32,6 @@ import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.State; -import java.util.Collections; -import java.util.Set; - /** * Calculator of Oozie service state. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java index ed401ab..24c4602 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/YARNServiceCalculatedState.java @@ -18,6 +18,9 @@ package org.apache.ambari.server.controller.utilities.state; +import java.util.Collections; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.StaticallyInject; @@ -29,9 +32,6 @@ import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.State; -import java.util.Collections; -import java.util.Set; - /** * Calculator of YARN service state. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinition.java index 02c469f..72ccc4a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinition.java @@ -18,13 +18,13 @@ package org.apache.ambari.server.customactions; +import java.util.Set; + import org.apache.ambari.server.actionmanager.ActionType; import org.apache.ambari.server.actionmanager.TargetHostType; import org.apache.ambari.server.controller.ActionResponse; import org.apache.ambari.server.security.authorization.RoleAuthorization; -import java.util.Set; - /** * The resource describing the definition of an action */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java index 637471f..7e93f23 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/customactions/ActionDefinitionManager.java @@ -17,19 +17,6 @@ */ package org.apache.ambari.server.customactions; -import org.apache.ambari.server.AmbariException; -import org.apache.ambari.server.actionmanager.ActionType; -import org.apache.ambari.server.actionmanager.TargetHostType; -import org.apache.ambari.server.api.services.AmbariMetaInfo; -import org.apache.ambari.server.security.authorization.RoleAuthorization; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.UnmarshalException; -import javax.xml.bind.Unmarshaller; import java.io.File; import java.util.ArrayList; import java.util.EnumSet; @@ -39,6 +26,20 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.UnmarshalException; +import javax.xml.bind.Unmarshaller; + +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.actionmanager.ActionType; +import org.apache.ambari.server.actionmanager.TargetHostType; +import org.apache.ambari.server.api.services.AmbariMetaInfo; +import org.apache.ambari.server.security.authorization.RoleAuthorization; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Manages Action definitions read from XML files */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/events/AlertEvent.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertEvent.java index 4860ffa..a5bf23a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertEvent.java @@ -17,11 +17,11 @@ */ package org.apache.ambari.server.events; -import org.apache.ambari.server.state.Alert; - import java.util.Collections; import java.util.List; +import org.apache.ambari.server.state.Alert; + /** * The {@link AlertEvent} class is the base for all events related to alerts. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AlertEventPublisher.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AlertEventPublisher.java b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AlertEventPublisher.java index 5427a7b..6b6f674 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AlertEventPublisher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/AlertEventPublisher.java @@ -23,13 +23,13 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import com.google.inject.Inject; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.events.AlertEvent; import com.google.common.eventbus.AsyncEventBus; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; +import com.google.inject.Inject; import com.google.inject.Singleton; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/VersionEventPublisher.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/VersionEventPublisher.java b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/VersionEventPublisher.java index 710707e..68602a0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/VersionEventPublisher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/publishers/VersionEventPublisher.java @@ -18,11 +18,11 @@ package org.apache.ambari.server.events.publishers; +import org.apache.ambari.server.events.ClusterEvent; + import com.google.common.eventbus.EventBus; import com.google.inject.Singleton; -import org.apache.ambari.server.events.ClusterEvent; - /** * The {@link VersionEventPublisher} is used to publish instances of * {@link ClusterEvent} to any {@link com.google.common.eventbus.Subscribe} interested. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserCreatedEvent.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserCreatedEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserCreatedEvent.java index 8e914dc..5f475f2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserCreatedEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserCreatedEvent.java @@ -18,8 +18,6 @@ package org.apache.ambari.server.hooks.users; -import javax.inject.Inject; - import org.apache.ambari.server.events.AmbariEvent; import org.apache.ambari.server.hooks.HookContext; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/logging/LockFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/logging/LockFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/logging/LockFactory.java index f40aa84..b848c28 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/logging/LockFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/logging/LockFactory.java @@ -17,13 +17,6 @@ */ package org.apache.ambari.server.logging; -import com.google.common.base.Ticker; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import org.apache.ambari.server.configuration.Configuration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.locks.Lock; @@ -31,6 +24,14 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.apache.ambari.server.configuration.Configuration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Ticker; +import com.google.inject.Inject; +import com.google.inject.Singleton; + /** * Factory to create locks depending on configuration. If lock profiling is enabled, * it creates instrumented locks that collect statistics and log requests. If profiling is http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/logging/LockProfileDelegate.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/logging/LockProfileDelegate.java b/ambari-server/src/main/java/org/apache/ambari/server/logging/LockProfileDelegate.java index e37016e0..42cb7fc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/logging/LockProfileDelegate.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/logging/LockProfileDelegate.java @@ -17,16 +17,17 @@ */ package org.apache.ambari.server.logging; -import com.google.common.base.Ticker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Ticker; + /** * A helper object for Lock implementations that need logging/profiling. * <p> http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantLock.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantLock.java b/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantLock.java index a45b1e4..f6d1011 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantLock.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantLock.java @@ -17,13 +17,13 @@ */ package org.apache.ambari.server.logging; -import com.google.common.base.Ticker; - import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; +import com.google.common.base.Ticker; + /** * Implements profiling for a ReentrantLock. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantReadWriteLock.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantReadWriteLock.java b/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantReadWriteLock.java index 4452b67..d4ba3d5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantReadWriteLock.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/logging/ProfiledReentrantReadWriteLock.java @@ -17,13 +17,13 @@ */ package org.apache.ambari.server.logging; -import com.google.common.base.Ticker; - import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import com.google.common.base.Ticker; + /** * Implements profiling for a ReentrantReadWriteLock. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/metadata/ActionMetadata.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metadata/ActionMetadata.java b/ambari-server/src/main/java/org/apache/ambari/server/metadata/ActionMetadata.java index 9135cdc..0064662 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metadata/ActionMetadata.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metadata/ActionMetadata.java @@ -18,10 +18,6 @@ package org.apache.ambari.server.metadata; -import com.google.inject.Singleton; -import org.apache.ambari.server.Role; -import org.apache.ambari.server.state.Service; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -29,6 +25,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.ambari.server.Role; +import org.apache.ambari.server.state.Service; + +import com.google.inject.Singleton; + /** * Contains metadata about actions supported by services */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AbstractMetricsSource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AbstractMetricsSource.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AbstractMetricsSource.java index 58e2045..cb90a13 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AbstractMetricsSource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AbstractMetricsSource.java @@ -17,11 +17,11 @@ */ package org.apache.ambari.server.metrics.system.impl; +import java.util.Map; + import org.apache.ambari.server.metrics.system.AmbariMetricSink; import org.apache.ambari.server.metrics.system.MetricsSource; -import java.util.Map; - public abstract class AbstractMetricsSource implements MetricsSource { protected AmbariMetricSink sink; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java index 00d205a..391fe11 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java @@ -17,13 +17,6 @@ */ package org.apache.ambari.server.metrics.system.impl; -import jline.internal.Log; -import org.apache.ambari.server.metrics.system.AmbariMetricSink; -import org.apache.commons.lang.ClassUtils; -import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; -import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; - import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; @@ -32,6 +25,14 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.ambari.server.metrics.system.AmbariMetricSink; +import org.apache.commons.lang.ClassUtils; +import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; +import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; +import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; + +import jline.internal.Log; + public class AmbariMetricSinkImpl extends AbstractTimelineMetricsSink implements AmbariMetricSink { private static final String APP_ID = "ambari_server"; private int timeoutSeconds = 10; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/Configuration.java index 705971f..44a3de0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/Configuration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/Configuration.java @@ -17,14 +17,14 @@ */ package org.apache.ambari.server.metrics.system.impl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.Properties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class Configuration { public static final String CONFIG_FILE = "metrics.properties"; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java index a04ca43..ef07deb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/JvmMetricsSource.java @@ -17,6 +17,14 @@ */ package org.apache.ambari.server.metrics.system.impl; +import java.lang.management.ManagementFactory; +import java.util.HashMap; +import java.util.Map; + +import org.apache.ambari.server.metrics.system.AmbariMetricSink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.codahale.metrics.Metric; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricSet; @@ -24,13 +32,6 @@ import com.codahale.metrics.jvm.BufferPoolMetricSet; import com.codahale.metrics.jvm.GarbageCollectorMetricSet; import com.codahale.metrics.jvm.MemoryUsageGaugeSet; import com.codahale.metrics.jvm.ThreadStatesGaugeSet; -import org.apache.ambari.server.metrics.system.AmbariMetricSink; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.management.ManagementFactory; -import java.util.HashMap; -import java.util.Map; public class JvmMetricsSource extends AbstractMetricsSource { static final MetricRegistry registry = new MetricRegistry(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java index 1645ebf..44b6204 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/MetricsServiceImpl.java @@ -18,8 +18,17 @@ package org.apache.ambari.server.metrics.system.impl; -import com.google.inject.Inject; -import com.google.inject.Singleton; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.internal.AbstractControllerResourceProvider; import org.apache.ambari.server.controller.internal.ServiceConfigVersionResourceProvider; @@ -34,21 +43,12 @@ import org.apache.ambari.server.metrics.system.MetricsService; import org.apache.ambari.server.security.authorization.internal.InternalAuthenticationToken; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.context.SecurityContextHolder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; +import com.google.inject.Inject; +import com.google.inject.Singleton; @Singleton public class MetricsServiceImpl implements MetricsService { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java index 77e55a4..62ef31a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java @@ -18,7 +18,11 @@ package org.apache.ambari.server.notifications.dispatchers; -import com.google.inject.Singleton; +import java.io.IOException; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + import org.apache.ambari.server.notifications.Notification; import org.apache.ambari.server.state.alert.AlertNotification; import org.apache.ambari.server.state.alert.TargetType; @@ -33,8 +37,7 @@ import org.snmp4j.smi.OctetString; import org.snmp4j.smi.VariableBinding; import org.snmp4j.util.DefaultPDUFactory; -import java.io.IOException; -import java.util.*; +import com.google.inject.Singleton; /** * The {@link AmbariSNMPDispatcher} class is used to dispatch {@link AlertNotification} via SNMP using predefined Ambari OIDs. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcher.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcher.java index 575f17b..bdfe7a7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/SNMPDispatcher.java @@ -20,10 +20,10 @@ package org.apache.ambari.server.notifications.dispatchers; import java.io.IOException; import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashSet; import org.apache.ambari.server.notifications.Notification; import org.apache.ambari.server.notifications.NotificationDispatcher; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariLocalSessionInterceptor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariLocalSessionInterceptor.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariLocalSessionInterceptor.java index fde96c5..32ada91 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariLocalSessionInterceptor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariLocalSessionInterceptor.java @@ -18,11 +18,12 @@ package org.apache.ambari.server.orm; -import com.google.inject.Inject; -import com.google.inject.persist.jpa.AmbariJpaPersistService; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; +import com.google.inject.Inject; +import com.google.inject.persist.jpa.AmbariJpaPersistService; + /** * AOP interceptor to provide session borders */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ArtifactDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ArtifactDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ArtifactDAO.java index 7d642c8..1d8f2c7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ArtifactDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ArtifactDAO.java @@ -19,18 +19,20 @@ package org.apache.ambari.server.orm.dao; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.ArtifactEntity; +import java.util.List; +import java.util.TreeMap; import javax.persistence.EntityManager; import javax.persistence.NoResultException; import javax.persistence.TypedQuery; -import java.util.List; -import java.util.TreeMap; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.ArtifactEntity; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.google.inject.persist.Transactional; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintDAO.java index 8c14a29..0a15860 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintDAO.java @@ -19,17 +19,19 @@ package org.apache.ambari.server.orm.dao; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.google.inject.persist.Transactional; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + import org.apache.ambari.server.orm.RequiresSession; import org.apache.ambari.server.orm.entities.BlueprintEntity; import org.apache.ambari.server.orm.entities.StackEntity; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.util.List; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.google.inject.persist.Transactional; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterStateDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterStateDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterStateDAO.java index b9505e8..f309ad8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterStateDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterStateDAO.java @@ -18,15 +18,17 @@ package org.apache.ambari.server.orm.dao; +import java.util.List; + +import javax.persistence.EntityManager; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.ClusterStateEntity; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.ClusterStateEntity; - -import javax.persistence.EntityManager; -import java.util.List; @Singleton public class ClusterStateDAO { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupConfigMappingDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupConfigMappingDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupConfigMappingDAO.java index d4f37c4..dfc5f0f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupConfigMappingDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupConfigMappingDAO.java @@ -17,16 +17,19 @@ */ package org.apache.ambari.server.orm.dao; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.ConfigGroupConfigMappingEntity; +import org.apache.ambari.server.orm.entities.ConfigGroupConfigMappingEntityPK; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.ConfigGroupConfigMappingEntity; -import org.apache.ambari.server.orm.entities.ConfigGroupConfigMappingEntityPK; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.util.List; @Singleton public class ConfigGroupConfigMappingDAO { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupDAO.java index a2dd29b..9455994 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupDAO.java @@ -17,16 +17,19 @@ */ package org.apache.ambari.server.orm.dao; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; +import javax.persistence.TypedQuery; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.ConfigGroupEntity; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.ConfigGroupEntity; -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; -import java.util.List; @Singleton @RequiresSession http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/CrudDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/CrudDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/CrudDAO.java index 473c558..bcc85a8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/CrudDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/CrudDAO.java @@ -23,6 +23,7 @@ import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import org.apache.ambari.server.orm.RequiresSession; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.persist.Transactional; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java index bdcece5..cd3faf0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java @@ -18,8 +18,11 @@ package org.apache.ambari.server.orm.dao; -import com.google.inject.Inject; -import com.google.inject.Singleton; +import static org.apache.ambari.server.orm.DBAccessor.DbType; + +import java.util.Collections; +import java.util.List; + import javax.persistence.EntityManager; import javax.persistence.NoResultException; import javax.persistence.Query; @@ -27,11 +30,12 @@ import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import java.util.Collections; -import java.util.List; -import static org.apache.ambari.server.orm.DBAccessor.DbType; + import org.apache.ambari.server.orm.DBAccessor; +import com.google.inject.Inject; +import com.google.inject.Singleton; + @Singleton public class DaoUtils { @Inject http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExecutionCommandDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExecutionCommandDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExecutionCommandDAO.java index 9a40a0c..7a3bc01 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExecutionCommandDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExecutionCommandDAO.java @@ -18,15 +18,17 @@ package org.apache.ambari.server.orm.dao; +import java.util.List; + +import javax.persistence.EntityManager; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.ExecutionCommandEntity; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.ExecutionCommandEntity; - -import javax.persistence.EntityManager; -import java.util.List; @Singleton public class ExecutionCommandDAO { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java index d90480b..adf7a04 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java @@ -18,7 +18,6 @@ package org.apache.ambari.server.orm.dao; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.persistence.EntityManager; @@ -28,7 +27,6 @@ import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.controller.ExtensionLinkRequest; import org.apache.ambari.server.orm.RequiresSession; import org.apache.ambari.server.orm.entities.ExtensionLinkEntity; -import org.apache.ambari.server.orm.entities.ExtensionLinkEntity; import com.google.inject.Inject; import com.google.inject.Provider; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java index f8392d9..0b6c14a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -33,8 +32,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; -import com.google.inject.Singleton; - import org.apache.ambari.server.orm.RequiresSession; import org.apache.ambari.server.orm.cache.HostConfigMapping; import org.apache.ambari.server.orm.cache.HostConfigMappingImpl; @@ -45,6 +42,7 @@ import org.apache.commons.collections.Predicate; import com.google.inject.Inject; import com.google.inject.Provider; +import com.google.inject.Singleton; import com.google.inject.persist.Transactional; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostStateDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostStateDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostStateDAO.java index 10828ac..d230abd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostStateDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostStateDAO.java @@ -18,17 +18,17 @@ package org.apache.ambari.server.orm.dao; +import java.util.List; + +import javax.persistence.EntityManager; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.HostStateEntity; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.HostStateEntity; -import org.apache.ambari.server.orm.entities.HostVersionEntity; - -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.util.List; @Singleton public class HostStateDAO { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java index 94c5a4f..cdc2fcd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosDescriptorDAO.java @@ -1,15 +1,17 @@ package org.apache.ambari.server.orm.dao; -import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.KerberosDescriptorEntity; +import java.util.List; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; -import java.util.List; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.KerberosDescriptorEntity; + +import com.google.inject.persist.Transactional; /** * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java index 7aa4df2..93c55c1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalDAO.java @@ -19,16 +19,18 @@ package org.apache.ambari.server.orm.dao; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.KerberosPrincipalEntity; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.KerberosPrincipalEntity; - -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.util.List; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalHostDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalHostDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalHostDAO.java index 4fcd019..0c17f19 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalHostDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KerberosPrincipalHostDAO.java @@ -19,17 +19,19 @@ package org.apache.ambari.server.orm.dao; -import com.google.inject.Inject; -import com.google.inject.Provider; -import com.google.inject.Singleton; -import com.google.inject.persist.Transactional; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + import org.apache.ambari.server.orm.RequiresSession; import org.apache.ambari.server.orm.entities.KerberosPrincipalHostEntity; import org.apache.ambari.server.orm.entities.KerberosPrincipalHostEntityPK; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.util.List; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.google.inject.persist.Transactional; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KeyValueDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KeyValueDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KeyValueDAO.java index b2d92b3..5034647 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KeyValueDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KeyValueDAO.java @@ -18,16 +18,18 @@ package org.apache.ambari.server.orm.dao; +import java.util.Collection; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + +import org.apache.ambari.server.orm.RequiresSession; +import org.apache.ambari.server.orm.entities.KeyValueEntity; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.persist.Transactional; -import org.apache.ambari.server.orm.RequiresSession; -import org.apache.ambari.server.orm.entities.KeyValueEntity; - -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.util.Collection; @Singleton public class KeyValueDAO {
