This is an automated email from the ASF dual-hosted git repository. jfeinauer pushed a commit to branch add-simple-mock-driver in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 983ea6d9b582d4824bb9ecf454a59fb0de92e730 Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Sun Oct 28 16:11:19 2018 +0100 - Fixing sonar issues --- .../plc4x/java/ads/model/AdsPlcFieldHandler.java | 18 ++-- .../plc4x/java/s7/connection/S7PlcConnection.java | 18 ++-- .../org/apache/plc4x/java/s7/model/S7Field.java | 120 +++++++++++---------- .../plc4x/java/s7/netty/Plc4XS7Protocol.java | 10 +- .../strategies/DefaultS7MessageProcessor.java | 5 +- .../s7/netty/strategies/S7MessageProcessor.java | 2 +- .../java/s7/netty/util/S7PlcFieldHandler.java | 24 ++--- .../strategies/DefaultS7MessageProcessorTest.java | 25 +++-- 8 files changed, 114 insertions(+), 108 deletions(-) diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java index cbd6ca8..50bf217 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/model/AdsPlcFieldHandler.java @@ -26,7 +26,7 @@ import org.apache.plc4x.java.base.messages.items.*; import java.math.BigDecimal; import java.math.BigInteger; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -911,9 +911,9 @@ public class AdsPlcFieldHandler extends DefaultPlcFieldHandler { Byte byteValue = (Byte) value; byte[] stringBytes = new byte[]{byteValue}; if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else if (value instanceof Short) { Short shortValue = (Short) value; @@ -921,9 +921,9 @@ public class AdsPlcFieldHandler extends DefaultPlcFieldHandler { stringBytes[0] = (byte) (shortValue >> 8); stringBytes[1] = (byte) (shortValue & 0xFF); if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else if (value instanceof Integer) { Integer integerValue = (Integer) value; @@ -933,9 +933,9 @@ public class AdsPlcFieldHandler extends DefaultPlcFieldHandler { stringBytes[2] = (byte) ((integerValue >> 8) & 0xFF); stringBytes[3] = (byte) (integerValue & 0xFF); if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else if (value instanceof Long) { Long longValue = (Long) value; @@ -949,9 +949,9 @@ public class AdsPlcFieldHandler extends DefaultPlcFieldHandler { stringBytes[6] = (byte) ((longValue >> 8) & 0xFF); stringBytes[7] = (byte) (longValue & 0xFF); if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else { throw new IllegalArgumentException( 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 ab23437..2f121de 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 @@ -103,9 +103,9 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader, this.rack = rack; this.slot = slot; - int paramPduSize = 1024; - short paramMaxAmqCaller = 8; - short paramMaxAmqCallee = 8; + int curParamPduSize = 1024; + short curParamMaxAmqCaller = 8; + short curParamMaxAmqCallee = 8; if (!StringUtils.isEmpty(params)) { for (String param : params.split("&")) { @@ -115,13 +115,13 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader, String paramValue = paramElements[1]; switch (paramName) { case "pdu-size": - paramPduSize = Integer.parseInt(paramValue); + curParamPduSize = Integer.parseInt(paramValue); break; case "max-amq-caller": - paramMaxAmqCaller = Short.parseShort(paramValue); + curParamMaxAmqCaller = Short.parseShort(paramValue); break; case "max-amq-callee": - paramMaxAmqCallee = Short.parseShort(paramValue); + curParamMaxAmqCallee = Short.parseShort(paramValue); break; default: logger.debug("Unknown parameter {} with value {}", paramName, paramValue); @@ -134,9 +134,9 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader, // IsoTP uses pre defined sizes. Find the smallest box, // that would be able to contain the requested pdu size. - this.paramPduSize = TpduSize.valueForGivenSize(paramPduSize); - this.paramMaxAmqCaller = paramMaxAmqCaller; - this.paramMaxAmqCallee = paramMaxAmqCallee; + this.paramPduSize = TpduSize.valueForGivenSize(curParamPduSize); + this.paramMaxAmqCaller = curParamMaxAmqCaller; + this.paramMaxAmqCallee = curParamMaxAmqCallee; } @Override diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java index 303c449..c82ba2a 100644 --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/model/S7Field.java @@ -29,64 +29,17 @@ import java.util.regex.Pattern; public class S7Field implements PlcField { private static final Pattern ADDRESS_PATTERN = - Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,4})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-z,A-Z,_]+)(\\[(?<numElements>\\d+)])?"); + Pattern.compile("^%(?<memoryArea>.)(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,4})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_]+)(\\[(?<numElements>\\d+)])?"); private static final Pattern DATA_BLOCK_ADDRESS_PATTERN = - Pattern.compile("^%DB(?<blockNumber>\\d{1,4}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,4})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-z,A-Z,_]+)(\\[(?<numElements>\\d+)])?"); + Pattern.compile("^%DB(?<blockNumber>\\d{1,4}).DB(?<transferSizeCode>[XBWD]?)(?<byteOffset>\\d{1,4})(.(?<bitOffset>[0-7]))?:(?<dataType>[a-zA-Z_]+)(\\[(?<numElements>\\d+)])?"); - public static boolean matches(String fieldString) { - return DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString).matches() || - ADDRESS_PATTERN.matcher(fieldString).matches(); - } - - public static S7Field of(String fieldString) throws PlcInvalidFieldException { - Matcher matcher = DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString); - if(matcher.matches()) { - TransportSize dataType = TransportSize.valueOf(matcher.group("dataType")); - MemoryArea memoryArea = MemoryArea.DATA_BLOCKS; - String transferSizeCode = matcher.group("transferSizeCode"); - short blockNumber = Short.parseShort(matcher.group("blockNumber")); - short byteOffset = Short.parseShort(matcher.group("byteOffset")); - short bitOffset = 0; - if(matcher.group("bitOffset") != null) { - bitOffset = Short.parseShort(matcher.group("bitOffset")); - } else if(dataType == TransportSize.BOOL) { - throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters."); - } - int numElements = 1; - if(matcher.group("numElements") != null) { - numElements = Integer.parseInt(matcher.group("numElements")); - } - if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) { - throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode + - "' doesn't match specified data type '" + dataType.name() + "'"); - } - return new S7Field(dataType, memoryArea, blockNumber, byteOffset, bitOffset, numElements); - } else { - matcher = ADDRESS_PATTERN.matcher(fieldString); - if (matcher.matches()) { - TransportSize dataType = TransportSize.valueOf(matcher.group("dataType")); - MemoryArea memoryArea = MemoryArea.valueOfShortName(matcher.group("memoryArea")); - String transferSizeCode = matcher.group("transferSizeCode"); - short byteOffset = Short.parseShort(matcher.group("byteOffset")); - short bitOffset = 0; - if(matcher.group("bitOffset") != null) { - bitOffset = Short.parseShort(matcher.group("bitOffset")); - } else if(dataType == TransportSize.BOOL) { - throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters."); - } - int numElements = 1; - if(matcher.group("numElements") != null) { - numElements = Integer.parseInt(matcher.group("numElements")); - } - if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) { - throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode + - "' doesn't match specified data type '" + dataType.name() + "'"); - } - return new S7Field(dataType, memoryArea, (short) 0, byteOffset, bitOffset, numElements); - } - } - throw new PlcInvalidFieldException("Unable to parse address: " + fieldString); - } + private static final String DATA_TYPE = "dataType"; + private static final String TRANSFER_SIZE_CODE = "transferSizeCode"; + private static final String BLOCK_NUMBER = "blockNumber"; + private static final String BYTE_OFFSET = "byteOffset"; + private static final String BIT_OFFSET = "bitOffset"; + private static final String NUM_ELEMENTS = "numElements"; + private static final String MEMORY_AREA = "memoryArea"; private final TransportSize dataType; private final MemoryArea memoryArea; @@ -128,4 +81,59 @@ public class S7Field implements PlcField { return numElements; } + public static boolean matches(String fieldString) { + return DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString).matches() || + ADDRESS_PATTERN.matcher(fieldString).matches(); + } + + public static S7Field of(String fieldString) { + Matcher matcher = DATA_BLOCK_ADDRESS_PATTERN.matcher(fieldString); + if(matcher.matches()) { + TransportSize dataType = TransportSize.valueOf(matcher.group(DATA_TYPE)); + MemoryArea memoryArea = MemoryArea.DATA_BLOCKS; + String transferSizeCode = matcher.group(TRANSFER_SIZE_CODE); + short blockNumber = Short.parseShort(matcher.group(BLOCK_NUMBER)); + short byteOffset = Short.parseShort(matcher.group(BYTE_OFFSET)); + short bitOffset = 0; + if(matcher.group(BIT_OFFSET) != null) { + bitOffset = Short.parseShort(matcher.group(BIT_OFFSET)); + } else if(dataType == TransportSize.BOOL) { + throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters."); + } + int numElements = 1; + if(matcher.group(NUM_ELEMENTS) != null) { + numElements = Integer.parseInt(matcher.group(NUM_ELEMENTS)); + } + if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) { + throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode + + "' doesn't match specified data type '" + dataType.name() + "'"); + } + return new S7Field(dataType, memoryArea, blockNumber, byteOffset, bitOffset, numElements); + } else { + matcher = ADDRESS_PATTERN.matcher(fieldString); + if (matcher.matches()) { + TransportSize dataType = TransportSize.valueOf(matcher.group(DATA_TYPE)); + MemoryArea memoryArea = MemoryArea.valueOfShortName(matcher.group(MEMORY_AREA)); + String transferSizeCode = matcher.group(TRANSFER_SIZE_CODE); + short byteOffset = Short.parseShort(matcher.group(BYTE_OFFSET)); + short bitOffset = 0; + if(matcher.group(BIT_OFFSET) != null) { + bitOffset = Short.parseShort(matcher.group(BIT_OFFSET)); + } else if(dataType == TransportSize.BOOL) { + throw new PlcInvalidFieldException("Expected bit offset for BOOL parameters."); + } + int numElements = 1; + if(matcher.group(NUM_ELEMENTS) != null) { + numElements = Integer.parseInt(matcher.group(NUM_ELEMENTS)); + } + if(!transferSizeCode.isEmpty() && !dataType.getSizeCode().equals(transferSizeCode)) { + throw new PlcInvalidFieldException("Transfer size code '" + transferSizeCode + + "' doesn't match specified data type '" + dataType.name() + "'"); + } + return new S7Field(dataType, memoryArea, (short) 0, byteOffset, bitOffset, numElements); + } + } + throw new PlcInvalidFieldException("Unable to parse address: " + fieldString); + } + } diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java index 022c30b..445bbc1 100644 --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java @@ -51,7 +51,7 @@ import java.io.IOException; import java.lang.reflect.Array; import java.math.BigInteger; import java.nio.ByteBuffer; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; @@ -538,13 +538,13 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ // ----------------------------------------- case CHAR: { // 1 byte (8 bit) // TODO: Double check, if this is ok? - String stringValue = data.readCharSequence(1, Charset.forName("UTF-8")).toString(); + String stringValue = data.readCharSequence(1, StandardCharsets.UTF_8).toString(); fieldItem = new DefaultStringFieldItem(stringValue); break; } case WCHAR: { // 2 byte // TODO: Double check, if this is ok? Alternatives: BMP, UCS2 - String stringValue = data.readCharSequence(2, Charset.forName("UTF-16")).toString(); + String stringValue = data.readCharSequence(2, StandardCharsets.UTF_16).toString(); fieldItem = new DefaultStringFieldItem(stringValue); break; } @@ -553,7 +553,7 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ data.readByte(); byte actualLength = data.readByte(); // TODO: Double check, if this is ok? - String stringValue = data.readCharSequence(actualLength, Charset.forName("UTF-8")).toString(); + String stringValue = data.readCharSequence(actualLength, StandardCharsets.UTF_8).toString(); fieldItem = new DefaultStringFieldItem(stringValue); break; } @@ -563,7 +563,7 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ byte actualLength = data.readByte(); // TODO: Double check, if this is ok? String stringValue = data.readCharSequence( - actualLength * 2, Charset.forName("UTF-16")).toString(); + actualLength * 2, StandardCharsets.UTF_16).toString(); fieldItem = new DefaultStringFieldItem(stringValue); break; } diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java index 118143c..382fcbb 100644 --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessor.java @@ -33,9 +33,9 @@ import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload; import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem; import org.apache.plc4x.java.s7.netty.model.types.MessageType; import org.apache.plc4x.java.s7.netty.model.types.ParameterType; +import org.apache.plc4x.java.s7.netty.model.types.TransportSize; import org.apache.plc4x.java.s7.netty.util.S7RequestSizeCalculator; import org.apache.plc4x.java.s7.netty.util.S7ResponseSizeEstimator; -import org.apache.plc4x.java.s7.netty.model.types.TransportSize; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -64,8 +64,7 @@ public class DefaultS7MessageProcessor implements S7MessageProcessor { } @Override - public Collection<? extends S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) - throws PlcException { + public Collection<S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) throws PlcException { // The following considerations have to be taken into account: // - The size of all parameters and payloads of a message cannot exceed the negotiated PDU size // - When reading data, the size of the returned data cannot exceed the negotiated PDU size diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java index cd307b6..10d5c80 100644 --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/strategies/S7MessageProcessor.java @@ -31,7 +31,7 @@ import java.util.Collection; */ public interface S7MessageProcessor { - Collection<? extends S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) throws PlcException; + Collection<S7RequestMessage> processRequest(S7RequestMessage request, int pduSize) throws PlcException; S7ResponseMessage processResponse(S7RequestMessage request, S7ResponseMessage response) throws PlcException; diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java index 23f3c15..14ba6f9 100644 --- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java +++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/util/S7PlcFieldHandler.java @@ -28,7 +28,7 @@ import org.apache.plc4x.java.s7.netty.model.types.TransportSize; import java.lang.reflect.InvocationTargetException; import java.math.BigInteger; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.BitSet; import java.util.LinkedList; import java.util.List; @@ -36,7 +36,7 @@ import java.util.List; public class S7PlcFieldHandler extends DefaultPlcFieldHandler { @Override - public PlcField createField(String fieldQuery) throws PlcInvalidFieldException { + public PlcField createField(String fieldQuery) { if (S7Field.matches(fieldQuery)) { return S7Field.of(fieldQuery); } @@ -302,8 +302,8 @@ public class S7PlcFieldHandler extends DefaultPlcFieldHandler { BigInteger value; if (val instanceof BigInteger) { value = (BigInteger) val; - } else if (((val instanceof Byte) || (val instanceof Short) || - (val instanceof Integer) || (val instanceof Long))) { + } else if ((val instanceof Byte) || (val instanceof Short) || + (val instanceof Integer) || (val instanceof Long)) { value = BigInteger.valueOf(((Number) val).longValue()); } else { throw new IllegalArgumentException( @@ -435,9 +435,9 @@ public class S7PlcFieldHandler extends DefaultPlcFieldHandler { Byte byteValue = (Byte) value; byte[] stringBytes = new byte[]{byteValue}; if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else if (value instanceof Short) { Short shortValue = (Short) value; @@ -445,9 +445,9 @@ public class S7PlcFieldHandler extends DefaultPlcFieldHandler { stringBytes[0] = (byte) (shortValue >> 8); stringBytes[1] = (byte) (shortValue & 0xFF); if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else if (value instanceof Integer) { Integer integerValue = (Integer) value; @@ -457,9 +457,9 @@ public class S7PlcFieldHandler extends DefaultPlcFieldHandler { stringBytes[2] = (byte) ((integerValue >> 8) & 0xFF); stringBytes[3] = (byte) (integerValue & 0xFF); if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else if (value instanceof Long) { Long longValue = (Long) value; @@ -473,9 +473,9 @@ public class S7PlcFieldHandler extends DefaultPlcFieldHandler { stringBytes[6] = (byte) ((longValue >> 8) & 0xFF); stringBytes[7] = (byte) (longValue & 0xFF); if (encoding16Bit) { - stringValues.add(new String(stringBytes, Charset.forName("UTF-16"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_16)); } else { - stringValues.add(new String(stringBytes, Charset.forName("UTF-8"))); + stringValues.add(new String(stringBytes, StandardCharsets.UTF_8)); } } else { throw new IllegalArgumentException( diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java index c5d5233..ed50c50 100644 --- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java +++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java @@ -27,7 +27,6 @@ import org.apache.plc4x.java.s7.netty.model.params.items.VarParameterItem; import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload; import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem; import org.apache.plc4x.java.s7.netty.model.types.*; -import org.apache.plc4x.java.s7.netty.model.types.TransportSize; import org.hamcrest.core.IsCollectionContaining; import org.junit.Before; import org.junit.Test; @@ -35,9 +34,9 @@ import org.junit.Test; import java.util.*; import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertThat; @@ -62,7 +61,7 @@ public class DefaultS7MessageProcessorTest { Collections.singletonList( new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0))); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(1)); @@ -87,7 +86,7 @@ public class DefaultS7MessageProcessorTest { TransportSize.BYTE, (short) 1, (short) 1, (short) 0, (byte) 0), new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, (short) 1, (short) 2, (short) 0, (byte) 0))); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(1)); @@ -146,7 +145,7 @@ public class DefaultS7MessageProcessorTest { TransportSize.BYTE, (short) 1, (short) 18, (short) 0, (byte) 0), new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, (short) 1, (short) 19, (short) 0, (byte) 0))); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(1)); @@ -208,7 +207,7 @@ public class DefaultS7MessageProcessorTest { TransportSize.BYTE, (short) 1, (short) 19, (short) 0, (byte) 0), new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, (short) 1, (short) 20, (short) 0, (byte) 0))); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(2)); @@ -243,7 +242,7 @@ public class DefaultS7MessageProcessorTest { TransportSize.BYTE, (short) 200, (short) 1, (short) 0, (byte) 0), new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS, TransportSize.BYTE, (short) 200, (short) 2, (short) 0, (byte) 0))); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 256); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 256); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(2)); @@ -270,7 +269,7 @@ public class DefaultS7MessageProcessorTest { Collections.singletonList( new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00})) ); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(1)); @@ -306,7 +305,7 @@ public class DefaultS7MessageProcessorTest { new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BIT, new byte[] { (byte) 0xAA, (byte) 0x02})) ); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); // Initialize a set of expected fields. Set<String> expectedFields = new HashSet<>(10); @@ -370,7 +369,7 @@ public class DefaultS7MessageProcessorTest { new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A})) ); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); // Initialize a set of expected fields. Set<Short> expectedFields = new HashSet<>(10); @@ -441,7 +440,7 @@ public class DefaultS7MessageProcessorTest { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A}))); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); // Initialize a set of expected fields. Set<Short> expectedFields = new HashSet<>(10); @@ -516,7 +515,7 @@ public class DefaultS7MessageProcessorTest { new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {0x00, 0x00, 0x00, 0x00}) ) ); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(5)); @@ -557,7 +556,7 @@ public class DefaultS7MessageProcessorTest { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04}) ) ); - Collection<? extends S7RequestMessage> processedRequests = SUT.processRequest(request, 250); + Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250); assertThat(processedRequests, notNullValue()); assertThat(processedRequests, hasSize(4));