[plc4x] branch develop updated: Scraper Test -Added type to MockField

[er...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

erobinet pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 4fdbf69  Scraper Test -Added type to MockField
4fdbf69 is described below

commit 4fdbf69b13dbb6f275b072bf96e08d26a695339c
Author: Etienne Robinet <et...@gmail.com>
AuthorDate: Fri May 15 16:51:33 2020 +0200

    Scraper Test
    -Added type to MockField
---
 .../apache/plc4x/java/mock/field/MockField.java    | 36 ++++++++++++++++++++--
 .../org/apache/plc4x/java/mock/field/MockType.java |  7 +++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/field/MockField.java b/plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/field/MockField.java
index 73eafdd..d9d8c8d 100644
--- a/plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/field/MockField.java
+++ b/plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/field/MockField.java
@@ -21,14 +21,26 @@ package org.apache.plc4x.java.mock.field;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
 import org.apache.plc4x.java.api.model.PlcField;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class MockField implements PlcField {
 
-    private final String address;
-    private final MockPlcValue plcValue;
+    private  String address;
+    private MockPlcValue plcValue;
+    private  MockType type;
 
+    private static final Pattern PATTERN =
+        Pattern.compile("%(?<name>[a-zA-Z_.0-9]+\\[?[0-9]*\\]?):?(?<type>[A-Z]*)");
 
     public static MockField of(String addressString) throws PlcInvalidFieldException {
-        return new MockField(addressString);
+        Matcher matcher = PATTERN.matcher(addressString);
+        if (matcher.matches()){
+            String addr = matcher.group("name");
+            MockType type = MockType.valueOf(matcher.group("type"));
+            return new MockField(addr,type);
+        }
+        return  null;
     }
 
     public MockField(String address) {
@@ -36,6 +48,11 @@ public class MockField implements PlcField {
         this.plcValue = null;
     }
 
+    public MockField(String address, MockType type) {
+        this.address = address;
+        this.type = type;
+    }
+
     public MockField(String address, MockPlcValue plcValue) {
         this.address = address;
         this.plcValue = plcValue;
@@ -65,4 +82,17 @@ public class MockField implements PlcField {
         return address.hashCode();
     }
 
+
+    @Override
+    public Class<?> getDefaultJavaType() {
+      switch(type){
+          case BOOL:
+              return Boolean.class;
+          case INT:
+              return Integer.class;
+          case REAL:
+              return Double.class;
+          default: return null;
+      }
+    }
 }
diff --git a/plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/field/MockType.java b/plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/field/MockType.java
new file mode 100644
index 0000000..2264f09
--- /dev/null
+++ b/plc4j/drivers/mock/src/main/java/org/apache/plc4x/java/mock/field/MockType.java
@@ -0,0 +1,7 @@
+package org.apache.plc4x.java.mock.field;
+
+public enum MockType {
+    BOOL,
+    INT,
+    REAL;
+}