This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 972188f8ce7d39dfd17bb0b78e1517d9cfd2ffbe Merge: 8076766 7031908 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Wed Jan 16 21:48:32 2019 +0100 - Resolved merge conflicts.. .../org/apache/plc4x/java/s7/model/S7Field.java | 54 ++++++++++++++++++---- .../model/params/items/S7AnyVarParameterItem.java | 12 ++--- .../strategies/DefaultS7MessageProcessor.java | 12 ++--- .../java/org/apache/plc4x/java/issues/PLC4X56.java | 42 ++++++++++++++++- .../src/test/resources/example_with_strings.yml | 14 +++--- 5 files changed, 103 insertions(+), 31 deletions(-) diff --cc plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/S7AnyVarParameterItem.java index b1849f8,e9bc87c..876c82c --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/S7AnyVarParameterItem.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/params/items/S7AnyVarParameterItem.java @@@ -20,8 -20,8 +20,8 @@@ package org.apache.plc4x.java.s7.netty. import org.apache.plc4x.java.s7.netty.model.types.MemoryArea; import org.apache.plc4x.java.s7.netty.model.types.SpecificationType; --import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode; import org.apache.plc4x.java.s7.netty.model.types.TransportSize; ++import org.apache.plc4x.java.s7.netty.model.types.VariableAddressingMode; /** * "Low-level" description of S7 Address range and the necessary size for transportation of values. diff --cc plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/issues/PLC4X56.java index d5de122,15d7a42..bc60896 --- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/issues/PLC4X56.java +++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/issues/PLC4X56.java @@@ -22,7 -23,10 +23,8 @@@ import org.apache.plc4x.java.api.except import org.apache.plc4x.java.s7.model.S7Field; import org.apache.plc4x.java.s7.netty.model.types.MemoryArea; import org.apache.plc4x.java.s7.netty.model.types.TransportSize; + import org.junit.Assert; -import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.ExpectedException; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.Assert.assertThat;