You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/06/28 12:51:18 UTC
[incubator-plc4x] branch feature/mobbus-support-with-lib updated:
MODBUS: fixing matchers don't match
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch feature/mobbus-support-with-lib
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/feature/mobbus-support-with-lib by this push:
new 807afb5 MODBUS: fixing matchers don't match
807afb5 is described below
commit 807afb547eebb8a232cdf2bdb9f13668e99df639
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jun 28 14:51:14 2018 +0200
MODBUS: fixing matchers don't match
---
.../plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java | 5 +++++
.../org/apache/plc4x/java/modbus/model/ReadCoilsModbusAddress.java | 4 ++++
.../plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java | 5 +++++
.../plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java | 5 +++++
.../plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java | 5 +++++
.../plc4x/java/modbus/model/WriteMultipleCoilsModbusAddress.java | 4 ++++
.../plc4x/java/modbus/model/WriteMultipleRegistersModbusAddress.java | 5 +++++
.../apache/plc4x/java/modbus/model/WriteSingleCoilModbusAddress.java | 5 +++++
.../plc4x/java/modbus/model/WriteSingleRegisterModbusAddress.java | 5 +++++
9 files changed, 43 insertions(+)
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java
index 5167021..fe61796 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/MaskWriteRegisterModbusAddress.java
@@ -18,6 +18,8 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -37,6 +39,9 @@ public class MaskWriteRegisterModbusAddress extends ModbusAddress {
public static MaskWriteRegisterModbusAddress of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
int andMask = Integer.valueOf(matcher.group("andMask"));
int orMask = Integer.valueOf(matcher.group("orMask"));
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadCoilsModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadCoilsModbusAddress.java
index e15c224..88c97d6 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadCoilsModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadCoilsModbusAddress.java
@@ -18,6 +18,7 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.model.Address;
import java.util.regex.Matcher;
@@ -33,6 +34,9 @@ public class ReadCoilsModbusAddress extends MultiModbusAddress {
public static Address of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
int quantity = Integer.valueOf(matcher.group("quantity"));
return new ReadCoilsModbusAddress(address, quantity);
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java
index a6a6a6b..c066191 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadDiscreteInputsModbusAddress.java
@@ -18,6 +18,8 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,6 +33,9 @@ public class ReadDiscreteInputsModbusAddress extends MultiModbusAddress {
public static ReadDiscreteInputsModbusAddress of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
int quantity = Integer.valueOf(matcher.group("quantity"));
return new ReadDiscreteInputsModbusAddress(address, quantity);
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java
index 592ba2d..de7a94b 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadHoldingRegistersModbusAddress.java
@@ -18,6 +18,8 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,6 +33,9 @@ public class ReadHoldingRegistersModbusAddress extends MultiModbusAddress {
public static ReadHoldingRegistersModbusAddress of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
int quantity = Integer.valueOf(matcher.group("quantity"));
return new ReadHoldingRegistersModbusAddress(address, quantity);
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java
index 44d5222..e9bd52e 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/ReadInputRegistersModbusAddress.java
@@ -18,6 +18,8 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,6 +33,9 @@ public class ReadInputRegistersModbusAddress extends MultiModbusAddress {
public static ReadInputRegistersModbusAddress of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
int quantity = Integer.valueOf(matcher.group("quantity"));
return new ReadInputRegistersModbusAddress(address, quantity);
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleCoilsModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleCoilsModbusAddress.java
index 9c43141..142ec83 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleCoilsModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleCoilsModbusAddress.java
@@ -18,6 +18,7 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.api.model.Address;
import java.util.regex.Matcher;
@@ -33,6 +34,9 @@ public class WriteMultipleCoilsModbusAddress extends MultiModbusAddress {
public static Address of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
int quantity = Integer.valueOf(matcher.group("quantity"));
return new WriteMultipleCoilsModbusAddress(address, quantity);
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleRegistersModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleRegistersModbusAddress.java
index 294b7a4..92c120c 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleRegistersModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteMultipleRegistersModbusAddress.java
@@ -18,6 +18,8 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,6 +33,9 @@ public class WriteMultipleRegistersModbusAddress extends MultiModbusAddress {
public static WriteMultipleRegistersModbusAddress of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
int quantity = Integer.valueOf(matcher.group("quantity"));
return new WriteMultipleRegistersModbusAddress(address, quantity);
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleCoilModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleCoilModbusAddress.java
index 943fa03..25cc5cb 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleCoilModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleCoilModbusAddress.java
@@ -18,6 +18,8 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,6 +33,9 @@ public class WriteSingleCoilModbusAddress extends ModbusAddress {
public static WriteSingleCoilModbusAddress of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
return new WriteSingleCoilModbusAddress(address);
}
diff --git a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleRegisterModbusAddress.java b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleRegisterModbusAddress.java
index cdf7fc4..1612095 100644
--- a/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleRegisterModbusAddress.java
+++ b/plc4j/protocols/modbus/src/main/java/org/apache/plc4x/java/modbus/model/WriteSingleRegisterModbusAddress.java
@@ -18,6 +18,8 @@
*/
package org.apache.plc4x.java.modbus.model;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,6 +33,9 @@ public class WriteSingleRegisterModbusAddress extends ModbusAddress {
public static WriteSingleCoilModbusAddress of(String addressString) {
Matcher matcher = ADDRESS_PATTERN.matcher(addressString);
+ if (!matcher.matches()) {
+ throw new PlcRuntimeException(addressString + " doesn't match" + ADDRESS_PATTERN);
+ }
int address = Integer.valueOf(matcher.group("address"));
return new WriteSingleCoilModbusAddress(address);
}