This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 554c3033bd9b87f7eacb7f696bac1379ae439884 Author: Andrey Skorikov <andrey.skori...@codecentric.de> AuthorDate: Thu Oct 4 19:37:11 2018 +0200 moved reader,writer,subscriber to driver-base module --- .../plc4x/java/examples/dummydriver/connection/DummyConnection.java | 4 ++-- .../src/test/java/org/apache/plc4x/camel/MockDriver.java | 2 +- .../src/test/java/org/apache/plc4x/edgent/mock/MockConnection.java | 4 ++-- .../apache/plc4x/java/ads/connection/AdsAbstractPlcConnection.java | 6 +++--- .../org/apache/plc4x/java/ads/connection/AdsTcpPlcConnection.java | 2 +- .../org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java | 1 - .../plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java | 1 - .../plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java | 1 - .../org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java | 1 - .../org/apache/plc4x/java/base/messages}/PlcProprietarySender.java | 2 +- .../main/java/org/apache/plc4x/java/base/messages}/PlcReader.java | 2 +- .../java/org/apache/plc4x/java/base/messages}/PlcSubscriber.java | 2 +- .../main/java/org/apache/plc4x/java/base/messages}/PlcWriter.java | 2 +- .../plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java | 4 ++-- .../java/base/protocol/SingleItemToSingleRequestProtocolTest.java | 6 +++--- .../java/ethernetip/connection/BaseEtherNetIpPlcConnection.java | 4 ++-- .../plc4x/java/modbus/connection/BaseModbusPlcConnection.java | 4 ++-- .../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 4 ++-- .../src/main/java/org/apache/plc4x/java/test/TestConnection.java | 4 ++-- 19 files changed, 26 insertions(+), 30 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 947971f..c5721ca 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 @@ -21,8 +21,8 @@ package org.apache.plc4x.java.examples.dummydriver.connection; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelInitializer; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.messages.*; import org.apache.plc4x.java.base.connection.AbstractPlcConnection; import org.apache.plc4x.java.base.connection.TcpSocketChannelFactory; diff --git a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java index fe0c6d2..a34f93d 100644 --- a/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java +++ b/integrations/apache-camel/src/test/java/org/apache/plc4x/camel/MockDriver.java @@ -21,7 +21,7 @@ package org.apache.plc4x.camel; import org.apache.plc4x.java.spi.PlcDriver; import org.apache.plc4x.java.api.authentication.PlcAuthentication; import org.apache.plc4x.java.api.PlcConnection; -import org.apache.plc4x.java.spi.PlcSubscriber; +import org.apache.plc4x.java.base.messages.PlcSubscriber; import org.apache.plc4x.java.api.messages.*; import org.apache.plc4x.java.base.messages.DefaultPlcSubscriptionResponse; import org.apache.plc4x.java.base.messages.InternalPlcSubscriptionRequest; 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 fdc8df6..383d3c6 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 @@ -21,8 +21,8 @@ package org.apache.plc4x.edgent.mock; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.plc4x.java.api.authentication.PlcAuthentication; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.exceptions.PlcIoException; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; 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 aa8e471..5ac73ef 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 @@ -31,9 +31,9 @@ import org.apache.plc4x.java.ads.api.generic.types.Invoke; import org.apache.plc4x.java.ads.model.AdsPlcFieldHandler; import org.apache.plc4x.java.ads.model.DirectAdsField; import org.apache.plc4x.java.ads.model.SymbolicAdsField; -import org.apache.plc4x.java.spi.PlcProprietarySender; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcProprietarySender; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.exceptions.PlcConnectionException; import org.apache.plc4x.java.api.exceptions.PlcRuntimeException; import org.apache.plc4x.java.api.messages.*; 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 3736e8c..406557f 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 @@ -32,7 +32,7 @@ import org.apache.plc4x.java.ads.model.*; import org.apache.plc4x.java.ads.protocol.Ads2PayloadProtocol; import org.apache.plc4x.java.ads.protocol.Payload2TcpProtocol; import org.apache.plc4x.java.ads.protocol.Plc4x2AdsProtocol; -import org.apache.plc4x.java.spi.PlcSubscriber; +import org.apache.plc4x.java.base.messages.PlcSubscriber; import org.apache.plc4x.java.api.exceptions.PlcConnectionException; import org.apache.plc4x.java.api.exceptions.PlcNotImplementedException; import org.apache.plc4x.java.api.exceptions.PlcRuntimeException; diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java index c37833e..b08fd85 100644 --- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadRequest.java @@ -19,7 +19,6 @@ under the License. package org.apache.plc4x.java.base.messages; import org.apache.commons.lang3.tuple.Pair; -import org.apache.plc4x.java.spi.PlcReader; import org.apache.plc4x.java.api.exceptions.PlcRuntimeException; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java index 9ae9992..815b46e 100644 --- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcSubscriptionRequest.java @@ -20,7 +20,6 @@ package org.apache.plc4x.java.base.messages; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.apache.plc4x.java.spi.PlcSubscriber; import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; import org.apache.plc4x.java.api.model.PlcField; diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java index d868d07..3e13d57 100644 --- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcUnsubscriptionRequest.java @@ -19,7 +19,6 @@ package org.apache.plc4x.java.base.messages; import org.apache.commons.lang3.tuple.Pair; -import org.apache.plc4x.java.spi.PlcSubscriber; import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest; import org.apache.plc4x.java.api.messages.PlcUnsubscriptionResponse; import org.apache.plc4x.java.api.model.PlcField; diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java index 710b17a..6330300 100644 --- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java @@ -21,7 +21,6 @@ package org.apache.plc4x.java.base.messages; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; -import org.apache.plc4x.java.spi.PlcWriter; import org.apache.plc4x.java.api.exceptions.PlcRuntimeException; import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.PlcWriteResponse; diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java similarity index 96% rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java index 204a2b6..249146e 100644 --- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcProprietarySender.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcProprietarySender.java @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.spi; +package org.apache.plc4x.java.base.messages; import org.apache.plc4x.java.api.messages.PlcProprietaryRequest; import org.apache.plc4x.java.api.messages.PlcProprietaryResponse; diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java similarity index 96% rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.java index 4febbb7..c403ca1 100644 --- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcReader.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcReader.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.spi; +package org.apache.plc4x.java.base.messages; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java similarity index 98% rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java index 89fc0aa..577a774 100644 --- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcSubscriber.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcSubscriber.java @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.spi; +package org.apache.plc4x.java.base.messages; import org.apache.plc4x.java.api.messages.*; import org.apache.plc4x.java.api.model.PlcConsumerRegistration; diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java similarity index 96% rename from plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.java index b8e11bb..13a83f4 100644 --- a/plc4j/api/src/main/java/org/apache/plc4x/java/spi/PlcWriter.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/PlcWriter.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.spi; +package org.apache.plc4x.java.base.messages; import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.PlcWriteResponse; diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java index 91d914e..bc19ad2 100644 --- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java +++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocol.java @@ -25,8 +25,8 @@ import io.netty.util.concurrent.Future; import io.netty.util.concurrent.PromiseCombiner; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.exceptions.PlcProtocolException; import org.apache.plc4x.java.api.exceptions.PlcTimeoutException; import org.apache.plc4x.java.api.model.PlcField; diff --git a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java index 2133370..5a9ac98 100644 --- a/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java +++ b/plc4j/protocols/driver-bases/base/src/test/java/org/apache/plc4x/java/base/protocol/SingleItemToSingleRequestProtocolTest.java @@ -25,9 +25,9 @@ import io.netty.channel.PendingWriteQueue; import io.netty.util.HashedWheelTimer; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.tuple.Pair; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcSubscriber; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcSubscriber; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.messages.PlcFieldRequest; import org.apache.plc4x.java.api.model.PlcField; import org.apache.plc4x.java.api.types.PlcResponseCode; diff --git a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java index 34dac5d..80dd054 100644 --- a/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java +++ b/plc4j/protocols/ethernetip/src/main/java/org/apache/plc4x/java/ethernetip/connection/BaseEtherNetIpPlcConnection.java @@ -19,8 +19,8 @@ under the License. package org.apache.plc4x.java.ethernetip.connection; import org.apache.commons.lang3.StringUtils; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; import org.apache.plc4x.java.api.messages.PlcWriteRequest; 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 15dfea3..2f983e7 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 @@ -19,8 +19,8 @@ under the License. package org.apache.plc4x.java.modbus.connection; import org.apache.commons.lang3.StringUtils; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.messages.*; import org.apache.plc4x.java.base.connection.AbstractPlcConnection; import org.apache.plc4x.java.base.connection.ChannelFactory; 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 ab46f3e..037beea 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 @@ -22,8 +22,8 @@ import io.netty.channel.*; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.SystemConfiguration; import org.apache.commons.lang3.StringUtils; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.exceptions.PlcConnectionException; import org.apache.plc4x.java.api.messages.*; import org.apache.plc4x.java.base.connection.AbstractPlcConnection; diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java index c4a3ab6..32da5e9 100644 --- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java +++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestConnection.java @@ -21,8 +21,8 @@ package org.apache.plc4x.java.test; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.plc4x.java.api.PlcConnection; -import org.apache.plc4x.java.spi.PlcReader; -import org.apache.plc4x.java.spi.PlcWriter; +import org.apache.plc4x.java.base.messages.PlcReader; +import org.apache.plc4x.java.base.messages.PlcWriter; import org.apache.plc4x.java.api.messages.*; import org.apache.plc4x.java.api.types.PlcResponseCode; import org.apache.plc4x.java.base.messages.*;