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/01/05 14:59:56 UTC
[incubator-plc4x] branch refactoring/java_generify updated: moved
specific messages into a sub package to declutter the API
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch refactoring/java_generify
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/refactoring/java_generify by this push:
new 1c71c7b moved specific messages into a sub package to declutter the API
1c71c7b is described below
commit 1c71c7bc121fcb13a024d19f37d4959d4c614d4f
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Jan 5 15:59:50 2018 +0100
moved specific messages into a sub package to declutter the API
---
.../src/main/java/org/apache/plc4x/camel/PLC4XProducer.java | 4 ++--
.../src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java | 4 ++--
.../test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java | 4 ++++
.../src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java | 1 +
.../main/java/org/apache/plc4x/java/api/connection/PlcReader.java | 1 +
.../main/java/org/apache/plc4x/java/api/connection/PlcWriter.java | 1 +
.../java/org/apache/plc4x/java/api/messages/PlcReadRequest.java | 3 +++
.../java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java | 3 +++
.../plc4x/java/api/messages/{ => specific}/BulkPlcReadRequest.java | 3 ++-
.../plc4x/java/api/messages/{ => specific}/BulkPlcReadResponse.java | 4 +++-
.../plc4x/java/api/messages/{ => specific}/BulkPlcWriteRequest.java | 3 ++-
.../java/api/messages/{ => specific}/BulkPlcWriteResponse.java | 3 ++-
.../java/api/messages/{ => specific}/CheckedBulkPlcReadRequest.java | 2 +-
.../api/messages/{ => specific}/CheckedBulkPlcReadResponse.java | 3 ++-
.../api/messages/{ => specific}/CheckedBulkPlcWriteRequest.java | 2 +-
.../api/messages/{ => specific}/CheckedBulkPlcWriteResponse.java | 2 +-
.../java/api/messages/{ => specific}/SinglePlcReadRequest.java | 3 ++-
.../java/api/messages/{ => specific}/SinglePlcReadResponse.java | 3 ++-
.../java/api/messages/{ => specific}/SinglePlcWriteRequest.java | 3 ++-
.../java/api/messages/{ => specific}/SinglePlcWriteResponse.java | 3 ++-
.../main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java | 1 +
.../src/test/java/org/apache/plc4x/java/s7/S7PlcReaderSample.java | 6 ++----
.../s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java | 4 ++--
.../s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java | 4 ++--
.../src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java | 4 ++--
.../java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 2 ++
26 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java
index aca485c..4a2f91d 100644
--- a/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java
+++ b/integrations/apache-camel/src/main/java/org/apache/plc4x/camel/PLC4XProducer.java
@@ -25,8 +25,8 @@ import org.apache.camel.impl.DefaultAsyncProducer;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.messages.BulkPlcWriteRequest;
-import org.apache.plc4x.java.api.messages.SinglePlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.BulkPlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
import org.apache.plc4x.java.api.model.Address;
diff --git a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
index 4dc14fe..7c104df 100644
--- a/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
+++ b/integrations/apache-edgent/src/main/java/org/apache/plc4x/edgent/PlcConnectionAdapter.java
@@ -28,8 +28,8 @@ import org.apache.plc4x.java.api.connection.PlcReader;
import org.apache.plc4x.java.api.connection.PlcWriter;
import org.apache.plc4x.java.api.exceptions.PlcException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.SinglePlcReadRequest;
-import org.apache.plc4x.java.api.messages.SinglePlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
import org.apache.plc4x.java.api.model.Address;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
index c78e231..8b95451 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
@@ -29,6 +29,10 @@ import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadResponse;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteResponse;
import org.apache.plc4x.java.api.model.Address;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
index 2bd3ab2..1a5bb09 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java
@@ -30,6 +30,7 @@ import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
+import org.apache.plc4x.java.api.messages.specific.*;
import org.apache.plc4x.java.api.model.Address;
import org.apache.plc4x.java.api.types.ResponseCode;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
index 00ec5be..dc28e25 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcReader.java
@@ -19,6 +19,7 @@ under the License.
package org.apache.plc4x.java.api.connection;
import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.messages.specific.*;
import java.util.concurrent.CompletableFuture;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
index 12e2e61..a530885 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/connection/PlcWriter.java
@@ -20,6 +20,7 @@ package org.apache.plc4x.java.api.connection;
import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.messages.specific.*;
import java.util.concurrent.CompletableFuture;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
index 1d9f37a..e712c04 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcReadRequest.java
@@ -19,6 +19,9 @@ under the License.
package org.apache.plc4x.java.api.messages;
import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
+import org.apache.plc4x.java.api.messages.specific.BulkPlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.CheckedBulkPlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
import org.apache.plc4x.java.api.model.Address;
import java.util.LinkedList;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
index aa4eced..7d8a9e9 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcWriteRequest.java
@@ -19,6 +19,9 @@ under the License.
package org.apache.plc4x.java.api.messages;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
+import org.apache.plc4x.java.api.messages.specific.BulkPlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.CheckedBulkPlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
import org.apache.plc4x.java.api.model.Address;
import java.util.LinkedList;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadRequest.java
similarity index 93%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadRequest.java
index b0466a0..a16a3ae 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadRequest.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.model.Address;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadResponse.java
similarity index 89%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadResponse.java
index 209ae5e..44de427 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcReadResponse.java
@@ -16,8 +16,10 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
import java.util.List;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcWriteRequest.java
similarity index 94%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcWriteRequest.java
index c2a4a4d..610e072 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcWriteRequest.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
import org.apache.plc4x.java.api.model.Address;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcWriteResponse.java
similarity index 92%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcWriteResponse.java
index 25f2a71..873fffd 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/BulkPlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/BulkPlcWriteResponse.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
import java.util.List;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcReadRequest.java
similarity index 97%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcReadRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcReadRequest.java
index 72ec1a0..a56c78c 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcReadRequest.java
@@ -16,7 +16,7 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.model.Address;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcReadResponse.java
similarity index 92%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcReadResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcReadResponse.java
index ff9976d..8dc9fd2 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcReadResponse.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
import java.util.List;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcWriteRequest.java
similarity index 97%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcWriteRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcWriteRequest.java
index e51e225..550b985 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcWriteRequest.java
@@ -16,7 +16,7 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
import org.apache.plc4x.java.api.model.Address;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcWriteResponse.java
similarity index 96%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcWriteResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcWriteResponse.java
index c76175b..e1f36e4 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/CheckedBulkPlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/CheckedBulkPlcWriteResponse.java
@@ -16,7 +16,7 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcReadRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadRequest.java
similarity index 95%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcReadRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadRequest.java
index c477fcd..3abfba7 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcReadRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadRequest.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.model.Address;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcReadResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadResponse.java
similarity index 93%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcReadResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadResponse.java
index 7776cd7..1161e47 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcReadResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcReadResponse.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
import java.util.Collections;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteRequest.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteRequest.java
similarity index 95%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteRequest.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteRequest.java
index 83fc439..34e323c 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteRequest.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteRequest.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
import org.apache.plc4x.java.api.model.Address;
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteResponse.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteResponse.java
similarity index 93%
rename from plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteResponse.java
rename to plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteResponse.java
index 7caeb0d..6c2c498 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/SinglePlcWriteResponse.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/SinglePlcWriteResponse.java
@@ -16,8 +16,9 @@ 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;
+package org.apache.plc4x.java.api.messages.specific;
+import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
import java.util.Collections;
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 0118cc0..3ff2e63 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
@@ -27,6 +27,7 @@ import org.apache.plc4x.java.api.messages.items.ReadRequestItem;
import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
import org.apache.plc4x.java.api.messages.items.WriteRequestItem;
import org.apache.plc4x.java.api.messages.items.WriteResponseItem;
+import org.apache.plc4x.java.api.messages.specific.*;
import org.apache.plc4x.java.api.model.Address;
import org.apache.plc4x.java.api.types.ResponseCode;
import org.apache.plc4x.java.s7.model.S7Address;
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcReaderSample.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcReaderSample.java
index ea7ecae..650cbcd 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcReaderSample.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcReaderSample.java
@@ -21,14 +21,12 @@ package org.apache.plc4x.java.s7;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.messages.SinglePlcReadRequest;
-import org.apache.plc4x.java.api.messages.SinglePlcReadResponse;
-import org.apache.plc4x.java.api.messages.items.ReadResponseItem;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadResponse;
import org.apache.plc4x.java.api.model.Address;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
import java.util.Optional;
public class S7PlcReaderSample {
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java
index 9ee6eb4..df6d270 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcScanner.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.java.s7;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.messages.SinglePlcReadRequest;
-import org.apache.plc4x.java.api.messages.SinglePlcReadResponse;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadResponse;
import org.apache.plc4x.java.api.model.Address;
import org.apache.plc4x.java.s7.netty.model.types.MemoryArea;
import org.slf4j.Logger;
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java
index 3f21163..52465b7 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcTestConsole.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.java.s7;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcReader;
-import org.apache.plc4x.java.api.messages.SinglePlcReadRequest;
-import org.apache.plc4x.java.api.messages.SinglePlcReadResponse;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadResponse;
import org.apache.plc4x.java.api.model.Address;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java
index 707c2ed..4ed5077 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/S7PlcWriterSample.java
@@ -21,8 +21,8 @@ package org.apache.plc4x.java.s7;
import org.apache.plc4x.java.PlcDriverManager;
import org.apache.plc4x.java.api.connection.PlcConnection;
import org.apache.plc4x.java.api.connection.PlcWriter;
-import org.apache.plc4x.java.api.messages.SinglePlcWriteRequest;
-import org.apache.plc4x.java.api.messages.SinglePlcWriteResponse;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteResponse;
import org.apache.plc4x.java.api.model.Address;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 1fcdd36..fe9a6ce 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
@@ -19,6 +19,8 @@ under the License.
package org.apache.plc4x.java.s7.netty;
import org.apache.plc4x.java.api.messages.*;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcReadRequest;
+import org.apache.plc4x.java.api.messages.specific.SinglePlcWriteRequest;
import org.apache.plc4x.java.netty.NettyTestBase;
import org.apache.plc4x.java.s7.model.S7Address;
import org.apache.plc4x.java.s7.model.S7BitAddress;
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].