fixed a bunch of sonar warnings.

apache · Feb 16, 2018 · 976d15f · 976d15f
1 parent 496da15
commit 976d15f
Show file tree

Hide file tree

Showing 73 changed files with 420 additions and 417 deletions.
diff --git a/...rotocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractRequest.java b/...rotocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractRequest.java
@@ -26,20 +26,20 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.generic.types.Invoke;
 import org.apache.plc4x.java.ads.api.generic.types.State;
 
-public abstract class ADSAbstractRequest extends AMSTCPPacket {
-    protected ADSAbstractRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
+abstract class ADSAbstractRequest extends AMSTCPPacket {
+    ADSAbstractRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
         super(amstcpHeader, amsHeader);
     }
 
-    protected ADSAbstractRequest(AMSHeader amsHeader) {
+    ADSAbstractRequest(AMSHeader amsHeader) {
         super(amsHeader);
     }
 
-    protected ADSAbstractRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
+    ADSAbstractRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
     }
 
-    protected ADSAbstractRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId) {
+    ADSAbstractRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId);
     }
 }
diff --git a/...otocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractResponse.java b/...otocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAbstractResponse.java
@@ -26,16 +26,16 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.generic.types.Invoke;
 import org.apache.plc4x.java.ads.api.generic.types.State;
 
-public abstract class ADSAbstractResponse extends AMSTCPPacket {
-    protected ADSAbstractResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
+abstract class ADSAbstractResponse extends AMSTCPPacket {
+    ADSAbstractResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
         super(amstcpHeader, amsHeader);
     }
 
     protected ADSAbstractResponse(AMSHeader amsHeader) {
         super(amsHeader);
     }
 
-    protected ADSAbstractResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
+    ADSAbstractResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT_RESPONSE, invokeId);
     }
 

diff --git a/...src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationRequest.java b/...src/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationRequest.java
@@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.generic.types.*;
 import org.apache.plc4x.java.ads.api.util.ByteValue;
 
-import java.util.Objects;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A notification is created in an ADS device.
@@ -66,34 +66,34 @@ public class ADSAddDeviceNotificationRequest extends ADSAbstractRequest {
      */
     private final Reserved reserved = Reserved.INSTANCE;
 
-    protected ADSAddDeviceNotificationRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+    private ADSAddDeviceNotificationRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
         super(amstcpHeader, amsHeader);
-        this.indexGroup = Objects.requireNonNull(indexGroup);
-        this.indexOffset = Objects.requireNonNull(indexOffset);
-        this.length = Objects.requireNonNull(length);
-        this.transmissionMode = Objects.requireNonNull(transmissionMode);
-        this.maxDelay = Objects.requireNonNull(maxDelay);
-        this.cycleTime = Objects.requireNonNull(cycleTime);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+        this.transmissionMode = requireNonNull(transmissionMode);
+        this.maxDelay = requireNonNull(maxDelay);
+        this.cycleTime = requireNonNull(cycleTime);
     }
 
-    protected ADSAddDeviceNotificationRequest(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+    private ADSAddDeviceNotificationRequest(AMSHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
         super(amsHeader);
-        this.indexGroup = Objects.requireNonNull(indexGroup);
-        this.indexOffset = Objects.requireNonNull(indexOffset);
-        this.length = Objects.requireNonNull(length);
-        this.transmissionMode = Objects.requireNonNull(transmissionMode);
-        this.maxDelay = Objects.requireNonNull(maxDelay);
-        this.cycleTime = Objects.requireNonNull(cycleTime);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+        this.transmissionMode = requireNonNull(transmissionMode);
+        this.maxDelay = requireNonNull(maxDelay);
+        this.cycleTime = requireNonNull(cycleTime);
     }
 
-    protected ADSAddDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
+    private ADSAddDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, IndexGroup indexGroup, IndexOffset indexOffset, Length length, TransmissionMode transmissionMode, MaxDelay maxDelay, CycleTime cycleTime) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId);
-        this.indexGroup = Objects.requireNonNull(indexGroup);
-        this.indexOffset = Objects.requireNonNull(indexOffset);
-        this.length = Objects.requireNonNull(length);
-        this.transmissionMode = Objects.requireNonNull(transmissionMode);
-        this.maxDelay = Objects.requireNonNull(maxDelay);
-        this.cycleTime = Objects.requireNonNull(cycleTime);
+        this.indexGroup = requireNonNull(indexGroup);
+        this.indexOffset = requireNonNull(indexOffset);
+        this.length = requireNonNull(length);
+        this.transmissionMode = requireNonNull(transmissionMode);
+        this.maxDelay = requireNonNull(maxDelay);
+        this.cycleTime = requireNonNull(cycleTime);
     }
 
     @Override

diff --git a/...rc/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationResponse.java b/...rc/main/java/org/apache/plc4x/java/ads/api/commands/ADSAddDeviceNotificationResponse.java
@@ -28,7 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.generic.types.Command;
 import org.apache.plc4x.java.ads.api.generic.types.Invoke;
 
-import java.util.Objects;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A notification is created in an ADS device.
@@ -46,16 +46,16 @@ public class ADSAddDeviceNotificationResponse extends ADSAbstractResponse {
      */
     private final NotificationHandle notificationHandle;
 
-    protected ADSAddDeviceNotificationResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result, NotificationHandle notificationHandle) {
+    private ADSAddDeviceNotificationResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result, NotificationHandle notificationHandle) {
         super(amstcpHeader, amsHeader);
-        this.result = Objects.requireNonNull(result);
-        this.notificationHandle = Objects.requireNonNull(notificationHandle);
+        this.result = requireNonNull(result);
+        this.notificationHandle = requireNonNull(notificationHandle);
     }
 
-    protected ADSAddDeviceNotificationResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
+    private ADSAddDeviceNotificationResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, NotificationHandle notificationHandle) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = Objects.requireNonNull(result);
-        this.notificationHandle = Objects.requireNonNull(notificationHandle);
+        this.result = requireNonNull(result);
+        this.notificationHandle = requireNonNull(notificationHandle);
     }
 
     public static ADSAddDeviceNotificationResponse of(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result, NotificationHandle notificationHandle) {

diff --git a/.../main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationRequest.java b/.../main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationRequest.java
@@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.generic.types.Command;
 import org.apache.plc4x.java.ads.api.generic.types.Invoke;
 
-import java.util.Objects;
+import static java.util.Objects.requireNonNull;
 
 /**
  * One before defined notification is deleted in an ADS device.
@@ -40,19 +40,19 @@ public class ADSDeleteDeviceNotificationRequest extends ADSAbstractRequest {
      */
     private final NotificationHandle notificationHandle;
 
-    protected ADSDeleteDeviceNotificationRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, NotificationHandle notificationHandle) {
+    private ADSDeleteDeviceNotificationRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, NotificationHandle notificationHandle) {
         super(amstcpHeader, amsHeader);
-        this.notificationHandle = Objects.requireNonNull(notificationHandle);
+        this.notificationHandle = requireNonNull(notificationHandle);
     }
 
-    protected ADSDeleteDeviceNotificationRequest(AMSHeader amsHeader, NotificationHandle notificationHandle) {
+    private ADSDeleteDeviceNotificationRequest(AMSHeader amsHeader, NotificationHandle notificationHandle) {
         super(amsHeader);
-        this.notificationHandle = Objects.requireNonNull(notificationHandle);
+        this.notificationHandle = requireNonNull(notificationHandle);
     }
 
-    protected ADSDeleteDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
+    private ADSDeleteDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, NotificationHandle notificationHandle) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.notificationHandle = Objects.requireNonNull(notificationHandle);
+        this.notificationHandle = requireNonNull(notificationHandle);
     }
 
     public static ADSDeleteDeviceNotificationRequest of(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, NotificationHandle notificationHandle) {

diff --git a/...main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationResponse.java b/...main/java/org/apache/plc4x/java/ads/api/commands/ADSDeleteDeviceNotificationResponse.java
@@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.generic.types.Command;
 import org.apache.plc4x.java.ads.api.generic.types.Invoke;
 
-import java.util.Objects;
+import static java.util.Objects.requireNonNull;
 
 /**
  * One before defined notification is deleted in an ADS device.
@@ -40,14 +40,14 @@ public class ADSDeleteDeviceNotificationResponse extends ADSAbstractResponse {
      */
     private final Result result;
 
-    protected ADSDeleteDeviceNotificationResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result) {
+    private ADSDeleteDeviceNotificationResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result) {
         super(amstcpHeader, amsHeader);
-        this.result = Objects.requireNonNull(result);
+        this.result = requireNonNull(result);
     }
 
-    protected ADSDeleteDeviceNotificationResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
+    private ADSDeleteDeviceNotificationResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = Objects.requireNonNull(result);
+        this.result = requireNonNull(result);
     }
 
     public static ADSDeleteDeviceNotificationResponse of(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result) {

diff --git a/...ds/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationRequest.java b/...ds/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSDeviceNotificationRequest.java
@@ -32,7 +32,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.util.LengthSupplier;
 
 import java.util.List;
-import java.util.Objects;
+
+import static java.util.Objects.requireNonNull;
 
 /**
  * Data will carry forward independently from an ADS device to a Client
@@ -62,29 +63,29 @@ public class ADSDeviceNotificationRequest extends ADSAbstractRequest {
     //
     ///
 
-    protected ADSDeviceNotificationRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+    private ADSDeviceNotificationRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
         super(amstcpHeader, amsHeader);
-        this.length = Objects.requireNonNull(length);
-        this.stamps = Objects.requireNonNull(stamps);
-        this.adsStampHeaders = Objects.requireNonNull(adsStampHeaders);
+        this.length = requireNonNull(length);
+        this.stamps = requireNonNull(stamps);
+        this.adsStampHeaders = requireNonNull(adsStampHeaders);
         calculated = false;
         lengthSupplier = null;
     }
 
-    protected ADSDeviceNotificationRequest(AMSHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+    private ADSDeviceNotificationRequest(AMSHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
         super(amsHeader);
-        this.length = Objects.requireNonNull(length);
-        this.stamps = Objects.requireNonNull(stamps);
-        this.adsStampHeaders = Objects.requireNonNull(adsStampHeaders);
+        this.length = requireNonNull(length);
+        this.stamps = requireNonNull(stamps);
+        this.adsStampHeaders = requireNonNull(adsStampHeaders);
         calculated = false;
         lengthSupplier = null;
     }
 
-    protected ADSDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
+    private ADSDeviceNotificationRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Stamps stamps, List<AdsStampHeader> adsStampHeaders) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
         this.length = null;
-        this.stamps = Objects.requireNonNull(stamps);
-        this.adsStampHeaders = Objects.requireNonNull(adsStampHeaders);
+        this.stamps = requireNonNull(stamps);
+        this.adsStampHeaders = requireNonNull(adsStampHeaders);
         calculated = true;
         this.lengthSupplier = () -> {
             long aggregateLength = 0;

diff --git a/...ls/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoRequest.java b/...ls/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoRequest.java
@@ -34,15 +34,15 @@ Licensed to the Apache Software Foundation (ASF) under one
 @ADSCommandType(Command.ADS_Read_Device_Info)
 public class ADSReadDeviceInfoRequest extends ADSAbstractRequest {
 
-    protected ADSReadDeviceInfoRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
+    private ADSReadDeviceInfoRequest(AMSTCPHeader amstcpHeader, AMSHeader amsHeader) {
         super(amstcpHeader, amsHeader);
     }
 
-    protected ADSReadDeviceInfoRequest(AMSHeader amsHeader) {
+    private ADSReadDeviceInfoRequest(AMSHeader amsHeader) {
         super(amsHeader);
     }
 
-    protected ADSReadDeviceInfoRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
+    private ADSReadDeviceInfoRequest(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
     }
 

diff --git a/...s/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoResponse.java b/...s/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/ADSReadDeviceInfoResponse.java
@@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.plc4x.java.ads.api.generic.types.Command;
 import org.apache.plc4x.java.ads.api.generic.types.Invoke;
 
-import java.util.Objects;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Reads the name and the version number of the ADS device.
@@ -56,22 +56,22 @@ public class ADSReadDeviceInfoResponse extends ADSAbstractResponse {
     private final Device device;
 
 
-    protected ADSReadDeviceInfoResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+    private ADSReadDeviceInfoResponse(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
         super(amstcpHeader, amsHeader);
-        this.result = Objects.requireNonNull(result);
-        this.majorVersion = Objects.requireNonNull(majorVersion);
-        this.minorVersion = Objects.requireNonNull(minorVersion);
-        this.version = Objects.requireNonNull(version);
-        this.device = Objects.requireNonNull(device);
+        this.result = requireNonNull(result);
+        this.majorVersion = requireNonNull(majorVersion);
+        this.minorVersion = requireNonNull(minorVersion);
+        this.version = requireNonNull(version);
+        this.device = requireNonNull(device);
     }
 
-    protected ADSReadDeviceInfoResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
+    private ADSReadDeviceInfoResponse(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, Invoke invokeId, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {
         super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId);
-        this.result = Objects.requireNonNull(result);
-        this.majorVersion = Objects.requireNonNull(majorVersion);
-        this.minorVersion = Objects.requireNonNull(minorVersion);
-        this.version = Objects.requireNonNull(version);
-        this.device = Objects.requireNonNull(device);
+        this.result = requireNonNull(result);
+        this.majorVersion = requireNonNull(majorVersion);
+        this.minorVersion = requireNonNull(minorVersion);
+        this.version = requireNonNull(version);
+        this.device = requireNonNull(device);
     }
 
     public static ADSReadDeviceInfoResponse of(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, Result result, MajorVersion majorVersion, MinorVersion minorVersion, Version version, Device device) {