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 2020/11/09 12:11:50 UTC
[plc4x] 02/04: - Renamed some of the KNX type names to be
consistent regarding case - Fixed a bug in the KNX driver
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/plc4go
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 937756dd4a020341c03c9503687421e648b162e9
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Nov 8 17:14:07 2020 +0100
- Renamed some of the KNX type names to be consistent regarding case
- Fixed a bug in the KNX driver
---
.../apache/plc4x/java/knxnetip/KnxNetIpDriver.java | 10 +-
.../knxnetip/context/KnxNetIpDriverContext.java | 14 +--
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 65 ++++++------
.../org/apache/plc4x/java/knxnetip/IOTest.java | 20 ++--
.../{KNXNetIpTest.java => KnxNetIpTest.java} | 4 +-
.../messages/DefaultPlcSubscriptionResponse.java | 1 -
.../plc4x/java/transport/tcp/TcpTransport.java | 2 +-
.../plc4x/java/transport/udp/UdpTransport.java | 4 +-
.../resources/protocols/knxnetip/knxnetip.mspec | 22 ++--
.../apache/plc4x/protocols/knxnetip/protocol.tdml | 112 ++++++++++-----------
.../knxnetip/ParserSerializerTestsuite.xml | 42 ++++----
.../adapters/source/knxnetip/KnxNetIpAdapter.java | 4 +-
12 files changed, 150 insertions(+), 150 deletions(-)
diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/KnxNetIpDriver.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/KnxNetIpDriver.java
index 102b688..d0c8994 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/KnxNetIpDriver.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/KnxNetIpDriver.java
@@ -22,11 +22,11 @@ import io.netty.buffer.ByteBuf;
import org.apache.plc4x.java.knxnetip.configuration.KnxNetIpConfiguration;
import org.apache.plc4x.java.knxnetip.context.KnxNetIpDriverContext;
import org.apache.plc4x.java.knxnetip.field.KnxNetIpField;
-import org.apache.plc4x.java.knxnetip.readwrite.io.KNXNetIPMessageIO;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpMessage;
+import org.apache.plc4x.java.knxnetip.readwrite.io.KnxNetIpMessageIO;
import org.apache.plc4x.java.spi.configuration.Configuration;
import org.apache.plc4x.java.knxnetip.field.KnxNetIpFieldHandler;
import org.apache.plc4x.java.knxnetip.protocol.KnxNetIpProtocolLogic;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXNetIPMessage;
import org.apache.plc4x.java.spi.values.IEC61131ValueHandler;
import org.apache.plc4x.java.api.value.PlcValueHandler;
import org.apache.plc4x.java.spi.connection.GeneratedDriverBase;
@@ -38,7 +38,7 @@ import org.apache.plc4x.java.spi.optimizer.SingleFieldOptimizer;
import java.util.function.ToIntFunction;
-public class KnxNetIpDriver extends GeneratedDriverBase<KNXNetIPMessage> {
+public class KnxNetIpDriver extends GeneratedDriverBase<KnxNetIpMessage> {
public static final int KNXNET_IP_PORT = 3671;
@@ -93,8 +93,8 @@ public class KnxNetIpDriver extends GeneratedDriverBase<KNXNetIPMessage> {
}
@Override
- protected ProtocolStackConfigurer<KNXNetIPMessage> getStackConfigurer() {
- return SingleProtocolStackConfigurer.builder(KNXNetIPMessage.class, KNXNetIPMessageIO.class)
+ protected ProtocolStackConfigurer<KnxNetIpMessage> getStackConfigurer() {
+ return SingleProtocolStackConfigurer.builder(KnxNetIpMessage.class, KnxNetIpMessageIO.class)
.withProtocol(KnxNetIpProtocolLogic.class)
.withDriverContext(KnxNetIpDriverContext.class)
.withPacketSizeEstimator(PacketSizeEstimator.class)
diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/context/KnxNetIpDriverContext.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/context/KnxNetIpDriverContext.java
index 5c14b89..386122b 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/context/KnxNetIpDriverContext.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/context/KnxNetIpDriverContext.java
@@ -23,7 +23,7 @@ import org.apache.plc4x.java.knxnetip.configuration.KnxNetIpConfiguration;
import org.apache.plc4x.java.knxnetip.ets5.Ets5Parser;
import org.apache.plc4x.java.knxnetip.ets5.model.Ets5Model;
import org.apache.plc4x.java.knxnetip.readwrite.IPAddress;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXAddress;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxAddress;
import org.apache.plc4x.java.knxnetip.readwrite.types.KnxLayer;
import org.apache.plc4x.java.spi.configuration.HasConfiguration;
import org.apache.plc4x.java.spi.context.DriverContext;
@@ -33,12 +33,12 @@ import java.io.File;
public class KnxNetIpDriverContext implements DriverContext, HasConfiguration<KnxNetIpConfiguration> {
private boolean passiveMode = false;
- private KNXAddress gatewayAddress;
+ private KnxAddress gatewayAddress;
private String gatewayName;
private IPAddress localIPAddress;
private int localPort;
private short communicationChannelId;
- private KNXAddress clientKnxAddress;
+ private KnxAddress clientKnxAddress;
private byte groupAddressType;
private KnxLayer tunnelConnectionType;
private Ets5Model ets5Model;
@@ -69,11 +69,11 @@ public class KnxNetIpDriverContext implements DriverContext, HasConfiguration<Kn
this.passiveMode = passiveMode;
}
- public KNXAddress getGatewayAddress() {
+ public KnxAddress getGatewayAddress() {
return gatewayAddress;
}
- public void setGatewayAddress(KNXAddress gatewayAddress) {
+ public void setGatewayAddress(KnxAddress gatewayAddress) {
this.gatewayAddress = gatewayAddress;
}
@@ -109,11 +109,11 @@ public class KnxNetIpDriverContext implements DriverContext, HasConfiguration<Kn
this.communicationChannelId = communicationChannelId;
}
- public KNXAddress getClientKnxAddress() {
+ public KnxAddress getClientKnxAddress() {
return clientKnxAddress;
}
- public void setClientKnxAddress(KNXAddress clientKnxAddress) {
+ public void setClientKnxAddress(KnxAddress clientKnxAddress) {
this.clientKnxAddress = clientKnxAddress;
}
diff --git a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
index 09b4c67..47d0854 100644
--- a/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
+++ b/plc4j/drivers/knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
@@ -32,11 +32,11 @@ import org.apache.plc4x.java.knxnetip.ets5.model.Ets5Model;
import org.apache.plc4x.java.knxnetip.ets5.model.GroupAddress;
import org.apache.plc4x.java.knxnetip.field.KnxNetIpField;
import org.apache.plc4x.java.knxnetip.model .KnxNetIpSubscriptionHandle;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXGroupAddress;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXGroupAddress2Level;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXGroupAddress3Level;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXGroupAddressFreeLevel;
-import org.apache.plc4x.java.knxnetip.readwrite.io.KNXGroupAddressIO;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxGroupAddress;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxGroupAddress2Level;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxGroupAddress3Level;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxGroupAddressFreeLevel;
+import org.apache.plc4x.java.knxnetip.readwrite.io.KnxGroupAddressIO;
import org.apache.plc4x.java.knxnetip.readwrite.io.KnxDatapointIO;
import org.apache.plc4x.java.knxnetip.readwrite.types.*;
import org.apache.plc4x.java.spi.ConversationContext;
@@ -49,6 +49,7 @@ import org.apache.plc4x.java.spi.generation.WriteBuffer;
import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.spi.messages.utils.ResponseItem;
import org.apache.plc4x.java.spi.model.DefaultPlcConsumerRegistration;
+import org.apache.plc4x.java.spi.model.DefaultPlcSubscriptionField;
import org.apache.plc4x.java.spi.transaction.RequestTransactionManager;
import org.apache.plc4x.java.spi.values.PlcSTRING;
import org.apache.plc4x.java.spi.values.PlcStruct;
@@ -64,7 +65,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
-public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> implements PlcSubscriber {
+public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KnxNetIpMessage> implements PlcSubscriber {
private static final Logger LOGGER = LoggerFactory.getLogger(KnxNetIpProtocolLogic.class);
public static final Duration REQUEST_TIMEOUT = Duration.ofMillis(10000);
@@ -90,7 +91,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
}
@Override
- public void onConnect(ConversationContext<KNXNetIPMessage> context) {
+ public void onConnect(ConversationContext<KnxNetIpMessage> context) {
// Only the UDP transport supports login.
if(!context.isPassive()) {
LOGGER.info("KNX Driver running in ACTIVE mode.");
@@ -110,7 +111,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
new HPAIDiscoveryEndpoint(HostProtocolCode.IPV4_UDP,
knxNetIpDriverContext.getLocalIPAddress(), knxNetIpDriverContext.getLocalPort()));
context.sendRequest(searchRequest)
- .expectResponse(KNXNetIPMessage.class, Duration.ofMillis(1000))
+ .expectResponse(KnxNetIpMessage.class, Duration.ofMillis(1000))
.check(p -> p instanceof SearchResponse)
.unwrap(p -> (SearchResponse) p)
.handle(searchResponse -> {
@@ -140,7 +141,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
knxNetIpDriverContext.getTunnelConnectionType()));
LOGGER.info("Sending KNXnet/IP Connection Request.");
context.sendRequest(connectionRequest)
- .expectResponse(KNXNetIPMessage.class, Duration.ofMillis(1000))
+ .expectResponse(KnxNetIpMessage.class, Duration.ofMillis(1000))
.check(p -> p instanceof ConnectionResponse)
.unwrap(p -> (ConnectionResponse) p)
.handle(connectionResponse -> {
@@ -159,8 +160,8 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
// Save the KNX Address the Gateway assigned to this connection.
knxNetIpDriverContext.setClientKnxAddress(tunnelConnectionDataBlock.getKnxAddress());
- final KNXAddress gatewayAddress = knxNetIpDriverContext.getGatewayAddress();
- final KNXAddress clientKnxAddress = knxNetIpDriverContext.getClientKnxAddress();
+ final KnxAddress gatewayAddress = knxNetIpDriverContext.getGatewayAddress();
+ final KnxAddress clientKnxAddress = knxNetIpDriverContext.getClientKnxAddress();
LOGGER.info(String.format("Successfully connected to KNXnet/IP Gateway '%s' with KNX address '%d.%d.%d' got assigned client KNX address '%d.%d.%d'",
knxNetIpDriverContext.getGatewayName(),
gatewayAddress.getMainGroup(), gatewayAddress.getMiddleGroup(),
@@ -184,7 +185,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
knxNetIpDriverContext.getLocalIPAddress(),
knxNetIpDriverContext.getLocalPort()));
context.sendRequest(connectionStateRequest)
- .expectResponse(KNXNetIPMessage.class, Duration.ofMillis(1000))
+ .expectResponse(KnxNetIpMessage.class, Duration.ofMillis(1000))
.check(p -> p instanceof ConnectionStateResponse)
.unwrap(p -> (ConnectionStateResponse) p)
.handle(connectionStateResponse -> {
@@ -230,7 +231,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
}
@Override
- public void onDisconnect(ConversationContext<KNXNetIPMessage> context) {
+ public void onDisconnect(ConversationContext<KnxNetIpMessage> context) {
// Cancel the timer for sending connection state requests.
connectionStateTimer.cancel();
@@ -238,14 +239,14 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
new HPAIControlEndpoint(HostProtocolCode.IPV4_UDP,
knxNetIpDriverContext.getLocalIPAddress(), knxNetIpDriverContext.getLocalPort()));
context.sendRequest(disconnectRequest)
- .expectResponse(KNXNetIPMessage.class, Duration.ofMillis(1000))
+ .expectResponse(KnxNetIpMessage.class, Duration.ofMillis(1000))
.check(p -> p instanceof DisconnectResponse)
.unwrap(p -> (DisconnectResponse) p)
.handle(disconnectResponse -> {
// In general we should probably check if the disconnect was successful, but in
// the end we couldn't do much if the disconnect would fail.
final String gatewayName = knxNetIpDriverContext.getGatewayName();
- final KNXAddress gatewayAddress = knxNetIpDriverContext.getGatewayAddress();
+ final KnxAddress gatewayAddress = knxNetIpDriverContext.getGatewayAddress();
LOGGER.info(String.format("Disconnected from KNX Gateway '%s' with KNX address '%d.%d.%d'", gatewayName,
gatewayAddress.getMainGroup(), gatewayAddress.getMiddleGroup(), gatewayAddress.getSubGroup()));
@@ -355,7 +356,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
// Start a new request-transaction (Is ended in the response-handler)
transaction.submit(() -> context.sendRequest(knxRequest)
- .expectResponse(KNXNetIPMessage.class, REQUEST_TIMEOUT)
+ .expectResponse(KnxNetIpMessage.class, REQUEST_TIMEOUT)
.onTimeout(future::completeExceptionally)
.onError((tr, e) -> future.completeExceptionally(e))
.check(tr -> tr instanceof TunnelingResponse)
@@ -386,7 +387,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
}
@Override
- protected void decode(ConversationContext<KNXNetIPMessage> context, KNXNetIPMessage msg) throws Exception {
+ protected void decode(ConversationContext<KnxNetIpMessage> context, KnxNetIpMessage msg) throws Exception {
// Handle a normal tunneling request, which is delivering KNX data.
if(msg instanceof TunnelingRequest) {
TunnelingRequest tunnelingRequest = (TunnelingRequest) msg;
@@ -428,7 +429,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
}
}
- protected void processCemiData(KNXAddress sourceAddress, byte[] destinationGroupAddress,
+ protected void processCemiData(KnxAddress sourceAddress, byte[] destinationGroupAddress,
byte firstByte, byte[] restBytes) throws ParseException {
// The first byte is actually just 6 bit long, but we'll treat it as a full one.
// So here we create a byte array containing the first and all the following bytes.
@@ -438,8 +439,8 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
// Decode the group address depending on the project settings.
ReadBuffer addressBuffer = new ReadBuffer(destinationGroupAddress);
- final KNXGroupAddress knxGroupAddress =
- KNXGroupAddressIO.staticParse(addressBuffer, knxNetIpDriverContext.getGroupAddressType());
+ final KnxGroupAddress knxGroupAddress =
+ KnxGroupAddressIO.staticParse(addressBuffer, knxNetIpDriverContext.getGroupAddressType());
final String destinationAddress = toString(knxGroupAddress);
// If there is an ETS5 model provided, continue decoding the payload.
@@ -500,7 +501,7 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
}
@Override
- public void close(ConversationContext<KNXNetIPMessage> context) {
+ public void close(ConversationContext<KnxNetIpMessage> context) {
// TODO Implement Closing on Protocol Level
}
@@ -508,12 +509,12 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionRequest subscriptionRequest) {
Map<String, ResponseItem<PlcSubscriptionHandle>> values = new HashMap<>();
for (String fieldName : subscriptionRequest.getFieldNames()) {
- final PlcField field = subscriptionRequest.getField(fieldName);
- if(!(field instanceof KnxNetIpField)) {
+ final DefaultPlcSubscriptionField field = (DefaultPlcSubscriptionField) subscriptionRequest.getField(fieldName);
+ if(!(field.getPlcField() instanceof KnxNetIpField)) {
values.put(fieldName, new ResponseItem<>(PlcResponseCode.INVALID_ADDRESS, null));
} else {
values.put(fieldName, new ResponseItem<>(PlcResponseCode.OK,
- new KnxNetIpSubscriptionHandle(this, (KnxNetIpField) field)));
+ new KnxNetIpSubscriptionHandle(this, (KnxNetIpField) field.getPlcField())));
}
}
return CompletableFuture.completedFuture(
@@ -580,19 +581,19 @@ public class KnxNetIpProtocolLogic extends Plc4xProtocolBase<KNXNetIPMessage> im
return address.getData();
}
- protected static String toString(KNXAddress knxAddress) {
+ protected static String toString(KnxAddress knxAddress) {
return knxAddress.getMainGroup() + "." + knxAddress.getMiddleGroup() + "." + knxAddress.getSubGroup();
}
- protected static String toString(KNXGroupAddress groupAddress) {
- if (groupAddress instanceof KNXGroupAddress3Level) {
- KNXGroupAddress3Level level3 = (KNXGroupAddress3Level) groupAddress;
+ protected static String toString(KnxGroupAddress groupAddress) {
+ if (groupAddress instanceof KnxGroupAddress3Level) {
+ KnxGroupAddress3Level level3 = (KnxGroupAddress3Level) groupAddress;
return level3.getMainGroup() + "/" + level3.getMiddleGroup() + "/" + level3.getSubGroup();
- } else if (groupAddress instanceof KNXGroupAddress2Level) {
- KNXGroupAddress2Level level2 = (KNXGroupAddress2Level) groupAddress;
+ } else if (groupAddress instanceof KnxGroupAddress2Level) {
+ KnxGroupAddress2Level level2 = (KnxGroupAddress2Level) groupAddress;
return level2.getMainGroup() + "/" + level2.getSubGroup();
- } else if(groupAddress instanceof KNXGroupAddressFreeLevel) {
- KNXGroupAddressFreeLevel free = (KNXGroupAddressFreeLevel) groupAddress;
+ } else if(groupAddress instanceof KnxGroupAddressFreeLevel) {
+ KnxGroupAddressFreeLevel free = (KnxGroupAddressFreeLevel) groupAddress;
return free.getSubGroup() + "";
}
throw new PlcRuntimeException("Unsupported Group Address Type " + groupAddress.getClass().getName());
diff --git a/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java b/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java
index 4f518b0..a47434a 100644
--- a/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java
+++ b/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/IOTest.java
@@ -22,8 +22,8 @@ package org.apache.plc4x.java.knxnetip;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import org.apache.commons.codec.binary.Hex;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXNetIPMessage;
-import org.apache.plc4x.java.knxnetip.readwrite.io.KNXNetIPMessageIO;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxNetIpMessage;
+import org.apache.plc4x.java.knxnetip.readwrite.io.KnxNetIpMessageIO;
import org.apache.plc4x.java.spi.generation.ReadBuffer;
import org.apache.plc4x.java.spi.generation.WriteBuffer;
import org.junit.jupiter.api.Test;
@@ -37,10 +37,10 @@ public class IOTest {
byte[] rData = Hex.decodeHex("06100420001c046b00002b0703010504024502bc360a1e0ce100810d");
ObjectMapper mapper = new XmlMapper().enableDefaultTyping();
ReadBuffer rBuf = new ReadBuffer(rData);
- KNXNetIPMessage packet = new KNXNetIPMessageIO().parse(rBuf);
+ KnxNetIpMessage packet = new KnxNetIpMessageIO().parse(rBuf);
String xml = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(packet);
System.out.println(xml);
- KNXNetIPMessage pack2 = mapper.readValue(xml, KNXNetIPMessage.class);
+ KnxNetIpMessage pack2 = mapper.readValue(xml, KnxNetIpMessage.class);
System.out.println(pack2);
}
@@ -49,10 +49,10 @@ public class IOTest {
byte[] rData = Hex.decodeHex("0610020500180801c0a82a46c4090801c0a82a46c40a0203");
ObjectMapper mapper = new ObjectMapper().enableDefaultTyping();
ReadBuffer rBuf = new ReadBuffer(rData);
- KNXNetIPMessage packet = new KNXNetIPMessageIO().parse(rBuf);
+ KnxNetIpMessage packet = new KnxNetIpMessageIO().parse(rBuf);
String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(packet);
System.out.println(json);
- KNXNetIPMessage pack2 = mapper.readValue(json, KNXNetIPMessage.class);
+ KnxNetIpMessage pack2 = mapper.readValue(json, KnxNetIpMessage.class);
System.out.println(pack2);
}
@@ -62,13 +62,13 @@ public class IOTest {
long start = System.currentTimeMillis();
int numRunsParse = 20000;
- KNXNetIPMessageIO knxNetIPMessageIO = new KNXNetIPMessageIO();
+ KnxNetIpMessageIO knxNetIPMessageIO = new KnxNetIpMessageIO();
// Benchmark the parsing code
- KNXNetIPMessage packet = null;
+ KnxNetIpMessage packet = null;
for(int i = 0; i < numRunsParse; i++) {
ReadBuffer rBuf = new ReadBuffer(rData);
- packet = KNXNetIPMessageIO.staticParse(rBuf);
+ packet = KnxNetIpMessageIO.staticParse(rBuf);
}
long endParsing = System.currentTimeMillis();
@@ -80,7 +80,7 @@ public class IOTest {
byte[] oData = null;
for(int i = 0; i < numRunsSerialize; i++) {
WriteBuffer wBuf = new WriteBuffer(packet.getLengthInBytes());
- KNXNetIPMessageIO.staticSerialize(wBuf, packet);
+ KnxNetIpMessageIO.staticSerialize(wBuf, packet);
oData = wBuf.getData();
}
long endSerializing = System.currentTimeMillis();
diff --git a/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java b/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/KnxNetIpTest.java
similarity index 91%
rename from plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java
rename to plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/KnxNetIpTest.java
index d6c89d8..8c6ba62 100644
--- a/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java
+++ b/plc4j/drivers/knxnetip/src/test/java/org/apache/plc4x/java/knxnetip/KnxNetIpTest.java
@@ -21,9 +21,9 @@ package org.apache.plc4x.java.knxnetip;
import org.apache.plc4x.test.parserserializer.ParserSerializerTestsuiteRunner;
-public class KNXNetIpTest extends ParserSerializerTestsuiteRunner {
+public class KnxNetIpTest extends ParserSerializerTestsuiteRunner {
- public KNXNetIpTest() {
+ public KnxNetIpTest() {
super("/protocols/knxnetip/ParserSerializerTestsuite.xml");
}
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/messages/DefaultPlcSubscriptionResponse.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/messages/DefaultPlcSubscriptionResponse.java
index afd6313..741bd93 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/messages/DefaultPlcSubscriptionResponse.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/messages/DefaultPlcSubscriptionResponse.java
@@ -27,7 +27,6 @@ import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.messages.PlcResponse;
import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse;
-import org.apache.plc4x.java.api.model.PlcField;
import org.apache.plc4x.java.api.model.PlcSubscriptionField;
import org.apache.plc4x.java.api.model.PlcSubscriptionHandle;
import org.apache.plc4x.java.api.types.PlcResponseCode;
diff --git a/plc4j/transports/tcp/src/main/java/org/apache/plc4x/java/transport/tcp/TcpTransport.java b/plc4j/transports/tcp/src/main/java/org/apache/plc4x/java/transport/tcp/TcpTransport.java
index e40d49c..63b688c 100644
--- a/plc4j/transports/tcp/src/main/java/org/apache/plc4x/java/transport/tcp/TcpTransport.java
+++ b/plc4j/transports/tcp/src/main/java/org/apache/plc4x/java/transport/tcp/TcpTransport.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
public class TcpTransport implements Transport, HasConfiguration<TcpTransportConfiguration> {
private static final Pattern TRANSPORT_TCP_PATTERN = Pattern.compile(
- "^((?<ip>[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3})|(?<hostname>[a-zA-Z0-9\\.\\-]+))(:(?<port>[0-9]{1,5}))?");
+ "^((?<ip>[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3})|(?<hostname>[a-zA-Z0-9.\\-]+))(:(?<port>[0-9]{1,5}))?");
private TcpTransportConfiguration configuration;
diff --git a/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/transport/udp/UdpTransport.java b/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/transport/udp/UdpTransport.java
index a3c51cb..91b1eae 100644
--- a/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/transport/udp/UdpTransport.java
+++ b/plc4j/transports/udp/src/main/java/org/apache/plc4x/java/transport/udp/UdpTransport.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
public class UdpTransport implements Transport, HasConfiguration<UdpTransportConfiguration> {
private static final Pattern TRANSPORT_UDP_PATTERN = Pattern.compile(
- "^((?<ip>[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3})|(?<hostname>[a-zA-Z0-9\\.\\-]+))(:(?<port>[0-9]{1,5}))?");
+ "^((?<ip>[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3})|(?<hostname>[a-zA-Z0-9.\\-]+))(:(?<port>[0-9]{1,5}))?");
private UdpTransportConfiguration configuration;
@@ -42,7 +42,7 @@ public class UdpTransport implements Transport, HasConfiguration<UdpTransportCon
@Override
public String getTransportName() {
- return "IP/UDP Transport";
+ return "UDP Datagram Transport";
}
@Override
diff --git a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
index f4b6707..b326285 100644
--- a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
+++ b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
@@ -17,7 +17,7 @@
// under the License.
//
-[discriminatedType 'KNXNetIPMessage'
+[discriminatedType 'KnxNetIpMessage'
[implicit uint 8 'headerLength' '6']
[const uint 8 'protocolVersion' '0x10']
[discriminator uint 16 'msgType']
@@ -108,7 +108,7 @@
[simple uint 8 'descriptionType']
[simple uint 8 'knxMedium']
[simple DeviceStatus 'deviceStatus']
- [simple KNXAddress 'knxAddress']
+ [simple KnxAddress 'knxAddress']
[simple ProjectInstallationIdentifier 'projectInstallationIdentifier']
[array int 8 'knxNetIpDeviceSerialNumber' count '6']
[simple IPAddress 'knxNetIpDeviceMulticastAddress']
@@ -149,7 +149,7 @@
['0x03' ConnectionResponseDataBlockDeviceManagement
]
['0x04' ConnectionResponseDataBlockTunnelConnection
- [simple KNXAddress 'knxAddress']
+ [simple KnxAddress 'knxAddress']
]
]
]
@@ -190,7 +190,7 @@
[array int 8 'addr' count '6']
]
-[type 'KNXAddress'
+[type 'KnxAddress'
[simple uint 4 'mainGroup']
[simple uint 4 'middleGroup']
[simple uint 8 'subGroup']
@@ -316,7 +316,7 @@
[simple bit 'groupDestinationAddress']
[simple uint 3 'hopCount']
[simple uint 4 'extendedFrameFormat']
- [simple KNXAddress 'sourceAddress']
+ [simple KnxAddress 'sourceAddress']
[array int 8 'destinationAddress' count '2']
[simple uint 8 'dataLength']
[enum TPCI 'tcpi']
@@ -340,7 +340,7 @@
['false' CEMIFrameAck
]
['true','true','false' CEMIFrameData
- [simple KNXAddress 'sourceAddress']
+ [simple KnxAddress 'sourceAddress']
[array int 8 'destinationAddress' count '2']
[simple bit 'groupAddress']
[simple uint 3 'hopCount']
@@ -358,7 +358,7 @@
[simple bit 'groupAddress']
[simple uint 3 'hopCount']
[simple uint 4 'extendedFrameFormat']
- [simple KNXAddress 'sourceAddress']
+ [simple KnxAddress 'sourceAddress']
[array int 8 'destinationAddress' count '2']
[simple uint 8 'dataLength']
[enum TPCI 'tcpi']
@@ -377,16 +377,16 @@
[simple uint 16 'timestamp']
]
-[discriminatedType 'KNXGroupAddress' [uint 2 'numLevels']
+[discriminatedType 'KnxGroupAddress' [uint 2 'numLevels']
[typeSwitch 'numLevels'
- ['1' KNXGroupAddressFreeLevel
+ ['1' KnxGroupAddressFreeLevel
[simple uint 16 'subGroup']
]
- ['2' KNXGroupAddress2Level
+ ['2' KnxGroupAddress2Level
[simple uint 5 'mainGroup']
[simple uint 11 'subGroup']
]
- ['3' KNXGroupAddress3Level
+ ['3' KnxGroupAddress3Level
[simple uint 5 'mainGroup']
[simple uint 3 'middleGroup']
[simple uint 8 'subGroup']
diff --git a/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml b/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml
index 3453454..ec12f08 100644
--- a/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml
+++ b/protocols/knxnetip/src/test/resources/org/apache/plc4x/protocols/knxnetip/protocol.tdml
@@ -38,8 +38,8 @@
<!--xs:element name="TpktMessage" type="s7:TpktMessageType"/-->
</tdml:defineSchema>
- <tdml:parserTestCase name="KNXNetIP-Search-Request"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Search-Request"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Search-Request">
<tdml:document>
@@ -48,7 +48,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -63,13 +63,13 @@
<ipPort>61326</ipPort>
</HPAIDiscoveryEndpoint>
</SearchRequest>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Search-Response"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Search-Response"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Search-Response">
<tdml:document>
@@ -80,7 +80,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -141,13 +141,13 @@
</serviceIds>
</DIBSuppSvcFamilies>
</SearchResponse>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Description-Request"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Description-Request"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Description-Request">
<tdml:document>
@@ -156,7 +156,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -171,13 +171,13 @@
<ipPort>0</ipPort>
</HPAIControlEndpoint>
</DescriptionRequest>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Description-Response"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Description-Response"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Description-Response">
<tdml:document>
@@ -188,7 +188,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -243,13 +243,13 @@
</serviceIds>
</DIBSuppSvcFamilies>
</DescriptionResponse>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Connect-Request"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Connect-Request"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Connect-Request">
<tdml:document>
@@ -258,7 +258,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -285,13 +285,13 @@
<reserved>0</reserved>
</ConnectionRequestInformation>
</ConnectionRequest>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Connect-Response"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Connect-Response"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Connect-Response">
<tdml:document>
@@ -300,7 +300,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -326,13 +326,13 @@
</knxAddress>
</ConnectionResponseDataBlock>
</ConnectionResponse>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Connection-State-Request"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Connection-State-Request"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Connection-State-Request">
<tdml:document>
@@ -341,7 +341,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -358,13 +358,13 @@
<ipPort>62513</ipPort>
</HPAIControlEndpoint>
</ConnectionStateRequest>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Connection-State-Response"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Connection-State-Response"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Connection-State-Response">
<tdml:document>
@@ -373,7 +373,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -384,13 +384,13 @@
<communicationChannelId>102</communicationChannelId>
<status>0</status>
</ConnectionStateResponse>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Device-Configuration-Request"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Device-Configuration-Request"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Device-Configuration-Request">
<tdml:document>
@@ -399,7 +399,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -422,13 +422,13 @@
</MPropRead>
</cEMI>
</DeviceConfigurationRequest>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Device-Configuration-Response"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Device-Configuration-Response"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Device-Configuration-Response">
<tdml:document>
@@ -437,7 +437,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -450,13 +450,13 @@
<sequenceCounter>0</sequenceCounter>
<status>0</status>
</DeviceConfigurationResponse>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Disconnect-Request"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Disconnect-Request"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Disconnect-Request">
<tdml:document>
@@ -465,7 +465,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -482,13 +482,13 @@
<ipPort>62513</ipPort>
</HPAIControlEndpoint>
</DisconnectRequest>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Disconnect-Response"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Disconnect-Response"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Disconnect-Response">
<tdml:document>
@@ -497,7 +497,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -508,13 +508,13 @@
<communicationChannelId>103</communicationChannelId>
<status>0</status>
</DisconnectResponse>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Tunneling-Request"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Tunneling-Request"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Tunneling-Request">
<tdml:document>
@@ -523,7 +523,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -566,13 +566,13 @@
</LBusmonInd>
</cEMI>
</TunnelingRequest>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
- <tdml:parserTestCase name="KNXNetIP-Tunneling-Response"
- root="KNXNetIPMessage"
+ <tdml:parserTestCase name="KnxNetIp-Tunneling-Response"
+ root="KnxNetIpMessage"
model="knxNetIpSchema"
description="KNXNet/IP Tunneling-Response">
<tdml:document>
@@ -581,7 +581,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <knx:KNXNetIPMessage>
+ <knx:KnxNetIpMessage>
<header>
<headerLength>6</headerLength>
<protocolVersion>16</protocolVersion>
@@ -594,7 +594,7 @@
<sequenceCounter>0</sequenceCounter>
<status>0</status>
</TunnelingResponse>
- </knx:KNXNetIPMessage>
+ </knx:KnxNetIpMessage>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
diff --git a/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml b/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml
index 939c1b9..90217fe 100644
--- a/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml
+++ b/protocols/knxnetip/src/test/resources/protocols/knxnetip/ParserSerializerTestsuite.xml
@@ -40,7 +40,7 @@
Differences from normal:
Repeat: True
Last two reserved bits are true
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<TunnelingRequest className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequest">
<tunnelingRequestDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequestDataBlock">
@@ -80,7 +80,7 @@
Raw CEMI Frame: bab8b838bb
Control Field: ba
First of the last two reserved bits is true
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<TunnelingRequest className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequest">
<tunnelingRequestDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequestDataBlock">
@@ -117,7 +117,7 @@
<testcase>
<name>Search Request</name>
<raw>06100201000e0801c0a82a46ef8e</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<SearchRequest className="org.apache.plc4x.java.knxnetip.readwrite.SearchRequest">
<hpaiIDiscoveryEndpoint className="org.apache.plc4x.java.knxnetip.readwrite.HPAIDiscoveryEndpoint">
@@ -134,7 +134,7 @@
<testcase>
<name>Search Response</name>
<raw>06100202004c0801c0a82a0b0e5736010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<SearchResponse className="org.apache.plc4x.java.knxnetip.readwrite.SearchResponse">
<hpaiControlEndpoint className="org.apache.plc4x.java.knxnetip.readwrite.HPAIControlEndpoint">
@@ -150,7 +150,7 @@
<deviceStatus className="org.apache.plc4x.java.knxnetip.readwrite.DeviceStatus">
<programMode>false</programMode>
</deviceStatus>
- <knxAddress className="org.apache.plc4x.java.knxnetip.readwrite.KNXAddress">
+ <knxAddress className="org.apache.plc4x.java.knxnetip.readwrite.KnxAddress">
<mainGroup>15</mainGroup>
<middleGroup>15</middleGroup>
<subGroup>255</subGroup>
@@ -189,7 +189,7 @@
<testcase>
<name>Description Request</name>
<raw>06100203000e0801000000000000</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<DescriptionRequest className="org.apache.plc4x.java.knxnetip.readwrite.DescriptionRequest">
<hpaiControlEndpoint className="org.apache.plc4x.java.knxnetip.readwrite.HPAIControlEndpoint">
@@ -206,7 +206,7 @@
<testcase>
<name>Description Response</name>
<raw>06100204004436010200ffff000000082d409852e000170c000ab327553647697261204b4e582f49502d5363686e6974747374656c6c6500000000000802020103010401</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<DescriptionResponse className="org.apache.plc4x.java.knxnetip.readwrite.DescriptionResponse">
<dibDeviceInfo className="org.apache.plc4x.java.knxnetip.readwrite.DIBDeviceInfo">
@@ -215,7 +215,7 @@
<deviceStatus className="org.apache.plc4x.java.knxnetip.readwrite.DeviceStatus">
<programMode>false</programMode>
</deviceStatus>
- <knxAddress className="org.apache.plc4x.java.knxnetip.readwrite.KNXAddress">
+ <knxAddress className="org.apache.plc4x.java.knxnetip.readwrite.KnxAddress">
<mainGroup>15</mainGroup>
<middleGroup>15</middleGroup>
<subGroup>255</subGroup>
@@ -254,7 +254,7 @@
<testcase>
<name>Connect Request</name>
<raw>06100205001a0801c0a82a46f4310801c0a82a46f43204040200</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<ConnectionRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequest">
<hpaiDiscoveryEndpoint className="org.apache.plc4x.java.knxnetip.readwrite.HPAIDiscoveryEndpoint">
@@ -281,7 +281,7 @@
<testcase>
<name>Connect Response</name>
<raw>06100206001466000801c0a82a0b0e5704041101</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<ConnectionResponse className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionResponse">
<communicationChannelId>102</communicationChannelId>
@@ -294,7 +294,7 @@
<ipPort>3671</ipPort>
</hpaiDataEndpoint>
<connectionResponseDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionResponseDataBlockTunnelConnection">
- <knxAddress className="org.apache.plc4x.java.knxnetip.readwrite.KNXAddress">
+ <knxAddress className="org.apache.plc4x.java.knxnetip.readwrite.KnxAddress">
<mainGroup>1</mainGroup>
<middleGroup>1</middleGroup>
<subGroup>1</subGroup>
@@ -307,7 +307,7 @@
<testcase>
<name>Connection State Request</name>
<raw>06100207001066000801c0a82a46f431</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<ConnectionStateRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionStateRequest">
<communicationChannelId>102</communicationChannelId>
@@ -325,7 +325,7 @@
<testcase>
<name>Connection State Response</name>
<raw>0610020800086600</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<ConnectionStateResponse className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionStateResponse">
<communicationChannelId>102</communicationChannelId>
@@ -337,7 +337,7 @@
<testcase>
<name>Device Configuration Request</name>
<raw>06100310001104670000fc000001531001</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<DeviceConfigurationRequest className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationRequest">
<deviceConfigurationRequestDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationRequestDataBlock">
@@ -358,7 +358,7 @@
<testcase>
<name>Device Configuration Ack</name>
<raw>06100311000a04670000</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<DeviceConfigurationAck className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationAck">
<deviceConfigurationAckDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.DeviceConfigurationAckDataBlock">
@@ -373,7 +373,7 @@
<testcase>
<name>Disconnect Request</name>
<raw>06100209001067000801c0a82a46f431</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<DisconnectRequest className="org.apache.plc4x.java.knxnetip.readwrite.DisconnectRequest">
<communicationChannelId>103</communicationChannelId>
@@ -391,7 +391,7 @@
<testcase>
<name>Disconnect Response</name>
<raw>0610020a00086600</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<DisconnectResponse className="org.apache.plc4x.java.knxnetip.readwrite.DisconnectResponse">
<communicationChannelId>102</communicationChannelId>
@@ -407,7 +407,7 @@
Raw CEMI Frame: bc360a1e0ce100810d
Control Field: bc
-->
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<TunnelingRequest className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequest">
<tunnelingRequestDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingRequestDataBlock">
@@ -436,7 +436,7 @@
<priority>LOW</priority>
<acknowledgeRequested>false</acknowledgeRequested>
<errorFlag>false</errorFlag>
- <sourceAddress className="org.apache.plc4x.java.knxnetip.readwrite.KNXAddress">
+ <sourceAddress className="org.apache.plc4x.java.knxnetip.readwrite.KnxAddress">
<mainGroup>3</mainGroup>
<middleGroup>6</middleGroup>
<subGroup>10</subGroup>
@@ -460,7 +460,7 @@
<testcase>
<name>Tunneling Response</name>
<raw>06100421000a046b0000</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<TunnelingResponse className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingResponse">
<tunnelingResponseDataBlock className="org.apache.plc4x.java.knxnetip.readwrite.TunnelingResponseDataBlock">
@@ -475,7 +475,7 @@
<testcase>
<name>Default</name>
<raw>0610020500180801c0a82a46c4090801c0a82a46c40a0203</raw>
- <root-type>KNXNetIPMessage</root-type>
+ <root-type>KnxNetIpMessage</root-type>
<xml>
<ConnectionRequest className="org.apache.plc4x.java.knxnetip.readwrite.ConnectionRequest">
<hpaiDiscoveryEndpoint className="org.apache.plc4x.java.knxnetip.readwrite.HPAIDiscoveryEndpoint">
diff --git a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
index a306a34..96b0136 100644
--- a/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
+++ b/sandbox/test-streampipes-plc4x-adapters/src/main/java/org/apache/plc4x/java/streampipes/adapters/source/knxnetip/KnxNetIpAdapter.java
@@ -19,7 +19,7 @@ under the License.
package org.apache.plc4x.java.streampipes.adapters.source.knxnetip;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.knxnetip.readwrite.KNXAddress;
+import org.apache.plc4x.java.knxnetip.readwrite.KnxAddress;
import org.apache.plc4x.java.spi.connection.DefaultNettyPlcConnection;
import org.apache.plc4x.java.streampipes.shared.source.knxnetip.Constants;
import org.slf4j.Logger;
@@ -215,7 +215,7 @@ public class KnxNetIpAdapter extends SpecificDataStreamAdapter {
return Constants.KNXNET_ID;
}
- private String addressToString(KNXAddress knxAddress) {
+ private String addressToString(KnxAddress knxAddress) {
return knxAddress.getMainGroup() + "." + knxAddress.getMiddleGroup() + "." + knxAddress.getSubGroup();
}