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/08/09 11:48:56 UTC
[incubator-plc4x] branch master updated: fixed some sonar bugs
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
The following commit(s) were added to refs/heads/master by this push:
new 4f38a3f fixed some sonar bugs
4f38a3f is described below
commit 4f38a3fae4cd4bc481ee6b1514fb95625fd20587
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Aug 9 13:48:49 2018 +0200
fixed some sonar bugs
---
.../items/SubscriptionRequestCyclicItem.java | 29 +++++++++++++++++++++
.../messages/items/SubscriptionRequestItem.java | 29 +++++++++++++++++++++
.../messages/items/SubscriptionResponseItem.java | 30 +++++++++++++++++++++-
.../java/base/connection/tcp/TcpHexDumper.java | 14 +++++++---
.../org/apache/plc4x/java/base/util/Assert.java | 5 ++--
.../plc4x/java/modbus/model/CoilModbusAddress.java | 2 +-
.../model/MaskWriteRegisterModbusAddress.java | 6 ++---
.../model/ReadDiscreteInputsModbusAddress.java | 2 +-
.../model/ReadHoldingRegistersModbusAddress.java | 2 +-
.../model/ReadInputRegistersModbusAddress.java | 2 +-
.../java/modbus/model/RegisterModbusAddress.java | 2 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 3 ---
12 files changed, 108 insertions(+), 18 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestCyclicItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestCyclicItem.java
index b1a491b..22793b2 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestCyclicItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestCyclicItem.java
@@ -21,6 +21,7 @@ package org.apache.plc4x.java.api.messages.items;
import org.apache.plc4x.java.api.model.Address;
import org.apache.plc4x.java.api.model.SubscriptionType;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -43,4 +44,32 @@ public class SubscriptionRequestCyclicItem extends SubscriptionRequestItem {
return period;
}
+ @Override
+ public String toString() {
+ return "SubscriptionRequestCyclicItem{" +
+ "timeUnit=" + timeUnit +
+ ", period=" + period +
+ "} " + super.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof SubscriptionRequestCyclicItem)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ SubscriptionRequestCyclicItem that = (SubscriptionRequestCyclicItem) o;
+ return period == that.period &&
+ timeUnit == that.timeUnit;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(super.hashCode(), timeUnit, period);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestItem.java
index 7591e09..0667073 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionRequestItem.java
@@ -21,6 +21,7 @@ package org.apache.plc4x.java.api.messages.items;
import org.apache.plc4x.java.api.model.Address;
import org.apache.plc4x.java.api.model.SubscriptionType;
+import java.util.Objects;
import java.util.function.Consumer;
public abstract class SubscriptionRequestItem<T> extends RequestItem<T> {
@@ -42,4 +43,32 @@ public abstract class SubscriptionRequestItem<T> extends RequestItem<T> {
return consumer;
}
+ @Override
+ public String toString() {
+ return "SubscriptionRequestItem{" +
+ "subscriptionType=" + subscriptionType +
+ ", consumer=" + consumer +
+ "} " + super.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof SubscriptionRequestItem)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ SubscriptionRequestItem<?> that = (SubscriptionRequestItem<?>) o;
+ return subscriptionType == that.subscriptionType &&
+ Objects.equals(consumer, that.consumer);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(super.hashCode(), subscriptionType, consumer);
+ }
}
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionResponseItem.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionResponseItem.java
index c38e28b..731a9ee 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionResponseItem.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/SubscriptionResponseItem.java
@@ -21,7 +21,9 @@ package org.apache.plc4x.java.api.messages.items;
import org.apache.plc4x.java.api.model.SubscriptionHandle;
import org.apache.plc4x.java.api.types.ResponseCode;
-public class SubscriptionResponseItem<T> extends ResponseItem<SubscriptionRequestItem<T>> {
+import java.util.Objects;
+
+public class SubscriptionResponseItem<T> extends ResponseItem<SubscriptionRequestItem<T>> {
private SubscriptionHandle subscriptionHandle;
@@ -34,4 +36,30 @@ public class SubscriptionResponseItem<T> extends ResponseItem<SubscriptionReques
return subscriptionHandle;
}
+ @Override
+ public String toString() {
+ return "SubscriptionResponseItem{" +
+ "subscriptionHandle=" + subscriptionHandle +
+ "} " + super.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof SubscriptionResponseItem)) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+ SubscriptionResponseItem<?> that = (SubscriptionResponseItem<?>) o;
+ return Objects.equals(subscriptionHandle, that.subscriptionHandle);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(super.hashCode(), subscriptionHandle);
+ }
}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/tcp/TcpHexDumper.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/tcp/TcpHexDumper.java
index 38d9909..dd2a193 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/tcp/TcpHexDumper.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/connection/tcp/TcpHexDumper.java
@@ -20,6 +20,7 @@ package org.apache.plc4x.java.base.connection.tcp;
import org.apache.commons.io.HexDump;
import org.apache.commons.io.IOUtils;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +70,7 @@ public class TcpHexDumper extends ExternalResource implements Closeable {
accept = serverSocket.accept();
logger.info("Accepted {} and starting listener", accept);
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new PlcRuntimeException(e);
}
pool.submit(() -> {
InputStream inputStream;
@@ -77,7 +78,7 @@ public class TcpHexDumper extends ExternalResource implements Closeable {
inputStream = accept.getInputStream();
logger.info("Starting to read now");
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new PlcRuntimeException(e);
}
byte[] buffer = new byte[4096];
try {
@@ -87,7 +88,7 @@ public class TcpHexDumper extends ExternalResource implements Closeable {
logger.info("Dump:\n{}", byteArrayOutputStream);
}
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new PlcRuntimeException(e);
}
});
});
@@ -112,7 +113,11 @@ public class TcpHexDumper extends ExternalResource implements Closeable {
public void after() {
try {
stop(true);
- } catch (IOException | InterruptedException ignore) {
+ } catch (InterruptedException e) {
+ logger.info("Shutdown error", e);
+ Thread.currentThread().interrupt();
+ } catch (IOException e) {
+ logger.info("Shutdown error", e);
}
}
@@ -136,6 +141,7 @@ public class TcpHexDumper extends ExternalResource implements Closeable {
try {
stop();
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new IOException(e);
}
}
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/util/Assert.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/util/Assert.java
index 2898d13..8f833ad 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/util/Assert.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/util/Assert.java
@@ -19,6 +19,7 @@
package org.apache.plc4x.java.base.util;
import org.apache.commons.io.HexDump;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.core.IsEqual;
@@ -52,7 +53,7 @@ public class Assert {
String dump = dump(expected);
description.appendText("\n").appendText(cleanHexDump(dump));
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new PlcRuntimeException(e);
}
}
@@ -66,7 +67,7 @@ public class Assert {
String dump = dump((byte[]) item);
description.appendText("was ").appendText("\n").appendText(cleanHexDump(dump));
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new PlcRuntimeException(e);
}
}
};
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusAddress.java
index 19681b0..bfbd06a 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/CoilModbusAddress.java
@@ -36,7 +36,7 @@ public class CoilModbusAddress extends ModbusAddress {
if (!matcher.matches()) {
throw new PlcRuntimeException(addressString + " doesn't match " + ADDRESS_PATTERN);
}
- int address = Integer.valueOf(matcher.group("address"));
+ int address = Integer.parseInt(matcher.group("address"));
return new CoilModbusAddress(address);
}
}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java
index 1709799..afff67a 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java
@@ -42,9 +42,9 @@ public class MaskWriteRegisterModbusAddress extends ModbusAddress {
if (!matcher.matches()) {
throw new PlcRuntimeException(addressString + " doesn't match " + ADDRESS_PATTERN);
}
- int address = Integer.valueOf(matcher.group("address"));
- int andMask = Integer.valueOf(matcher.group("andMask"));
- int orMask = Integer.valueOf(matcher.group("orMask"));
+ int address = Integer.parseInt(matcher.group("address"));
+ int andMask = Integer.parseInt(matcher.group("andMask"));
+ int orMask = Integer.parseInt(matcher.group("orMask"));
return new MaskWriteRegisterModbusAddress(address, andMask, orMask);
}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java
index 7adf4e2..8e0c17e 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java
@@ -36,7 +36,7 @@ public class ReadDiscreteInputsModbusAddress extends ModbusAddress {
if (!matcher.matches()) {
throw new PlcRuntimeException(addressString + " doesn't match " + ADDRESS_PATTERN);
}
- int address = Integer.valueOf(matcher.group("address"));
+ int address = Integer.parseInt(matcher.group("address"));
return new ReadDiscreteInputsModbusAddress(address);
}
}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java
index 847cb29..a8dd8f3 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java
@@ -36,7 +36,7 @@ public class ReadHoldingRegistersModbusAddress extends ModbusAddress {
if (!matcher.matches()) {
throw new PlcRuntimeException(addressString + " doesn't match " + ADDRESS_PATTERN);
}
- int address = Integer.valueOf(matcher.group("address"));
+ int address = Integer.parseInt(matcher.group("address"));
return new ReadHoldingRegistersModbusAddress(address);
}
}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java
index 663fbe1..9f3fe0c 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java
@@ -36,7 +36,7 @@ public class ReadInputRegistersModbusAddress extends ModbusAddress {
if (!matcher.matches()) {
throw new PlcRuntimeException(addressString + " doesn't match " + ADDRESS_PATTERN);
}
- int address = Integer.valueOf(matcher.group("address"));
+ int address = Integer.parseInt(matcher.group("address"));
return new ReadInputRegistersModbusAddress(address);
}
}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusAddress.java
index ac112d8..290f7de 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/RegisterModbusAddress.java
@@ -37,7 +37,7 @@ public class RegisterModbusAddress extends ModbusAddress {
if (!matcher.matches()) {
throw new PlcRuntimeException(addressString + " doesn't match " + ADDRESS_PATTERN);
}
- int address = Integer.valueOf(matcher.group("address"));
+ int address = Integer.parseInt(matcher.group("address"));
return new RegisterModbusAddress(address);
}
}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
index d153b36..4c4aaab 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocol.java
@@ -54,9 +54,6 @@ public class Plc4XModbusProtocol extends MessageToMessageCodec<ModbusTcpPayload,
private final ConcurrentMap<Short, PlcRequestContainer<PlcRequest, PlcResponse>> requestsMap = new ConcurrentHashMap<>();
- public Plc4XModbusProtocol() {
- }
-
@Override
protected void encode(ChannelHandlerContext ctx, PlcRequestContainer<PlcRequest, PlcResponse> msg, List<Object> out) throws Exception {
LOGGER.trace("(<--OUT): {}, {}, {}", ctx, msg, out);