You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/10/28 14:24:04 UTC
[incubator-plc4x] branch master updated: - Fixing sonar issues
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
The following commit(s) were added to refs/heads/master by this push:
new 5de43ac - Fixing sonar issues
5de43ac is described below
commit 5de43acc59df1fbb57a5593703b2164b2435ccfd
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Sun Oct 28 15:24:00 2018 +0100
- Fixing sonar issues
---
examples/hello-storage-elasticsearch/pom.xml | 7 ++++++-
.../storage/elasticsearch/ElasticsearchStorage.java | 11 +++++++++++
.../java/org/apache/plc4x/kafka/Plc4xSourceTask.java | 12 ++++++------
.../java/base/protocol/Plc4XSupportedDataTypes.java | 4 ++--
.../java/isotp/netty/model/types/DeviceGroup.java | 17 ++++++++---------
.../isotp/netty/model/types/DisconnectReason.java | 17 ++++++++---------
.../java/isotp/netty/model/types/ParameterCode.java | 17 ++++++++---------
.../java/isotp/netty/model/types/ProtocolClass.java | 17 ++++++++---------
.../java/isotp/netty/model/types/RejectCause.java | 17 ++++++++---------
.../plc4x/java/isotp/netty/model/types/TpduCode.java | 17 ++++++++---------
.../plc4x/java/isotp/netty/model/types/TpduSize.java | 17 ++++++++---------
.../types/CpuServicesParameterFunctionGroup.java | 17 ++++++++---------
.../types/CpuServicesParameterSubFunctionGroup.java | 17 ++++++++---------
.../s7/netty/model/types/DataTransportErrorCode.java | 17 ++++++++---------
.../java/s7/netty/model/types/DataTransportSize.java | 17 ++++++++---------
.../java/s7/netty/model/types/HeaderErrorClass.java | 17 ++++++++---------
.../plc4x/java/s7/netty/model/types/MemoryArea.java | 17 ++++++++---------
.../plc4x/java/s7/netty/model/types/MessageType.java | 17 ++++++++---------
.../java/s7/netty/model/types/ParameterError.java | 17 ++++++++---------
.../java/s7/netty/model/types/ParameterType.java | 17 ++++++++---------
.../java/s7/netty/model/types/SpecificationType.java | 17 ++++++++---------
.../apache/plc4x/java/s7/netty/model/types/SslId.java | 17 ++++++++---------
.../java/s7/netty/model/types/TransportSize.java | 19 +++++++++----------
.../s7/netty/model/types/VariableAddressingMode.java | 17 ++++++++---------
.../java/org/apache/plc4x/java/test/TestField.java | 5 +++++
25 files changed, 191 insertions(+), 190 deletions(-)
diff --git a/examples/hello-storage-elasticsearch/pom.xml b/examples/hello-storage-elasticsearch/pom.xml
index b0f8c48..98d293d 100644
--- a/examples/hello-storage-elasticsearch/pom.xml
+++ b/examples/hello-storage-elasticsearch/pom.xml
@@ -38,6 +38,11 @@
<dependencies>
<dependency>
<groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-api</artifactId>
+ <version>0.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
<artifactId>apache-edgent</artifactId>
<version>0.2.0-SNAPSHOT</version>
</dependency>
@@ -99,7 +104,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
- <usedDependencies>
+ <usedDependencies combine.children="append">
<usedDependency>org.apache.plc4x:plc4j-protocol-s7</usedDependency>
<usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
</usedDependencies>
diff --git a/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java b/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
index 3b5a641..7cf704f 100644
--- a/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
+++ b/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
@@ -25,6 +25,7 @@ import org.apache.edgent.topology.TStream;
import org.apache.edgent.topology.Topology;
import org.apache.plc4x.edgent.PlcConnectionAdapter;
import org.apache.plc4x.edgent.PlcFunctions;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
@@ -137,6 +138,16 @@ public class ElasticsearchStorage {
// Start an Elasticsearch node.
Node esNode = startElasticsearchNode();
Client esClient = esNode.client();
+ // Register a shutdown hook.
+ final Thread mainThread = Thread.currentThread();
+ Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+ try {
+ esNode.close();
+ mainThread.join();
+ } catch (IOException | InterruptedException e) {
+ throw new PlcRuntimeException("Error closing ES Node", e);
+ }
+ }));
System.out.println("Started Elasticsearch node on port 9200");
// Make sure the indexes exist prior to writing to them.
diff --git a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
index 2b9d9f2..d353e54 100644
--- a/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
+++ b/integrations/apache-kafka/src/main/java/org/apache/plc4x/kafka/Plc4xSourceTask.java
@@ -64,13 +64,13 @@ public class Plc4xSourceTask extends SourceTask {
.define(QUERIES_CONFIG, ConfigDef.Type.LIST, ConfigDef.Importance.HIGH, QUERIES_DOC)
.define(RATE_CONFIG, ConfigDef.Type.INT, RATE_DEFAULT, ConfigDef.Importance.MEDIUM, RATE_DOC);
- private final static long WAIT_LIMIT_MILLIS = 100;
- private final static long TIMEOUT_LIMIT_MILLIS = 5000;
+ private static final long WAIT_LIMIT_MILLIS = 100;
+ private static final long TIMEOUT_LIMIT_MILLIS = 5000;
- private final static String URL_FIELD = "url";
- private final static String QUERY_FIELD = "query";
+ private static final String URL_FIELD = "url";
+ private static final String QUERY_FIELD = "query";
- private final static Schema KEY_SCHEMA =
+ private static final Schema KEY_SCHEMA =
new SchemaBuilder(Schema.Type.STRUCT)
.field(URL_FIELD, Schema.STRING_SCHEMA)
.field(QUERY_FIELD, Schema.STRING_SCHEMA)
@@ -151,7 +151,7 @@ public class Plc4xSourceTask extends SourceTask {
}
/**
- * Wait for next scheduled fetch operation.
+ * Wait for next scheduled fetch operation or till the source is closed.
* @param milliseconds maximum time to wait
* @throws InterruptedException if the thread is interrupted
* @return true if a fetch should be performed, false otherwise
diff --git a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/protocol/Plc4XSupportedDataTypes.java b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/protocol/Plc4XSupportedDataTypes.java
index ffe5234..614e105 100644
--- a/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/protocol/Plc4XSupportedDataTypes.java
+++ b/plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/base/protocol/Plc4XSupportedDataTypes.java
@@ -41,8 +41,8 @@ import static org.junit.Assert.assertThat;
public class Plc4XSupportedDataTypes {
- private final static Map<Class, DataTypePair<?>> littleEndianMap;
- private final static Map<Class, DataTypePair<?>> bigEndianMap;
+ private static final Map<Class, DataTypePair<?>> littleEndianMap;
+ private static final Map<Class, DataTypePair<?>> bigEndianMap;
static {
littleEndianMap = new HashMap<>();
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java
index f6093c6..7064e88 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java
@@ -26,6 +26,14 @@ public enum DeviceGroup {
OS((byte) 0x02),
OTHERS((byte) 0x03);
+ private static final Map<Byte, DeviceGroup> map;
+ static {
+ map = new HashMap<>();
+ for (DeviceGroup deviceGroup : DeviceGroup.values()) {
+ map.put(deviceGroup.code, deviceGroup);
+ }
+ }
+
private final byte code;
DeviceGroup(byte code) {
@@ -36,15 +44,6 @@ public enum DeviceGroup {
return code;
}
- private final static Map<Byte, DeviceGroup> map;
-
- static {
- map = new HashMap<>();
- for (DeviceGroup deviceGroup : DeviceGroup.values()) {
- map.put(deviceGroup.code, deviceGroup);
- }
- }
-
public static DeviceGroup valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java
index 29af0f7..9eabe89 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java
@@ -39,6 +39,14 @@ public enum DisconnectReason {
CONNECTION_REQUEST_REFUSED((byte) 0x88),
HEADER_OR_PARAMETER_LENGTH_INVALID((byte) 0x8A);
+ private static final Map<Byte, DisconnectReason> map;
+ static {
+ map = new HashMap<>();
+ for (DisconnectReason disconnectReason : DisconnectReason.values()) {
+ map.put(disconnectReason.code, disconnectReason);
+ }
+ }
+
private final byte code;
DisconnectReason(byte code) {
@@ -49,15 +57,6 @@ public enum DisconnectReason {
return code;
}
- private final static Map<Byte, DisconnectReason> map;
-
- static {
- map = new HashMap<>();
- for (DisconnectReason disconnectReason : DisconnectReason.values()) {
- map.put(disconnectReason.code, disconnectReason);
- }
- }
-
public static DisconnectReason valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java
index 2605009..8e4fe1c 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ParameterCode.java
@@ -50,6 +50,14 @@ public enum ParameterCode {
PREFERRED_MAX_PDU_SIZE((byte) 0xF0),
INACTIVITY_TIMER((byte) 0xF2);
+ private static final Map<Byte, ParameterCode> map;
+ static {
+ map = new HashMap<>();
+ for (ParameterCode parameterCode : ParameterCode.values()) {
+ map.put(parameterCode.code, parameterCode);
+ }
+ }
+
private final byte code;
ParameterCode(byte code) {
@@ -60,15 +68,6 @@ public enum ParameterCode {
return code;
}
- private final static Map<Byte, ParameterCode> map;
-
- static {
- map = new HashMap<>();
- for (ParameterCode parameterCode : ParameterCode.values()) {
- map.put(parameterCode.code, parameterCode);
- }
- }
-
public static ParameterCode valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java
index 91e8c13..f944f69 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java
@@ -28,6 +28,14 @@ public enum ProtocolClass {
CLASS_3((byte) 0x30),
CLASS_4((byte) 0x40);
+ private static final Map<Byte, ProtocolClass> map;
+ static {
+ map = new HashMap<>();
+ for (ProtocolClass protocolClass : ProtocolClass.values()) {
+ map.put(protocolClass.code, protocolClass);
+ }
+ }
+
private final byte code;
ProtocolClass(byte code) {
@@ -38,15 +46,6 @@ public enum ProtocolClass {
return code;
}
- private final static Map<Byte, ProtocolClass> map;
-
- static {
- map = new HashMap<>();
- for (ProtocolClass protocolClass : ProtocolClass.values()) {
- map.put(protocolClass.code, protocolClass);
- }
- }
-
public static ProtocolClass valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java
index 1f2bcf3..37c2b28 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java
@@ -27,6 +27,14 @@ public enum RejectCause {
INVALID_TPDU_TYPE((byte) 0x02),
INVALID_PARAMETER_TYPE((byte) 0x03);
+ private static final Map<Byte, RejectCause> map;
+ static {
+ map = new HashMap<>();
+ for (RejectCause rejectCause : RejectCause.values()) {
+ map.put(rejectCause.code, rejectCause);
+ }
+ }
+
private final byte code;
RejectCause(byte code) {
@@ -37,15 +45,6 @@ public enum RejectCause {
return code;
}
- private final static Map<Byte, RejectCause> map;
-
- static {
- map = new HashMap<>();
- for (RejectCause rejectCause : RejectCause.values()) {
- map.put(rejectCause.code, rejectCause);
- }
- }
-
public static RejectCause valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java
index 45089ca..ded9a07 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java
@@ -34,6 +34,14 @@ public enum TpduCode {
TPDU_ERROR((byte) 0x70),
TPDU_UNKNOWN((byte) 0xFF);
+ private static final Map<Byte, TpduCode> map;
+ static {
+ map = new HashMap<>();
+ for (TpduCode tpduCode : TpduCode.values()) {
+ map.put(tpduCode.code, tpduCode);
+ }
+ }
+
private final byte code;
TpduCode(byte code) {
@@ -44,15 +52,6 @@ public enum TpduCode {
return code;
}
- private final static Map<Byte, TpduCode> map;
-
- static {
- map = new HashMap<>();
- for (TpduCode tpduCode : TpduCode.values()) {
- map.put(tpduCode.code, tpduCode);
- }
- }
-
public static TpduCode valueOf(byte code) {
if (map.containsKey(code)) {
return map.get(code);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java
index f04f2db..5ba90ec 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java
@@ -30,6 +30,14 @@ public enum TpduSize {
SIZE_4096((byte) 0x0c, 4096),
SIZE_8192((byte) 0x0d, 8192);
+ private static final Map<Byte, TpduSize> map;
+ static {
+ map = new HashMap<>();
+ for (TpduSize tpduSize : TpduSize.values()) {
+ map.put(tpduSize.code, tpduSize);
+ }
+ }
+
private final byte code;
private final int value;
@@ -46,15 +54,6 @@ public enum TpduSize {
return value;
}
- private final static Map<Byte, TpduSize> map;
-
- static {
- map = new HashMap<>();
- for (TpduSize tpduSize : TpduSize.values()) {
- map.put(tpduSize.code, tpduSize);
- }
- }
-
public static TpduSize valueForGivenSize(int pduSize) {
if(pduSize <= 0) {
throw new IllegalArgumentException("PduSize has to be greater than 0");
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
index 5ab6169..25f5ac0 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterFunctionGroup.java
@@ -30,6 +30,14 @@ public enum CpuServicesParameterFunctionGroup {
private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterFunctionGroup.class);
+ private static final Map<Byte, CpuServicesParameterFunctionGroup> map;
+ static {
+ map = new HashMap<>();
+ for (CpuServicesParameterFunctionGroup cpuServicesParameterFunctionGroup : CpuServicesParameterFunctionGroup.values()) {
+ map.put(cpuServicesParameterFunctionGroup.code, cpuServicesParameterFunctionGroup);
+ }
+ }
+
private final byte code;
CpuServicesParameterFunctionGroup(byte code) {
@@ -40,15 +48,6 @@ public enum CpuServicesParameterFunctionGroup {
return code;
}
- private final static Map<Byte, CpuServicesParameterFunctionGroup> map;
-
- static {
- map = new HashMap<>();
- for (CpuServicesParameterFunctionGroup cpuServicesParameterFunctionGroup : CpuServicesParameterFunctionGroup.values()) {
- map.put(cpuServicesParameterFunctionGroup.code, cpuServicesParameterFunctionGroup);
- }
- }
-
public static CpuServicesParameterFunctionGroup valueOf(byte code) {
if(!map.containsKey(code)) {
logger.error("CpuServicesParameterFunctionGroup for code {} not found", code);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
index 90a6886..a99b6e8 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/CpuServicesParameterSubFunctionGroup.java
@@ -30,6 +30,14 @@ public enum CpuServicesParameterSubFunctionGroup {
private static final Logger logger = LoggerFactory.getLogger(CpuServicesParameterSubFunctionGroup.class);
+ private static final Map<Byte, CpuServicesParameterSubFunctionGroup> map;
+ static {
+ map = new HashMap<>();
+ for (CpuServicesParameterSubFunctionGroup cpuServicesParameterSubFunctionGroup : CpuServicesParameterSubFunctionGroup.values()) {
+ map.put(cpuServicesParameterSubFunctionGroup.code, cpuServicesParameterSubFunctionGroup);
+ }
+ }
+
private final byte code;
CpuServicesParameterSubFunctionGroup(byte code) {
@@ -40,15 +48,6 @@ public enum CpuServicesParameterSubFunctionGroup {
return code;
}
- private final static Map<Byte, CpuServicesParameterSubFunctionGroup> map;
-
- static {
- map = new HashMap<>();
- for (CpuServicesParameterSubFunctionGroup cpuServicesParameterSubFunctionGroup : CpuServicesParameterSubFunctionGroup.values()) {
- map.put(cpuServicesParameterSubFunctionGroup.code, cpuServicesParameterSubFunctionGroup);
- }
- }
-
public static CpuServicesParameterSubFunctionGroup valueOf(byte code) {
if(!map.containsKey(code)) {
logger.error("CpuServicesParameterSubFunctionGroup for code {} not found", code);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
index 4feb387..4074331 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportErrorCode.java
@@ -34,6 +34,14 @@ public enum DataTransportErrorCode {
private static final Logger logger = LoggerFactory.getLogger(DataTransportErrorCode.class);
+ private static final Map<Byte, DataTransportErrorCode> map;
+ static {
+ map = new HashMap<>();
+ for (DataTransportErrorCode dataTransportErrorCode : DataTransportErrorCode.values()) {
+ map.put(dataTransportErrorCode.code, dataTransportErrorCode);
+ }
+ }
+
private byte code;
DataTransportErrorCode(byte code) {
@@ -44,15 +52,6 @@ public enum DataTransportErrorCode {
return code;
}
- private final static Map<Byte, DataTransportErrorCode> map;
-
- static {
- map = new HashMap<>();
- for (DataTransportErrorCode dataTransportErrorCode : DataTransportErrorCode.values()) {
- map.put(dataTransportErrorCode.code, dataTransportErrorCode);
- }
- }
-
public static DataTransportErrorCode valueOf(byte code) {
if (!map.containsKey(code)) {
logger.error("No DataTransportErrorCode for code {}", code);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
index c0c35a7..24b7c38 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/DataTransportSize.java
@@ -35,6 +35,14 @@ public enum DataTransportSize {
REAL((byte) 0x07, false, false),
OCTET_STRING((byte) 0x09, false, true);
+ private static final Map<Byte, DataTransportSize> map;
+ static {
+ map = new HashMap<>();
+ for (DataTransportSize dataTransportSize : DataTransportSize.values()) {
+ map.put(dataTransportSize.code, dataTransportSize);
+ }
+ }
+
private final byte code;
private final boolean sizeInBits;
private final boolean hasBlankByte;
@@ -57,15 +65,6 @@ public enum DataTransportSize {
return hasBlankByte;
}
- private final static Map<Byte, DataTransportSize> map;
-
- static {
- map = new HashMap<>();
- for (DataTransportSize dataTransportSize : DataTransportSize.values()) {
- map.put(dataTransportSize.code, dataTransportSize);
- }
- }
-
public static DataTransportSize valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
index aaf6257..9aac69e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java
@@ -30,6 +30,14 @@ public enum HeaderErrorClass {
ERROR_ON_SUPPLIES((byte) 0x85),
ACCESS_ERROR((byte) 0x87);
+ private static final Map<Byte, HeaderErrorClass> map;
+ static {
+ map = new HashMap<>();
+ for (HeaderErrorClass headerErrorClass : HeaderErrorClass.values()) {
+ map.put(headerErrorClass.code, headerErrorClass);
+ }
+ }
+
private final byte code;
HeaderErrorClass(byte code) {
@@ -40,15 +48,6 @@ public enum HeaderErrorClass {
return code;
}
- private final static Map<Byte, HeaderErrorClass> map;
-
- static {
- map = new HashMap<>();
- for (HeaderErrorClass headerErrorClass : HeaderErrorClass.values()) {
- map.put(headerErrorClass.code, headerErrorClass);
- }
- }
-
public static HeaderErrorClass valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
index 079f26a..c7cad88 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java
@@ -43,6 +43,14 @@ public enum MemoryArea {
S7_200_IEC_COUNTERS(null, (byte) 0x1E), * Renamed from "IEC counters (200 family)" *
S7_200_IEC_TIMERS(null, (byte) 0x1F); * Renamed from "IEC timers (200 family)" */
+ private static final Map<Byte, MemoryArea> map;
+ static {
+ map = new HashMap<>();
+ for (MemoryArea memoryArea : MemoryArea.values()) {
+ map.put(memoryArea.code, memoryArea);
+ }
+ }
+
private final String shortName;
private final byte code;
@@ -59,15 +67,6 @@ public enum MemoryArea {
return code;
}
- private final static Map<Byte, MemoryArea> map;
-
- static {
- map = new HashMap<>();
- for (MemoryArea memoryArea : MemoryArea.values()) {
- map.put(memoryArea.code, memoryArea);
- }
- }
-
public static MemoryArea valueOfShortName(String shortName) {
for (MemoryArea value : MemoryArea.values()) {
if(value.getShortName().equals(shortName)) {
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java
index 7817bcd..78977e3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/MessageType.java
@@ -30,6 +30,14 @@ public enum MessageType {
ACK_DATA((byte) 0x03),
USER_DATA((byte) 0x07); /* Renamed from "Userdata" */
+ private static final Map<Byte, MessageType> map;
+ static {
+ map = new HashMap<>();
+ for (MessageType messageType : MessageType.values()) {
+ map.put(messageType.code, messageType);
+ }
+ }
+
private final byte code;
MessageType(byte code) {
@@ -40,15 +48,6 @@ public enum MessageType {
return code;
}
- private final static Map<Byte, MessageType> map;
-
- static {
- map = new HashMap<>();
- for (MessageType messageType : MessageType.values()) {
- map.put(messageType.code, messageType);
- }
- }
-
public static MessageType valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
index 1bc04ca..90b6d6b 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterError.java
@@ -45,6 +45,14 @@ public enum ParameterError {
L7_UNKNOWN_REQUEST((short) 0xD802),
L7_INVALID_REQUEST_STATUS((short) 0xD803);
+ private static final Map<Short, ParameterError> map;
+ static {
+ map = new HashMap<>();
+ for (ParameterError parameterError : ParameterError.values()) {
+ map.put(parameterError.code, parameterError);
+ }
+ }
+
private final short code;
ParameterError(short code) {
@@ -55,15 +63,6 @@ public enum ParameterError {
return code;
}
- private final static Map<Short, ParameterError> map;
-
- static {
- map = new HashMap<>();
- for (ParameterError parameterError : ParameterError.values()) {
- map.put(parameterError.code, parameterError);
- }
- }
-
public static ParameterError valueOf(short code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
index 4a54d0d..3b92ea0 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/ParameterType.java
@@ -43,6 +43,14 @@ public enum ParameterType {
private static final Logger logger = LoggerFactory.getLogger(ParameterType.class);
+ private static final Map<Byte, ParameterType> map;
+ static {
+ map = new HashMap<>();
+ for (ParameterType parameterType : ParameterType.values()) {
+ map.put(parameterType.code, parameterType);
+ }
+ }
+
private final byte code;
ParameterType(byte code) {
@@ -53,15 +61,6 @@ public enum ParameterType {
return code;
}
- private final static Map<Byte, ParameterType> map;
-
- static {
- map = new HashMap<>();
- for (ParameterType parameterType : ParameterType.values()) {
- map.put(parameterType.code, parameterType);
- }
- }
-
public static ParameterType valueOf(byte code) {
if(!map.containsKey(code)) {
logger.error("ParameterType for code {} not found", code);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
index 41e2675..46c6033 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SpecificationType.java
@@ -27,6 +27,14 @@ import java.util.Map;
public enum SpecificationType {
VARIABLE_SPECIFICATION((byte) 0x12);
+ private static final Map<Byte, SpecificationType> map;
+ static {
+ map = new HashMap<>();
+ for (SpecificationType specificationType : SpecificationType.values()) {
+ map.put(specificationType.code, specificationType);
+ }
+ }
+
private final byte code;
SpecificationType(byte code) {
@@ -37,15 +45,6 @@ public enum SpecificationType {
return code;
}
- private final static Map<Byte, SpecificationType> map;
-
- static {
- map = new HashMap<>();
- for (SpecificationType specificationType : SpecificationType.values()) {
- map.put(specificationType.code, specificationType);
- }
- }
-
public static SpecificationType valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
index 3464b9a..f8fc6c3 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/SslId.java
@@ -68,6 +68,14 @@ public enum SslId {
private static final Logger logger = LoggerFactory.getLogger(SslId.class);
+ private static final Map<Short, SslId> map;
+ static {
+ map = new HashMap<>();
+ for (SslId sslId : SslId.values()) {
+ map.put(sslId.code, sslId);
+ }
+ }
+
private final short code;
SslId(short code) {
@@ -78,15 +86,6 @@ public enum SslId {
return code;
}
- private final static Map<Short, SslId> map;
-
- static {
- map = new HashMap<>();
- for (SslId sslId : SslId.values()) {
- map.put(sslId.code, sslId);
- }
- }
-
public static SslId valueOf(short code) {
if(!map.containsKey(code)) {
logger.error("SslId for code {} not found", code);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
index f203789..4152def 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/TransportSize.java
@@ -121,9 +121,17 @@ public enum TransportSize {
// 0x20: HS Counter
//
+ private static final Map<Byte, TransportSize> map;
+ static {
+ map = new HashMap<>();
+ for (TransportSize dataType : TransportSize.values()) {
+ map.put(dataType.typeCode, dataType);
+ }
+ }
+
private final byte typeCode;
private final String sizeCode;
- private int sizeInBytes;
+ private final int sizeInBytes;
private final Set<S7ControllerType> supportedControllerTypes;
private final TransportSize baseType;
private final DataTransportSize dataTransportSize;
@@ -182,15 +190,6 @@ public enum TransportSize {
return supportedControllerTypes.contains(controllerType);
}
- private final static Map<Byte, TransportSize> map;
-
- static {
- map = new HashMap<>();
- for (TransportSize dataType : TransportSize.values()) {
- map.put(dataType.typeCode, dataType);
- }
- }
-
public static TransportSize valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
index 9125d39..52e5d0e 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/model/types/VariableAddressingMode.java
@@ -38,6 +38,14 @@ public enum VariableAddressingMode {
DBREAD((byte) 0xb0),
SYM1200((byte) 0xb2); /* Renamed from "1200SYM" */
+ private static final Map<Byte, VariableAddressingMode> map;
+ static {
+ map = new HashMap<>();
+ for (VariableAddressingMode variableAddressingMode : VariableAddressingMode.values()) {
+ map.put(variableAddressingMode.code, variableAddressingMode);
+ }
+ }
+
private final byte code;
VariableAddressingMode(byte code) {
@@ -48,15 +56,6 @@ public enum VariableAddressingMode {
return code;
}
- private final static Map<Byte, VariableAddressingMode> map;
-
- static {
- map = new HashMap<>();
- for (VariableAddressingMode variableAddressingMode : VariableAddressingMode.values()) {
- map.put(variableAddressingMode.code, variableAddressingMode);
- }
- }
-
public static VariableAddressingMode valueOf(byte code) {
return map.get(code);
}
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestField.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestField.java
index 2488282..89b85b2 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestField.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestField.java
@@ -21,6 +21,8 @@ package org.apache.plc4x.java.test;
import org.apache.commons.text.WordUtils;
import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
import org.apache.plc4x.java.api.model.PlcField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -30,6 +32,8 @@ import java.util.regex.Pattern;
*/
class TestField implements PlcField {
+ private static final Logger logger = LoggerFactory.getLogger(TestField.class);
+
/**
* Examples:
* - {@code RANDOM/foo:INTEGER}
@@ -55,6 +59,7 @@ class TestField implements PlcField {
Class<?> dataType = Class.forName("java.lang." + dataTypeName);
return new TestField(type, name, dataType, numElements);
} catch (ClassNotFoundException e) {
+ logger.error("Unsupported type: " + dataTypeName, e);
throw new PlcInvalidFieldException("Unsupported type: " + dataTypeName);
}
}