Upgrade to parent POM 19

Import WLFY BOM in JAXRS module Organize imports Update Groovy license headers
hawkular · Aug 13, 2015 · f63e385 · f63e385
1 parent e236ee9
commit f63e385
Show file tree

Hide file tree

Showing 60 changed files with 194 additions and 135 deletions.
diff --git a/api/metrics-api-jaxrs/pom.xml b/api/metrics-api-jaxrs/pom.xml
@@ -34,6 +34,18 @@
   <name>Hawkular Metrics JAXRS API</name>
   <description>The REST-api of Hawkular-Metrics implemented via JAXRS archive</description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.wildfly.bom</groupId>
+        <artifactId>jboss-javaee-7.0-wildfly</artifactId>
+        <version>${version.org.wildfly}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
 
     <dependency>

diff --git a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java
@@ -16,20 +16,21 @@
  */
 package org.hawkular.metrics.api.jaxrs.filter;
 
-import org.hawkular.metrics.api.jaxrs.ApiError;
-import org.hawkular.metrics.api.jaxrs.handler.BaseHandler;
-import org.hawkular.metrics.api.jaxrs.handler.StatusHandler;
-import org.hawkular.metrics.api.jaxrs.handler.VirtualClockHandler;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+
+import java.io.IOException;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Provider;
-import java.io.IOException;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import org.hawkular.metrics.api.jaxrs.ApiError;
+import org.hawkular.metrics.api.jaxrs.handler.BaseHandler;
+import org.hawkular.metrics.api.jaxrs.handler.StatusHandler;
+import org.hawkular.metrics.api.jaxrs.handler.VirtualClockHandler;
 
 /**
  * @author Stefan Negrea

diff --git a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/BaseHandler.java b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/BaseHandler.java
@@ -20,7 +20,6 @@
 import static javax.ws.rs.core.MediaType.APPLICATION_XHTML_XML;
 import static javax.ws.rs.core.MediaType.TEXT_HTML;
 
-import com.wordnik.swagger.annotations.ApiOperation;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -29,8 +28,11 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
+
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 
+import com.wordnik.swagger.annotations.ApiOperation;
+
 /**
  * @author mwringe
  */

diff --git a/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java b/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
@@ -28,8 +28,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import java.util.regex.PatternSyntaxException;
+
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;

diff --git a/...s/src/main/java/org/hawkular/metrics/api/jaxrs/influx/write/validation/DataTypesRule.java b/...s/src/main/java/org/hawkular/metrics/api/jaxrs/influx/write/validation/DataTypesRule.java
@@ -25,10 +25,10 @@
 import java.util.List;
 import java.util.ListIterator;
 
-import com.google.common.base.Predicate;
-
 import org.hawkular.metrics.api.jaxrs.influx.InfluxObject;
 
+import com.google.common.base.Predicate;
+
 /**
  * @author Thomas Segismont
  */

diff --git a/...ain/java/org/hawkular/metrics/api/jaxrs/influx/write/validation/SupportedColumnsRule.java b/...ain/java/org/hawkular/metrics/api/jaxrs/influx/write/validation/SupportedColumnsRule.java
@@ -18,10 +18,10 @@
 
 import java.util.List;
 
-import com.google.common.collect.ImmutableList;
-
 import org.hawkular.metrics.api.jaxrs.influx.InfluxObject;
 
+import com.google.common.collect.ImmutableList;
+
 /**
  * @author Thomas Segismont
  */

diff --git a/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java b/...etrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java
@@ -20,10 +20,11 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.hawkular.metrics.core.api.DataPoint;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 import com.wordnik.swagger.annotations.ApiModel;
-import org.hawkular.metrics.core.api.DataPoint;
 
 /**
  * @author jsanda

diff --git a/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java b/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java
@@ -18,12 +18,13 @@
 
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.wordnik.swagger.annotations.ApiModel;
 import org.hawkular.metrics.api.jaxrs.model.Availability;
 import org.hawkular.metrics.api.jaxrs.model.Counter;
 import org.hawkular.metrics.api.jaxrs.model.Gauge;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wordnik.swagger.annotations.ApiModel;
+
 /**
  * @author Stefan Negrea
  */

diff --git a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/VirtualClock.java b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/VirtualClock.java
@@ -16,10 +16,10 @@
  */
 package org.hawkular.metrics.api.jaxrs.util;
 
-import rx.schedulers.TestScheduler;
-
 import java.util.concurrent.TimeUnit;
 
+import rx.schedulers.TestScheduler;
+
 /**
  * @author jsanda
  */

diff --git a/...lar/metrics/api/jaxrs/influx/query/parse/definition/SelectQueryColumnDefinitionsTest.java b/...lar/metrics/api/jaxrs/influx/query/parse/definition/SelectQueryColumnDefinitionsTest.java
@@ -16,13 +16,14 @@
  */
 package org.hawkular.metrics.api.jaxrs.influx.query.parse.definition;
 
-import static com.google.common.collect.FluentIterable.from;
 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 static com.google.common.collect.FluentIterable.from;
+
 import java.util.List;
 
 import org.antlr.v4.runtime.tree.ParseTreeWalker;

diff --git a/...java/org/hawkular/metrics/api/jaxrs/influx/query/validation/SupportedSelectQueryTest.java b/...java/org/hawkular/metrics/api/jaxrs/influx/query/validation/SupportedSelectQueryTest.java
@@ -20,8 +20,8 @@
 import java.nio.charset.Charset;
 
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.hawkular.metrics.api.jaxrs.influx.query.parse.InfluxQueryParserFactory;
 import org.hawkular.metrics.api.jaxrs.influx.query.parse.InfluxQueryParser.SelectQueryContext;
+import org.hawkular.metrics.api.jaxrs.influx.query.parse.InfluxQueryParserFactory;
 import org.hawkular.metrics.api.jaxrs.influx.query.parse.definition.SelectQueryDefinitions;
 import org.hawkular.metrics.api.jaxrs.influx.query.parse.definition.SelectQueryDefinitionsParser;
 import org.junit.Rule;

diff --git a/...va/org/hawkular/metrics/api/jaxrs/influx/query/validation/UnsupportedSelectQueryTest.java b/...va/org/hawkular/metrics/api/jaxrs/influx/query/validation/UnsupportedSelectQueryTest.java
@@ -20,8 +20,8 @@
 import java.nio.charset.Charset;
 
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.hawkular.metrics.api.jaxrs.influx.query.parse.InfluxQueryParserFactory;
 import org.hawkular.metrics.api.jaxrs.influx.query.parse.InfluxQueryParser.SelectQueryContext;
+import org.hawkular.metrics.api.jaxrs.influx.query.parse.InfluxQueryParserFactory;
 import org.hawkular.metrics.api.jaxrs.influx.query.parse.definition.SelectQueryDefinitions;
 import org.hawkular.metrics.api.jaxrs.influx.query.parse.definition.SelectQueryDefinitionsParser;
 import org.junit.Rule;

diff --git a/...s-api-jaxrs/src/test/java/org/hawkular/metrics/api/jaxrs/param/DurationConverterTest.java b/...s-api-jaxrs/src/test/java/org/hawkular/metrics/api/jaxrs/param/DurationConverterTest.java
@@ -21,6 +21,7 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
+
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;

diff --git a/api/metrics-api-undertow/src/main/java/org/hawkular/metrics/api/undertow/MainServer.java b/api/metrics-api-undertow/src/main/java/org/hawkular/metrics/api/undertow/MainServer.java
@@ -18,6 +18,7 @@
 
 
 import static io.undertow.Handlers.path;
+
 import io.undertow.Handlers;
 import io.undertow.Undertow;
 import io.undertow.server.RoutingHandler;

diff --git a/...metrics-api-undertow/src/main/java/org/hawkular/metrics/api/undertow/MetricsHandlers.java b/...metrics-api-undertow/src/main/java/org/hawkular/metrics/api/undertow/MetricsHandlers.java
@@ -16,11 +16,6 @@
  */
 package org.hawkular.metrics.api.undertow;
 
-import io.undertow.server.HttpHandler;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.server.RoutingHandler;
-import io.undertow.util.Methods;
-
 import java.nio.channels.Channels;
 import java.util.Deque;
 import java.util.List;
@@ -40,6 +35,11 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 
+import io.undertow.server.HttpHandler;
+import io.undertow.server.HttpServerExchange;
+import io.undertow.server.RoutingHandler;
+import io.undertow.util.Methods;
+
 public class MetricsHandlers {
     private final MetricsService metricsService;
     private final ObjectMapper mapper;

diff --git a/api/metrics-api-undertow/src/main/java/org/hawkular/metrics/api/undertow/PingHandler.java b/api/metrics-api-undertow/src/main/java/org/hawkular/metrics/api/undertow/PingHandler.java
@@ -16,11 +16,11 @@
  */
 package org.hawkular.metrics.api.undertow;
 
+import java.util.Date;
+
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 
-import java.util.Date;
-
 class PingHandler implements HttpHandler {
     @Override
     public void handleRequest(HttpServerExchange exchange) throws Exception {

diff --git a/...anslator/src/main/java/org/hawkular/metrics/clients/ptrans/ganglia/UdpGangliaDecoder.java b/...anslator/src/main/java/org/hawkular/metrics/clients/ptrans/ganglia/UdpGangliaDecoder.java
@@ -16,16 +16,16 @@
  */
 package org.hawkular.metrics.clients.ptrans.ganglia;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.socket.DatagramPacket;
-import io.netty.handler.codec.MessageToMessageDecoder;
-
 import java.util.List;
 
 import org.acplt.oncrpc.XdrBufferDecodingStream;
 import org.hawkular.metrics.client.common.SingleMetric;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.socket.DatagramPacket;
+import io.netty.handler.codec.MessageToMessageDecoder;
+
 /**
  * A Decoder for Ganglia metrics packets.
  * Ganglia sends each metric value in its own packet.

diff --git a/...s/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/statsd/StatsdDecoder.java b/...s/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/statsd/StatsdDecoder.java
@@ -18,15 +18,15 @@
 
 import java.util.List;
 
+import org.hawkular.metrics.client.common.MetricType;
+import org.hawkular.metrics.client.common.SingleMetric;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.util.CharsetUtil;
 
-import org.hawkular.metrics.client.common.MetricType;
-import org.hawkular.metrics.client.common.SingleMetric;
-
 /**
  * Decoder for Stats packets that comes in the form of
  * name:value[|type]

diff --git a/...nts/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/syslog/DecoderUtil.java b/...nts/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/syslog/DecoderUtil.java
@@ -21,13 +21,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.util.CharsetUtil;
-
+import org.hawkular.metrics.client.common.SingleMetric;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.hawkular.metrics.client.common.SingleMetric;
+import io.netty.buffer.ByteBuf;
+import io.netty.util.CharsetUtil;
 
 /**
  * Do the actual decoding of the syslog line.

diff --git a/...a-seed-provider/src/main/java/org/hawkular/openshift/cassandra/OpenshiftSeedProvider.java b/...a-seed-provider/src/main/java/org/hawkular/openshift/cassandra/OpenshiftSeedProvider.java
@@ -17,19 +17,19 @@
 
 package org.hawkular.openshift.cassandra;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.cassandra.config.Config;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.locator.SeedProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by mwringe on 10/04/15.
  */

diff --git a/containers/container-tests/src/test/java/org/hawkular/containers/BaseContainerTests.java b/containers/container-tests/src/test/java/org/hawkular/containers/BaseContainerTests.java
@@ -20,14 +20,10 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.fabric8.arquillian.kubernetes.Session;
-import io.fabric8.kubernetes.api.KubernetesClient;
-import io.fabric8.kubernetes.api.model.Service;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
@@ -36,6 +32,13 @@
 import org.junit.Assert;
 import org.junit.Before;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.fabric8.arquillian.kubernetes.Session;
+import io.fabric8.kubernetes.api.KubernetesClient;
+import io.fabric8.kubernetes.api.model.Service;
+
 /**
  * @author mwringe
  */

diff --git a/containers/container-tests/src/test/java/org/hawkular/containers/HeapsterTest.java b/containers/container-tests/src/test/java/org/hawkular/containers/HeapsterTest.java
@@ -20,16 +20,12 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.fabric8.kubernetes.api.model.Pod;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.ServiceAccount;
 import java.net.URLEncoder;
 import java.util.List;
+
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
@@ -38,6 +34,14 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServiceAccount;
+
 /**
  * @author mwringe
  */

diff --git a/containers/container-tests/src/test/java/org/hawkular/containers/TestCassandraScaling.java b/containers/container-tests/src/test/java/org/hawkular/containers/TestCassandraScaling.java
@@ -18,12 +18,14 @@
 
 import static org.junit.Assert.assertEquals;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import io.fabric8.kubernetes.api.model.ReplicationController;
 import org.jboss.arquillian.junit.Arquillian;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
+import io.fabric8.kubernetes.api.model.ReplicationController;
+
 /**
  * @author mwringe
  */