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/09/07 14:22:16 UTC
[incubator-plc4x] branch feature/api-redesign-chris-c updated: -
Added the prefix "Default" to the FieldItems in base-driver
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/api-redesign-chris-c
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/feature/api-redesign-chris-c by this push:
new 220d8d8 - Added the prefix "Default" to the FieldItems in base-driver
220d8d8 is described below
commit 220d8d8ddf53aff7136e617de0342acce1343533
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Sep 7 16:22:13 2018 +0200
- Added the prefix "Default" to the FieldItems in base-driver
---
.../plc4x/edgent/PlcConnectionAdapterTest.java | 6 ++---
...ldItem.java => DefaultBigIntegerFieldItem.java} | 4 ++--
...FieldItem.java => DefaultBooleanFieldItem.java} | 4 ++--
...tem.java => DefaultFloatingPointFieldItem.java} | 4 ++--
...FieldItem.java => DefaultIntegerFieldItem.java} | 4 ++--
...gFieldItem.java => DefaultStringFieldItem.java} | 4 ++--
...imeFieldItem.java => DefaultTimeFieldItem.java} | 4 ++--
.../s7/messages/items/S7BigIntegerFieldItem.java | 4 ++--
.../java/s7/messages/items/S7BooleanFieldItem.java | 4 ++--
.../messages/items/S7FloatingPointFieldItem.java | 4 ++--
.../java/s7/messages/items/S7IntegerFieldItem.java | 4 ++--
.../java/s7/messages/items/S7StringFieldItem.java | 4 ++--
.../java/s7/messages/items/S7TimeFieldItem.java | 4 ++--
.../java/s7/netty/util/S7PlcFieldHandler.java | 28 +++++++++++-----------
.../apache/plc4x/java/test/TestFieldHandler.java | 22 ++++++++---------
.../org/apache/plc4x/java/test/TestDeviceTest.java | 4 ++--
16 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
index 4d4047c..2368bea 100644
--- a/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
+++ b/integrations/apache-edgent/src/test/java/org/apache/plc4x/edgent/PlcConnectionAdapterTest.java
@@ -31,7 +31,7 @@ import org.apache.plc4x.java.api.messages.PlcReadResponse;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.apache.plc4x.java.api.model.PlcField;
-import org.apache.plc4x.java.base.messages.items.IntegerFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
import org.apache.plc4x.test.FastTests;
import org.hamcrest.core.IsInstanceOf;
import org.junit.Test;
@@ -88,7 +88,7 @@ public class PlcConnectionAdapterTest {
// will help identify problems in the adapter/supplier/consumer
PlcField plcField = request.getFields().get(0);
// TODO: smart value conversion
- connection.setFieldItem(plcField, new IntegerFieldItem(0L));
+ connection.setFieldItem(plcField, new DefaultIntegerFieldItem(0L));
CompletableFuture<PlcReadResponse<?>> cf = connection.read(request);
@@ -103,7 +103,7 @@ public class PlcConnectionAdapterTest {
// this is really a tests of our mock tooling but knowing it's behaving as expected
// will help identify problems in the adapter/supplier/consumer
PlcField plcField = request.getFields().get(0);
- connection.setFieldItem(plcField, new IntegerFieldItem(0L));
+ connection.setFieldItem(plcField, new DefaultIntegerFieldItem(0L));
CompletableFuture<PlcWriteResponse<?>> cf = connection.write(request);
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BigIntegerFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigIntegerFieldItem.java
similarity index 97%
rename from plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BigIntegerFieldItem.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigIntegerFieldItem.java
index 8ba7971..8578db1 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BigIntegerFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBigIntegerFieldItem.java
@@ -21,9 +21,9 @@ package org.apache.plc4x.java.base.messages.items;
import java.math.BigDecimal;
import java.math.BigInteger;
-public class BigIntegerFieldItem extends FieldItem<BigInteger> {
+public class DefaultBigIntegerFieldItem extends FieldItem<BigInteger> {
- public BigIntegerFieldItem(BigInteger... values) {
+ public DefaultBigIntegerFieldItem(BigInteger... values) {
super(values);
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BooleanFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBooleanFieldItem.java
similarity index 90%
rename from plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BooleanFieldItem.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBooleanFieldItem.java
index d9a28da..9f8db5d 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/BooleanFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultBooleanFieldItem.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.base.messages.items;
-public class BooleanFieldItem extends FieldItem<Boolean> {
+public class DefaultBooleanFieldItem extends FieldItem<Boolean> {
- public BooleanFieldItem(Boolean... values) {
+ public DefaultBooleanFieldItem(Boolean... values) {
super(values);
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/FloatingPointFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultFloatingPointFieldItem.java
similarity index 96%
rename from plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/FloatingPointFieldItem.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultFloatingPointFieldItem.java
index c3ffe4e..7b1ae04 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/FloatingPointFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultFloatingPointFieldItem.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.base.messages.items;
-public class FloatingPointFieldItem extends FieldItem<Double> {
+public class DefaultFloatingPointFieldItem extends FieldItem<Double> {
- public FloatingPointFieldItem(Double... values) {
+ public DefaultFloatingPointFieldItem(Double... values) {
super(values);
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/IntegerFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
similarity index 96%
rename from plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/IntegerFieldItem.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
index f8c57f6..a2d4035 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/IntegerFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultIntegerFieldItem.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.base.messages.items;
-public class IntegerFieldItem extends FieldItem<Long> {
+public class DefaultIntegerFieldItem extends FieldItem<Long> {
- public IntegerFieldItem(Long... values) {
+ public DefaultIntegerFieldItem(Long... values) {
super(values);
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/StringFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
similarity index 91%
rename from plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/StringFieldItem.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
index a7fd5ea..395a6c8 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/StringFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultStringFieldItem.java
@@ -18,9 +18,9 @@ under the License.
*/
package org.apache.plc4x.java.base.messages.items;
-public class StringFieldItem extends FieldItem<String> {
+public class DefaultStringFieldItem extends FieldItem<String> {
- public StringFieldItem(String... values) {
+ public DefaultStringFieldItem(String... values) {
super(values);
}
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/TimeFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultTimeFieldItem.java
similarity index 93%
rename from plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/TimeFieldItem.java
rename to plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultTimeFieldItem.java
index 53b2150..18f2190 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/TimeFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultTimeFieldItem.java
@@ -22,9 +22,9 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-public class TimeFieldItem extends FieldItem<LocalDateTime> {
+public class DefaultTimeFieldItem extends FieldItem<LocalDateTime> {
- public TimeFieldItem(LocalDateTime... values) {
+ public DefaultTimeFieldItem(LocalDateTime... values) {
super(values);
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BigIntegerFieldItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BigIntegerFieldItem.java
index da76032..02cdcda 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BigIntegerFieldItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BigIntegerFieldItem.java
@@ -18,12 +18,12 @@
*/
package org.apache.plc4x.java.s7.messages.items;
-import org.apache.plc4x.java.base.messages.items.BigIntegerFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultBigIntegerFieldItem;
import org.apache.plc4x.java.s7.types.S7DataType;
import java.math.BigInteger;
-public class S7BigIntegerFieldItem extends BigIntegerFieldItem {
+public class S7BigIntegerFieldItem extends DefaultBigIntegerFieldItem {
private final S7DataType naturalDataType;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BooleanFieldItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BooleanFieldItem.java
index 2b73361..dc887c4 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BooleanFieldItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BooleanFieldItem.java
@@ -18,10 +18,10 @@
*/
package org.apache.plc4x.java.s7.messages.items;
-import org.apache.plc4x.java.base.messages.items.BooleanFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultBooleanFieldItem;
import org.apache.plc4x.java.s7.types.S7DataType;
-public class S7BooleanFieldItem extends BooleanFieldItem {
+public class S7BooleanFieldItem extends DefaultBooleanFieldItem {
private final S7DataType naturalDataType;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7FloatingPointFieldItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7FloatingPointFieldItem.java
index 23dacfc..9a412ef 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7FloatingPointFieldItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7FloatingPointFieldItem.java
@@ -18,10 +18,10 @@
*/
package org.apache.plc4x.java.s7.messages.items;
-import org.apache.plc4x.java.base.messages.items.FloatingPointFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultFloatingPointFieldItem;
import org.apache.plc4x.java.s7.types.S7DataType;
-public class S7FloatingPointFieldItem extends FloatingPointFieldItem {
+public class S7FloatingPointFieldItem extends DefaultFloatingPointFieldItem {
private final S7DataType naturalDataType;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7IntegerFieldItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7IntegerFieldItem.java
index 1c04ef0..35e4b56 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7IntegerFieldItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7IntegerFieldItem.java
@@ -18,10 +18,10 @@
*/
package org.apache.plc4x.java.s7.messages.items;
-import org.apache.plc4x.java.base.messages.items.IntegerFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
import org.apache.plc4x.java.s7.types.S7DataType;
-public class S7IntegerFieldItem extends IntegerFieldItem {
+public class S7IntegerFieldItem extends DefaultIntegerFieldItem {
private final S7DataType naturalDataType;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7StringFieldItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7StringFieldItem.java
index 8863727..507cad1 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7StringFieldItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7StringFieldItem.java
@@ -18,10 +18,10 @@
*/
package org.apache.plc4x.java.s7.messages.items;
-import org.apache.plc4x.java.base.messages.items.StringFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultStringFieldItem;
import org.apache.plc4x.java.s7.types.S7DataType;
-public class S7StringFieldItem extends StringFieldItem {
+public class S7StringFieldItem extends DefaultStringFieldItem {
private final S7DataType naturalDataType;
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7TimeFieldItem.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7TimeFieldItem.java
index 065c22d..3ab5507 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7TimeFieldItem.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7TimeFieldItem.java
@@ -18,12 +18,12 @@
*/
package org.apache.plc4x.java.s7.messages.items;
-import org.apache.plc4x.java.base.messages.items.TimeFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultTimeFieldItem;
import org.apache.plc4x.java.s7.types.S7DataType;
import java.time.LocalDateTime;
-public class S7TimeFieldItem extends TimeFieldItem {
+public class S7TimeFieldItem extends DefaultTimeFieldItem {
private final S7DataType naturalDataType;
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 4cb91d7..a34a79a 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
@@ -210,68 +210,68 @@ public class S7PlcFieldHandler implements PlcFieldHandler {
case BYTE:
minValue = BigInteger.valueOf((long) Byte.MIN_VALUE);
maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case WORD:
minValue = BigInteger.valueOf((long) Short.MIN_VALUE);
maxValue = BigInteger.valueOf((long) Short.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case DWORD:
minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case LWORD:
minValue = BigInteger.valueOf(Long.MIN_VALUE);
maxValue = BigInteger.valueOf(Long.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case SINT:
minValue = BigInteger.valueOf((long) Byte.MIN_VALUE);
maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case USINT:
minValue = BigInteger.valueOf((long) 0);
maxValue = BigInteger.valueOf((long) Byte.MAX_VALUE * 2);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case INT:
minValue = BigInteger.valueOf((long) Short.MIN_VALUE);
maxValue = BigInteger.valueOf((long) Short.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case UINT:
minValue = BigInteger.valueOf((long) 0);
maxValue = BigInteger.valueOf(((long) Short.MAX_VALUE) * 2);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case DINT:
minValue = BigInteger.valueOf((long) Integer.MIN_VALUE);
maxValue = BigInteger.valueOf((long) Integer.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case UDINT:
minValue = BigInteger.valueOf((long) 0);
maxValue = BigInteger.valueOf(((long) Integer.MAX_VALUE) * 2);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case LINT:
minValue = BigInteger.valueOf(Long.MIN_VALUE);
maxValue = BigInteger.valueOf(Long.MAX_VALUE);
- fieldType = IntegerFieldItem.class;
+ fieldType = S7IntegerFieldItem.class;
break;
case ULINT:
minValue = BigInteger.valueOf((long) 0);
maxValue = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.valueOf((long) 2));
- fieldType = BigIntegerFieldItem.class;
+ fieldType = S7BigIntegerFieldItem.class;
break;
default:
throw new IllegalArgumentException(
"Cannot assign integer values to " + s7Field.getDataType().name() + " fields.");
}
- if(fieldType == IntegerFieldItem.class) {
+ if(fieldType == DefaultIntegerFieldItem.class) {
Long[] longValues = new Long[values.length];
for (int i = 0; i < values.length; i++) {
if(!((values[i] instanceof Byte) || (values[i] instanceof Short) ||
@@ -470,7 +470,7 @@ public class S7PlcFieldHandler implements PlcFieldHandler {
case TIME:
case DATE:
case DATE_AND_TIME:
- return new TimeFieldItem();
+ return new DefaultTimeFieldItem();
default:
throw new IllegalArgumentException(
"Cannot assign temporal values to " + s7Field.getDataType().name() + " fields.");
diff --git a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldHandler.java b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldHandler.java
index 82bc594..7c9f286 100644
--- a/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldHandler.java
+++ b/plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldHandler.java
@@ -43,7 +43,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeBoolean(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == Boolean.class) {
- return new BooleanFieldItem((Boolean[]) values);
+ return new DefaultBooleanFieldItem((Boolean[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -52,7 +52,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeByte(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == Byte.class) {
- return new IntegerFieldItem((Long[]) values);
+ return new DefaultIntegerFieldItem((Long[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -61,7 +61,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeShort(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == Short.class) {
- return new IntegerFieldItem((Long[]) values);
+ return new DefaultIntegerFieldItem((Long[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -70,7 +70,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeInteger(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == Integer.class) {
- return new IntegerFieldItem((Long[]) values);
+ return new DefaultIntegerFieldItem((Long[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -79,7 +79,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeLong(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == Long.class) {
- return new IntegerFieldItem((Long[]) values);
+ return new DefaultIntegerFieldItem((Long[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -88,7 +88,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeFloat(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == Float.class) {
- return new FloatingPointFieldItem((Double[]) values);
+ return new DefaultFloatingPointFieldItem((Double[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -97,7 +97,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeDouble(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == Double.class) {
- return new FloatingPointFieldItem((Double[]) values);
+ return new DefaultFloatingPointFieldItem((Double[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -106,7 +106,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeString(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == String.class) {
- return new StringFieldItem((String[]) values);
+ return new DefaultStringFieldItem((String[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -115,7 +115,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeTime(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == LocalTime.class) {
- return new TimeFieldItem((LocalDateTime[]) values);
+ return new DefaultTimeFieldItem((LocalDateTime[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -124,7 +124,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeDate(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == LocalDate.class) {
- return new TimeFieldItem((LocalDateTime[]) values);
+ return new DefaultTimeFieldItem((LocalDateTime[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
@@ -133,7 +133,7 @@ public class TestFieldHandler implements PlcFieldHandler {
public FieldItem encodeDateTime(PlcField field, Object[] values) {
TestField testField = (TestField) field;
if(testField.getDataType() == LocalDateTime.class) {
- return new TimeFieldItem((LocalDateTime[]) values);
+ return new DefaultTimeFieldItem((LocalDateTime[]) values);
}
throw new PlcRuntimeException("Invalid encoder for type " + testField.getDataType().getName());
}
diff --git a/plc4j/protocols/test/src/test/java/org/apache/plc4x/java/test/TestDeviceTest.java b/plc4j/protocols/test/src/test/java/org/apache/plc4x/java/test/TestDeviceTest.java
index dd0f86f..fa817cf 100644
--- a/plc4j/protocols/test/src/test/java/org/apache/plc4x/java/test/TestDeviceTest.java
+++ b/plc4j/protocols/test/src/test/java/org/apache/plc4x/java/test/TestDeviceTest.java
@@ -19,7 +19,7 @@
package org.apache.plc4x.java.test;
import org.apache.plc4x.java.base.messages.items.FieldItem;
-import org.apache.plc4x.java.base.messages.items.IntegerFieldItem;
+import org.apache.plc4x.java.base.messages.items.DefaultIntegerFieldItem;
import org.junit.Test;
import java.util.Optional;
@@ -48,7 +48,7 @@ public class TestDeviceTest {
Optional<FieldItem> value = device.get(field);
assertFalse(value.isPresent());
- device.set(field, new IntegerFieldItem((long) 42));
+ device.set(field, new DefaultIntegerFieldItem((long) 42));
value = device.get(field);
assertTrue(value.isPresent());
FieldItem fieldItem = value.get();