From d3eff010ba0df1e2de9be1c5bb2538d85c6aabfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20R=C3=BChl?= Date: Fri, 30 Aug 2024 12:15:14 +0200 Subject: [PATCH] fix(code-gen/java): fix interface name collision --- .../java/org/apache/plc4x/java/spi/codegen/io/DataReader.java | 2 +- .../spi/codegen/io/{PositionAware.java => PositionMover.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/{PositionAware.java => PositionMover.java} (96%) diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataReader.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataReader.java index 6a0e1ec7b06..b714223813f 100644 --- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataReader.java +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataReader.java @@ -22,7 +22,7 @@ import org.apache.plc4x.java.spi.generation.ReadBuffer; import org.apache.plc4x.java.spi.generation.WithReaderArgs; -public interface DataReader extends ByteOrderAware, PositionAware, ContextReader { +public interface DataReader extends ByteOrderAware, PositionMover, ContextReader { T read(String logicalName, WithReaderArgs... readerArgs) throws ParseException; diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/PositionAware.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/PositionMover.java similarity index 96% rename from plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/PositionAware.java rename to plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/PositionMover.java index 3b7902598be..2b3a470a0bc 100644 --- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/PositionAware.java +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/PositionMover.java @@ -19,7 +19,7 @@ package org.apache.plc4x.java.spi.codegen.io; -public interface PositionAware { +public interface PositionMover { int getPos(); void setPos(int position);