You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2019/12/25 17:25:44 UTC
[plc4x] branch next-gen-core updated: Minor fixes which came up
with knx testing (2).
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch next-gen-core
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/next-gen-core by this push:
new d6ec2e0 Minor fixes which came up with knx testing (2).
d6ec2e0 is described below
commit d6ec2e0d7710a1cbca42b3c499346d579fa7c9a2
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Wed Dec 25 18:25:38 2019 +0100
Minor fixes which came up with knx testing (2).
---
.../plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 914526b..ae40597 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
@@ -29,6 +29,7 @@ import org.apache.plc4x.java.knxnetip.ets5.Ets5Parser;
import org.apache.plc4x.java.knxnetip.ets5.model.Ets5Model;
import org.apache.plc4x.java.knxnetip.ets5.model.GroupAddress;
import org.apache.plc4x.java.spi.ConversationContext;
+import org.apache.plc4x.java.spi.HasConfiguration;
import org.apache.plc4x.java.spi.Plc4xProtocolBase;
import org.apache.plc4x.java.knxnetip.readwrite.*;
import org.apache.plc4x.java.knxnetip.readwrite.types.HostProtocolCode;
@@ -43,7 +44,7 @@ import java.net.InetSocketAddress;
import java.time.Duration;
import java.util.*;
-public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> {
+public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> implements HasConfiguration<KnxNetIpConfiguration> {
private static final Logger LOGGER = LoggerFactory.getLogger(KnxNetIpProtocolLogic.class);
@@ -58,10 +59,10 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> {
private byte groupAddressType;
private Ets5Model ets5Model;
- public KnxNetIpProtocolLogic(KnxNetIpConfiguration configuration) {
- if(configuration.knxprojFilePath != null) {
+ @Override public void setConfiguration(KnxNetIpConfiguration configuration) {
+ if (configuration.knxprojFilePath != null) {
File knxprojFile = new File(configuration.knxprojFilePath);
- if(knxprojFile.exists() && knxprojFile.isFile()) {
+ if (knxprojFile.exists() && knxprojFile.isFile()) {
ets5Model = new Ets5Parser().parse(knxprojFile);
groupAddressType = ets5Model.getGroupAddressType();
} else {
@@ -263,5 +264,4 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> {
}
throw new RuntimeException("Unsupported Group Address Type " + groupAddress.getClass().getName());
}
-
}