This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 181d976470 chore(plc4j/opm): port to restructured SPI and re-enable
module
181d976470 is described below
commit 181d976470b6564067607b7f859255ee4f26107d
Author: Sebastian Rühl <[email protected]>
AuthorDate: Fri Jul 10 09:11:23 2026 +0200
chore(plc4j/opm): port to restructured SPI and re-enable module
The opm module was parked in the plc4j-tools reactor by the SPI
restructuring (372501287d). The main sources were unaffected; only the
tests referenced classes at their old SPI locations, resolved through
the obsolete monolithic plc4j-spi test dependency:
- spi.messages.utils.(Default)PlcResponseItem
-> spi.drivers.messages.items.(Default)PlcResponseItem
- spi.messages.DefaultPlcRead/WriteRequest/Response
-> spi.drivers.messages.*
- spi.messages.PlcReader/PlcWriter -> spi.drivers.functions.*
- spi.connection.PlcTagHandler -> spi.drivers.tags.PlcTagHandler
Replace the plc4j-spi test dependency with plc4j-spi-drivers and
plc4j-spi-values, update the imports, and re-enable the module in the
reactor. All 40 tests pass (6 skips are pre-existing @Disabled).
scraper-ng stays disabled: it is an empty skeleton (no sources, its
dependencies commented out and still referencing 0.12.0-era artifacts
like plc4j-connection-pool), so there is nothing to port yet.
---
plc4j/tools/opm/pom.xml | 8 +++++++-
.../org/apache/plc4x/java/opm/ConnectedEntityTest.java | 2 +-
.../plc4x/java/opm/PlcEntityInterceptorTest.java | 4 ++--
.../plc4x/java/opm/PlcEntityManagerComplexTest.java | 18 +++++++++---------
.../apache/plc4x/java/opm/PlcEntityManagerTest.java | 2 +-
.../java/opm/issues/i1935/Plc4jMockConnectionTest.java | 2 +-
plc4j/tools/pom.xml | 2 +-
7 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/plc4j/tools/opm/pom.xml b/plc4j/tools/opm/pom.xml
index 03dbedca85..0b5e669ea5 100644
--- a/plc4j/tools/opm/pom.xml
+++ b/plc4j/tools/opm/pom.xml
@@ -61,7 +61,13 @@
<!--Testing-->
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
+ <artifactId>plc4j-spi-drivers</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi-values</artifactId>
<version>0.14.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
index 2cd2f8d251..b87b662f04 100644
---
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
+++
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/ConnectedEntityTest.java
@@ -20,7 +20,7 @@ package org.apache.plc4x.java.opm;
import org.apache.plc4x.java.DefaultPlcDriverManager;
import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.spi.messages.utils.DefaultPlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.items.DefaultPlcResponseItem;
import org.apache.plc4x.java.spi.values.PlcSTRING;
import org.apache.plc4x.java.mock.connection.MockConnection;
import org.apache.plc4x.java.mock.connection.MockDevice;
diff --git
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java
index 063686dbd4..4e3af751a3 100644
---
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java
+++
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityInterceptorTest.java
@@ -25,8 +25,8 @@ import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.mock.connection.MockConnection;
import org.apache.plc4x.java.mock.connection.MockDevice;
-import org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse;
-import org.apache.plc4x.java.spi.messages.utils.DefaultPlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcReadResponse;
+import org.apache.plc4x.java.spi.drivers.messages.items.DefaultPlcResponseItem;
import org.assertj.core.api.WithAssertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
diff --git
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
index 1548efb18a..072e09021d 100644
---
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
+++
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerComplexTest.java
@@ -30,15 +30,15 @@ import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.api.types.PlcValueType;
import org.apache.plc4x.java.api.value.*;
import org.apache.plc4x.java.mock.tag.MockTag;
-import org.apache.plc4x.java.spi.connection.PlcTagHandler;
-import org.apache.plc4x.java.spi.messages.DefaultPlcReadRequest;
-import org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse;
-import org.apache.plc4x.java.spi.messages.DefaultPlcWriteRequest;
-import org.apache.plc4x.java.spi.messages.DefaultPlcWriteResponse;
-import org.apache.plc4x.java.spi.messages.PlcReader;
-import org.apache.plc4x.java.spi.messages.PlcWriter;
-import org.apache.plc4x.java.spi.messages.utils.DefaultPlcResponseItem;
-import org.apache.plc4x.java.spi.messages.utils.PlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.tags.PlcTagHandler;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcReadRequest;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcReadResponse;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcWriteRequest;
+import org.apache.plc4x.java.spi.drivers.messages.DefaultPlcWriteResponse;
+import org.apache.plc4x.java.spi.drivers.functions.PlcReader;
+import org.apache.plc4x.java.spi.drivers.functions.PlcWriter;
+import org.apache.plc4x.java.spi.drivers.messages.items.DefaultPlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.items.PlcResponseItem;
import org.apache.plc4x.java.spi.values.DefaultPlcValueHandler;
import org.apache.plc4x.java.spi.values.PlcDINT;
import org.apache.plc4x.java.spi.values.PlcLINT;
diff --git
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
index efa9d21097..009222c930 100644
---
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
+++
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/PlcEntityManagerTest.java
@@ -23,7 +23,7 @@ import org.apache.plc4x.java.DefaultPlcDriverManager;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException;
import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.spi.messages.utils.DefaultPlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.items.DefaultPlcResponseItem;
import org.apache.plc4x.java.spi.values.PlcSTRING;
import org.apache.plc4x.java.mock.connection.MockConnection;
import org.apache.plc4x.java.mock.connection.MockDevice;
diff --git
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/issues/i1935/Plc4jMockConnectionTest.java
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/issues/i1935/Plc4jMockConnectionTest.java
index 93f559b073..a0ddc8a5c7 100644
---
a/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/issues/i1935/Plc4jMockConnectionTest.java
+++
b/plc4j/tools/opm/src/test/java/org/apache/plc4x/java/opm/issues/i1935/Plc4jMockConnectionTest.java
@@ -24,7 +24,7 @@ import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.mock.connection.MockConnection;
import org.apache.plc4x.java.mock.connection.MockDevice;
import org.apache.plc4x.java.opm.PlcEntityManager;
-import org.apache.plc4x.java.spi.messages.utils.DefaultPlcResponseItem;
+import org.apache.plc4x.java.spi.drivers.messages.items.DefaultPlcResponseItem;
import org.apache.plc4x.java.spi.values.PlcSTRING;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/plc4j/tools/pom.xml b/plc4j/tools/pom.xml
index 3afe91bd53..f64bbd925f 100644
--- a/plc4j/tools/pom.xml
+++ b/plc4j/tools/pom.xml
@@ -38,8 +38,8 @@
<subprojects>
<subproject>capture-replay</subproject>
<subproject>connection-cache</subproject>
+ <subproject>opm</subproject>
<subproject>scraper</subproject>
- <!--subproject>opm</subproject-->
<!--subproject>scraper-ng</subproject-->
</subprojects>
