Updated PMD config; Fixed checkstyle issues

hypfvieh · Aug 7, 2023 · 15316c5 · 15316c5
1 parent e4a16b4
commit 15316c5
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 21 deletions.
diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/bin/DBusDaemon.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/bin/DBusDaemon.java
@@ -2,31 +2,44 @@
 
 import org.freedesktop.dbus.Marshalling;
 import org.freedesktop.dbus.connections.BusAddress;
-import org.freedesktop.dbus.connections.transports.*;
+import org.freedesktop.dbus.connections.transports.AbstractTransport;
+import org.freedesktop.dbus.connections.transports.TransportBuilder;
 import org.freedesktop.dbus.connections.transports.TransportBuilder.SaslAuthMode;
+import org.freedesktop.dbus.connections.transports.TransportConnection;
 import org.freedesktop.dbus.errors.AccessDenied;
 import org.freedesktop.dbus.errors.Error;
 import org.freedesktop.dbus.errors.MatchRuleInvalid;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.freedesktop.dbus.interfaces.*;
+import org.freedesktop.dbus.interfaces.DBus;
 import org.freedesktop.dbus.interfaces.DBus.NameOwnerChanged;
-import org.freedesktop.dbus.messages.*;
+import org.freedesktop.dbus.interfaces.FatalException;
+import org.freedesktop.dbus.interfaces.Introspectable;
+import org.freedesktop.dbus.interfaces.Peer;
+import org.freedesktop.dbus.messages.DBusSignal;
+import org.freedesktop.dbus.messages.Message;
+import org.freedesktop.dbus.messages.MethodCall;
+import org.freedesktop.dbus.messages.MethodReturn;
 import org.freedesktop.dbus.types.UInt32;
 import org.freedesktop.dbus.types.Variant;
 import org.freedesktop.dbus.utils.Hexdump;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.Closeable;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 

diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/bin/EmbeddedDBusDaemon.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/bin/EmbeddedDBusDaemon.java
@@ -1,9 +1,13 @@
 package org.freedesktop.dbus.bin;
 
 import org.freedesktop.dbus.connections.BusAddress;
-import org.freedesktop.dbus.connections.transports.*;
+import org.freedesktop.dbus.connections.transports.AbstractTransport;
+import org.freedesktop.dbus.connections.transports.TransportBuilder;
 import org.freedesktop.dbus.connections.transports.TransportBuilder.SaslAuthMode;
-import org.freedesktop.dbus.exceptions.*;
+import org.freedesktop.dbus.connections.transports.TransportConnection;
+import org.freedesktop.dbus.exceptions.AuthenticationException;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.SocketClosedException;
 import org.freedesktop.dbus.utils.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/AbstractConnection.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/AbstractConnection.java
@@ -9,16 +9,25 @@
 import org.freedesktop.dbus.errors.Error;
 import org.freedesktop.dbus.errors.UnknownMethod;
 import org.freedesktop.dbus.errors.UnknownObject;
-import org.freedesktop.dbus.exceptions.*;
-import org.freedesktop.dbus.interfaces.*;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.freedesktop.dbus.exceptions.FatalDBusException;
+import org.freedesktop.dbus.exceptions.NotConnected;
+import org.freedesktop.dbus.interfaces.CallbackHandler;
+import org.freedesktop.dbus.interfaces.DBusInterface;
+import org.freedesktop.dbus.interfaces.DBusSigHandler;
 import org.freedesktop.dbus.messages.*;
 import org.freedesktop.dbus.utils.LoggingHelper;
 import org.freedesktop.dbus.utils.NameableThreadFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
-import java.lang.reflect.*;
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.nio.channels.ClosedByInterruptException;
 import java.util.*;
 import java.util.Map.Entry;

diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/SASL.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/SASL.java
@@ -10,7 +10,10 @@
 import org.freedesktop.dbus.exceptions.AuthenticationException;
 import org.freedesktop.dbus.exceptions.SocketClosedException;
 import org.freedesktop.dbus.messages.Message;
-import org.freedesktop.dbus.utils.*;
+import org.freedesktop.dbus.utils.Hexdump;
+import org.freedesktop.dbus.utils.LoggingHelper;
+import org.freedesktop.dbus.utils.TimeMeasure;
+import org.freedesktop.dbus.utils.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,7 +23,9 @@
 import java.nio.channels.NetworkChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.PosixFilePermission;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java
@@ -975,7 +975,7 @@ public void close() throws DBusException {
         };
     }
 
-    private class SigHandler implements DBusSigHandler<DBusSignal> {
+    private final class SigHandler implements DBusSigHandler<DBusSignal> {
         @Override
         public void handle(DBusSignal _signal) {
              if (_signal instanceof DBus.NameAcquired) {

diff --git a/...ava-core/src/main/java/org/freedesktop/dbus/connections/transports/AbstractTransport.java b/...ava-core/src/main/java/org/freedesktop/dbus/connections/transports/AbstractTransport.java
@@ -4,7 +4,9 @@
 import org.freedesktop.dbus.connections.SASL;
 import org.freedesktop.dbus.connections.config.SaslConfig;
 import org.freedesktop.dbus.connections.config.TransportConfig;
-import org.freedesktop.dbus.exceptions.*;
+import org.freedesktop.dbus.exceptions.AuthenticationException;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.InvalidBusAddressException;
 import org.freedesktop.dbus.messages.Message;
 import org.freedesktop.dbus.spi.message.*;
 import org.slf4j.Logger;
@@ -13,7 +15,9 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.channels.SocketChannel;
-import java.util.*;
+import java.util.Objects;
+import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 

diff --git a/...java-core/src/main/java/org/freedesktop/dbus/connections/transports/TransportBuilder.java b/...java-core/src/main/java/org/freedesktop/dbus/connections/transports/TransportBuilder.java
@@ -1,9 +1,13 @@
 package org.freedesktop.dbus.connections.transports;
 
-import org.freedesktop.dbus.connections.*;
+import org.freedesktop.dbus.connections.AbstractConnection;
+import org.freedesktop.dbus.connections.BusAddress;
+import org.freedesktop.dbus.connections.SASL;
 import org.freedesktop.dbus.connections.config.TransportConfig;
 import org.freedesktop.dbus.connections.config.TransportConfigBuilder;
-import org.freedesktop.dbus.exceptions.*;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.TransportConfigurationException;
+import org.freedesktop.dbus.exceptions.TransportRegistrationException;
 import org.freedesktop.dbus.spi.transport.ITransportProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestAll.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestAll.java
@@ -795,7 +795,7 @@ public void testNestedListsCallback() throws DBusException, InterruptedException
         assertIterableEquals(li, cbHandle.getRetval().get(0));
     }
 
-    private class NestedListCallbackHandler implements CallbackHandler<List<List<Integer>>> {
+    private final class NestedListCallbackHandler implements CallbackHandler<List<List<Integer>>> {
             private List<List<Integer>> retval;
 
             @Override

diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestPeer2Peer.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestPeer2Peer.java
@@ -58,7 +58,7 @@ public void testP2p() throws InterruptedException {
         }
     }
 
-    private class P2pServer extends Thread {
+    private final class P2pServer extends Thread {
 
         @Override
         public void run() {

diff --git a/src/main/resources/pmd_rules.xml b/src/main/resources/pmd_rules.xml
@@ -59,7 +59,7 @@
     </rule>
     <rule ref="category/java/codestyle.xml/UnnecessaryCast" />
     <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName" />
-    <rule ref="category/java/codestyle.xml/UnnecessaryImport" />
+    <!-- rule ref="category/java/codestyle.xml/UnnecessaryImport" /-->
     <rule ref="category/java/codestyle.xml/UnnecessaryModifier" />
     <rule ref="category/java/codestyle.xml/UnnecessarySemicolon" />
     <rule ref="category/java/codestyle.xml/UnnecessaryReturn" />