You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jm...@apache.org on 2017/12/28 00:47:49 UTC
[incubator-plc4x] 11/19: add final where needed
This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit f2b0d7757796914d1702c766eb32ce889a2f030e
Author: Justin Mclean <jm...@apache.org>
AuthorDate: Thu Dec 28 08:35:03 2017 +1100
add final where needed
---
.../org/apache/plc4x/java/api/messages/PlcRequestContainer.java | 4 ++--
.../main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java | 6 +++---
.../java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java | 2 +-
.../plc4x/java/isotp/netty/model/params/TpduSizeParameter.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/params/TsapParameter.java | 6 +++---
.../java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java | 4 ++--
.../org/apache/plc4x/java/isotp/netty/model/types/DeviceGroup.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/types/DisconnectReason.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/types/ParameterCode.java | 2 +-
.../apache/plc4x/java/isotp/netty/model/types/ProtocolClass.java | 2 +-
.../org/apache/plc4x/java/isotp/netty/model/types/RejectCause.java | 2 +-
.../org/apache/plc4x/java/isotp/netty/model/types/TpduCode.java | 2 +-
.../org/apache/plc4x/java/isotp/netty/model/types/TpduSize.java | 2 +-
.../s7/src/main/java/org/apache/plc4x/java/netty/Message.java | 2 +-
.../java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java | 2 +-
.../java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java | 3 +--
.../apache/plc4x/java/s7/netty/model/types/DataTransportSize.java | 4 ++--
.../apache/plc4x/java/s7/netty/model/types/HeaderErrorClass.java | 2 +-
.../java/org/apache/plc4x/java/s7/netty/model/types/MemoryArea.java | 2 +-
.../org/apache/plc4x/java/s7/netty/model/types/ParameterError.java | 2 +-
.../org/apache/plc4x/java/s7/netty/model/types/ParameterType.java | 2 +-
.../apache/plc4x/java/s7/netty/model/types/SpecificationType.java | 2 +-
.../org/apache/plc4x/java/s7/netty/model/types/TransportSize.java | 2 +-
.../plc4x/java/s7/netty/model/types/VariableAddressingMode.java | 2 +-
24 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java
index 5fb7ccf..26d5418 100644
--- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java
+++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/PlcRequestContainer.java
@@ -22,8 +22,8 @@ import java.util.concurrent.CompletableFuture;
public class PlcRequestContainer<T extends PlcRequest, R extends PlcResponse> {
- private T request;
- private CompletableFuture<R> responseFuture;
+ private final T request;
+ private final CompletableFuture<R> responseFuture;
public PlcRequestContainer(T request, CompletableFuture<R> responseFuture) {
this.request = request;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java
index 010029f..2630cf0 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/IsoTPProtocol.java
@@ -41,9 +41,9 @@ public class IsoTPProtocol extends MessageToMessageCodec<IsoOnTcpMessage, Tpdu>
private final static Logger logger = LoggerFactory.getLogger(IsoTPProtocol.class);
- private byte rackNo;
- private byte slotNo;
- private TpduSize tpduSize;
+ private final byte rackNo;
+ private final byte slotNo;
+ private final TpduSize tpduSize;
private CalledTsapParameter calledTsapParameter;
private TpduSizeParameter tpduSizeParameter;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java
index 07f5106..98899cf 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/IsoTPMessage.java
@@ -24,7 +24,7 @@ import org.apache.plc4x.java.netty.Message;
public class IsoTPMessage extends Message {
- private Tpdu tpdu;
+ private final Tpdu tpdu;
public IsoTPMessage(Tpdu tpdu, ByteBuf userData) {
super(userData);
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java
index e1c6af3..146b8ad 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TpduSizeParameter.java
@@ -23,7 +23,7 @@ import org.apache.plc4x.java.isotp.netty.model.types.TpduSize;
public class TpduSizeParameter implements Parameter {
- private TpduSize tpduSize;
+ private final TpduSize tpduSize;
public TpduSizeParameter(TpduSize tpduSize) {
this.tpduSize = tpduSize;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java
index 854c01e..2d7f2d2 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/params/TsapParameter.java
@@ -23,9 +23,9 @@ import org.apache.plc4x.java.isotp.netty.model.types.DeviceGroup;
public abstract class TsapParameter implements Parameter {
- private DeviceGroup deviceGroup;
- private byte rackNumber;
- private byte slotNumber;
+ private final DeviceGroup deviceGroup;
+ private final byte rackNumber;
+ private final byte slotNumber;
public TsapParameter(DeviceGroup deviceGroup, byte rackNumber, byte slotNumber) {
this.deviceGroup = deviceGroup;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java
index 98f6f96..92f8c78 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/isotp/netty/model/tpdus/Tpdu.java
@@ -27,8 +27,8 @@ import java.util.List;
public abstract class Tpdu extends Message {
- private TpduCode tpduCode;
- private List<Parameter> parameters;
+ private final TpduCode tpduCode;
+ private final List<Parameter> parameters;
public Tpdu(TpduCode tpduCode, List<Parameter> parameters, ByteBuf userData) {
super(userData);
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 b90d4d2..63bdb0e 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,7 +26,7 @@ public enum DeviceGroup {
OS((byte) 0x02),
OTHERS((byte) 0x03);
- private byte code;
+ private final byte code;
DeviceGroup(byte code) {
this.code = 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 12272ce..637ce21 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,7 +39,7 @@ public enum DisconnectReason {
CONNECTION_REQUEST_REFUSED((byte) 0x88),
HEADER_OR_PARAMETER_LENGTH_INVALID((byte) 0x8A);
- private byte code;
+ private final byte code;
DisconnectReason(byte code) {
this.code = 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 8099a1f..a56e146 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,7 +50,7 @@ public enum ParameterCode {
PREFERRED_MAX_PDU_SIZE((byte) 0xF0),
INACTIVITY_TIMER((byte) 0xF2);
- private byte code;
+ private final byte code;
ParameterCode(byte code) {
this.code = 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 7bc8b07..05dc2f4 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,7 +28,7 @@ public enum ProtocolClass {
CLASS_3((byte) 0x30),
CLASS_4((byte) 0x40);
- private byte code;
+ private final byte code;
ProtocolClass(byte code) {
this.code = 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 69e69d6..f061afc 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,7 +27,7 @@ public enum RejectCause {
INVALID_TPDU_TYPE((byte) 0x02),
INVALID_PARAMETER_TYPE((byte) 0x03);
- private byte code;
+ private final byte code;
RejectCause(byte code) {
this.code = 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 58e84c2..113f32e 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
@@ -33,7 +33,7 @@ public enum TpduCode {
REJECT((byte) 0x50),
TPDU_ERROR((byte) 0x70);
- private byte code;
+ private final byte code;
TpduCode(byte code) {
this.code = 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 6576745..57dd19c 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,7 +30,7 @@ public enum TpduSize {
SIZE_256((byte) 0x08),
SIZE_128((byte) 0x07);
- private byte code;
+ private final byte code;
TpduSize(byte code) {
this.code = code;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java
index 99b8c40..a9c39fb 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/Message.java
@@ -22,7 +22,7 @@ import io.netty.buffer.ByteBuf;
public class Message {
- private ByteBuf userData;
+ private final ByteBuf userData;
public Message(ByteBuf userData) {
this.userData = userData;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java
index f27d8b2..a81ba6a 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/netty/events/S7ConnectionEvent.java
@@ -20,7 +20,7 @@ package org.apache.plc4x.java.netty.events;
public class S7ConnectionEvent {
- private S7ConnectionState state;
+ private final S7ConnectionState state;
public S7ConnectionEvent() {
this(S7ConnectionState.INITIAL);
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 d4c06b2..55e13e1 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
@@ -67,8 +67,7 @@ public class S7PlcConnection extends AbstractPlcConnection implements PlcReader,
private final String hostName;
private final int rack;
private final int slot;
-
- private int pduSize;
+ private final int pduSize;
private EventLoopGroup workerGroup;
private Channel channel;
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 ef5252c..9992c0f 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
@@ -33,8 +33,8 @@ public enum DataTransportSize {
REAL((byte) 0x07, false),
OCTET_STRING((byte) 0x09, false);
- private byte code;
- private boolean sizeInBits;
+ private final byte code;
+ private final boolean sizeInBits;
DataTransportSize(byte code, boolean sizeInBits) {
this.code = 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 9ceec04..3859b82 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
@@ -27,7 +27,7 @@ public enum HeaderErrorClass {
ERROR_ON_SUPPLIES((byte) 0x85),
ACCESS_ERROR((byte) 0x87);
- private byte code;
+ private final byte code;
HeaderErrorClass(byte code) {
this.code = 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 4d9fb88..1e6042a 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
@@ -42,7 +42,7 @@ public enum MemoryArea {
S7_200_IEC_COUNTERS((byte) 0x1E), /* Renamed from "IEC counters (200 family)" */
S7_200_IEC_TIMERS((byte) 0x1F); /* Renamed from "IEC timers (200 family)" */
- private byte code;
+ private final byte code;
MemoryArea(byte code) {
this.code = 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 da9c84c..564d9b3 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
@@ -42,7 +42,7 @@ public enum ParameterError {
L7_UNKNOWN_REQUEST((short) 0xD802),
L7_INVALID_REQUEST_STATUS((short) 0xD803);
- private short code;
+ private final short code;
ParameterError(short code) {
this.code = 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 a71282a..84b9629 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
@@ -38,7 +38,7 @@ public enum ParameterType {
PLC_STOP((byte) 0x29),
SETUP_COMMUNICATION((byte) 0xF0);
- private byte code;
+ private final byte code;
ParameterType(byte code) {
this.code = 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 7e4c6f7..8d22cb7 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,7 +27,7 @@ import java.util.Map;
public enum SpecificationType {
VARIABLE_SPECIFICATION((byte) 0x12);
- private byte code;
+ private final byte code;
SpecificationType(byte code) {
this.code = 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 9632f50..3836e2c 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
@@ -43,7 +43,7 @@ public enum TransportSize {
IEC_COUNTER((byte) 0x1F),
HS_COUNTER((byte) 0x20);
- private byte code;
+ private final byte code;
TransportSize(byte code) {
this.code = 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 14e4337..99e926a 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,7 +38,7 @@ public enum VariableAddressingMode {
DBREAD((byte) 0xb0),
SYM1200((byte) 0xb2); /* Renamed from "1200SYM" */
- private byte code;
+ private final byte code;
VariableAddressingMode(byte code) {
this.code = code;
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.