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
commit 339b220abf77211b6fa3ce5c8099c1a8c787f0dc Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Thu Mar 8 09:22:37 2018 +0100 renamed package netty to protocol --- .../java/ads/connection/ADSPlcConnection.java | 4 +-- .../java/ads/{netty => protocol}/ADSProtocol.java | 2 +- .../ads/{netty => protocol}/Plc4XADSProtocol.java | 36 +++++++++++----------- .../util/LittleEndianDecoder.java | 2 +- .../util/LittleEndianEncoder.java | 2 +- .../ads/{netty => protocol}/ADSProtocolTest.java | 2 +- .../{netty => protocol}/Plc4XADSProtocolTest.java | 2 +- .../plc4x/java/ads/netty/ADSProtocolBenchmark.java | 1 + 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSPlcConnection.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSPlcConnection.java index d25762a..7f770b3 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSPlcConnection.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/connection/ADSPlcConnection.java @@ -25,8 +25,8 @@ import io.netty.channel.ChannelPipeline; 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.model.ADSAddress; -import org.apache.plc4x.java.ads.netty.ADSProtocol; -import org.apache.plc4x.java.ads.netty.Plc4XADSProtocol; +import org.apache.plc4x.java.ads.protocol.ADSProtocol; +import org.apache.plc4x.java.ads.protocol.Plc4XADSProtocol; import org.apache.plc4x.java.api.connection.PlcReader; import org.apache.plc4x.java.api.connection.PlcWriter; import org.apache.plc4x.java.api.exceptions.PlcException; diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocol.java similarity index 99% rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocol.java rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocol.java index 70796b6..bf19722 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocol.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADSProtocol.java @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.ads.netty; +package org.apache.plc4x.java.ads.protocol; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocol.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4XADSProtocol.java similarity index 93% rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocol.java rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4XADSProtocol.java index a6f506b..1870b97 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocol.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/Plc4XADSProtocol.java @@ -1,22 +1,22 @@ /* -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.ads.netty; + 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.ads.protocol; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageCodec; @@ -52,8 +52,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; -import static org.apache.plc4x.java.ads.netty.util.LittleEndianDecoder.decodeData; -import static org.apache.plc4x.java.ads.netty.util.LittleEndianEncoder.encodeData; +import static org.apache.plc4x.java.ads.protocol.util.LittleEndianDecoder.decodeData; +import static org.apache.plc4x.java.ads.protocol.util.LittleEndianEncoder.encodeData; public class Plc4XADSProtocol extends MessageToMessageCodec<AMSTCPPacket, PlcRequestContainer<PlcRequest, PlcResponse>> { diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/util/LittleEndianDecoder.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java similarity index 99% rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/util/LittleEndianDecoder.java rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java index 00ad4ce..3362b15 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/util/LittleEndianDecoder.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianDecoder.java @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.ads.netty.util; +package org.apache.plc4x.java.ads.protocol.util; import org.apache.plc4x.java.ads.api.commands.types.TimeStamp; import org.apache.plc4x.java.api.exceptions.PlcProtocolException; diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/util/LittleEndianEncoder.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java similarity index 99% rename from plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/util/LittleEndianEncoder.java rename to plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java index 4f69687..f196e2e 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/netty/util/LittleEndianEncoder.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.ads.netty.util; +package org.apache.plc4x.java.ads.protocol.util; import org.apache.commons.lang3.ArrayUtils; import org.apache.plc4x.java.ads.api.commands.types.TimeStamp; diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADSProtocolTest.java similarity index 99% rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADSProtocolTest.java index 9d8cb26..0a7d3ca 100644 --- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADSProtocolTest.java @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.ads.netty; +package org.apache.plc4x.java.ads.protocol; import io.netty.buffer.ByteBuf; import org.apache.plc4x.java.ads.api.commands.*; diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4XADSProtocolTest.java similarity index 99% rename from plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java rename to plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4XADSProtocolTest.java index 6c37466..66abf0a 100644 --- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/Plc4XADSProtocolTest.java @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -package org.apache.plc4x.java.ads.netty; +package org.apache.plc4x.java.ads.protocol; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.plc4x.java.ads.api.commands.ADSReadResponse; diff --git a/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocolBenchmark.java b/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocolBenchmark.java index d296e6e..0be9a4f 100644 --- a/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocolBenchmark.java +++ b/plc4j/protocols/benchmarks/src/main/java/org/apache/plc4x/java/ads/netty/ADSProtocolBenchmark.java @@ -28,6 +28,7 @@ import org.apache.plc4x.java.ads.api.commands.types.*; 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.protocol.ADSProtocol; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; -- To stop receiving notification emails like this one, please contact sru...@apache.org.