You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/11/10 16:10:50 UTC
[plc4x] branch feature/knxnet-ip updated: - Cleaned up the code to
avoid warnings
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/knxnet-ip
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/knxnet-ip by this push:
new ff55eb1 - Cleaned up the code to avoid warnings
ff55eb1 is described below
commit ff55eb1a734066cf00cae80b85abd32d675db615
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Nov 10 17:10:42 2019 +0100
- Cleaned up the code to avoid warnings
---
.../apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java | 6 +-----
.../apache/plc4x/java/knxnetip/connection/KnxNetIpFieldHandler.java | 2 +-
.../java/org/apache/plc4x/java/knxnetip/model/KnxNetIpField.java | 3 ---
.../apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java | 2 +-
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java
index b6d5ccb..eda590b 100644
--- a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java
+++ b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpConnection.java
@@ -33,8 +33,6 @@ import org.apache.plc4x.java.base.events.DisconnectEvent;
import org.apache.plc4x.java.base.messages.*;
import org.apache.plc4x.java.knxnetip.model.KnxNetIpField;
import org.apache.plc4x.java.knxnetip.protocol.KnxNetIpProtocolPackets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.net.InetAddress;
import java.util.concurrent.CompletableFuture;
@@ -44,9 +42,7 @@ import java.util.concurrent.TimeoutException;
public class KnxNetIpConnection extends NettyPlcConnection implements PlcReader {
- public static final int KNXNET_IP_PORT = 3671;
-
- private static final Logger logger = LoggerFactory.getLogger(KnxNetIpConnection.class);
+ private static final int KNXNET_IP_PORT = 3671;
private final ChannelHandler handler;
diff --git a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpFieldHandler.java b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpFieldHandler.java
index 6e6996d..18713db 100644
--- a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpFieldHandler.java
+++ b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/connection/KnxNetIpFieldHandler.java
@@ -26,7 +26,7 @@ import org.apache.plc4x.java.knxnetip.model.KnxNetIpField;
public class KnxNetIpFieldHandler extends DefaultPlcFieldHandler {
@Override
- public PlcField createField(String fieldQuery) throws PlcInvalidFieldException {
+ public PlcField createField(String fieldQuery) {
if (KnxNetIpField.matches(fieldQuery)) {
return KnxNetIpField.of(fieldQuery);
}
diff --git a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/model/KnxNetIpField.java b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/model/KnxNetIpField.java
index fbf207a..12579a6 100644
--- a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/model/KnxNetIpField.java
+++ b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/model/KnxNetIpField.java
@@ -29,9 +29,6 @@ public class KnxNetIpField implements PlcField {
private static final Pattern ADDRESS_PATTERN =
Pattern.compile("^N(?<fileNumber>\\d{1,7}):(?<elementNumber>\\d{1,7})(/(?<bitNumber>\\d{1,7}))?:(?<dataType>[a-zA-Z_]+)(\\[(?<size>\\d+)])?");
- public KnxNetIpField() {
- }
-
public static boolean matches(String fieldString) {
return ADDRESS_PATTERN.matcher(fieldString).matches();
}
diff --git a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
index 885fc95..b1f6b90 100644
--- a/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
+++ b/sandbox/test-java-knxnetip-driver/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
@@ -53,7 +53,7 @@ public class KnxNetIpProtocolLogic extends PlcMessageToMessageCodec<KNXNetIPMess
private CompletableFuture<Void> disconnectFuture;
@Override
- public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
if (evt instanceof ConnectEvent) {
DatagramChannel channel = (DatagramChannel) ctx.pipeline().channel();
final InetSocketAddress localSocketAddress = channel.localAddress();