You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/06/13 14:20:05 UTC
[incubator-plc4x] 02/02: fixed some sonar bugs (equals, hashcode,
serializable)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 864bd9626177e6cef1507c01895fb270ac9114a8
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Jun 13 16:19:58 2018 +0200
fixed some sonar bugs (equals, hashcode, serializable)
---
.../java/api/messages/PlcProprietaryRequest.java | 23 ++++++++++++++++++++++
.../java/api/messages/PlcProprietaryResponse.java | 22 +++++++++++++++++++++
.../java/api/messages/items/ReadRequestItem.java | 22 +++++++++++++++++++++
.../java/api/messages/items/ReadResponseItem.java | 20 +++++++++++++++++++
.../java/api/messages/items/WriteRequestItem.java | 20 +++++++++++++++++++
.../messages/specific/TypeSafePlcReadRequest.java | 21 ++++++++++++++++++++
.../messages/specific/TypeSafePlcWriteRequest.java | 21 ++++++++++++++++++++
.../plc4x/java/ads/api/util/ByteReadable.java | 3 ++-
8 files changed, 151 insertions(+), 1 deletion(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
index 3389317..1cae2be 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryRequest.java
@@ -21,6 +21,8 @@ package org.apache.plc4x.java.api.messages;
import org.apache.plc4x.java.api.messages.items.RequestItem;
import org.apache.plc4x.java.api.model.Address;
+import java.util.Objects;
+
/**
* This request can be used to pass proprietary protocol specific messages to the underlying layers.
*
@@ -52,4 +54,25 @@ public class PlcProprietaryRequest<CUSTOM_REQUEST> extends PlcRequest<PlcProprie
"request=" + request +
"} " + super.toString();
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof PlcProprietaryRequest)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ PlcProprietaryRequest<?> that = (PlcProprietaryRequest<?>) o;
+ return Objects.equals(request, that.request);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), request);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
index 96a9654..f2868e2 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcProprietaryResponse.java
@@ -22,6 +22,7 @@ import org.apache.plc4x.java.api.messages.items.ResponseItem;
import org.apache.plc4x.java.api.types.ResponseCode;
import java.util.Collections;
+import java.util.Objects;
/**
* This response can be used to pass proprietary protocol specific messages from the underlying layers.
@@ -52,4 +53,25 @@ public class PlcProprietaryResponse<CUSTOM_RESPONSE> extends PlcResponse<PlcProp
"response=" + response +
"} " + super.toString();
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof PlcProprietaryResponse)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ PlcProprietaryResponse<?> that = (PlcProprietaryResponse<?>) o;
+ return Objects.equals(response, that.response);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), response);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadRequestItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadRequestItem.java
index b51644e..222310e 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadRequestItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadRequestItem.java
@@ -20,6 +20,8 @@ package org.apache.plc4x.java.api.messages.items;
import org.apache.plc4x.java.api.model.Address;
+import java.util.Objects;
+
public class ReadRequestItem<T> extends RequestItem<T> {
private final int size;
@@ -38,4 +40,24 @@ public class ReadRequestItem<T> extends RequestItem<T> {
return size;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof ReadRequestItem)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ ReadRequestItem<?> that = (ReadRequestItem<?>) o;
+ return size == that.size;
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), size);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadResponseItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadResponseItem.java
index 0116a1a..9d5a4d6 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadResponseItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/ReadResponseItem.java
@@ -48,4 +48,24 @@ public class ReadResponseItem<T> extends ResponseItem<ReadRequestItem<T>> {
return values;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof ReadResponseItem)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ ReadResponseItem<?> that = (ReadResponseItem<?>) o;
+ return Objects.equals(values, that.values);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), values);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java
index 5f083f2..32c75bd 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/WriteRequestItem.java
@@ -39,4 +39,24 @@ public class WriteRequestItem<T> extends RequestItem<T> {
return values;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof WriteRequestItem)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ WriteRequestItem<?> that = (WriteRequestItem<?>) o;
+ return Objects.equals(values, that.values);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), values);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
index 7cee6ad..e1d44ec 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
@@ -88,4 +88,25 @@ public class TypeSafePlcReadRequest<T> extends PlcReadRequest {
public Class<T> getDataType() {
return dataType;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof TypeSafePlcReadRequest)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ TypeSafePlcReadRequest<?> that = (TypeSafePlcReadRequest<?>) o;
+ return Objects.equals(dataType, that.dataType);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), dataType);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
index d5de7f7..870d28a 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
@@ -83,4 +83,25 @@ public class TypeSafePlcWriteRequest<T> extends PlcWriteRequest {
public Class<T> getDataType() {
return dataType;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof TypeSafePlcWriteRequest)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ TypeSafePlcWriteRequest<?> that = (TypeSafePlcWriteRequest<?>) o;
+ return Objects.equals(dataType, that.dataType);
+ }
+
+ @Override
+ public int hashCode() {
+
+ return Objects.hash(super.hashCode(), dataType);
+ }
}
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java
index f3eaa07..4730bd4 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/ByteReadable.java
@@ -24,9 +24,10 @@ import org.apache.commons.io.HexDump;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.Serializable;
import java.util.Arrays;
-public interface ByteReadable extends ByteBufSupplier, LengthSupplier {
+public interface ByteReadable extends ByteBufSupplier, LengthSupplier, Serializable {
default byte[] getBytes() {
ByteBuf byteBuf = getByteBuf();
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.