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 96eaca6cff19802bc92c39ae6cfa1fd74baec436 Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Wed Jun 13 17:04:07 2018 +0200 fixed sonar warning about not serializable fields --- .../ads/api/commands/AdsDeviceNotificationRequest.java | 2 +- .../plc4x/java/ads/api/commands/AdsReadResponse.java | 17 +++++++++++------ .../java/ads/api/commands/AdsReadWriteRequest.java | 2 +- .../java/ads/api/commands/AdsReadWriteResponse.java | 2 +- .../java/ads/api/commands/AdsWriteControlRequest.java | 2 +- .../plc4x/java/ads/api/commands/AdsWriteRequest.java | 2 +- .../plc4x/java/ads/api/commands/UnknownCommand.java | 11 +++++++---- .../ads/api/commands/types/AdsNotificationSample.java | 2 +- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java index 583673c..e502777 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsDeviceNotificationRequest.java @@ -55,7 +55,7 @@ public class AdsDeviceNotificationRequest extends AdsAbstractRequest { */ private final List<AdsStampHeader> adsStampHeaders; - private final LengthSupplier lengthSupplier; + private final transient LengthSupplier lengthSupplier; private AdsDeviceNotificationRequest(AmsHeader amsHeader, Length length, Stamps stamps, List<AdsStampHeader> adsStampHeaders) { super(amsHeader); diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java index 69f2a2e..3698b03 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadResponse.java @@ -50,7 +50,7 @@ public class AdsReadResponse extends AdsAbstractResponse { */ private final Data data; - private final LengthSupplier lengthSupplier; + private final transient LengthSupplier lengthSupplier; private AdsReadResponse(AmsHeader amsHeader, Result result, Length length, Data data) { super(amsHeader); @@ -95,19 +95,24 @@ public class AdsReadResponse extends AdsAbstractResponse { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (!(o instanceof AdsReadResponse)) + } + if (!(o instanceof AdsReadResponse)) { return false; - if (!super.equals(o)) + } + if (!super.equals(o)) { return false; + } AdsReadResponse that = (AdsReadResponse) o; - if (!result.equals(that.result)) + if (!result.equals(that.result)) { return false; - if (!getLength().equals(that.getLength())) + } + if (!getLength().equals(that.getLength())) { return false; + } return data.equals(that.data); } diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java index c007fdf..ccd73de 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteRequest.java @@ -58,7 +58,7 @@ public class AdsReadWriteRequest extends AdsAbstractRequest { */ private final Data data; - private final LengthSupplier writeLengthSupplier; + private final transient LengthSupplier writeLengthSupplier; private AdsReadWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, ReadLength readLength, WriteLength writeLength, Data data) { super(amsHeader); diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java index 3d5cfcf..fdc79e5 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsReadWriteResponse.java @@ -52,7 +52,7 @@ public class AdsReadWriteResponse extends AdsAbstractResponse { */ private final Data data; - private final LengthSupplier lengthSupplier; + private final transient LengthSupplier lengthSupplier; private AdsReadWriteResponse(AmsHeader amsHeader, Result result, Length length, Data data) { super(amsHeader); diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java index 2ec8dbe..31100b8 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteControlRequest.java @@ -57,7 +57,7 @@ public class AdsWriteControlRequest extends AdsAbstractRequest { */ private final Data data; - private final LengthSupplier lengthSupplier; + private final transient LengthSupplier lengthSupplier; private AdsWriteControlRequest(AmsHeader amsHeader, AdsState adsState, DeviceState deviceState, Length length, Data data) { super(amsHeader); diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java index c1e108b..1f431f3 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/AdsWriteRequest.java @@ -55,7 +55,7 @@ public class AdsWriteRequest extends AdsAbstractRequest { */ private final Data data; - private final LengthSupplier lengthSupplier; + private final transient LengthSupplier lengthSupplier; private AdsWriteRequest(AmsHeader amsHeader, IndexGroup indexGroup, IndexOffset indexOffset, Length length, Data data) { super(amsHeader); diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java index 5172d46..df395dc 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java @@ -32,7 +32,7 @@ import static java.util.Objects.requireNonNull; @AdsCommandType(Command.UNKNOWN) public class UnknownCommand extends AmsPacket { - private final ByteBuf remainingBytes; + private transient final ByteBuf remainingBytes; private UnknownCommand(AmsHeader amsHeader, ByteBuf remainingBytes) { super(amsHeader); @@ -59,12 +59,15 @@ public class UnknownCommand extends AmsPacket { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (!(o instanceof UnknownCommand)) + } + if (!(o instanceof UnknownCommand)) { return false; - if (!super.equals(o)) + } + if (!super.equals(o)) { return false; + } UnknownCommand that = (UnknownCommand) o; diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java index b4040cb..c963466 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/AdsNotificationSample.java @@ -39,7 +39,7 @@ public class AdsNotificationSample implements ByteReadable { */ private final Data data; - private final LengthSupplier lengthSupplier; + private final transient LengthSupplier lengthSupplier; private AdsNotificationSample(NotificationHandle notificationHandle, Data data) { this.notificationHandle = requireNonNull(notificationHandle); -- To stop receiving notification emails like this one, please contact sru...@apache.org.