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 73a3f42 moved PlcRequestContainer to driver-bases 73a3f42 is described below commit 73a3f42b15b085b667041edd6fa2e01fe41efbd6 Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Thu Aug 16 10:45:12 2018 +0200 moved PlcRequestContainer to driver-bases --- .../dummydriver/connection/DummyConnection.java | 12 ++++--- .../examples/dummydriver/netty/DummyProtocol.java | 6 ++-- .../ads/connection/AdsAbstractPlcConnection.java | 1 + .../java/ads/connection/AdsTcpPlcConnection.java | 1 + .../plc4x/java/ads/protocol/Plc4x2AdsProtocol.java | 1 + .../connection/AdsAbstractPlcConnectionTest.java | 1 + .../ads/connection/AdsTcpPlcConnectionTests.java | 10 +++--- .../java/ads/protocol/Plc4x2AdsProtocolTest.java | 6 +++- .../java/base}/messages/PlcRequestContainer.java | 42 +++++++++++----------- .../base}/messages/PlcRequestContainerTest.java | 8 +++-- .../modbus/connection/BaseModbusPlcConnection.java | 6 +++- .../java/modbus/netty/Plc4XModbusProtocol.java | 1 + .../java/modbus/netty/Plc4XModbusProtocolTest.java | 6 +++- .../plc4x/java/s7/connection/S7PlcConnection.java | 6 +++- .../plc4x/java/s7/netty/Plc4XS7Protocol.java | 1 + .../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 2 +- 16 files changed, 71 insertions(+), 39 deletions(-) diff --git a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java index abb3fea..3cbfd45 100644 --- a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java +++ b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java @@ -18,24 +18,26 @@ under the License. */ package org.apache.plc4x.java.examples.dummydriver.connection; -import java.net.InetAddress; -import java.util.concurrent.CompletableFuture; - -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelInitializer; import org.apache.plc4x.java.api.connection.PlcReader; import org.apache.plc4x.java.api.connection.PlcWriter; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; -import org.apache.plc4x.java.api.messages.PlcRequestContainer; import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.PlcWriteResponse; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.base.connection.AbstractPlcConnection; import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.apache.plc4x.java.examples.dummydriver.model.DummyAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.InetAddress; +import java.util.concurrent.CompletableFuture; + public class DummyConnection extends AbstractPlcConnection implements PlcReader, PlcWriter { @SuppressWarnings("unused") diff --git a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java index bf448ea..96514c7 100644 --- a/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java +++ b/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java @@ -25,7 +25,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageCodec; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcRequest; -import org.apache.plc4x.java.api.messages.PlcRequestContainer; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ public class DummyProtocol extends MessageToMessageCodec<ByteBuf, PlcRequestCont private static final Logger logger = LoggerFactory.getLogger(DummyProtocol.class); @Override - protected void encode(ChannelHandlerContext ctx, PlcRequestContainer in, List<Object> out) throws Exception { + protected void encode(ChannelHandlerContext ctx, PlcRequestContainer in, List<Object> out) { PlcRequest request = in.getRequest(); if (request instanceof PlcReadRequest) { @@ -61,7 +61,7 @@ public class DummyProtocol extends MessageToMessageCodec<ByteBuf, PlcRequestCont } @Override - protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception { + protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) { if(logger.isTraceEnabled()) { logger.trace("Got Data: {}", ByteBufUtil.hexDump(in)); } diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java index 125d012..9b394b8 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java @@ -40,6 +40,7 @@ import org.apache.plc4x.java.api.messages.items.RequestItem; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.base.connection.AbstractPlcConnection; import org.apache.plc4x.java.base.connection.ChannelFactory; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java index e4458df..12fc9cf 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java @@ -46,6 +46,7 @@ import org.apache.plc4x.java.api.messages.items.UnsubscriptionRequestItem; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.api.types.ResponseCode; import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java index 7f0df2b..c0c0fbf 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocol.java @@ -43,6 +43,7 @@ import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteRequest; import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteResponse; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.api.types.ResponseCode; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java index 4044858..1445363 100644 --- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsAbstractPlcConnectionTest.java @@ -39,6 +39,7 @@ import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteRequest; import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteResponse; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.base.connection.ChannelFactory; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java index 74fbca0..aa56d79 100644 --- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/connection/AdsTcpPlcConnectionTests.java @@ -29,11 +29,13 @@ import org.apache.plc4x.java.ads.api.generic.types.AmsPort; import org.apache.plc4x.java.ads.model.AdsAddress; import org.apache.plc4x.java.ads.model.SymbolicAdsAddress; import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol; -import org.apache.plc4x.java.api.messages.*; +import org.apache.plc4x.java.api.messages.PlcProprietaryRequest; +import org.apache.plc4x.java.api.messages.PlcProprietaryResponse; +import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; +import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; import org.apache.plc4x.java.api.messages.items.SubscriptionEventItem; import org.apache.plc4x.java.api.messages.items.SubscriptionRequestChangeOfStateItem; -import org.apache.plc4x.java.api.messages.items.SubscriptionRequestItem; -import org.apache.plc4x.java.api.messages.items.SubscriptionResponseItem; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -50,11 +52,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; +import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNull.notNullValue; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import static org.hamcrest.core.IsEqual.equalTo; public class AdsTcpPlcConnectionTests { diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java index ebfff15..d63fe18 100644 --- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4x2AdsProtocolTest.java @@ -31,9 +31,13 @@ import org.apache.plc4x.java.ads.api.generic.types.AmsNetId; import org.apache.plc4x.java.ads.api.generic.types.AmsPort; import org.apache.plc4x.java.ads.api.generic.types.Invoke; import org.apache.plc4x.java.ads.model.AdsAddress; -import org.apache.plc4x.java.api.messages.*; +import org.apache.plc4x.java.api.messages.PlcReadRequest; +import org.apache.plc4x.java.api.messages.PlcRequest; +import org.apache.plc4x.java.api.messages.PlcResponse; +import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.items.ReadResponseItem; import org.apache.plc4x.java.api.messages.items.ResponseItem; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java similarity index 61% rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java index f7259f6..9b8bf0e 100644 --- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcRequestContainer.java @@ -1,22 +1,26 @@ /* -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. -*/ -package org.apache.plc4x.java.api.messages; + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + */ +package org.apache.plc4x.java.base.messages; + +import org.apache.plc4x.java.api.messages.PlcRequest; +import org.apache.plc4x.java.api.messages.PlcResponse; +import org.apache.plc4x.java.api.messages.ProtocolMessage; import java.util.Objects; import java.util.concurrent.CompletableFuture; @@ -24,10 +28,8 @@ import java.util.concurrent.CompletableFuture; /** * Helper mostly used internally to split up big requests into multiple sub-requests. * - * TODO: Think about moving this into one of the driver-base modules. - * - * @param <T> - * @param <R> + * @param <T> type of request. + * @param <R> type of response. */ public class PlcRequestContainer<T extends PlcRequest, R extends PlcResponse> implements ProtocolMessage { diff --git a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestContainerTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java similarity index 90% rename from plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestContainerTest.java rename to plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java index a3654ad..8cf3161 100644 --- a/plc4j/api/src/test/java/org/apache/plc4x/java/api/messages/PlcRequestContainerTest.java +++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/messages/PlcRequestContainerTest.java @@ -16,8 +16,11 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.api.messages; +package org.apache.plc4x.java.base.messages; +import org.apache.plc4x.java.api.messages.PlcRequest; +import org.apache.plc4x.java.api.messages.PlcResponse; +import org.apache.plc4x.java.api.messages.ProtocolMessage; import org.hamcrest.core.IsEqual; import org.junit.Before; import org.junit.Test; @@ -28,6 +31,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; +@SuppressWarnings("unchecked") public class PlcRequestContainerTest { private PlcRequestContainer<PlcRequest, PlcResponse> SUT; @@ -37,7 +41,7 @@ public class PlcRequestContainerTest { private CompletableFuture<PlcResponse> future; @Before - public void setUp() throws Exception { + public void setUp() { plcResponse = mock(PlcResponse.class); plcRequest = mock(PlcRequest.class); future = CompletableFuture.completedFuture(plcResponse); diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java index 6be492d..e8a671c 100644 --- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java +++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java @@ -22,10 +22,14 @@ import io.netty.channel.ChannelFuture; import org.apache.commons.lang3.StringUtils; import org.apache.plc4x.java.api.connection.PlcReader; import org.apache.plc4x.java.api.connection.PlcWriter; -import org.apache.plc4x.java.api.messages.*; +import org.apache.plc4x.java.api.messages.PlcReadRequest; +import org.apache.plc4x.java.api.messages.PlcReadResponse; +import org.apache.plc4x.java.api.messages.PlcWriteRequest; +import org.apache.plc4x.java.api.messages.PlcWriteResponse; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.base.connection.AbstractPlcConnection; import org.apache.plc4x.java.base.connection.ChannelFactory; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.apache.plc4x.java.modbus.model.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 5a42e6b..00ca660 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 @@ -34,6 +34,7 @@ import org.apache.plc4x.java.api.exceptions.PlcRuntimeException; import org.apache.plc4x.java.api.messages.*; import org.apache.plc4x.java.api.messages.items.*; import org.apache.plc4x.java.api.types.ResponseCode; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.apache.plc4x.java.modbus.model.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java index 7144720..dc60d22 100644 --- a/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java +++ b/plc4j/protocols/modbus/src/test/java/org/apache/plc4x/java/modbus/netty/Plc4XModbusProtocolTest.java @@ -25,12 +25,16 @@ import com.digitalpetri.modbus.responses.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.plc4x.java.api.messages.*; +import org.apache.plc4x.java.api.messages.PlcReadRequest; +import org.apache.plc4x.java.api.messages.PlcRequest; +import org.apache.plc4x.java.api.messages.PlcResponse; +import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.items.ReadResponseItem; import org.apache.plc4x.java.api.messages.items.ResponseItem; import org.apache.plc4x.java.api.messages.items.WriteResponseItem; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.api.types.ResponseCode; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.apache.plc4x.java.base.protocol.Plc4XSupportedDataTypes; import org.apache.plc4x.java.modbus.model.*; import org.junit.Before; diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java index 772aa51..a9740d3 100644 --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java @@ -26,13 +26,17 @@ import org.apache.plc4x.java.api.connection.PlcReader; import org.apache.plc4x.java.api.connection.PlcWriter; import org.apache.plc4x.java.api.exceptions.PlcConnectionException; import org.apache.plc4x.java.api.exceptions.PlcException; -import org.apache.plc4x.java.api.messages.*; +import org.apache.plc4x.java.api.messages.PlcReadRequest; +import org.apache.plc4x.java.api.messages.PlcReadResponse; +import org.apache.plc4x.java.api.messages.PlcWriteRequest; +import org.apache.plc4x.java.api.messages.PlcWriteResponse; import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.base.connection.AbstractPlcConnection; import org.apache.plc4x.java.base.connection.ChannelFactory; import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory; import org.apache.plc4x.java.base.events.ConnectEvent; import org.apache.plc4x.java.base.events.ConnectedEvent; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.apache.plc4x.java.isoontcp.netty.IsoOnTcpProtocol; import org.apache.plc4x.java.isotp.netty.IsoTPProtocol; import org.apache.plc4x.java.isotp.netty.model.tpdus.DisconnectRequestTpdu; diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java index 64d66df..4ee958a 100644 --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java @@ -33,6 +33,7 @@ import org.apache.plc4x.java.api.model.Address; import org.apache.plc4x.java.api.types.ResponseCode; import org.apache.plc4x.java.base.PlcMessageToMessageCodec; import org.apache.plc4x.java.base.events.ConnectedEvent; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.apache.plc4x.java.s7.model.S7Address; import org.apache.plc4x.java.s7.model.S7BitAddress; import org.apache.plc4x.java.s7.model.S7DataBlockAddress; diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java index f1e5eb7..4ab29c6 100644 --- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java +++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java @@ -20,10 +20,10 @@ package org.apache.plc4x.java.s7.netty; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcRequest; -import org.apache.plc4x.java.api.messages.PlcRequestContainer; import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.specific.TypeSafePlcReadRequest; import org.apache.plc4x.java.api.messages.specific.TypeSafePlcWriteRequest; +import org.apache.plc4x.java.base.messages.PlcRequestContainer; import org.apache.plc4x.java.netty.NettyTestBase; import org.apache.plc4x.java.s7.model.S7Address; import org.apache.plc4x.java.s7.model.S7BitAddress;