Bump maven-checkstyle-plugin

radargun · Oct 13, 2022 · 19c0364 · 19c0364
1 parent 50199a4
commit 19c0364
Show file tree

Hide file tree

Showing 50 changed files with 49 additions and 10 deletions.
diff --git a/core/src/main/java/org/radargun/config/ClasspathScanner.java b/core/src/main/java/org/radargun/config/ClasspathScanner.java
@@ -8,7 +8,6 @@
 import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
 import io.github.lukehutch.fastclasspathscanner.scanner.ClassInfo;
 import io.github.lukehutch.fastclasspathscanner.scanner.ScanResult;
-
 import org.radargun.logging.Log;
 import org.radargun.logging.LogFactory;
 

diff --git a/core/src/main/java/org/radargun/config/DomConfigParser.java b/core/src/main/java/org/radargun/config/DomConfigParser.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;

diff --git a/core/src/main/java/org/radargun/jmx/JMXPoller.java b/core/src/main/java/org/radargun/jmx/JMXPoller.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+
 import javax.management.MBeanServerConnection;
 import javax.management.Notification;
 import javax.management.NotificationFilterSupport;

diff --git a/core/src/main/java/org/radargun/stages/AfterServiceStartStage.java b/core/src/main/java/org/radargun/stages/AfterServiceStartStage.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.radargun.DistStageAck;
 import org.radargun.ServiceContext;
 import org.radargun.ServiceHelper;

diff --git a/core/src/main/java/org/radargun/stages/BeforeServiceStartStage.java b/core/src/main/java/org/radargun/stages/BeforeServiceStartStage.java
@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+
 import org.radargun.DistStageAck;
 import org.radargun.ServiceContext;
 import org.radargun.config.Stage;

diff --git a/core/src/main/java/org/radargun/stages/monitor/HeapDumpTask.java b/core/src/main/java/org/radargun/stages/monitor/HeapDumpTask.java
@@ -5,12 +5,12 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static java.lang.management.ManagementFactory.newPlatformMXBeanProxy;
 import com.sun.management.HotSpotDiagnosticMXBean;
-
 import org.radargun.sysmonitor.JmxMonitor;
 import org.radargun.traits.JmxConnectionProvider;
 
+import static java.lang.management.ManagementFactory.newPlatformMXBeanProxy;
+
 public class HeapDumpTask extends JmxMonitor implements PeriodicStage.PeriodicTask {
 
    private HotSpotDiagnosticMXBean heapDumpMXBean;

diff --git a/core/src/main/java/org/radargun/stages/monitor/JProfilerStage.java b/core/src/main/java/org/radargun/stages/monitor/JProfilerStage.java
@@ -2,6 +2,7 @@
 
 import java.lang.management.ManagementFactory;
 import java.util.Collection;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 

diff --git a/core/src/main/java/org/radargun/stages/monitor/MonitorStopStage.java b/core/src/main/java/org/radargun/stages/monitor/MonitorStopStage.java
@@ -1,6 +1,7 @@
 package org.radargun.stages.monitor;
 
 import java.util.List;
+
 import org.radargun.DistStageAck;
 import org.radargun.StageResult;
 import org.radargun.config.Stage;

diff --git a/core/src/main/java/org/radargun/stages/test/Stressor.java b/core/src/main/java/org/radargun/stages/test/Stressor.java
@@ -116,7 +116,7 @@ private void runInternal() {
                try {
                   logic.run(operation);
                   if (thinkTime > 0)
-                    sleep(thinkTime);
+                     sleep(thinkTime);
                } catch (OperationLogic.RequestException e) {
                   if (stage.exitOnFailure) {
                      // it will stop all stressor

diff --git a/core/src/main/java/org/radargun/stages/trace/MethodInterceptor.java b/core/src/main/java/org/radargun/stages/trace/MethodInterceptor.java
@@ -10,7 +10,6 @@
 import net.bytebuddy.implementation.bind.annotation.Origin;
 import net.bytebuddy.implementation.bind.annotation.RuntimeType;
 import net.bytebuddy.implementation.bind.annotation.SuperCall;
-
 import org.HdrHistogram.Histogram;
 
 public class MethodInterceptor {

diff --git a/core/src/main/java/org/radargun/stages/trace/TraceMethodCall.java b/core/src/main/java/org/radargun/stages/trace/TraceMethodCall.java
@@ -12,7 +12,6 @@
 import net.bytebuddy.agent.builder.AgentBuilder;
 import net.bytebuddy.implementation.MethodDelegation;
 import net.bytebuddy.matcher.ElementMatchers;
-
 import org.HdrHistogram.Histogram;
 import org.radargun.config.Property;
 import org.radargun.logging.Log;

diff --git a/core/src/main/java/org/radargun/sysmonitor/GcMonitor.java b/core/src/main/java/org/radargun/sysmonitor/GcMonitor.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 

diff --git a/core/src/main/java/org/radargun/sysmonitor/JmxMonitor.java b/core/src/main/java/org/radargun/sysmonitor/JmxMonitor.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.text.NumberFormat;
+
 import javax.management.AttributeNotFoundException;
 import javax.management.MBeanServerConnection;
 import javax.management.MalformedObjectNameException;

diff --git a/core/src/main/java/org/radargun/utils/AddressStringListConverter.java b/core/src/main/java/org/radargun/utils/AddressStringListConverter.java
@@ -1,6 +1,7 @@
 package org.radargun.utils;
 
 import java.lang.reflect.Type;
+
 import org.radargun.config.Converter;
 
 /**

diff --git a/core/src/main/java/org/radargun/utils/EnvsConverter.java b/core/src/main/java/org/radargun/utils/EnvsConverter.java
@@ -3,6 +3,7 @@
 import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.TreeMap;
+
 import org.radargun.config.Converter;
 import org.radargun.logging.Log;
 import org.radargun.logging.LogFactory;

diff --git a/core/src/main/java/org/radargun/utils/Utils.java b/core/src/main/java/org/radargun/utils/Utils.java
@@ -26,6 +26,7 @@
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+
 import javax.management.MBeanServer;
 
 import com.sun.management.HotSpotDiagnosticMXBean;

diff --git a/...sions/cache/src/main/java/org/radargun/stages/cache/generators/BooleanValueGenerator.java b/...sions/cache/src/main/java/org/radargun/stages/cache/generators/BooleanValueGenerator.java
@@ -1,6 +1,7 @@
 package org.radargun.stages.cache.generators;
 
 import java.util.Random;
+
 import org.radargun.config.DefinitionElement;
 
 /**

diff --git a/...sions/cache/src/main/java/org/radargun/stages/cache/generators/ByteArrayKeyGenerator.java b/...sions/cache/src/main/java/org/radargun/stages/cache/generators/ByteArrayKeyGenerator.java
@@ -1,6 +1,7 @@
 package org.radargun.stages.cache.generators;
 
 import java.nio.ByteBuffer;
+
 import org.radargun.config.DefinitionElement;
 
 /**

diff --git a/extensions/cache/src/main/java/org/radargun/stages/cache/generators/DateValueGenerator.java b/extensions/cache/src/main/java/org/radargun/stages/cache/generators/DateValueGenerator.java
@@ -2,6 +2,7 @@
 
 import java.util.Date;
 import java.util.Random;
+
 import org.radargun.config.DefinitionElement;
 
 /**

diff --git a/...sions/cache/src/main/java/org/radargun/stages/cache/generators/IntegerValueGenerator.java b/...sions/cache/src/main/java/org/radargun/stages/cache/generators/IntegerValueGenerator.java
@@ -1,6 +1,7 @@
 package org.radargun.stages.cache.generators;
 
 import java.util.Random;
+
 import org.radargun.config.DefinitionElement;
 
 /**

diff --git a/extensions/counter/src/main/java/org/radargun/stages/CheckCounterStage.java b/extensions/counter/src/main/java/org/radargun/stages/CheckCounterStage.java
@@ -1,6 +1,7 @@
 package org.radargun.stages;
 
 import java.util.List;
+
 import org.radargun.DistStageAck;
 import org.radargun.StageResult;
 import org.radargun.config.Namespace;

diff --git a/extensions/rest/src/main/java/org/radargun/RESTOperationInvocations.java b/extensions/rest/src/main/java/org/radargun/RESTOperationInvocations.java
@@ -1,9 +1,11 @@
 package org.radargun;
 
 import java.util.List;
+
 import javax.ws.rs.core.Cookie;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
+
 import org.radargun.stages.test.Invocation;
 import org.radargun.traits.RESTOperations;
 

diff --git a/extensions/rest/src/main/java/org/radargun/stages/BackgroundRESTOperationsStartStage.java b/extensions/rest/src/main/java/org/radargun/stages/BackgroundRESTOperationsStartStage.java
@@ -1,6 +1,7 @@
 package org.radargun.stages;
 
 import java.util.List;
+
 import org.radargun.DistStageAck;
 import org.radargun.StageResult;
 import org.radargun.config.Namespace;

diff --git a/extensions/rest/src/main/java/org/radargun/stages/BackgroundRESTOperationsStopStage.java b/extensions/rest/src/main/java/org/radargun/stages/BackgroundRESTOperationsStopStage.java
@@ -1,6 +1,7 @@
 package org.radargun.stages;
 
 import java.util.List;
+
 import org.radargun.DistStageAck;
 import org.radargun.StageResult;
 import org.radargun.config.Namespace;

diff --git a/extensions/rest/src/main/java/org/radargun/stages/RESTOperationsTestStage.java b/extensions/rest/src/main/java/org/radargun/stages/RESTOperationsTestStage.java
@@ -2,9 +2,11 @@
 
 import java.util.Collections;
 import java.util.List;
+
 import javax.ws.rs.core.Cookie;
 import javax.ws.rs.core.NewCookie;
 import javax.ws.rs.core.Response;
+
 import org.radargun.Operation;
 import org.radargun.RESTOperationInvocations;
 import org.radargun.Version;

diff --git a/extensions/rest/src/main/java/org/radargun/traits/RESTOperations.java b/extensions/rest/src/main/java/org/radargun/traits/RESTOperations.java
@@ -1,9 +1,11 @@
 package org.radargun.traits;
 
 import java.util.List;
+
 import javax.ws.rs.core.Cookie;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
+
 import org.radargun.Operation;
 
 /**

diff --git a/parent/main/resources/checkstyle.xml b/parent/main/resources/checkstyle.xml
@@ -39,7 +39,7 @@
       <module name="ImportOrder">
          <property name="groups" value="java,javax,*"/>
          <property name="ordered" value="true"/>
-         <property name="separated" value="false"/>
+         <property name="separated" value="true"/>
          <property name="option" value="bottom"/>
          <property name="sortStaticImportsAlphabetically" value="true"/>
       </module>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -797,7 +797,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.0.0</version>
+            <version>3.2.0</version>
             <configuration>
                <configLocation>main/resources/checkstyle.xml</configLocation>
                <suppressionsLocation>main/resources/checkstyle-suppressions.xml</suppressionsLocation>

diff --git a/plugins/couchbase/src/main/java/org/radargun/service/CouchbaseClientService.java b/plugins/couchbase/src/main/java/org/radargun/service/CouchbaseClientService.java
@@ -7,7 +7,6 @@
 import com.couchbase.client.java.CouchbaseCluster;
 import com.couchbase.client.java.env.CouchbaseEnvironment;
 import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
-
 import org.radargun.Service;
 import org.radargun.config.Property;
 import org.radargun.traits.Lifecycle;

diff --git a/plugins/docker/src/main/java/org/radargun/service/DockerService.java b/plugins/docker/src/main/java/org/radargun/service/DockerService.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;

diff --git a/plugins/eap73/src/main/java/org/radargun/service/EAPServerService.java b/plugins/eap73/src/main/java/org/radargun/service/EAPServerService.java
@@ -10,6 +10,7 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
 import javax.management.MBeanServerConnection;
 
 import org.radargun.Service;

diff --git a/plugins/hazelcast2/src/main/java/org/radargun/service/HazelcastConfigurationProvider.java b/plugins/hazelcast2/src/main/java/org/radargun/service/HazelcastConfigurationProvider.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+
 import org.radargun.logging.Log;
 import org.radargun.logging.LogFactory;
 import org.radargun.traits.ConfigurationProvider;

diff --git a/plugins/hazelcast36/src/main/java/org/radargun/service/HazelcastContinuousQuery.java b/plugins/hazelcast36/src/main/java/org/radargun/service/HazelcastContinuousQuery.java
@@ -4,7 +4,6 @@
 import com.hazelcast.core.EntryListener;
 import com.hazelcast.core.IMap;
 import com.hazelcast.core.MapEvent;
-
 import org.radargun.traits.ContinuousQuery;
 import org.radargun.traits.Query;
 

diff --git a/plugins/hazelcast37/src/main/java/org/radargun/service/Hazelcast37ClientService.java b/plugins/hazelcast37/src/main/java/org/radargun/service/Hazelcast37ClientService.java
@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.List;
+
 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
 import com.hazelcast.core.HazelcastInstance;

diff --git a/plugins/infinispan4/src/main/java/org/radargun/service/InfinispanEmbeddedService.java b/plugins/infinispan4/src/main/java/org/radargun/service/InfinispanEmbeddedService.java
@@ -4,6 +4,7 @@
 import java.lang.management.ManagementFactory;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;

diff --git a/plugins/infinispan51/src/main/java/org/radargun/jmx/InfinispanJMXClusterValidator.java b/plugins/infinispan51/src/main/java/org/radargun/jmx/InfinispanJMXClusterValidator.java
@@ -4,6 +4,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 

diff --git a/plugins/infinispan51/src/main/java/org/radargun/service/InfinispanBulkOperations.java b/plugins/infinispan51/src/main/java/org/radargun/service/InfinispanBulkOperations.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Future;
+
 import javax.transaction.Status;
 import javax.transaction.TransactionManager;
 

diff --git a/plugins/infinispan52/src/main/java/org/radargun/service/ConfigDumpHelper.java b/plugins/infinispan52/src/main/java/org/radargun/service/ConfigDumpHelper.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
+
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;

diff --git a/plugins/infinispan52/src/main/java/org/radargun/service/ServerJGroupsDumper.java b/plugins/infinispan52/src/main/java/org/radargun/service/ServerJGroupsDumper.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import javax.management.Attribute;
 import javax.management.AttributeList;
 import javax.management.MBeanAttributeInfo;

diff --git a/plugins/infinispan60/src/main/java/org/radargun/service/Infinispan60EmbeddedService.java b/plugins/infinispan60/src/main/java/org/radargun/service/Infinispan60EmbeddedService.java
@@ -6,6 +6,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+
 import org.infinispan.commons.util.FileLookupFactory;
 import org.infinispan.commons.util.concurrent.jdk8backported.ForkJoinPool;
 import org.infinispan.configuration.parsing.ConfigurationBuilderHolder;

diff --git a/...ns/infinispan60/src/main/java/org/radargun/service/Infinispan60ServerTopologyHistory.java b/...ns/infinispan60/src/main/java/org/radargun/service/Infinispan60ServerTopologyHistory.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+
 import javax.management.MBeanServerConnection;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;

diff --git a/plugins/infinispan60/src/main/java/org/radargun/service/InfinispanHotrodQueryable.java b/plugins/infinispan60/src/main/java/org/radargun/service/InfinispanHotrodQueryable.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
+
 import javax.management.MBeanServerConnection;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;

diff --git a/plugins/infinispan80/src/main/java/org/radargun/service/Infinispan80HotrodQueryable.java b/plugins/infinispan80/src/main/java/org/radargun/service/Infinispan80HotrodQueryable.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+
 import javax.management.MBeanServerConnection;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;

diff --git a/plugins/infinispan90/src/main/java/org/radargun/service/Infinispan90EmbeddedService.java b/plugins/infinispan90/src/main/java/org/radargun/service/Infinispan90EmbeddedService.java
@@ -1,6 +1,7 @@
 package org.radargun.service;
 
 import java.util.concurrent.TimeUnit;
+
 import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
 import org.jgroups.protocols.TP;
 import org.radargun.Service;

diff --git a/plugins/infinispan90/src/main/java/org/radargun/service/JGroups4Dumper.java b/plugins/infinispan90/src/main/java/org/radargun/service/JGroups4Dumper.java
@@ -3,6 +3,7 @@
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.concurrent.ThreadPoolExecutor;
+
 import org.jgroups.protocols.TP;
 import org.jgroups.stack.Protocol;
 import org.jgroups.stack.ProtocolStack;

diff --git a/plugins/jcache/src/main/java/org/radargun/service/JCacheLifecycle.java b/plugins/jcache/src/main/java/org/radargun/service/JCacheLifecycle.java
@@ -6,6 +6,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Properties;
+
 import javax.cache.Caching;
 import javax.cache.spi.CachingProvider;
 

diff --git a/plugins/jgroups35/src/main/java/org/radargun/service/JGroups35Service.java b/plugins/jgroups35/src/main/java/org/radargun/service/JGroups35Service.java
@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     import java.util.Date;
     import java.util.Random;
     import org.radargun.config.DefinitionElement;
     /**
@@ Expand Down @@