From 76cccc4a2f855791d5596c008f08feef745d876c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Sat, 11 Mar 2023 14:11:34 -0400 Subject: [PATCH 01/14] Update repo. --- .../bacnetip/readwrite/BACnetVendorId.java | 4 +++ .../s7/readwrite/S7VarPayloadDataItem.java | 36 ++++++++++++++++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index ebf2bba99d4..37ca4becec1 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1609,16 +1609,19 @@ public enum BACnetVendorId { KOMFORTIQ_INC((int) 1397, (int) 1397, (String) "Komfort IQ, Inc."), COOL_TERA_LIMITED((int) 1398, (int) 1398, (String) "CoolTera Limited"), HADRON_SOLUTIONS_SRLS((int) 1399, (int) 1399, (String) "Hadron Solutions S.r.l.s"), + BITPOOL((int) 1401, (int) 1401, (String) "Bitpool"), SONICULLC((int) 1402, (int) 1402, (String) "Sonicu, LLC"), RISHABH_INSTRUMENTS_LIMITED((int) 1403, (int) 1403, (String) "Rishabh Instruments Limited"), THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"), INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"), METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."), + TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD( (int) 1409, (int) 1409, (String) "LEFOO Industrial (Hangzhou) Co., Ltd."), + CALIBRATION_TECHNOLOGIES_INC((int) 1410, (int) 1410, (String) "Calibration Technologies, Inc."), ALLORADO((int) 1411, (int) 1411, (String) "Allorado"), VERKADA((int) 1412, (int) 1412, (String) "Verkada"), @@ -1628,6 +1631,7 @@ public enum BACnetVendorId { OLYMPIA_ELECTRONICS((int) 1416, (int) 1416, (String) "Olympia Electronics"), NORMAL_SOFTWARE_INC((int) 1417, (int) 1417, (String) "Normal Software, Inc."), ST_ENGINEERING_SOLUTIONJSC((int) 1418, (int) 1418, (String) "ST Engineering Solution JSC"), + UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown"); private static final Map map; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 4483814eac5..05ed37389e5 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -41,13 +41,18 @@ public class S7VarPayloadDataItem implements Message { protected final DataTransportErrorCode returnCode; protected final DataTransportSize transportSize; protected final byte[] data; + protected final Boolean hasNext; public S7VarPayloadDataItem( - DataTransportErrorCode returnCode, DataTransportSize transportSize, byte[] data) { + DataTransportErrorCode returnCode, + DataTransportSize transportSize, + byte[] data, + Boolean hasNext) { super(); this.returnCode = returnCode; this.transportSize = transportSize; this.data = data; + this.hasNext = hasNext; } public DataTransportErrorCode getReturnCode() { @@ -62,6 +67,10 @@ public byte[] getData() { return data; } + public Boolean getHasNext() { + return hasNext; + } + public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,10 +110,13 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); + // Optional Field (hasNext) (Can be skipped, if the value is null) + writeOptionalField("hasNext", hasNext, writeBoolean(writeBuffer)); + // Padding Field (padding) writePaddingField( "padding", - (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), + (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), (short) 0x00, writeUnsignedShort(writeBuffer, 8)); @@ -136,8 +148,17 @@ public int getLengthInBits() { lengthInBits += 8 * data.length; } + // Optional Field (hasNext) + if (hasNext != null) { + lengthInBits += 1; + } + // Padding Field (padding) +<<<<<<< HEAD int _timesPadding = (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)); +======= + int _timesPadding = (int) (((PADCOUNT(data, hasNext)) % (2))); +>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) while (_timesPadding-- > 0) { lengthInBits += 8; } @@ -180,13 +201,19 @@ public static S7VarPayloadDataItem staticParse(ReadBuffer readBuffer) throws Par Math.toIntExact( ((transportSize.getSizeInBits()) ? CEIL((dataLength) / (8.0)) : dataLength))); +<<<<<<< HEAD readPaddingField( readUnsignedShort(readBuffer, 8), (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0))); +======= + Boolean hasNext = readOptionalField("hasNext", readBoolean(readBuffer), (dataLength) < (-(1))); + + readPaddingField(readUnsignedShort(readBuffer, 8), (int) (((PADCOUNT(data, hasNext)) % (2)))); +>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) readBuffer.closeContext("S7VarPayloadDataItem"); // Create the instance S7VarPayloadDataItem _s7VarPayloadDataItem; - _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data); + _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data, hasNext); return _s7VarPayloadDataItem; } @@ -202,12 +229,13 @@ public boolean equals(Object o) { return (getReturnCode() == that.getReturnCode()) && (getTransportSize() == that.getTransportSize()) && (getData() == that.getData()) + && (getHasNext() == that.getHasNext()) && true; } @Override public int hashCode() { - return Objects.hash(getReturnCode(), getTransportSize(), getData()); + return Objects.hash(getReturnCode(), getTransportSize(), getData(), getHasNext()); } @Override From 39a90301793451900f56405c5098bfbbb32e0e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Thu, 16 Feb 2023 11:01:22 -0400 Subject: [PATCH 02/14] Update local repo. --- .../apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 05ed37389e5..2ef8f4bb003 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -116,7 +116,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Padding Field (padding) writePaddingField( "padding", - (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), + (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), (short) 0x00, writeUnsignedShort(writeBuffer, 8)); From 56c1b5a113ea79269f858c6bd61b9e871e70d591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Sat, 4 Feb 2023 12:15:13 -0400 Subject: [PATCH 03/14] New feature _lastitem. --- .../org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 2ef8f4bb003..5cd7c9ebe58 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -119,7 +119,6 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), (short) 0x00, writeUnsignedShort(writeBuffer, 8)); - writeBuffer.popContext("S7VarPayloadDataItem"); } From c02fec13730046c17743011318988071425fc0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Thu, 16 Feb 2023 11:01:22 -0400 Subject: [PATCH 04/14] Update local repo. --- .../org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java | 1 + 1 file changed, 1 insertion(+) diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 5cd7c9ebe58..2ef8f4bb003 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -119,6 +119,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), (short) 0x00, writeUnsignedShort(writeBuffer, 8)); + writeBuffer.popContext("S7VarPayloadDataItem"); } From 0595c0d38fbe1055e1409efcda73bca9e59ed0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Wed, 22 Feb 2023 20:02:32 -0400 Subject: [PATCH 05/14] Update repo. --- .../bacnetip/readwrite/BACnetVendorId.java | 1 - .../s7/readwrite/S7VarPayloadDataItem.java | 34 ++----------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index 37ca4becec1..b3f73c66439 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1609,7 +1609,6 @@ public enum BACnetVendorId { KOMFORTIQ_INC((int) 1397, (int) 1397, (String) "Komfort IQ, Inc."), COOL_TERA_LIMITED((int) 1398, (int) 1398, (String) "CoolTera Limited"), HADRON_SOLUTIONS_SRLS((int) 1399, (int) 1399, (String) "Hadron Solutions S.r.l.s"), - BITPOOL((int) 1401, (int) 1401, (String) "Bitpool"), SONICULLC((int) 1402, (int) 1402, (String) "Sonicu, LLC"), RISHABH_INSTRUMENTS_LIMITED((int) 1403, (int) 1403, (String) "Rishabh Instruments Limited"), diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 2ef8f4bb003..4483814eac5 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -41,18 +41,13 @@ public class S7VarPayloadDataItem implements Message { protected final DataTransportErrorCode returnCode; protected final DataTransportSize transportSize; protected final byte[] data; - protected final Boolean hasNext; public S7VarPayloadDataItem( - DataTransportErrorCode returnCode, - DataTransportSize transportSize, - byte[] data, - Boolean hasNext) { + DataTransportErrorCode returnCode, DataTransportSize transportSize, byte[] data) { super(); this.returnCode = returnCode; this.transportSize = transportSize; this.data = data; - this.hasNext = hasNext; } public DataTransportErrorCode getReturnCode() { @@ -67,10 +62,6 @@ public byte[] getData() { return data; } - public Boolean getHasNext() { - return hasNext; - } - public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -110,9 +101,6 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); - // Optional Field (hasNext) (Can be skipped, if the value is null) - writeOptionalField("hasNext", hasNext, writeBoolean(writeBuffer)); - // Padding Field (padding) writePaddingField( "padding", @@ -148,17 +136,8 @@ public int getLengthInBits() { lengthInBits += 8 * data.length; } - // Optional Field (hasNext) - if (hasNext != null) { - lengthInBits += 1; - } - // Padding Field (padding) -<<<<<<< HEAD int _timesPadding = (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)); -======= - int _timesPadding = (int) (((PADCOUNT(data, hasNext)) % (2))); ->>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) while (_timesPadding-- > 0) { lengthInBits += 8; } @@ -201,19 +180,13 @@ public static S7VarPayloadDataItem staticParse(ReadBuffer readBuffer) throws Par Math.toIntExact( ((transportSize.getSizeInBits()) ? CEIL((dataLength) / (8.0)) : dataLength))); -<<<<<<< HEAD readPaddingField( readUnsignedShort(readBuffer, 8), (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0))); -======= - Boolean hasNext = readOptionalField("hasNext", readBoolean(readBuffer), (dataLength) < (-(1))); - - readPaddingField(readUnsignedShort(readBuffer, 8), (int) (((PADCOUNT(data, hasNext)) % (2)))); ->>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) readBuffer.closeContext("S7VarPayloadDataItem"); // Create the instance S7VarPayloadDataItem _s7VarPayloadDataItem; - _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data, hasNext); + _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data); return _s7VarPayloadDataItem; } @@ -229,13 +202,12 @@ public boolean equals(Object o) { return (getReturnCode() == that.getReturnCode()) && (getTransportSize() == that.getTransportSize()) && (getData() == that.getData()) - && (getHasNext() == that.getHasNext()) && true; } @Override public int hashCode() { - return Objects.hash(getReturnCode(), getTransportSize(), getData(), getHasNext()); + return Objects.hash(getReturnCode(), getTransportSize(), getData()); } @Override From 35869e8b4e7a22a733c2ebd8b21f0a2ed85b5e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Thu, 27 Apr 2023 17:19:47 -0400 Subject: [PATCH 06/14] Fix BACnetVendorId. --- .../apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index b3f73c66439..ebf2bba99d4 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1615,12 +1615,10 @@ public enum BACnetVendorId { THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"), INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"), METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."), - TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD( (int) 1409, (int) 1409, (String) "LEFOO Industrial (Hangzhou) Co., Ltd."), - CALIBRATION_TECHNOLOGIES_INC((int) 1410, (int) 1410, (String) "Calibration Technologies, Inc."), ALLORADO((int) 1411, (int) 1411, (String) "Allorado"), VERKADA((int) 1412, (int) 1412, (String) "Verkada"), @@ -1630,7 +1628,6 @@ public enum BACnetVendorId { OLYMPIA_ELECTRONICS((int) 1416, (int) 1416, (String) "Olympia Electronics"), NORMAL_SOFTWARE_INC((int) 1417, (int) 1417, (String) "Normal Software, Inc."), ST_ENGINEERING_SOLUTIONJSC((int) 1418, (int) 1418, (String) "ST Engineering Solution JSC"), - UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown"); private static final Map map; From 126152a7d507588dda358e8d4ecd7010f8f0b975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Thu, 16 Feb 2023 11:08:53 -0400 Subject: [PATCH 07/14] Update repo. --- .../bacnetip/readwrite/BACnetVendorId.java | 3 ++ .../s7/readwrite/S7VarPayloadDataItem.java | 36 ++++++++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index ebf2bba99d4..df150c902f1 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1609,12 +1609,14 @@ public enum BACnetVendorId { KOMFORTIQ_INC((int) 1397, (int) 1397, (String) "Komfort IQ, Inc."), COOL_TERA_LIMITED((int) 1398, (int) 1398, (String) "CoolTera Limited"), HADRON_SOLUTIONS_SRLS((int) 1399, (int) 1399, (String) "Hadron Solutions S.r.l.s"), + BITPOOL((int) 1401, (int) 1401, (String) "Bitpool"), SONICULLC((int) 1402, (int) 1402, (String) "Sonicu, LLC"), RISHABH_INSTRUMENTS_LIMITED((int) 1403, (int) 1403, (String) "Rishabh Instruments Limited"), THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"), INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"), METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."), + TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD( @@ -1628,6 +1630,7 @@ public enum BACnetVendorId { OLYMPIA_ELECTRONICS((int) 1416, (int) 1416, (String) "Olympia Electronics"), NORMAL_SOFTWARE_INC((int) 1417, (int) 1417, (String) "Normal Software, Inc."), ST_ENGINEERING_SOLUTIONJSC((int) 1418, (int) 1418, (String) "ST Engineering Solution JSC"), + UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown"); private static final Map map; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 4483814eac5..05ed37389e5 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -41,13 +41,18 @@ public class S7VarPayloadDataItem implements Message { protected final DataTransportErrorCode returnCode; protected final DataTransportSize transportSize; protected final byte[] data; + protected final Boolean hasNext; public S7VarPayloadDataItem( - DataTransportErrorCode returnCode, DataTransportSize transportSize, byte[] data) { + DataTransportErrorCode returnCode, + DataTransportSize transportSize, + byte[] data, + Boolean hasNext) { super(); this.returnCode = returnCode; this.transportSize = transportSize; this.data = data; + this.hasNext = hasNext; } public DataTransportErrorCode getReturnCode() { @@ -62,6 +67,10 @@ public byte[] getData() { return data; } + public Boolean getHasNext() { + return hasNext; + } + public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,10 +110,13 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); + // Optional Field (hasNext) (Can be skipped, if the value is null) + writeOptionalField("hasNext", hasNext, writeBoolean(writeBuffer)); + // Padding Field (padding) writePaddingField( "padding", - (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), + (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), (short) 0x00, writeUnsignedShort(writeBuffer, 8)); @@ -136,8 +148,17 @@ public int getLengthInBits() { lengthInBits += 8 * data.length; } + // Optional Field (hasNext) + if (hasNext != null) { + lengthInBits += 1; + } + // Padding Field (padding) +<<<<<<< HEAD int _timesPadding = (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)); +======= + int _timesPadding = (int) (((PADCOUNT(data, hasNext)) % (2))); +>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) while (_timesPadding-- > 0) { lengthInBits += 8; } @@ -180,13 +201,19 @@ public static S7VarPayloadDataItem staticParse(ReadBuffer readBuffer) throws Par Math.toIntExact( ((transportSize.getSizeInBits()) ? CEIL((dataLength) / (8.0)) : dataLength))); +<<<<<<< HEAD readPaddingField( readUnsignedShort(readBuffer, 8), (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0))); +======= + Boolean hasNext = readOptionalField("hasNext", readBoolean(readBuffer), (dataLength) < (-(1))); + + readPaddingField(readUnsignedShort(readBuffer, 8), (int) (((PADCOUNT(data, hasNext)) % (2)))); +>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) readBuffer.closeContext("S7VarPayloadDataItem"); // Create the instance S7VarPayloadDataItem _s7VarPayloadDataItem; - _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data); + _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data, hasNext); return _s7VarPayloadDataItem; } @@ -202,12 +229,13 @@ public boolean equals(Object o) { return (getReturnCode() == that.getReturnCode()) && (getTransportSize() == that.getTransportSize()) && (getData() == that.getData()) + && (getHasNext() == that.getHasNext()) && true; } @Override public int hashCode() { - return Objects.hash(getReturnCode(), getTransportSize(), getData()); + return Objects.hash(getReturnCode(), getTransportSize(), getData(), getHasNext()); } @Override From 033f533b76190fa2698652495c8046798093eaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Wed, 22 Feb 2023 20:02:32 -0400 Subject: [PATCH 08/14] Update repo. --- .../bacnetip/readwrite/BACnetVendorId.java | 1 - .../s7/readwrite/S7VarPayloadDataItem.java | 34 ++----------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index df150c902f1..43a5539556e 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1609,7 +1609,6 @@ public enum BACnetVendorId { KOMFORTIQ_INC((int) 1397, (int) 1397, (String) "Komfort IQ, Inc."), COOL_TERA_LIMITED((int) 1398, (int) 1398, (String) "CoolTera Limited"), HADRON_SOLUTIONS_SRLS((int) 1399, (int) 1399, (String) "Hadron Solutions S.r.l.s"), - BITPOOL((int) 1401, (int) 1401, (String) "Bitpool"), SONICULLC((int) 1402, (int) 1402, (String) "Sonicu, LLC"), RISHABH_INSTRUMENTS_LIMITED((int) 1403, (int) 1403, (String) "Rishabh Instruments Limited"), diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 05ed37389e5..0d6c861cb25 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -41,18 +41,13 @@ public class S7VarPayloadDataItem implements Message { protected final DataTransportErrorCode returnCode; protected final DataTransportSize transportSize; protected final byte[] data; - protected final Boolean hasNext; public S7VarPayloadDataItem( - DataTransportErrorCode returnCode, - DataTransportSize transportSize, - byte[] data, - Boolean hasNext) { + DataTransportErrorCode returnCode, DataTransportSize transportSize, byte[] data) { super(); this.returnCode = returnCode; this.transportSize = transportSize; this.data = data; - this.hasNext = hasNext; } public DataTransportErrorCode getReturnCode() { @@ -67,10 +62,6 @@ public byte[] getData() { return data; } - public Boolean getHasNext() { - return hasNext; - } - public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -110,9 +101,6 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); - // Optional Field (hasNext) (Can be skipped, if the value is null) - writeOptionalField("hasNext", hasNext, writeBoolean(writeBuffer)); - // Padding Field (padding) writePaddingField( "padding", @@ -148,17 +136,8 @@ public int getLengthInBits() { lengthInBits += 8 * data.length; } - // Optional Field (hasNext) - if (hasNext != null) { - lengthInBits += 1; - } - // Padding Field (padding) -<<<<<<< HEAD int _timesPadding = (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)); -======= - int _timesPadding = (int) (((PADCOUNT(data, hasNext)) % (2))); ->>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) while (_timesPadding-- > 0) { lengthInBits += 8; } @@ -201,19 +180,13 @@ public static S7VarPayloadDataItem staticParse(ReadBuffer readBuffer) throws Par Math.toIntExact( ((transportSize.getSizeInBits()) ? CEIL((dataLength) / (8.0)) : dataLength))); -<<<<<<< HEAD readPaddingField( readUnsignedShort(readBuffer, 8), (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0))); -======= - Boolean hasNext = readOptionalField("hasNext", readBoolean(readBuffer), (dataLength) < (-(1))); - - readPaddingField(readUnsignedShort(readBuffer, 8), (int) (((PADCOUNT(data, hasNext)) % (2)))); ->>>>>>> fe65e60f40 (Test for S7VarPayloadItem.) readBuffer.closeContext("S7VarPayloadDataItem"); // Create the instance S7VarPayloadDataItem _s7VarPayloadDataItem; - _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data, hasNext); + _s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data); return _s7VarPayloadDataItem; } @@ -229,13 +202,12 @@ public boolean equals(Object o) { return (getReturnCode() == that.getReturnCode()) && (getTransportSize() == that.getTransportSize()) && (getData() == that.getData()) - && (getHasNext() == that.getHasNext()) && true; } @Override public int hashCode() { - return Objects.hash(getReturnCode(), getTransportSize(), getData(), getHasNext()); + return Objects.hash(getReturnCode(), getTransportSize(), getData()); } @Override From 9510b94c26dabb6787ccfd6d52cf7d1ea4dc0a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Thu, 23 Feb 2023 21:11:20 -0400 Subject: [PATCH 09/14] Update repo. --- .../apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index 43a5539556e..8f5d0a26fcd 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1615,6 +1615,7 @@ public enum BACnetVendorId { THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"), INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"), METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."), +<<<<<<< HEAD TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), @@ -1629,6 +1630,8 @@ public enum BACnetVendorId { OLYMPIA_ELECTRONICS((int) 1416, (int) 1416, (String) "Olympia Electronics"), NORMAL_SOFTWARE_INC((int) 1417, (int) 1417, (String) "Normal Software, Inc."), ST_ENGINEERING_SOLUTIONJSC((int) 1418, (int) 1418, (String) "ST Engineering Solution JSC"), + TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), + ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown"); private static final Map map; From 9ddf709c63a048eb13f3c0c1ee42e760432d82a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Tue, 28 Feb 2023 13:48:37 -0400 Subject: [PATCH 10/14] Apache Hop integration. --- .../apache-hop/plc4x-hop-actions/pom.xml | 146 ++ .../hop/actions/ActionSampleMetaData.java | 35 + .../hop/actions/Plc4xCheckConnections.java | 271 ++++ .../actions/Plc4xCheckConnectionsDialog.java | 371 +++++ .../messages/messages_en_US.properties | 49 + .../src/main/resources/plc4x_toddy.svg | 1306 +++++++++++++++++ .../plc4x-hop-assemblies-action/pom.xml | 82 ++ .../src/assembly/assembly.xml | 52 + .../src/main/resources/version.xml | 20 + .../plc4x-hop-assemblies-metadata/pom.xml | 82 ++ .../src/assembly/assembly.xml | 69 + .../src/main/resources/version.xml | 20 + .../plc4x-hop-assemblies-transform/pom.xml | 82 ++ .../src/assembly/assembly.xml | 52 + .../src/main/resources/version.xml | 20 + .../apache-hop/plc4x-hop-assemblies/pom.xml | 42 + .../apache-hop/plc4x-hop-metadata/pom.xml | 129 ++ .../plc4x/hop/metadata/Plc4xConnection.java | 73 + .../hop/metadata/Plc4xConnectionEditor.java | 148 ++ .../messages/messages_en_US.properties | 22 + .../src/main/resources/plc4x_toddy.svg | 1306 +++++++++++++++++ .../apache-hop/plc4x-hop-transformer/pom.xml | 143 ++ .../hop/transforms/plc4xevent/Plc4xEvent.java | 346 +++++ .../transforms/plc4xevent/Plc4xEventData.java | 50 + .../plc4xevent/Plc4xEventDialog.java | 663 +++++++++ .../transforms/plc4xevent/Plc4xEventMeta.java | 239 +++ .../hop/transforms/plc4xinput/Plc4xRead.java | 446 ++++++ .../transforms/plc4xinput/Plc4xReadData.java | 48 + .../plc4xinput/Plc4xReadDialog.java | 600 ++++++++ .../transforms/plc4xinput/Plc4xReadMeta.java | 308 ++++ .../transforms/plc4xoutput/Plc4xWrite.java | 478 ++++++ .../plc4xoutput/Plc4xWriteData.java | 49 + .../plc4xoutput/Plc4xWriteDialog.java | 674 +++++++++ .../plc4xoutput/Plc4xWriteMeta.java | 310 ++++ .../hop/transforms/plc4xsubs/Plc4xSubs.java | 446 ++++++ .../transforms/plc4xsubs/Plc4xSubsData.java | 49 + .../transforms/plc4xsubs/Plc4xSubsDialog.java | 601 ++++++++ .../transforms/plc4xsubs/Plc4xSubsMeta.java | 310 ++++ .../hop/transforms/util/Plc4xDataType.java | 115 ++ .../transforms/util/Plc4xGeneratorField.java | 275 ++++ .../hop/transforms/util/Plc4xPlcField.java | 148 ++ .../util/Plc4xWrapperConnection.java | 60 + .../messages/messages_en_US.properties | 69 + .../messages/messages_es_ES.properties | 69 + .../messages/messages_en_US.properties | 69 + .../messages/messages_es_ES.properties | 69 + .../messages/messages_en_US.properties | 69 + .../messages/messages_es_ES.properties | 69 + .../messages/messages_en_US.properties | 69 + .../messages/messages_es_ES.properties | 69 + .../src/main/resources/plc4x_action.svg | 1306 +++++++++++++++++ .../src/main/resources/plc4x_event.svg | 822 +++++++++++ .../src/main/resources/plc4x_read.svg | 813 ++++++++++ .../src/main/resources/plc4x_subs.svg | 743 ++++++++++ .../src/main/resources/plc4x_write.svg | 810 ++++++++++ .../plc4x-hop-utils/hop-plc4x-grafana/pom.xml | 138 ++ .../utils/transforms/grafana/GrafanaPost.java | 589 ++++++++ .../grafana/GrafanaPostArgumentField.java | 70 + .../transforms/grafana/GrafanaPostData.java | 66 + .../transforms/grafana/GrafanaPostDialog.java | 1098 ++++++++++++++ .../grafana/GrafanaPostLoookupField.java | 65 + .../transforms/grafana/GrafanaPostMeta.java | 425 ++++++ .../transforms/grafana/GrafanaPostQuery.java | 57 + .../grafana/GrafanaPostResultField.java | 90 ++ .../src/main/resources/grafana.svg | 103 ++ .../messages/messages_en_US.properties | 138 ++ .../apache-hop/plc4x-hop-utils/pom.xml | 33 + plc4j/integrations/apache-hop/pom.xml | 251 ++++ plc4j/integrations/pom.xml | 1 + .../protocols/ads/images/ads-statemachine.svg | 1 + .../asciidoc/images/plc4x-architecture.png | Bin 0 -> 24761 bytes 71 files changed, 18906 insertions(+) create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnectionsDialog.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/assembly/assembly.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/main/resources/version.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/main/resources/version.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/main/resources/version.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-assemblies/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnection.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/org/apache/plc4x/hop/metadata/messages/messages_en_US.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/plc4x_toddy.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventData.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadData.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteData.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteDialog.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsData.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsDialog.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xDataType.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xGeneratorField.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xWrapperConnection.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_es_ES.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_en_US.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_es_ES.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_en_US.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_es_ES.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_en_US.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_es_ES.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_action.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_event.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_read.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_subs.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_write.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/pom.xml create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPost.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostArgumentField.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostData.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostDialog.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostLoookupField.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostMeta.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostQuery.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostResultField.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/grafana.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/org/apache/plc4x/hop/utils/transforms/grafana/messages/messages_en_US.properties create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-utils/pom.xml create mode 100644 plc4j/integrations/apache-hop/pom.xml create mode 100644 src/site/asciidoc/developers/protocols/ads/images/ads-statemachine.svg create mode 100644 src/site/asciidoc/images/plc4x-architecture.png diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml new file mode 100644 index 00000000000..ee58270dbcc --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml @@ -0,0 +1,146 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4j-apache-hop + 0.11.0-SNAPSHOT + + plc4x-hop-action + jar + PLC4J: Integrations: Apache Hop: Action + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + org.jboss.jandex + jandex-maven-plugin + 1.0.8 + + + make-index + + jandex + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.plc4x:plc4j-api:jar:${project.version} + org.apache.plc4x:plc4j-spi:jar:${project.version} + org.apache.plc4x:plc4j-driver-s7:jar:${project.version} + org.apache.plc4x:plc4j-transport-tcp:jar:${project.version} + + + + + + + + + org.apache.hop + hop-core + ${hop.version} + + + * + * + + + + + org.apache.hop + hop-ui + ${hop.version} + + + org.apache.hop + hop-engine + + + + + org.eclipse.platform + org.eclipse.swt.gtk.linux.x86_64 + ${org.eclipse.platform.version} + + + org.apache.plc4x + plc4j-driver-s7 + ${project.version} + + + org.apache.plc4x + plc4j-api + ${project.version} + + + org.apache.plc4x + plc4j-spi + ${project.version} + + + org.apache.plc4x + plc4j-transport-tcp + ${project.version} + + + ${project.groupId} + plc4x-hop-metadata + ${project.version} + + + org.apache.hop + hop-engine + ${hop.version} + + + * + * + + + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java new file mode 100644 index 00000000000..ecaaf6efdf7 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.plc4x.hop.actions; + +import org.apache.hop.metadata.api.HopMetadata; +import org.apache.hop.metadata.api.HopMetadataBase; +import org.apache.hop.metadata.api.IHopMetadata; + +/** + * + * @author cgarcia + */ +@HopMetadata( + key = "Xplc4xconnection", + name = "PLC4x Connection", + description = "A shared PLC4x connection to a PLC", + image = "plc4x_toddy.svg", + documentationUrl = "/metadata-types/neo4j/neo4j-connection.html") +public class ActionSampleMetaData extends HopMetadataBase implements IHopMetadata { + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java new file mode 100644 index 00000000000..752890f7f23 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java @@ -0,0 +1,271 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.actions; + +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.Result; +import org.apache.hop.core.annotations.Action; +import org.apache.hop.core.exception.HopXmlException; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.core.xml.XmlHandler; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.workflow.WorkflowMeta; +import org.apache.hop.workflow.action.ActionBase; +import org.apache.hop.workflow.action.IAction; + + +import java.util.List; +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.w3c.dom.Node; + + +@Action( + id = "CHECK_PLC4X_CONNECTIONS", + name = "i18n::Plc4xAction.Name", + description = "i18n::Plc4xAction.Description", + image = "plc4x_toddy.svg", + categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.Conditions", + keywords = "i18n::Plc4xAction.keyword", + documentationUrl = "/workflow/actions/checkdbconnection.html") +public class Plc4xCheckConnections extends ActionBase implements Cloneable, IAction { + private static final Class PKG = Plc4xCheckConnections.class; // Needed by Translator + + + private Plc4xConnection[] connections; + + protected static final String[] unitTimeDesc = + new String[] { + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeMilliSecond.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeSecond.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeMinute.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeHour.Label"), + }; + protected static final String[] unitTimeCode = + new String[] {"millisecond", "second", "minute", "hour"}; + + public static final int UNIT_TIME_MILLI_SECOND = 0; + public static final int UNIT_TIME_SECOND = 1; + public static final int UNIT_TIME_MINUTE = 2; + public static final int UNIT_TIME_HOUR = 3; + + private String[] waitfors; + private int[] waittimes; + + private long timeStart; + private long now; + + public Plc4xCheckConnections( String name) { + super(name, ""); + //connections = null; + waitfors = null; + waittimes = null; + } + + public Plc4xCheckConnections() { + this( ""); + } + + public Object clone() { + Plc4xCheckConnections c = (Plc4xCheckConnections) super.clone(); + return c; + } + + + public Plc4xConnection[] getConnections() { + return connections; + } + + public void setConnections(Plc4xConnection[] connections) { + this.connections = connections; + } + + public String[] getWaitfors() { + return waitfors; + } + + public void setWaitfors(String[] waitfors) { + this.waitfors = waitfors; + } + + public int[] getWaittimes() { + return waittimes; + } + + public void setWaittimes(int[] waittimes) { + this.waittimes = waittimes; + } + + public long getTimeStart() { + return timeStart; + } + + public long getNow() { + return now; + } + + private static String getWaitTimeCode(int i) { + if (i < 0 || i >= unitTimeCode.length) { + return unitTimeCode[0]; + } + return unitTimeCode[i]; + } + + public static String getWaitTimeDesc(int i) { + if (i < 0 || i >= unitTimeDesc.length) { + return unitTimeDesc[0]; + } + return unitTimeDesc[i]; + } + + public static int getWaitTimeByDesc(String tt) { + if (tt == null) { + return 0; + } + + for (int i = 0; i < unitTimeDesc.length; i++) { + if (unitTimeDesc[i].equalsIgnoreCase(tt)) { + return i; + } + } + + // If this fails, try to match using the code. + return getWaitTimeByCode(tt); + } + + private static int getWaitTimeByCode(String tt) { + if (tt == null) { + return 0; + } + + for (int i = 0; i < unitTimeCode.length; i++) { + if (unitTimeCode[i].equalsIgnoreCase(tt)) { + return i; + } + } + return 0; + } + + + + /** + * + * Save values to XML + * + * @return + */ + @Override + public String getXml() { + StringBuilder xml = new StringBuilder(120); + xml.append(super.getXml()); + xml.append(" ").append(Const.CR); + if (connections != null) { + for (int i = 0; i < connections.length; i++) { + xml.append(" ").append(Const.CR); + xml.append(" ") + .append( + XmlHandler.addTagValue( + "name", connections[i] == null ? null : connections[i].getName())); + xml.append(" ").append(XmlHandler.addTagValue("waitfor", waitfors[i])); + xml.append(" ") + .append(XmlHandler.addTagValue("waittime", getWaitTimeCode(waittimes[i]))); + xml.append(" ").append(Const.CR); + } + } + xml.append(" ").append(Const.CR); + + return xml.toString(); + } + + /** + * + * Read the XML and get the values needed for the acton + * + * @param entrynode + * @param metadataProvider + * @throws HopXmlException + */ + @Override + public void loadXml( Node entrynode, IHopMetadataProvider metadataProvider, IVariables variables ) throws HopXmlException { + try { + super.loadXml(entrynode); + Node fields = XmlHandler.getSubNode(entrynode, "connections"); + + // How many hosts? + int nrFields = XmlHandler.countNodes(fields, "connection"); + connections = new Plc4xConnection[nrFields]; + waitfors = new String[nrFields]; + waittimes = new int[nrFields]; + // Read them all... + for (int i = 0; i < nrFields; i++) { + Node fnode = XmlHandler.getSubNodeByNr(fields, "connection", i); + String dbname = XmlHandler.getTagValue(fnode, "name"); + + //connections[i] = Plc4xConnection.loadDatabase(metadataProvider, dbname); + if (dbname != null) { + connections[i] = metadataProvider.getSerializer(Plc4xConnection.class).load(dbname); + waitfors[i] = XmlHandler.getTagValue(fnode, "waitfor"); + waittimes[i] = getWaitTimeByCode(Const.NVL(XmlHandler.getTagValue(fnode, "waittime"), "")); + }; + } + } catch (HopXmlException xe) { + throw new HopXmlException( + BaseMessages.getString( + PKG, + "Plc4xCheckConnections.ERROR_0001_Cannot_Load_Job_Entry_From_Xml_Node", + xe.getMessage())); + } catch (HopException ex) { + throw new HopXmlException( + BaseMessages.getString( + PKG, + "Plc4xCheckConnections.ERROR_0001_Cannot_Load_Job_Entry_From_Xml_Node", + ex.getMessage())); + } + } + + /** + * Execute this action and return the result. In this case it means, just set the result boolean in the Result + * class. + * + * @param result The result of the previous execution + * @return The Result of the execution. + */ + @Override + public Result execute( Result result, int nr ) { + result.setResult(true); + System.out.println("NR: " + nr); + + return result; + } + + /** + * + * Add checks to report warnings + * + * @param remarks + * @param workflowMeta + * @param variables + * @param metadataProvider + */ + @Override + public void check( List remarks, WorkflowMeta workflowMeta, IVariables variables, + IHopMetadataProvider metadataProvider ) { + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnectionsDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnectionsDialog.java new file mode 100644 index 00000000000..791d3b88611 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnectionsDialog.java @@ -0,0 +1,371 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.plc4x.hop.actions; + +import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.gui.WindowProperty; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.workflow.action.ActionDialog; +import org.apache.hop.ui.workflow.dialog.WorkflowDialog; +import org.apache.hop.workflow.WorkflowMeta; +import org.apache.hop.workflow.action.IAction; +import org.apache.hop.workflow.action.IActionDialog; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.*; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.*; + +import org.apache.hop.metadata.api.IHopMetadata; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.metadata.MetadataManager; +import org.apache.hop.ui.core.widget.MetaSelectionLine; + + +public class Plc4xCheckConnectionsDialog extends ActionDialog implements IActionDialog { + private static final Class PKG = Plc4xCheckConnectionsDialog.class; // Needed by Translator + + private Shell shell; + + private Text wName; + + private Plc4xCheckConnections action; + + private boolean changed; + + private TableView wFields; + + private MetaSelectionLine wConnection; + + public Plc4xCheckConnectionsDialog(Shell parent, IAction action, WorkflowMeta workflowMeta, IVariables variables) { + super( parent, workflowMeta, variables ); + this.action = (Plc4xCheckConnections) action; + if ( this.action.getName() == null ) { + this.action.setName( BaseMessages.getString( PKG, "Plc4xCheckConnections.Label" ) ); + } + } + + @Override + public IAction open() { + Shell parent = getParent(); + + shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX | SWT.RESIZE); + props.setLook(shell); + WorkflowDialog.setShellImage(shell, action); + + ModifyListener lsMod = (ModifyEvent e) -> action.setChanged(); + changed = action.hasChanged(); + + FormLayout formLayout = new FormLayout(); + formLayout.marginWidth = Const.FORM_MARGIN; + formLayout.marginHeight = Const.FORM_MARGIN; + + shell.setLayout(formLayout); + shell.setText(BaseMessages.getString(PKG, "Plc4xCheckonnections.Title")); + + int middle = props.getMiddlePct(); + int margin = Const.MARGIN; + + // Buttons at the bottom + // + Button wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, (Event e) -> ok()); + Button wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, (Event e) -> cancel()); + BaseTransformDialog.positionBottomButtons(shell, new Button[] {wOk, wCancel}, margin, null); + + // Filename line + Label wlName = new Label(shell, SWT.RIGHT); + wlName.setText(BaseMessages.getString(PKG, "Plc4xCheckConnections.Name.Label")); + props.setLook(wlName); + FormData fdlName = new FormData(); + fdlName.left = new FormAttachment(0, 0); + fdlName.right = new FormAttachment(middle, -margin); + fdlName.top = new FormAttachment(0, margin); + wlName.setLayoutData(fdlName); + wName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wName); + wName.addModifyListener(lsMod); + FormData fdName = new FormData(); + fdName.left = new FormAttachment(middle, 0); + fdName.top = new FormAttachment(0, margin); + fdName.right = new FormAttachment(100, 0); + wName.setLayoutData(fdName); + + Label wlFields = new Label(shell, SWT.NONE); + wlFields.setText(BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.Label")); + props.setLook(wlFields); + FormData fdlFields = new FormData(); + fdlFields.left = new FormAttachment(0, 0); + // fdlFields.right= new FormAttachment(middle, -margin); + fdlFields.top = new FormAttachment(wName, 2 * margin); + wlFields.setLayoutData(fdlFields); + + + wConnection = + new MetaSelectionLine<>( + variables, + metadataProvider, + Plc4xConnection.class, + shell, + SWT.NONE, + BaseMessages.getString(PKG, "Plc4xCheckConnections.Connection.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.Connection.Tooltip")); + props.setLook(wConnection); + FormData fdConnection = new FormData(); + fdConnection.left = new FormAttachment(0, 0); + fdConnection.right = new FormAttachment(100, 0); + //fdConnection.top = new FormAttachment(wTransformName, margin); + wConnection.setLayoutData(fdConnection); + + try { + wConnection.fillItems(); + } catch (Exception e) { + new ErrorDialog(shell, "Error", "Error listing Cassandra connection metadata objects", e); + } + + + // Buttons to the right of the screen... + Button wbGetConnections = new Button(shell, SWT.PUSH | SWT.CENTER); + props.setLook(wbGetConnections); + wbGetConnections.setText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.GetConnections")); + wbGetConnections.setToolTipText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.GetConnections.Tooltip")); + FormData fdbGetConnections = new FormData(); + fdbGetConnections.right = new FormAttachment(100, -margin); + fdbGetConnections.top = new FormAttachment(wlFields, margin); + wbGetConnections.setLayoutData(fdbGetConnections); + + // Buttons to the right of the screen... + Button wbdSourceFileFolder = new Button(shell, SWT.PUSH | SWT.CENTER); + props.setLook(wbdSourceFileFolder); + wbdSourceFileFolder.setText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.DeleteEntry")); + wbdSourceFileFolder.setToolTipText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.DeleteSourceFileButton.Label")); + FormData fdbdSourceFileFolder = new FormData(); + fdbdSourceFileFolder.right = new FormAttachment(100, -margin); + fdbdSourceFileFolder.top = new FormAttachment(wbGetConnections, margin); + wbdSourceFileFolder.setLayoutData(fdbdSourceFileFolder); + + int rows = + action.getConnections() == null + ? 1 + : (action.getConnections().length == 0 ? 0 : action.getConnections().length); + + final int FieldsRows = rows; + + ColumnInfo[] colinf = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.Argument.Label"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + this.getWorkflowMeta().getDatabaseNames(), + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.WaitFor.Label"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.WaitForTime.Label"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + Plc4xCheckConnections.unitTimeDesc, + false), + }; + + colinf[0].setToolTip(BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.Column")); + colinf[1].setUsingVariables(true); + colinf[1].setToolTip(BaseMessages.getString(PKG, "Plc4xCheckConnections.WaitFor.ToolTip")); + + wFields = + new TableView( + variables, + shell, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinf, + FieldsRows, + lsMod, + props); + + FormData fdFields = new FormData(); + fdFields.left = new FormAttachment(0, 0); + fdFields.top = new FormAttachment(wlFields, margin); + fdFields.right = new FormAttachment(wbGetConnections, -margin); + fdFields.bottom = new FormAttachment(wOk, -2 * margin); + wFields.setLayoutData(fdFields); + + // Delete files from the list of files... + wbdSourceFileFolder.addListener( + SWT.Selection, + e -> { + int[] idx = wFields.getSelectionIndices(); + wFields.remove(idx); + wFields.removeEmptyRows(); + wFields.setRowNums(); + }); + + // get connections... + wbGetConnections.addListener(SWT.Selection, e -> getConnections()); + + getData(); + + BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel()); + + return action; + } + + // public void addDatabases() { + // connections = workflowMeta.getDatabaseNames(); + // } + + public void getConnections() { + /* + this.workflowMeta.getMetadataProvider().getMetadataClasses().forEach( + (c) -> { + System.out.println("Name: " + c.getName()); + }); + IHopMetadataProvider hmdp = this.workflowMeta.getMetadataProvider(); + */ + Class metadataClass = null; + + java.util.List databases = new ArrayList<>(); //this.workflowMeta.getMetadataProvider(). + try { + metadataClass = metadataProvider.getMetadataClassForKey("plc4x-connection"); + MetadataManager manager = new MetadataManager<>(variables, metadataProvider, metadataClass, null); + manager.getNames().forEach((s)->{ + try { + databases.add((Plc4xConnection) manager.loadElement(s)); + } catch (HopException ex) { + Logger.getLogger(Plc4xCheckConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + }); + + } catch (Exception ex) { + Logger.getLogger(Plc4xCheckConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + + + wFields.removeAll(); + + for (Plc4xConnection ci : databases) { + if (ci != null) { + wFields.add(new String[] {ci.getName(), "0", Plc4xCheckConnections.unitTimeDesc[0]}); + } + } + wFields.removeEmptyRows(); + wFields.setRowNums(); + wFields.optWidth(true); + } + + public void dispose() { + WindowProperty winprop = new WindowProperty(shell); + props.setScreen(winprop); + shell.dispose(); + } + + /** Copy information from the meta-data input to the dialog fields. */ + public void getData() { + if (action.getName() != null) { + wName.setText(action.getName()); + } + + if (action.getConnections() != null) { + for (int i = 0; i < action.getConnections().length; i++) { + TableItem ti = wFields.table.getItem(i); + if (action.getConnections()[i] != null) { + ti.setText(1, action.getConnections()[i].getName()); + ti.setText(2, "" + Const.toInt(action.getWaitfors()[i], 0)); + ti.setText(3, Plc4xCheckConnections.getWaitTimeDesc(action.getWaittimes()[i])); + } + } + wFields.setRowNums(); + wFields.optWidth(true); + } + wName.selectAll(); + wName.setFocus(); + } + + private void cancel() { + action.setChanged(changed); + action = null; + dispose(); + } + + private void ok() { + if (Utils.isEmpty(wName.getText())) { + MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR); + mb.setText(BaseMessages.getString(PKG, "System.TransformActionNameMissing.Title")); + mb.setMessage(BaseMessages.getString(PKG, "System.ActionNameMissing.Msg")); + mb.open(); + return; + } + Class metadataClass = null; + action.setName(wName.getText()); + + int nrItems = wFields.nrNonEmpty(); + System.out.println("Numero de items: " + nrItems); + + Plc4xConnection[] connections = new Plc4xConnection[nrItems]; + String[] waitfors = new String[nrItems]; + int[] waittimes = new int[nrItems]; + + + try { + metadataClass = metadataProvider.getMetadataClassForKey("plc4x-connection"); + } catch (HopException ex) { + Logger.getLogger(Plc4xCheckConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + MetadataManager manager = new MetadataManager<>(variables, metadataProvider, metadataClass, null); + + for (int i = 0; i < nrItems; i++) { + String arg = wFields.getNonEmpty(i).getText(1); + Plc4xConnection conn; + try { + conn = (Plc4xConnection) manager.loadElement(arg); + if (conn != null) { + connections[i] = conn; + waitfors[i] = "" + Const.toInt(wFields.getNonEmpty(i).getText(2), 0); + waittimes[i] = + Plc4xCheckConnections.getWaitTimeByDesc(wFields.getNonEmpty(i).getText(3)); + } + } catch (HopException ex) { + Logger.getLogger(Plc4xCheckConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + + } + action.setConnections(connections); + action.setWaitfors(waitfors); + action.setWaittimes(waittimes); + + dispose(); + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties new file mode 100644 index 00000000000..f13f6255eb2 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties @@ -0,0 +1,49 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +# +Plc4xCheckConnections.Name=Check PLC connections +Plc4xCheckConnections.Description=Check if we can connect to one or several databases. +Plc4xCheckConnections.ConnectionOK=We can successfully connect to database [{0}] (connection [{1}]) +Plc4xCheckConnections.ERROR_0001_Cannot_Load_Job_Entry_From_Xml_Node=Unable to load action of type 'Check Db connection' from XML node. Exception : {0} +Plc4xCheckConnections.Exception=Cannot connect to database [{0}] (connection [{1}]). Exception : [{2}] +Plc4xCheckConnections.Log.Info.ConnectionsInSuccess=[{0}] connections were successfully checked. +Plc4xCheckConnections.Log.Info.ConnectionsInError=[{0}] connections were in error. +Plc4xCheckConnections.UnitTimeMilliSecond.Label=Milliseconds +Plc4xCheckConnections.UnitTimeSecond.Label=Seconds +Plc4xCheckConnections.UnitTimeMinute.Label=Minutes +Plc4xCheckConnections.UnitTimeHour.Label=Hours +Plc4xCheckConnections.Connected=Connected to database [{0}] (connection [{1}])... +Plc4xCheckConnections.Wait=We need to leave the connection open {0} {1} ... +Plc4xCheckConnections.WaitTimeIsElapsed.Label=Wait time is elapsed for plc [{0}] (connection [{1}]). The connection will be closed ... +Plc4xCheckConnections.Title=Check PLC connections +Plc4xCheckConnections.Name.Default=Check PLC connections +Plc4xCheckConnections.Name.Label=Action name +Plc4xCheckConnections.Fields.Argument.Label=Connection +Plc4xCheckConnections.Fields.Label=Connections +Plc4xCheckConnections.Fields.Column=Connections +Plc4xCheckConnections.Fields.WaitFor.Label=Wait +Plc4xCheckConnections.Fields.WaitForTime.Label=Units of time +Plc4xCheckConnections.WaitFor.ToolTip=After the connection was opened\nwait x (s, mn,..) +Plc4xCheckConnections.DeleteSourceFileButton.Label=Remove selected items from the list. +Plc4xCheckConnections.DeleteEntry=Delete +Plc4xCheckConnections.GetConnections=Get connections +Plc4xCheckConnections.GetConnections.Tooltip=Get available connections +Plc4xCheckConnections.keyword=check,plc,database,connection +Plc4xCheckConnections.Connection.Label +Plc4xCheckConnections.Connection.Tooltip \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy.svg b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy.svg new file mode 100644 index 00000000000..01694ecd5df --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy.svg @@ -0,0 +1,1306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/pom.xml new file mode 100644 index 00000000000..3f95f27e849 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4x-hop-assemblies + 0.11.0-SNAPSHOT + + plc4x-hop-assemblies-action + pom + PLC4J: Integrations: Apache Hop: Assemblies: Action + + + + + org.apache.plc4x + plc4x-hop-action + ${project.version} + + + + + + + + maven-assembly-plugin + ${maven-assembly-plugin.version} + + + + + + + + assembly + + + ${basedir}/src/assembly/assembly.xml + + + + + + maven-assembly-plugin + + + assembly_package + compile + + single + + + ${basedir}/src/assembly + false + + + + + + + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/assembly/assembly.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/assembly/assembly.xml new file mode 100644 index 00000000000..84529d10bab --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/assembly/assembly.xml @@ -0,0 +1,52 @@ + + + + + plc4x-plugin-assemblies-action + + zip + + plugins/actions/plc4x + + + ${project.basedir}/src/main/resources/version.xml + . + true + + + + + lib + + **/* + + + + + + false + + org.apache.plc4x:plc4x-hop-action:jar + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/main/resources/version.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/main/resources/version.xml new file mode 100644 index 00000000000..2703899672c --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-action/src/main/resources/version.xml @@ -0,0 +1,20 @@ + + +${project.version} \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/pom.xml new file mode 100644 index 00000000000..290099015a3 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4x-hop-assemblies + 0.11.0-SNAPSHOT + + + plc4x-hop-assemblies-metadata + pom + PLC4J: Integrations: Apache Hop: Assemblies: Metadata + + + + org.apache.plc4x + plc4x-hop-metadata + ${project.version} + + + + + + + + maven-assembly-plugin + ${maven-assembly-plugin.version} + + + + + + + + assembly + + + ${basedir}/src/assembly/assembly.xml + + + + + + maven-assembly-plugin + + + assembly_package + compile + + single + + + ${basedir}/src/assembly + false + + + + + + + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml new file mode 100644 index 00000000000..c79e5135186 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml @@ -0,0 +1,69 @@ + + + + + plc4x-plugin-assemblies-metadata + + zip + + plugins/metadata/plc4x + + + ${project.basedir}/src/main/resources/version.xml + . + true + + + + + lib + + **/* + + + + + + false + + org.apache.plc4x:plc4x-hop-metadata:jar + + + + + lib + false + true + runtime + + com.github.jinahya:bit-io:jar + ch.qos.logback:logback-core + io.netty:netty-buffer + io.netty:netty-codec:jar + io.netty:netty-common:jar + io.netty:netty-resolver:jar + io.netty:netty-transport + + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/main/resources/version.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/main/resources/version.xml new file mode 100644 index 00000000000..2703899672c --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/main/resources/version.xml @@ -0,0 +1,20 @@ + + +${project.version} \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/pom.xml new file mode 100644 index 00000000000..66253b85961 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4x-hop-assemblies + 0.11.0-SNAPSHOT + + plc4x-hop-assemblies-transform + pom + PLC4J: Integrations: Apache Hop: Assemblies: Transform + + + + + org.apache.plc4x + plc4x-hop-transform + ${project.version} + + + + + + + + maven-assembly-plugin + ${maven-assembly-plugin.version} + + + + + + + + assembly + + + ${basedir}/src/assembly/assembly.xml + + + + + + maven-assembly-plugin + + + assembly_package + compile + + single + + + ${basedir}/src/assembly + false + + + + + + + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml new file mode 100644 index 00000000000..3321a4ce6fe --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml @@ -0,0 +1,52 @@ + + + + + plc4x-plugin-assemblies-transform + + zip + + plugins/transforms/plc4x + + + ${project.basedir}/src/main/resources/version.xml + . + true + + + + + lib + + **/* + + + + + + false + + org.apache.plc4x:plc4x-hop-transform:jar + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/main/resources/version.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/main/resources/version.xml new file mode 100644 index 00000000000..2703899672c --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/main/resources/version.xml @@ -0,0 +1,20 @@ + + +${project.version} \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/pom.xml new file mode 100644 index 00000000000..ccc6d04b8e7 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.apache.plc4x + plc4j-apache-hop + 0.11.0-SNAPSHOT + + + plc4x-hop-assemblies + pom + PLC4J: Integrations: Apache Hop: Assemblies + + + ${project.build.directory}/assembly + + + + plc4x-hop-assemblies-metadata + plc4x-hop-assemblies-action + plc4x-hop-assemblies-transform + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml new file mode 100644 index 00000000000..22eccd03ab7 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml @@ -0,0 +1,129 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4j-apache-hop + 0.11.0-SNAPSHOT + + plc4x-hop-metadata + jar + + PLC4J: Integrations: Apache Hop: Metadata + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + org.jboss.jandex + jandex-maven-plugin + 1.0.8 + + + make-index + + jandex + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.plc4x:plc4j-spi:jar:${project.version} + org.apache.plc4x:plc4j-driver-s7:jar:${project.version} + org.apache.plc4x:plc4j-transport-tcp:jar:${project.version} + org.apache.hop:hop-engine:jar:${hop.version} + javax.annotation:javax.annotation-api:jar:1.2 + + + + + + + + + org.apache.hop + hop-ui + ${hop.version} + + + org.apache.hop + hop-engine + ${hop.version} + + + * + * + + + + + org.eclipse.platform + org.eclipse.swt.gtk.linux.x86_64 + 3.114.0 + + + org.apache.plc4x + plc4j-driver-s7 + ${project.version} + + + org.apache.plc4x + plc4j-api + ${project.version} + + + org.apache.plc4x + plc4j-spi + ${project.version} + + + org.apache.plc4x + plc4j-transport-tcp + ${project.version} + + + org.apache.hop + hop-core + ${hop.version} + + + * + * + + + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnection.java b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnection.java new file mode 100644 index 00000000000..3a2b711c53c --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnection.java @@ -0,0 +1,73 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.metadata; + +import org.apache.hop.core.gui.plugin.GuiElementType; +import org.apache.hop.core.gui.plugin.GuiPlugin; +import org.apache.hop.core.gui.plugin.GuiWidgetElement; +import org.apache.hop.metadata.api.HopMetadata; +import org.apache.hop.metadata.api.HopMetadataBase; +import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.IHopMetadata; + +@GuiPlugin +@HopMetadata( + key = "plc4x-connection", + name = "Plc4x Connection", + description = "Describes a connection to a PLC", + image = "plc4x_toddy.svg", + documentationUrl = "/metadata-types/plc4x/plc4x-connection.html") +public class Plc4xConnection extends HopMetadataBase implements IHopMetadata { + + public static final String WIDGET_ID_URL = "10000-url"; + + @HopMetadataProperty + @GuiWidgetElement( + id = WIDGET_ID_URL, + type = GuiElementType.TEXT, + parentId = Plc4xConnectionEditor.PARENT_WIDGET_ID, + label = "URL", + toolTip = "Specify the hostname of your cassandra server") + private String url; + + + public Plc4xConnection() {} + + public Plc4xConnection(Plc4xConnection p) { + super(p.name); + this.url = p.url; + } + + + /** + * Gets url + * + * @return value of hostname + */ + public String getUrl() { + return url; + } + + /** @param hostname The hostname to set */ + public void setUrl(String url) { + this.url = url; + } + + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java new file mode 100644 index 00000000000..1118a5ff741 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java @@ -0,0 +1,148 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.metadata; + +import org.apache.hop.core.Const; +import org.apache.hop.ui.core.PropsUi; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.gui.GuiCompositeWidgets; +import org.apache.hop.ui.core.gui.GuiCompositeWidgetsAdapter; +import org.apache.hop.ui.core.metadata.IMetadataEditor; +import org.apache.hop.ui.core.metadata.MetadataEditor; +import org.apache.hop.ui.core.metadata.MetadataManager; +import org.apache.hop.ui.hopgui.HopGui; +import org.apache.plc4x.java.DefaultPlcDriverManager; +import org.apache.plc4x.java.api.PlcDriverManager; +import org.apache.plc4x.java.api.PlcConnection; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.*; + + +public class Plc4xConnectionEditor extends MetadataEditor + implements IMetadataEditor{ + + private static final Class PKG = Plc4xConnectionEditor.class; // For Translator + + public static final String PARENT_WIDGET_ID = "Plc4xConnectionEditor.Widgets.ParentId"; + + private Composite parent; + private Text wName; + private GuiCompositeWidgets widgets; + + public Plc4xConnectionEditor(HopGui hopGui, MetadataManager manager, Plc4xConnection metadata) { + super(hopGui, manager, metadata); + } + + + @Override + public void createControl(Composite parent) { + this.parent = parent; + PropsUi props = PropsUi.getInstance(); + int margin = props.getMargin(); + int middle = props.getMiddlePct(); + // Name... + // + // What's the name + Label wlName = new Label(parent, SWT.RIGHT); + props.setLook(wlName); + wlName.setText("Plc4x url name"); + FormData fdlName = new FormData(); + fdlName.top = new FormAttachment(0, margin * 2); + fdlName.left = new FormAttachment(0, 0); + fdlName.right = new FormAttachment(middle, 0); + wlName.setLayoutData(fdlName); + wName = new Text(parent, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wName); + + FormData fdName = new FormData(); + fdName.top = new FormAttachment(wlName, 0, SWT.CENTER); + fdName.left = new FormAttachment(middle, margin); + fdName.right = new FormAttachment(100, 0); + wName.setLayoutData(fdName); + + // Rest of the widgets... + // + widgets = new GuiCompositeWidgets(manager.getVariables()); + widgets.createCompositeWidgets(getMetadata(), null, parent, PARENT_WIDGET_ID, wName); + + // Set content on the widgets... + // + setWidgetsContent(); + + // Add changed listeners + wName.addListener(SWT.Modify, e -> setChanged()); + widgets.setWidgetsListener( + new GuiCompositeWidgetsAdapter() { + @Override + public void widgetModified( + GuiCompositeWidgets compositeWidgets, Control changedWidget, String widgetId) { + setChanged(); + } + }); + } + + + @Override + public void setWidgetsContent() { + Plc4xConnection meta = getMetadata(); + wName.setText(Const.NVL(meta.getName(), "")); + widgets.setWidgetsContents(meta, parent, PARENT_WIDGET_ID); + } + + @Override + public void getWidgetsContent(Plc4xConnection meta) { + meta.setName(wName.getText()); + widgets.getWidgetsContents(meta, PARENT_WIDGET_ID); + } + + @Override + public Button[] createButtonsForButtonBar(Composite parent) { + PropsUi props = PropsUi.getInstance(); + + Button wbTest = new Button(parent, SWT.PUSH | SWT.CENTER); + props.setLook(wbTest); + wbTest.setText("Test"); + wbTest.addListener(SWT.Selection, e -> test()); + + return new Button[] {wbTest}; + } + + public void test() { + PlcConnection plcConnection; + try { + Plc4xConnection meta = getMetadata(); + plcConnection = new DefaultPlcDriverManager().getConnection(meta.getUrl()); + plcConnection.connect(); + Thread.sleep(100); + plcConnection.close(); + MessageBox box = new MessageBox(parent.getShell(), SWT.ICON_INFORMATION | SWT.OK); + box.setText("Success!"); + box.setMessage("It's possible to connect to Device with this metadata!"); + box.open(); + + } catch (Exception e) { + new ErrorDialog(parent.getShell(), "Error", "We couldn't connect using this information", e); + } + } + + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/org/apache/plc4x/hop/metadata/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/org/apache/plc4x/hop/metadata/messages/messages_en_US.properties new file mode 100644 index 00000000000..6db5c3fea39 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/org/apache/plc4x/hop/metadata/messages/messages_en_US.properties @@ -0,0 +1,22 @@ + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +Plc4x.Name=Sample Transform +Plc4x.Description=Sample Transform Description +Plc4x.Shell.Title=Sample Transform Title +Plc4x.TransformName.Label=Sample Name \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/plc4x_toddy.svg b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/plc4x_toddy.svg new file mode 100644 index 00000000000..01694ecd5df --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/resources/plc4x_toddy.svg @@ -0,0 +1,1306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml new file mode 100644 index 00000000000..e707e0d2069 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml @@ -0,0 +1,143 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4j-apache-hop + 0.11.0-SNAPSHOT + + + plc4x-hop-transform + jar + PLC4J: Integrations: Apache Hop: Transform + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + org.jboss.jandex + jandex-maven-plugin + 1.0.8 + + + make-index + + jandex + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + io.netty:netty-common:jar:4.1.89.Final + io.netty:netty-all:jar:4.1.89.Final + commons-lang:commons-lang:jar:2.6 + xml-apis:xml-apis:jar:1.4.01 + org.apache.plc4x:plc4j-spi:jar:${project.version} + com.fasterxml.jackson.core:jackson-annotations:jar:2.14.2 + + + + + + + + + + org.apache.hop + hop-core + ${hop.version} + compile + + + * + * + + + + + org.apache.hop + hop-engine + ${hop.version} + + + * + * + + + + + org.apache.hop + hop-ui + ${hop.version} + + + * + * + + + + + io.netty + netty-all + ${netty.version} + + + ${project.groupId} + plc4j-api + ${project.version} + + + ${project.groupId} + hop-plc4x-metadata + ${project.version} + + + org.eclipse.platform + org.eclipse.swt.gtk.linux.x86_64 + 3.114.0 + + + ${project.groupId} + plc4j-driver-s7 + ${project.version} + + + org.apache.commons + commons-lang3 + 3.12.0 + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java new file mode 100644 index 00000000000..e87262ec01e --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java @@ -0,0 +1,346 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xevent; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.hop.core.CheckResult; +import org.apache.hop.core.Const; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.exception.HopPluginException; +import org.apache.hop.core.logging.LogLevel; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.row.RowDataUtil; +import org.apache.hop.core.row.RowMeta; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransform; +import org.apache.hop.pipeline.transform.ITransform; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.java.DefaultPlcDriverManager; +import org.apache.plc4x.java.api.PlcConnection; +import org.apache.plc4x.java.api.messages.PlcReadRequest; +import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; +import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; +import org.apache.plc4x.java.api.model.PlcConsumerRegistration; +import org.apache.plc4x.java.api.types.PlcResponseCode; +import org.apache.plc4x.java.s7.events.S7ModeEvent; +import org.apache.plc4x.java.s7.readwrite.ModeTransitionType; + +/** + * Transform That contains the basic skeleton needed to create your own plugin + * + */ +public class Plc4xEvent extends BaseTransform implements ITransform { + + public static String FIELD_MODE_EVENT = "MODE"; + public static String FIELD_USER_EVENT = "USR"; + public static String FIELD_SYS_EVENT = "SYS"; + public static String FIELD_ALARM_EVENT = "ALM"; + + + private static final Class PKG = Plc4xEvent.class; // Needed by Translator + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcReadRequest readRequest = null; + private PlcConsumerRegistration registerMode = null; + private PlcConsumerRegistration registerUser = null; + private PlcConsumerRegistration registerSys = null; + private PlcConsumerRegistration registerAlarm = null; + private PlcSubscriptionRequest subsbuild = null; + private PlcSubscriptionResponse subresponse = null; + + private static final ReentrantLock lock = new ReentrantLock(); + + private static final String dummy = "dummy"; + + public Plc4xEvent(TransformMeta transformMeta, Plc4xEventMeta meta, Plc4xEventData data, int copyNr, PipelineMeta pipelineMeta, + Pipeline pipeline ) { + super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); + } + + /* + * Including Date and Time field for every row + * + * @param meta Meta data from user dialog + * @param remarks Error registers + * @param origin transform instance name + */ + public static final RowMetaAndData buildRow( + Plc4xEventMeta meta, List remarks, String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(2); + int index = 0; + + return new RowMetaAndData(rowMeta, rowData); + } + + /* + * 1. Block the other instances by means of a lock. + * 2. Try to locate an existing connection. + * 3. If it doesn't exist, it tries to take control of the routine to + * create an instance of PlcConnection and his wrapper. + * 4. Register the connection wrapper for global access. + * 5. If the connection to the PLC is made, then it creates the query + * and executes it. + * + */ + @Override + public boolean processRow() throws HopException { + Object[] r = getRow(); // Get row from input rowset & set row busy! + setLogLevel(LogLevel.DEBUG); + + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; + } + + lock.lock(); //(01) + try { + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + if (connwrapper == null) { + connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) + if (connwrapper != null) connwrapper.retain(); + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + readRequest = null; + try{ + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + if (conn.isConnected()) { + connwrapper = new Plc4xWrapperConnection(conn); + getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) + } + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + } finally { + lock.unlock(); + } + + if ((connmeta != null) && (connwrapper != null)){ + if (connwrapper.getConnection().isConnected()){ + if (readRequest == null){ + final PlcSubscriptionRequest.Builder subscription = connwrapper.getConnection().subscriptionRequestBuilder(); //(05) + if (meta.isModeEvent()) subscription.addEventTagAddress(FIELD_MODE_EVENT, FIELD_MODE_EVENT); + if (meta.isUserEvent()) subscription.addEventTagAddress(FIELD_USER_EVENT, FIELD_USER_EVENT); + if (meta.isSysEvent()) subscription.addEventTagAddress(FIELD_SYS_EVENT, FIELD_SYS_EVENT); + if (meta.isAlarmEvent()) subscription.addEventTagAddress(FIELD_ALARM_EVENT, FIELD_ALARM_EVENT); + + subsbuild = subscription.build(); + + } + try { + subresponse = subsbuild.execute().get(); + + if (meta.isModeEvent() && subresponse.getResponseCode(FIELD_MODE_EVENT) == PlcResponseCode.OK) { + registerMode = + subresponse + .getSubscriptionHandle(FIELD_MODE_EVENT) + .register(msg -> { + System.out.println("******** S7ModeEvent ********"); + Map map = ((S7ModeEvent) msg).getMap(); + map.forEach((x, y) -> { + System.out.println(x + " : " + y); + }); + short currentmode = (short) + map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); + System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); + System.out.println("****************************"); + }); + } + + if (meta.isUserEvent() && subresponse.getResponseCode(FIELD_USER_EVENT) == PlcResponseCode.OK) { + registerUser = + subresponse + .getSubscriptionHandle(FIELD_USER_EVENT) + .register(msg -> { + System.out.println("******** S7ModeEvent ********"); + Map map = ((S7ModeEvent) msg).getMap(); + map.forEach((x, y) -> { + System.out.println(x + " : " + y); + }); + short currentmode = (short) + map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); + System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); + System.out.println("****************************"); + }); + } + + if (meta.isSysEvent() && subresponse.getResponseCode(FIELD_SYS_EVENT) == PlcResponseCode.OK) { + registerSys = + subresponse + .getSubscriptionHandle(FIELD_SYS_EVENT) + .register(msg -> { + System.out.println("******** S7ModeEvent ********"); + Map map = ((S7ModeEvent) msg).getMap(); + map.forEach((x, y) -> { + System.out.println(x + " : " + y); + }); + short currentmode = (short) + map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); + System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); + System.out.println("****************************"); + }); + } + + if (meta.isAlarmEvent() && subresponse.getResponseCode(FIELD_ALARM_EVENT) == PlcResponseCode.OK) { + registerAlarm = + subresponse + .getSubscriptionHandle(FIELD_ALARM_EVENT) + .register(msg -> { + System.out.println("******** S7ModeEvent ********"); + Map map = ((S7ModeEvent) msg).getMap(); + map.forEach((x, y) -> { + System.out.println(x + " : " + y); + }); + short currentmode = (short) + map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); + System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); + System.out.println("****************************"); + }); + } + + } catch (Exception ex) { + setErrors(1L); + logError("Unable read from PLC. " + ex.getMessage()); + } + + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + + + r = data.outputRowMeta.cloneRow(data.outputRowData); + logBasic("Tamano de los datos: " + r.length); + data.prevDate = data.rowDate; + data.rowDate = new Date(); + + + putRow(data.outputRowMeta, r ); // return your data + data.rowsWritten++; + return true; + } + + + @Override + public boolean init() { + try { + if(super.init()){ + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } + + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; + } + + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); + + return true; + } + return false; + } catch (Exception ex){ + setErrors(1L); + logError("Error initializing transform", ex); + return false; + } + } + + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ + @Override + public void cleanup() { + super.cleanup(); + logBasic("Cleanup. Release connection."); + if (connwrapper != null) + connwrapper.release(); + } + + + /* + * Here, must perform the cleaning of any resource. + * 1. Check if we have reference to wrapper. + * 2. Release de reference to object. + * 3. The lastone remove the global reference to connection wrapper. + * 4. Clear local references. + */ + @Override + public void dispose() { + super.dispose(); + if (connwrapper != null) { + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + connwrapper.release(); + if (!connwrapper.getConnection().isConnected()){ + getPipeline().getExtensionDataMap().remove(meta.getConnection()); + } + connwrapper = null; + readRequest = null; + + } + } + + + + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventData.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventData.java new file mode 100644 index 00000000000..ebadf2111be --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventData.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xevent; + +import org.apache.plc4x.hop.transforms.plc4xoutput.*; +import org.apache.plc4x.hop.transforms.plc4xinput.*; +import java.util.Date; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.pipeline.transform.BaseTransformData; +import org.apache.hop.pipeline.transform.ITransformData; + + +public class Plc4xEventData extends BaseTransformData implements ITransformData { + + //The Plc4xConnection metadata + public String connection; + + public IRowMeta outputRowMeta; + public Object[] outputRowData; + + public long rowLimit; + public long rowsWritten; + public Date rowDate; + public Date prevDate; + public long delay; + + + + /** + * Default constructor for SampleData. + */ + public Plc4xEventData() { + super(); + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java new file mode 100644 index 00000000000..ea369b5cb74 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java @@ -0,0 +1,663 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xevent; + +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.PipelinePreviewFactory; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformDialog; +import org.apache.hop.ui.core.ConstUi; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.dialog.EnterNumberDialog; +import org.apache.hop.ui.core.dialog.EnterTextDialog; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.dialog.PreviewRowsDialog; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; +import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog; +import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.util.SwtSvgImageUtil; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.*; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +public class Plc4xEventDialog extends BaseTransformDialog implements ITransformDialog { + private static final Class PKG = Plc4xEventDialog.class; // Needed by Translator + + private MetaSelectionLine wConnection; + + private Label wlLimit; + private TextVar wLimit; + + private Button wNeverEnding; + + private Button wModeEvent; + private Button wUserEvent; + private Button wSysEvent; + private Button wAlarmEvent; + + private Label wlMaxwait; + private TextVar wMaxwait; + + private Label wlInterval; + private TextVar wInterval; + + private Label wlRowTimeField; + private TextVar wRowTimeField; + + private Label wlLastTimeField; + private TextVar wLastTimeField; + + private TableView wFields; + + private final Plc4xEventMeta input; + + public Plc4xEventDialog(Shell parent, IVariables variables , Object in, PipelineMeta pipelineMeta, String sname ) { + super( parent, variables, (BaseTransformMeta) in, pipelineMeta, sname ); + input = (Plc4xEventMeta) in; + } + + @Override + public String open() { + Shell parent = getParent(); + + shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN); + props.setLook(shell); + setShellImage(shell, input); + + ModifyListener lsMod = e -> input.setChanged(); + changed = input.hasChanged(); + + FormLayout formLayout = new FormLayout(); + formLayout.marginWidth = Const.FORM_MARGIN; + formLayout.marginHeight = Const.FORM_MARGIN; + + shell.setLayout(formLayout); + shell.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.DialogTitle")); + + int middle = props.getMiddlePct(); + int margin = props.getMargin(); + + // Filename line + wlTransformName = new Label(shell, SWT.RIGHT); + wlTransformName.setText(BaseMessages.getString(PKG, "System.Label.TransformName")); + props.setLook(wlTransformName); + fdlTransformName = new FormData(); + fdlTransformName.left = new FormAttachment(0, 0); + fdlTransformName.right = new FormAttachment(middle, -margin); + fdlTransformName.top = new FormAttachment(0, margin); + wlTransformName.setLayoutData(fdlTransformName); + + wTransformName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wTransformName.setText(transformName); + props.setLook(wTransformName); + wTransformName.addModifyListener(lsMod); + fdTransformName = new FormData(); + fdTransformName.left = new FormAttachment(middle, 0); + fdTransformName.top = new FormAttachment(0, margin); + fdTransformName.right = new FormAttachment(100, 0); + wTransformName.setLayoutData(fdTransformName); + + // Connection line + wConnection = + new MetaSelectionLine<>( + variables, + metadataProvider, + Plc4xConnection.class, + shell, + SWT.NONE, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Label"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Tooltip")); + FormData fdConnection = new FormData(); + fdConnection.left = new FormAttachment(0, 0); + fdConnection.right = new FormAttachment(100, 0); + fdConnection.top = new FormAttachment(wTransformName, margin); + wConnection.setLayoutData(fdConnection); + props.setLook(wConnection); + try { + wConnection.fillItems(); + } catch (Exception e) { + new ErrorDialog(shell, "Error", "Error listing Cassandra connection metadata objects", e); + } + + Control lastControl = wConnection; + + wlLimit = new Label(shell, SWT.RIGHT); + wlLimit.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Limit.Label")); + props.setLook(wlLimit); + FormData fdlLimit = new FormData(); + fdlLimit.left = new FormAttachment(0, 0); + fdlLimit.right = new FormAttachment(middle, -margin); + fdlLimit.top = new FormAttachment(lastControl, margin); + wlLimit.setLayoutData(fdlLimit); + wLimit = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLimit); + wLimit.addModifyListener(lsMod); + FormData fdLimit = new FormData(); + fdLimit.left = new FormAttachment(middle, 0); + fdLimit.top = new FormAttachment(lastControl, margin); + fdLimit.right = new FormAttachment(100, 0); + wLimit.setLayoutData(fdLimit); + lastControl = wLimit; + + /******************** + * Never Ending + ********************/ + Label wlNeverEnding = new Label(shell, SWT.RIGHT); + wlNeverEnding.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlNeverEnding); + FormData fdlNeverEnding = new FormData(); + fdlNeverEnding.left = new FormAttachment(0, 0); + fdlNeverEnding.right = new FormAttachment(middle, -margin); + fdlNeverEnding.top = new FormAttachment(lastControl, margin); + wlNeverEnding.setLayoutData(fdlNeverEnding); + wNeverEnding = new Button(shell, SWT.CHECK); + props.setLook(wNeverEnding); + wNeverEnding.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + + FormData fdNeverEnding = new FormData(); + fdNeverEnding.left = new FormAttachment(middle, 0); + fdNeverEnding.top = new FormAttachment(wlNeverEnding, 0, SWT.CENTER); + fdNeverEnding.right = new FormAttachment(100, 0); + wNeverEnding.setLayoutData(fdNeverEnding); + lastControl = wlNeverEnding; + + /******************** + * Mode Events + ********************/ + Label wlModeEvent = new Label(shell, SWT.RIGHT); + wlModeEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlModeEvent); + FormData fdlModeEvent = new FormData(); + fdlModeEvent.left = new FormAttachment(0, 0); + fdlModeEvent.right = new FormAttachment(middle, -margin); + fdlModeEvent.top = new FormAttachment(lastControl, margin); + wlModeEvent.setLayoutData(fdlModeEvent); + wModeEvent = new Button(shell, SWT.CHECK); + props.setLook(wModeEvent); + wModeEvent.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + + FormData fdModeEvent = new FormData(); + fdModeEvent.left = new FormAttachment(middle, 0); + fdModeEvent.top = new FormAttachment(wlModeEvent, 0, SWT.CENTER); + fdModeEvent.right = new FormAttachment(100, 0); + wModeEvent.setLayoutData(fdModeEvent); + lastControl = wlModeEvent; + + /******************** + * User Events + ********************/ + Label wlUserEvent = new Label(shell, SWT.RIGHT); + wlUserEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlUserEvent); + FormData fdlUserEvent = new FormData(); + fdlUserEvent.left = new FormAttachment(0, 0); + fdlUserEvent.right = new FormAttachment(middle, -margin); + fdlUserEvent.top = new FormAttachment(lastControl, margin); + wlUserEvent.setLayoutData(fdlUserEvent); + wUserEvent = new Button(shell, SWT.CHECK); + props.setLook(wUserEvent); + wUserEvent.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + + FormData fdUserEvent = new FormData(); + fdUserEvent.left = new FormAttachment(middle, 0); + fdUserEvent.top = new FormAttachment(wlUserEvent, 0, SWT.CENTER); + fdUserEvent.right = new FormAttachment(100, 0); + wUserEvent.setLayoutData(fdUserEvent); + lastControl = wlUserEvent; + + /******************** + * Sys Events + ********************/ + Label wlSysEvent = new Label(shell, SWT.RIGHT); + wlSysEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlSysEvent); + FormData fdlSysEvent = new FormData(); + fdlSysEvent.left = new FormAttachment(0, 0); + fdlSysEvent.right = new FormAttachment(middle, -margin); + fdlSysEvent.top = new FormAttachment(lastControl, margin); + wlSysEvent.setLayoutData(fdlSysEvent); + wSysEvent = new Button(shell, SWT.CHECK); + props.setLook(wSysEvent); + wSysEvent.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + + FormData fdSysEvent = new FormData(); + fdSysEvent.left = new FormAttachment(middle, 0); + fdSysEvent.top = new FormAttachment(wlSysEvent, 0, SWT.CENTER); + fdSysEvent.right = new FormAttachment(100, 0); + wSysEvent.setLayoutData(fdSysEvent); + lastControl = wlSysEvent; + + /******************** + * Alarm Events + ********************/ + Label wlAlarmEvent = new Label(shell, SWT.RIGHT); + wlAlarmEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlAlarmEvent); + FormData fdlAlarmEvent = new FormData(); + fdlAlarmEvent.left = new FormAttachment(0, 0); + fdlAlarmEvent.right = new FormAttachment(middle, -margin); + fdlAlarmEvent.top = new FormAttachment(lastControl, margin); + wlAlarmEvent.setLayoutData(fdlAlarmEvent); + wAlarmEvent = new Button(shell, SWT.CHECK); + props.setLook(wAlarmEvent); + wAlarmEvent.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + + FormData fdAlarmEvent = new FormData(); + fdAlarmEvent.left = new FormAttachment(middle, 0); + fdAlarmEvent.top = new FormAttachment(wlAlarmEvent, 0, SWT.CENTER); + fdAlarmEvent.right = new FormAttachment(100, 0); + wAlarmEvent.setLayoutData(fdAlarmEvent); + lastControl = wlAlarmEvent; + + + wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, e -> ok()); + + wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, e -> cancel()); + + setButtonPositions(new Button[] {wOk, wCancel}, margin, null); + + /* + + wlMaxwait = new Label(shell, SWT.RIGHT); + wlMaxwait.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Maxwait.Label")); + props.setLook(wlMaxwait); + FormData fdlMaxwait = new FormData(); + fdlMaxwait.left = new FormAttachment(0, 0); + fdlMaxwait.right = new FormAttachment(middle, -margin); + fdlMaxwait.top = new FormAttachment(lastControl, margin); + wlMaxwait.setLayoutData(fdlMaxwait); + wMaxwait = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wMaxwait); + wMaxwait.addModifyListener(lsMod); + FormData fdMaxwait = new FormData(); + fdMaxwait.left = new FormAttachment(middle, 0); + fdMaxwait.top = new FormAttachment(lastControl, margin); + fdMaxwait.right = new FormAttachment(100, 0); + wMaxwait.setLayoutData(fdMaxwait); + lastControl = wMaxwait; + + wlInterval = new Label(shell, SWT.RIGHT); + wlInterval.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Interval.Label")); + props.setLook(wlInterval); + FormData fdlInterval = new FormData(); + fdlInterval.left = new FormAttachment(0, 0); + fdlInterval.right = new FormAttachment(middle, -margin); + fdlInterval.top = new FormAttachment(lastControl, margin); + wlInterval.setLayoutData(fdlInterval); + wInterval = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wInterval); + wInterval.addModifyListener(lsMod); + FormData fdInterval = new FormData(); + fdInterval.left = new FormAttachment(middle, 0); + fdInterval.top = new FormAttachment(lastControl, margin); + fdInterval.right = new FormAttachment(100, 0); + wInterval.setLayoutData(fdInterval); + lastControl = wInterval; + + + wlRowTimeField = new Label(shell, SWT.RIGHT); + wlRowTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.RowTimeField.Label")); + props.setLook(wlRowTimeField); + FormData fdlRowTimeField = new FormData(); + fdlRowTimeField.left = new FormAttachment(0, 0); + fdlRowTimeField.right = new FormAttachment(middle, -margin); + fdlRowTimeField.top = new FormAttachment(lastControl, margin); + wlRowTimeField.setLayoutData(fdlRowTimeField); + wRowTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wRowTimeField); + wRowTimeField.addModifyListener(lsMod); + FormData fdRowTimeField = new FormData(); + fdRowTimeField.left = new FormAttachment(middle, 0); + fdRowTimeField.top = new FormAttachment(lastControl, margin); + fdRowTimeField.right = new FormAttachment(100, 0); + wRowTimeField.setLayoutData(fdRowTimeField); + lastControl = wRowTimeField; + + wlLastTimeField = new Label(shell, SWT.RIGHT); + wlLastTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.LastTimeField.Label")); + props.setLook(wlLastTimeField); + FormData fdlLastTimeField = new FormData(); + fdlLastTimeField.left = new FormAttachment(0, 0); + fdlLastTimeField.right = new FormAttachment(middle, -margin); + fdlLastTimeField.top = new FormAttachment(lastControl, margin); + wlLastTimeField.setLayoutData(fdlLastTimeField); + wLastTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLastTimeField); + wLastTimeField.addModifyListener(lsMod); + FormData fdLastTimeField = new FormData(); + fdLastTimeField.left = new FormAttachment(middle, 0); + fdLastTimeField.top = new FormAttachment(lastControl, margin); + fdLastTimeField.right = new FormAttachment(100, 0); + wLastTimeField.setLayoutData(fdLastTimeField); + lastControl = wLastTimeField; + + wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, e -> ok()); + wPreview = new Button(shell, SWT.PUSH); + wPreview.setText(BaseMessages.getString(PKG, "System.Button.Preview")); + wPreview.addListener(SWT.Selection, e -> preview()); + wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, e -> cancel()); + + setButtonPositions(new Button[] {wOk, wPreview, wCancel}, margin, null); + + Label wlFields = new Label(shell, SWT.NONE); + wlFields.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Label")); + props.setLook(wlFields); + FormData fdlFields = new FormData(); + fdlFields.left = new FormAttachment(0, 0); + fdlFields.top = new FormAttachment(lastControl, margin); + wlFields.setLayoutData(fdlFields); + lastControl = wlFields; + + final int nrFields = input.getFields().size(); + + ColumnInfo[] colinf = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Name"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Item"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Type"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + ValueMetaFactory.getValueMetaNames()), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Format"), + ColumnInfo.COLUMN_TYPE_FORMAT, + 2), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Length"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Precision"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Currency"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Decimal"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Group"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Value"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.SetEmptyString"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + new String[] { + BaseMessages.getString(PKG, "System.Combo.Yes"), + BaseMessages.getString(PKG, "System.Combo.No") + }) + }; + + wFields = + new TableView( + variables, + shell, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinf, + nrFields, + lsMod, + props); + + FormData fdFields = new FormData(); + fdFields.left = new FormAttachment(0, 0); + fdFields.top = new FormAttachment(lastControl, margin); + fdFields.right = new FormAttachment(100, 0); + fdFields.bottom = new FormAttachment(wOk, -2 * margin); + wFields.setLayoutData(fdFields); + + lsResize = + event -> { + Point size = shell.getSize(); + wFields.setSize(size.x - 10, size.y - 50); + wFields.table.setSize(size.x - 10, size.y - 50); + wFields.redraw(); + }; + */ + + //shell.addListener(SWT.Resize, lsResize); + + getData(); + input.setChanged(changed); + + BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel()); + + return transformName; + }; + + + public void setActive() { + boolean neverEnding = wNeverEnding.getSelection(); + + wlLimit.setEnabled(!neverEnding); + wLimit.setEnabled(!neverEnding); + } + + + + private Image getImage() { + return SwtSvgImageUtil.getImage( shell.getDisplay(), getClass().getClassLoader(), "plc4x_toddy_read.svg", ConstUi.LARGE_ICON_SIZE, + ConstUi.LARGE_ICON_SIZE ); + } + + /** + * Copy information from the meta-data input to the dialog fields. + * + */ + public void getData() { + if (isDebug()) { + logDebug("getting fields info..."); + } + if (input.getConnection() == null) { + wConnection.setText(""); + } else { + wConnection.setText(input.getConnection()); + } + + wLimit.setText(input.getRowLimit()); + wNeverEnding.setSelection(input.isNeverEnding()); + + + setActive(); + + wTransformName.selectAll(); + wTransformName.setFocus(); + } + + /** + * Stores the information from the dialog box in meta-data. + * + * @param meta + */ + private void getInfo( Plc4xEventMeta meta) throws HopException { + meta.setConnection(wConnection.getText()); + meta.setRowLimit(wLimit.getText()); + meta.setNeverEnding(wNeverEnding.getSelection()); + + } + + /** + * Cancel the dialog. + */ + private void cancel() { + transformName = null; + input.setChanged( changed ); + dispose(); + } + + private void ok() { + if (Utils.isEmpty(wTransformName.getText())) { + return; + } + + transformName = wTransformName.getText(); // return value + try { + getInfo(new Plc4xEventMeta()); // to see if there is an exception + getInfo(input); // to put the content on the input structure for real if all is well. + dispose(); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + } + } + + + /** + * Preview the data generated by this transform. This generates a pipeline using this transform & + * a dummy and previews it. + */ + private void preview() { + Plc4xEventMeta oneMeta = new Plc4xEventMeta(); + try { + getInfo(oneMeta); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + return; + } + + PipelineMeta previewMeta = + PipelinePreviewFactory.generatePreviewPipeline( + pipelineMeta.getMetadataProvider(), oneMeta, wTransformName.getText()); + + EnterNumberDialog numberDialog = + new EnterNumberDialog( + shell, + props.getDefaultPreviewSize(), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Title"), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Message")); + int previewSize = numberDialog.open(); + if (previewSize > 0) { + PipelinePreviewProgressDialog progressDialog = + new PipelinePreviewProgressDialog( + shell, + variables, + previewMeta, + new String[] {wTransformName.getText()}, + new int[] {previewSize}); + progressDialog.open(); + + Pipeline pipeline = progressDialog.getPipeline(); + String loggingText = progressDialog.getLoggingText(); + + if (!progressDialog.isCancelled()) { + if (pipeline.getResult() != null && pipeline.getResult().getNrErrors() > 0) { + EnterTextDialog etd = + new EnterTextDialog( + shell, + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Title"), + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Message"), + loggingText, + true); + etd.setReadOnly(); + etd.open(); + } + } + + PreviewRowsDialog prd = + new PreviewRowsDialog( + shell, + variables, + SWT.NONE, + wTransformName.getText(), + progressDialog.getPreviewRowsMeta(wTransformName.getText()), + progressDialog.getPreviewRows(wTransformName.getText()), + loggingText); + prd.open(); + } + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java new file mode 100644 index 00000000000..207adb78245 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java @@ -0,0 +1,239 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xevent; + +import java.util.ArrayList; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.Transform; +import org.apache.hop.core.exception.HopTransformException; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformMeta; +import org.apache.hop.pipeline.transform.TransformMeta; + +import java.util.List; +import org.apache.hop.core.Const; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.pipeline.transform.ITransformIOMeta; +import org.apache.hop.pipeline.transform.TransformIOMeta; + +/** + * Meta data for the sample transform. + */ +@Transform( + id = "plc4x-event", + name = "i18n::Plc4x.Read.Name", + description = "i18n::Plc4x.Read.Description", + image = "plc4x_event.svg", + categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xevent:Plc4x.Category.plc4x", + documentationUrl = "https://plc4x.apache.org/users/integrations/apache-hop.html" +) +public class Plc4xEventMeta extends BaseTransformMeta implements ITransformMeta { + + private static final Class PKG = Plc4xEventMeta.class; // Needed by Translator + + + @HopMetadataProperty( + key = "connection", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Connection") + private String connection; + + @HopMetadataProperty( + key = "limit", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowLimit") + private String rowLimit; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean neverEnding; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean modeEvent; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean userEvent; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean sysEvent; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean alarmEvent; + + + public Plc4xEventMeta() { + rowLimit = "10"; + neverEnding = false; + modeEvent = false; + userEvent = false; + sysEvent = false; + alarmEvent = false; + + } + + public Plc4xEventMeta(Plc4xEventMeta m) { + this.connection = m.connection; + this.neverEnding = m.neverEnding; + this.modeEvent = m.modeEvent; + this.userEvent = m.userEvent; + this.sysEvent = m.sysEvent; + this.alarmEvent = m.alarmEvent; + } + + @Override + public Plc4xEventMeta clone() { + return new Plc4xEventMeta(this); + } + + + + @Override + public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, + IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { + try { + List remarks = new ArrayList<>(); + RowMetaAndData rowMetaAndData = Plc4xEvent.buildRow(this, remarks, name); + if (!remarks.isEmpty()) { + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + stringRemarks.append(remark.toString()).append(Const.CR); + } + throw new HopTransformException(stringRemarks.toString()); + } + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); + } + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + } catch (Exception e) { + throw new HopTransformException(e); + } + } + + public Plc4xEvent createTransform(TransformMeta transformMeta, Plc4xEventData data, int copyNr, + PipelineMeta pipelineMeta, Pipeline pipeline ) { + return new Plc4xEvent( transformMeta, this, data, copyNr, pipelineMeta, pipeline ); + } + + /** + * + * @return + */ + public Plc4xEventData getTransformData() { + return new Plc4xEventData(); + } + + @Override + public void setDefault() { + //default values when creating a new transform + } + + + /** + * Returns the Input/Output metadata for this transform. + * The generator transform only produces output, does not accept input! + * TransformIOMeta(inputAcceptor, outputProducer, inputOptional, outputDynamic, inputDynamic) + */ + @Override + public ITransformIOMeta getTransformIOMeta() { + return new TransformIOMeta(false, true, false, false, false, false); + } + + /** + * Gets Plc4xConnection metadata name. + * + * @return value of intervalInMs + */ + public String getConnection() { + return connection; + } + + /** @param connection */ + public void setConnection(String connection) { + this.connection = connection; + } + + public String getRowLimit() { + return rowLimit; + } + + /** @param connection */ + public void setRowLimit(String rowLimit) { + this.rowLimit = rowLimit; + } + + /** + * Gets neverEnding + * + * @return value of neverEnding + */ + public boolean isNeverEnding() { + return neverEnding; + } + + /** @param neverEnding The neverEnding to set */ + public void setNeverEnding(boolean neverEnding) { + this.neverEnding = neverEnding; + } + + public boolean isModeEvent() { + return neverEnding; + } + + public void setModeEvent(boolean modeEvent) { + this.modeEvent = modeEvent; + } + + public boolean isUserEvent() { + return neverEnding; + } + + public void setUserEvent(boolean userEvent) { + this.userEvent = userEvent; + } + + public boolean isSysEvent() { + return sysEvent; + } + + public void setSysEvent(boolean sysEvent) { + this.sysEvent = sysEvent; + } + + public boolean isAlarmEvent() { + return alarmEvent; + } + + public void setAlarmEvent(boolean alarmEvent) { + this.alarmEvent = alarmEvent; + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java new file mode 100644 index 00000000000..7b1832c16d1 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java @@ -0,0 +1,446 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xinput; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.commons.lang3.StringUtils; +import org.apache.hop.core.CheckResult; +import org.apache.hop.core.Const; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.exception.HopPluginException; +import org.apache.hop.core.exception.HopValueException; +import org.apache.hop.core.logging.LogLevel; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.core.row.RowDataUtil; +import org.apache.hop.core.row.RowMeta; +import org.apache.hop.core.row.value.ValueMetaDate; +import org.apache.hop.core.row.value.ValueMetaFactory; +import org.apache.hop.core.util.StringUtil; +import org.apache.hop.core.util.Utils; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransform; +import org.apache.hop.pipeline.transform.ITransform; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; +import org.apache.plc4x.hop.transforms.util.Plc4xPlcField; +import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.java.DefaultPlcDriverManager; +import org.apache.plc4x.java.api.PlcConnection; +import org.apache.plc4x.java.api.messages.PlcReadRequest; +import org.apache.plc4x.java.api.messages.PlcReadResponse; + +/** + * Transform That contains the basic skeleton needed to create your own plugin + * + */ +public class Plc4xRead extends BaseTransform implements ITransform { + + private static final Class PKG = Plc4xRead.class; // Needed by Translator + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcReadRequest readRequest = null; + private PlcReadResponse readResponse = null; + private int maxwait = 0; + private static final ReentrantLock lock = new ReentrantLock(); + + private static final String dummy = "dummy"; + + private Map index = new HashMap(); + private Map plcfields = new HashMap(); + + public Plc4xRead(TransformMeta transformMeta, Plc4xReadMeta meta, Plc4xReadData data, int copyNr, PipelineMeta pipelineMeta, + Pipeline pipeline ) { + super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); + } + + /* + * Including Date and Time field for every row + * + * @param meta Meta data from user dialog + * @param remarks Error registers + * @param origin transform instance name + */ + public static final RowMetaAndData buildRow( + Plc4xReadMeta meta, List remarks, String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); + int index = 0; + + if (!Utils.isEmpty(meta.getRowTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); + rowData[index++] = null; + } + + if (!Utils.isEmpty(meta.getLastTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); + rowData[index++] = null; + } + + for (Plc4xGeneratorField field : meta.getFields()) { + int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); + if (StringUtils.isNotEmpty(field.getType())) { + System.out.println("typeString: " + typeString); + IValueMeta valueMeta = + ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a + // value! + valueMeta.setLength(field.getLength()); + valueMeta.setPrecision(field.getPrecision()); + valueMeta.setConversionMask(field.getFormat()); + valueMeta.setCurrencySymbol(field.getCurrency()); + valueMeta.setGroupingSymbol(field.getGroup()); + valueMeta.setDecimalSymbol(field.getDecimal()); + valueMeta.setOrigin(origin); + + IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); + + if (field.isSetEmptyString()) { + // Set empty string + rowData[index] = StringUtil.EMPTY_STRING; + } else { + String stringValue = field.getValue(); + + // If the value is empty: consider it to be NULL. + if (Utils.isEmpty(stringValue)) { + rowData[index] = null; + + if (valueMeta.getType() == IValueMeta.TYPE_NONE) { + String message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + } + } else { + // Convert the data from String to the specified type ... + // + try { + System.out.println("stringValue: " + stringValue); + rowData[index] = valueMeta.convertData(stringMeta, stringValue); + } catch (HopValueException e) { + switch (valueMeta.getType()) { + case IValueMeta.TYPE_NUMBER: + String message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_DATE: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_INTEGER: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_BIGNUMBER: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_TIMESTAMP: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + default: + // Boolean and binary don't throw errors normally, so it's probably an unspecified + // error problem... + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + } + } + } + } + + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; + } + } + + return new RowMetaAndData(rowMeta, rowData); + } + + /* + * 1. Block the other instances by means of a lock. + * 2. Try to locate an existing connection. + * 3. If it doesn't exist, it tries to take control of the routine to + * create an instance of PlcConnection and his wrapper. + * 4. Register the connection wrapper for global access. + * 5. If the connection to the PLC is made, then it creates the query + * and executes it. + * + */ + @Override + public boolean processRow() throws HopException { + Object[] r = getRow(); // Get row from input rowset & set row busy! + setLogLevel(LogLevel.DEBUG); + + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; + } + + if (first) { + index.clear(); + plcfields.clear(); + //This performs a minimal check on the user item. + //It guarantees that the rates are within those managed by Plc4x. + meta.getFields().forEach((f) ->{ + plcfields.put(f.getName(),Plc4xPlcField.of(f.getItem())); + }); + first = false; + } + + lock.lock(); //(01) + try { + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + if (connwrapper == null) { + connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) + if (connwrapper != null) connwrapper.retain(); + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + readRequest = null; + try{ + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + if (conn.isConnected()) { + connwrapper = new Plc4xWrapperConnection(conn); + getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) + } + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + } finally { + lock.unlock(); + } + + if ((connmeta != null) && (connwrapper != null)){ + if (connwrapper.getConnection().isConnected()){ + if (readRequest == null){ + PlcReadRequest.Builder builder = connwrapper.getConnection().readRequestBuilder(); //(05) + for (Plc4xGeneratorField field: meta.getFields()){ + builder.addTagAddress(field.getName(), field.getItem()); + } + readRequest = builder.build(); + } + try { + maxwait = Integer.parseInt(meta.getMaxwaitInMs()); + maxwait = (maxwait<100)?100:maxwait; + readResponse = readRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); + + for (Plc4xGeneratorField field: meta.getFields()){ + field.setValue(readResponse.getString(field.getName())); + } + } catch (Exception ex) { + setErrors(1L); + logError("Unable read from PLC. " + ex.getMessage()); + } + + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + + // + int interval = Integer.parseInt(meta.getIntervalInMs()); + + try { + Thread.sleep(interval); + } catch (InterruptedException ex) { + setErrors(1L); + logError(ex.getMessage()); + } + + r = data.outputRowMeta.cloneRow(data.outputRowData); + logBasic("Tamano de los datos: " + r.length); + data.prevDate = data.rowDate; + data.rowDate = new Date(); + int index = 0; + if (!Utils.isEmpty(meta.getRowTimeField())) { + r[index++] = data.rowDate; + } + if (!Utils.isEmpty(meta.getLastTimeField())) { + r[index++] = data.prevDate; + } + for (Plc4xGeneratorField field: meta.getFields()){ + if (field.getType().equalsIgnoreCase("Boolean")){ + r[index++] = Boolean.parseBoolean(field.getValue()); + } else if (field.getType().equalsIgnoreCase("Number")){ + r[index++] = Double.parseDouble(field.getValue()); + } else if (field.getType().equalsIgnoreCase("Integer")){ + r[index++] = Integer.parseInt(field.getValue()); + } + } + putRow(data.outputRowMeta, r ); // return your data + data.rowsWritten++; + return true; + } + + + @Override + public boolean init() { + try { + if(super.init()){ + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + data.rowsWritten = 0L; + data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); + + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } + + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; + } + + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); + + return true; + } + return false; + } catch (Exception ex){ + setErrors(1L); + logError("Error initializing transform", ex); + return false; + } + } + + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ + @Override + public void cleanup() { + super.cleanup(); + logBasic("Cleanup. Release connection."); + if (connwrapper != null) + connwrapper.release(); + } + + + /* + * Here, must perform the cleaning of any resource. + * 1. Check if we have reference to wrapper. + * 2. Release de reference to object. + * 3. The lastone remove the global reference to connection wrapper. + * 4. Clear local references. + */ + @Override + public void dispose() { + super.dispose(); + if (connwrapper != null) { + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + connwrapper.release(); + if (!connwrapper.getConnection().isConnected()){ + getPipeline().getExtensionDataMap().remove(meta.getConnection()); + } + connwrapper = null; + readRequest = null; + + } + } + + + + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadData.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadData.java new file mode 100644 index 00000000000..98b5889f0a8 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadData.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xinput; + +import java.util.Date; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.pipeline.transform.BaseTransformData; +import org.apache.hop.pipeline.transform.ITransformData; + + +public class Plc4xReadData extends BaseTransformData implements ITransformData { + + //The Plc4xConnection metadata + public String connection; + + public IRowMeta outputRowMeta; + public Object[] outputRowData; + + public long rowLimit; + public long rowsWritten; + public Date rowDate; + public Date prevDate; + public long delay; + + + + /** + * Default constructor for SampleData. + */ + public Plc4xReadData() { + super(); + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java new file mode 100644 index 00000000000..a736e418da0 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java @@ -0,0 +1,600 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xinput; + +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.row.value.ValueMetaFactory; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.PipelinePreviewFactory; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformDialog; +import org.apache.hop.ui.core.ConstUi; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.dialog.EnterNumberDialog; +import org.apache.hop.ui.core.dialog.EnterTextDialog; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.dialog.PreviewRowsDialog; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; +import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog; +import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.util.SwtSvgImageUtil; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.*; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; + +public class Plc4xReadDialog extends BaseTransformDialog implements ITransformDialog { + private static final Class PKG = Plc4xReadDialog.class; // Needed by Translator + + private MetaSelectionLine wConnection; + + private Label wlLimit; + private TextVar wLimit; + + private Button wNeverEnding; + + private Label wlMaxwait; + private TextVar wMaxwait; + + private Label wlInterval; + private TextVar wInterval; + + private Label wlRowTimeField; + private TextVar wRowTimeField; + + private Label wlLastTimeField; + private TextVar wLastTimeField; + + private TableView wFields; + + private final Plc4xReadMeta input; + + public Plc4xReadDialog(Shell parent, IVariables variables , Object in, PipelineMeta pipelineMeta, String sname ) { + super( parent, variables, (BaseTransformMeta) in, pipelineMeta, sname ); + input = (Plc4xReadMeta) in; + } + + @Override + public String open() { + Shell parent = getParent(); + + shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN); + props.setLook(shell); + setShellImage(shell, input); + + ModifyListener lsMod = e -> input.setChanged(); + changed = input.hasChanged(); + + FormLayout formLayout = new FormLayout(); + formLayout.marginWidth = Const.FORM_MARGIN; + formLayout.marginHeight = Const.FORM_MARGIN; + + shell.setLayout(formLayout); + shell.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.DialogTitle")); + + int middle = props.getMiddlePct(); + int margin = props.getMargin(); + + // Filename line + wlTransformName = new Label(shell, SWT.RIGHT); + wlTransformName.setText(BaseMessages.getString(PKG, "System.Label.TransformName")); + props.setLook(wlTransformName); + fdlTransformName = new FormData(); + fdlTransformName.left = new FormAttachment(0, 0); + fdlTransformName.right = new FormAttachment(middle, -margin); + fdlTransformName.top = new FormAttachment(0, margin); + wlTransformName.setLayoutData(fdlTransformName); + + wTransformName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wTransformName.setText(transformName); + props.setLook(wTransformName); + wTransformName.addModifyListener(lsMod); + fdTransformName = new FormData(); + fdTransformName.left = new FormAttachment(middle, 0); + fdTransformName.top = new FormAttachment(0, margin); + fdTransformName.right = new FormAttachment(100, 0); + wTransformName.setLayoutData(fdTransformName); + + // Connection line + wConnection = + new MetaSelectionLine<>( + variables, + metadataProvider, + Plc4xConnection.class, + shell, + SWT.NONE, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Label"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Tooltip")); + FormData fdConnection = new FormData(); + fdConnection.left = new FormAttachment(0, 0); + fdConnection.right = new FormAttachment(100, 0); + fdConnection.top = new FormAttachment(wTransformName, margin); + wConnection.setLayoutData(fdConnection); + props.setLook(wConnection); + try { + wConnection.fillItems(); + } catch (Exception e) { + new ErrorDialog(shell, "Error", "Error listing Cassandra connection metadata objects", e); + } + + Control lastControl = wConnection; + + wlLimit = new Label(shell, SWT.RIGHT); + wlLimit.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Limit.Label")); + props.setLook(wlLimit); + FormData fdlLimit = new FormData(); + fdlLimit.left = new FormAttachment(0, 0); + fdlLimit.right = new FormAttachment(middle, -margin); + fdlLimit.top = new FormAttachment(lastControl, margin); + wlLimit.setLayoutData(fdlLimit); + wLimit = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLimit); + wLimit.addModifyListener(lsMod); + FormData fdLimit = new FormData(); + fdLimit.left = new FormAttachment(middle, 0); + fdLimit.top = new FormAttachment(lastControl, margin); + fdLimit.right = new FormAttachment(100, 0); + wLimit.setLayoutData(fdLimit); + lastControl = wLimit; + + Label wlNeverEnding = new Label(shell, SWT.RIGHT); + wlNeverEnding.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlNeverEnding); + FormData fdlNeverEnding = new FormData(); + fdlNeverEnding.left = new FormAttachment(0, 0); + fdlNeverEnding.right = new FormAttachment(middle, -margin); + fdlNeverEnding.top = new FormAttachment(lastControl, margin); + wlNeverEnding.setLayoutData(fdlNeverEnding); + wNeverEnding = new Button(shell, SWT.CHECK); + props.setLook(wNeverEnding); + wNeverEnding.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + FormData fdNeverEnding = new FormData(); + fdNeverEnding.left = new FormAttachment(middle, 0); + fdNeverEnding.top = new FormAttachment(wlNeverEnding, 0, SWT.CENTER); + fdNeverEnding.right = new FormAttachment(100, 0); + wNeverEnding.setLayoutData(fdNeverEnding); + lastControl = wlNeverEnding; + + wlMaxwait = new Label(shell, SWT.RIGHT); + wlMaxwait.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Maxwait.Label")); + props.setLook(wlMaxwait); + FormData fdlMaxwait = new FormData(); + fdlMaxwait.left = new FormAttachment(0, 0); + fdlMaxwait.right = new FormAttachment(middle, -margin); + fdlMaxwait.top = new FormAttachment(lastControl, margin); + wlMaxwait.setLayoutData(fdlMaxwait); + wMaxwait = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wMaxwait); + wMaxwait.addModifyListener(lsMod); + FormData fdMaxwait = new FormData(); + fdMaxwait.left = new FormAttachment(middle, 0); + fdMaxwait.top = new FormAttachment(lastControl, margin); + fdMaxwait.right = new FormAttachment(100, 0); + wMaxwait.setLayoutData(fdMaxwait); + lastControl = wMaxwait; + + wlInterval = new Label(shell, SWT.RIGHT); + wlInterval.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Interval.Label")); + props.setLook(wlInterval); + FormData fdlInterval = new FormData(); + fdlInterval.left = new FormAttachment(0, 0); + fdlInterval.right = new FormAttachment(middle, -margin); + fdlInterval.top = new FormAttachment(lastControl, margin); + wlInterval.setLayoutData(fdlInterval); + wInterval = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wInterval); + wInterval.addModifyListener(lsMod); + FormData fdInterval = new FormData(); + fdInterval.left = new FormAttachment(middle, 0); + fdInterval.top = new FormAttachment(lastControl, margin); + fdInterval.right = new FormAttachment(100, 0); + wInterval.setLayoutData(fdInterval); + lastControl = wInterval; + + /* + wlRowTimeField = new Label(shell, SWT.RIGHT); + wlRowTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.RowTimeField.Label")); + props.setLook(wlRowTimeField); + FormData fdlRowTimeField = new FormData(); + fdlRowTimeField.left = new FormAttachment(0, 0); + fdlRowTimeField.right = new FormAttachment(middle, -margin); + fdlRowTimeField.top = new FormAttachment(lastControl, margin); + wlRowTimeField.setLayoutData(fdlRowTimeField); + wRowTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wRowTimeField); + wRowTimeField.addModifyListener(lsMod); + FormData fdRowTimeField = new FormData(); + fdRowTimeField.left = new FormAttachment(middle, 0); + fdRowTimeField.top = new FormAttachment(lastControl, margin); + fdRowTimeField.right = new FormAttachment(100, 0); + wRowTimeField.setLayoutData(fdRowTimeField); + lastControl = wRowTimeField; + + wlLastTimeField = new Label(shell, SWT.RIGHT); + wlLastTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.LastTimeField.Label")); + props.setLook(wlLastTimeField); + FormData fdlLastTimeField = new FormData(); + fdlLastTimeField.left = new FormAttachment(0, 0); + fdlLastTimeField.right = new FormAttachment(middle, -margin); + fdlLastTimeField.top = new FormAttachment(lastControl, margin); + wlLastTimeField.setLayoutData(fdlLastTimeField); + wLastTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLastTimeField); + wLastTimeField.addModifyListener(lsMod); + FormData fdLastTimeField = new FormData(); + fdLastTimeField.left = new FormAttachment(middle, 0); + fdLastTimeField.top = new FormAttachment(lastControl, margin); + fdLastTimeField.right = new FormAttachment(100, 0); + wLastTimeField.setLayoutData(fdLastTimeField); + lastControl = wLastTimeField; + */ + wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, e -> ok()); + wPreview = new Button(shell, SWT.PUSH); + wPreview.setText(BaseMessages.getString(PKG, "System.Button.Preview")); + wPreview.addListener(SWT.Selection, e -> preview()); + wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, e -> cancel()); + + setButtonPositions(new Button[] {wOk, wPreview, wCancel}, margin, null); + + Label wlFields = new Label(shell, SWT.NONE); + wlFields.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Label")); + props.setLook(wlFields); + FormData fdlFields = new FormData(); + fdlFields.left = new FormAttachment(0, 0); + fdlFields.top = new FormAttachment(lastControl, margin); + wlFields.setLayoutData(fdlFields); + lastControl = wlFields; + + final int nrFields = input.getFields().size(); + + ColumnInfo[] colinf = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Name"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Item"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Type"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + ValueMetaFactory.getValueMetaNames()), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Format"), + ColumnInfo.COLUMN_TYPE_FORMAT, + 2), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Length"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Precision"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Currency"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Decimal"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Group"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Value"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.SetEmptyString"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + new String[] { + BaseMessages.getString(PKG, "System.Combo.Yes"), + BaseMessages.getString(PKG, "System.Combo.No") + }) + }; + + wFields = + new TableView( + variables, + shell, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinf, + nrFields, + lsMod, + props); + + FormData fdFields = new FormData(); + fdFields.left = new FormAttachment(0, 0); + fdFields.top = new FormAttachment(lastControl, margin); + fdFields.right = new FormAttachment(100, 0); + fdFields.bottom = new FormAttachment(wOk, -2 * margin); + wFields.setLayoutData(fdFields); + + lsResize = + event -> { + Point size = shell.getSize(); + wFields.setSize(size.x - 10, size.y - 50); + wFields.table.setSize(size.x - 10, size.y - 50); + wFields.redraw(); + }; + shell.addListener(SWT.Resize, lsResize); + + getData(); + input.setChanged(changed); + + BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel()); + + return transformName; + }; + + @Override + public void setActive() { + boolean neverEnding = wNeverEnding.getSelection(); + + wlLimit.setEnabled(!neverEnding); + wLimit.setEnabled(!neverEnding); + + //wlInterval.setEnabled(neverEnding); + //wInterval.setEnabled(neverEnding); + + //wlRowTimeField.setEnabled(neverEnding); + //wRowTimeField.setEnabled(neverEnding); + + //wlLastTimeField.setEnabled(neverEnding); + //wLastTimeField.setEnabled(neverEnding); + } + + + + private Image getImage() { + return SwtSvgImageUtil.getImage( shell.getDisplay(), getClass().getClassLoader(), "plc4x_toddy_read.svg", ConstUi.LARGE_ICON_SIZE, + ConstUi.LARGE_ICON_SIZE ); + } + + /** + * Copy information from the meta-data input to the dialog fields. + * + */ + public void getData() { + if (isDebug()) { + logDebug("getting fields info..."); + } + if (input.getConnection() == null) { + wConnection.setText(""); + } else { + wConnection.setText(input.getConnection()); + } + + wLimit.setText(input.getRowLimit()); + wNeverEnding.setSelection(input.isNeverEnding()); + wMaxwait.setText(Const.NVL(input.getMaxwaitInMs(), "")); + wInterval.setText(Const.NVL(input.getIntervalInMs(), "")); + // wRowTimeField.setText(Const.NVL(input.getRowTimeField(), "")); + //wLastTimeField.setText(Const.NVL(input.getLastTimeField(), "")); + + for (int i = 0; i < input.getFields().size(); i++) { + Plc4xGeneratorField field = input.getFields().get(i); + TableItem item = wFields.table.getItem(i); + int col = 1; + item.setText(col++, Const.NVL(field.getName(), "")); + + item.setText(col++, Const.NVL(field.getItem(), "")); + + String type = field.getType(); + String format = field.getFormat(); + String length = field.getLength() < 0 ? "" : ("" + field.getLength()); + String prec = field.getPrecision() < 0 ? "" : ("" + field.getPrecision()); + + String curr = field.getCurrency(); + String group = field.getGroup(); + String decim = field.getDecimal(); + String def = field.getValue(); + + item.setText(col++, Const.NVL(type, "")); + item.setText(col++, Const.NVL(format, "")); + item.setText(col++, Const.NVL(length, "")); + item.setText(col++, Const.NVL(prec, "")); + item.setText(col++, Const.NVL(curr, "")); + item.setText(col++, Const.NVL(decim, "")); + item.setText(col++, Const.NVL(group, "")); + item.setText(col++, Const.NVL(def, "")); + item.setText( + col++, + field.isSetEmptyString() + ? BaseMessages.getString(PKG, "System.Combo.Yes") + : BaseMessages.getString(PKG, "System.Combo.No")); + } + + wFields.setRowNums(); + wFields.optWidth(true); + + setActive(); + + wTransformName.selectAll(); + wTransformName.setFocus(); + } + + /** + * Stores the information from the dialog box in meta-data. + * + * @param meta + */ + private void getInfo( Plc4xReadMeta meta) throws HopException { + meta.setConnection(wConnection.getText()); + meta.setRowLimit(wLimit.getText()); + meta.setNeverEnding(wNeverEnding.getSelection()); + meta.setMaxwaitInMs(wMaxwait.getText()); + meta.setIntervalInMs(wInterval.getText()); + //meta.setRowTimeField(wRowTimeField.getText()); + //meta.setLastTimeField(wLastTimeField.getText()); + + meta.getFields().clear(); + + // CHECKSTYLE:Indentation:OFF + for (TableItem item : wFields.getNonEmptyItems()) { + Plc4xGeneratorField field = new Plc4xGeneratorField(); + field.setName(item.getText(1)); + field.setItem(item.getText(2)); + field.setFormat(item.getText(4)); + field.setLength(Const.toInt(item.getText(5), -1)); + field.setPrecision(Const.toInt(item.getText(6), -1)); + field.setCurrency(item.getText(7)); + field.setDecimal(item.getText(8)); + field.setGroup(item.getText(9)); + field.setValue(field.isSetEmptyString() ? "" : item.getText(10)); + field.setSetEmptyString( + BaseMessages.getString(PKG, "System.Combo.Yes").equalsIgnoreCase(item.getText(11))); + field.setType(field.isSetEmptyString() ? "String" : item.getText(3)); + + meta.getFields().add(field); + } + } + + /** + * Cancel the dialog. + */ + private void cancel() { + transformName = null; + input.setChanged( changed ); + dispose(); + } + + private void ok() { + if (Utils.isEmpty(wTransformName.getText())) { + return; + } + + transformName = wTransformName.getText(); // return value + try { + getInfo(new Plc4xReadMeta()); // to see if there is an exception + getInfo(input); // to put the content on the input structure for real if all is well. + dispose(); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + } + } + + + /** + * Preview the data generated by this transform. This generates a pipeline using this transform & + * a dummy and previews it. + */ + private void preview() { + Plc4xReadMeta oneMeta = new Plc4xReadMeta(); + try { + getInfo(oneMeta); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + return; + } + + PipelineMeta previewMeta = + PipelinePreviewFactory.generatePreviewPipeline( + pipelineMeta.getMetadataProvider(), oneMeta, wTransformName.getText()); + + EnterNumberDialog numberDialog = + new EnterNumberDialog( + shell, + props.getDefaultPreviewSize(), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Title"), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Message")); + int previewSize = numberDialog.open(); + if (previewSize > 0) { + PipelinePreviewProgressDialog progressDialog = + new PipelinePreviewProgressDialog( + shell, + variables, + previewMeta, + new String[] {wTransformName.getText()}, + new int[] {previewSize}); + progressDialog.open(); + + Pipeline pipeline = progressDialog.getPipeline(); + String loggingText = progressDialog.getLoggingText(); + + if (!progressDialog.isCancelled()) { + if (pipeline.getResult() != null && pipeline.getResult().getNrErrors() > 0) { + EnterTextDialog etd = + new EnterTextDialog( + shell, + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Title"), + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Message"), + loggingText, + true); + etd.setReadOnly(); + etd.open(); + } + } + + PreviewRowsDialog prd = + new PreviewRowsDialog( + shell, + variables, + SWT.NONE, + wTransformName.getText(), + progressDialog.getPreviewRowsMeta(wTransformName.getText()), + progressDialog.getPreviewRows(wTransformName.getText()), + loggingText); + prd.open(); + } + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java new file mode 100644 index 00000000000..3946c9a310b --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java @@ -0,0 +1,308 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xinput; + +import java.util.ArrayList; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.Transform; +import org.apache.hop.core.exception.HopTransformException; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformMeta; +import org.apache.hop.pipeline.transform.TransformMeta; + +import java.util.List; +import org.apache.hop.core.Const; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.pipeline.transform.ITransformIOMeta; +import org.apache.hop.pipeline.transform.TransformIOMeta; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; + +/** + * Meta data for the sample transform. + */ +@Transform( + id = "plc4x-read", + name = "i18n::Plc4x.Read.Name", + description = "i18n::Plc4x.Read.Description", + image = "plc4x_read.svg", + categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xinput:Plc4x.Category.plc4x", + documentationUrl = "https://plc4x.apache.org/users/integrations/apache-calcite.html" +) +public class Plc4xReadMeta extends BaseTransformMeta implements ITransformMeta { + + private static final Class PKG = Plc4xReadMeta.class; // Needed by Translator + + + @HopMetadataProperty( + key = "connection", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Connection") + private String connection; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean neverEnding; + + @HopMetadataProperty( + key = "maxwait_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.MaxwaitInMs") + private String maxwaitInMs; + + @HopMetadataProperty( + key = "interval_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.IntervalInMs") + private String intervalInMs; + + @HopMetadataProperty( + key = "row_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowTimeField") + private String rowTimeField; + + @HopMetadataProperty( + key = "last_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.LastTimeField") + private String lastTimeField; + + @HopMetadataProperty( + key = "limit", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowLimit") + private String rowLimit; + + @HopMetadataProperty( + groupKey = "fields", + key = "field", + injectionGroupDescription = "Plc4x.Read.Meta.Injection.Fields", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Fields") + private List fields; + + public Plc4xReadMeta() { + fields = new ArrayList<>(); + + rowLimit = "10"; + neverEnding = false; + maxwaitInMs = "1000"; + intervalInMs = "5000"; + rowTimeField = "now"; + lastTimeField = "last"; + } + + public Plc4xReadMeta(Plc4xReadMeta m) { + this.connection = m.connection; + this.neverEnding = m.neverEnding; + this.intervalInMs = m.intervalInMs; + this.rowTimeField = m.rowTimeField; + this.lastTimeField = m.lastTimeField; + this.rowLimit = m.rowLimit; + this.fields = new ArrayList<>(); + for (Plc4xGeneratorField field : m.fields) { + this.fields.add(new Plc4xGeneratorField(field)); + } + } + + @Override + public Plc4xReadMeta clone() { + return new Plc4xReadMeta(this); + } + + + + @Override + public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, + IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { + try { + logBasic("PASO 1"); + List remarks = new ArrayList<>(); + RowMetaAndData rowMetaAndData = Plc4xRead.buildRow(this, remarks, name); + logBasic("PASO 2"); + if (!remarks.isEmpty()) { + logBasic("PASO 3"); + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + logBasic("PASO 3x: " + remark.toString()); + stringRemarks.append(remark.toString()).append(Const.CR); + } + logBasic("PASO 3.1"); + throw new HopTransformException(stringRemarks.toString()); + } + logBasic("PASO 4"); + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); + } + logBasic("PASO 5"); + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + } catch (Exception e) { + throw new HopTransformException(e); + } + } + + + public Plc4xRead createTransform(TransformMeta transformMeta, Plc4xReadData data, int copyNr, + PipelineMeta pipelineMeta, Pipeline pipeline ) { + return new Plc4xRead( transformMeta, this, data, copyNr, pipelineMeta, pipeline ); + } + + + public Plc4xReadData getTransformData() { + return new Plc4xReadData(); + } + +/* + @Override + public void loadXml( Node transformNode, IHopMetadataProvider metadataProvider ) throws HopXmlException { + //load the saved values from the transformnode + String sampleValue = XmlHandler.getTagValue( transformNode, "sampleValue" ); + + } +*/ + @Override + public void setDefault() { + //default values when creating a new transform + } + + + /** + * Returns the Input/Output metadata for this transform. + * The generator transform only produces output, does not accept input! + * TransformIOMeta(inputAcceptor, outputProducer, inputOptional, outputDynamic, inputDynamic) + */ + @Override + public ITransformIOMeta getTransformIOMeta() { + return new TransformIOMeta(false, true, false, false, false, false); + } + + /** + * Gets Plc4xConnection metadata name. + * + * @return value of intervalInMs + */ + public String getConnection() { + return connection; + } + + /** @param connection */ + public void setConnection(String connection) { + this.connection = connection; + } + + + /** + * Gets neverEnding + * + * @return value of neverEnding + */ + public boolean isNeverEnding() { + return neverEnding; + } + + /** @param neverEnding The neverEnding to set */ + public void setNeverEnding(boolean neverEnding) { + this.neverEnding = neverEnding; + } + + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getMaxwaitInMs() { + return maxwaitInMs; + } + + /** @param intervalInMs The intervalInMs to set */ + public void setMaxwaitInMs(String maxwaitInMs) { + this.maxwaitInMs = maxwaitInMs; + } + + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getIntervalInMs() { + return intervalInMs; + } + + /** @param intervalInMs The intervalInMs to set */ + public void setIntervalInMs(String intervalInMs) { + this.intervalInMs = intervalInMs; + } + + /** + * Gets rowTimeField + * + * @return value of rowTimeField + */ + public String getRowTimeField() { + return rowTimeField; + } + + /** @param rowTimeField The rowTimeField to set */ + public void setRowTimeField(String rowTimeField) { + this.rowTimeField = rowTimeField; + } + + /** + * Gets lastTimeField + * + * @return value of lastTimeField + */ + public String getLastTimeField() { + return lastTimeField; + } + + /** @param lastTimeField The lastTimeField to set */ + public void setLastTimeField(String lastTimeField) { + this.lastTimeField = lastTimeField; + } + + /** + * Gets rowLimit + * + * @return value of rowLimit + */ + public String getRowLimit() { + return rowLimit; + } + + /** @param rowLimit The rowLimit to set */ + public void setRowLimit(String rowLimit) { + this.rowLimit = rowLimit; + } + + /** + * Gets fields + * + * @return value of fields + */ + public List getFields() { + return fields; + } + + /** @param fields The fields to set */ + public void setFields(List fields) { + this.fields = fields; + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java new file mode 100644 index 00000000000..2381564a755 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java @@ -0,0 +1,478 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xoutput; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.commons.lang3.StringUtils; +import org.apache.hop.core.CheckResult; +import org.apache.hop.core.Const; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.exception.HopPluginException; +import org.apache.hop.core.exception.HopValueException; +import org.apache.hop.core.logging.LogLevel; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.core.row.RowDataUtil; +import org.apache.hop.core.row.RowMeta; +import org.apache.hop.core.row.value.ValueMetaDate; +import org.apache.hop.core.row.value.ValueMetaFactory; +import org.apache.hop.core.util.StringUtil; +import org.apache.hop.core.util.Utils; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransform; +import org.apache.hop.pipeline.transform.ITransform; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; +import org.apache.plc4x.hop.transforms.util.Plc4xPlcField; +import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.java.DefaultPlcDriverManager; +import org.apache.plc4x.java.api.PlcConnection; +import org.apache.plc4x.java.api.messages.PlcWriteRequest; +import org.apache.plc4x.java.api.messages.PlcWriteResponse; + +/** + * Transform That contains the basic skeleton needed to create your own plugin + * + */ +public class Plc4xWrite extends BaseTransform implements ITransform { + + private static final Class PKG = Plc4xWrite.class; // Needed by Translator + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcWriteRequest writeRequest = null; + private PlcWriteRequest.Builder builder = null; + private PlcWriteResponse writeResponse = null; + + private static final ReentrantLock lock = new ReentrantLock(); + + private static final String dummy = "dummy"; + + private Map index = new HashMap(); + private Map plcfields = new HashMap(); + + public Plc4xWrite(TransformMeta transformMeta, Plc4xWriteMeta meta, Plc4xWriteData data, int copyNr, PipelineMeta pipelineMeta, + Pipeline pipeline ) { + super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); + } + + /* + * Including Date and Time field for every row + * + * @param meta Meta data from user dialog + * @param remarks Error registers + * @param origin transform instance name + */ + public static final RowMetaAndData buildRow( + Plc4xWriteMeta meta, List remarks, String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); + int index = 0; + + if (!Utils.isEmpty(meta.getRowTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); + rowData[index++] = null; + } + + if (!Utils.isEmpty(meta.getLastTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); + rowData[index++] = null; + } + + for (Plc4xGeneratorField field : meta.getFields()) { + int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); + if (StringUtils.isNotEmpty(field.getType())) { + System.out.println("typeString: " + typeString); + IValueMeta valueMeta = + ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a + // value! + valueMeta.setLength(field.getLength()); + valueMeta.setPrecision(field.getPrecision()); + valueMeta.setConversionMask(field.getFormat()); + valueMeta.setCurrencySymbol(field.getCurrency()); + valueMeta.setGroupingSymbol(field.getGroup()); + valueMeta.setDecimalSymbol(field.getDecimal()); + valueMeta.setOrigin(origin); + + IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); + + if (field.isSetEmptyString()) { + // Set empty string + rowData[index] = StringUtil.EMPTY_STRING; + } else { + String stringValue = field.getValue(); + + // If the value is empty: consider it to be NULL. + if (Utils.isEmpty(stringValue)) { + rowData[index] = null; + + if (valueMeta.getType() == IValueMeta.TYPE_NONE) { + String message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + } + } else { + // Convert the data from String to the specified type ... + // + try { + System.out.println("stringValue: " + stringValue); + rowData[index] = valueMeta.convertData(stringMeta, stringValue); + } catch (HopValueException e) { + switch (valueMeta.getType()) { + case IValueMeta.TYPE_NUMBER: + String message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_DATE: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_INTEGER: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_BIGNUMBER: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_TIMESTAMP: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + default: + // Boolean and binary don't throw errors normally, so it's probably an unspecified + // error problem... + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + } + } + } + } + + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; + } + } + + return new RowMetaAndData(rowMeta, rowData); + } + + /* + * 1. Stores the indexes of the incoming fields from the user's selection. + * It is only done during the first cycle. + * 2. Block the other instances by means of a lock. + * 3. Try to locate an existing connection. + * 4. If it doesn't exist, it tries to take control of the routine to + * create an instance of PlcConnection and his wrapper. + * 5. Register the connection wrapper for global access. + * 6. If the connection to the PLC is made, then it creates the query + * and executes it. + * + */ + @Override + public boolean processRow() throws HopException { + final Object[] r = getRow(); // Get row from input rowset & set row busy! + + if (r == null) { + setOutputDone(); + return false; + } + + data.outputRowMeta = getInputRowMeta(); + + + if (first) { + index.clear(); + plcfields.clear(); + meta.getFields().forEach((f) ->{ + Integer i = getInputRowMeta().indexOfValue(f.getName()); //(01) + if (i>=0) { + index.put(f.getName(), i); + plcfields.put(f.getName(),Plc4xPlcField.of(f.getItem())); + } + }); + first = false; + } + + IRowMeta inputRowMeta = getInputRowMeta(); + + setLogLevel(LogLevel.DEBUG); + + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; + } + + lock.lock(); //(01) + try { + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + if (connwrapper == null) { + connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) + if (connwrapper != null) connwrapper.retain(); + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + writeRequest = null; + try{ + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + if (conn.isConnected()) { + connwrapper = new Plc4xWrapperConnection(conn); + getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) + } + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + } finally { + lock.unlock(); + } + + if ((connmeta != null) && (connwrapper != null)){ + if (connwrapper.getConnection().isConnected()){ + + builder = null; + builder = connwrapper.getConnection().writeRequestBuilder(); //(05) + Integer i; + for (Plc4xGeneratorField field: meta.getFields()){ + i = index.get(field.getName()); + if (i != null) { + //From Input Type + if (inputRowMeta.getValueMeta(i).getTypeDesc(). + equalsIgnoreCase(field.getType())) + switch(inputRowMeta.getValueMeta(i).getType()) { + case IValueMeta.TYPE_BOOLEAN: + case IValueMeta.TYPE_INTEGER: + case IValueMeta.TYPE_NUMBER: + case IValueMeta.TYPE_BIGNUMBER: + builder.addTagAddress(field.getName(), + field.getItem(), + r[i]); + break; + case IValueMeta.TYPE_DATE: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(inputRowMeta.getString(r, i))); + break; + case IValueMeta.TYPE_TIMESTAMP: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(inputRowMeta.getString(r, i))); + break; + case IValueMeta.TYPE_INET: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(inputRowMeta.getString(r, i))); + break; + case IValueMeta.TYPE_STRING: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(inputRowMeta.getString(r, i))); + break; + case IValueMeta.TYPE_SERIALIZABLE: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(inputRowMeta.getString(r, i))); + break; + + } + //field.setValue(inputRowMeta.getString(r, i)); + }; + } + + writeRequest = builder.build(); + + try { + int maxwait = Integer.parseInt(meta.getMaxwaitInMs()); + maxwait = (maxwait<100)?100:maxwait; + writeResponse = writeRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); + + index.forEach((n,y)->{ + System.out.println("Resultado: " + writeResponse.getResponseCode(n)); + }); + + } catch (Exception ex) { + setErrors(1L); + logError("Unable read from PLC. " + ex.getMessage()); + } + + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + + + putRow(data.outputRowMeta, r); // return your data + data.rowsWritten++; + return true; + } + + + @Override + public boolean init() { + try { + if(super.init()){ + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + data.rowsWritten = 0L; + data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); + + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } + + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; + } + + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); + + return true; + } + return false; + } catch (Exception ex){ + setErrors(1L); + logError("Error initializing transform", ex); + return false; + } + } + + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ + @Override + public void cleanup() { + super.cleanup(); + logBasic("Cleanup. Release connection."); + if (connwrapper != null) + connwrapper.release(); + } + + + /* + * Here, must perform the cleaning of any resource. + * 1. Check if we have reference to wrapper. + * 2. Release de reference to object. + * 3. The lastone remove the global reference to connection wrapper. + * 4. Clear local references. + */ + @Override + public void dispose() { + super.dispose(); + if (connwrapper != null) { + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + connwrapper.release(); + if (!connwrapper.getConnection().isConnected()){ + getPipeline().getExtensionDataMap().remove(meta.getConnection()); + } + connwrapper = null; + writeRequest = null; + + } + } + + + + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteData.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteData.java new file mode 100644 index 00000000000..81f9c909b81 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteData.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xoutput; + +import org.apache.plc4x.hop.transforms.plc4xinput.*; +import java.util.Date; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.pipeline.transform.BaseTransformData; +import org.apache.hop.pipeline.transform.ITransformData; + + +public class Plc4xWriteData extends BaseTransformData implements ITransformData { + + //The Plc4xConnection metadata + public String connection; + + public IRowMeta outputRowMeta; + public Object[] outputRowData; + + public long rowLimit; + public long rowsWritten; + public Date rowDate; + public Date prevDate; + public long delay; + + + + /** + * Default constructor for SampleData. + */ + public Plc4xWriteData() { + super(); + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteDialog.java new file mode 100644 index 00000000000..1e2b3107ca5 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteDialog.java @@ -0,0 +1,674 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xoutput; + +import org.apache.plc4x.hop.transforms.plc4xinput.*; +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.row.value.ValueMetaFactory; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.PipelinePreviewFactory; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformDialog; +import org.apache.hop.ui.core.ConstUi; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.dialog.EnterNumberDialog; +import org.apache.hop.ui.core.dialog.EnterTextDialog; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.dialog.PreviewRowsDialog; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; +import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog; +import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.pipeline.transform.ITableItemInsertListener; +import org.apache.hop.ui.util.SwtSvgImageUtil; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.*; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; + +public class Plc4xWriteDialog extends BaseTransformDialog implements ITransformDialog { + private static final Class PKG = Plc4xWriteDialog.class; // Needed by Translator + + private MetaSelectionLine wConnection; + + private Label wlLimit; + private TextVar wLimit; + + private Button wNeverEnding; + + private Label wlMaxwait; + private TextVar wMaxwait; + + private Label wlInterval; + private TextVar wInterval; + + private Label wlRowTimeField; + private TextVar wRowTimeField; + + private Label wlLastTimeField; + private TextVar wLastTimeField; + + private TableView wFields; + + private Button wGetPrvFields; + + private final Plc4xWriteMeta input; + + public Plc4xWriteDialog(Shell parent, IVariables variables , Object in, PipelineMeta pipelineMeta, String sname ) { + super( parent, variables, (BaseTransformMeta) in, pipelineMeta, sname ); + input = (Plc4xWriteMeta) in; + } + + @Override + public String open() { + Shell parent = getParent(); + + shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN); + props.setLook(shell); + setShellImage(shell, input); + + ModifyListener lsMod = e -> input.setChanged(); + changed = input.hasChanged(); + + FormLayout formLayout = new FormLayout(); + formLayout.marginWidth = Const.FORM_MARGIN; + formLayout.marginHeight = Const.FORM_MARGIN; + + shell.setLayout(formLayout); + shell.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.DialogTitle")); + + int middle = props.getMiddlePct(); + int margin = props.getMargin(); + + // Filename line + wlTransformName = new Label(shell, SWT.RIGHT); + wlTransformName.setText(BaseMessages.getString(PKG, "System.Label.TransformName")); + props.setLook(wlTransformName); + fdlTransformName = new FormData(); + fdlTransformName.left = new FormAttachment(0, 0); + fdlTransformName.right = new FormAttachment(middle, -margin); + fdlTransformName.top = new FormAttachment(0, margin); + wlTransformName.setLayoutData(fdlTransformName); + + wTransformName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wTransformName.setText(transformName); + props.setLook(wTransformName); + wTransformName.addModifyListener(lsMod); + fdTransformName = new FormData(); + fdTransformName.left = new FormAttachment(middle, 0); + fdTransformName.top = new FormAttachment(0, margin); + fdTransformName.right = new FormAttachment(100, 0); + wTransformName.setLayoutData(fdTransformName); + + // Connection line + wConnection = + new MetaSelectionLine<>( + variables, + metadataProvider, + Plc4xConnection.class, + shell, + SWT.NONE, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Label"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Tooltip")); + FormData fdConnection = new FormData(); + fdConnection.left = new FormAttachment(0, 0); + fdConnection.right = new FormAttachment(100, 0); + fdConnection.top = new FormAttachment(wTransformName, margin); + wConnection.setLayoutData(fdConnection); + props.setLook(wConnection); + try { + wConnection.fillItems(); + } catch (Exception e) { + new ErrorDialog(shell, "Error", "Error listing Cassandra connection metadata objects", e); + } + + Control lastControl = wConnection; + + wlLimit = new Label(shell, SWT.RIGHT); + wlLimit.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Limit.Label")); + props.setLook(wlLimit); + FormData fdlLimit = new FormData(); + fdlLimit.left = new FormAttachment(0, 0); + fdlLimit.right = new FormAttachment(middle, -margin); + fdlLimit.top = new FormAttachment(lastControl, margin); + wlLimit.setLayoutData(fdlLimit); + wLimit = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLimit); + wLimit.addModifyListener(lsMod); + FormData fdLimit = new FormData(); + fdLimit.left = new FormAttachment(middle, 0); + fdLimit.top = new FormAttachment(lastControl, margin); + fdLimit.right = new FormAttachment(100, 0); + wLimit.setLayoutData(fdLimit); + lastControl = wLimit; + + Label wlNeverEnding = new Label(shell, SWT.RIGHT); + wlNeverEnding.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlNeverEnding); + FormData fdlNeverEnding = new FormData(); + fdlNeverEnding.left = new FormAttachment(0, 0); + fdlNeverEnding.right = new FormAttachment(middle, -margin); + fdlNeverEnding.top = new FormAttachment(lastControl, margin); + wlNeverEnding.setLayoutData(fdlNeverEnding); + wNeverEnding = new Button(shell, SWT.CHECK); + props.setLook(wNeverEnding); + wNeverEnding.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + FormData fdNeverEnding = new FormData(); + fdNeverEnding.left = new FormAttachment(middle, 0); + fdNeverEnding.top = new FormAttachment(wlNeverEnding, 0, SWT.CENTER); + fdNeverEnding.right = new FormAttachment(100, 0); + wNeverEnding.setLayoutData(fdNeverEnding); + lastControl = wlNeverEnding; + + wlMaxwait = new Label(shell, SWT.RIGHT); + wlMaxwait.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Maxwait.Label")); + props.setLook(wlMaxwait); + FormData fdlMaxwait = new FormData(); + fdlMaxwait.left = new FormAttachment(0, 0); + fdlMaxwait.right = new FormAttachment(middle, -margin); + fdlMaxwait.top = new FormAttachment(lastControl, margin); + wlMaxwait.setLayoutData(fdlMaxwait); + wMaxwait = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wMaxwait); + wMaxwait.addModifyListener(lsMod); + FormData fdMaxwait = new FormData(); + fdMaxwait.left = new FormAttachment(middle, 0); + fdMaxwait.top = new FormAttachment(lastControl, margin); + fdMaxwait.right = new FormAttachment(100, 0); + wMaxwait.setLayoutData(fdMaxwait); + lastControl = wMaxwait; + + wlInterval = new Label(shell, SWT.RIGHT); + wlInterval.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Interval.Label")); + props.setLook(wlInterval); + FormData fdlInterval = new FormData(); + fdlInterval.left = new FormAttachment(0, 0); + fdlInterval.right = new FormAttachment(middle, -margin); + fdlInterval.top = new FormAttachment(lastControl, margin); + wlInterval.setLayoutData(fdlInterval); + wInterval = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wInterval); + wInterval.addModifyListener(lsMod); + FormData fdInterval = new FormData(); + fdInterval.left = new FormAttachment(middle, 0); + fdInterval.top = new FormAttachment(lastControl, margin); + fdInterval.right = new FormAttachment(100, 0); + wInterval.setLayoutData(fdInterval); + lastControl = wInterval; + + /* + wlRowTimeField = new Label(shell, SWT.RIGHT); + wlRowTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.RowTimeField.Label")); + props.setLook(wlRowTimeField); + FormData fdlRowTimeField = new FormData(); + fdlRowTimeField.left = new FormAttachment(0, 0); + fdlRowTimeField.right = new FormAttachment(middle, -margin); + fdlRowTimeField.top = new FormAttachment(lastControl, margin); + wlRowTimeField.setLayoutData(fdlRowTimeField); + wRowTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wRowTimeField); + wRowTimeField.addModifyListener(lsMod); + FormData fdRowTimeField = new FormData(); + fdRowTimeField.left = new FormAttachment(middle, 0); + fdRowTimeField.top = new FormAttachment(lastControl, margin); + fdRowTimeField.right = new FormAttachment(100, 0); + wRowTimeField.setLayoutData(fdRowTimeField); + lastControl = wRowTimeField; + + wlLastTimeField = new Label(shell, SWT.RIGHT); + wlLastTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.LastTimeField.Label")); + props.setLook(wlLastTimeField); + FormData fdlLastTimeField = new FormData(); + fdlLastTimeField.left = new FormAttachment(0, 0); + fdlLastTimeField.right = new FormAttachment(middle, -margin); + fdlLastTimeField.top = new FormAttachment(lastControl, margin); + wlLastTimeField.setLayoutData(fdlLastTimeField); + wLastTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLastTimeField); + wLastTimeField.addModifyListener(lsMod); + FormData fdLastTimeField = new FormData(); + fdLastTimeField.left = new FormAttachment(middle, 0); + fdLastTimeField.top = new FormAttachment(lastControl, margin); + fdLastTimeField.right = new FormAttachment(100, 0); + wLastTimeField.setLayoutData(fdLastTimeField); + lastControl = wLastTimeField; + */ + wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, e -> ok()); + + wGet = new Button(shell, SWT.PUSH); + wGet.setText(BaseMessages.getString(PKG, "Get Fields")); + wGet.addListener(SWT.Selection, e -> getfields()); + + wPreview = new Button(shell, SWT.PUSH); + wPreview.setText(BaseMessages.getString(PKG, "System.Button.Preview")); + wPreview.addListener(SWT.Selection, e -> preview()); + + wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, e -> cancel()); + + setButtonPositions(new Button[] {wOk, wPreview, wGet, wCancel}, margin, null); + + Label wlFields = new Label(shell, SWT.NONE); + wlFields.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Label")); + props.setLook(wlFields); + FormData fdlFields = new FormData(); + fdlFields.left = new FormAttachment(0, 0); + fdlFields.top = new FormAttachment(lastControl, margin); + wlFields.setLayoutData(fdlFields); + lastControl = wlFields; + + final int nrFields = input.getFields().size(); + + ColumnInfo[] colinf = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Name"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Item"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Type"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + ValueMetaFactory.getValueMetaNames()), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Format"), + ColumnInfo.COLUMN_TYPE_FORMAT, + 2), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Length"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Precision"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Currency"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Decimal"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Group"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Value"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.SetEmptyString"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + new String[] { + BaseMessages.getString(PKG, "System.Combo.Yes"), + BaseMessages.getString(PKG, "System.Combo.No") + }) + }; + + wFields = + new TableView( + variables, + shell, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinf, + nrFields, + lsMod, + props); + + FormData fdFields = new FormData(); + fdFields.left = new FormAttachment(0, 0); + fdFields.top = new FormAttachment(lastControl, margin); + fdFields.right = new FormAttachment(100, 0); + fdFields.bottom = new FormAttachment(wOk, -2 * margin); + wFields.setLayoutData(fdFields); + + lsResize = + event -> { + Point size = shell.getSize(); + wFields.setSize(size.x - 10, size.y - 50); + wFields.table.setSize(size.x - 10, size.y - 50); + wFields.redraw(); + }; + shell.addListener(SWT.Resize, lsResize); + + getData(); + input.setChanged(changed); + + BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel()); + + return transformName; + }; + + public void setActive() { + boolean neverEnding = wNeverEnding.getSelection(); + + wlLimit.setEnabled(!neverEnding); + wLimit.setEnabled(!neverEnding); + + //wlInterval.setEnabled(neverEnding); + //wInterval.setEnabled(neverEnding); + + //wlRowTimeField.setEnabled(neverEnding); + //wRowTimeField.setEnabled(neverEnding); + + //wlLastTimeField.setEnabled(neverEnding); + //wLastTimeField.setEnabled(neverEnding); + } + + + + private Image getImage() { + return SwtSvgImageUtil.getImage( shell.getDisplay(), getClass().getClassLoader(), "plc4x_toddy_read.svg", ConstUi.LARGE_ICON_SIZE, + ConstUi.LARGE_ICON_SIZE ); + } + + /** + * Copy information from the meta-data input to the dialog fields. + * + */ + public void getData() { + if (isDebug()) { + logDebug("getting fields info..."); + } + if (input.getConnection() == null) { + wConnection.setText(""); + } else { + wConnection.setText(input.getConnection()); + } + + wLimit.setText(input.getRowLimit()); + wNeverEnding.setSelection(input.isNeverEnding()); + wMaxwait.setText(Const.NVL(input.getMaxwaitInMs(), "")); + wInterval.setText(Const.NVL(input.getIntervalInMs(), "")); + // wRowTimeField.setText(Const.NVL(input.getRowTimeField(), "")); + //wLastTimeField.setText(Const.NVL(input.getLastTimeField(), "")); + + for (int i = 0; i < input.getFields().size(); i++) { + Plc4xGeneratorField field = input.getFields().get(i); + TableItem item = wFields.table.getItem(i); + int col = 1; + item.setText(col++, Const.NVL(field.getName(), "")); + + item.setText(col++, Const.NVL(field.getItem(), "")); + + String type = field.getType(); + String format = field.getFormat(); + String length = field.getLength() < 0 ? "" : ("" + field.getLength()); + String prec = field.getPrecision() < 0 ? "" : ("" + field.getPrecision()); + + String curr = field.getCurrency(); + String group = field.getGroup(); + String decim = field.getDecimal(); + String def = field.getValue(); + + item.setText(col++, Const.NVL(type, "")); + item.setText(col++, Const.NVL(format, "")); + item.setText(col++, Const.NVL(length, "")); + item.setText(col++, Const.NVL(prec, "")); + item.setText(col++, Const.NVL(curr, "")); + item.setText(col++, Const.NVL(decim, "")); + item.setText(col++, Const.NVL(group, "")); + item.setText(col++, Const.NVL(def, "")); + item.setText( + col++, + field.isSetEmptyString() + ? BaseMessages.getString(PKG, "System.Combo.Yes") + : BaseMessages.getString(PKG, "System.Combo.No")); + } + + wFields.setRowNums(); + wFields.optWidth(true); + + setActive(); + + wTransformName.selectAll(); + wTransformName.setFocus(); + } + + /** + * Stores the information from the dialog box in meta-data. + * + * @param meta + */ + private void getInfo( Plc4xWriteMeta meta) throws HopException { + meta.setConnection(wConnection.getText()); + meta.setRowLimit(wLimit.getText()); + meta.setNeverEnding(wNeverEnding.getSelection()); + meta.setMaxwaitInMs(wMaxwait.getText()); + meta.setIntervalInMs(wInterval.getText()); + //meta.setRowTimeField(wRowTimeField.getText()); + //meta.setLastTimeField(wLastTimeField.getText()); + + meta.getFields().clear(); + + // CHECKSTYLE:Indentation:OFF + for (TableItem item : wFields.getNonEmptyItems()) { + Plc4xGeneratorField field = new Plc4xGeneratorField(); + field.setName(item.getText(1)); + field.setItem(item.getText(2)); + field.setFormat(item.getText(4)); + field.setLength(Const.toInt(item.getText(5), -1)); + field.setPrecision(Const.toInt(item.getText(6), -1)); + field.setCurrency(item.getText(7)); + field.setDecimal(item.getText(8)); + field.setGroup(item.getText(9)); + field.setValue(field.isSetEmptyString() ? "" : item.getText(10)); + field.setSetEmptyString( + BaseMessages.getString(PKG, "System.Combo.Yes").equalsIgnoreCase(item.getText(11))); + field.setType(field.isSetEmptyString() ? "String" : item.getText(3)); + + meta.getFields().add(field); + } + } + + /** + * Get previos transform fields. + * Clear all information in actual fields. + * + * @param meta + */ + private void getPrevFields(Plc4xWriteMeta meta) throws HopException { + IRowMeta r = pipelineMeta.getPrevTransformFields(variables, transformMeta); + if (r != null){ + meta.getFields().clear(); + r.getValueMetaList().forEach((f)->{ + Plc4xGeneratorField field = new Plc4xGeneratorField(); + field.setName(f.getName()); + field.setItem(""); + field.setType(f.getTypeDesc()); + field.setFormat(f.getFormatMask()); + field.setLength(f.getLength()); + field.setPrecision(f.getPrecision()); + field.setCurrency(f.getCurrencySymbol()); + field.setDecimal(f.getDecimalSymbol()); + field.setGroup(f.getGroupingSymbol()); + field.setValue(f.getStringEncoding()); + meta.getFields().add(field); + }); + } + } + + + /** + * Cancel the dialog. + */ + private void cancel() { + transformName = null; + input.setChanged( changed ); + dispose(); + } + + private void ok() { + if (Utils.isEmpty(wTransformName.getText())) { + return; + } + + transformName = wTransformName.getText(); // return value + try { + getInfo(new Plc4xWriteMeta()); // to see if there is an exception + getInfo(input); // to put the content on the input structure for real if all is well. + dispose(); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + } + } + +private void getfields() { + try { + + IRowMeta r = pipelineMeta.getPrevTransformFields(variables, transformName); + + if (r != null && !r.isEmpty()) { + ITableItemInsertListener listener = + (tableItem, v) -> { + + tableItem.setText(2, ""); + tableItem.setText(3, v.getTypeDesc()); + tableItem.setText(4, v.getFormatMask()==null?"":v.getFormatMask()); + tableItem.setText(5, Integer.toString(v.getLength())); + tableItem.setText(6, Integer.toString(v.getPrecision())); + tableItem.setText(7, v.getCurrencySymbol()==null?"":v.getCurrencySymbol()); + tableItem.setText(8, v.getDecimalSymbol()==null?"":v.getDecimalSymbol()); + tableItem.setText(9, v.getGroupingSymbol()==null?"":v.getGroupingSymbol()); + //tableItem.setText(10, "N"); + tableItem.setText(11, "N"); + return true; + }; + BaseTransformDialog.getFieldsFromPrevious( + r, wFields, 1, new int[] {1}, null, -1, -1, listener); + } + + + + + } catch (Exception ex){ + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + ex); + } +} + + /** + * Preview the data generated by this transform. This generates a pipeline using this transform & + * a dummy and previews it. + */ + private void preview() { + Plc4xWriteMeta oneMeta = new Plc4xWriteMeta(); + try { + getInfo(oneMeta); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + return; + } + + PipelineMeta previewMeta = + PipelinePreviewFactory.generatePreviewPipeline( + pipelineMeta.getMetadataProvider(), oneMeta, wTransformName.getText()); + + EnterNumberDialog numberDialog = + new EnterNumberDialog( + shell, + props.getDefaultPreviewSize(), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Title"), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Message")); + int previewSize = numberDialog.open(); + if (previewSize > 0) { + PipelinePreviewProgressDialog progressDialog = + new PipelinePreviewProgressDialog( + shell, + variables, + previewMeta, + new String[] {wTransformName.getText()}, + new int[] {previewSize}); + progressDialog.open(); + + Pipeline pipeline = progressDialog.getPipeline(); + String loggingText = progressDialog.getLoggingText(); + + if (!progressDialog.isCancelled()) { + if (pipeline.getResult() != null && pipeline.getResult().getNrErrors() > 0) { + EnterTextDialog etd = + new EnterTextDialog( + shell, + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Title"), + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Message"), + loggingText, + true); + etd.setReadOnly(); + etd.open(); + } + } + + PreviewRowsDialog prd = + new PreviewRowsDialog( + shell, + variables, + SWT.NONE, + wTransformName.getText(), + progressDialog.getPreviewRowsMeta(wTransformName.getText()), + progressDialog.getPreviewRows(wTransformName.getText()), + loggingText); + prd.open(); + } + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java new file mode 100644 index 00000000000..d3996ad4a93 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java @@ -0,0 +1,310 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xoutput; + +import org.apache.plc4x.hop.transforms.plc4xinput.*; +import java.util.ArrayList; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.Transform; +import org.apache.hop.core.exception.HopTransformException; +import org.apache.hop.core.exception.HopXmlException; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.core.xml.XmlHandler; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformMeta; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.w3c.dom.Node; + +import java.util.List; +import org.apache.hop.core.Const; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.pipeline.transform.ITransformIOMeta; +import org.apache.hop.pipeline.transform.TransformIOMeta; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; + +/** + * Meta data for the sample transform. + */ +@Transform( + id = "plc4x-write", + name = "i18n::Plc4x.Read.Name", + description = "i18n::Plc4x.Read.Description", + image = "plc4x_write.svg", + categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xoutput:Plc4x.Category.plc4x", + documentationUrl = "https://plc4x.apache.org/users/integrations/apache-calcite.html" +) +public class Plc4xWriteMeta extends BaseTransformMeta implements ITransformMeta { + + private static final Class PKG = Plc4xWriteMeta.class; // Needed by Translator + + + @HopMetadataProperty( + key = "connection", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Connection") + private String connection; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean neverEnding; + + @HopMetadataProperty( + key = "maxwait_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.MaxwaitInMs") + private String maxwaitInMs; + + @HopMetadataProperty( + key = "interval_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.IntervalInMs") + private String intervalInMs; + + @HopMetadataProperty( + key = "row_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowTimeField") + private String rowTimeField; + + @HopMetadataProperty( + key = "last_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.LastTimeField") + private String lastTimeField; + + @HopMetadataProperty( + key = "limit", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowLimit") + private String rowLimit; + + @HopMetadataProperty( + groupKey = "fields", + key = "field", + injectionGroupDescription = "Plc4x.Read.Meta.Injection.Fields", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Fields") + private List fields; + + public Plc4xWriteMeta() { + fields = new ArrayList<>(); + + rowLimit = "10"; + neverEnding = false; + maxwaitInMs = "1000"; + intervalInMs = "5000"; + rowTimeField = "now"; + lastTimeField = "last"; + } + + public Plc4xWriteMeta(Plc4xWriteMeta m) { + this.connection = m.connection; + this.neverEnding = m.neverEnding; + this.intervalInMs = m.intervalInMs; + this.rowTimeField = m.rowTimeField; + this.lastTimeField = m.lastTimeField; + this.rowLimit = m.rowLimit; + this.fields = new ArrayList<>(); + for (Plc4xGeneratorField field : m.fields) { + this.fields.add(new Plc4xGeneratorField(field)); + } + } + + @Override + public Plc4xWriteMeta clone() { + return new Plc4xWriteMeta(this); + } + + + + @Override + public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, + IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { + try { + logBasic("PASO 1"); + List remarks = new ArrayList<>(); + RowMetaAndData rowMetaAndData = Plc4xWrite.buildRow(this, remarks, name); + logBasic("PASO 2"); + if (!remarks.isEmpty()) { + logBasic("PASO 3"); + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + logBasic("PASO 3x: " + remark.toString()); + stringRemarks.append(remark.toString()).append(Const.CR); + } + logBasic("PASO 3.1"); + throw new HopTransformException(stringRemarks.toString()); + } + logBasic("PASO 4"); + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); + } + logBasic("PASO 5"); + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + } catch (Exception e) { + throw new HopTransformException(e); + } + } + + + public Plc4xWrite createTransform(TransformMeta transformMeta, Plc4xWriteData data, int copyNr, + PipelineMeta pipelineMeta, Pipeline pipeline ) { + return new Plc4xWrite( transformMeta, this, data, copyNr, pipelineMeta, pipeline ); + } + + public Plc4xWriteData getTransformData() { + return new Plc4xWriteData(); + } +/* + @Override + public void loadXml( Node transformNode, IHopMetadataProvider metadataProvider ) throws HopXmlException { + //load the saved values from the transformnode + String sampleValue = XmlHandler.getTagValue( transformNode, "sampleValue" ); + + } +*/ + @Override + public void setDefault() { + //default values when creating a new transform + } + + + /** + * Returns the Input/Output metadata for this transform. + * The generator transform only produces output, does not accept input! + * TransformIOMeta(inputAcceptor, outputProducer, inputOptional, outputDynamic, inputDynamic) + */ + @Override + public ITransformIOMeta getTransformIOMeta() { + return new TransformIOMeta(false, true, false, false, false, false); + } + + /** + * Gets Plc4xConnection metadata name. + * + * @return value of intervalInMs + */ + public String getConnection() { + return connection; + } + + /** @param connection */ + public void setConnection(String connection) { + this.connection = connection; + } + + + /** + * Gets neverEnding + * + * @return value of neverEnding + */ + public boolean isNeverEnding() { + return neverEnding; + } + + /** @param neverEnding The neverEnding to set */ + public void setNeverEnding(boolean neverEnding) { + this.neverEnding = neverEnding; + } + + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getMaxwaitInMs() { + return maxwaitInMs; + } + + /** @param intervalInMs The intervalInMs to set */ + public void setMaxwaitInMs(String maxwaitInMs) { + this.maxwaitInMs = maxwaitInMs; + } + + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getIntervalInMs() { + return intervalInMs; + } + + /** @param intervalInMs The intervalInMs to set */ + public void setIntervalInMs(String intervalInMs) { + this.intervalInMs = intervalInMs; + } + + /** + * Gets rowTimeField + * + * @return value of rowTimeField + */ + public String getRowTimeField() { + return rowTimeField; + } + + /** @param rowTimeField The rowTimeField to set */ + public void setRowTimeField(String rowTimeField) { + this.rowTimeField = rowTimeField; + } + + /** + * Gets lastTimeField + * + * @return value of lastTimeField + */ + public String getLastTimeField() { + return lastTimeField; + } + + /** @param lastTimeField The lastTimeField to set */ + public void setLastTimeField(String lastTimeField) { + this.lastTimeField = lastTimeField; + } + + /** + * Gets rowLimit + * + * @return value of rowLimit + */ + public String getRowLimit() { + return rowLimit; + } + + /** @param rowLimit The rowLimit to set */ + public void setRowLimit(String rowLimit) { + this.rowLimit = rowLimit; + } + + /** + * Gets fields + * + * @return value of fields + */ + public List getFields() { + return fields; + } + + /** @param fields The fields to set */ + public void setFields(List fields) { + this.fields = fields; + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java new file mode 100644 index 00000000000..51c6c9d5366 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java @@ -0,0 +1,446 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xsubs; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantLock; +import org.apache.commons.lang3.StringUtils; +import org.apache.hop.core.CheckResult; +import org.apache.hop.core.Const; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.exception.HopPluginException; +import org.apache.hop.core.exception.HopValueException; +import org.apache.hop.core.logging.LogLevel; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.core.row.RowDataUtil; +import org.apache.hop.core.row.RowMeta; +import org.apache.hop.core.row.value.ValueMetaDate; +import org.apache.hop.core.row.value.ValueMetaFactory; +import org.apache.hop.core.util.StringUtil; +import org.apache.hop.core.util.Utils; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransform; +import org.apache.hop.pipeline.transform.ITransform; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; +import org.apache.plc4x.hop.transforms.util.Plc4xPlcField; +import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.java.DefaultPlcDriverManager; +import org.apache.plc4x.java.api.PlcConnection; +import org.apache.plc4x.java.api.messages.PlcReadRequest; +import org.apache.plc4x.java.api.messages.PlcReadResponse; + +/** + * Transform That contains the basic skeleton needed to create your own plugin + * + */ +public class Plc4xSubs extends BaseTransform implements ITransform { + + private static final Class PKG = Plc4xSubs.class; // Needed by Translator + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcReadRequest readRequest = null; + private PlcReadResponse readResponse = null; + private int maxwait = 0; + private static final ReentrantLock lock = new ReentrantLock(); + + private static final String dummy = "dummy"; + + private Map index = new HashMap(); + private Map plcfields = new HashMap(); + + public Plc4xSubs(TransformMeta transformMeta, Plc4xSubsMeta meta, Plc4xSubsData data, int copyNr, PipelineMeta pipelineMeta, + Pipeline pipeline ) { + super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); + } + + /* + * Including Date and Time field for every row + * + * @param meta Meta data from user dialog + * @param remarks Error registers + * @param origin transform instance name + */ + public static final RowMetaAndData buildRow( + Plc4xSubsMeta meta, List remarks, String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); + int index = 0; + + if (!Utils.isEmpty(meta.getRowTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); + rowData[index++] = null; + } + + if (!Utils.isEmpty(meta.getLastTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); + rowData[index++] = null; + } + + for (Plc4xGeneratorField field : meta.getFields()) { + int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); + if (StringUtils.isNotEmpty(field.getType())) { + System.out.println("typeString: " + typeString); + IValueMeta valueMeta = + ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a + // value! + valueMeta.setLength(field.getLength()); + valueMeta.setPrecision(field.getPrecision()); + valueMeta.setConversionMask(field.getFormat()); + valueMeta.setCurrencySymbol(field.getCurrency()); + valueMeta.setGroupingSymbol(field.getGroup()); + valueMeta.setDecimalSymbol(field.getDecimal()); + valueMeta.setOrigin(origin); + + IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); + + if (field.isSetEmptyString()) { + // Set empty string + rowData[index] = StringUtil.EMPTY_STRING; + } else { + String stringValue = field.getValue(); + + // If the value is empty: consider it to be NULL. + if (Utils.isEmpty(stringValue)) { + rowData[index] = null; + + if (valueMeta.getType() == IValueMeta.TYPE_NONE) { + String message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + } + } else { + // Convert the data from String to the specified type ... + // + try { + System.out.println("stringValue: " + stringValue); + rowData[index] = valueMeta.convertData(stringMeta, stringValue); + } catch (HopValueException e) { + switch (valueMeta.getType()) { + case IValueMeta.TYPE_NUMBER: + String message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_DATE: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_INTEGER: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_BIGNUMBER: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_TIMESTAMP: + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + default: + // Boolean and binary don't throw errors normally, so it's probably an unspecified + // error problem... + message = + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + } + } + } + } + + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; + } + } + + return new RowMetaAndData(rowMeta, rowData); + } + + /* + * 1. Block the other instances by means of a lock. + * 2. Try to locate an existing connection. + * 3. If it doesn't exist, it tries to take control of the routine to + * create an instance of PlcConnection and his wrapper. + * 4. Register the connection wrapper for global access. + * 5. If the connection to the PLC is made, then it creates the query + * and executes it. + * + */ + @Override + public boolean processRow() throws HopException { + Object[] r = getRow(); // Get row from input rowset & set row busy! + setLogLevel(LogLevel.DEBUG); + + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; + } + + if (first) { + index.clear(); + plcfields.clear(); + //This performs a minimal check on the user item. + //It guarantees that the rates are within those managed by Plc4x. + meta.getFields().forEach((f) ->{ + plcfields.put(f.getName(),Plc4xPlcField.of(f.getItem())); + }); + first = false; + } + + lock.lock(); //(01) + try { + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + if (connwrapper == null) { + connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) + if (connwrapper != null) connwrapper.retain(); + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + readRequest = null; + try{ + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + if (conn.isConnected()) { + connwrapper = new Plc4xWrapperConnection(conn); + getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) + } + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + } finally { + lock.unlock(); + } + + if ((connmeta != null) && (connwrapper != null)){ + if (connwrapper.getConnection().isConnected()){ + if (readRequest == null){ + PlcReadRequest.Builder builder = connwrapper.getConnection().readRequestBuilder(); //(05) + for (Plc4xGeneratorField field: meta.getFields()){ + builder.addTagAddress(field.getName(), field.getItem()); + } + readRequest = builder.build(); + } + try { + maxwait = Integer.parseInt(meta.getMaxwaitInMs()); + maxwait = (maxwait<100)?100:maxwait; + readResponse = readRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); + + for (Plc4xGeneratorField field: meta.getFields()){ + field.setValue(readResponse.getString(field.getName())); + } + } catch (Exception ex) { + setErrors(1L); + logError("Unable read from PLC. " + ex.getMessage()); + } + + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + + // + int interval = Integer.parseInt(meta.getIntervalInMs()); + + try { + Thread.sleep(interval); + } catch (InterruptedException ex) { + setErrors(1L); + logError(ex.getMessage()); + } + + r = data.outputRowMeta.cloneRow(data.outputRowData); + logBasic("Tamano de los datos: " + r.length); + data.prevDate = data.rowDate; + data.rowDate = new Date(); + int index = 0; + if (!Utils.isEmpty(meta.getRowTimeField())) { + r[index++] = data.rowDate; + } + if (!Utils.isEmpty(meta.getLastTimeField())) { + r[index++] = data.prevDate; + } + for (Plc4xGeneratorField field: meta.getFields()){ + if (field.getType().equalsIgnoreCase("Boolean")){ + r[index++] = Boolean.parseBoolean(field.getValue()); + } else if (field.getType().equalsIgnoreCase("Number")){ + r[index++] = Double.parseDouble(field.getValue()); + } else if (field.getType().equalsIgnoreCase("Integer")){ + r[index++] = Integer.parseInt(field.getValue()); + } + } + putRow(data.outputRowMeta, r ); // return your data + data.rowsWritten++; + return true; + } + + + @Override + public boolean init() { + try { + if(super.init()){ + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + data.rowsWritten = 0L; + data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); + + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } + + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; + } + + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); + + return true; + } + return false; + } catch (Exception ex){ + setErrors(1L); + logError("Error initializing transform", ex); + return false; + } + } + + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ + @Override + public void cleanup() { + super.cleanup(); + logBasic("Cleanup. Release connection."); + if (connwrapper != null) + connwrapper.release(); + } + + + /* + * Here, must perform the cleaning of any resource. + * 1. Check if we have reference to wrapper. + * 2. Release de reference to object. + * 3. The lastone remove the global reference to connection wrapper. + * 4. Clear local references. + */ + @Override + public void dispose() { + super.dispose(); + if (connwrapper != null) { + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + connwrapper.release(); + if (!connwrapper.getConnection().isConnected()){ + getPipeline().getExtensionDataMap().remove(meta.getConnection()); + } + connwrapper = null; + readRequest = null; + + } + } + + + + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsData.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsData.java new file mode 100644 index 00000000000..e39dad14568 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsData.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xsubs; + +import org.apache.plc4x.hop.transforms.plc4xinput.*; +import java.util.Date; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.pipeline.transform.BaseTransformData; +import org.apache.hop.pipeline.transform.ITransformData; + + +public class Plc4xSubsData extends BaseTransformData implements ITransformData { + + //The Plc4xConnection metadata + public String connection; + + public IRowMeta outputRowMeta; + public Object[] outputRowData; + + public long rowLimit; + public long rowsWritten; + public Date rowDate; + public Date prevDate; + public long delay; + + + + /** + * Default constructor for SampleData. + */ + public Plc4xSubsData() { + super(); + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsDialog.java new file mode 100644 index 00000000000..e5d14f2c8b0 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsDialog.java @@ -0,0 +1,601 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xsubs; + +import org.apache.plc4x.hop.transforms.plc4xinput.*; +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.row.value.ValueMetaFactory; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.PipelinePreviewFactory; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformDialog; +import org.apache.hop.ui.core.ConstUi; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.dialog.EnterNumberDialog; +import org.apache.hop.ui.core.dialog.EnterTextDialog; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.dialog.PreviewRowsDialog; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.MetaSelectionLine; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.core.widget.TextVar; +import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog; +import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.util.SwtSvgImageUtil; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.*; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Text; + +public class Plc4xSubsDialog extends BaseTransformDialog implements ITransformDialog { + private static final Class PKG = Plc4xSubsDialog.class; // Needed by Translator + + private MetaSelectionLine wConnection; + + private Label wlLimit; + private TextVar wLimit; + + private Button wNeverEnding; + + private Label wlMaxwait; + private TextVar wMaxwait; + + private Label wlInterval; + private TextVar wInterval; + + private Label wlRowTimeField; + private TextVar wRowTimeField; + + private Label wlLastTimeField; + private TextVar wLastTimeField; + + private TableView wFields; + + private final Plc4xSubsMeta input; + + public Plc4xSubsDialog(Shell parent, IVariables variables , Object in, PipelineMeta pipelineMeta, String sname ) { + super( parent, variables, (BaseTransformMeta) in, pipelineMeta, sname ); + input = (Plc4xSubsMeta) in; + } + + @Override + public String open() { + Shell parent = getParent(); + + shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN); + props.setLook(shell); + setShellImage(shell, input); + + ModifyListener lsMod = e -> input.setChanged(); + changed = input.hasChanged(); + + FormLayout formLayout = new FormLayout(); + formLayout.marginWidth = Const.FORM_MARGIN; + formLayout.marginHeight = Const.FORM_MARGIN; + + shell.setLayout(formLayout); + shell.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.DialogTitle")); + + int middle = props.getMiddlePct(); + int margin = props.getMargin(); + + // Filename line + wlTransformName = new Label(shell, SWT.RIGHT); + wlTransformName.setText(BaseMessages.getString(PKG, "System.Label.TransformName")); + props.setLook(wlTransformName); + fdlTransformName = new FormData(); + fdlTransformName.left = new FormAttachment(0, 0); + fdlTransformName.right = new FormAttachment(middle, -margin); + fdlTransformName.top = new FormAttachment(0, margin); + wlTransformName.setLayoutData(fdlTransformName); + + wTransformName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wTransformName.setText(transformName); + props.setLook(wTransformName); + wTransformName.addModifyListener(lsMod); + fdTransformName = new FormData(); + fdTransformName.left = new FormAttachment(middle, 0); + fdTransformName.top = new FormAttachment(0, margin); + fdTransformName.right = new FormAttachment(100, 0); + wTransformName.setLayoutData(fdTransformName); + + // Connection line + wConnection = + new MetaSelectionLine<>( + variables, + metadataProvider, + Plc4xConnection.class, + shell, + SWT.NONE, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Label"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Connection.Tooltip")); + FormData fdConnection = new FormData(); + fdConnection.left = new FormAttachment(0, 0); + fdConnection.right = new FormAttachment(100, 0); + fdConnection.top = new FormAttachment(wTransformName, margin); + wConnection.setLayoutData(fdConnection); + props.setLook(wConnection); + try { + wConnection.fillItems(); + } catch (Exception e) { + new ErrorDialog(shell, "Error", "Error listing Cassandra connection metadata objects", e); + } + + Control lastControl = wConnection; + + wlLimit = new Label(shell, SWT.RIGHT); + wlLimit.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Limit.Label")); + props.setLook(wlLimit); + FormData fdlLimit = new FormData(); + fdlLimit.left = new FormAttachment(0, 0); + fdlLimit.right = new FormAttachment(middle, -margin); + fdlLimit.top = new FormAttachment(lastControl, margin); + wlLimit.setLayoutData(fdlLimit); + wLimit = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLimit); + wLimit.addModifyListener(lsMod); + FormData fdLimit = new FormData(); + fdLimit.left = new FormAttachment(middle, 0); + fdLimit.top = new FormAttachment(lastControl, margin); + fdLimit.right = new FormAttachment(100, 0); + wLimit.setLayoutData(fdLimit); + lastControl = wLimit; + + Label wlNeverEnding = new Label(shell, SWT.RIGHT); + wlNeverEnding.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + props.setLook(wlNeverEnding); + FormData fdlNeverEnding = new FormData(); + fdlNeverEnding.left = new FormAttachment(0, 0); + fdlNeverEnding.right = new FormAttachment(middle, -margin); + fdlNeverEnding.top = new FormAttachment(lastControl, margin); + wlNeverEnding.setLayoutData(fdlNeverEnding); + wNeverEnding = new Button(shell, SWT.CHECK); + props.setLook(wNeverEnding); + wNeverEnding.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + setActive(); + input.setChanged(); + } + }); + FormData fdNeverEnding = new FormData(); + fdNeverEnding.left = new FormAttachment(middle, 0); + fdNeverEnding.top = new FormAttachment(wlNeverEnding, 0, SWT.CENTER); + fdNeverEnding.right = new FormAttachment(100, 0); + wNeverEnding.setLayoutData(fdNeverEnding); + lastControl = wlNeverEnding; + + wlMaxwait = new Label(shell, SWT.RIGHT); + wlMaxwait.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Maxwait.Label")); + props.setLook(wlMaxwait); + FormData fdlMaxwait = new FormData(); + fdlMaxwait.left = new FormAttachment(0, 0); + fdlMaxwait.right = new FormAttachment(middle, -margin); + fdlMaxwait.top = new FormAttachment(lastControl, margin); + wlMaxwait.setLayoutData(fdlMaxwait); + wMaxwait = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wMaxwait); + wMaxwait.addModifyListener(lsMod); + FormData fdMaxwait = new FormData(); + fdMaxwait.left = new FormAttachment(middle, 0); + fdMaxwait.top = new FormAttachment(lastControl, margin); + fdMaxwait.right = new FormAttachment(100, 0); + wMaxwait.setLayoutData(fdMaxwait); + lastControl = wMaxwait; + + wlInterval = new Label(shell, SWT.RIGHT); + wlInterval.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Interval.Label")); + props.setLook(wlInterval); + FormData fdlInterval = new FormData(); + fdlInterval.left = new FormAttachment(0, 0); + fdlInterval.right = new FormAttachment(middle, -margin); + fdlInterval.top = new FormAttachment(lastControl, margin); + wlInterval.setLayoutData(fdlInterval); + wInterval = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wInterval); + wInterval.addModifyListener(lsMod); + FormData fdInterval = new FormData(); + fdInterval.left = new FormAttachment(middle, 0); + fdInterval.top = new FormAttachment(lastControl, margin); + fdInterval.right = new FormAttachment(100, 0); + wInterval.setLayoutData(fdInterval); + lastControl = wInterval; + + /* + wlRowTimeField = new Label(shell, SWT.RIGHT); + wlRowTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.RowTimeField.Label")); + props.setLook(wlRowTimeField); + FormData fdlRowTimeField = new FormData(); + fdlRowTimeField.left = new FormAttachment(0, 0); + fdlRowTimeField.right = new FormAttachment(middle, -margin); + fdlRowTimeField.top = new FormAttachment(lastControl, margin); + wlRowTimeField.setLayoutData(fdlRowTimeField); + wRowTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wRowTimeField); + wRowTimeField.addModifyListener(lsMod); + FormData fdRowTimeField = new FormData(); + fdRowTimeField.left = new FormAttachment(middle, 0); + fdRowTimeField.top = new FormAttachment(lastControl, margin); + fdRowTimeField.right = new FormAttachment(100, 0); + wRowTimeField.setLayoutData(fdRowTimeField); + lastControl = wRowTimeField; + + wlLastTimeField = new Label(shell, SWT.RIGHT); + wlLastTimeField.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.LastTimeField.Label")); + props.setLook(wlLastTimeField); + FormData fdlLastTimeField = new FormData(); + fdlLastTimeField.left = new FormAttachment(0, 0); + fdlLastTimeField.right = new FormAttachment(middle, -margin); + fdlLastTimeField.top = new FormAttachment(lastControl, margin); + wlLastTimeField.setLayoutData(fdlLastTimeField); + wLastTimeField = new TextVar(variables, shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wLastTimeField); + wLastTimeField.addModifyListener(lsMod); + FormData fdLastTimeField = new FormData(); + fdLastTimeField.left = new FormAttachment(middle, 0); + fdLastTimeField.top = new FormAttachment(lastControl, margin); + fdLastTimeField.right = new FormAttachment(100, 0); + wLastTimeField.setLayoutData(fdLastTimeField); + lastControl = wLastTimeField; + */ + wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, e -> ok()); + wPreview = new Button(shell, SWT.PUSH); + wPreview.setText(BaseMessages.getString(PKG, "System.Button.Preview")); + wPreview.addListener(SWT.Selection, e -> preview()); + wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, e -> cancel()); + + setButtonPositions(new Button[] {wOk, wPreview, wCancel}, margin, null); + + Label wlFields = new Label(shell, SWT.NONE); + wlFields.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Label")); + props.setLook(wlFields); + FormData fdlFields = new FormData(); + fdlFields.left = new FormAttachment(0, 0); + fdlFields.top = new FormAttachment(lastControl, margin); + wlFields.setLayoutData(fdlFields); + lastControl = wlFields; + + final int nrFields = input.getFields().size(); + + ColumnInfo[] colinf = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Name"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Item"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Type"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + ValueMetaFactory.getValueMetaNames()), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Format"), + ColumnInfo.COLUMN_TYPE_FORMAT, + 2), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Length"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Precision"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Currency"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Decimal"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Group"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.Value"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "System.Column.SetEmptyString"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + new String[] { + BaseMessages.getString(PKG, "System.Combo.Yes"), + BaseMessages.getString(PKG, "System.Combo.No") + }) + }; + + wFields = + new TableView( + variables, + shell, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinf, + nrFields, + lsMod, + props); + + FormData fdFields = new FormData(); + fdFields.left = new FormAttachment(0, 0); + fdFields.top = new FormAttachment(lastControl, margin); + fdFields.right = new FormAttachment(100, 0); + fdFields.bottom = new FormAttachment(wOk, -2 * margin); + wFields.setLayoutData(fdFields); + + lsResize = + event -> { + Point size = shell.getSize(); + wFields.setSize(size.x - 10, size.y - 50); + wFields.table.setSize(size.x - 10, size.y - 50); + wFields.redraw(); + }; + shell.addListener(SWT.Resize, lsResize); + + getData(); + input.setChanged(changed); + + BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel()); + + return transformName; + }; + + @Override + public void setActive() { + boolean neverEnding = wNeverEnding.getSelection(); + + wlLimit.setEnabled(!neverEnding); + wLimit.setEnabled(!neverEnding); + + //wlInterval.setEnabled(neverEnding); + //wInterval.setEnabled(neverEnding); + + //wlRowTimeField.setEnabled(neverEnding); + //wRowTimeField.setEnabled(neverEnding); + + //wlLastTimeField.setEnabled(neverEnding); + //wLastTimeField.setEnabled(neverEnding); + } + + + + private Image getImage() { + return SwtSvgImageUtil.getImage( shell.getDisplay(), getClass().getClassLoader(), "plc4x_toddy_read.svg", ConstUi.LARGE_ICON_SIZE, + ConstUi.LARGE_ICON_SIZE ); + } + + /** + * Copy information from the meta-data input to the dialog fields. + * + */ + public void getData() { + if (isDebug()) { + logDebug("getting fields info..."); + } + if (input.getConnection() == null) { + wConnection.setText(""); + } else { + wConnection.setText(input.getConnection()); + } + + wLimit.setText(input.getRowLimit()); + wNeverEnding.setSelection(input.isNeverEnding()); + wMaxwait.setText(Const.NVL(input.getMaxwaitInMs(), "")); + wInterval.setText(Const.NVL(input.getIntervalInMs(), "")); + // wRowTimeField.setText(Const.NVL(input.getRowTimeField(), "")); + //wLastTimeField.setText(Const.NVL(input.getLastTimeField(), "")); + + for (int i = 0; i < input.getFields().size(); i++) { + Plc4xGeneratorField field = input.getFields().get(i); + TableItem item = wFields.table.getItem(i); + int col = 1; + item.setText(col++, Const.NVL(field.getName(), "")); + + item.setText(col++, Const.NVL(field.getItem(), "")); + + String type = field.getType(); + String format = field.getFormat(); + String length = field.getLength() < 0 ? "" : ("" + field.getLength()); + String prec = field.getPrecision() < 0 ? "" : ("" + field.getPrecision()); + + String curr = field.getCurrency(); + String group = field.getGroup(); + String decim = field.getDecimal(); + String def = field.getValue(); + + item.setText(col++, Const.NVL(type, "")); + item.setText(col++, Const.NVL(format, "")); + item.setText(col++, Const.NVL(length, "")); + item.setText(col++, Const.NVL(prec, "")); + item.setText(col++, Const.NVL(curr, "")); + item.setText(col++, Const.NVL(decim, "")); + item.setText(col++, Const.NVL(group, "")); + item.setText(col++, Const.NVL(def, "")); + item.setText( + col++, + field.isSetEmptyString() + ? BaseMessages.getString(PKG, "System.Combo.Yes") + : BaseMessages.getString(PKG, "System.Combo.No")); + } + + wFields.setRowNums(); + wFields.optWidth(true); + + setActive(); + + wTransformName.selectAll(); + wTransformName.setFocus(); + } + + /** + * Stores the information from the dialog box in meta-data. + * + * @param meta + */ + private void getInfo( Plc4xSubsMeta meta) throws HopException { + meta.setConnection(wConnection.getText()); + meta.setRowLimit(wLimit.getText()); + meta.setNeverEnding(wNeverEnding.getSelection()); + meta.setMaxwaitInMs(wMaxwait.getText()); + meta.setIntervalInMs(wInterval.getText()); + //meta.setRowTimeField(wRowTimeField.getText()); + //meta.setLastTimeField(wLastTimeField.getText()); + + meta.getFields().clear(); + + // CHECKSTYLE:Indentation:OFF + for (TableItem item : wFields.getNonEmptyItems()) { + Plc4xGeneratorField field = new Plc4xGeneratorField(); + field.setName(item.getText(1)); + field.setItem(item.getText(2)); + field.setFormat(item.getText(4)); + field.setLength(Const.toInt(item.getText(5), -1)); + field.setPrecision(Const.toInt(item.getText(6), -1)); + field.setCurrency(item.getText(7)); + field.setDecimal(item.getText(8)); + field.setGroup(item.getText(9)); + field.setValue(field.isSetEmptyString() ? "" : item.getText(10)); + field.setSetEmptyString( + BaseMessages.getString(PKG, "System.Combo.Yes").equalsIgnoreCase(item.getText(11))); + field.setType(field.isSetEmptyString() ? "String" : item.getText(3)); + + meta.getFields().add(field); + } + } + + /** + * Cancel the dialog. + */ + private void cancel() { + transformName = null; + input.setChanged( changed ); + dispose(); + } + + private void ok() { + if (Utils.isEmpty(wTransformName.getText())) { + return; + } + + transformName = wTransformName.getText(); // return value + try { + getInfo(new Plc4xSubsMeta()); // to see if there is an exception + getInfo(input); // to put the content on the input structure for real if all is well. + dispose(); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + } + } + + + /** + * Preview the data generated by this transform. This generates a pipeline using this transform & + * a dummy and previews it. + */ + private void preview() { + Plc4xSubsMeta oneMeta = new Plc4xSubsMeta(); + try { + getInfo(oneMeta); + } catch (HopException e) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + e); + return; + } + + PipelineMeta previewMeta = + PipelinePreviewFactory.generatePreviewPipeline( + pipelineMeta.getMetadataProvider(), oneMeta, wTransformName.getText()); + + EnterNumberDialog numberDialog = + new EnterNumberDialog( + shell, + props.getDefaultPreviewSize(), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Title"), + BaseMessages.getString(PKG, "System.Dialog.EnterPreviewSize.Message")); + int previewSize = numberDialog.open(); + if (previewSize > 0) { + PipelinePreviewProgressDialog progressDialog = + new PipelinePreviewProgressDialog( + shell, + variables, + previewMeta, + new String[] {wTransformName.getText()}, + new int[] {previewSize}); + progressDialog.open(); + + Pipeline pipeline = progressDialog.getPipeline(); + String loggingText = progressDialog.getLoggingText(); + + if (!progressDialog.isCancelled()) { + if (pipeline.getResult() != null && pipeline.getResult().getNrErrors() > 0) { + EnterTextDialog etd = + new EnterTextDialog( + shell, + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Title"), + BaseMessages.getString(PKG, "System.Dialog.PreviewError.Message"), + loggingText, + true); + etd.setReadOnly(); + etd.open(); + } + } + + PreviewRowsDialog prd = + new PreviewRowsDialog( + shell, + variables, + SWT.NONE, + wTransformName.getText(), + progressDialog.getPreviewRowsMeta(wTransformName.getText()), + progressDialog.getPreviewRows(wTransformName.getText()), + loggingText); + prd.open(); + } + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java new file mode 100644 index 00000000000..35f15665bdb --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java @@ -0,0 +1,310 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.plc4xsubs; + +import org.apache.plc4x.hop.transforms.plc4xinput.*; +import java.util.ArrayList; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.Transform; +import org.apache.hop.core.exception.HopTransformException; +import org.apache.hop.core.exception.HopXmlException; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.core.xml.XmlHandler; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformMeta; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.w3c.dom.Node; + +import java.util.List; +import org.apache.hop.core.Const; +import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.pipeline.transform.ITransformIOMeta; +import org.apache.hop.pipeline.transform.TransformIOMeta; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; + +/** + * Meta data for the sample transform. + */ +@Transform( + id = "plc4x-subs", + name = "i18n::Plc4x.Read.Name", + description = "i18n::Plc4x.Read.Description", + image = "plc4x_subs.svg", + categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xinput:Plc4x.Category.plc4x", + documentationUrl = "https://plc4x.apache.org/users/integrations/apache-calcite.html" +) +public class Plc4xSubsMeta extends BaseTransformMeta implements ITransformMeta { + + private static final Class PKG = Plc4xSubsMeta.class; // Needed by Translator + + + @HopMetadataProperty( + key = "connection", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Connection") + private String connection; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean neverEnding; + + @HopMetadataProperty( + key = "maxwait_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.MaxwaitInMs") + private String maxwaitInMs; + + @HopMetadataProperty( + key = "interval_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.IntervalInMs") + private String intervalInMs; + + @HopMetadataProperty( + key = "row_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowTimeField") + private String rowTimeField; + + @HopMetadataProperty( + key = "last_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.LastTimeField") + private String lastTimeField; + + @HopMetadataProperty( + key = "limit", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowLimit") + private String rowLimit; + + @HopMetadataProperty( + groupKey = "fields", + key = "field", + injectionGroupDescription = "Plc4x.Read.Meta.Injection.Fields", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Fields") + private List fields; + + public Plc4xSubsMeta() { + fields = new ArrayList<>(); + + rowLimit = "10"; + neverEnding = false; + maxwaitInMs = "1000"; + intervalInMs = "5000"; + rowTimeField = "now"; + lastTimeField = "last"; + } + + public Plc4xSubsMeta(Plc4xSubsMeta m) { + this.connection = m.connection; + this.neverEnding = m.neverEnding; + this.intervalInMs = m.intervalInMs; + this.rowTimeField = m.rowTimeField; + this.lastTimeField = m.lastTimeField; + this.rowLimit = m.rowLimit; + this.fields = new ArrayList<>(); + for (Plc4xGeneratorField field : m.fields) { + this.fields.add(new Plc4xGeneratorField(field)); + } + } + + @Override + public Plc4xSubsMeta clone() { + return new Plc4xSubsMeta(this); + } + + + + @Override + public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, + IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { + try { + logBasic("PASO 1"); + List remarks = new ArrayList<>(); + RowMetaAndData rowMetaAndData = Plc4xSubs.buildRow(this, remarks, name); + logBasic("PASO 2"); + if (!remarks.isEmpty()) { + logBasic("PASO 3"); + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + logBasic("PASO 3x: " + remark.toString()); + stringRemarks.append(remark.toString()).append(Const.CR); + } + logBasic("PASO 3.1"); + throw new HopTransformException(stringRemarks.toString()); + } + logBasic("PASO 4"); + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); + } + logBasic("PASO 5"); + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + } catch (Exception e) { + throw new HopTransformException(e); + } + } + + + public Plc4xSubs createTransform(TransformMeta transformMeta, Plc4xSubsData data, int copyNr, + PipelineMeta pipelineMeta, Pipeline pipeline ) { + return new Plc4xSubs( transformMeta, this, data, copyNr, pipelineMeta, pipeline ); + } + + public Plc4xSubsData getTransformData() { + return new Plc4xSubsData(); + } +/* + @Override + public void loadXml( Node transformNode, IHopMetadataProvider metadataProvider ) throws HopXmlException { + //load the saved values from the transformnode + String sampleValue = XmlHandler.getTagValue( transformNode, "sampleValue" ); + + } +*/ + @Override + public void setDefault() { + //default values when creating a new transform + } + + + /** + * Returns the Input/Output metadata for this transform. + * The generator transform only produces output, does not accept input! + * TransformIOMeta(inputAcceptor, outputProducer, inputOptional, outputDynamic, inputDynamic) + */ + @Override + public ITransformIOMeta getTransformIOMeta() { + return new TransformIOMeta(false, true, false, false, false, false); + } + + /** + * Gets Plc4xConnection metadata name. + * + * @return value of intervalInMs + */ + public String getConnection() { + return connection; + } + + /** @param connection */ + public void setConnection(String connection) { + this.connection = connection; + } + + + /** + * Gets neverEnding + * + * @return value of neverEnding + */ + public boolean isNeverEnding() { + return neverEnding; + } + + /** @param neverEnding The neverEnding to set */ + public void setNeverEnding(boolean neverEnding) { + this.neverEnding = neverEnding; + } + + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getMaxwaitInMs() { + return maxwaitInMs; + } + + /** @param intervalInMs The intervalInMs to set */ + public void setMaxwaitInMs(String maxwaitInMs) { + this.maxwaitInMs = maxwaitInMs; + } + + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getIntervalInMs() { + return intervalInMs; + } + + /** @param intervalInMs The intervalInMs to set */ + public void setIntervalInMs(String intervalInMs) { + this.intervalInMs = intervalInMs; + } + + /** + * Gets rowTimeField + * + * @return value of rowTimeField + */ + public String getRowTimeField() { + return rowTimeField; + } + + /** @param rowTimeField The rowTimeField to set */ + public void setRowTimeField(String rowTimeField) { + this.rowTimeField = rowTimeField; + } + + /** + * Gets lastTimeField + * + * @return value of lastTimeField + */ + public String getLastTimeField() { + return lastTimeField; + } + + /** @param lastTimeField The lastTimeField to set */ + public void setLastTimeField(String lastTimeField) { + this.lastTimeField = lastTimeField; + } + + /** + * Gets rowLimit + * + * @return value of rowLimit + */ + public String getRowLimit() { + return rowLimit; + } + + /** @param rowLimit The rowLimit to set */ + public void setRowLimit(String rowLimit) { + this.rowLimit = rowLimit; + } + + /** + * Gets fields + * + * @return value of fields + */ + public List getFields() { + return fields; + } + + /** @param fields The fields to set */ + public void setFields(List fields) { + this.fields = fields; + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xDataType.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xDataType.java new file mode 100644 index 00000000000..dc6df28d2a2 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xDataType.java @@ -0,0 +1,115 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.transforms.util; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +// Code generated by code-generation. DO NOT EDIT. + +public enum Plc4xDataType { + BOOL((short) 1, (short) 1), + BYTE((short) 2, (short) 1), + WORD((short) 3, (short) 2), + DWORD((short) 4, (short) 4), + LWORD((short) 5, (short) 8), + SINT((short) 6, (short) 1), + INT((short) 7, (short) 2), + DINT((short) 8, (short) 4), + LINT((short) 9, (short) 8), + USINT((short) 10, (short) 1), + UINT((short) 11, (short) 2), + UDINT((short) 12, (short) 4), + ULINT((short) 13, (short) 8), + REAL((short) 14, (short) 4), + LREAL((short) 15, (short) 8), + TIME((short) 16, (short) 8), + LTIME((short) 17, (short) 8), + DATE((short) 18, (short) 8), + LDATE((short) 19, (short) 8), + TIME_OF_DAY((short) 20, (short) 8), + LTIME_OF_DAY((short) 21, (short) 8), + DATE_AND_TIME((short) 22, (short) 8), + LDATE_AND_TIME((short) 23, (short) 8), + CHAR((short) 24, (short) 1), + WCHAR((short) 25, (short) 2), + STRING((short) 26, (short) 1), + WSTRING((short) 27, (short) 2); + + private static final Logger logger = LoggerFactory.getLogger(Plc4xDataType.class); + + private static final Map map; + + static { + map = new HashMap<>(); + for (Plc4xDataType value : Plc4xDataType.values()) { + map.put((short) value.getValue(), value); + } + } + + private short value; + private short dataTypeSize; + + Plc4xDataType(short value, short dataTypeSize) { + this.value = value; + this.dataTypeSize = dataTypeSize; + } + + public short getValue() { + return value; + } + + public short getDataTypeSize() { + return dataTypeSize; + } + + public static Plc4xDataType firstEnumForFieldDataTypeSize(short fieldValue) { + for (Plc4xDataType _val : Plc4xDataType.values()) { + if (_val.getDataTypeSize() == fieldValue) { + return _val; + } + } + return null; + } + + public static List enumsForFieldDataTypeSize(short fieldValue) { + List _values = new ArrayList(); + for (Plc4xDataType _val : Plc4xDataType.values()) { + if (_val.getDataTypeSize() == fieldValue) { + _values.add(_val); + } + } + return _values; + } + + public static Plc4xDataType enumForValue(short value) { + if (!map.containsKey(value)) { + logger.error("No Plc4xDataType for value {}", value); + } + return map.get(value); + } + + public static Boolean isDefined(short value) { + return map.containsKey(value); + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xGeneratorField.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xGeneratorField.java new file mode 100644 index 00000000000..a676ee34221 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xGeneratorField.java @@ -0,0 +1,275 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.transforms.util; + +import org.apache.hop.metadata.api.HopMetadataProperty; + +import java.util.Objects; + +public class Plc4xGeneratorField { + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Name") + private String name; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Item") + private String item; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Type") + private String type; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Format") + private String format; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Length") + private int length; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Precision") + private int precision; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Currency") + private String currency; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Decimal") + private String decimal; + + @HopMetadataProperty(injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Group") + private String group; + + // Yeah, it has a key of "nullif", keep it for backward compatibility + @HopMetadataProperty( + key = "nullif", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.Value") + private String value; + + @HopMetadataProperty( + key = "set_empty_string", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Field.SetEmptyString") + private boolean setEmptyString; + + public Plc4xGeneratorField() {} + + public Plc4xGeneratorField(Plc4xGeneratorField f) { + this.name = f.name; + this.item = f.item; + this.type = f.type; + this.format = f.format; + this.length = f.length; + this.precision = f.precision; + this.currency = f.currency; + this.decimal = f.decimal; + this.group = f.group; + this.value = f.value; + this.setEmptyString = f.setEmptyString; + } + + public Plc4xGeneratorField( + String name, + String item, + String type, + String format, + int length, + int precision, + String currency, + String decimal, + String group, + String value, + boolean setEmptyString) { + this.name = name; + this.item = item; + this.type = type; + this.format = format; + this.length = length; + this.precision = precision; + this.currency = currency; + this.decimal = decimal; + this.group = group; + this.value = value; + this.setEmptyString = setEmptyString; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Plc4xGeneratorField that = (Plc4xGeneratorField) o; + return Objects.equals(name, that.name); + } + + @Override + public int hashCode() { + return Objects.hash(name); + } + + /** + * Gets name + * + * @return value of name + */ + public String getName() { + return name; + } + + /** @param name The name to set */ + public void setName(String name) { + this.name = name; + } + + /** + * Gets Item + * + * @return value of name + */ + public String getItem() { + return item; + } + + /** @param name The name to set */ + public void setItem(String item) { + this.item = item; + } + + /** + * Gets type + * + * @return value of type + */ + public String getType() { + return type; + } + + /** @param type The type to set */ + public void setType(String type) { + this.type = type; + } + + /** + * Gets format + * + * @return value of format + */ + public String getFormat() { + return format; + } + + /** @param format The format to set */ + public void setFormat(String format) { + this.format = format; + } + + /** + * Gets length + * + * @return value of length + */ + public int getLength() { + return length; + } + + /** @param length The length to set */ + public void setLength(int length) { + this.length = length; + } + + /** + * Gets precision + * + * @return value of precision + */ + public int getPrecision() { + return precision; + } + + /** @param precision The precision to set */ + public void setPrecision(int precision) { + this.precision = precision; + } + + /** + * Gets currency + * + * @return value of currency + */ + public String getCurrency() { + return currency; + } + + /** @param currency The currency to set */ + public void setCurrency(String currency) { + this.currency = currency; + } + + /** + * Gets decimal + * + * @return value of decimal + */ + public String getDecimal() { + return decimal; + } + + /** @param decimal The decimal to set */ + public void setDecimal(String decimal) { + this.decimal = decimal; + } + + /** + * Gets group + * + * @return value of group + */ + public String getGroup() { + return group; + } + + /** @param group The group to set */ + public void setGroup(String group) { + this.group = group; + } + + /** + * Gets value + * + * @return value of value + */ + public String getValue() { + return value; + } + + /** @param value The value to set */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets setEmptyString + * + * @return value of setEmptyString + */ + public boolean isSetEmptyString() { + return setEmptyString; + } + + /** @param setEmptyString The setEmptyString to set */ + public void setSetEmptyString(boolean setEmptyString) { + this.setEmptyString = setEmptyString; + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java new file mode 100644 index 00000000000..295dc9f1765 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java @@ -0,0 +1,148 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.transforms.util; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException; +import org.apache.plc4x.java.api.model.PlcTag; +import org.apache.plc4x.java.spi.generation.ParseException; +import org.apache.plc4x.java.spi.generation.SerializationException; +import org.apache.plc4x.java.spi.generation.WriteBuffer; +import org.apache.plc4x.java.spi.utils.Serializable; + +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/* +* Code taken from the Modbus driver implementation. +* This allows me to make the correct interpretation of the "Hop" values +* towards the writing fields. +* +* TODO: The HOP interpreter generates an error when processing +* the "Integer" fields. +*/ + +public class Plc4xPlcField implements PlcTag, Serializable { + + public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?
[\\%a-zA-Z_\\.0-9]+)(:(?[a-zA-Z_]+))?(\\[(?\\d+)])?"); + + protected static final int PROTOCOL_ADDRESS_OFFSET = 1; + + private final String address; + + private final int quantity; + + private final Plc4xDataType dataType; + + public static Plc4xPlcField of(String addressString) { + if (Plc4xPlcField.matches(addressString)) { + Matcher matcher = ADDRESS_PATTERN.matcher(addressString); + + matcher.matches(); + + String address = matcher.group("address"); + + String quantityString = matcher.group("quantity"); + int quantity = quantityString != null ? Integer.parseInt(quantityString) : 1; + + Plc4xDataType dataType = (matcher.group("datatype") != null) ? Plc4xDataType.valueOf(matcher.group("datatype")) : Plc4xDataType.BOOL; + + + return new Plc4xPlcField(address, quantity, dataType); + } + + throw new PlcInvalidTagException("Unable to parse address: " + addressString); + } + + protected Plc4xPlcField(String address, Integer quantity, Plc4xDataType dataType) { + this.address = address; + + this.quantity = quantity != null ? quantity : 1; + + this.dataType = dataType != null ? dataType : Plc4xDataType.INT; + } + + public static boolean matches(String addressString) { + return ADDRESS_PATTERN.matcher(addressString).matches(); + } + + public String getAddress() { + return address; + } + + public int getNumberOfElements() { + return quantity; + } + + public int getLengthBytes() { + return quantity * dataType.getDataTypeSize(); + } + + @JsonIgnore + public int getLengthWords() { + return (int) ((quantity * (float) dataType.getDataTypeSize()) / 2.0f); + } + + public Plc4xDataType getDataType() { + return dataType; + } + + public String getPlcDataType() { + return dataType.name(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Plc4xPlcField)) { + return false; + } + Plc4xPlcField that = (Plc4xPlcField) o; + return address == that.address; + } + + @Override + public int hashCode() { + return Objects.hash(address); + } + + @Override + public String toString() { + return "Plc4xPlcField{" + + " address=" + address + + " datatype=" + dataType + + " quantity=" + quantity + + " }"; + } + + @Override + public void serialize(WriteBuffer wb) throws SerializationException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public String getAddressString() { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xWrapperConnection.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xWrapperConnection.java new file mode 100644 index 00000000000..6c6ea3602aa --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xWrapperConnection.java @@ -0,0 +1,60 @@ + /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.transforms.util; + +import io.netty.util.AbstractReferenceCounted; +import io.netty.util.ReferenceCounted; +import org.apache.plc4x.java.api.PlcConnection; + +/** + * This is a wrapper around a PlcConnection connection from the Apache Plc4x library. + * Its goal is for it to be shared between the different transform that + * may be running simultaneously on the local or remote Hop engine. + * Its use with other kind of engines must be certified. + * The concept is very simple, the last to leave closes the connection. + */ +public class Plc4xWrapperConnection extends AbstractReferenceCounted { + + private final PlcConnection connection; + + public Plc4xWrapperConnection(PlcConnection connection){ + super(); + this.connection = connection; + } + + public PlcConnection getConnection(){ + return this.connection; + } + + @Override + protected void deallocate() { + try{ + connection.close(); + } catch (Exception ex){ + ex.printStackTrace(); + } + } + + + @Override + public ReferenceCounted touch(Object hint) { + return this; + } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties new file mode 100644 index 00000000000..b6bc8d9f8d5 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Event Transform +Plc4x.Read.Description=Plc4x Event Transform Description +Plc4x.Read.Shell.Title=Plc4x Event Transform Title +Plc4x.Read.TransformName.Label=Plc4x Event Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Never ending +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection EN +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata EN +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_es_ES.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_es_ES.properties new file mode 100644 index 00000000000..4fba5312296 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_es_ES.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Event Transform +Plc4x.Read.Description=Plc4x Event Transform Description +Plc4x.Read.Shell.Title=Plc4x Event Transform Title +Plc4x.Read.TransformName.Label=Plc4x Event Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Bucle sin fin +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection ES +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata ES +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_en_US.properties new file mode 100644 index 00000000000..59072612a7e --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_en_US.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Read Transform +Plc4x.Read.Description=Plc4x Read Transform Description +Plc4x.Read.Shell.Title=Plc4x Read Transform Title +Plc4x.Read.TransformName.Label=Plc4x Read Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Never ending +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection EN +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata EN +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_es_ES.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_es_ES.properties new file mode 100644 index 00000000000..20a5d8f4b2f --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xinput/messages/messages_es_ES.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Read Transform +Plc4x.Read.Description=Plc4x Read Transform Description +Plc4x.Read.Shell.Title=Plc4x Read Transform Title +Plc4x.Read.TransformName.Label=Plc4x Read Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Bucle sin fin +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection ES +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata ES +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_en_US.properties new file mode 100644 index 00000000000..8bdd7fd697a --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_en_US.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Write Transform +Plc4x.Read.Description=Plc4x Write Transform Description +Plc4x.Read.Shell.Title=Plc4x Write Transform Title +Plc4x.Read.TransformName.Label=Plc4x Write Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Never ending +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection EN +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata EN +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_es_ES.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_es_ES.properties new file mode 100644 index 00000000000..b4d048a18c5 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xoutput/messages/messages_es_ES.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Write Transform +Plc4x.Read.Description=Plc4x Write Transform Description +Plc4x.Read.Shell.Title=Plc4x Write Transform Title +Plc4x.Read.TransformName.Label=Plc4x Write Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Bucle sin fin +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection ES +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata ES +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_en_US.properties new file mode 100644 index 00000000000..cbcf6a63dac --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_en_US.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Subscription Transform +Plc4x.Read.Description=Plc4x Subscription Transform Description +Plc4x.Read.Shell.Title=Plc4x Subscription Transform Title +Plc4x.Read.TransformName.Label=Plc4x Subscription Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Never ending +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection EN +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata EN +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_es_ES.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_es_ES.properties new file mode 100644 index 00000000000..44279b8dec2 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xsubs/messages/messages_es_ES.properties @@ -0,0 +1,69 @@ + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +Plc4x.Category.plc4x=Plc4x +Plc4x.Read.Name=Plc4x Subscription Transform +Plc4x.Read.Description=Plc4x Subscription Transform Description +Plc4x.Read.Shell.Title=Plc4x Subscription Transform Title +Plc4x.Read.TransformName.Label=Plc4x Subscription Sample Name + +Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.NeverEnding=Nerverending +Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn +Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn +Plc4x.Read.Meta.Injection.RowTimeField=RowTimeField +Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField +Plc4x.Read.Meta.Injection.RowLimit=RowLimit +Plc4x.Read.Meta.Injection.Fields=Fields + +Plc4x.Read.Meta.Injection.Field.Name=Name +Plc4x.Read.Meta.Injection.Field.Item=Item +Plc4x.Read.Meta.Injection.Field.Type=Type +Plc4x.Read.Meta.Injection.Field.Format=Format +Plc4x.Read.Meta.Injection.Field.Length=Length +Plc4x.Read.Meta.Injection.Field.Precision=Precision +Plc4x.Read.Meta.Injection.Field.Units=Units +Plc4x.Read.Meta.Injection.Field.Decimal=Decimal +Plc4x.Read.Meta.Injection.Field.Group=Group +Plc4x.Read.Meta.Injection.Field.Value=Value +Plc4x.Read.Meta.Injection.Field.SetEmptyString=Empty + +Plc4x.Read.Meta.Illegal.Dialog.Settings.Message=The Message +Plc4x.Read.Meta.Dialog.Settings.Title=Dialog +Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer +Plc4x.Read.Meta.Dialog.Limit.Label=Limit +Plc4x.Read.Meta.Dialog.NeverEnding.Label=Bucle sin fin +Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting +Plc4x.Read.Meta.Dialog.Interval.Label=Interval +Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time +Plc4x.Read.Meta.Dialog.LastTimeField.Label=Last Time +Plc4x.Read.Meta.Dialog.Fields.Label=Fields +Plc4x.Read.Meta.Dialog.Fields.Item=Item +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title=Alert +Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message=Message +Plc4x.Read.Meta.Dialog.Connection.Label=Connection ES +Plc4x.Read.Meta.Dialog.Connection.Tooltip=Plc4x connection metadata ES +Plc4x.Read.Meta.BuildRow.Error.Parsing.Number=Error parsing number +Plc4x.Read.Meta.BuildRow.Error.Parsing.Date=Error parsing date +Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer=Error parsing integer +Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber=Error parsing bignumber +Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp=Error parsing timestamp +Plc4x.Read.Meta.CheckResult.SpecifyTypeError=Errot type +Plc4x.Read.Meta.Wrong.RowLimit.Number=Error in the number of row +System.Column.SetEmptyString=Set empty string? +Plc4x.Read.Meta.Log.SetMetadata=Check your connection setings +Plc4x.Read.Meta.Log.UnableToCreateConnection=Unable to create connection to PLC diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_action.svg b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_action.svg new file mode 100644 index 00000000000..01694ecd5df --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_action.svg @@ -0,0 +1,1306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_event.svg b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_event.svg new file mode 100644 index 00000000000..21ed5ecb1ed --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_event.svg @@ -0,0 +1,822 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_read.svg b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_read.svg new file mode 100644 index 00000000000..c67b42523ad --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_read.svg @@ -0,0 +1,813 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_subs.svg b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_subs.svg new file mode 100644 index 00000000000..87f84f3f855 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_subs.svg @@ -0,0 +1,743 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_write.svg b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_write.svg new file mode 100644 index 00000000000..9b295c3ea71 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/plc4x_write.svg @@ -0,0 +1,810 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/pom.xml new file mode 100644 index 00000000000..214a8dc009f --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/pom.xml @@ -0,0 +1,138 @@ + + + + 4.0.0 + + org.apache.plc4x + hop-plc4x-utils + 0.11.0-SNAPSHOT + + plc4x-hop-grafana + jar + PLC4J: Integrations: Apache Hop: Grafana Post + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + org.jboss.jandex + jandex-maven-plugin + 1.0.8 + + + make-index + + jandex + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + io.netty:netty-common:jar:${netty.version} + io.netty:netty-all:jar:${netty.version} + commons-lang:commons-lang:jar:2.6 + xml-apis:xml-apis:jar:1.4.01 + + + + + + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + org.apache.hop + hop-core + ${hop.version} + + + * + * + + + + + org.apache.hop + hop-engine + ${hop.version} + + + * + * + + + + + org.apache.hop + hop-ui + ${hop.version} + + + * + * + + + + + com.google.guava + guava + 30.1.1-jre + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + commons-lang + commons-lang + 2.6 + + + org.eclipse.platform + org.eclipse.swt.gtk.linux.x86_64 + 3.114.0 + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPost.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPost.java new file mode 100644 index 00000000000..ba590cd0ca8 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPost.java @@ -0,0 +1,589 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.utils.transforms.grafana; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.commons.lang.StringUtils; +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.exception.HopTransformException; +import org.apache.hop.core.row.RowDataUtil; +import org.apache.hop.core.util.HttpClientManager; +import org.apache.hop.core.util.StringUtil; +import org.apache.hop.core.util.Utils; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransform; +import org.apache.hop.pipeline.transform.ITransform; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.apache.http.*; +import org.apache.http.client.AuthCache; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.InputStreamEntity; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.auth.BasicScheme; +import org.apache.http.impl.client.BasicAuthCache; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.json.simple.JSONObject; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URLEncoder; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.apache.plc4x.hop.utils.transforms.grafana.GrafanaPostMeta.DEFAULT_ENCODING; + +/** Make a HTTP Post call */ +public class GrafanaPost extends BaseTransform implements ITransform { + + private static final Class PKG = GrafanaPostMeta.class; // For Translator + + private static final String CONTENT_TYPE = "Content-type"; + private static final String CONTENT_TYPE_TEXT_XML = "text/xml"; + private static final String PKG_HEADER_VALUE = "HTTPPOST.Log.HeaderValue"; + private static final String PKG_ERROR_FINDING_FIELD = "HTTPPOST.Log.ErrorFindingField"; + + public GrafanaPost( + TransformMeta transformMeta, + GrafanaPostMeta meta, + GrafanaPostData data, + int copyNr, + PipelineMeta pipelineMeta, + Pipeline pipeline) { + super(transformMeta, meta, data, copyNr, pipelineMeta, pipeline); + } + + private Object[] callHttpPOST(Object[] rowData) throws HopException { + HttpClientManager.HttpClientBuilderFacade clientBuilder = + HttpClientManager.getInstance().createBuilder(); + + if (data.realConnectionTimeout > -1) { + clientBuilder.setConnectionTimeout(data.realConnectionTimeout); + } + if (data.realSocketTimeout > -1) { + clientBuilder.setSocketTimeout(data.realSocketTimeout); + } + if (StringUtils.isNotBlank(data.realHttpLogin)) { + clientBuilder.setCredentials(data.realHttpLogin, data.realHttpPassword); + } + if (StringUtils.isNotBlank(data.realProxyHost)) { + clientBuilder.setProxy(data.realProxyHost, data.realProxyPort); + } + + CloseableHttpClient httpClient = clientBuilder.build(); + + // get dynamic url ? + if (meta.isUrlInField()) { + data.realUrl = data.inputRowMeta.getString(rowData, data.indexOfUrlField); + } + // Prepare HTTP POST + FileInputStream fis = null; + try { + if (isDetailed()) { + logDetailed(BaseMessages.getString(PKG, "HTTPPOST.Log.ConnectingToURL", data.realUrl)); + } + URIBuilder uriBuilder = new URIBuilder(data.realUrl); + org.apache.http.client.methods.HttpPost post = + new org.apache.http.client.methods.HttpPost(uriBuilder.build()); + + // Specify content type and encoding + // If content encoding is not explicitly specified + // ISO-8859-1 is assumed by the POSTMethod + if (!data.contentTypeHeaderOverwrite) { // can be overwritten now + if (Utils.isEmpty(data.realEncoding)) { + post.setHeader(CONTENT_TYPE, CONTENT_TYPE_TEXT_XML); + if (isDebug()) { + logDebug( + BaseMessages.getString(PKG, PKG_HEADER_VALUE, CONTENT_TYPE, CONTENT_TYPE_TEXT_XML)); + } + } else { + post.setHeader(CONTENT_TYPE, CONTENT_TYPE_TEXT_XML + "; " + data.realEncoding); + if (isDebug()) { + logDebug( + BaseMessages.getString( + PKG, + PKG_HEADER_VALUE, + CONTENT_TYPE, + CONTENT_TYPE_TEXT_XML + "; " + data.realEncoding)); + } + } + } + + // HEADER PARAMETERS + if (data.useHeaderParameters) { + // set header parameters that we want to send + for (int i = 0; i < data.header_parameters_nrs.length; i++) { + post.addHeader( + data.headerParameters[i].getName(), + data.inputRowMeta.getString(rowData, data.header_parameters_nrs[i])); + if (isDebug()) { + logDebug( + BaseMessages.getString( + PKG, + PKG_HEADER_VALUE, + data.headerParameters[i].getName(), + data.inputRowMeta.getString(rowData, data.header_parameters_nrs[i]))); + } + } + } + + // BODY PARAMETERS + if (data.useBodyParameters) { + // set body parameters that we want to send + for (int i = 0; i < data.body_parameters_nrs.length; i++) { + String bodyParameterName = data.bodyParameters[i].getName(); + String bodyParameterValue = + data.inputRowMeta.getString(rowData, data.body_parameters_nrs[i]); + data.bodyParameters[i] = new BasicNameValuePair(bodyParameterName, bodyParameterValue); + if (isDebug()) { + logDebug( + BaseMessages.getString( + PKG, "HTTPPOST.Log.BodyValue", bodyParameterName, bodyParameterValue)); + } + } + String bodyParams = getRequestBodyParamsAsStr(data.bodyParameters, data.realEncoding); + post.setEntity( + (new StringEntity(bodyParams, ContentType.TEXT_XML.withCharset("US-ASCII")))); + } + + // QUERY PARAMETERS + if (data.useQueryParameters) { + for (int i = 0; i < data.query_parameters_nrs.length; i++) { + String queryParameterName = data.queryParameters[i].getName(); + String queryParameterValue = + data.inputRowMeta.getString(rowData, data.query_parameters_nrs[i]); + data.queryParameters[i] = new BasicNameValuePair(queryParameterName, queryParameterValue); + if (isDebug()) { + logDebug( + BaseMessages.getString( + PKG, "HTTPPOST.Log.QueryValue", queryParameterName, queryParameterValue)); + } + } + post.setEntity(new UrlEncodedFormEntity(Arrays.asList(data.queryParameters))); + } + + // Set request entity? + if (data.indexOfRequestEntity >= 0) { + String tmp = data.inputRowMeta.getString(rowData, data.indexOfRequestEntity); + // Request content will be retrieved directly + // from the input stream + // Per default, the request content needs to be buffered + // in order to determine its length. + // Request body buffering can be avoided when + // content length is explicitly specified + + if (meta.isPostAFile()) { + File input = new File(tmp); + fis = new FileInputStream(input); + post.setEntity(new InputStreamEntity(fis, input.length())); + } else { + byte[] bytes; + if ((data.realEncoding != null) && (data.realEncoding.length() > 0)) { + bytes = tmp.getBytes(data.realEncoding); + } else { + bytes = tmp.getBytes(); + } + post.setEntity(new ByteArrayEntity(bytes)); + } + } + + // Execute request + Object[] newRow = null; + if (rowData != null) { + newRow = rowData.clone(); + } + CloseableHttpResponse httpResponse = null; + try { + // used for calculating the responseTime + long startTime = System.currentTimeMillis(); + + // Execute the POST method + if (StringUtils.isNotBlank(data.realProxyHost)) { + HttpHost target = new HttpHost(data.realProxyHost, data.realProxyPort, "http"); + // Create AuthCache instance + AuthCache authCache = new BasicAuthCache(); + // Generate BASIC scheme object and add it to the local + // auth cache + BasicScheme basicAuth = new BasicScheme(); + authCache.put(target, basicAuth); + // Add AuthCache to the execution context + HttpClientContext localContext = HttpClientContext.create(); + localContext.setAuthCache(authCache); + httpResponse = httpClient.execute(target, post, localContext); + } else { + httpResponse = httpClient.execute(post); + } + int statusCode = requestStatusCode(httpResponse); + + // calculate the responseTime + long responseTime = System.currentTimeMillis() - startTime; + + if (isDetailed()) { + logDetailed( + BaseMessages.getString(PKG, "HTTPPOST.Log.ResponseTime", responseTime, data.realUrl)); + } + + // Display status code + if (isDebug()) { + logDebug( + BaseMessages.getString(PKG, "HTTPPOST.Log.ResponseCode", String.valueOf(statusCode))); + } + + String body; + String headerString = ""; + switch (statusCode) { + case HttpURLConnection.HTTP_UNAUTHORIZED: + throw new HopTransformException( + BaseMessages.getString(PKG, "HTTPPOST.Exception.Authentication", data.realUrl)); + case -1: + throw new HopTransformException( + BaseMessages.getString(PKG, "HTTPPOST.Exception.IllegalStatusCode", data.realUrl)); + case HttpURLConnection.HTTP_NO_CONTENT: + body = ""; + break; + default: + HttpEntity entity = httpResponse.getEntity(); + if (entity != null) { + body = EntityUtils.toString(entity); + } else { + body = ""; + } + Header[] headers = searchForHeaders(httpResponse); + // Use request encoding if specified in component to avoid strange response encodings + + JSONObject json = new JSONObject(); + for (Header header : headers) { + Object previousValue = json.get(header.getName()); + if (previousValue == null) { + json.put(header.getName(), header.getValue()); + } else if (previousValue instanceof List) { + List list = (List) previousValue; + list.add(header.getValue()); + } else { + ArrayList list = new ArrayList<>(); + list.add((String) previousValue); + list.add(header.getValue()); + json.put(header.getName(), list); + } + } + headerString = json.toJSONString(); + } + + if (isDebug()) { + logDebug(BaseMessages.getString(PKG, "HTTPPOST.Log.ResponseBody", body)); + } + + int returnFieldsOffset = data.inputRowMeta.size(); + if (!Utils.isEmpty(meta.getHttpPostResultField().get(0).getName())) { + newRow = RowDataUtil.addValueData(newRow, returnFieldsOffset, body); + returnFieldsOffset++; + } + + if (!Utils.isEmpty(meta.getHttpPostResultField().get(0).getCode())) { + newRow = RowDataUtil.addValueData(newRow, returnFieldsOffset, Long.valueOf(statusCode)); + returnFieldsOffset++; + } + if (!Utils.isEmpty(meta.getHttpPostResultField().get(0).getResponseTimeFieldName())) { + newRow = RowDataUtil.addValueData(newRow, returnFieldsOffset, Long.valueOf(responseTime)); + returnFieldsOffset++; + } + if (!Utils.isEmpty(meta.getHttpPostResultField().get(0).getResponseHeaderFieldName())) { + newRow = RowDataUtil.addValueData(newRow, returnFieldsOffset, headerString); + } + } finally { + // Release current connection to the connection pool once you are done + post.releaseConnection(); + if (httpResponse != null) { + httpResponse.close(); + } + } + return newRow; + } catch (UnknownHostException uhe) { + throw new HopException( + BaseMessages.getString(PKG, "HTTPPOST.Error.UnknownHostException", uhe.getMessage())); + } catch (Exception e) { + throw new HopException( + BaseMessages.getString(PKG, "HTTPPOST.Error.CanNotReadURL", data.realUrl), e); + + } finally { + if (fis != null) { + BaseTransform.closeQuietly(fis); + } + } + } + + protected int requestStatusCode(HttpResponse httpResponse) { + return httpResponse.getStatusLine().getStatusCode(); + } + + protected InputStreamReader openStream(String encoding, HttpResponse httpResponse) + throws Exception { + if (!Utils.isEmpty(encoding)) { + return new InputStreamReader(httpResponse.getEntity().getContent(), encoding); + } else { + return new InputStreamReader(httpResponse.getEntity().getContent()); + } + } + + protected Header[] searchForHeaders(HttpResponse response) { + return response.getAllHeaders(); + } + + @Override + public boolean processRow() throws HopException { + + Object[] r = getRow(); // Get row from input rowset & set row busy! + if (r == null) { // no more input to be expected... + setOutputDone(); + return false; + } + if (first) { + first = false; + data.inputRowMeta = getInputRowMeta(); + data.outputRowMeta = getInputRowMeta().clone(); + meta.getFields(data.outputRowMeta, getTransformName(), null, null, this, metadataProvider); + + if (meta.isUrlInField()) { + if (Utils.isEmpty(meta.getUrlField())) { + logError(BaseMessages.getString(PKG, "HTTPPOST.Log.NoField")); + throw new HopException(BaseMessages.getString(PKG, "HTTPPOST.Log.NoField")); + } + + // cache the position of the field + if (data.indexOfUrlField < 0) { + String realUrlfieldName = resolve(meta.getUrlField()); + data.indexOfUrlField = data.inputRowMeta.indexOfValue((realUrlfieldName)); + if (data.indexOfUrlField < 0) { + // The field is unreachable ! + logError(BaseMessages.getString(PKG, PKG_ERROR_FINDING_FIELD, realUrlfieldName)); + throw new HopException( + BaseMessages.getString( + PKG, "HTTPPOST.Exception.ErrorFindingField", realUrlfieldName)); + } + } + } else { + data.realUrl = resolve(meta.getUrl()); + } + // set body parameters + int nrargs = meta.getLookupfield().get(0).getArgumentField().size(); + if (nrargs > 0) { + data.useBodyParameters = false; + data.useHeaderParameters = false; + data.contentTypeHeaderOverwrite = false; + int nrheader = 0; + int nrbody = 0; + for (int i = 0; i < nrargs; i++) { // split into body / header + if (meta.getLookupfield().get(0).getArgumentField().get(i).isHeader()) { + data.useHeaderParameters = true; // at least one header parameter + nrheader++; + } else { + data.useBodyParameters = true; // at least one body parameter + nrbody++; + } + } + data.header_parameters_nrs = new int[nrheader]; + data.headerParameters = new NameValuePair[nrheader]; + data.body_parameters_nrs = new int[nrbody]; + data.bodyParameters = new NameValuePair[nrbody]; + int posHeader = 0; + int posBody = 0; + for (int i = 0; i < nrargs; i++) { + int fieldIndex = + data.inputRowMeta.indexOfValue( + meta.getLookupfield().get(0).getArgumentField().get(i).getName()); + if (fieldIndex < 0) { + logError( + BaseMessages.getString(PKG, PKG_ERROR_FINDING_FIELD) + + meta.getLookupfield().get(0).getArgumentField().get(i).getName() + + "]"); + throw new HopTransformException( + BaseMessages.getString( + PKG, + "HTTPPOST.Exception.CouldnotFindField", + meta.getLookupfield().get(0).getArgumentField().get(i).getName())); + } + if (meta.getLookupfield().get(0).getArgumentField().get(i).isHeader()) { + data.header_parameters_nrs[posHeader] = fieldIndex; + data.headerParameters[posHeader] = + new BasicNameValuePair( + resolve(meta.getLookupfield().get(0).getArgumentField().get(i).getParameter()), + data.outputRowMeta.getString(r, data.header_parameters_nrs[posHeader])); + posHeader++; + if (CONTENT_TYPE.equalsIgnoreCase( + meta.getLookupfield().get(0).getArgumentField().get(i).getParameter())) { + data.contentTypeHeaderOverwrite = true; // Content-type will be overwritten + } + } else { + data.body_parameters_nrs[posBody] = fieldIndex; + data.bodyParameters[posBody] = + new BasicNameValuePair( + resolve(meta.getLookupfield().get(0).getArgumentField().get(i).getParameter()), + data.outputRowMeta.getString(r, data.body_parameters_nrs[posBody])); + posBody++; + } + } + } + // set query parameters + int nrQuery = meta.getLookupfield().get(0).getQueryField().size(); + if (nrQuery > 0) { + data.useQueryParameters = true; + data.query_parameters_nrs = new int[nrQuery]; + data.queryParameters = new NameValuePair[nrQuery]; + for (int i = 0; i < nrQuery; i++) { + data.query_parameters_nrs[i] = + data.inputRowMeta.indexOfValue( + meta.getLookupfield().get(0).getQueryField().get(i).getName()); + if (data.query_parameters_nrs[i] < 0) { + logError( + BaseMessages.getString(PKG, PKG_ERROR_FINDING_FIELD) + + meta.getLookupfield().get(0).getQueryField().get(i).getName() + + "]"); + throw new HopTransformException( + BaseMessages.getString( + PKG, + "HTTPPOST.Exception.CouldnotFindField", + meta.getLookupfield().get(0).getQueryField().get(i).getName())); + } + data.queryParameters[i] = + new BasicNameValuePair( + resolve(meta.getLookupfield().get(0).getQueryField().get(i).getParameter()), + data.outputRowMeta.getString(r, data.query_parameters_nrs[i])); + } + } + // set request entity? + if (!Utils.isEmpty(meta.getRequestEntity())) { + data.indexOfRequestEntity = + data.inputRowMeta.indexOfValue(resolve(meta.getRequestEntity())); + if (data.indexOfRequestEntity < 0) { + throw new HopTransformException( + BaseMessages.getString( + PKG, + "HTTPPOST.Exception.CouldnotFindRequestEntityField", + meta.getRequestEntity())); + } + } + data.realEncoding = resolve(meta.getEncoding()); + } // end if first + + try { + Object[] outputRowData = callHttpPOST(r); + putRow(data.outputRowMeta, outputRowData); // copy row to output rowset(s) + + if (checkFeedback(getLinesRead()) && isDetailed()) { + logDetailed(BaseMessages.getString(PKG, "HTTPPOST.LineNumber") + getLinesRead()); + } + } catch (HopException e) { + boolean sendToErrorRow = false; + String errorMessage = null; + + if (getTransformMeta().isDoingErrorHandling()) { + sendToErrorRow = true; + errorMessage = e.toString(); + } else { + logError(BaseMessages.getString(PKG, "HTTPPOST.ErrorInTransformRunning") + e.getMessage()); + setErrors(1); + logError(Const.getStackTracker(e)); + stopAll(); + setOutputDone(); // signal end to receiver(s) + return false; + } + + if (sendToErrorRow) { + // Simply add this row to the error row + putError(getInputRowMeta(), r, 1, errorMessage, null, "HTTPPOST001"); + } + } + + return true; + } + + @VisibleForTesting + String getRequestBodyParamsAsStr(NameValuePair[] pairs, String charset) throws HopException { + StringBuilder buf = new StringBuilder(); + try { + for (int i = 0; i < pairs.length; ++i) { + NameValuePair pair = pairs[i]; + if (pair.getName() != null) { + if (i > 0) { + buf.append("&"); + } + System.out.println("Caracter set: " + charset); + + if (!charset.matches("US-ASCII")) { + buf.append( + URLEncoder.encode( + pair.getName(), !StringUtil.isEmpty(charset) ? charset : DEFAULT_ENCODING)); + + if (!StringUtil.isEmpty(pair.getName())) + buf.append("="); + + if (pair.getValue() != null) { + buf.append( + URLEncoder.encode( + pair.getValue(), !StringUtil.isEmpty(charset) ? charset : DEFAULT_ENCODING)); + } + } else { + buf.append(pair.getName()); + + if (!StringUtil.isEmpty(pair.getName())) + buf.append("="); + + buf.append(pair.getValue()); + } + } + } + return buf.toString(); + } catch (UnsupportedEncodingException e) { + throw new HopException(e.getMessage(), e.getCause()); + } + } + + @Override + public boolean init() { + + if (super.init()) { + // get authentication settings once + data.realProxyHost = resolve(meta.getProxyHost()); + data.realProxyPort = Const.toInt(resolve(meta.getProxyPort()), 8080); + data.realHttpLogin = resolve(meta.getHttpLogin()); + data.realHttpPassword = Utils.resolvePassword(variables, meta.getHttpPassword()); + + data.realSocketTimeout = Const.toInt(resolve(meta.getSocketTimeout()), -1); + data.realConnectionTimeout = Const.toInt(resolve(meta.getSocketTimeout()), -1); + data.realcloseIdleConnectionsTime = + Const.toInt(resolve(meta.getCloseIdleConnectionsTime()), -1); + + return true; + } + return false; + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostArgumentField.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostArgumentField.java new file mode 100644 index 00000000000..29af6b04749 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostArgumentField.java @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.utils.transforms.grafana; + +import org.apache.hop.metadata.api.HopMetadataProperty; + +public class GrafanaPostArgumentField { + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.ArgumentFieldName") + private String name; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.ArgumentFieldParameter") + private String parameter; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.ArgumentFieldHeader") + private boolean header; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParameter() { + return parameter; + } + + public void setParameter(String parameter) { + this.parameter = parameter; + } + + public boolean isHeader() { + return header; + } + + public void setHeader(boolean header) { + this.header = header; + } + + public GrafanaPostArgumentField(String name, String parameter, boolean header) { + this.name = name; + this.parameter = parameter; + this.header = header; + } + + public GrafanaPostArgumentField(GrafanaPostArgumentField httpPostArgumentField) { + this.name = httpPostArgumentField.name; + this.parameter = httpPostArgumentField.parameter; + this.header = httpPostArgumentField.header; + } + + public GrafanaPostArgumentField() {} +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostData.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostData.java new file mode 100644 index 00000000000..106ae9f0d28 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostData.java @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.utils.transforms.grafana; + +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.pipeline.transform.BaseTransformData; +import org.apache.hop.pipeline.transform.ITransformData; +import org.apache.http.NameValuePair; + +public class GrafanaPostData extends BaseTransformData implements ITransformData { + public IRowMeta outputRowMeta; + public IRowMeta inputRowMeta; + public String realEncoding; + public int[] header_parameters_nrs; + public int[] body_parameters_nrs; + public int[] query_parameters_nrs; + public int indexOfUrlField; + public String realUrl; + public NameValuePair[] headerParameters; + public NameValuePair[] bodyParameters; + public NameValuePair[] queryParameters; + public boolean useHeaderParameters; + public boolean contentTypeHeaderOverwrite; + public boolean useBodyParameters; + public boolean useQueryParameters; + public int indexOfRequestEntity; + + public String realProxyHost; + public int realProxyPort; + public String realHttpLogin; + public String realHttpPassword; + + public int realSocketTimeout; + public int realConnectionTimeout; + public int realcloseIdleConnectionsTime; + + public GrafanaPostData() { + super(); + indexOfUrlField = -1; + useHeaderParameters = false; + contentTypeHeaderOverwrite = false; + useBodyParameters = false; + useQueryParameters = false; + indexOfRequestEntity = -1; + realEncoding = null; + realProxyHost = null; + realProxyPort = 8080; + realHttpLogin = null; + realHttpPassword = null; + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostDialog.java new file mode 100644 index 00000000000..6c8cd720457 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostDialog.java @@ -0,0 +1,1098 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.utils.transforms.grafana; + +import org.apache.hop.core.Const; +import org.apache.hop.core.Props; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformDialog; +import org.apache.hop.pipeline.transform.TransformMeta; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.widget.*; +import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.pipeline.transform.ComponentSelectionListener; +import org.apache.hop.ui.pipeline.transform.ITableItemInsertListener; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CTabFolder; +import org.eclipse.swt.custom.CTabItem; +import org.eclipse.swt.events.*; +import org.eclipse.swt.graphics.Cursor; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.*; + +import java.nio.charset.Charset; +import java.util.List; +import java.util.*; + +public class GrafanaPostDialog extends BaseTransformDialog implements ITransformDialog { + private static final Class PKG = GrafanaPostMeta.class; // For Translator + + private static final String[] YES_NO_COMBO = + new String[] { + BaseMessages.getString(PKG, "System.Combo.No"), + BaseMessages.getString(PKG, "System.Combo.Yes") + }; + private static final String YES = BaseMessages.getString(PKG, "System.Combo.Yes"); + private static final String NO = BaseMessages.getString(PKG, "System.Combo.No"); + + private Label wlUrl; + private TextVar wUrl; + + private TextVar wResult; + + private TextVar wResultCode; + + private TextVar wResponseTime; + private TextVar wResponseHeader; + + private TableView wFields; + + private TableView wQuery; + + private Button wUrlInField; + + private Label wlUrlField; + private ComboVar wUrlField; + + private ComboVar wRequestEntity; + + private TextVar wHttpLogin; + + private TextVar wHttpPassword; + + private TextVar wProxyHost; + + private TextVar wProxyPort; + + private final GrafanaPostMeta input; + + private final Map inputFields; + + private ColumnInfo[] colinf; + private ColumnInfo[] colinfquery; + + private String[] fieldNames; + + private boolean gotPreviousFields = false; + + private ComboVar wEncoding; + + private Button wPostAFile; + + private boolean gotEncodings = false; + + private TextVar wConnectionTimeOut; + + private TextVar wSocketTimeOut; + + private TextVar wCloseIdleConnectionsTime; + + public GrafanaPostDialog( + Shell parent, IVariables variables, Object in, PipelineMeta pipelineMeta, String sname) { + super(parent, variables, (BaseTransformMeta) in, pipelineMeta, sname); + input = (GrafanaPostMeta) in; + inputFields = new HashMap<>(); + } + + @Override + public String open() { + Shell parent = getParent(); + + shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN); + props.setLook(shell); + setShellImage(shell, input); + + ModifyListener lsMod = e -> input.setChanged(); + + changed = input.hasChanged(); + + FormLayout formLayout = new FormLayout(); + formLayout.marginWidth = Const.FORM_MARGIN; + formLayout.marginHeight = Const.FORM_MARGIN; + + shell.setLayout(formLayout); + shell.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.Shell.Title")); + + int middle = props.getMiddlePct(); + int margin = props.getMargin(); + + // THE BUTTONS + wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, e -> ok()); + wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, e -> cancel()); + setButtonPositions(new Button[] {wOk, wCancel}, margin, null); + + // TransformName line + wlTransformName = new Label(shell, SWT.RIGHT); + wlTransformName.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.TransformName.Label")); + props.setLook(wlTransformName); + fdlTransformName = new FormData(); + fdlTransformName.left = new FormAttachment(0, 0); + fdlTransformName.right = new FormAttachment(middle, -margin); + fdlTransformName.top = new FormAttachment(0, margin); + wlTransformName.setLayoutData(fdlTransformName); + wTransformName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wTransformName.setText(transformName); + props.setLook(wTransformName); + wTransformName.addModifyListener(lsMod); + fdTransformName = new FormData(); + fdTransformName.left = new FormAttachment(middle, 0); + fdTransformName.top = new FormAttachment(0, margin); + fdTransformName.right = new FormAttachment(100, 0); + wTransformName.setLayoutData(fdTransformName); + + CTabFolder wTabFolder = new CTabFolder(shell, SWT.BORDER); + props.setLook(wTabFolder, Props.WIDGET_STYLE_TAB); + + // //////////////////////// + // START OF GENERAL TAB /// + // //////////////////////// + CTabItem wGeneralTab = new CTabItem(wTabFolder, SWT.NONE); + wGeneralTab.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.GeneralTab.Title")); + + Composite wGeneralComp = new Composite(wTabFolder, SWT.NONE); + props.setLook(wGeneralComp); + + FormLayout fileLayout = new FormLayout(); + fileLayout.marginWidth = 3; + fileLayout.marginHeight = 3; + wGeneralComp.setLayout(fileLayout); + + // //////////////////////// + // START Settings GROUP + + Group gSettings = new Group(wGeneralComp, SWT.SHADOW_ETCHED_IN); + gSettings.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.SettingsGroup.Label")); + FormLayout settingsLayout = new FormLayout(); + settingsLayout.marginWidth = 3; + settingsLayout.marginHeight = 3; + gSettings.setLayout(settingsLayout); + props.setLook(gSettings); + + wlUrl = new Label(gSettings, SWT.RIGHT); + wlUrl.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.URL.Label")); + props.setLook(wlUrl); + FormData fdlUrl = new FormData(); + fdlUrl.left = new FormAttachment(0, 0); + fdlUrl.right = new FormAttachment(middle, -margin); + fdlUrl.top = new FormAttachment(wTransformName, margin); + wlUrl.setLayoutData(fdlUrl); + + wUrl = new TextVar(variables, gSettings, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wUrl); + wUrl.addModifyListener(lsMod); + FormData fdUrl = new FormData(); + fdUrl.left = new FormAttachment(middle, 0); + fdUrl.top = new FormAttachment(wTransformName, margin); + fdUrl.right = new FormAttachment(100, 0); + wUrl.setLayoutData(fdUrl); + + // UrlInField line + Label wlUrlInField = new Label(gSettings, SWT.RIGHT); + wlUrlInField.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.UrlInField.Label")); + props.setLook(wlUrlInField); + FormData fdlUrlInField = new FormData(); + fdlUrlInField.left = new FormAttachment(0, 0); + fdlUrlInField.top = new FormAttachment(wUrl, margin); + fdlUrlInField.right = new FormAttachment(middle, -margin); + wlUrlInField.setLayoutData(fdlUrlInField); + wUrlInField = new Button(gSettings, SWT.CHECK); + props.setLook(wUrlInField); + FormData fdUrlInField = new FormData(); + fdUrlInField.left = new FormAttachment(middle, 0); + fdUrlInField.top = new FormAttachment(wlUrlInField, 0, SWT.CENTER); + fdUrlInField.right = new FormAttachment(100, 0); + wUrlInField.setLayoutData(fdUrlInField); + wUrlInField.addSelectionListener( + new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + input.setChanged(); + activeUrlInfield(); + } + }); + + // UrlField Line + wlUrlField = new Label(gSettings, SWT.RIGHT); + wlUrlField.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.UrlField.Label")); + props.setLook(wlUrlField); + FormData fdlUrlField = new FormData(); + fdlUrlField.left = new FormAttachment(0, 0); + fdlUrlField.right = new FormAttachment(middle, -margin); + fdlUrlField.top = new FormAttachment(wUrlInField, margin); + wlUrlField.setLayoutData(fdlUrlField); + + wUrlField = new ComboVar(variables, gSettings, SWT.BORDER | SWT.READ_ONLY); + wUrlField.setEditable(true); + props.setLook(wUrlField); + wUrlField.addModifyListener(lsMod); + FormData fdUrlField = new FormData(); + fdUrlField.left = new FormAttachment(middle, 0); + fdUrlField.top = new FormAttachment(wUrlInField, margin); + fdUrlField.right = new FormAttachment(100, -margin); + wUrlField.setLayoutData(fdUrlField); + wUrlField.addFocusListener( + new FocusListener() { + @Override + public void focusLost(FocusEvent e) { + // Disable focuslost event + } + + @Override + public void focusGained(FocusEvent e) { + Cursor busy = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT); + shell.setCursor(busy); + setStreamFields(); + shell.setCursor(null); + busy.dispose(); + } + }); + + Label wlEncoding = new Label(gSettings, SWT.RIGHT); + wlEncoding.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.Encoding.Label")); + props.setLook(wlEncoding); + FormData fdlEncoding = new FormData(); + fdlEncoding.left = new FormAttachment(0, 0); + fdlEncoding.top = new FormAttachment(wUrlField, margin); + fdlEncoding.right = new FormAttachment(middle, -margin); + wlEncoding.setLayoutData(fdlEncoding); + wEncoding = new ComboVar(variables, gSettings, SWT.BORDER | SWT.READ_ONLY); + wEncoding.setEditable(true); + props.setLook(wEncoding); + wEncoding.addModifyListener(lsMod); + FormData fdEncoding = new FormData(); + fdEncoding.left = new FormAttachment(middle, 0); + fdEncoding.top = new FormAttachment(wUrlField, margin); + fdEncoding.right = new FormAttachment(100, -margin); + wEncoding.setLayoutData(fdEncoding); + wEncoding.addFocusListener( + new FocusListener() { + @Override + public void focusLost(FocusEvent e) { + // Disable focuslost event + } + + @Override + public void focusGained(FocusEvent e) { + Cursor busy = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT); + shell.setCursor(busy); + setEncodings(); + shell.setCursor(null); + busy.dispose(); + } + }); + + // requestEntity Line + Label wlRequestEntity = new Label(gSettings, SWT.RIGHT); + wlRequestEntity.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.requestEntity.Label")); + props.setLook(wlRequestEntity); + FormData fdlRequestEntity = new FormData(); + fdlRequestEntity.left = new FormAttachment(0, 0); + fdlRequestEntity.right = new FormAttachment(middle, -margin); + fdlRequestEntity.top = new FormAttachment(wEncoding, margin); + wlRequestEntity.setLayoutData(fdlRequestEntity); + + wRequestEntity = new ComboVar(variables, gSettings, SWT.BORDER | SWT.READ_ONLY); + wRequestEntity.setEditable(true); + props.setLook(wRequestEntity); + wRequestEntity.addModifyListener(lsMod); + FormData fdRequestEntity = new FormData(); + fdRequestEntity.left = new FormAttachment(middle, 0); + fdRequestEntity.top = new FormAttachment(wEncoding, margin); + fdRequestEntity.right = new FormAttachment(100, -margin); + wRequestEntity.setLayoutData(fdRequestEntity); + wRequestEntity.addFocusListener( + new FocusListener() { + @Override + public void focusLost(FocusEvent e) { + // Disable focuslost event + } + + @Override + public void focusGained(FocusEvent e) { + Cursor busy = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT); + shell.setCursor(busy); + setStreamFields(); + shell.setCursor(null); + busy.dispose(); + } + }); + + // Post file? + Label wlPostAFile = new Label(gSettings, SWT.RIGHT); + wlPostAFile.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.postAFile.Label")); + props.setLook(wlPostAFile); + FormData fdlPostAFile = new FormData(); + fdlPostAFile.left = new FormAttachment(0, 0); + fdlPostAFile.right = new FormAttachment(middle, -margin); + fdlPostAFile.top = new FormAttachment(wRequestEntity, margin); + wlPostAFile.setLayoutData(fdlPostAFile); + wPostAFile = new Button(gSettings, SWT.CHECK); + wPostAFile.setToolTipText(BaseMessages.getString(PKG, "HTTPPOSTDialog.postAFile.Tooltip")); + props.setLook(wPostAFile); + FormData fdPostAFile = new FormData(); + fdPostAFile.left = new FormAttachment(middle, 0); + fdPostAFile.top = new FormAttachment(wlPostAFile, 0, SWT.CENTER); + fdPostAFile.right = new FormAttachment(100, 0); + wPostAFile.setLayoutData(fdPostAFile); + wPostAFile.addSelectionListener(new ComponentSelectionListener(input)); + + Label wlConnectionTimeOut = new Label(gSettings, SWT.RIGHT); + wlConnectionTimeOut.setText( + BaseMessages.getString(PKG, "HTTPPOSTDialog.ConnectionTimeOut.Label")); + props.setLook(wlConnectionTimeOut); + FormData fdlConnectionTimeOut = new FormData(); + fdlConnectionTimeOut.top = new FormAttachment(wPostAFile, margin); + fdlConnectionTimeOut.left = new FormAttachment(0, 0); + fdlConnectionTimeOut.right = new FormAttachment(middle, -margin); + wlConnectionTimeOut.setLayoutData(fdlConnectionTimeOut); + wConnectionTimeOut = new TextVar(variables, gSettings, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wConnectionTimeOut.addModifyListener(lsMod); + wConnectionTimeOut.setToolTipText( + BaseMessages.getString(PKG, "HTTPPOSTDialog.ConnectionTimeOut.Tooltip")); + props.setLook(wConnectionTimeOut); + FormData fdConnectionTimeOut = new FormData(); + fdConnectionTimeOut.top = new FormAttachment(wPostAFile, margin); + fdConnectionTimeOut.left = new FormAttachment(middle, 0); + fdConnectionTimeOut.right = new FormAttachment(100, 0); + wConnectionTimeOut.setLayoutData(fdConnectionTimeOut); + + Label wlSocketTimeOut = new Label(gSettings, SWT.RIGHT); + wlSocketTimeOut.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.SocketTimeOut.Label")); + props.setLook(wlSocketTimeOut); + FormData fdlSocketTimeOut = new FormData(); + fdlSocketTimeOut.top = new FormAttachment(wConnectionTimeOut, margin); + fdlSocketTimeOut.left = new FormAttachment(0, 0); + fdlSocketTimeOut.right = new FormAttachment(middle, -margin); + wlSocketTimeOut.setLayoutData(fdlSocketTimeOut); + wSocketTimeOut = new TextVar(variables, gSettings, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wSocketTimeOut.addModifyListener(lsMod); + wSocketTimeOut.setToolTipText( + BaseMessages.getString(PKG, "HTTPPOSTDialog.SocketTimeOut.Tooltip")); + props.setLook(wSocketTimeOut); + FormData fdSocketTimeOut = new FormData(); + fdSocketTimeOut.top = new FormAttachment(wConnectionTimeOut, margin); + fdSocketTimeOut.left = new FormAttachment(middle, 0); + fdSocketTimeOut.right = new FormAttachment(100, 0); + wSocketTimeOut.setLayoutData(fdSocketTimeOut); + + Label wlCloseIdleConnectionsTime = new Label(gSettings, SWT.RIGHT); + wlCloseIdleConnectionsTime.setText( + BaseMessages.getString(PKG, "HTTPPOSTDialog.CloseIdleConnectionsTime.Label")); + props.setLook(wlCloseIdleConnectionsTime); + FormData fdlCloseIdleConnectionsTime = new FormData(); + fdlCloseIdleConnectionsTime.top = new FormAttachment(wSocketTimeOut, margin); + fdlCloseIdleConnectionsTime.left = new FormAttachment(0, 0); + fdlCloseIdleConnectionsTime.right = new FormAttachment(middle, -margin); + wlCloseIdleConnectionsTime.setLayoutData(fdlCloseIdleConnectionsTime); + wCloseIdleConnectionsTime = + new TextVar(variables, gSettings, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wCloseIdleConnectionsTime.addModifyListener(lsMod); + wCloseIdleConnectionsTime.setToolTipText( + BaseMessages.getString(PKG, "HTTPPOSTDialog.CloseIdleConnectionsTime.Tooltip")); + props.setLook(wCloseIdleConnectionsTime); + FormData fdCloseIdleConnectionsTime = new FormData(); + fdCloseIdleConnectionsTime.top = new FormAttachment(wSocketTimeOut, margin); + fdCloseIdleConnectionsTime.left = new FormAttachment(middle, 0); + fdCloseIdleConnectionsTime.right = new FormAttachment(100, 0); + wCloseIdleConnectionsTime.setLayoutData(fdCloseIdleConnectionsTime); + + FormData fdSettings = new FormData(); + fdSettings.left = new FormAttachment(0, 0); + fdSettings.right = new FormAttachment(100, 0); + fdSettings.top = new FormAttachment(wTransformName, margin); + gSettings.setLayoutData(fdSettings); + + // END Output Settings GROUP + // //////////////////////// + + // //////////////////////// + // START Output Fields GROUP + + Group gOutputFields = new Group(wGeneralComp, SWT.SHADOW_ETCHED_IN); + gOutputFields.setText(BaseMessages.getString(PKG, "HTTPDialog.OutputFieldsGroup.Label")); + FormLayout outputFieldsLayout = new FormLayout(); + outputFieldsLayout.marginWidth = 3; + outputFieldsLayout.marginHeight = 3; + gOutputFields.setLayout(outputFieldsLayout); + props.setLook(gOutputFields); + + // Result line... + Label wlResult = new Label(gOutputFields, SWT.RIGHT); + wlResult.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.Result.Label")); + props.setLook(wlResult); + FormData fdlResult = new FormData(); + fdlResult.left = new FormAttachment(0, 0); + fdlResult.right = new FormAttachment(middle, -margin); + fdlResult.top = new FormAttachment(wPostAFile, margin); + wlResult.setLayoutData(fdlResult); + wResult = new TextVar(variables, gOutputFields, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wResult); + wResult.addModifyListener(lsMod); + FormData fdResult = new FormData(); + fdResult.left = new FormAttachment(middle, 0); + fdResult.top = new FormAttachment(wPostAFile, margin); + fdResult.right = new FormAttachment(100, -margin); + wResult.setLayoutData(fdResult); + + // Resultcode line... + Label wlResultCode = new Label(gOutputFields, SWT.RIGHT); + wlResultCode.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ResultCode.Label")); + props.setLook(wlResultCode); + FormData fdlResultCode = new FormData(); + fdlResultCode.left = new FormAttachment(0, 0); + fdlResultCode.right = new FormAttachment(middle, -margin); + fdlResultCode.top = new FormAttachment(wResult, margin); + wlResultCode.setLayoutData(fdlResultCode); + wResultCode = new TextVar(variables, gOutputFields, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wResultCode); + wResultCode.addModifyListener(lsMod); + FormData fdResultCode = new FormData(); + fdResultCode.left = new FormAttachment(middle, 0); + fdResultCode.top = new FormAttachment(wResult, margin); + fdResultCode.right = new FormAttachment(100, -margin); + wResultCode.setLayoutData(fdResultCode); + + // Response time line... + Label wlResponseTime = new Label(gOutputFields, SWT.RIGHT); + wlResponseTime.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ResponseTime.Label")); + props.setLook(wlResponseTime); + FormData fdlResponseTime = new FormData(); + fdlResponseTime.left = new FormAttachment(0, 0); + fdlResponseTime.right = new FormAttachment(middle, -margin); + fdlResponseTime.top = new FormAttachment(wResultCode, margin); + wlResponseTime.setLayoutData(fdlResponseTime); + wResponseTime = new TextVar(variables, gOutputFields, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wResponseTime); + wResponseTime.addModifyListener(lsMod); + FormData fdResponseTime = new FormData(); + fdResponseTime.left = new FormAttachment(middle, 0); + fdResponseTime.top = new FormAttachment(wResultCode, margin); + fdResponseTime.right = new FormAttachment(100, 0); + wResponseTime.setLayoutData(fdResponseTime); + // Response header line... + Label wlResponseHeader = new Label(gOutputFields, SWT.RIGHT); + wlResponseHeader.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ResponseHeader.Label")); + props.setLook(wlResponseHeader); + FormData fdlResponseHeader = new FormData(); + fdlResponseHeader.left = new FormAttachment(0, 0); + fdlResponseHeader.right = new FormAttachment(middle, -margin); + fdlResponseHeader.top = new FormAttachment(wResponseTime, margin); + wlResponseHeader.setLayoutData(fdlResponseHeader); + wResponseHeader = new TextVar(variables, gOutputFields, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wResponseHeader); + wResponseHeader.addModifyListener(lsMod); + FormData fdResponseHeader = new FormData(); + fdResponseHeader.left = new FormAttachment(middle, 0); + fdResponseHeader.top = new FormAttachment(wResponseTime, margin); + fdResponseHeader.right = new FormAttachment(100, 0); + wResponseHeader.setLayoutData(fdResponseHeader); + + FormData fdOutputFields = new FormData(); + fdOutputFields.left = new FormAttachment(0, 0); + fdOutputFields.right = new FormAttachment(100, 0); + fdOutputFields.top = new FormAttachment(gSettings, margin); + gOutputFields.setLayoutData(fdOutputFields); + + // END Output Fields GROUP + // //////////////////////// + + // //////////////////////// + // START HTTP AUTH GROUP + + Group gHttpAuth = new Group(wGeneralComp, SWT.SHADOW_ETCHED_IN); + gHttpAuth.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.HttpAuthGroup.Label")); + FormLayout httpAuthLayout = new FormLayout(); + httpAuthLayout.marginWidth = 3; + httpAuthLayout.marginHeight = 3; + gHttpAuth.setLayout(httpAuthLayout); + props.setLook(gHttpAuth); + + // HTTP Login + Label wlHttpLogin = new Label(gHttpAuth, SWT.RIGHT); + wlHttpLogin.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.HttpLogin.Label")); + props.setLook(wlHttpLogin); + FormData fdlHttpLogin = new FormData(); + fdlHttpLogin.top = new FormAttachment(0, margin); + fdlHttpLogin.left = new FormAttachment(0, 0); + fdlHttpLogin.right = new FormAttachment(middle, -margin); + wlHttpLogin.setLayoutData(fdlHttpLogin); + wHttpLogin = new TextVar(variables, gHttpAuth, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wHttpLogin.addModifyListener(lsMod); + wHttpLogin.setToolTipText(BaseMessages.getString(PKG, "HTTPPOSTDialog.HttpLogin.Tooltip")); + props.setLook(wHttpLogin); + FormData fdHttpLogin = new FormData(); + fdHttpLogin.top = new FormAttachment(0, margin); + fdHttpLogin.left = new FormAttachment(middle, 0); + fdHttpLogin.right = new FormAttachment(100, 0); + wHttpLogin.setLayoutData(fdHttpLogin); + + // HTTP Password + Label wlHttpPassword = new Label(gHttpAuth, SWT.RIGHT); + wlHttpPassword.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.HttpPassword.Label")); + props.setLook(wlHttpPassword); + FormData fdlHttpPassword = new FormData(); + fdlHttpPassword.top = new FormAttachment(wHttpLogin, margin); + fdlHttpPassword.left = new FormAttachment(0, 0); + fdlHttpPassword.right = new FormAttachment(middle, -margin); + wlHttpPassword.setLayoutData(fdlHttpPassword); + wHttpPassword = new PasswordTextVar(variables, gHttpAuth, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wHttpPassword.addModifyListener(lsMod); + wHttpPassword.setToolTipText( + BaseMessages.getString(PKG, "HTTPPOSTDialog.HttpPassword.Tooltip")); + props.setLook(wHttpPassword); + FormData fdHttpPassword = new FormData(); + fdHttpPassword.top = new FormAttachment(wHttpLogin, margin); + fdHttpPassword.left = new FormAttachment(middle, 0); + fdHttpPassword.right = new FormAttachment(100, 0); + wHttpPassword.setLayoutData(fdHttpPassword); + + FormData fdHttpAuth = new FormData(); + fdHttpAuth.left = new FormAttachment(0, 0); + fdHttpAuth.right = new FormAttachment(100, 0); + fdHttpAuth.top = new FormAttachment(gOutputFields, margin); + gHttpAuth.setLayoutData(fdHttpAuth); + + // END HTTP AUTH GROUP + // //////////////////////// + + // //////////////////////// + // START PROXY GROUP + + Group gProxy = new Group(wGeneralComp, SWT.SHADOW_ETCHED_IN); + gProxy.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ProxyGroup.Label")); + FormLayout proxyLayout = new FormLayout(); + proxyLayout.marginWidth = 3; + proxyLayout.marginHeight = 3; + gProxy.setLayout(proxyLayout); + props.setLook(gProxy); + + // HTTP Login + Label wlProxyHost = new Label(gProxy, SWT.RIGHT); + wlProxyHost.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ProxyHost.Label")); + props.setLook(wlProxyHost); + FormData fdlProxyHost = new FormData(); + fdlProxyHost.top = new FormAttachment(0, margin); + fdlProxyHost.left = new FormAttachment(0, 0); + fdlProxyHost.right = new FormAttachment(middle, -margin); + wlProxyHost.setLayoutData(fdlProxyHost); + wProxyHost = new TextVar(variables, gProxy, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wProxyHost.addModifyListener(lsMod); + wProxyHost.setToolTipText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ProxyHost.Tooltip")); + props.setLook(wProxyHost); + FormData fdProxyHost = new FormData(); + fdProxyHost.top = new FormAttachment(0, margin); + fdProxyHost.left = new FormAttachment(middle, 0); + fdProxyHost.right = new FormAttachment(100, 0); + wProxyHost.setLayoutData(fdProxyHost); + + // HTTP Password + Label wlProxyPort = new Label(gProxy, SWT.RIGHT); + wlProxyPort.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ProxyPort.Label")); + props.setLook(wlProxyPort); + FormData fdlProxyPort = new FormData(); + fdlProxyPort.top = new FormAttachment(wProxyHost, margin); + fdlProxyPort.left = new FormAttachment(0, 0); + fdlProxyPort.right = new FormAttachment(middle, -margin); + wlProxyPort.setLayoutData(fdlProxyPort); + wProxyPort = new TextVar(variables, gProxy, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + wProxyPort.addModifyListener(lsMod); + wProxyPort.setToolTipText(BaseMessages.getString(PKG, "HTTPPOSTDialog.ProxyPort.Tooltip")); + props.setLook(wProxyPort); + FormData fdProxyPort = new FormData(); + fdProxyPort.top = new FormAttachment(wProxyHost, margin); + fdProxyPort.left = new FormAttachment(middle, 0); + fdProxyPort.right = new FormAttachment(100, 0); + wProxyPort.setLayoutData(fdProxyPort); + + FormData fdProxy = new FormData(); + fdProxy.left = new FormAttachment(0, 0); + fdProxy.right = new FormAttachment(100, 0); + fdProxy.top = new FormAttachment(gHttpAuth, margin); + gProxy.setLayoutData(fdProxy); + + // END HTTP AUTH GROUP + // //////////////////////// + + FormData fdGeneralComp = new FormData(); + fdGeneralComp.left = new FormAttachment(0, 0); + fdGeneralComp.top = new FormAttachment(wTransformName, margin); + fdGeneralComp.right = new FormAttachment(100, 0); + fdGeneralComp.bottom = new FormAttachment(100, 0); + wGeneralComp.setLayoutData(fdGeneralComp); + + wGeneralComp.layout(); + wGeneralTab.setControl(wGeneralComp); + + // /////////////////////////////////////////////////////////// + // / END OF GENERAL TAB + // /////////////////////////////////////////////////////////// + + // Additional tab... + // + CTabItem wAdditionalTab = new CTabItem(wTabFolder, SWT.NONE); + wAdditionalTab.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.FieldsTab.Title")); + + FormLayout addLayout = new FormLayout(); + addLayout.marginWidth = Const.FORM_MARGIN; + addLayout.marginHeight = Const.FORM_MARGIN; + + Composite wAdditionalComp = new Composite(wTabFolder, SWT.NONE); + wAdditionalComp.setLayout(addLayout); + props.setLook(wAdditionalComp); + + Label wlFields = new Label(wAdditionalComp, SWT.NONE); + wlFields.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.Parameters.Label")); + props.setLook(wlFields); + FormData fdlFields = new FormData(); + fdlFields.left = new FormAttachment(0, 0); + fdlFields.top = new FormAttachment(gProxy, margin); + wlFields.setLayoutData(fdlFields); + + int fieldsRows = 0; + if (input.getLookupfield().get(0).getArgumentField() != null) { + fieldsRows = input.getLookupfield().get(0).getArgumentField().size(); + } + + colinf = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "HTTPPOSTDialog.ColumnInfo.Name"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + new String[] {""}, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "HTTPPOSTDialog.ColumnInfo.Parameter"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "HTTPPOSTDialog.ColumnInfo.Header"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + YES_NO_COMBO), + }; + colinf[1].setUsingVariables(true); + wFields = + new TableView( + variables, + wAdditionalComp, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinf, + fieldsRows, + lsMod, + props); + + Button wGetBodyParam = new Button(wAdditionalComp, SWT.PUSH); + wGetBodyParam.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.GetFields.Button")); + FormData fdGetBodyParam = new FormData(); + fdGetBodyParam.top = new FormAttachment(wlFields, margin); + fdGetBodyParam.right = new FormAttachment(100, 0); + wGetBodyParam.setLayoutData(fdGetBodyParam); + + FormData fdFields = new FormData(); + fdFields.left = new FormAttachment(0, 0); + fdFields.top = new FormAttachment(wlFields, margin); + fdFields.right = new FormAttachment(wGetBodyParam, -margin); + fdFields.bottom = new FormAttachment(wlFields, 200); + wFields.setLayoutData(fdFields); + + Label wlQuery = new Label(wAdditionalComp, SWT.NONE); + wlQuery.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.QueryParameters.Label")); + props.setLook(wlQuery); + FormData fdlQuery = new FormData(); + fdlQuery.left = new FormAttachment(0, 0); + fdlQuery.top = new FormAttachment(wFields, margin); + wlQuery.setLayoutData(fdlQuery); + + int queryRows = 0; + if (input.getLookupfield().get(0).getQueryField() != null) { + queryRows = input.getLookupfield().get(0).getQueryField().size(); + } + + colinfquery = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "HTTPPOSTDialog.ColumnInfo.QueryName"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + new String[] {""}, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "HTTPPOSTDialog.ColumnInfo.QueryParameter"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + }; + colinfquery[1].setUsingVariables(true); + wQuery = + new TableView( + variables, + wAdditionalComp, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinfquery, + queryRows, + lsMod, + props); + + wGet = new Button(wAdditionalComp, SWT.PUSH); + wGet.setText(BaseMessages.getString(PKG, "HTTPPOSTDialog.GetFields.Button")); + fdGet = new FormData(); + fdGet.top = new FormAttachment(wlQuery, margin); + fdGet.right = new FormAttachment(100, 0); + wGet.setLayoutData(fdGet); + + FormData fdQuery = new FormData(); + fdQuery.left = new FormAttachment(0, 0); + fdQuery.top = new FormAttachment(wlQuery, margin); + fdQuery.right = new FormAttachment(wGet, -margin); + fdQuery.bottom = new FormAttachment(100, -margin); + wQuery.setLayoutData(fdQuery); + + // + // Search the fields in the background + // + + final Runnable runnable = + () -> { + TransformMeta transformMeta = pipelineMeta.findTransform(transformName); + if (transformMeta != null) { + try { + IRowMeta row = pipelineMeta.getPrevTransformFields(variables, transformMeta); + + // Remember these fields... + for (int i = 0; i < row.size(); i++) { + inputFields.put(row.getValueMeta(i).getName(), i); + } + + setComboBoxes(); + } catch (HopException e) { + logError(BaseMessages.getString(PKG, "System.Dialog.GetFieldsFailed.Message")); + } + } + }; + new Thread(runnable).start(); + FormData fdAdditionalComp = new FormData(); + fdAdditionalComp.left = new FormAttachment(0, 0); + fdAdditionalComp.top = new FormAttachment(wTransformName, margin); + fdAdditionalComp.right = new FormAttachment(100, 0); + fdAdditionalComp.bottom = new FormAttachment(100, 0); + wAdditionalComp.setLayoutData(fdAdditionalComp); + + wAdditionalComp.layout(); + wAdditionalTab.setControl(wAdditionalComp); + // ////// END of Additional Tab + + FormData fdTabFolder = new FormData(); + fdTabFolder.left = new FormAttachment(0, 0); + fdTabFolder.top = new FormAttachment(wTransformName, margin); + fdTabFolder.right = new FormAttachment(100, 0); + fdTabFolder.bottom = new FormAttachment(wOk, -2 * margin); + wTabFolder.setLayoutData(fdTabFolder); + + // Add listeners + wGet.addListener(SWT.Selection, e -> getQueryFields()); + wGetBodyParam.addListener(SWT.Selection, e -> get()); + + lsResize = + event -> { + Point size = shell.getSize(); + wFields.setSize(size.x - 10, size.y - 50); + wFields.table.setSize(size.x - 10, size.y - 50); + wFields.redraw(); + }; + shell.addListener(SWT.Resize, lsResize); + + wTabFolder.setSelection(0); + getData(); + activeUrlInfield(); + input.setChanged(changed); + + BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel()); + + return transformName; + } + + protected void setComboBoxes() { + // Something was changed in the row. + // + final Map fields = new HashMap<>(); + + // Add the currentMeta fields... + fields.putAll(inputFields); + + Set keySet = fields.keySet(); + List entries = new ArrayList<>(keySet); + + fieldNames = entries.toArray(new String[entries.size()]); + + Const.sortStrings(fieldNames); + colinf[0].setComboValues(fieldNames); + colinfquery[0].setComboValues(fieldNames); + } + + private void setStreamFields() { + if (!gotPreviousFields) { + String urlfield = wUrlField.getText(); + wUrlField.removeAll(); + wUrlField.setItems(fieldNames); + if (urlfield != null) { + wUrlField.setText(urlfield); + } + + String request = wRequestEntity.getText(); + wRequestEntity.removeAll(); + wRequestEntity.setItems(fieldNames); + if (request != null) { + wRequestEntity.setText(request); + } + + gotPreviousFields = true; + } + } + + private void setEncodings() { + // Encoding of the text file: + if (!gotEncodings) { + gotEncodings = true; + + wEncoding.removeAll(); + List values = new ArrayList<>(Charset.availableCharsets().values()); + for (Charset charSet : values) { + wEncoding.add(charSet.displayName()); + } + + // Now select the default! + String defEncoding = Const.getEnvironmentVariable("file.encoding", "UTF-8"); + int idx = Const.indexOfString(defEncoding, wEncoding.getItems()); + if (idx >= 0) { + wEncoding.select(idx); + } + } + } + + private void activeUrlInfield() { + wlUrlField.setEnabled(wUrlInField.getSelection()); + wUrlField.setEnabled(wUrlInField.getSelection()); + wlUrl.setEnabled(!wUrlInField.getSelection()); + wUrl.setEnabled(!wUrlInField.getSelection()); + } + + /** Copy information from the meta-data input to the dialog fields. */ + public void getData() { + if (log.isDebug()) { + logDebug(BaseMessages.getString(PKG, "HTTPPOSTDialog.Log.GettingKeyInfo")); + } + + if (input.getLookupfield().get(0).getArgumentField() != null) { + for (int i = 0; i < input.getLookupfield().get(0).getArgumentField().size(); i++) { + TableItem item = wFields.table.getItem(i); + if (input.getLookupfield().get(0).getArgumentField().get(i).getName() != null) { + item.setText(1, input.getLookupfield().get(0).getArgumentField().get(i).getName()); + } + if (input.getLookupfield().get(0).getArgumentField().get(i).getParameter() != null) { + item.setText(2, input.getLookupfield().get(0).getArgumentField().get(i).getParameter()); + } + item.setText( + 3, (input.getLookupfield().get(0).getArgumentField().get(i).isHeader()) ? YES : NO); + } + } + if (input.getLookupfield().get(0).getQueryField() != null) { + for (int i = 0; i < input.getLookupfield().get(0).getQueryField().size(); i++) { + TableItem item = wQuery.table.getItem(i); + if (input.getLookupfield().get(0).getQueryField().get(i).getName() != null) { + item.setText(1, input.getLookupfield().get(0).getQueryField().get(i).getName()); + } + if (input.getLookupfield().get(0).getQueryField().get(i).getParameter() != null) { + item.setText(2, input.getLookupfield().get(0).getQueryField().get(i).getParameter()); + } + } + } + if (input.getUrl() != null) { + wUrl.setText(input.getUrl()); + } + wUrlInField.setSelection(input.isUrlInField()); + if (input.getUrlField() != null) { + wUrlField.setText(input.getUrlField()); + } + if (input.getRequestEntity() != null) { + wRequestEntity.setText(input.getRequestEntity()); + } + if (input.getHttpPostResultField().get(0).getName() != null) { + wResult.setText(input.getHttpPostResultField().get(0).getName()); + } + if (input.getHttpPostResultField().get(0).getCode() != null) { + wResultCode.setText(input.getHttpPostResultField().get(0).getCode()); + } + if (input.getHttpPostResultField().get(0).getResponseTimeFieldName() != null) { + wResponseTime.setText(input.getHttpPostResultField().get(0).getResponseTimeFieldName()); + } + if (input.getEncoding() != null) { + wEncoding.setText(input.getEncoding()); + } + wPostAFile.setSelection(input.isPostAFile()); + + if (input.getHttpLogin() != null) { + wHttpLogin.setText(input.getHttpLogin()); + } + if (input.getHttpPassword() != null) { + wHttpPassword.setText(input.getHttpPassword()); + } + if (input.getProxyHost() != null) { + wProxyHost.setText(input.getProxyHost()); + } + if (input.getProxyPort() != null) { + wProxyPort.setText(input.getProxyPort()); + } + if (input.getHttpPostResultField().get(0).getResponseHeaderFieldName() != null) { + wResponseHeader.setText(input.getHttpPostResultField().get(0).getResponseHeaderFieldName()); + } + + wSocketTimeOut.setText(Const.NVL(input.getSocketTimeout(), "")); + wConnectionTimeOut.setText(Const.NVL(input.getConnectionTimeout(), "")); + wCloseIdleConnectionsTime.setText(Const.NVL(input.getCloseIdleConnectionsTime(), "")); + + wFields.setRowNums(); + wFields.optWidth(true); + + wTransformName.selectAll(); + wTransformName.setFocus(); + } + + private void cancel() { + transformName = null; + input.setChanged(changed); + dispose(); + } + + private void ok() { + GrafanaPostLoookupField loookupField = new GrafanaPostLoookupField(); + if (Utils.isEmpty(wTransformName.getText())) { + return; + } + + int nrargs = wFields.nrNonEmpty(); + + if (log.isDebug()) { + logDebug( + BaseMessages.getString(PKG, "HTTPPOSTDialog.Log.FoundArguments", String.valueOf(nrargs))); + } + // CHECKSTYLE:Indentation:OFF + for (int i = 0; i < nrargs; i++) { + TableItem item = wFields.getNonEmpty(i); + GrafanaPostArgumentField argumentField = + new GrafanaPostArgumentField(item.getText(1), item.getText(2), YES.equals(item.getText(3))); + loookupField.getArgumentField().add(argumentField); + } + + int nrqueryparams = wQuery.nrNonEmpty(); + + if (log.isDebug()) { + logDebug( + BaseMessages.getString( + PKG, "HTTPPOSTDialog.Log.FoundQueryParameters", String.valueOf(nrqueryparams))); + } + // CHECKSTYLE:Indentation:OFF + for (int i = 0; i < nrqueryparams; i++) { + TableItem item = wQuery.getNonEmpty(i); + input.getLookupfield().get(0).getQueryField().clear(); + GrafanaPostQuery httpPostQuery = new GrafanaPostQuery(item.getText(1), item.getText(2)); + loookupField.getQueryField().add(httpPostQuery); + } + + List listLookupField = new ArrayList<>(); + listLookupField.add(loookupField); + input.setLookupfield(listLookupField); + + input.setUrl(wUrl.getText()); + input.setUrlField(wUrlField.getText()); + input.setRequestEntity(wRequestEntity.getText()); + input.setUrlInField(wUrlInField.getSelection()); + + GrafanaPostResultField httpPostResultField = + new GrafanaPostResultField( + wResultCode.getText(), + wResult.getText(), + wResponseTime.getText(), + wResponseHeader.getText()); + + List listHttpPostResultField = new ArrayList<>(); + listHttpPostResultField.add(httpPostResultField); + input.setHttpPostResultField(listHttpPostResultField); + + input.setEncoding(wEncoding.getText()); + input.setPostAFile(wPostAFile.getSelection()); + input.setHttpLogin(wHttpLogin.getText()); + input.setHttpPassword(wHttpPassword.getText()); + input.setProxyHost(wProxyHost.getText()); + input.setProxyPort(wProxyPort.getText()); + input.setSocketTimeout(wSocketTimeOut.getText()); + input.setConnectionTimeout(wConnectionTimeOut.getText()); + input.setCloseIdleConnectionsTime(wCloseIdleConnectionsTime.getText()); + + transformName = wTransformName.getText(); // return value + + dispose(); + } + + private void get() { + try { + IRowMeta r = pipelineMeta.getPrevTransformFields(variables, transformName); + if (r != null && !r.isEmpty()) { + ITableItemInsertListener listener = + (tableItem, v) -> { + tableItem.setText(3, NO); // default is "N" + return true; + }; + BaseTransformDialog.getFieldsFromPrevious( + r, wFields, 1, new int[] {1, 2}, null, -1, -1, listener); + } + } catch (HopException ke) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "HTTPPOSTDialog.FailedToGetFields.DialogTitle"), + BaseMessages.getString(PKG, "HTTPPOSTDialog.FailedToGetFields.DialogMessage"), + ke); + } + } + + private void getQueryFields() { + try { + IRowMeta r = pipelineMeta.getPrevTransformFields(variables, transformName); + if (r != null && !r.isEmpty()) { + BaseTransformDialog.getFieldsFromPrevious( + r, wQuery, 1, new int[] {1, 2}, new int[] {3}, -1, -1, null); + } + } catch (HopException ke) { + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "HTTPPOSTDialog.FailedToGetFields.DialogTitle"), + BaseMessages.getString(PKG, "HTTPPOSTDialog.FailedToGetFields.DialogMessage"), + ke); + } + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostLoookupField.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostLoookupField.java new file mode 100644 index 00000000000..71036ba13f7 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostLoookupField.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.utils.transforms.grafana; + +import org.apache.hop.metadata.api.HopMetadataProperty; + +import java.util.ArrayList; +import java.util.List; + +public class GrafanaPostLoookupField { + + @HopMetadataProperty( + key = "query", + injectionGroupDescription = "HTTPPOST.Injection.LookupQueryField") + private List queryField = new ArrayList<>(); + + @HopMetadataProperty( + key = "arg", + injectionGroupDescription = "HTTPPOST.Injection.LookupArgumentField") + private List argumentField = new ArrayList<>(); + + public List getQueryField() { + return queryField; + } + + public void setQueryField(List queryField) { + this.queryField = queryField; + } + + public List getArgumentField() { + return argumentField; + } + + public void setArgumentField(List argumentField) { + this.argumentField = argumentField; + } + + public GrafanaPostLoookupField( + List postQuery, List argumentField) { + this.queryField = postQuery; + this.argumentField = argumentField; + } + + public GrafanaPostLoookupField(GrafanaPostLoookupField httpPostLoookupField) { + this.queryField = httpPostLoookupField.queryField; + this.argumentField = httpPostLoookupField.argumentField; + } + + public GrafanaPostLoookupField() {} +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostMeta.java new file mode 100644 index 00000000000..c01736e6e30 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostMeta.java @@ -0,0 +1,425 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.plc4x.hop.utils.transforms.grafana; + +import org.apache.hop.core.CheckResult; +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.Transform; +import org.apache.hop.core.exception.HopTransformException; +import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.row.IValueMeta; +import org.apache.hop.core.row.value.ValueMetaInteger; +import org.apache.hop.core.row.value.ValueMetaString; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.Pipeline; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.transform.BaseTransformMeta; +import org.apache.hop.pipeline.transform.ITransformMeta; +import org.apache.hop.pipeline.transform.TransformMeta; + +import java.util.ArrayList; +import java.util.List; + +/* +* This code is taken from the "HttpPost" transform to be adapted for use +* with the Grafana APIs. +* In the future, its integration with the original version should be proposed +* to the working group of Apache Hop +*/ + +@Transform( + id = "grafana-post", + image = "grafana.svg", + name = "i18n::BaseTransform.TypeLongDesc.GrafanaPost", + description = "i18n::BaseTransform.TypeTooltipDesc.HTTPPOST", + categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xinput.messages:Plc4x.Category.plc4x", + keywords = "i18n::HttpPostMeta.keyword", + documentationUrl = "/pipeline/transforms/httppost.html") +public class GrafanaPostMeta extends BaseTransformMeta implements ITransformMeta { + private static final Class PKG = GrafanaPostMeta.class; // For Translator + + // the timeout for waiting for data (milliseconds) + public static final int DEFAULT_SOCKET_TIMEOUT = 10000; + + // the timeout until a connection is established (milliseconds) + public static final int DEFAULT_CONNECTION_TIMEOUT = 10000; + + // the time to wait till a connection is closed (milliseconds)? -1 is no not close. + public static final int DEFAULT_CLOSE_CONNECTIONS_TIME = -1; + + public static final String DEFAULT_ENCODING = "UTF-8"; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.socketTimeout") + private String socketTimeout; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.connectionTimeout") + private String connectionTimeout; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.closeIdleConnectionsTime") + private String closeIdleConnectionsTime; + + /** URL / service to be called */ + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.url") + private String url; + + @HopMetadataProperty(key = "lookup", injectionGroupDescription = "HTTPPOST.Injection.lookupfield") + private List lookupfield = new ArrayList<>(); + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.urlInField") + private boolean urlInField; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.urlField") + private String urlField; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.requestEntity") + private String requestEntity; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.encoding") + private String encoding; + + @HopMetadataProperty(key = "postafile", injectionKeyDescription = "HTTPPOST.Injection.postAFile") + private boolean postAFile; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.proxyHost") + private String proxyHost; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.proxyPort") + private String proxyPort; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.httpLogin") + private String httpLogin; + + @HopMetadataProperty(password = true, injectionKeyDescription = "HTTPPOST.Injection.httpPassword") + private String httpPassword; + + @HopMetadataProperty( + key = "result", + injectionGroupDescription = "HTTPPOST.Injection.httpPostResultField") + private List httpPostResultField = new ArrayList<>(); + + public GrafanaPostMeta() { + super(); // allocate BaseTransformMeta + } + + public String getEncoding() { + return encoding; + } + + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + /** @return Returns the connectionTimeout. */ + public String getConnectionTimeout() { + return connectionTimeout; + } + + /** @param connectionTimeout The connectionTimeout to set. */ + public void setConnectionTimeout(String connectionTimeout) { + this.connectionTimeout = connectionTimeout; + } + + /** @return Returns the closeIdleConnectionsTime. */ + public String getCloseIdleConnectionsTime() { + return closeIdleConnectionsTime; + } + + /** @param closeIdleConnectionsTime The connectionTimeout to set. */ + public void setCloseIdleConnectionsTime(String closeIdleConnectionsTime) { + this.closeIdleConnectionsTime = closeIdleConnectionsTime; + } + + /** @return Returns the socketTimeout. */ + public String getSocketTimeout() { + return socketTimeout; + } + + /** @param socketTimeout The socketTimeout to set. */ + public void setSocketTimeout(String socketTimeout) { + this.socketTimeout = socketTimeout; + } + + /** @return Returns the procedure. */ + public String getUrl() { + return url; + } + + /** @param procedure The procedure to set. */ + public void setUrl(String procedure) { + this.url = procedure; + } + + /** @return Is the url coded in a field? */ + public boolean isUrlInField() { + return urlInField; + } + + public boolean isPostAFile() { + return postAFile; + } + + public void setPostAFile(boolean postafile) { + this.postAFile = postafile; + } + + /** @param urlInField Is the url coded in a field? */ + public void setUrlInField(boolean urlInField) { + this.urlInField = urlInField; + } + + /** @return The field name that contains the url. */ + public String getUrlField() { + return urlField; + } + + /** @param urlField name of the field that contains the url */ + public void setUrlField(String urlField) { + this.urlField = urlField; + } + + /** @param requestEntity the requestEntity to set */ + public void setRequestEntity(String requestEntity) { + this.requestEntity = requestEntity; + } + + /** @return requestEntity */ + public String getRequestEntity() { + return requestEntity; + } + + public List getLookupfield() { + return lookupfield; + } + + public void setLookupfield(List lookupfield) { + this.lookupfield = lookupfield; + } + + public List getHttpPostResultField() { + return httpPostResultField; + } + + public void setHttpPostResultField(List httpPostResultField) { + this.httpPostResultField = httpPostResultField; + } + + @Override + public Object clone() { + GrafanaPostMeta retval = (GrafanaPostMeta) super.clone(); + + return retval; + } + + @Override + public void setDefault() { + encoding = DEFAULT_ENCODING; + postAFile = false; + lookupfield.add(new GrafanaPostLoookupField()); + httpPostResultField.add(new GrafanaPostResultField()); + socketTimeout = String.valueOf(DEFAULT_SOCKET_TIMEOUT); + connectionTimeout = String.valueOf(DEFAULT_CONNECTION_TIMEOUT); + closeIdleConnectionsTime = String.valueOf(DEFAULT_CLOSE_CONNECTIONS_TIME); + } + + @Override + public void getFields( + IRowMeta inputRowMeta, + String name, + IRowMeta[] info, + TransformMeta nextTransform, + IVariables variables, + IHopMetadataProvider metadataProvider) + throws HopTransformException { + if (!Utils.isEmpty(httpPostResultField.get(0).getName())) { + IValueMeta v = new ValueMetaString(httpPostResultField.get(0).getName()); + inputRowMeta.addValueMeta(v); + } + + if (!Utils.isEmpty(httpPostResultField.get(0).getCode())) { + IValueMeta v = new ValueMetaInteger(httpPostResultField.get(0).getCode()); + inputRowMeta.addValueMeta(v); + } + if (!Utils.isEmpty(httpPostResultField.get(0).getResponseTimeFieldName())) { + IValueMeta v = + new ValueMetaInteger( + variables.resolve(httpPostResultField.get(0).getResponseTimeFieldName())); + inputRowMeta.addValueMeta(v); + } + String headerFieldName = + variables.resolve(httpPostResultField.get(0).getResponseHeaderFieldName()); + if (!Utils.isEmpty(headerFieldName)) { + IValueMeta v = new ValueMetaString(headerFieldName); + v.setOrigin(name); + inputRowMeta.addValueMeta(v); + } + } + + @Override + public void check( + List remarks, + PipelineMeta pipelineMeta, + TransformMeta transformMeta, + IRowMeta prev, + String[] input, + String[] output, + IRowMeta info, + IVariables variables, + IHopMetadataProvider metadataProvider) { + CheckResult cr; + + // See if we have input streams leading to this transform! + if (input.length > 0) { + cr = + new CheckResult( + ICheckResult.TYPE_RESULT_OK, + BaseMessages.getString( + PKG, "HTTPPOSTMeta.CheckResult.ReceivingInfoFromOtherTransforms"), + transformMeta); + remarks.add(cr); + } else { + cr = + new CheckResult( + ICheckResult.TYPE_RESULT_ERROR, + BaseMessages.getString(PKG, "HTTPPOSTMeta.CheckResult.NoInpuReceived"), + transformMeta); + remarks.add(cr); + } + + // check Url + if (urlInField) { + if (Utils.isEmpty(urlField)) { + cr = + new CheckResult( + ICheckResult.TYPE_RESULT_ERROR, + BaseMessages.getString(PKG, "HTTPPOSTMeta.CheckResult.UrlfieldMissing"), + transformMeta); + } else { + cr = + new CheckResult( + ICheckResult.TYPE_RESULT_ERROR, + BaseMessages.getString(PKG, "HTTPPOSTMeta.CheckResult.UrlfieldOk"), + transformMeta); + } + + } else { + if (Utils.isEmpty(url)) { + cr = + new CheckResult( + ICheckResult.TYPE_RESULT_ERROR, + BaseMessages.getString(PKG, "HTTPPOSTMeta.CheckResult.UrlMissing"), + transformMeta); + } else { + cr = + new CheckResult( + ICheckResult.TYPE_RESULT_OK, + BaseMessages.getString(PKG, "HTTPPOSTMeta.CheckResult.UrlOk"), + transformMeta); + } + } + remarks.add(cr); + } + + public GrafanaPost createTransform( + TransformMeta transformMeta, + GrafanaPostData data, + int cnr, + PipelineMeta pipelineMeta, + Pipeline pipeline) { + return new GrafanaPost(transformMeta, this, data, cnr, pipelineMeta, pipeline); + } + + public GrafanaPostData getTransformData() { + return new GrafanaPostData(); + } + + @Override + public boolean supportsErrorHandling() { + return true; + } + + /** + * ISetter + * + * @param proxyHost + */ + public void setProxyHost(String proxyHost) { + this.proxyHost = proxyHost; + } + + /** + * IGetter + * + * @return + */ + public String getProxyHost() { + return proxyHost; + } + + /** + * ISetter + * + * @param proxyPort + */ + public void setProxyPort(String proxyPort) { + this.proxyPort = proxyPort; + } + + /** + * IGetter + * + * @return + */ + public String getProxyPort() { + return this.proxyPort; + } + + /** + * ISetter + * + * @param httpLogin + */ + public void setHttpLogin(String httpLogin) { + this.httpLogin = httpLogin; + } + + /** + * IGetter + * + * @return + */ + public String getHttpLogin() { + return httpLogin; + } + + /** + * ISetter + * + * @param httpPassword + */ + public void setHttpPassword(String httpPassword) { + this.httpPassword = httpPassword; + } + + /** @return */ + public String getHttpPassword() { + return httpPassword; + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostQuery.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostQuery.java new file mode 100644 index 00000000000..6e6f259a393 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostQuery.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.utils.transforms.grafana; + +import org.apache.hop.metadata.api.HopMetadataProperty; + +public class GrafanaPostQuery { + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.QueryFieldName") + private String name; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.QueryFieldParameter") + private String parameter; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParameter() { + return parameter; + } + + public void setParameter(String parameter) { + this.parameter = parameter; + } + + public GrafanaPostQuery(String name, String parameter) { + this.name = name; + this.parameter = parameter; + } + + public GrafanaPostQuery(GrafanaPostQuery httpPostQuery) { + this.name = httpPostQuery.name; + this.parameter = httpPostQuery.parameter; + } + + public GrafanaPostQuery() {} +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostResultField.java b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostResultField.java new file mode 100644 index 00000000000..afdd547fb95 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/java/org/apache/plc4x/hop/utils/transforms/grafana/GrafanaPostResultField.java @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.utils.transforms.grafana; + +import org.apache.hop.metadata.api.HopMetadataProperty; + +public class GrafanaPostResultField { + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.ResultFieldCode") + private String code; + + @HopMetadataProperty(injectionKeyDescription = "HTTPPOST.Injection.ResultFieldName") + private String name; + + @HopMetadataProperty( + key = "response_time", + injectionKeyDescription = "HTTPPOST.Injection.ResultFieldResponseTime") + private String responseTimeFieldName; + + @HopMetadataProperty( + key = "response_header", + injectionKeyDescription = "HTTPPOST.Injection.ResultFieldResponseHeader") + private String responseHeaderFieldName; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getResponseTimeFieldName() { + return responseTimeFieldName; + } + + public void setResponseTimeFieldName(String responseTimeFieldName) { + this.responseTimeFieldName = responseTimeFieldName; + } + + public String getResponseHeaderFieldName() { + return responseHeaderFieldName; + } + + public void setResponseHeaderFieldName(String responseHeaderFieldName) { + this.responseHeaderFieldName = responseHeaderFieldName; + } + + public GrafanaPostResultField( + String code, String name, String responseTimeFieldName, String responseHeaderFieldName) { + this.code = code; + this.name = name; + this.responseTimeFieldName = responseTimeFieldName; + this.responseHeaderFieldName = responseHeaderFieldName; + } + + public GrafanaPostResultField(GrafanaPostResultField httpPostResultField) { + this.code = httpPostResultField.code; + this.name = httpPostResultField.name; + this.responseTimeFieldName = httpPostResultField.responseTimeFieldName; + this.responseHeaderFieldName = httpPostResultField.responseHeaderFieldName; + } + + public GrafanaPostResultField() { + this.code = "result"; + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/grafana.svg b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/grafana.svg new file mode 100644 index 00000000000..ff8c2c5fabd --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/grafana.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/org/apache/plc4x/hop/utils/transforms/grafana/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/org/apache/plc4x/hop/utils/transforms/grafana/messages/messages_en_US.properties new file mode 100644 index 00000000000..3904e5caa47 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/hop-plc4x-grafana/src/main/resources/org/apache/plc4x/hop/utils/transforms/grafana/messages/messages_en_US.properties @@ -0,0 +1,138 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +BaseTransform.TypeTooltipDesc.HTTPPOST=Call a web service request over HTTP by supplying a base URL by allowing parameters to be set dynamically +BaseTransform.TypeLongDesc.GrafanaPost=Grafana post +HTTPPOSTMeta.Exception.UnableToReadTransformMeta=Unable to read transform information from XML +HTTPPOST.Log.StartingToRun=Starting to run ... +HTTPPOSTDialog.UrlInField.Label=Accept URL from field? +HTTPPOSTDialog.QueryParameters.Label=Query parameters +HTTPPOSTDialog.ColumnInfo.Name=Name +HTTPPOSTDialog.InvalidConnection.DialogMessage=Please select a valid connection\! +HTTPPOSTDialog.UrlField.Tooltip=URL field name +HTTPPOST.Exception.CouldnotFindRequestEntityField=Can not find request entity field [{0}]\! +HTTPPOSTMeta.CheckResult.UrlMissing=URL is missing\! +HTTPPOST.Log.ConnectingToURL=Connecting to [{0}] ... +HTTPPOSTDialog.Log.GettingKeyInfo=getting key info... +HTTPPOSTDialog.URL.Label=URL +HTTPPOST.Log.ResponseCode=The response code is {0} +HTTPPOSTDialog.Log.FoundQueryParameters=Found {0} query parameters +HTTPPOSTDialog.TransformName.Label=Transform name +HTTPPOSTDialog.ColumnInfo.Parameter=Parameter +HTTPPOSTDialog.ColumnInfo.Header=Put in Header? +HTTPPOSTMeta.CheckResult.UrlfieldMissing=URL field is missing\! +HTTPPOSTDialog.AutoCommit.Tooltip=Enable auto commit on this database connection.\nWhen the auto commit is off, a commit is done after the last row is processed. +HTTPPOSTDialog.requestEntity.Label=Request entity field +HTTPPOST.ErrorInTransformRunning=Because of an error, this transform can''t continue\: +HTTPPOSTDialog.UrlField.Label=URL field name +HTTPPOSTMeta.CheckResult.ReceivingInfoFromOtherTransforms=Transform is receiving info from other transforms. +HTTPPOST.LineNumber=linenr +HTTPPOST.Log.DBException=An error occurred, processing will be stopped\: +HTTPPOSTDialog.GetFields.Button=\ &Get Fields +HTTPPOST.Log.ResponseStatusCode=Response status code\: {0} +HTTPPOST.Log.UnableCreateUrl=Unable to create URL. +HTTPPOSTDialog.postAFile.Label=Post a file +HTTPPOST.Log.UnableGetResult=Unable to get result from specified URL \: {0} +HTTPPOSTDialog.postAFile.Tooltip=Post a file +HTTPPOST.Exception.ErrorFindingField=Error finding field [{0}] \! +HTTPPOSTDialog.FailedToGetFields.DialogTitle=Error getting fields +HTTPPOSTMeta.CheckResult.AllArgumentsOK=All arguments found in the input stream. +HTTPPOSTDialog.Log.FoundArguments=Found {0} arguments +HTTPPOSTMeta.CheckResult.UrlOk=URL is specified. +HTTPPOST.Log.ResponseBody=The response body is {0} +HTTPPOSTDialog.ColumnInfo.QueryParameter=Value +HTTPPOST.Log.ErrorFindingField=We can not find field [{0}] in the input stream\! +HTTPPOSTMeta.CheckResult.CouldNotReadFields=Couldn''t read fields from the previous transform. +HTTPPOSTDialog.InvalidConnection.DialogTitle=ERROR +HTTPPOSTDialog.ResultType.Label=Result type +HTTPPOSTDialog.Shell.Title=HTTP post +HTTPPOST.Log.ConnectedToDB=Connected to database... +HTTPPOST.Log.HeaderValue=Header parameter [{0}]=''{1}'' +HTTPPOST.Log.BodyValue=Body parameter [{0}]=''{1}'' +HTTPPOST.Log.QueryValue=Query parameter [{0}]=''{1}'' +HTTPPOSTDialog.Encoding.Label=Encoding +HTTPPOST.Log.Encoding=Header content encoding \: {0} +HTTPPOST.Log.Connecting=Connecting to \: [{0}] +HTTPPOSTMeta.CheckResult.NoInpuReceived=No input received from other transforms\! +HTTPPOSTDialog.FailedToGetFields.DialogMessage=We failed to get fields from previous transform\! +HTTPPOSTMeta.CheckResult.ErrorOccurred=An error occurred\: +HTTPPOSTDialog.Parameters.Label=Body (Header) Parameters \: +HTTPPOSTMeta.CheckResult.MissingArguments=Missing arguments, not found in input from previous transforms\: +HTTPPOST.Log.NoField=URL field name is missing\! +HTTPPOSTMeta.CheckResult.UrlfieldOk=URL field is specified. +HTTPPOSTDialog.Result.Label=Result field name +HTTPPOSTDialog.ResponseTime.Label=Response time (milliseconds) field name +HTTPPOSTDialog.ResponseHeader.Label=Response header field name +HTTPPOSTDialog.ResultCode.Label=HTTP status code field name +HTTPPOSTMeta.CheckResult.WrongTypeArguments=\ (found but wrong type\: {0} vs. {1}) +HTTPPOSTDialog.AutoCommit.Label=Enable auto commit +HTTPPOST.Error.CanNotReadURL=Can not result from [{0}] +HTTPPOST.Log.UnexpectedError=Unexpected error +HTTPPOST.Log.ResponseTime=Response time (milliseconds)\: [{0}] for [{1}] +HTTPPOST.Exception.CouldnotFindField=Couldn''t find field ''{0}'' in row\! +HTTPPOSTMeta.CheckResult.InvalidConnection=Please select or create a connection\! +HTTPPOSTDialog.ColumnInfo.QueryName=Name +HTTPPOSTDialog.HttpAuthGroup.Label=HTTP authentication +HTTPPOSTDialog.HttpLogin.Label=HTTP Login +HTTPPOSTDialog.HttpLogin.Tooltip=HTTP login used to authenticate the call +HTTPPOSTDialog.HttpPassword.Label=HTTP Password +HTTPPOSTDialog.HttpPassword.Tooltip=HTTP password used to authenticate the call +HTTPPOSTDialog.ProxyGroup.Label=Proxy to use +HTTPPOSTDialog.ProxyHost.Label=Proxy Host +HTTPPOSTDialog.ProxyHost.Tooltip=Proxy Host +HTTPPOSTDialog.ProxyPort.Label=Proxy Port +HTTPPOSTDialog.ProxyPort.Tooltip=Proxy Port +HTTPPOST.Exception.Authentication=You need to be authenticated to access the resource at {0}. +HTTPPOST.Exception.IllegalStatusCode=Status code is Illegal: {0}. +HTTPPOST.Error.UnknownHostException=Unknown host {0}. +HTTPPOSTDialog.GeneralTab.Title=General +HTTPPOSTDialog.FieldsTab.Title=Fields +HTTPPOSTDialog.SettingsGroup.Label=Settings +HTTPDialog.OutputFieldsGroup.Label=Output fields +HTTPPOSTDialog.ConnectionTimeOut.Label=Connection timeout +HTTPPOSTDialog.ConnectionTimeOut.Tooltip=The timeout until a connection is established (milliseconds) +HTTPPOSTDialog.SocketTimeOut.Label=Socket timeout +HTTPPOSTDialog.SocketTimeOut.Tooltip=The timeout for waiting for data (milliseconds) +HTTPPOSTDialog.CloseIdleConnectionsTime.Label=Connection close wait time +HTTPPOSTDialog.CloseIdleConnectionsTime.Tooltip=Close all connections older than x milliseconds. +HTTPPOST.Injection.socketTimeout=Socket timeout value (miliseconds) +HTTPPOST.Injection.connectionTimeout=Connection timeout value (miliseconds) +HTTPPOST.Injection.closeIdleConnectionsTime=Connection close wait time (miliseconds) +HTTPPOST.Injection.url=Endpoint URL +HTTPPOST.Injection.lookupfield=Query parameters +HTTPPOST.Injection.urlInField=Accept URL from fieldname (Y/N) +HTTPPOST.Injection.urlField=URL Fieldname +HTTPPOST.Injection.requestEntity=Request entity Fieldname +HTTPPOST.Injection.encoding=Encoding +HTTPPOST.Injection.postAFile=Post a file (Y/N) +HTTPPOST.Injection.proxyHost=Proxy Hostname +HTTPPOST.Injection.proxyPort=Proxy Port +HTTPPOST.Injection.httpLogin=HTTP Login +HTTPPOST.Injection.httpPassword=HTTP Password +HTTPPOST.Injection.httpPostResultField=Result fields +HTTPPOST.Injection.LookupQueryField=Http Post Query fields +HTTPPOST.Injection.LookupArgumentField=Http Post Argument fields +HTTPPOST.Injection.ArgumentFieldName=Body (Header) Field name +HTTPPOST.Injection.ArgumentFieldParameter=Body (Header) value +HTTPPOST.Injection.ArgumentFieldHeader=Put in Header (Y/N) +HTTPPOST.Injection.QueryFieldName=Query parameter field name +HTTPPOST.Injection.QueryFieldParameter=Query parameter value +HTTPPOST.Injection.ResultFieldName=Result field name +HTTPPOST.Injection.ResultFieldCode=HTTP status code field name +HTTPPOST.Injection.ResultFieldResponseTime=Response time (milliseconds) +HTTPPOST.Injection.ResultFieldResponseHeader=Response header field name +HttpPostMeta.keyword=http,post + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-utils/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-utils/pom.xml new file mode 100644 index 00000000000..d7d3d520904 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-utils/pom.xml @@ -0,0 +1,33 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4j-apache-hop + 0.11.0-SNAPSHOT + + hop-plc4x-utils + pom + PLC4J: Integrations: Apache Hop: Utils + + hop-plc4x-grafana + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/pom.xml b/plc4j/integrations/apache-hop/pom.xml new file mode 100644 index 00000000000..5908498abb5 --- /dev/null +++ b/plc4j/integrations/apache-hop/pom.xml @@ -0,0 +1,251 @@ + + + + 4.0.0 + + org.apache.plc4x + plc4j-integrations + 0.11.0-SNAPSHOT + + + plc4j-apache-hop + pom + PLC4J: Integrations: Apache Hop + + + + + + 2.3.0 + + /home/hans/Documents/test + + 3.114.0 + 3.1.0 + + 2.2.2.Final + + 0.11.0-SNAPSHOT + 1.4.01 + + + + + plc4x-hop-actions + plc4x-hop-metadata + plc4x-hop-transformer + plc4x-hop-assemblies + plc4x-hop-utils + + + + + + swt-unix + + + unix + + + + org.eclipse.swt.gtk.linux.x86_64 + linux + + + + + org.eclipse.platform + ${swt.artifactId} + ${org.eclipse.platform.version} + + + * + * + + + + + + + + swt-mac + + + mac + + + + org.eclipse.swt.cocoa.macosx.x86_64 + mac + + + + + org.eclipse.platform + ${swt.artifactId} + ${org.eclipse.platform.version} + + + * + * + + + + + + + + swt-windows + + + windows + + + + org.eclipse.swt.win32.win32.x86_64 + windows + + + + + org.eclipse.platform + ${swt.artifactId} + ${org.eclipse.platform.version} + + + * + * + + + + + + + + + + + + central + https://repo1.maven.org/maven2/ + Maven Central + + false + + + true + + + + Apache + https://repository.apache.org/snapshots/ + Apache Repository + + true + + + false + + + + + + apache.snapshots + https://repository.apache.org/snapshots/ + + true + + + false + + + + + + + + + org.apache.rat + apache-rat-plugin + 0.13 + + false + true + + + + DISCLAIMER + LICENSE + NOTICE + **/licenses/* + **/target/** + **/*.svg + **/*.json + **/PUT_JDBC_HERE + **/hop.pwd + **/*.iml + + + **/test/**/*.txt + **/test/**/*.xml + **/test/**/*.xsd + **/test/**/*.csv + **/test/**/*.csv.bz2 + **/test/**/*.csv.gz + **/test/**/*.ods + **/test/**/*.xls + **/test/**/*.xlsx + **/test/**/*.edi + **/test/**/*.avro + **/test/**/*.snippet + + + **/datasets/*.csv + **/it/**/*.csv + + + **/integration-tests/**/*.txt + **/integration-tests/**/*.json + **/integration-tests/**/*.json.old + + + + **/src/main/samples/**/*.txt + **/src/main/samples/**/*.csv + + + docs/content/** + docs/resources/** + docs/node_modules/** + docs/.pnp/** + docs/.pnp.js + docs/yarn.lock + + + + + + + + + + + + \ No newline at end of file diff --git a/plc4j/integrations/pom.xml b/plc4j/integrations/pom.xml index 253dcb038b5..28c39abc3d8 100644 --- a/plc4j/integrations/pom.xml +++ b/plc4j/integrations/pom.xml @@ -37,6 +37,7 @@ apache-nifi apache-calcite opcua-server + apache-hop diff --git a/src/site/asciidoc/developers/protocols/ads/images/ads-statemachine.svg b/src/site/asciidoc/developers/protocols/ads/images/ads-statemachine.svg new file mode 100644 index 00000000000..b3923580aec --- /dev/null +++ b/src/site/asciidoc/developers/protocols/ads/images/ads-statemachine.svg @@ -0,0 +1 @@ +ConnectedConnectBrowseReadWriteSubscribeUnsubscribeinitializingSend 'Add Or Update AMS Routes'Send 'ADS Read Device Info'Receive 'Add Or Update AMS Routes'Receive 'ADS Read Device Info'Init Read Online and Offline VersionReset Symbol and Data-Type DataSend 'Read Online-Version (Symbolic)'Send 'Read Offline-Version'Receive 'Read Online-Version (Symbolic)'Receive 'Read Offline-Version'Send 'Read Symbol- and Data-Type-Table sizes'Receive 'Read Symbol- and Data-Type-Table sizes'Send 'Read Data-Type-Table'Receive 'Read Data-Type-Table'Send 'Read Symbol-Table'Receive 'Read Symbol-Table'Subscribe to changes to the Online- and Offline VersionBrowseBrowse: Send 'Read Symbol- and Data-Type-Table sizes'Browse: Receive 'Read Symbol- and Data-Type-Table sizes'Browse: Send 'Read Data-Type-Table'Browse: Receive 'Read Data-Type-Table'Browse: Send 'Read Symbol-Table'Browse: Receive 'Read Symbol-Table'Return API Browse ResultReadRead: Send 'Multi Item Address Resolution' for unresolvedRead: Receive 'Multi Item Address Resolution' for unresolvedRead: Send 'Multi Item Read'Read: Receive 'Multi Item Read'Read: Return API Read ResultRead: Send 'Single Item Address Resolution'Read: Receive 'Single Item Address Resolution'Read: Send 'Single Item Read'Read: Receive 'Single Item Read'WriteWrite: Send 'Multi Item Address Resolution' for unresolvedWrite: Receive 'Multi Item Address Resolution' for unresolvedWrite: Send 'Multi Item Write'Write: Receive 'Multi Item Write'Write: Return API Write ResultWrite: Send 'Single Item Address Resolution'Write: Receive 'Single Item Address Resolution'Write: Send 'Single Item Write'Write: Receive 'Single Item Write'SubscribeSubscribe: Send 'Multi Item Address Resolution' for unresolvedSubscribe: Receive 'Multi Item Address Resolution' for unresolvedSubscribe: Send 'Single Item Address Resolution'Subscribe: Receive 'Single Item Address Resolution'Subscribe: Send 'Single Item 1 Subscibe'Subscribe: Receive 'Single Item 1 Subscibe'Subscribe: Send 'Single Item 2 Subscibe'Subscribe: Receive 'Single Item 2 Subscibe'Subscribe: Send 'Single Item n Subscibe'Subscribe: Receive 'Single Item n Subscibe'Subscribe: Return API Write ResultUnsubscribeUnsubscribe: Send 'Single Item 1 Unsubscribe'Unsubscribe: Receive 'Single Item 1 Unsubscribe'Unsubscribe: Send 'Single Item 2 Unsubscribe'Unsubscribe: Receive 'Single Item 2 Unsubscribe'Unsubscribe: Send 'Single Item n Unsubscribe'Unsubscribe: Receive 'Single Item n Unsubscribe'Unsubscribe: Return API Unsubscribe ResultAPI Browse RequestAPI Read RequestAPI Write RequestAPI Subscription RequestAPI Unsubscription RequestUsing Authentication?truefalseConfig: Monitor PLC changes?truefalseConfig: Load Symbol- and Data-Type-Tables?truefalseConfig: Monitor PLC changes?trueUpdate the online- or offline version (Depending on wich one changed)Is symbol- and data-type-table loaded?truefalseIs single item read request?falseAre all field addresses resolved?unresolvedresolvedtrueIs the field address resolved?falsetrueIs single item write request?falseAre all field addresses resolved?unresolvedresolvedtrueIs the field address resolved?falsetrueIs single item subscription request?falseAre all field addresses resolved?unresolvedresolvedtrueIs the field address resolved?falsetrue \ No newline at end of file diff --git a/src/site/asciidoc/images/plc4x-architecture.png b/src/site/asciidoc/images/plc4x-architecture.png new file mode 100644 index 0000000000000000000000000000000000000000..4891a28c492ac99d330f5eb0d3eeae724c71a89a GIT binary patch literal 24761 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 D86b(e literal 0 HcmV?d00001 From fd4bf09485d6d6849adf0b7bf644ef2a2dc88076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Sat, 11 Mar 2023 13:41:46 -0400 Subject: [PATCH 11/14] Integration with Hop V2.X.X in progress. Action and Transform Read, Write and Events are working, Subscription is missing due to S7 driver problems. The resources for modification are added to the portal. --- .gitignore | 1 + .../bacnetip/readwrite/BACnetVendorId.java | 2 - .../hop/actions/ActionSampleMetaData.java | 4 +- .../hop/actions/Plc4xCheckConnections.java | 72 +++- .../hop/actions/Plc4xCheckDisConnections.java | 271 +++++++++++++ .../Plc4xCheckDisConnectionsDialog.java | 371 ++++++++++++++++++ .../messages/messages_en_US.properties | 13 +- .../src/assembly/assembly.xml | 33 +- .../src/assembly/assembly.xml | 49 +++ .../apache-hop/plc4x-hop-metadata/pom.xml | 18 +- .../apache-hop/plc4x-hop-transformer/pom.xml | 16 + .../hop/transforms/plc4xevent/Plc4xEvent.java | 165 +++++--- .../plc4xevent/Plc4xEventDialog.java | 17 +- .../transforms/plc4xevent/Plc4xEventMeta.java | 22 +- .../hop/transforms/plc4xinput/Plc4xRead.java | 28 +- .../plc4xinput/Plc4xReadDialog.java | 2 +- .../transforms/plc4xinput/Plc4xReadMeta.java | 36 +- .../transforms/plc4xoutput/Plc4xWrite.java | 22 +- .../plc4xoutput/Plc4xWriteMeta.java | 36 +- .../hop/transforms/plc4xsubs/Plc4xSubs.java | 88 +++-- .../transforms/plc4xsubs/Plc4xSubsMeta.java | 34 +- .../util/Plc4xPlcSubscriptionTag.java | 160 ++++++++ .../{Plc4xPlcField.java => Plc4xPlcTag.java} | 20 +- .../messages/messages_en_US.properties | 14 +- pom.xml | 2 + src/site/asciidoc/index.adoc | 14 + src/site/asciidoc/users/index.adoc | 14 + .../users/integrations/apache-hop.adoc | 41 ++ src/site/resources/images/icons/s7_alert.png | Bin 0 -> 19948 bytes .../resources/images/icons/s7_caution.png | Bin 0 -> 18944 bytes src/site/resources/images/icons/s7_danger.png | Bin 0 -> 20452 bytes src/site/resources/images/icons/s7_dont.png | Bin 0 -> 20067 bytes src/site/resources/images/icons/s7_ex.png | Bin 0 -> 20057 bytes .../resources/images/icons/s7_important.png | Bin 0 -> 19667 bytes src/site/resources/images/icons/s7_note.png | Bin 0 -> 19486 bytes src/site/resources/images/icons/s7_tip.png | Bin 0 -> 20231 bytes src/site/resources/images/icons/s7_toddy.png | Bin 0 -> 20356 bytes .../resources/images/icons/s7_warning.png | Bin 0 -> 19172 bytes .../images/integrations/apache_hop_logo.png | Bin 0 -> 14041 bytes .../images/integrations/plc4x_hop_banner.jpg | Bin 0 -> 81373 bytes src/site/site.xml | 1 + 41 files changed, 1355 insertions(+), 211 deletions(-) create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnectionsDialog.java create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcSubscriptionTag.java rename plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/{Plc4xPlcField.java => Plc4xPlcTag.java} (85%) create mode 100644 src/site/asciidoc/users/integrations/apache-hop.adoc create mode 100644 src/site/resources/images/icons/s7_alert.png create mode 100644 src/site/resources/images/icons/s7_caution.png create mode 100644 src/site/resources/images/icons/s7_danger.png create mode 100644 src/site/resources/images/icons/s7_dont.png create mode 100644 src/site/resources/images/icons/s7_ex.png create mode 100644 src/site/resources/images/icons/s7_important.png create mode 100644 src/site/resources/images/icons/s7_note.png create mode 100644 src/site/resources/images/icons/s7_tip.png create mode 100644 src/site/resources/images/icons/s7_toddy.png create mode 100644 src/site/resources/images/icons/s7_warning.png create mode 100644 src/site/resources/images/integrations/apache_hop_logo.png create mode 100644 src/site/resources/images/integrations/plc4x_hop_banner.jpg diff --git a/.gitignore b/.gitignore index 39a55e142e7..d86ce58836f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ atlassian-ide-plugin.xml *.tar.gz *.rar + # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index 8f5d0a26fcd..a5f60c30a41 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1615,8 +1615,6 @@ public enum BACnetVendorId { THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"), INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"), METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."), -<<<<<<< HEAD - TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), LEFOO_INDUSTRIAL_HANGZHOU_CO_LTD( diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java index ecaaf6efdf7..67145901ab6 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java @@ -25,8 +25,8 @@ * @author cgarcia */ @HopMetadata( - key = "Xplc4xconnection", - name = "PLC4x Connection", + key = "Xplc4xaction", + name = "PLC4x Action", description = "A shared PLC4x connection to a PLC", image = "plc4x_toddy.svg", documentationUrl = "/metadata-types/neo4j/neo4j-connection.html") diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java index 752890f7f23..c2aac428f52 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java @@ -31,25 +31,32 @@ import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.java.DefaultPlcDriverManager; +import org.apache.plc4x.java.api.PlcConnection; +import org.apache.plc4x.java.api.exceptions.PlcConnectionException; import org.w3c.dom.Node; @Action( id = "CHECK_PLC4X_CONNECTIONS", - name = "i18n::Plc4xAction.Name", - description = "i18n::Plc4xAction.Description", + name = "i18n::Plc4xActionConnections.Name", + description = "i18n::Plc4xActionConnections.Description", image = "plc4x_toddy.svg", categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.Conditions", - keywords = "i18n::Plc4xAction.keyword", - documentationUrl = "/workflow/actions/checkdbconnection.html") + keywords = "i18n::Plc4xActionConnections.keyword", + documentationUrl = "/workflow/actions/plc4x.html") public class Plc4xCheckConnections extends ActionBase implements Cloneable, IAction { private static final Class PKG = Plc4xCheckConnections.class; // Needed by Translator private Plc4xConnection[] connections; + private boolean connected = false; + private PlcConnection plcconn = null; protected static final String[] unitTimeDesc = new String[] { @@ -241,17 +248,41 @@ public void loadXml( Node entrynode, IHopMetadataProvider metadataProvider, IVar } /** - * Execute this action and return the result. In this case it means, just set the result boolean in the Result + * Execute this action and return the result. + * In this case it means, just set the result boolean in the Result * class. - * - * @param result The result of the previous execution + * Check all conections metadata from the dialog. + * @param prevResult The result of the previous execution * @return The Result of the execution. */ @Override - public Result execute( Result result, int nr ) { - result.setResult(true); - System.out.println("NR: " + nr); - + public Result execute( Result prevResult, int nr ) { + Result result = prevResult; + result.setNrErrors(0); + connected = true; + for (Plc4xConnection connmeta:connections) { + try { + plcconn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(01) + if (!plcconn.isConnected()) { + logBasic("Cant connect to: " + connmeta.getUrl()); + connected = false; + plcconn = null; + //break; + } + plcconn.close(); + plcconn = null; + } catch (Exception ex) { + Logger.getLogger(Plc4xCheckConnections.class.getName()).log(Level.SEVERE, null, ex); + connected = false; + plcconn = null; + //break; + } finally { + + } + + } + + result.setResult(connected); return result; } @@ -268,4 +299,23 @@ public Result execute( Result result, int nr ) { public void check( List remarks, WorkflowMeta workflowMeta, IVariables variables, IHopMetadataProvider metadataProvider ) { } + + @Override + public boolean resetErrorsBeforeExecution() { + return false; + } + + @Override + public boolean isEvaluation() { + return true; + } + + @Override + public boolean isUnconditional() { + return false; + } + + + + } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java new file mode 100644 index 00000000000..d4f3f5e2538 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java @@ -0,0 +1,271 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.plc4x.hop.actions; + +import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.Result; +import org.apache.hop.core.annotations.Action; +import org.apache.hop.core.exception.HopXmlException; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.core.xml.XmlHandler; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.workflow.WorkflowMeta; +import org.apache.hop.workflow.action.ActionBase; +import org.apache.hop.workflow.action.IAction; + + +import java.util.List; +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.w3c.dom.Node; + + +@Action( + id = "CHECK_PLC4X_DISCONNECTIONS", + name = "i18n::Plc4xActionDisConnections.Name", + description = "i18n::Plc4xActionDisConnections.Description", + image = "plc4x_toddy.svg", + categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.Conditions", + keywords = "i18n::Plc4xActionDisConnections.keyword", + documentationUrl = "/workflow/actions/checkdbconnection.html") +public class Plc4xCheckDisConnections extends ActionBase implements Cloneable, IAction { + private static final Class PKG = Plc4xCheckDisConnections.class; // Needed by Translator + + + private Plc4xConnection[] connections; + + protected static final String[] unitTimeDesc = + new String[] { + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeMilliSecond.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeSecond.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeMinute.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.UnitTimeHour.Label"), + }; + protected static final String[] unitTimeCode = + new String[] {"millisecond", "second", "minute", "hour"}; + + public static final int UNIT_TIME_MILLI_SECOND = 0; + public static final int UNIT_TIME_SECOND = 1; + public static final int UNIT_TIME_MINUTE = 2; + public static final int UNIT_TIME_HOUR = 3; + + private String[] waitfors; + private int[] waittimes; + + private long timeStart; + private long now; + + public Plc4xCheckDisConnections( String name) { + super(name, ""); + //connections = null; + waitfors = null; + waittimes = null; + } + + public Plc4xCheckDisConnections() { + this( ""); + } + + public Object clone() { + Plc4xCheckDisConnections c = (Plc4xCheckDisConnections) super.clone(); + return c; + } + + + public Plc4xConnection[] getConnections() { + return connections; + } + + public void setConnections(Plc4xConnection[] connections) { + this.connections = connections; + } + + public String[] getWaitfors() { + return waitfors; + } + + public void setWaitfors(String[] waitfors) { + this.waitfors = waitfors; + } + + public int[] getWaittimes() { + return waittimes; + } + + public void setWaittimes(int[] waittimes) { + this.waittimes = waittimes; + } + + public long getTimeStart() { + return timeStart; + } + + public long getNow() { + return now; + } + + private static String getWaitTimeCode(int i) { + if (i < 0 || i >= unitTimeCode.length) { + return unitTimeCode[0]; + } + return unitTimeCode[i]; + } + + public static String getWaitTimeDesc(int i) { + if (i < 0 || i >= unitTimeDesc.length) { + return unitTimeDesc[0]; + } + return unitTimeDesc[i]; + } + + public static int getWaitTimeByDesc(String tt) { + if (tt == null) { + return 0; + } + + for (int i = 0; i < unitTimeDesc.length; i++) { + if (unitTimeDesc[i].equalsIgnoreCase(tt)) { + return i; + } + } + + // If this fails, try to match using the code. + return getWaitTimeByCode(tt); + } + + private static int getWaitTimeByCode(String tt) { + if (tt == null) { + return 0; + } + + for (int i = 0; i < unitTimeCode.length; i++) { + if (unitTimeCode[i].equalsIgnoreCase(tt)) { + return i; + } + } + return 0; + } + + + + /** + * + * Save values to XML + * + * @return + */ + @Override + public String getXml() { + StringBuilder xml = new StringBuilder(120); + xml.append(super.getXml()); + xml.append(" ").append(Const.CR); + if (connections != null) { + for (int i = 0; i < connections.length; i++) { + xml.append(" ").append(Const.CR); + xml.append(" ") + .append( + XmlHandler.addTagValue( + "name", connections[i] == null ? null : connections[i].getName())); + xml.append(" ").append(XmlHandler.addTagValue("waitfor", waitfors[i])); + xml.append(" ") + .append(XmlHandler.addTagValue("waittime", getWaitTimeCode(waittimes[i]))); + xml.append(" ").append(Const.CR); + } + } + xml.append(" ").append(Const.CR); + + return xml.toString(); + } + + /** + * + * Read the XML and get the values needed for the acton + * + * @param entrynode + * @param metadataProvider + * @throws HopXmlException + */ + @Override + public void loadXml( Node entrynode, IHopMetadataProvider metadataProvider, IVariables variables ) throws HopXmlException { + try { + super.loadXml(entrynode); + Node fields = XmlHandler.getSubNode(entrynode, "connections"); + + // How many hosts? + int nrFields = XmlHandler.countNodes(fields, "connection"); + connections = new Plc4xConnection[nrFields]; + waitfors = new String[nrFields]; + waittimes = new int[nrFields]; + // Read them all... + for (int i = 0; i < nrFields; i++) { + Node fnode = XmlHandler.getSubNodeByNr(fields, "connection", i); + String dbname = XmlHandler.getTagValue(fnode, "name"); + + //connections[i] = Plc4xConnection.loadDatabase(metadataProvider, dbname); + if (dbname != null) { + connections[i] = metadataProvider.getSerializer(Plc4xConnection.class).load(dbname); + waitfors[i] = XmlHandler.getTagValue(fnode, "waitfor"); + waittimes[i] = getWaitTimeByCode(Const.NVL(XmlHandler.getTagValue(fnode, "waittime"), "")); + }; + } + } catch (HopXmlException xe) { + throw new HopXmlException( + BaseMessages.getString( + PKG, + "Plc4xCheckConnections.ERROR_0001_Cannot_Load_Job_Entry_From_Xml_Node", + xe.getMessage())); + } catch (HopException ex) { + throw new HopXmlException( + BaseMessages.getString( + PKG, + "Plc4xCheckConnections.ERROR_0001_Cannot_Load_Job_Entry_From_Xml_Node", + ex.getMessage())); + } + } + + /** + * Execute this action and return the result. In this case it means, just set the result boolean in the Result + * class. + * + * @param result The result of the previous execution + * @return The Result of the execution. + */ + @Override + public Result execute( Result result, int nr ) { + result.setResult(true); + System.out.println("NR: " + nr); + + return result; + } + + /** + * + * Add checks to report warnings + * + * @param remarks + * @param workflowMeta + * @param variables + * @param metadataProvider + */ + @Override + public void check( List remarks, WorkflowMeta workflowMeta, IVariables variables, + IHopMetadataProvider metadataProvider ) { + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnectionsDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnectionsDialog.java new file mode 100644 index 00000000000..75336387996 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnectionsDialog.java @@ -0,0 +1,371 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.plc4x.hop.actions; + +import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.hop.core.Const; +import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.util.Utils; +import org.apache.hop.core.variables.IVariables; +import org.apache.hop.i18n.BaseMessages; +import org.apache.hop.ui.core.dialog.BaseDialog; +import org.apache.hop.ui.core.gui.WindowProperty; +import org.apache.hop.ui.core.widget.ColumnInfo; +import org.apache.hop.ui.core.widget.TableView; +import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.workflow.action.ActionDialog; +import org.apache.hop.ui.workflow.dialog.WorkflowDialog; +import org.apache.hop.workflow.WorkflowMeta; +import org.apache.hop.workflow.action.IAction; +import org.apache.hop.workflow.action.IActionDialog; +import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.*; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.*; + +import org.apache.hop.metadata.api.IHopMetadata; +import org.apache.hop.ui.core.dialog.ErrorDialog; +import org.apache.hop.ui.core.metadata.MetadataManager; +import org.apache.hop.ui.core.widget.MetaSelectionLine; + + +public class Plc4xCheckDisConnectionsDialog extends ActionDialog implements IActionDialog { + private static final Class PKG = Plc4xCheckDisConnectionsDialog.class; // Needed by Translator + + private Shell shell; + + private Text wName; + + private Plc4xCheckDisConnections action; + + private boolean changed; + + private TableView wFields; + + private MetaSelectionLine wConnection; + + public Plc4xCheckDisConnectionsDialog(Shell parent, IAction action, WorkflowMeta workflowMeta, IVariables variables) { + super( parent, workflowMeta, variables ); + this.action = (Plc4xCheckDisConnections) action; + if ( this.action.getName() == null ) { + this.action.setName( BaseMessages.getString( PKG, "Plc4xCheckConnections.Label" ) ); + } + } + + @Override + public IAction open() { + Shell parent = getParent(); + + shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX | SWT.RESIZE); + props.setLook(shell); + WorkflowDialog.setShellImage(shell, action); + + ModifyListener lsMod = (ModifyEvent e) -> action.setChanged(); + changed = action.hasChanged(); + + FormLayout formLayout = new FormLayout(); + formLayout.marginWidth = Const.FORM_MARGIN; + formLayout.marginHeight = Const.FORM_MARGIN; + + shell.setLayout(formLayout); + shell.setText(BaseMessages.getString(PKG, "Plc4xCheckonnections.Title")); + + int middle = props.getMiddlePct(); + int margin = Const.MARGIN; + + // Buttons at the bottom + // + Button wOk = new Button(shell, SWT.PUSH); + wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); + wOk.addListener(SWT.Selection, (Event e) -> ok()); + Button wCancel = new Button(shell, SWT.PUSH); + wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); + wCancel.addListener(SWT.Selection, (Event e) -> cancel()); + BaseTransformDialog.positionBottomButtons(shell, new Button[] {wOk, wCancel}, margin, null); + + // Filename line + Label wlName = new Label(shell, SWT.RIGHT); + wlName.setText(BaseMessages.getString(PKG, "Plc4xCheckConnections.Name.Label")); + props.setLook(wlName); + FormData fdlName = new FormData(); + fdlName.left = new FormAttachment(0, 0); + fdlName.right = new FormAttachment(middle, -margin); + fdlName.top = new FormAttachment(0, margin); + wlName.setLayoutData(fdlName); + wName = new Text(shell, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + props.setLook(wName); + wName.addModifyListener(lsMod); + FormData fdName = new FormData(); + fdName.left = new FormAttachment(middle, 0); + fdName.top = new FormAttachment(0, margin); + fdName.right = new FormAttachment(100, 0); + wName.setLayoutData(fdName); + + Label wlFields = new Label(shell, SWT.NONE); + wlFields.setText(BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.Label")); + props.setLook(wlFields); + FormData fdlFields = new FormData(); + fdlFields.left = new FormAttachment(0, 0); + // fdlFields.right= new FormAttachment(middle, -margin); + fdlFields.top = new FormAttachment(wName, 2 * margin); + wlFields.setLayoutData(fdlFields); + + + wConnection = + new MetaSelectionLine<>( + variables, + metadataProvider, + Plc4xConnection.class, + shell, + SWT.NONE, + BaseMessages.getString(PKG, "Plc4xCheckConnections.Connection.Label"), + BaseMessages.getString(PKG, "Plc4xCheckConnections.Connection.Tooltip")); + props.setLook(wConnection); + FormData fdConnection = new FormData(); + fdConnection.left = new FormAttachment(0, 0); + fdConnection.right = new FormAttachment(100, 0); + //fdConnection.top = new FormAttachment(wTransformName, margin); + wConnection.setLayoutData(fdConnection); + + try { + wConnection.fillItems(); + } catch (Exception e) { + new ErrorDialog(shell, "Error", "Error listing Cassandra connection metadata objects", e); + } + + + // Buttons to the right of the screen... + Button wbGetConnections = new Button(shell, SWT.PUSH | SWT.CENTER); + props.setLook(wbGetConnections); + wbGetConnections.setText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.GetConnections")); + wbGetConnections.setToolTipText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.GetConnections.Tooltip")); + FormData fdbGetConnections = new FormData(); + fdbGetConnections.right = new FormAttachment(100, -margin); + fdbGetConnections.top = new FormAttachment(wlFields, margin); + wbGetConnections.setLayoutData(fdbGetConnections); + + // Buttons to the right of the screen... + Button wbdSourceFileFolder = new Button(shell, SWT.PUSH | SWT.CENTER); + props.setLook(wbdSourceFileFolder); + wbdSourceFileFolder.setText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.DeleteEntry")); + wbdSourceFileFolder.setToolTipText( + BaseMessages.getString(PKG, "Plc4xCheckConnections.DeleteSourceFileButton.Label")); + FormData fdbdSourceFileFolder = new FormData(); + fdbdSourceFileFolder.right = new FormAttachment(100, -margin); + fdbdSourceFileFolder.top = new FormAttachment(wbGetConnections, margin); + wbdSourceFileFolder.setLayoutData(fdbdSourceFileFolder); + + int rows = + action.getConnections() == null + ? 1 + : (action.getConnections().length == 0 ? 0 : action.getConnections().length); + + final int FieldsRows = rows; + + ColumnInfo[] colinf = + new ColumnInfo[] { + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.Argument.Label"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + this.getWorkflowMeta().getDatabaseNames(), + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.WaitFor.Label"), + ColumnInfo.COLUMN_TYPE_TEXT, + false), + new ColumnInfo( + BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.WaitForTime.Label"), + ColumnInfo.COLUMN_TYPE_CCOMBO, + Plc4xCheckConnections.unitTimeDesc, + false), + }; + + colinf[0].setToolTip(BaseMessages.getString(PKG, "Plc4xCheckConnections.Fields.Column")); + colinf[1].setUsingVariables(true); + colinf[1].setToolTip(BaseMessages.getString(PKG, "Plc4xCheckConnections.WaitFor.ToolTip")); + + wFields = + new TableView( + variables, + shell, + SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI, + colinf, + FieldsRows, + lsMod, + props); + + FormData fdFields = new FormData(); + fdFields.left = new FormAttachment(0, 0); + fdFields.top = new FormAttachment(wlFields, margin); + fdFields.right = new FormAttachment(wbGetConnections, -margin); + fdFields.bottom = new FormAttachment(wOk, -2 * margin); + wFields.setLayoutData(fdFields); + + // Delete files from the list of files... + wbdSourceFileFolder.addListener( + SWT.Selection, + e -> { + int[] idx = wFields.getSelectionIndices(); + wFields.remove(idx); + wFields.removeEmptyRows(); + wFields.setRowNums(); + }); + + // get connections... + wbGetConnections.addListener(SWT.Selection, e -> getConnections()); + + getData(); + + BaseDialog.defaultShellHandling(shell, c -> ok(), c -> cancel()); + + return action; + } + + // public void addDatabases() { + // connections = workflowMeta.getDatabaseNames(); + // } + + public void getConnections() { + /* + this.workflowMeta.getMetadataProvider().getMetadataClasses().forEach( + (c) -> { + System.out.println("Name: " + c.getName()); + }); + IHopMetadataProvider hmdp = this.workflowMeta.getMetadataProvider(); + */ + Class metadataClass = null; + + java.util.List databases = new ArrayList<>(); //this.workflowMeta.getMetadataProvider(). + try { + metadataClass = metadataProvider.getMetadataClassForKey("plc4x-connection"); + MetadataManager manager = new MetadataManager<>(variables, metadataProvider, metadataClass, null); + manager.getNames().forEach((s)->{ + try { + databases.add((Plc4xConnection) manager.loadElement(s)); + } catch (HopException ex) { + Logger.getLogger(Plc4xCheckDisConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + }); + + } catch (Exception ex) { + Logger.getLogger(Plc4xCheckDisConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + + + wFields.removeAll(); + + for (Plc4xConnection ci : databases) { + if (ci != null) { + wFields.add(new String[] {ci.getName(), "0", Plc4xCheckDisConnections.unitTimeDesc[0]}); + } + } + wFields.removeEmptyRows(); + wFields.setRowNums(); + wFields.optWidth(true); + } + + public void dispose() { + WindowProperty winprop = new WindowProperty(shell); + props.setScreen(winprop); + shell.dispose(); + } + + /** Copy information from the meta-data input to the dialog fields. */ + public void getData() { + if (action.getName() != null) { + wName.setText(action.getName()); + } + + if (action.getConnections() != null) { + for (int i = 0; i < action.getConnections().length; i++) { + TableItem ti = wFields.table.getItem(i); + if (action.getConnections()[i] != null) { + ti.setText(1, action.getConnections()[i].getName()); + ti.setText(2, "" + Const.toInt(action.getWaitfors()[i], 0)); + ti.setText(3, Plc4xCheckDisConnections.getWaitTimeDesc(action.getWaittimes()[i])); + } + } + wFields.setRowNums(); + wFields.optWidth(true); + } + wName.selectAll(); + wName.setFocus(); + } + + private void cancel() { + action.setChanged(changed); + action = null; + dispose(); + } + + private void ok() { + if (Utils.isEmpty(wName.getText())) { + MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR); + mb.setText(BaseMessages.getString(PKG, "System.TransformActionNameMissing.Title")); + mb.setMessage(BaseMessages.getString(PKG, "System.ActionNameMissing.Msg")); + mb.open(); + return; + } + Class metadataClass = null; + action.setName(wName.getText()); + + int nrItems = wFields.nrNonEmpty(); + System.out.println("Numero de items: " + nrItems); + + Plc4xConnection[] connections = new Plc4xConnection[nrItems]; + String[] waitfors = new String[nrItems]; + int[] waittimes = new int[nrItems]; + + + try { + metadataClass = metadataProvider.getMetadataClassForKey("plc4x-connection"); + } catch (HopException ex) { + Logger.getLogger(Plc4xCheckDisConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + MetadataManager manager = new MetadataManager<>(variables, metadataProvider, metadataClass, null); + + for (int i = 0; i < nrItems; i++) { + String arg = wFields.getNonEmpty(i).getText(1); + Plc4xConnection conn; + try { + conn = (Plc4xConnection) manager.loadElement(arg); + if (conn != null) { + connections[i] = conn; + waitfors[i] = "" + Const.toInt(wFields.getNonEmpty(i).getText(2), 0); + waittimes[i] = + Plc4xCheckDisConnections.getWaitTimeByDesc(wFields.getNonEmpty(i).getText(3)); + } + } catch (HopException ex) { + Logger.getLogger(Plc4xCheckDisConnectionsDialog.class.getName()).log(Level.SEVERE, null, ex); + } + + } + action.setConnections(connections); + action.setWaitfors(waitfors); + action.setWaittimes(waittimes); + + dispose(); + } +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties index f13f6255eb2..ae7eb85d961 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/org/apache/plc4x/hop/actions/messages/messages_en_US.properties @@ -17,6 +17,15 @@ # # # +Plc4xActionConnections.Name=Plc4x Action Connections +Plc4xActionConnections.Description=Check Plc4x connections +Plc4xActionConnections.keyword=Plc4x Connections + +Plc4xActionDisConnections.Name=Plc4x Action Disconnections +Plc4xActionDisConnections.Description=Check Plc4x disconnections +Plc4xActionDisConnections.keyword=Plc4x Disconnections + + Plc4xCheckConnections.Name=Check PLC connections Plc4xCheckConnections.Description=Check if we can connect to one or several databases. Plc4xCheckConnections.ConnectionOK=We can successfully connect to database [{0}] (connection [{1}]) @@ -45,5 +54,5 @@ Plc4xCheckConnections.DeleteEntry=Delete Plc4xCheckConnections.GetConnections=Get connections Plc4xCheckConnections.GetConnections.Tooltip=Get available connections Plc4xCheckConnections.keyword=check,plc,database,connection -Plc4xCheckConnections.Connection.Label -Plc4xCheckConnections.Connection.Tooltip \ No newline at end of file +Plc4xCheckConnections.Connection.Label= +Plc4xCheckConnections.Connection.Tooltip= \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml index c79e5135186..984455a9bcb 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-metadata/src/assembly/assembly.xml @@ -57,11 +57,42 @@ com.github.jinahya:bit-io:jar ch.qos.logback:logback-core + io.netty:netty-buffer io.netty:netty-codec:jar + io.netty:netty-codec-dns:jar + io.netty:netty-codec-haproxy:jar + io.netty:netty-codec-http:jar + io.netty:netty-codec-http2:jar + io.netty:netty-codec-memcache:jar + io.netty:netty-codec-mqtt:jar + io.netty:netty-codec-redis:jar + io.netty:netty-codec-smtp:jar + io.netty:netty-codec-socks:jar + io.netty:netty-codec-stomp:jar + io.netty:netty-codec-xml:jar io.netty:netty-common:jar + io.netty:netty-handler:jar + io.netty:netty-handler-proxy:jar + io.netty:netty-ssl-ocsp:jar io.netty:netty-resolver:jar - io.netty:netty-transport + io.netty:netty-resolver-dns:jar + io.netty:netty-resolver-dns-classes-macos:jar + io.netty:netty-transport:jar + io.netty:netty-transport-classes-kqueue:jar + io.netty:netty-transport-native-unix-common:jar + io.netty:netty-transport-rxtx:jar + io.netty:netty-transport-sctp:jar + io.netty:netty-transport-udt:jar + + io.vavr:vavr:jar + io.vavr:vavr-match:jar + + org.apache.plc4x:plc4j-api:jar + org.apache.plc4x:plc4j-spi:jar + org.apache.plc4x:plc4j-spi:jar + org.apache.plc4x:plc4j-transport-tcp:jar + org.apache.plc4x:plc4j-driver-s7:jar diff --git a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml index 3321a4ce6fe..bff52ed295f 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-assemblies/plc4x-hop-assemblies-transform/src/assembly/assembly.xml @@ -48,5 +48,54 @@ org.apache.plc4x:plc4x-hop-transform:jar + + + + lib + false + true + runtime + + com.github.jinahya:bit-io:jar + ch.qos.logback:logback-core + + io.netty:netty-buffer + io.netty:netty-codec:jar + io.netty:netty-codec-dns:jar + io.netty:netty-codec-haproxy:jar + io.netty:netty-codec-http:jar + io.netty:netty-codec-http2:jar + io.netty:netty-codec-memcache:jar + io.netty:netty-codec-mqtt:jar + io.netty:netty-codec-redis:jar + io.netty:netty-codec-smtp:jar + io.netty:netty-codec-socks:jar + io.netty:netty-codec-stomp:jar + io.netty:netty-codec-xml:jar + io.netty:netty-common:jar + io.netty:netty-handler:jar + io.netty:netty-handler-proxy:jar + io.netty:netty-ssl-ocsp:jar + io.netty:netty-resolver:jar + io.netty:netty-resolver-dns:jar + io.netty:netty-resolver-dns-classes-macos:jar + io.netty:netty-transport:jar + io.netty:netty-transport-classes-kqueue:jar + io.netty:netty-transport-native-unix-common:jar + io.netty:netty-transport-rxtx:jar + io.netty:netty-transport-sctp:jar + io.netty:netty-transport-udt:jar + + io.vavr:vavr:jar + io.vavr:vavr-match:jar + + org.apache.plc4x:plc4j-api:jar + org.apache.plc4x:plc4j-spi:jar + org.apache.plc4x:plc4j-spi:jar + org.apache.plc4x:plc4j-transport-tcp:jar + org.apache.plc4x:plc4j-driver-s7:jar + + + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml index 22eccd03ab7..84000a4fbe5 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml @@ -68,7 +68,23 @@ javax.annotation:javax.annotation-api:jar:1.2 - + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + true + lib/ + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml index e707e0d2069..3bd9600ebe6 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml @@ -67,6 +67,7 @@ xml-apis:xml-apis:jar:1.4.01 org.apache.plc4x:plc4j-spi:jar:${project.version} com.fasterxml.jackson.core:jackson-annotations:jar:2.14.2 + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.14.2 @@ -139,5 +140,20 @@ commons-lang3 3.12.0 + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.14.2 + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java index e87262ec01e..243aa0120b7 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java @@ -17,11 +17,17 @@ package org.apache.plc4x.hop.transforms.plc4xevent; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.locks.ReentrantLock; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; @@ -30,8 +36,11 @@ import org.apache.hop.core.exception.HopPluginException; import org.apache.hop.core.logging.LogLevel; import org.apache.hop.core.row.IRowMeta; +import org.apache.hop.core.row.IValueMeta; import org.apache.hop.core.row.RowDataUtil; import org.apache.hop.core.row.RowMeta; +import org.apache.hop.core.row.value.ValueMetaFactory; +import org.apache.hop.core.util.StringUtil; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.Pipeline; @@ -40,6 +49,7 @@ import org.apache.hop.pipeline.transform.ITransform; import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; @@ -48,14 +58,20 @@ import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; import org.apache.plc4x.java.api.model.PlcConsumerRegistration; import org.apache.plc4x.java.api.types.PlcResponseCode; +import org.apache.plc4x.java.s7.events.S7AlarmEvent; +import org.apache.plc4x.java.s7.events.S7Event; import org.apache.plc4x.java.s7.events.S7ModeEvent; +import org.apache.plc4x.java.s7.events.S7ModeEvent.Fields; +import org.apache.plc4x.java.s7.events.S7SysEvent; +import org.apache.plc4x.java.s7.events.S7UserEvent; import org.apache.plc4x.java.s7.readwrite.ModeTransitionType; /** - * Transform That contains the basic skeleton needed to create your own plugin + * This transform receives an event from the S7 driver, of type MODE, SYS, + * USR or ALM. Only one type can be processed at a time. * */ -public class Plc4xEvent extends BaseTransform implements ITransform { +public class Plc4xEvent extends BaseTransform { public static String FIELD_MODE_EVENT = "MODE"; public static String FIELD_USER_EVENT = "USR"; @@ -75,6 +91,17 @@ public class Plc4xEvent extends BaseTransform im private PlcSubscriptionRequest subsbuild = null; private PlcSubscriptionResponse subresponse = null; + private List remarks = new ArrayList<>(); // stores the errors... + + /* + * The transfer of events is done from the driver tasks. A delay can be added + * for the execution of this transformer. + */ + private ObjectMapper mapper = new ObjectMapper(); + private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); + private boolean stopBundle = false; + private int index = 0; + private static final ReentrantLock lock = new ReentrantLock(); private static final String dummy = "dummy"; @@ -91,12 +118,41 @@ public Plc4xEvent(TransformMeta transformMeta, Plc4xEventMeta meta, Plc4xEventDa * @param remarks Error registers * @param origin transform instance name */ - public static final RowMetaAndData buildRow( - Plc4xEventMeta meta, List remarks, String origin) throws HopPluginException { + public static final RowMetaAndData buildRow(Plc4xEventMeta meta, + List remarks, + String origin) throws HopPluginException { IRowMeta rowMeta = new RowMeta(); Object[] rowData = RowDataUtil.allocateRowData(2); int index = 0; - + + ArrayList fields = new ArrayList(); + + if (meta.isModeEvent()) { + for (S7ModeEvent.Fields field:S7ModeEvent.Fields.values()) { + fields.add(field.name()); + } + } else if (meta.isSysEvent()) { + for (S7SysEvent.Fields field:S7SysEvent.Fields.values()) { + fields.add(field.name()); + } + } else if (meta.isUserEvent()) { + for (S7UserEvent.Fields field:S7UserEvent.Fields.values()) { + fields.add(field.name()); + } + } else if (meta.isAlarmEvent()) { + fields.add("ALARM"); + } + + for (String field : fields) { + IValueMeta valueMeta = + ValueMetaFactory.createValueMeta(field, IValueMeta.TYPE_STRING); // build a + rowData[index] = StringUtil.EMPTY_STRING; + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; + } + return new RowMetaAndData(rowMeta, rowData); } @@ -174,15 +230,7 @@ public boolean processRow() throws HopException { subresponse .getSubscriptionHandle(FIELD_MODE_EVENT) .register(msg -> { - System.out.println("******** S7ModeEvent ********"); - Map map = ((S7ModeEvent) msg).getMap(); - map.forEach((x, y) -> { - System.out.println(x + " : " + y); - }); - short currentmode = (short) - map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); - System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); - System.out.println("****************************"); + events.add((S7Event) msg); }); } @@ -191,15 +239,7 @@ public boolean processRow() throws HopException { subresponse .getSubscriptionHandle(FIELD_USER_EVENT) .register(msg -> { - System.out.println("******** S7ModeEvent ********"); - Map map = ((S7ModeEvent) msg).getMap(); - map.forEach((x, y) -> { - System.out.println(x + " : " + y); - }); - short currentmode = (short) - map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); - System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); - System.out.println("****************************"); + events.add((S7Event) msg); }); } @@ -208,15 +248,7 @@ public boolean processRow() throws HopException { subresponse .getSubscriptionHandle(FIELD_SYS_EVENT) .register(msg -> { - System.out.println("******** S7ModeEvent ********"); - Map map = ((S7ModeEvent) msg).getMap(); - map.forEach((x, y) -> { - System.out.println(x + " : " + y); - }); - short currentmode = (short) - map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); - System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); - System.out.println("****************************"); + events.add((S7Event) msg); }); } @@ -225,15 +257,7 @@ public boolean processRow() throws HopException { subresponse .getSubscriptionHandle(FIELD_ALARM_EVENT) .register(msg -> { - System.out.println("******** S7ModeEvent ********"); - Map map = ((S7ModeEvent) msg).getMap(); - map.forEach((x, y) -> { - System.out.println(x + " : " + y); - }); - short currentmode = (short) - map.get(S7ModeEvent.Fields.CURRENT_MODE.name()); - System.out.println("CURRENT_MODE MSG: " + ModeTransitionType.enumForValue(currentmode).name()); - System.out.println("****************************"); + events.add((S7Event) msg); }); } @@ -256,13 +280,39 @@ public boolean processRow() throws HopException { return false; } + while (events.size() == 0) { + try { + Thread.sleep(100); + if (stopBundle) { + setOutputDone(); // signal end to receiver(s) + return false; + } + } catch (InterruptedException ex) { + break; + } + } + + S7Event s7event = events.poll(); + index = 0; + r = data.outputRowMeta.cloneRow(data.outputRowData); + for (String name:data.outputRowMeta.getFieldNames()) { + System.out.println(name + ": " + s7event.getMap().get(name)); + if (null != s7event.getMap().get(name)) { + r[index++] = s7event.getMap().get(name).toString(); + } else { + try { + r[index++] = mapper.writer() + .writeValueAsString(s7event.getMap()); + } catch (Exception ex) { + Logger.getLogger(Plc4xEvent.class.getName()).log(Level.SEVERE, null, ex); + } + } + } - r = data.outputRowMeta.cloneRow(data.outputRowData); - logBasic("Tamano de los datos: " + r.length); + data.prevDate = data.rowDate; data.rowDate = new Date(); - putRow(data.outputRowMeta, r ); // return your data data.rowsWritten++; return true; @@ -293,7 +343,9 @@ public boolean init() { } data.outputRowData = outputRow.getData(); - data.outputRowMeta = outputRow.getRowMeta(); + data.outputRowMeta = outputRow.getRowMeta(); + + mapper.findAndRegisterModules(); return true; } @@ -313,8 +365,13 @@ public boolean init() { public void cleanup() { super.cleanup(); logBasic("Cleanup. Release connection."); - if (connwrapper != null) - connwrapper.release(); + if (null != connwrapper) { + if (null != registerMode ) registerMode.unregister(); + if (null != registerUser) registerUser.unregister(); + if (null != registerSys) registerSys.unregister(); + if (null != registerAlarm) registerAlarm.unregister(); + connwrapper.release(); + } } @@ -334,11 +391,21 @@ public void dispose() { if (!connwrapper.getConnection().isConnected()){ getPipeline().getExtensionDataMap().remove(meta.getConnection()); } - connwrapper = null; - readRequest = null; + connwrapper = null; + readRequest = null; + registerMode = null; + registerUser = null; + registerSys = null; + registerAlarm = null; } } + + @Override + public void stopRunning() throws HopException { + super.stopRunning(); + stopBundle = true; + } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java index ea369b5cb74..3d246028774 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventDialog.java @@ -204,7 +204,7 @@ public void widgetSelected(SelectionEvent e) { * Mode Events ********************/ Label wlModeEvent = new Label(shell, SWT.RIGHT); - wlModeEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + wlModeEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.ModeEvent.Label")); props.setLook(wlModeEvent); FormData fdlModeEvent = new FormData(); fdlModeEvent.left = new FormAttachment(0, 0); @@ -233,7 +233,7 @@ public void widgetSelected(SelectionEvent e) { * User Events ********************/ Label wlUserEvent = new Label(shell, SWT.RIGHT); - wlUserEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + wlUserEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.UserEvent.Label")); props.setLook(wlUserEvent); FormData fdlUserEvent = new FormData(); fdlUserEvent.left = new FormAttachment(0, 0); @@ -262,7 +262,7 @@ public void widgetSelected(SelectionEvent e) { * Sys Events ********************/ Label wlSysEvent = new Label(shell, SWT.RIGHT); - wlSysEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + wlSysEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.SysEvent.Label")); props.setLook(wlSysEvent); FormData fdlSysEvent = new FormData(); fdlSysEvent.left = new FormAttachment(0, 0); @@ -291,7 +291,7 @@ public void widgetSelected(SelectionEvent e) { * Alarm Events ********************/ Label wlAlarmEvent = new Label(shell, SWT.RIGHT); - wlAlarmEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.NeverEnding.Label")); + wlAlarmEvent.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.AlarmEvent.Label")); props.setLook(wlAlarmEvent); FormData fdlAlarmEvent = new FormData(); fdlAlarmEvent.left = new FormAttachment(0, 0); @@ -544,6 +544,10 @@ public void getData() { wLimit.setText(input.getRowLimit()); wNeverEnding.setSelection(input.isNeverEnding()); + wModeEvent.setSelection(input.isModeEvent()); + wUserEvent.setSelection(input.isUserEvent()); + wSysEvent.setSelection(input.isSysEvent()); + wAlarmEvent.setSelection(input.isAlarmEvent()); setActive(); @@ -560,6 +564,11 @@ private void getInfo( Plc4xEventMeta meta) throws HopException { meta.setConnection(wConnection.getText()); meta.setRowLimit(wLimit.getText()); meta.setNeverEnding(wNeverEnding.getSelection()); + + meta.setModeEvent(wModeEvent.getSelection()); + meta.setUserEvent(wUserEvent.getSelection()); + meta.setSysEvent(wSysEvent.getSelection()); + meta.setAlarmEvent(wAlarmEvent.getSelection()); } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java index 207adb78245..10de092241d 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEventMeta.java @@ -49,7 +49,7 @@ categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xevent:Plc4x.Category.plc4x", documentationUrl = "https://plc4x.apache.org/users/integrations/apache-hop.html" ) -public class Plc4xEventMeta extends BaseTransformMeta implements ITransformMeta { +public class Plc4xEventMeta extends BaseTransformMeta { private static final Class PKG = Plc4xEventMeta.class; // Needed by Translator @@ -70,23 +70,23 @@ public class Plc4xEventMeta extends BaseTransformMeta implements ITransformMeta private boolean neverEnding; @HopMetadataProperty( - key = "never_ending", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + key = "mode_event", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.ModeEvent") private boolean modeEvent; @HopMetadataProperty( - key = "never_ending", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + key = "user_event", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.UserEvent") private boolean userEvent; @HopMetadataProperty( - key = "never_ending", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + key = "sys_event", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.SysEvent") private boolean sysEvent; @HopMetadataProperty( - key = "never_ending", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + key = "alarm_event", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.AlarmEvent") private boolean alarmEvent; @@ -205,7 +205,7 @@ public void setNeverEnding(boolean neverEnding) { } public boolean isModeEvent() { - return neverEnding; + return modeEvent; } public void setModeEvent(boolean modeEvent) { @@ -213,7 +213,7 @@ public void setModeEvent(boolean modeEvent) { } public boolean isUserEvent() { - return neverEnding; + return userEvent; } public void setUserEvent(boolean userEvent) { diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java index 7b1832c16d1..5e9302da020 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java @@ -50,7 +50,7 @@ import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; -import org.apache.plc4x.hop.transforms.util.Plc4xPlcField; +import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; @@ -61,7 +61,7 @@ * Transform That contains the basic skeleton needed to create your own plugin * */ -public class Plc4xRead extends BaseTransform implements ITransform { +public class Plc4xRead extends BaseTransform { private static final Class PKG = Plc4xRead.class; // Needed by Translator @@ -75,7 +75,7 @@ public class Plc4xRead extends BaseTransform imple private static final String dummy = "dummy"; private Map index = new HashMap(); - private Map plcfields = new HashMap(); + private Map plcfields = new HashMap(); public Plc4xRead(TransformMeta transformMeta, Plc4xReadMeta meta, Plc4xReadData data, int copyNr, PipelineMeta pipelineMeta, Pipeline pipeline ) { @@ -89,8 +89,10 @@ public Plc4xRead(TransformMeta transformMeta, Plc4xReadMeta meta, Plc4xReadData * @param remarks Error registers * @param origin transform instance name */ - public static final RowMetaAndData buildRow( - Plc4xReadMeta meta, List remarks, String origin) throws HopPluginException { + public static final RowMetaAndData buildRow(Plc4xReadMeta meta, + List remarks, + String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); int index = 0; @@ -108,7 +110,7 @@ public static final RowMetaAndData buildRow( for (Plc4xGeneratorField field : meta.getFields()) { int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); if (StringUtils.isNotEmpty(field.getType())) { - System.out.println("typeString: " + typeString); + IValueMeta valueMeta = ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a // value! @@ -146,7 +148,7 @@ public static final RowMetaAndData buildRow( // try { System.out.println("stringValue: " + stringValue); - rowData[index] = valueMeta.convertData(stringMeta, stringValue); + rowData[index] = valueMeta.convertData(stringMeta, stringValue); } catch (HopValueException e) { switch (valueMeta.getType()) { case IValueMeta.TYPE_NUMBER: @@ -226,7 +228,6 @@ public static final RowMetaAndData buildRow( index++; } } - return new RowMetaAndData(rowMeta, rowData); } @@ -238,17 +239,18 @@ public static final RowMetaAndData buildRow( * 4. Register the connection wrapper for global access. * 5. If the connection to the PLC is made, then it creates the query * and executes it. - * + * TODO: Field validation. */ @Override public boolean processRow() throws HopException { + Object[] r = getRow(); // Get row from input rowset & set row busy! setLogLevel(LogLevel.DEBUG); if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { setOutputDone(); // signal end to receiver(s) return false; - } + } if (first) { index.clear(); @@ -256,7 +258,7 @@ public boolean processRow() throws HopException { //This performs a minimal check on the user item. //It guarantees that the rates are within those managed by Plc4x. meta.getFields().forEach((f) ->{ - plcfields.put(f.getName(),Plc4xPlcField.of(f.getItem())); + plcfields.put(f.getName(),Plc4xPlcTag.of(f.getItem())); }); first = false; } @@ -282,10 +284,12 @@ public boolean processRow() throws HopException { readRequest = null; try{ PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + if (conn.isConnected()) { connwrapper = new Plc4xWrapperConnection(conn); getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) } + } catch (Exception ex){ setErrors(1L); logError("Unable to create connection to PLC. " + ex.getMessage()); @@ -342,7 +346,7 @@ public boolean processRow() throws HopException { } r = data.outputRowMeta.cloneRow(data.outputRowData); - logBasic("Tamano de los datos: " + r.length); + data.prevDate = data.rowDate; data.rowDate = new Date(); int index = 0; diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java index a736e418da0..96a47e5f166 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java @@ -148,7 +148,7 @@ public String open() { try { wConnection.fillItems(); } catch (Exception e) { - new ErrorDialog(shell, "Error", "Error listing Cassandra connection metadata objects", e); + new ErrorDialog(shell, "Error", "Error listing Plc4x connection metadata objects", e); } Control lastControl = wConnection; diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java index 3946c9a310b..c43178958ac 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java @@ -50,7 +50,7 @@ categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xinput:Plc4x.Category.plc4x", documentationUrl = "https://plc4x.apache.org/users/integrations/apache-calcite.html" ) -public class Plc4xReadMeta extends BaseTransformMeta implements ITransformMeta { +public class Plc4xReadMeta extends BaseTransformMeta { private static final Class PKG = Plc4xReadMeta.class; // Needed by Translator @@ -121,39 +121,33 @@ public Plc4xReadMeta(Plc4xReadMeta m) { } } - @Override public Plc4xReadMeta clone() { return new Plc4xReadMeta(this); } - @Override public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { try { - logBasic("PASO 1"); List remarks = new ArrayList<>(); RowMetaAndData rowMetaAndData = Plc4xRead.buildRow(this, remarks, name); - logBasic("PASO 2"); - if (!remarks.isEmpty()) { - logBasic("PASO 3"); - StringBuilder stringRemarks = new StringBuilder(); - for (ICheckResult remark : remarks) { - logBasic("PASO 3x: " + remark.toString()); - stringRemarks.append(remark.toString()).append(Const.CR); + + if (!remarks.isEmpty()) { + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + stringRemarks.append(remark.toString()).append(Const.CR); + } + throw new HopTransformException(stringRemarks.toString()); } - logBasic("PASO 3.1"); - throw new HopTransformException(stringRemarks.toString()); - } - logBasic("PASO 4"); - for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { - valueMeta.setOrigin(name); - } - logBasic("PASO 5"); - inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); + } + + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); } catch (Exception e) { - throw new HopTransformException(e); + throw new HopTransformException(e); } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java index 2381564a755..508831b0a5a 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java @@ -49,7 +49,7 @@ import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; -import org.apache.plc4x.hop.transforms.util.Plc4xPlcField; +import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; @@ -60,7 +60,7 @@ * Transform That contains the basic skeleton needed to create your own plugin * */ -public class Plc4xWrite extends BaseTransform implements ITransform { +public class Plc4xWrite extends BaseTransform { private static final Class PKG = Plc4xWrite.class; // Needed by Translator @@ -75,7 +75,7 @@ public class Plc4xWrite extends BaseTransform im private static final String dummy = "dummy"; private Map index = new HashMap(); - private Map plcfields = new HashMap(); + private Map plcfields = new HashMap(); public Plc4xWrite(TransformMeta transformMeta, Plc4xWriteMeta meta, Plc4xWriteData data, int copyNr, PipelineMeta pipelineMeta, Pipeline pipeline ) { @@ -108,7 +108,6 @@ public static final RowMetaAndData buildRow( for (Plc4xGeneratorField field : meta.getFields()) { int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); if (StringUtils.isNotEmpty(field.getType())) { - System.out.println("typeString: " + typeString); IValueMeta valueMeta = ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a // value! @@ -145,7 +144,6 @@ public static final RowMetaAndData buildRow( // Convert the data from String to the specified type ... // try { - System.out.println("stringValue: " + stringValue); rowData[index] = valueMeta.convertData(stringMeta, stringValue); } catch (HopValueException e) { switch (valueMeta.getType()) { @@ -261,7 +259,7 @@ public boolean processRow() throws HopException { Integer i = getInputRowMeta().indexOfValue(f.getName()); //(01) if (i>=0) { index.put(f.getName(), i); - plcfields.put(f.getName(),Plc4xPlcField.of(f.getItem())); + plcfields.put(f.getName(),Plc4xPlcTag.of(f.getItem())); } }); first = false; @@ -309,14 +307,15 @@ public boolean processRow() throws HopException { } finally { lock.unlock(); } - + if ((connmeta != null) && (connwrapper != null)){ if (connwrapper.getConnection().isConnected()){ - + builder = null; builder = connwrapper.getConnection().writeRequestBuilder(); //(05) Integer i; for (Plc4xGeneratorField field: meta.getFields()){ + i = index.get(field.getName()); if (i != null) { //From Input Type @@ -329,7 +328,7 @@ public boolean processRow() throws HopException { case IValueMeta.TYPE_BIGNUMBER: builder.addTagAddress(field.getName(), field.getItem(), - r[i]); + r[i]); break; case IValueMeta.TYPE_DATE: builder.addTagAddress(field.getName(), @@ -369,13 +368,14 @@ public boolean processRow() throws HopException { maxwait = (maxwait<100)?100:maxwait; writeResponse = writeRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); + if (isDebug()) index.forEach((n,y)->{ - System.out.println("Resultado: " + writeResponse.getResponseCode(n)); + logDebug("Result: " + writeResponse.getResponseCode(n)); }); } catch (Exception ex) { setErrors(1L); - logError("Unable read from PLC. " + ex.getMessage()); + logError("Unable write to PLC. " + ex.getMessage()); } } else { diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java index d3996ad4a93..d9461f6d07c 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java @@ -54,7 +54,7 @@ categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xoutput:Plc4x.Category.plc4x", documentationUrl = "https://plc4x.apache.org/users/integrations/apache-calcite.html" ) -public class Plc4xWriteMeta extends BaseTransformMeta implements ITransformMeta { +public class Plc4xWriteMeta extends BaseTransformMeta { private static final Class PKG = Plc4xWriteMeta.class; // Needed by Translator @@ -130,34 +130,28 @@ public Plc4xWriteMeta clone() { return new Plc4xWriteMeta(this); } - - + @Override public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { try { - logBasic("PASO 1"); List remarks = new ArrayList<>(); RowMetaAndData rowMetaAndData = Plc4xWrite.buildRow(this, remarks, name); - logBasic("PASO 2"); - if (!remarks.isEmpty()) { - logBasic("PASO 3"); - StringBuilder stringRemarks = new StringBuilder(); - for (ICheckResult remark : remarks) { - logBasic("PASO 3x: " + remark.toString()); - stringRemarks.append(remark.toString()).append(Const.CR); + + if (!remarks.isEmpty()) { + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + stringRemarks.append(remark.toString()).append(Const.CR); + } + throw new HopTransformException(stringRemarks.toString()); + } + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); } - logBasic("PASO 3.1"); - throw new HopTransformException(stringRemarks.toString()); - } - logBasic("PASO 4"); - for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { - valueMeta.setOrigin(name); - } - logBasic("PASO 5"); - inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); } catch (Exception e) { - throw new HopTransformException(e); + throw new HopTransformException(e); } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java index 51c6c9d5366..67003bf3b5e 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java @@ -17,13 +17,16 @@ package org.apache.plc4x.hop.transforms.plc4xsubs; +import java.time.Duration; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Consumer; import org.apache.commons.lang3.StringUtils; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; @@ -50,32 +53,40 @@ import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; -import org.apache.plc4x.hop.transforms.util.Plc4xPlcField; +import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; +import org.apache.plc4x.hop.transforms.util.Plc4xPlcSubscriptionTag; import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; +import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent; +import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; +import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; +import org.apache.plc4x.java.s7.events.S7Event; /** * Transform That contains the basic skeleton needed to create your own plugin * */ -public class Plc4xSubs extends BaseTransform implements ITransform { +public class Plc4xSubs extends BaseTransform { private static final Class PKG = Plc4xSubs.class; // Needed by Translator private Plc4xConnection connmeta = null; private Plc4xWrapperConnection connwrapper = null; - private PlcReadRequest readRequest = null; - private PlcReadResponse readResponse = null; + private PlcSubscriptionRequest subsRequest = null; + private PlcSubscriptionResponse subsResponse = null; private int maxwait = 0; private static final ReentrantLock lock = new ReentrantLock(); + private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); + private boolean stopBundle = false; + private static final String dummy = "dummy"; private Map index = new HashMap(); - private Map plcfields = new HashMap(); + private Map plctags = new HashMap(); public Plc4xSubs(TransformMeta transformMeta, Plc4xSubsMeta meta, Plc4xSubsData data, int copyNr, PipelineMeta pipelineMeta, Pipeline pipeline ) { @@ -108,7 +119,7 @@ public static final RowMetaAndData buildRow( for (Plc4xGeneratorField field : meta.getFields()) { int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); if (StringUtils.isNotEmpty(field.getType())) { - System.out.println("typeString: " + typeString); + IValueMeta valueMeta = ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a // value! @@ -145,7 +156,7 @@ public static final RowMetaAndData buildRow( // Convert the data from String to the specified type ... // try { - System.out.println("stringValue: " + stringValue); + rowData[index] = valueMeta.convertData(stringMeta, stringValue); } catch (HopValueException e) { switch (valueMeta.getType()) { @@ -252,11 +263,11 @@ public boolean processRow() throws HopException { if (first) { index.clear(); - plcfields.clear(); + plctags.clear(); //This performs a minimal check on the user item. //It guarantees that the rates are within those managed by Plc4x. meta.getFields().forEach((f) ->{ - plcfields.put(f.getName(),Plc4xPlcField.of(f.getItem())); + plctags.put(f.getName(),Plc4xPlcSubscriptionTag.of(f.getItem())); }); first = false; } @@ -266,6 +277,7 @@ public boolean processRow() throws HopException { IHopMetadataProvider metaprovider = getMetadataProvider(); connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); if (connwrapper == null) { + System.out.println("PASO 02"); connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) if (connwrapper != null) connwrapper.retain(); }; @@ -279,7 +291,7 @@ public boolean processRow() throws HopException { } if ((connmeta != null) && (connwrapper == null)){ - readRequest = null; + subsRequest = null; try{ PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) if (conn.isConnected()) { @@ -297,24 +309,28 @@ public boolean processRow() throws HopException { if ((connmeta != null) && (connwrapper != null)){ if (connwrapper.getConnection().isConnected()){ - if (readRequest == null){ - PlcReadRequest.Builder builder = connwrapper.getConnection().readRequestBuilder(); //(05) + if (subsRequest == null){ + PlcSubscriptionRequest.Builder builder = connwrapper.getConnection().subscriptionRequestBuilder(); //(05) for (Plc4xGeneratorField field: meta.getFields()){ - builder.addTagAddress(field.getName(), field.getItem()); + System.out.println(field.getName() + " : " + field.getItem().toString()); + builder.addCyclicTagAddress(field.getName(), field.getItem().toString(), Duration.ofMillis(1000)); } - readRequest = builder.build(); + System.out.println("PASO: 05"); + subsRequest = builder.build(); } try { maxwait = Integer.parseInt(meta.getMaxwaitInMs()); - maxwait = (maxwait<100)?100:maxwait; - readResponse = readRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); - - for (Plc4xGeneratorField field: meta.getFields()){ - field.setValue(readResponse.getString(field.getName())); - } + maxwait = (maxwait<1000)?1000:maxwait; + System.out.println("PASO: 06"); + subsResponse = subsRequest.execute().get(); + System.out.println("PASO: 07"); + //Only for Siemens S7 + subsResponse.getSubscriptionHandles().forEach(a -> a.register(e -> events.add(e))); + System.out.println("PASO: 08"); } catch (Exception ex) { setErrors(1L); logError("Unable read from PLC. " + ex.getMessage()); + ex.printStackTrace(); } } else { @@ -332,17 +348,23 @@ public boolean processRow() throws HopException { } // - int interval = Integer.parseInt(meta.getIntervalInMs()); + while (events.size() == 0) { + try { + Thread.sleep(100); + if (stopBundle) { + setOutputDone(); // signal end to receiver(s) + return false; + } + } catch (InterruptedException ex) { + break; + } + } - try { - Thread.sleep(interval); - } catch (InterruptedException ex) { - setErrors(1L); - logError(ex.getMessage()); - } + PlcSubscriptionEvent s7event = events.poll(); + System.out.println("Ejecuto el consumidor en el cliente..." + s7event.getTagNames()); r = data.outputRowMeta.cloneRow(data.outputRowData); - logBasic("Tamano de los datos: " + r.length); + data.prevDate = data.rowDate; data.rowDate = new Date(); int index = 0; @@ -435,12 +457,16 @@ public void dispose() { getPipeline().getExtensionDataMap().remove(meta.getConnection()); } connwrapper = null; - readRequest = null; - + subsRequest = null; } } - + + @Override + public void stopRunning() throws HopException { + super.stopRunning(); + stopBundle = true; + } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java index 35f15665bdb..12943301d71 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubsMeta.java @@ -54,7 +54,7 @@ categoryDescription = "i18n:org.apache.plc4x.hop.transforms.plc4xinput:Plc4x.Category.plc4x", documentationUrl = "https://plc4x.apache.org/users/integrations/apache-calcite.html" ) -public class Plc4xSubsMeta extends BaseTransformMeta implements ITransformMeta { +public class Plc4xSubsMeta extends BaseTransformMeta{ private static final Class PKG = Plc4xSubsMeta.class; // Needed by Translator @@ -136,28 +136,24 @@ public Plc4xSubsMeta clone() { public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { try { - logBasic("PASO 1"); List remarks = new ArrayList<>(); RowMetaAndData rowMetaAndData = Plc4xSubs.buildRow(this, remarks, name); - logBasic("PASO 2"); - if (!remarks.isEmpty()) { - logBasic("PASO 3"); - StringBuilder stringRemarks = new StringBuilder(); - for (ICheckResult remark : remarks) { - logBasic("PASO 3x: " + remark.toString()); - stringRemarks.append(remark.toString()).append(Const.CR); + + if (!remarks.isEmpty()) { + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + stringRemarks.append(remark.toString()).append(Const.CR); + } + throw new HopTransformException(stringRemarks.toString()); + } + + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); } - logBasic("PASO 3.1"); - throw new HopTransformException(stringRemarks.toString()); - } - logBasic("PASO 4"); - for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { - valueMeta.setOrigin(name); - } - logBasic("PASO 5"); - inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); } catch (Exception e) { - throw new HopTransformException(e); + throw new HopTransformException(e); } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcSubscriptionTag.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcSubscriptionTag.java new file mode 100644 index 00000000000..2a261a39062 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcSubscriptionTag.java @@ -0,0 +1,160 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.transforms.util; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.time.Duration; +import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException; +import org.apache.plc4x.java.api.model.PlcSubscriptionTag; +import org.apache.plc4x.java.spi.generation.SerializationException; +import org.apache.plc4x.java.spi.generation.WriteBuffer; +import org.apache.plc4x.java.spi.utils.Serializable; + +import java.util.Objects; +import java.util.Optional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.plc4x.java.api.model.PlcTag; +import org.apache.plc4x.java.api.types.PlcSubscriptionType; + +/* +* Code taken from the Modbus driver implementation. +* This allows me to make the correct interpretation of the "Hop" values +* towards the writing fields. +* +* TODO: The HOP interpreter generates an error when processing +* the "Integer" fields. +*/ + +public class Plc4xPlcSubscriptionTag implements PlcTag, Serializable { + + public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?
[\\%a-zA-Z_\\.0-9]+)(:(?[a-zA-Z_]+))?(\\[(?\\d+)])?"); + + protected static final int PROTOCOL_ADDRESS_OFFSET = 1; + + private final String address; + + private final int quantity; + + private final Plc4xDataType dataType; + + public static Plc4xPlcSubscriptionTag of(String addressString) { + if (Plc4xPlcSubscriptionTag.matches(addressString)) { + Matcher matcher = ADDRESS_PATTERN.matcher(addressString); + + matcher.matches(); + + String address = matcher.group("address"); + + String quantityString = matcher.group("quantity"); + int quantity = quantityString != null ? Integer.parseInt(quantityString) : 1; + + Plc4xDataType dataType = (matcher.group("datatype") != null) ? Plc4xDataType.valueOf(matcher.group("datatype")) : Plc4xDataType.BOOL; + + + return new Plc4xPlcSubscriptionTag(address, quantity, dataType); + } + + throw new PlcInvalidTagException("Unable to parse address: " + addressString); + } + + protected Plc4xPlcSubscriptionTag(String address, Integer quantity, Plc4xDataType dataType) { + this.address = address; + + this.quantity = quantity != null ? quantity : 1; + + this.dataType = dataType != null ? dataType : Plc4xDataType.INT; + } + + public static boolean matches(String addressString) { + return ADDRESS_PATTERN.matcher(addressString).matches(); + } + + public String getAddress() { + return address; + } + + public int getNumberOfElements() { + return quantity; + } + + public int getLengthBytes() { + return quantity * dataType.getDataTypeSize(); + } + + @JsonIgnore + public int getLengthWords() { + return (int) ((quantity * (float) dataType.getDataTypeSize()) / 2.0f); + } + + public Plc4xDataType getDataType() { + return dataType; + } + + public String getPlcDataType() { + return dataType.name(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Plc4xPlcSubscriptionTag)) { + return false; + } + Plc4xPlcSubscriptionTag that = (Plc4xPlcSubscriptionTag) o; + return address == that.address; + } + + @Override + public int hashCode() { + return Objects.hash(address); + } + + @Override + public String toString() { + return "Plc4xPlcSubscriptionField{" + + " address=" + address + + " datatype=" + dataType + + " quantity=" + quantity + + " }"; + } + + @Override + public void serialize(WriteBuffer wb) throws SerializationException { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public String getAddressString() { + throw new UnsupportedOperationException("Not supported yet."); + } + +// @Override +// public PlcSubscriptionType getPlcSubscriptionType() { +// throw new UnsupportedOperationException("Not supported yet."); +// } +// +// @Override +// public Optional getDuration() { +// throw new UnsupportedOperationException("Not supported yet."); +// } + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcTag.java similarity index 85% rename from plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java rename to plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcTag.java index 295dc9f1765..d89cbfabc73 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcTag.java @@ -21,12 +21,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException; import org.apache.plc4x.java.api.model.PlcTag; -import org.apache.plc4x.java.spi.generation.ParseException; import org.apache.plc4x.java.spi.generation.SerializationException; import org.apache.plc4x.java.spi.generation.WriteBuffer; import org.apache.plc4x.java.spi.utils.Serializable; -import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -40,7 +38,7 @@ * the "Integer" fields. */ -public class Plc4xPlcField implements PlcTag, Serializable { +public class Plc4xPlcTag implements PlcTag, Serializable { public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?
[\\%a-zA-Z_\\.0-9]+)(:(?[a-zA-Z_]+))?(\\[(?\\d+)])?"); @@ -52,8 +50,8 @@ public class Plc4xPlcField implements PlcTag, Serializable { private final Plc4xDataType dataType; - public static Plc4xPlcField of(String addressString) { - if (Plc4xPlcField.matches(addressString)) { + public static Plc4xPlcTag of(String addressString) { + if (Plc4xPlcTag.matches(addressString)) { Matcher matcher = ADDRESS_PATTERN.matcher(addressString); matcher.matches(); @@ -66,13 +64,13 @@ public static Plc4xPlcField of(String addressString) { Plc4xDataType dataType = (matcher.group("datatype") != null) ? Plc4xDataType.valueOf(matcher.group("datatype")) : Plc4xDataType.BOOL; - return new Plc4xPlcField(address, quantity, dataType); + return new Plc4xPlcTag(address, quantity, dataType); } throw new PlcInvalidTagException("Unable to parse address: " + addressString); } - protected Plc4xPlcField(String address, Integer quantity, Plc4xDataType dataType) { + protected Plc4xPlcTag(String address, Integer quantity, Plc4xDataType dataType) { this.address = address; this.quantity = quantity != null ? quantity : 1; @@ -114,10 +112,10 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof Plc4xPlcField)) { + if (!(o instanceof Plc4xPlcTag)) { return false; } - Plc4xPlcField that = (Plc4xPlcField) o; + Plc4xPlcTag that = (Plc4xPlcTag) o; return address == that.address; } @@ -137,12 +135,12 @@ public String toString() { @Override public void serialize(WriteBuffer wb) throws SerializationException { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public String getAddressString() { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + throw new UnsupportedOperationException("Not supported yet."); } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties index b6bc8d9f8d5..70a5e66f92e 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/resources/org/apache/plc4x/hop/transforms/plc4xevent/messages/messages_en_US.properties @@ -21,7 +21,7 @@ Plc4x.Read.Description=Plc4x Event Transform Description Plc4x.Read.Shell.Title=Plc4x Event Transform Title Plc4x.Read.TransformName.Label=Plc4x Event Sample Name -Plc4x.Read.Meta.Injection.NeverEnding=Connection +Plc4x.Read.Meta.Injection.Connection=Connection Plc4x.Read.Meta.Injection.NeverEnding=Nerverending Plc4x.Read.Meta.Injection.MaxwaitInMs=MaxwaitIn Plc4x.Read.Meta.Injection.IntervalInMs=IntervalIn @@ -30,6 +30,11 @@ Plc4x.Read.Meta.Injection.LastTimeField=LastTimeField Plc4x.Read.Meta.Injection.RowLimit=RowLimit Plc4x.Read.Meta.Injection.Fields=Fields +Plc4x.Read.Meta.Injection.ModeEvent=ModeEvent +Plc4x.Read.Meta.Injection.UserEvent=UserEvent +Plc4x.Read.Meta.Injection.SysEvent=SysEvent +Plc4x.Read.Meta.Injection.AlarmEvent=AlarmEvent + Plc4x.Read.Meta.Injection.Field.Name=Name Plc4x.Read.Meta.Injection.Field.Item=Item Plc4x.Read.Meta.Injection.Field.Type=Type @@ -47,6 +52,13 @@ Plc4x.Read.Meta.Dialog.Settings.Title=Dialog Plc4x.Read.Meta.Dialog.DialogTitle=Plc4x Read transformer Plc4x.Read.Meta.Dialog.Limit.Label=Limit Plc4x.Read.Meta.Dialog.NeverEnding.Label=Never ending + +Plc4x.Read.Meta.Dialog.ModeEvent.Label=Mode event +Plc4x.Read.Meta.Dialog.UserEvent.Label=User event +Plc4x.Read.Meta.Dialog.SysEvent.Label=Sys event +Plc4x.Read.Meta.Dialog.UserEvent.Label=User event +Plc4x.Read.Meta.Dialog.AlarmEvent.Label=Alarm event + Plc4x.Read.Meta.Dialog.Maxwait.Label=Max waiting Plc4x.Read.Meta.Dialog.Interval.Label=Interval Plc4x.Read.Meta.Dialog.RowTimeField.Label=Time diff --git a/pom.xml b/pom.xml index 4e114e4089c..324c0f7ded2 100644 --- a/pom.xml +++ b/pom.xml @@ -818,6 +818,8 @@ **/hs_err_pid* **/replay_pid* + + **/*.svg diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc index 5ecb4db6614..cbed626f264 100644 --- a/src/site/asciidoc/index.adoc +++ b/src/site/asciidoc/index.adoc @@ -165,6 +165,20 @@ +
+
+
+
+ Card image cap +
+
+
Apache Hop
+
+
+
+
+
+
+
+
+ Card image cap +
+
+
Apache Hop™
+
+
+
+
@QQAS!^1^DyR?Ey_uzr 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 literal 0 HcmV?d00001 diff --git a/src/site/resources/images/icons/s7_caution.png b/src/site/resources/images/icons/s7_caution.png new file mode 100644 index 0000000000000000000000000000000000000000..02a2eba4a03f464a7d919e33086ff327b4cca8ce GIT binary patch literal 18944 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 literal 0 HcmV?d00001 diff --git a/src/site/resources/images/icons/s7_dont.png b/src/site/resources/images/icons/s7_dont.png new file mode 100644 index 0000000000000000000000000000000000000000..21947a27c2c8ce61fb13198187d01ab9e1754dd7 GIT binary patch literal 20067 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 z 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 literal 0 HcmV?d00001 diff --git a/src/site/resources/images/icons/s7_important.png b/src/site/resources/images/icons/s7_important.png new file mode 100644 index 0000000000000000000000000000000000000000..d5c189056e85cbbd5dad17876ad1678e0671a530 GIT binary patch literal 19667 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

^^5PyE~`hx+Yj=I`uvXk`BUN|r3eXRHE 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 literal 0 HcmV?d00001 diff --git a/src/site/resources/images/icons/s7_tip.png b/src/site/resources/images/icons/s7_tip.png new file mode 100644 index 0000000000000000000000000000000000000000..035093da237c9acf6bc8e6bbf73dcbadc88b701c GIT binary patch literal 20231 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 LNkvXXu0mjfj@zZ# literal 0 HcmV?d00001 diff --git a/src/site/resources/images/icons/s7_toddy.png b/src/site/resources/images/icons/s7_toddy.png new file mode 100644 index 0000000000000000000000000000000000000000..0f0cb53cc05004ac2a4ba2f80348d2dab4abf3f3 GIT binary patch literal 20356 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 literal 0 HcmV?d00001 diff --git a/src/site/resources/images/icons/s7_warning.png b/src/site/resources/images/icons/s7_warning.png new file mode 100644 index 0000000000000000000000000000000000000000..29f0ad240d22e366aee7196dfaf74e773033a7c4 GIT binary patch literal 19172 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

@E&An3SccA9Pb_PTal*||!q<=n|k$aU~ z)`KI~R9>{!e#60}WX;q;Tg4>Pb*5-Jv^(qMlObn9-e+D7+eIXTGTio4`l3;MAOS}x zILp4h&KLGH7_rsw=Tvk~)ns?C95u)_hdW zV<`QuF3(bNL2OfA`a{pAqT=eu8vsaSw4#1V?;z9GZDNJL^=II>uvaF1@nb{z@4-vE zAI?+X7NuIHx;8F;G%^W%#Z*CEPZ##Lk)%Ax+-IF-}GW6!^x85lpw(> zUXK5bG7(kqTY>DD`=QJ;73rjwC+%;F5k}`fo~ly0kFVPw8Eh3mAjg3$R!vp= zoO=)d`D0sx#mB4Vo2)V;foKFw{x0`-n)~GrMVR+{=2BuQH9s1*0=^?akm{D2j~ZLb z1-&XRmK1NBQ?)aprYM)@1jRfV2z+E*N&*8Vkk)p*qz>=M{FeHwB6g=&&L{ke7!_!} zU%^APLFbKG95U$^q1F6rFNIiH{d=?Q58DyWgWI~qEdk3|>d29h?*^d(RU?t8tvo8}%H&)ud@%3YjN zS0Fehh&!BBc;Bey1&eNSdH?ZozH2=86**5Ka0nG`x9!~&E#^cJ0R*FPTIa*+;igBv za-DddnUBdZO+^ane&TlTm6Q^0$-Ex&<>@hI$|6HGse16XH$%@4-=!31qG9-YM&n!* zyN>D4UWHkBm+4-pVOiPxbHd`OVR-^r%=#5ChBDs$2uocZl3Ty`p>a?8qAxczPu~N}HN%6Hb-8;;y>&2gh9=+FG z^dD-7RilShZ(}yDj0c0|pDBIKI8qGb1?%0Jq03{ESNl1&56lKF zaAKfq&tv#AQ@=LcM@XOx=*&S@rU+k|t(`Et#YeApbe)t+uQ#37 z#&s)qdy!82zf53#tO%)7-Ufjcn0NStZ@nU+PB2{$!=Hm%MMyKP#ZGJnb=0mw{Bg!B zhV_ooLTG1bP$4I+&i0aBhxT02Eo5BXk|;YKZnS=}mKnBBOhV{I9Z5pk{N_&6^04t5 zI;f)J!!Ek%N$|E8GgAL` z92cKWT^Ax%XxjjLDAL4P@W9Jb$jx%mjX-Rp{g({h^17PS$mMgaBnS9F_73k){HTboNvHF(Y*A4Xr-TZw;d;wmEzt7WS z8Fa3R{VmOwcCXTF% z4GmUl0+|kdX>%}UG2mY~Xw|8#L(L;u-lx5ea-j`8utPek5f%Bek#&(tj)afzoz|zZ zSXc{pNJjj&Zim~Q`LTO;aQjDil>}$EY^jG z8tICbDjW|oiU51FVJ7@>*$9a|C@ZNh--r$+7>sg=fK(iRv|wE^!%11%?erF=0(U|p zmH=f*b5GDVFA${#Z8;ApE3rS5xgs4EH@MA(b@mPrzp&f7)Dzvg1u714wYBe0d${5@vz;m0*rSUc4~8I3$$h61kH9q;JrF|o-h zFJ1)YP$gW}H%}v9yCuZe`U+!Yb4OuyVu|OX&fvTeQHT@RliSrfQ{2 zloq+V;#X%ml9U$VX}GWYtEi~PX~@Ms%2rNAUyMu9`{T%bo=y&z$wCMdbog2n0>%*>7Cg^4PzwT>N-m&%b<;#{8`pFRY~LY-!;^%qU!iIB8|KgD1l`(n%PHz|IB!Ym`c_hDOdSFcY< zeIWr89AV4b#55JcL_+^vCL3m*N0Gj4nA{v7NLKFMT{geo*pt8EAQo^*K9S`J3&p@d z*3pK#$;jj17-9tS%~4^#i4%QamX#R&`7n5z{!aFNzFe5(oLdT-ow7JqsecT1+-x?oM}+VrjUSBB!@ZGZ*%Zj>J6hc-|=*vWPt! zG6kKi0F?+^Ri*^5b!@Gs0IzRz-D0Oq&D~dEtF++cj7CyiB6DrgOcYfDFut7ansk0^ zww5<>v>Wf)o}Yi)t7xaJagE>zz8>J?9q>*f;16mLyBQK=k8~l2lf5K0ZsRmL5C8kL0 zYMwj=wPDg1BC9bVLON>e>0p z;iXx0T!>CZ#Uht{*If>XWZx5i-I!(IOzO=$xI;sVJ%T6=MVg+DHoPyXE|l+xYseZi zl;lxI&SL!tIuV7{tBh-(<68^qG$tBT#=On`QcN3SlOI=XxxL%)V?2p~u4^CDShK_Z z_4SJrIPPj#lJ5ow&Ak8~9<1{eyKbsV)4&uyxnCgc*_QWkaM?C2sg?~sM8gupgDBoc_xwiIO=+B_7muD4%m+3Yh(MO%!-b zip^}Ecxi{W8S<3w=voz7C?_Xe5sVK_mt3!Fq|6=uRd76&jo=#XB@rMVzhF4xbR<*O zd`6F_ic|_a7c!ysT6so(x%Wu&63`G{3qkrcG;_ebJBxqV)9~YK_p1!DHqm4X!h{@` z5F%0d#LEfsE0|f_;)-co8DpgvlW%vVXHXh7<+>>iN#4nKijJYLEr^sISiWl?daZg2 z#pvd^*g0YY_3`M@f@;K-)B9sGTx>)?0iv=GJRikird8d_JExv>`ZnS1OyqEaQHF6Y zKdcfhRGx?D8TRb0HQ0*?DJo2;Qt7Bc7plY1p+NuY9dlj?3On2`IsVBPwuP7~a|{Mk zj?;}={~W|Z2W)!;LPr6gwwm#JBzvOXgvtI`RR$y#N-3pB>OoW9kAZuX?zTphIQDW8 zwyfQq)ORN!0mIPKA%t4kIDwuY#nkN9K^L!aZh&7dHRy9yIZhK5mXNlO6o><;%grLb z;A;W#ceCKd(no6@1er%Ihv=~1Zmb<;jw?3bRazQIAwVFwvljPZ6-vjL6F-;N?c%&- z8Et74cH0jTEU`55uv+m}V_U^uf$*Yt`;9OgU@5~d={C~+319Kownmd^C?EGyVcPU@ z`;(~socp3AzJT05do*B~|JD;jUie9D}cuq3?v{TV+bI?fi^{X(oiV0H3z zYa+zga@kfRCV;uWkVLnf)IP|-Xwg7RS~`JR354nL!7UW|S9z70j6)$(nG-1^Bdf>Q zg|?J|xQ~lwrx)%cfsPyn{rYRz1cZ-6T4rKOzv9V7?OTICZZNiADW0ys#62v7R&>ZZ z;utV@lp@mS$jG;%R*KJ1$JOGoZ5`DR(Wly+FBzM=Vh-aB(Kwao`n%x$ASPC8U>&NG zTTgH^<`xGm`^GK5w#(*%9s)Ywb$$|ckF7;%6!1Q=30jsiqa}p5LM=FES`$+MBO2!K zxV*^xDkeWWW`7F`v^`v@r00WNReEy~Gb@t+xbGuD-|slPaq?s)KlCbhIiXQQE#nbC zzX=jxqHxdnSQ$qA)0XPXxRucI6q^n0YJ3*dyHI<>O^ffN^DHkmLEjkS{-8oQmPI!; zRi}7V%Yr&+1e)r5U>J-!XPTwEbsm181N5z0riG$}3_5#r54zR6+-B=x~)$zfk}Z#C615W>ixZ}#KcQn9k#2B3h* zInO3y*9of_r#pm=^^^IBKRB|>Ha4c|S@~jp&a(DTDa_dBE6DYlQX;;1HOw*2S*kPz z6)4C)?r_M)fEK;s)X9y}w`>qIv|%F*)r&lzk@MPBIX$5(yP8t2j4W7W-{^>VM3KA6 zDHi~)W5r9$V`_jS7`I)kk<%gc^^v>cCdTTjn~G!KM3wH*PF1u^Q7^cC+C&B=8iA(nI6QIT%*APd&)l*nE75n0rnw! zND>}vt`=^Uo;Glr7l{c)>9S=>?FkmN?;LFvW5AytC%#9(^u1A~S4tqZ4+n^I_UBuF zpi-CGo-V^xo1`0oOQmQ}VNaQ&j8wtDq|jk<*DUd-Lhb#yXhbhO&)BEI{eJvfYq9!T z_Ja#75%T-+`}2XpgH$w%OKCp?MNu1LlDTr5_&mY+)iUlYlu70{8rQilX+Ja)nc&`> zl&o8S-*o+{j}KQNjb)91pEknB+V~EI6Vulusb!ZD3%$}iqP3}xG)V#vv9%?4F6~(1 zx|c(|&~S&+gAebELp+(~U|_@vJkr|*}oLsmPeGirsF^&F-AA1@oN6d0N?DVPvEqgPe{6K@?qd*rQ*WuH>)D z?MU!cMeC?}$z`s;f=uStwWXEj>uv;Z@8~*fL^%LWGTVP|U%{ zs)y^w9wU~NhKnKi9&u~{UA}OO^pKN`OJpn5>S zbUk*4k5y5!#q;H3I4Y24UD+$k-0mwbz33~ND^`PUPFjrfebwkru@_TyA(<*YmC9S9 zQ1dx!UB*Y*_S$oD|A77ZZdyus%SiDL9A$G6cq7}BCaAG+uIdpl%Mi?U#a_#P zlVAXFqvLW5oZwp^ekF1-n1Wg|#auASSPF4}1LodJw#I3R!?P-w zKB_#ge`Qag7SBVm2Vwob*ZjS8Pf>^)!F;0#%T>2B!{-$Fq8^4>J6MtffB5q4r_a}d zv`%yyjjt_>cPUEmXDerZnuTkD1Tx@{(S%Ar^bi=^jbASkyYxInA@+US>B_S#z^Y9Q zb{+U^t`Um|uSe{t&wT-es(Xoj$=ARmzSAm`A*Zi9jxj*s~< zrr?^{-0Jc@VS!}!%u@mDN}Gaj4)xq6j4DJ)rTRpJt@LvZ{}fQE4v)rZA1nLJOS+UA zvx|cKFw?z7^z9ci8nS5$q*TTzW5_ZJ?j{KV_m&Wn5oAhbcPmda2JLQ(Y2)Ow+TTB@%-2eb!2t-0cRZc?U?^_7Z z8wVM_@j|knMM?XOGzz8kzzbr16cVn}K_%h&TDeGg;uTY6!NZq0X&`C_)|epMo}SqL zvf!w?N{q@N@*Cjh{${~0CCx83hWhZc_2yS6$3n;7fZ}x{nsrvBs@$WpbU3CwO^gVJ z8#0(!Asmcc8rdHTa0LhFg?xNEqJA=;IQz#yJB>NJ>98j`SF6K$!;5)YGJgucO-$Mr zJmWu05hI}X``)^FPO_8m8D{c5aq5NO+e95^*P1W=<#r`~8hthGWon&quKbgpQFVG1 zbyq^Ss1oq@7O4lIu(&?TWOA{PATVP|uXu)5G%gNgNyXy^k*rISHB=vu-HAB|0k3uo z@hNz1HLZUbnU^6E;ALcYZ$^l82vhOS-v8CI+X39E2&}f=pph*MS9Sp}Snm)i+zyst zo=j;GmeoBVkj{X|T;_ZRH&SZ-@qH%);>8+_udRdQk#B}DfM}o56_%6~hKgpy@Y=(@ zx~<87vi|-aD6H?4;69sa|Gd@n2zlPp(NR(an>pIEnwUG9TCjT9L!Y;N002P|52%Tm zt%VD@sf889L5T9Ct&5TzVlG6f&8@_)1eLI`hRAw3S!j4EYnpl4n(>=ciU^|!dVrq+ z>@8eO$UW@s9Gt-(LX>}S!Oy>ci`gj2|ERdw3Q_7Psgg@LI$4l|SV64pEK(j2H%>}n z6mmf)b4#$gr1ak)p09)`tzBH8U^X^)cXw8IE>=e;D>e>(ettG~PBukIGZ^^pe_(c2lC&TCZ>+AE<%))&*S8OkIx>er1TGX2j{=B@XQCB zhY6I8gO#1l-k$AWEu3AX+@3-H7SR7_;jH<*GsdQF;q2(@WM(1dX5rvM^{)`-X8*8< zx;okYNyprb&BD&Y{#n)e*(=Atxs;JpQvHX;Zwjm+_Rv38&t(6brVGUKpJe@8Y`;hT zr1P(VJe&Um_usVtp8Fr=XDuZqu%x4z>+kU7B!wt{`v;plnnBFLe|}n+nV6V@%s?z4 zE^}TMkclN9iwTI+goT&e(v01b+l-x$&+K2IW4DzltIYaemhD{N3??>v;`}w|`yzbqm-*{tS_m|7lyWiP>LHoK4&;{^H=- z?yn&;YZC`6i|70MZw>W#IplvRmMO^8jE{qlmxY^`%bW#d%4^ES83#89FFzkQ zJ1>{TpEUk~?(Ask;%?$(A!hZQ>2o&E4fH1)a{511GW@%?yS2q{p4d6LSlFLGe3~2_ zU=A+ub33qup3jtQ|Mw|!@mQGfu=7~3@L54@;TihBPW~f)|4Y|@>H3ct_>YwT+g<;q>px=PKT`g0cm1!?h4RleorS~mgP!~I zip|fDJokCEhhVB8BMEr={m$tq{_re8hRW(X0{|GGe;>d>#}e~rA)o^z+CU$3xENpi3(r*JzCzpxsAb6(|}K8Nv^P_AZp zvg_pyAvFQ)FTEELdE)e7R1*0QTy5$Hi1xcdrWHIR%(%3-At1WnfMJBzm%3f7O#b zFpqdQ+zmKg0<*5cW*oIl%&?GT52Wh3Avbp^PXS{94%yCrx(xv;yos!^g6rAcMRAP# ziA^n2uQW~^Q`7F0VzAtt5Kjf!1@iVJy6K^4?7RgZmjf-b4m?=a4^9H$yS+AAioGkj zZshM-z40R#_0F6M*B1Thfor?F-^GC!9bk63s&L-*L)fbZyNBWblgwzz*)JC(Dn7uyVVA2Ko}f^~Ou#NJu5Vh0huus&Tl~FXrqIFiJUlMCnGChrq9} z>qfsC+m$Gy%-onqExvz+Z>vV2ixOV%b4^ST8yMkXYYDCp4k=2-S`?VceGc1Fn zG^(YTUs536fxsS0dr$d8f(u)CbEP-@tupm#Xie%MHg$16y|%d0>pIbFLEnHKP!IN@ zW;GHae>jjKs9(=Ha30oTeHA8EwYxvTSx9QP-$1xMF)m{~cKThZM(K=Y z7(wI}GrcQ+o@Ihe{y<&Y#tKmFX>!a*gTzu9a@ zxvnsW_?}&#z4QeKi+Aby*U#PA5(7~4pwSqBSAc&?at9>^79R>9c(XvI_2RqTFtOC4 z2M(V@Z8yoyTjb-Ol;QWBEcaa9jNN53mXkm)rO{sx)MoN+zT1w%w!Ecdl?H~CK(*HxqnXJZ=FdN#9XFq63t z)8_T^%23+}^mr@ZN8NP=^QP)KfCDc}TZQua%sZY5%!$Xrl0gcuN2U*)SPTdCHJgg z;CDPkN4jHw&U#3YphiqI-*)etW(gVX_-X-mkml{-D}laUJ6F+Ku6oEfw5O1byTT%i zk7dq)qSveg3)>(R_ZoIR-VKri+LW{yhc?-`bKB+tcb7|CQRYwn$R1HU;A^d549p-; zmQ$Hw?AfA`eZIW>giic$QM^!A7;RJ~znzNC(QH8boC{!38p|KMQ((E^^o*$We@ZxZ%V{>N?zy|ACwEX~$jl~~YEdMRPv@%uE<>l9WGPP5!|s9$UqS*W zM`|3-RysG%q&3~&0juOK_*d~pv$+ox7dNClI>An-Z<;MIxc zIj486%Q}{f=$qfnO>_E15@OA{R*@*Ih3MKYw?l-tz9pdD1vZVQh4`@CcS>4!S$ceB z!w!p88WqOocLcNEeyQ;ZB^=Xuy;iZk-)}<%UwNg!Q@Rhi_@tJ}>#IW{gM$NHn>MJV z>*>%*GcBII+6qNppcfna^_m==inT{5#T2BSJ{0R&`BPzf_>k#Pg!cUpsqyB7ql^NG zj3E<0U)Fsx*WPLHcg-F#c4mfYN~!~zy4UDwv;{8N)tWz1H95=q1tl7My0aU zw*-s!amjIN4>zrD1>zQy5`P#joCC+O6=afG*8#rES3oPdHWYk~6{uPN5t-cCh8oZ5 z_I~cm&$lzQ#j;y zyl>gLB+T#pg)YW<-+%f*9PL-Lc}2q-$I25ZUs-h_03I)>n7cb4(vfSbm@1u#jv!iy zdEFs=icZTQjRW#CKp)VK)>3{1GPJ;N6hlBhW>@PZXNy+AEb?NR z9)=oh`H@K?{@g!fD^-d{ZkM*cx16c{NZq_s9w);qwUs2;;#ul7S7sI-aK4zqbjlIM zO(Dy!s6}g?0a-k9bfFJUxcq z5;H+^Gl2l;ijPo}*!%46Sy{)j&4q7?>|-bjBEE6WTK?p02I9AV$c1?@9(kdH$4IYx zg;lVSR+#^Z?splPPLEcZHk%zSiL>cW8Hey>;BTb^cLqGYwiRBp37^^-isAy%>=VNc z4~iuK35sD>al#`h+o~U>D|ml=s@M`y9M_&s%{N*1Z-G(Kf455b#_m17Y2ZA9BVZ1R zthqB%exk^2;HeuP64ts9(WV`H&BjQ}xYsfv`>i`lzp-}zSW+zesZP7l6!?_y~)GD@zU>99mX_0cIm4m<09sIzqP4!cX7kXBsyY)q$iC3 zkhRauJFj8J;t|t^4$shO&GqGEgUZ^e8+FwlU%hwT#b`05I1w@O$~g(4Y7%-(sR!SY zyXnVLJnOrC`^%yk-$CJ~nVM(;j&t*B3Cx%e{mMqAN8AqznuZ<()hv!0R2)$#VqQ!U zvbL;rfYP9XI|d?~40BdqwCn34IjG1<%k8hg@o>+LC(mJ~W(|9Ug5YVar1d$*<>47F z&$Je=z{!1h>bkR_qUz!Sq=CJKVk=|CWn(F6>Y&J$TMG0g*$r|e8 z(<0A1ShoBl7?9*Qx~u7Yz}zI^*SkX;O4YQFJ0MQImdk z>Nw9#uWHQd`Ab@#hvok2++Sb7&dqnT)jWRFg3Gk{pj#fG?^Z{(Q3LA~^u>nbJc}*R z%Vt&L0^9MGj_%ftQv{IVLWfFGiR$>ZLK|=Y$_ZBu?L;jBun9@&PH5gUZ{Q3y)b{1I zlRQ*qAenMOYEMLoyNqiV2QCed+q-?K{;+s@F!UDIYPh?V%zP)=nTfyc^em^?#%V)$Qs2j3G}!sWvNCK?MJ=+A zX7jPyq^n^HPj?t4|6WOl&;Wljcm431GZA`0HPCP)QSS*3&)c<1uZ^gM9PQ$lF zpilgTe@CKd*MxIs_I&jbYOj^lI|j|_qnmozUs%9yo{~pzRWj>EZ7zU6(oN0|80X5H zIa8YzGjT96kiO}v?(l9i&+QR{eT#D{J?WZ} zR=K8aM7to$D(@E5nuH*4+5G}B3ELf22|qv2z2Q`Uhc)QY(hGUNVADLr*zCbQw`IsV z^Abz{31yRs&*5U_n|(B#@C;d;;;0{4&kvz~>v7Z49k8j^C-X(;*XwZ~Lwc&Nrf|`5 za4Us~IOAA2PMnbgSCcozZAICxS2}%X@NZ7dPN?X4V-p5NyT+aGomR`&>JMLpxfv|U zI)Zxz)-T& zzz~x-#QLi>4I-VE>o^!;xGmBke~Jbg>tAR+Zd%v06#$O5BR7yEtT2qe9{pUzXq3Qv(h&p6xQT{j~F)#QwFoKf$qXL|fP4~$djP~4fMzfZi(rKec z?t#xs82E>fL-DE0a0G|>G`80W8IOuUwP=rU$l?jCAO887^r-T>M%F>OIZA}hY_Q^} zaFp>u7Z-8Kwm*5erh{>$+-Ev=^P(ffjfrUO8Pt37oKpXNz)IHxz zbUcQ}{osgLldo1(U1BM`Qh#_$L8dPjH=-Z_;~Nyd>li42_h2^U>QfY0QhJK*JkgXS zGH?*^6WOUc3MmpThC+uY51BHVEmTwlUJ#>Mey=#}?!E|q0de#RNNO6-lQx|(_PkI9 N$Vn+nR*D-3{Xe>*u9N@( literal 0 HcmV?d00001 diff --git a/src/site/resources/images/integrations/plc4x_hop_banner.jpg b/src/site/resources/images/integrations/plc4x_hop_banner.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7eb1967253b2b6a1f334c3ece5855f20ef6777f7 GIT binary patch literal 81373 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�wUI1XdQYeZVlZh>-=Een)9VSbC4=!yMw~qz`IB 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 + From 000455b3cd54fd428a25a0ef98aa7a27cd7c6538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Sun, 30 Apr 2023 15:59:36 -0400 Subject: [PATCH 12/14] Check S7 driver for USR & ALRM fault. --- .../bacnetip/readwrite/BACnetVendorId.java | 3 --- .../s7/readwrite/S7VarPayloadDataItem.java | 2 +- .../s7/readwrite/protocol/S7HMuxImpl.java | 3 ++- .../plc4j/s7event/EventSubscription.java | 26 +++++++++--------- .../examples/plc4j/s7event/SzlRequest.java | 2 +- .../hop/metadata/Plc4xConnectionEditor.java | 8 +++--- .../apache-hop/plc4x-hop-transformer/pom.xml | 12 ++++----- .../transforms/plc4xoutput/Plc4xWrite.java | 27 +++++++++++++++---- plc4j/integrations/apache-hop/pom.xml | 2 +- .../users/integrations/apache-hop.adoc | 19 ++++++------- 10 files changed, 60 insertions(+), 44 deletions(-) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java index a5f60c30a41..ebf2bba99d4 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java @@ -1628,9 +1628,6 @@ public enum BACnetVendorId { OLYMPIA_ELECTRONICS((int) 1416, (int) 1416, (String) "Olympia Electronics"), NORMAL_SOFTWARE_INC((int) 1417, (int) 1417, (String) "Normal Software, Inc."), ST_ENGINEERING_SOLUTIONJSC((int) 1418, (int) 1418, (String) "ST Engineering Solution JSC"), - TECHKNAVE((int) 1407, (int) 1407, (String) "Techknave"), - ELSNER_ELEKTRONIK((int) 1408, (int) 1408, (String) "Elsner Elektronik"), - UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown"); private static final Map map; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 0d6c861cb25..4483814eac5 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -104,7 +104,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Padding Field (padding) writePaddingField( "padding", - (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), + (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)), (short) 0x00, writeUnsignedShort(writeBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java index dd42b232d70..58b9969bbeb 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java @@ -19,6 +19,7 @@ package org.apache.plc4x.java.s7.readwrite.protocol; import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufUtil; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; @@ -117,7 +118,7 @@ public class S7HMuxImpl extends MessageToMessageCodec implemen */ @Override protected void encode(ChannelHandlerContext ctx, ByteBuf outbb, List list) throws Exception { - System.out.println("Llego aqui: " + outbb); + //System.out.println("Llego aqui: " + ByteBufUtil.hexDump(outbb)); if ((embed_ctx == null) && (ctx.channel() instanceof EmbeddedChannel)) embed_ctx = ctx; if ((tcp_channel != null) && (embed_ctx == ctx)){ tcp_channel.writeAndFlush(outbb.copy()); diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java index fff303b6514..a6a111b3829 100644 --- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java +++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java @@ -53,25 +53,25 @@ public static void main(String[] args) throws Exception { try (PlcConnection connection = new DefaultPlcDriverManager().getConnection("s7://10.10.1.33?remote-rack=0&remote-slot=3&controller-type=S7_400")) { final PlcSubscriptionRequest.Builder subscription = connection.subscriptionRequestBuilder(); - subscription.addEventTagAddress("myMODE", "MODE"); +// subscription.addEventTagAddress("myMODE", "MODE"); // subscription.addEventTagAddress("mySYS", "SYS"); -// subscription.addEventTagAddress("myUSR", "USR"); + subscription.addEventTagAddress("myUSR", "USR"); // subscription.addEventTagAddress("myALM", "ALM"); final PlcSubscriptionRequest sub = subscription.build(); final PlcSubscriptionResponse subresponse = sub.execute().get(); //Si todo va bien con la subscripción puedo - subresponse - .getSubscriptionHandle("myMODE") - .register(msg -> { - System.out.println("******** S7ModeEvent ********"); - Map map = ((S7ModeEvent) msg).getMap(); - map.forEach((x, y) -> { - System.out.println(x + " : " + y); - }); - System.out.println("****************************"); - }); +// subresponse +// .getSubscriptionHandle("myMODE") +// .register(msg -> { +// System.out.println("******** S7ModeEvent ********"); +// Map map = ((S7ModeEvent) msg).getMap(); +// map.forEach((x, y) -> { +// System.out.println(x + " : " + y); +// }); +// System.out.println("****************************"); +// }); // // subresponse // .getSubscriptionHandle("mySYS") @@ -112,7 +112,7 @@ public static void main(String[] args) throws Exception { System.out.println("Waiting for events"); - Thread.sleep(5000); + Thread.sleep(30000); System.out.println("Bye..."); diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java index 9289d6c3d25..560b9dafcb2 100644 --- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java +++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/SzlRequest.java @@ -61,7 +61,7 @@ public static void main(String[] args) throws Exception { System.out.println("Chapter 34 System Status Lists (SSL)."); System.out.println("URL: https://cache.industry.siemens.com/dl/files/604/44240604/att_67003/v1/s7sfc_en-EN.pdf"); System.out.println("******************************************************************************************"); - + Thread.sleep(10000); try (PlcConnection connection = new DefaultPlcDriverManager().getConnection("s7://10.10.1.33?remote-rack=0&remote-slot=3&controller-type=S7_400")) { //(01) final PlcReadRequest.Builder readrequest = connection.readRequestBuilder(); //(02) diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java index 1118a5ff741..43fb6a9befe 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java @@ -120,18 +120,18 @@ public Button[] createButtonsForButtonBar(Composite parent) { Button wbTest = new Button(parent, SWT.PUSH | SWT.CENTER); props.setLook(wbTest); - wbTest.setText("Test"); - wbTest.addListener(SWT.Selection, e -> test()); + wbTest.setText("Test connection"); + wbTest.addListener(SWT.Selection, e -> test_connection()); return new Button[] {wbTest}; } - public void test() { + public void test_connection() { PlcConnection plcConnection; try { Plc4xConnection meta = getMetadata(); plcConnection = new DefaultPlcDriverManager().getConnection(meta.getUrl()); - plcConnection.connect(); + Thread.sleep(100); plcConnection.close(); MessageBox box = new MessageBox(parent.getShell(), SWT.ICON_INFORMATION | SWT.OK); diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml index 3bd9600ebe6..961b83f0c2c 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml @@ -61,13 +61,13 @@ maven-dependency-plugin - io.netty:netty-common:jar:4.1.89.Final - io.netty:netty-all:jar:4.1.89.Final + io.netty:netty-common:jar:${netty.version} + io.netty:netty-all:jar:${netty.version} commons-lang:commons-lang:jar:2.6 xml-apis:xml-apis:jar:1.4.01 org.apache.plc4x:plc4j-spi:jar:${project.version} - com.fasterxml.jackson.core:jackson-annotations:jar:2.14.2 - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.14.2 + com.fasterxml.jackson.core:jackson-annotations:jar:${jackson.version} + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:${jackson.version} @@ -138,7 +138,7 @@ org.apache.commons commons-lang3 - 3.12.0 + ${commons-lang3.version} com.fasterxml.jackson.core @@ -153,7 +153,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.14.2 + ${jackson.version} \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java index 508831b0a5a..2f2b718a083 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java @@ -251,15 +251,16 @@ public boolean processRow() throws HopException { data.outputRowMeta = getInputRowMeta(); - + first = true; if (first) { index.clear(); plcfields.clear(); meta.getFields().forEach((f) ->{ Integer i = getInputRowMeta().indexOfValue(f.getName()); //(01) if (i>=0) { + logDebug(">> i: " + i + " : " + f.getName() + " : " + f.getItem()); index.put(f.getName(), i); - plcfields.put(f.getName(),Plc4xPlcTag.of(f.getItem())); + plcfields.put(f.getName(), Plc4xPlcTag.of(f.getItem())); } }); first = false; @@ -310,15 +311,16 @@ public boolean processRow() throws HopException { if ((connmeta != null) && (connwrapper != null)){ if (connwrapper.getConnection().isConnected()){ - + logDebug(">>>> Paso por aqui!"); builder = null; builder = connwrapper.getConnection().writeRequestBuilder(); //(05) Integer i; for (Plc4xGeneratorField field: meta.getFields()){ - + logDebug(">>>> Paso por aqui! 22"); i = index.get(field.getName()); if (i != null) { //From Input Type + logDebug(">>>> Paso por aqui! 33: " + inputRowMeta.getValueMeta(i).getTypeDesc() + " : " + field.getType()); if (inputRowMeta.getValueMeta(i).getTypeDesc(). equalsIgnoreCase(field.getType())) switch(inputRowMeta.getValueMeta(i).getType()) { @@ -326,9 +328,22 @@ public boolean processRow() throws HopException { case IValueMeta.TYPE_INTEGER: case IValueMeta.TYPE_NUMBER: case IValueMeta.TYPE_BIGNUMBER: + Object value= null; + switch(plcfields.get(field.getName()).getDataType()) { + case BOOL: + case BYTE: + case WORD: + value = Short.parseShort(r[i].toString()); + break; + case REAL: + value = Float.parseFloat(r[i].toString()); + break; + } + + logDebug(">>>> " + field.getName() + " : " + field.getItem() + " : " + r[i] + " : " + plcfields.get(field.getName()).getDataType().name()); builder.addTagAddress(field.getName(), field.getItem(), - r[i]); + value); break; case IValueMeta.TYPE_DATE: builder.addTagAddress(field.getName(), @@ -401,6 +416,7 @@ public boolean processRow() throws HopException { @Override public boolean init() { + try { if(super.init()){ // Determine the number of rows to generate... @@ -435,6 +451,7 @@ public boolean init() { logError("Error initializing transform", ex); return false; } + } /* diff --git a/plc4j/integrations/apache-hop/pom.xml b/plc4j/integrations/apache-hop/pom.xml index 5908498abb5..a1b43bdce79 100644 --- a/plc4j/integrations/apache-hop/pom.xml +++ b/plc4j/integrations/apache-hop/pom.xml @@ -33,7 +33,7 @@ - 2.3.0 + 2.4.0 /home/hans/Documents/test diff --git a/src/site/asciidoc/users/integrations/apache-hop.adoc b/src/site/asciidoc/users/integrations/apache-hop.adoc index ce9d36ad486..e3df24c1612 100644 --- a/src/site/asciidoc/users/integrations/apache-hop.adoc +++ b/src/site/asciidoc/users/integrations/apache-hop.adoc @@ -17,7 +17,9 @@ :imagesdir: ../../images/ :icons: font -image::integrations/plc4x_hop_banner.jpg[] + + +image::plc4x_hop_banner.jpg[banner,512,167] == Apache Hop @@ -26,16 +28,15 @@ image::integrations/plc4x_hop_banner.jpg[] "__Hop aims to be the future of data integration. Visual development enables developers to be more productive than they can be through code. Our Design once, run anywhere workflows and pipelines can be designed in the Hop Gui and run on the Hop native engine (local or remote), or on Spark, Flink, Google Dataflow or AWS EMR through Beam. Lifecycle Management enables developers and administrators to switch between projects, environments and purposes without leaving your train of thought__." +.Version control +=== Record of revisions +[cols="1, 2,2a,5a"] +|=== +|Rev |Release |Date |Description of the change +|0 |0.10.0 |2022/10/04 |Stable release. - -.Version control -[width="100%",options="header,footer"] -|==================== -| Date | Plc4x | Comments -| 10/03/2023 |0.11.0-SNAPSHOT | xxx -| | | -|==================== +|=== From facb33c3937f3785295a8d2155139be913db84a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Sat, 6 May 2023 01:11:37 -0400 Subject: [PATCH 13/14] Verifying the execution sequence for a multi-instance system. --- .../apache-hop/plc4x-hop-actions/pom.xml | 5 + .../hop/actions/ActionSampleMetaData.java | 2 +- .../hop/actions/Plc4xCheckConnections.java | 150 +- .../hop/actions/Plc4xCheckDisConnections.java | 77 +- .../src/main/resources/plc4x_toddy_play.svg | 1490 ++++++++++++++++ .../src/main/resources/plc4x_toddy_stop.svg | 1513 +++++++++++++++++ .../apache-hop/plc4x-hop-metadata/pom.xml | 10 + .../hop/metadata/Plc4xConnectionEditor.java | 2 +- .../plc4x/hop/metadata/util/Plc4xLookup.java | 92 + .../util/Plc4xWrapperConnection.java | 15 +- .../apache-hop/plc4x-hop-transformer/pom.xml | 7 +- .../hop/transforms/plc4xevent/Plc4xEvent.java | 305 ++-- .../hop/transforms/plc4xinput/Plc4xRead.java | 262 ++- .../transforms/plc4xoutput/Plc4xWrite.java | 160 +- .../hop/transforms/plc4xsubs/Plc4xSubs.java | 121 +- .../plc4x/readwrite/Plc4xRequestType.java | 2 +- .../plc4x/readwrite/Plc4xResponseCode.java | 2 +- .../readwrite/Plc4xSubscriptionType.java | 2 +- .../java/plc4x/readwrite/Plc4xValueType.java | 2 +- 19 files changed, 3834 insertions(+), 385 deletions(-) create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_play.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_stop.svg create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java rename plc4j/integrations/apache-hop/{plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms => plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata}/util/Plc4xWrapperConnection.java (85%) diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml index ee58270dbcc..ddc11edb5b6 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/pom.xml @@ -142,5 +142,10 @@ provided --> + + org.netbeans.api + org-openide-util-lookup + RELEASE170 + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java index 67145901ab6..dca33626910 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/ActionSampleMetaData.java @@ -27,7 +27,7 @@ @HopMetadata( key = "Xplc4xaction", name = "PLC4x Action", - description = "A shared PLC4x connection to a PLC", + description = "A shared PLC4x connection to a PLC_Borrar", image = "plc4x_toddy.svg", documentationUrl = "/metadata-types/neo4j/neo4j-connection.html") public class ActionSampleMetaData extends HopMetadataBase implements IHopMetadata { diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java index c2aac428f52..53ffb309a41 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckConnections.java @@ -31,22 +31,26 @@ import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xLookup; +import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; -import org.apache.plc4x.java.api.exceptions.PlcConnectionException; +import org.openide.util.Lookup; import org.w3c.dom.Node; - +/* +* The purpose of this "Action" is firstly to verify the connection to +* the PLC and secondly to create a connection that will be shared by +* the Hop environment. +*/ @Action( id = "CHECK_PLC4X_CONNECTIONS", name = "i18n::Plc4xActionConnections.Name", description = "i18n::Plc4xActionConnections.Description", - image = "plc4x_toddy.svg", + image = "plc4x_toddy_play.svg", categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.Conditions", keywords = "i18n::Plc4xActionConnections.keyword", documentationUrl = "/workflow/actions/plc4x.html") @@ -56,7 +60,13 @@ public class Plc4xCheckConnections extends ActionBase implements Cloneable, IAct private Plc4xConnection[] connections; private boolean connected = false; + private Plc4xWrapperConnection connwrapper = null; private PlcConnection plcconn = null; + private ActionBase actionbase = null; + + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result lkresult = null; protected static final String[] unitTimeDesc = new String[] { @@ -79,7 +89,7 @@ public class Plc4xCheckConnections extends ActionBase implements Cloneable, IAct private long timeStart; private long now; - public Plc4xCheckConnections( String name) { + public Plc4xCheckConnections(String name) { super(name, ""); //connections = null; waitfors = null; @@ -170,8 +180,6 @@ private static int getWaitTimeByCode(String tt) { return 0; } - - /** * * Save values to XML @@ -247,63 +255,84 @@ public void loadXml( Node entrynode, IHopMetadataProvider metadataProvider, IVar } } - /** - * Execute this action and return the result. - * In this case it means, just set the result boolean in the Result - * class. - * Check all conections metadata from the dialog. - * @param prevResult The result of the previous execution - * @return The Result of the execution. - */ - @Override - public Result execute( Result prevResult, int nr ) { - Result result = prevResult; - result.setNrErrors(0); - connected = true; - for (Plc4xConnection connmeta:connections) { - try { - plcconn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(01) - if (!plcconn.isConnected()) { - logBasic("Cant connect to: " + connmeta.getUrl()); - connected = false; - plcconn = null; - //break; + /** + * Execute this action and return the result. + * In this case it means, just set the result boolean in the Result class. + * + * Check all conections metadata from the dialog (really only one). + * @param prevResult The result of the previous execution + * @return The Result of the execution. + */ + @Override + public Result execute( Result prevResult, int nr ) { + + Result result = prevResult; + result.setNrErrors(0); + connected = true; + + actionbase = null; + + for (Plc4xConnection connmeta:connections) { + + if (null == connwrapper) { //(01) + template = new Lookup.Template<>(Plc4xWrapperConnection.class, connmeta.getName(), null); + lkresult = lookup.lookup(template); + if (!lkresult.allItems().isEmpty()) { + connwrapper = (Plc4xWrapperConnection) lkresult.allInstances().toArray()[0]; //(02) + if (connwrapper != null) connwrapper.retain(); //(03) + } + }; + + if (null == connwrapper) { //(04) + try { + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(05) + if (conn.isConnected()) { + connwrapper = new Plc4xWrapperConnection(conn, connmeta.getName()); + lookup.add(connwrapper); //(06) + } else { + connected = false; + plcconn = null; + } + } catch (Exception ex) { + connected = false; + plcconn = null; + } + + } else { + if (!connwrapper.getConnection().isConnected()) { //(07) + connected = false; + plcconn = null; + } + } + + if (null == connwrapper) { //(08) + try { + + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(09) + + if (conn.isConnected()) { + conn.close(); //(10) + plcconn = null; + } else { + connected = false; + plcconn = null; + } + } catch (Exception ex){ + connected = false; + plcconn = null; + } + } - plcconn.close(); - plcconn = null; - } catch (Exception ex) { - Logger.getLogger(Plc4xCheckConnections.class.getName()).log(Level.SEVERE, null, ex); - connected = false; - plcconn = null; - //break; - } finally { - } - - } result.setResult(connected); return result; } - /** - * - * Add checks to report warnings - * - * @param remarks - * @param workflowMeta - * @param variables - * @param metadataProvider - */ - @Override - public void check( List remarks, WorkflowMeta workflowMeta, IVariables variables, - IHopMetadataProvider metadataProvider ) { - } - - @Override - public boolean resetErrorsBeforeExecution() { - return false; - } + @Override + public boolean resetErrorsBeforeExecution() { + return false; + } @Override public boolean isEvaluation() { @@ -313,9 +342,6 @@ public boolean isEvaluation() { @Override public boolean isUnconditional() { return false; - } - - - + } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java index d4f3f5e2538..d92da3f85ab 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/java/org/apache/plc4x/hop/actions/Plc4xCheckDisConnections.java @@ -33,23 +33,45 @@ import java.util.List; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; +import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.engine.IPipelineEngine; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xLookup; +import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; +import org.openide.util.Lookup; import org.w3c.dom.Node; - +/* +* The purpose of this "Action" is to release the driver resource +* within a "workflow", in case the number of accounts reaches zero, +* the wrapper will close the connection. +* The work pattern must be within the "workflow": +* +* Start -> Create connection -> Run pipeline -> Close connection -> Finish. +* +* It should always be taken into account that the connections to +* the PLCs are limited resources. +*/ @Action( id = "CHECK_PLC4X_DISCONNECTIONS", name = "i18n::Plc4xActionDisConnections.Name", description = "i18n::Plc4xActionDisConnections.Description", - image = "plc4x_toddy.svg", + image = "plc4x_toddy_stop.svg", categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.Conditions", keywords = "i18n::Plc4xActionDisConnections.keyword", documentationUrl = "/workflow/actions/checkdbconnection.html") public class Plc4xCheckDisConnections extends ActionBase implements Cloneable, IAction { - private static final Class PKG = Plc4xCheckDisConnections.class; // Needed by Translator + + private static final Class PKG = Plc4xCheckDisConnections.class; // Needed by Translator - private Plc4xConnection[] connections; + private Plc4xConnection[] connections; + private Plc4xWrapperConnection connwrapper = null; + private ActionBase actionbase = null; + + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result lkresult = null; protected static final String[] unitTimeDesc = new String[] { @@ -240,32 +262,31 @@ public void loadXml( Node entrynode, IHopMetadataProvider metadataProvider, IVar } } - /** - * Execute this action and return the result. In this case it means, just set the result boolean in the Result - * class. - * - * @param result The result of the previous execution - * @return The Result of the execution. - */ - @Override - public Result execute( Result result, int nr ) { - result.setResult(true); - System.out.println("NR: " + nr); + /** + * Execute this action and return the result. In this case it means, + * just set the result boolean in the Result class. + * + * @param result The result of the previous execution + * @return The Result of the execution. + */ + @Override + public Result execute( Result result, int nr ) { + result.setResult(true); + + for (Plc4xConnection connmeta:connections) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, connmeta.getName(), null); + lkresult = lookup.lookup(template); + if (!lkresult.allItems().isEmpty()) { + connwrapper = (Plc4xWrapperConnection) lkresult.allInstances().toArray()[0]; + if (connwrapper != null) { + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); + } + } + }; return result; } - /** - * - * Add checks to report warnings - * - * @param remarks - * @param workflowMeta - * @param variables - * @param metadataProvider - */ - @Override - public void check( List remarks, WorkflowMeta workflowMeta, IVariables variables, - IHopMetadataProvider metadataProvider ) { - } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_play.svg b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_play.svg new file mode 100644 index 00000000000..b0683725109 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_play.svg @@ -0,0 +1,1490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_stop.svg b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_stop.svg new file mode 100644 index 00000000000..844057852b6 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-actions/src/main/resources/plc4x_toddy_stop.svg @@ -0,0 +1,1513 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml index 84000a4fbe5..7d718f1492c 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/pom.xml @@ -141,5 +141,15 @@ + + io.netty + netty-common + ${netty.version} + + + org.netbeans.api + org-openide-util-lookup + RELEASE170 + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java index 43fb6a9befe..75db5ca921c 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/Plc4xConnectionEditor.java @@ -120,7 +120,7 @@ public Button[] createButtonsForButtonBar(Composite parent) { Button wbTest = new Button(parent, SWT.PUSH | SWT.CENTER); props.setLook(wbTest); - wbTest.setText("Test connection"); + wbTest.setText("Test connection."); wbTest.addListener(SWT.Selection, e -> test_connection()); return new Button[] {wbTest}; diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java new file mode 100644 index 00000000000..fac064e6fcc --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java @@ -0,0 +1,92 @@ + /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.metadata.util; + +import org.apache.plc4x.java.api.PlcConnection; +import org.openide.util.lookup.AbstractLookup; +import org.openide.util.lookup.InstanceContent; +import org.openide.util.lookup.InstanceContent.Convertor; + +/* +* Plc4xLookup is the main repository for sharing connections within a +* Hop pipeline/workflow instance. +* It's static nature limits its use within a JVM instance, +* however this is not a limitation since in general the connections to +* the PLCs are limited resources. +* A "Convertor" is included for the "Plc4xWrapperConnection" types +* to facilitate their use, without limiting their use as a container +* for other types of objects. +*/ +public class Plc4xLookup extends AbstractLookup { + private InstanceContent content = null; + private static Plc4xLookup def = new Plc4xLookup (); + + public Plc4xLookup(InstanceContent content) { + super(content); + this.content = content; + } + + public Plc4xLookup() { + this(new InstanceContent()); + } + + public void add(Object obj) { + if (obj instanceof Plc4xWrapperConnection) + content.add((Plc4xWrapperConnection) obj, Plc4xConvertor); + else + content.add(obj); + } + + public void remove(Object obj) { + if (obj instanceof Plc4xWrapperConnection) + content.remove((Plc4xWrapperConnection) obj, Plc4xConvertor); + else + content.remove(obj); + } + + public static Plc4xLookup getDefault(){ + return def; + } + + private static final Convertor Plc4xConvertor = + new InstanceContent.Convertor() { + + @Override + public Plc4xWrapperConnection convert(Plc4xWrapperConnection obj) { + return obj; + } + + @Override + public Class type(Plc4xWrapperConnection obj) { + return Plc4xWrapperConnection.class; + } + + @Override + public String id(Plc4xWrapperConnection obj) { + return obj.getId(); + } + + @Override + public String displayName(Plc4xWrapperConnection obj) { + return obj.getConnection().toString(); + } + + }; + +} diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xWrapperConnection.java b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xWrapperConnection.java similarity index 85% rename from plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xWrapperConnection.java rename to plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xWrapperConnection.java index 6c6ea3602aa..f16e6a4259f 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xWrapperConnection.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xWrapperConnection.java @@ -1,4 +1,4 @@ - /* + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.plc4x.hop.transforms.util; +package org.apache.plc4x.hop.metadata.util; import io.netty.util.AbstractReferenceCounted; import io.netty.util.ReferenceCounted; @@ -27,15 +27,17 @@ * Its goal is for it to be shared between the different transform that * may be running simultaneously on the local or remote Hop engine. * Its use with other kind of engines must be certified. - * The concept is very simple, the last to leave closes the connection. + * The concept is very simple, "the last to leave closes the connection". */ public class Plc4xWrapperConnection extends AbstractReferenceCounted { private final PlcConnection connection; + private final String id; - public Plc4xWrapperConnection(PlcConnection connection){ + public Plc4xWrapperConnection(PlcConnection connection, String id){ super(); this.connection = connection; + this.id = id; } public PlcConnection getConnection(){ @@ -51,10 +53,13 @@ protected void deallocate() { } } - @Override public ReferenceCounted touch(Object hint) { return this; } + public String getId() { + return id; + } + } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml index 961b83f0c2c..1091369b0a1 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml @@ -122,7 +122,7 @@ ${project.groupId} - hop-plc4x-metadata + plc4x-hop-metadata ${project.version} @@ -155,5 +155,10 @@ jackson-datatype-jsr310 ${jackson.version} + + org.netbeans.api + org-openide-util-lookup + RELEASE170 + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java index 243aa0120b7..099dc1de1fc 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java @@ -49,8 +49,10 @@ import org.apache.hop.pipeline.transform.ITransform; import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xLookup; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; -import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; +import org.apache.plc4x.hop.transforms.plc4xinput.Plc4xRead; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcReadRequest; @@ -65,6 +67,7 @@ import org.apache.plc4x.java.s7.events.S7SysEvent; import org.apache.plc4x.java.s7.events.S7UserEvent; import org.apache.plc4x.java.s7.readwrite.ModeTransitionType; +import org.openide.util.Lookup; /** * This transform receives an event from the S7 driver, of type MODE, SYS, @@ -73,87 +76,93 @@ */ public class Plc4xEvent extends BaseTransform { - public static String FIELD_MODE_EVENT = "MODE"; - public static String FIELD_USER_EVENT = "USR"; - public static String FIELD_SYS_EVENT = "SYS"; - public static String FIELD_ALARM_EVENT = "ALM"; + public static String FIELD_MODE_EVENT = "MODE"; + public static String FIELD_USER_EVENT = "USR"; + public static String FIELD_SYS_EVENT = "SYS"; + public static String FIELD_ALARM_EVENT = "ALM"; - - private static final Class PKG = Plc4xEvent.class; // Needed by Translator - - private Plc4xConnection connmeta = null; - private Plc4xWrapperConnection connwrapper = null; - private PlcReadRequest readRequest = null; - private PlcConsumerRegistration registerMode = null; - private PlcConsumerRegistration registerUser = null; - private PlcConsumerRegistration registerSys = null; - private PlcConsumerRegistration registerAlarm = null; - private PlcSubscriptionRequest subsbuild = null; - private PlcSubscriptionResponse subresponse = null; - - private List remarks = new ArrayList<>(); // stores the errors... - - /* - * The transfer of events is done from the driver tasks. A delay can be added - * for the execution of this transformer. - */ - private ObjectMapper mapper = new ObjectMapper(); - private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); - private boolean stopBundle = false; - private int index = 0; - - private static final ReentrantLock lock = new ReentrantLock(); - - private static final String dummy = "dummy"; - public Plc4xEvent(TransformMeta transformMeta, Plc4xEventMeta meta, Plc4xEventData data, int copyNr, PipelineMeta pipelineMeta, + private static final Class PKG = Plc4xEvent.class; // Needed by Translator + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcReadRequest readRequest = null; + private PlcConsumerRegistration registerMode = null; + private PlcConsumerRegistration registerUser = null; + private PlcConsumerRegistration registerSys = null; + private PlcConsumerRegistration registerAlarm = null; + private PlcSubscriptionRequest subsbuild = null; + private PlcSubscriptionResponse subresponse = null; + + private List remarks = new ArrayList<>(); // stores the errors... + + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result result = null; + + + /* + * The transfer of events is done from the driver tasks. A delay can be added + * for the execution of this transformer. + */ + private ObjectMapper mapper = new ObjectMapper(); + private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); + private boolean stopBundle = false; + private int index = 0; + + private static final ReentrantLock lock = new ReentrantLock(); + + private static final String dummy = "dummy"; + + public Plc4xEvent(TransformMeta transformMeta, Plc4xEventMeta meta, Plc4xEventData data, int copyNr, PipelineMeta pipelineMeta, Pipeline pipeline ) { super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); - } + } - /* - * Including Date and Time field for every row - * - * @param meta Meta data from user dialog - * @param remarks Error registers - * @param origin transform instance name - */ - public static final RowMetaAndData buildRow(Plc4xEventMeta meta, + /* + * Including Date and Time field for every row + * + * @param meta Meta data from user dialog + * @param remarks Error registers + * @param origin transform instance name + */ + public static final RowMetaAndData buildRow(Plc4xEventMeta meta, List remarks, String origin) throws HopPluginException { - IRowMeta rowMeta = new RowMeta(); - Object[] rowData = RowDataUtil.allocateRowData(2); - int index = 0; - - ArrayList fields = new ArrayList(); - - if (meta.isModeEvent()) { - for (S7ModeEvent.Fields field:S7ModeEvent.Fields.values()) { - fields.add(field.name()); + + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(2); + int index = 0; + + ArrayList fields = new ArrayList(); + + if (meta.isModeEvent()) { + for (S7ModeEvent.Fields field:S7ModeEvent.Fields.values()) { + fields.add(field.name()); + } + } else if (meta.isSysEvent()) { + for (S7SysEvent.Fields field:S7SysEvent.Fields.values()) { + fields.add(field.name()); + } + } else if (meta.isUserEvent()) { + for (S7UserEvent.Fields field:S7UserEvent.Fields.values()) { + fields.add(field.name()); + } + } else if (meta.isAlarmEvent()) { + fields.add("ALARM"); } - } else if (meta.isSysEvent()) { - for (S7SysEvent.Fields field:S7SysEvent.Fields.values()) { - fields.add(field.name()); - } - } else if (meta.isUserEvent()) { - for (S7UserEvent.Fields field:S7UserEvent.Fields.values()) { - fields.add(field.name()); - } - } else if (meta.isAlarmEvent()) { - fields.add("ALARM"); - } - - for (String field : fields) { - IValueMeta valueMeta = - ValueMetaFactory.createValueMeta(field, IValueMeta.TYPE_STRING); // build a - rowData[index] = StringUtil.EMPTY_STRING; - // Now add value to the row! - // This is in fact a copy from the fields row, but now with data. - rowMeta.addValueMeta(valueMeta); - index++; - } - - return new RowMetaAndData(rowMeta, rowData); + + for (String field : fields) { + IValueMeta valueMeta = + ValueMetaFactory.createValueMeta(field, IValueMeta.TYPE_STRING); // build a + rowData[index] = StringUtil.EMPTY_STRING; + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; + } + + return new RowMetaAndData(rowMeta, rowData); } /* @@ -198,7 +207,7 @@ public boolean processRow() throws HopException { try{ PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) if (conn.isConnected()) { - connwrapper = new Plc4xWrapperConnection(conn); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) } } catch (Exception ex){ @@ -319,62 +328,68 @@ public boolean processRow() throws HopException { } - @Override - public boolean init() { - try { - if(super.init()){ - // Determine the number of rows to generate... - data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + @Override + public boolean init() { + try { + if(super.init()){ + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); - if (data.rowLimit < 0L) { // Unable to parse - logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); - return false; // fail - } - - // Create a row (constants) with all the values in it... - List remarks = new ArrayList<>(); // stores the errors... - RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); - if (!remarks.isEmpty()) { - for (int i = 0; i < remarks.size(); i++) { - CheckResult cr = (CheckResult) remarks.get(i); - logError(cr.getText()); - } - return false; - } + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } - data.outputRowData = outputRow.getData(); - data.outputRowMeta = outputRow.getRowMeta(); - - mapper.findAndRegisterModules(); + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; + } + + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); - return true; + mapper.findAndRegisterModules(); + + getPlcConnection(); + + return true; + } + + return false; + + } catch (Exception ex){ + setErrors(1L); + logError("Error initializing transform", ex); + return false; } - return false; - } catch (Exception ex){ - setErrors(1L); - logError("Error initializing transform", ex); - return false; } - } - /* - * Here, must perform the cleaning of any resource, main of the connection to - * the associated PLC. - */ + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ @Override public void cleanup() { + System.out.println("*************** CLEANUP *****************"); super.cleanup(); logBasic("Cleanup. Release connection."); if (null != connwrapper) { if (null != registerMode ) registerMode.unregister(); if (null != registerUser) registerUser.unregister(); if (null != registerSys) registerSys.unregister(); - if (null != registerAlarm) registerAlarm.unregister(); - connwrapper.release(); + if (null != registerAlarm) registerAlarm.unregister(); + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); } } - - + /* * Here, must perform the cleaning of any resource. * 1. Check if we have reference to wrapper. @@ -384,14 +399,14 @@ public void cleanup() { */ @Override public void dispose() { + System.out.println("*************** DISPOSE *****************"); super.dispose(); if (connwrapper != null) { logBasic("Dispose. Release connection: " + connwrapper.refCnt()); - connwrapper.release(); - if (!connwrapper.getConnection().isConnected()){ - getPipeline().getExtensionDataMap().remove(meta.getConnection()); - } - connwrapper = null; + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); + connwrapper = null; readRequest = null; registerMode = null; registerUser = null; @@ -407,7 +422,55 @@ public void stopRunning() throws HopException { stopBundle = true; } - + private void getPlcConnection() { + lock.lock(); //(01) + try { + + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + result = lookup.lookup(template); + if (!result.allItems().isEmpty()) { + System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; + if (connwrapper != null) connwrapper.retain(); + } + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + readRequest = null; + try{ + System.out.println("Creo una nueva conexión..."); + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + + if (conn.isConnected()) { + System.out.println("**** Agrego la segunda conexion. ****"); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + lookup.add(connwrapper); + } + + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + + } catch (HopException ex) { + logError("Unable to create connection to PLC. " + ex.getMessage()); + } finally { + lock.unlock(); + } + } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java index 5e9302da020..0d8332d4ffb 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java @@ -24,6 +24,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.lang3.StringUtils; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; @@ -49,13 +51,15 @@ import org.apache.hop.pipeline.transform.ITransform; import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xLookup; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; -import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; +import org.openide.util.Lookup; /** * Transform That contains the basic skeleton needed to create your own plugin @@ -68,7 +72,12 @@ public class Plc4xRead extends BaseTransform { private Plc4xConnection connmeta = null; private Plc4xWrapperConnection connwrapper = null; private PlcReadRequest readRequest = null; - private PlcReadResponse readResponse = null; + private PlcReadResponse readResponse = null; + + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result result = null; + private int maxwait = 0; private static final ReentrantLock lock = new ReentrantLock(); @@ -231,27 +240,30 @@ public static final RowMetaAndData buildRow(Plc4xReadMeta meta, return new RowMetaAndData(rowMeta, rowData); } - /* - * 1. Block the other instances by means of a lock. - * 2. Try to locate an existing connection. - * 3. If it doesn't exist, it tries to take control of the routine to - * create an instance of PlcConnection and his wrapper. - * 4. Register the connection wrapper for global access. - * 5. If the connection to the PLC is made, then it creates the query - * and executes it. - * TODO: Field validation. - */ - @Override - public boolean processRow() throws HopException { - - Object[] r = getRow(); // Get row from input rowset & set row busy! - setLogLevel(LogLevel.DEBUG); + /* + * 1. Block the other instances by means of a lock. + * 2. Try to locate an existing connection. + * 3. If it doesn't exist, it tries to take control of the routine to + * create an instance of PlcConnection and his wrapper. + * 4. Register the connection wrapper for global access. + * 5. If the connection to the PLC is made, then it creates the query + * and executes it. + * TODO: Field validation. + */ + @Override + public boolean processRow() throws HopException { + System.out.println("*************** PROCESSROW *****************"); + Object[] r = getRow(); // Get row from input rowset & set row busy! + setLogLevel(LogLevel.DEBUG); if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { setOutputDone(); // signal end to receiver(s) return false; } + System.out.println("Nombre del transform: " + getName() + " : " + getPipeline().getFilename()); + System.out.println("Plc4xRead Objetos registrados: " + getPipeline().getExtensionDataMap().size()); + if (first) { index.clear(); plcfields.clear(); @@ -263,41 +275,51 @@ public boolean processRow() throws HopException { first = false; } - lock.lock(); //(01) - try { - IHopMetadataProvider metaprovider = getMetadataProvider(); - connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) - if (connwrapper != null) connwrapper.retain(); - }; - - if (connmeta == null){ - logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); - } - - if ((connmeta != null) && (connwrapper == null)){ - readRequest = null; - try{ - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - - if (conn.isConnected()) { - connwrapper = new Plc4xWrapperConnection(conn); - getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) - } - - } catch (Exception ex){ - setErrors(1L); - logError("Unable to create connection to PLC. " + ex.getMessage()); - } - } - } finally { - lock.unlock(); - } +// lock.lock(); //(01) +// try { +// +// IHopMetadataProvider metaprovider = getMetadataProvider(); +// connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); +// +// if (connwrapper == null) { +// template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); +// result = lookup.lookup(template); +// if (!result.allItems().isEmpty()) { +// System.out.println("Aqui encontro la conexion: " + meta.getConnection()); +// connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; +// if (connwrapper != null) connwrapper.retain(); +// } +// }; +// +// if (connmeta == null){ +// logError( +// BaseMessages.getString( +// PKG, +// "Plc4x.Read.Meta.Log.SetMetadata", +// meta.getConnection())); +// } +// +// if ((connmeta != null) && (connwrapper == null)){ +// readRequest = null; +// try{ +// System.out.println("Creo una nueva conexión..."); +// PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) +// +// if (conn.isConnected()) { +// System.out.println("**** Agrego la segunda conexion. ****"); +// connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); +// lookup.add(connwrapper); +// } +// +// } catch (Exception ex){ +// setErrors(1L); +// logError("Unable to create connection to PLC. " + ex.getMessage()); +// } +// } +// +// } finally { +// lock.unlock(); +// } if ((connmeta != null) && (connwrapper != null)){ if (connwrapper.getConnection().isConnected()){ @@ -350,12 +372,15 @@ public boolean processRow() throws HopException { data.prevDate = data.rowDate; data.rowDate = new Date(); int index = 0; + if (!Utils.isEmpty(meta.getRowTimeField())) { r[index++] = data.rowDate; } + if (!Utils.isEmpty(meta.getLastTimeField())) { r[index++] = data.prevDate; } + for (Plc4xGeneratorField field: meta.getFields()){ if (field.getType().equalsIgnoreCase("Boolean")){ r[index++] = Boolean.parseBoolean(field.getValue()); @@ -372,42 +397,45 @@ public boolean processRow() throws HopException { @Override - public boolean init() { - try { - if(super.init()){ - // Determine the number of rows to generate... - data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); - data.rowsWritten = 0L; - data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); - - if (data.rowLimit < 0L) { // Unable to parse - logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); - return false; // fail - } - - // Create a row (constants) with all the values in it... - List remarks = new ArrayList<>(); // stores the errors... - RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); - if (!remarks.isEmpty()) { - for (int i = 0; i < remarks.size(); i++) { - CheckResult cr = (CheckResult) remarks.get(i); - logError(cr.getText()); - } - return false; - } + public boolean init() { + System.out.println("*************** INIT *****************"); + try { + if(super.init()){ + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + data.rowsWritten = 0L; + data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); + + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } + + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; + } - data.outputRowData = outputRow.getData(); - data.outputRowMeta = outputRow.getRowMeta(); + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); - return true; + getPlcConnection(); + + return true; + } + return false; + } catch (Exception ex){ + setErrors(1L); + logError("Error initializing transform", ex); + return false; } - return false; - } catch (Exception ex){ - setErrors(1L); - logError("Error initializing transform", ex); - return false; } - } /* * Here, must perform the cleaning of any resource, main of the connection to @@ -415,10 +443,14 @@ public boolean init() { */ @Override public void cleanup() { + System.out.println("*************** CLEANUP *****************"); super.cleanup(); logBasic("Cleanup. Release connection."); - if (connwrapper != null) - connwrapper.release(); + if (connwrapper != null) { + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); + } } @@ -431,20 +463,68 @@ public void cleanup() { */ @Override public void dispose() { + System.out.println("*************** DISPOSE *****************"); super.dispose(); if (connwrapper != null) { logBasic("Dispose. Release connection: " + connwrapper.refCnt()); - connwrapper.release(); - if (!connwrapper.getConnection().isConnected()){ - getPipeline().getExtensionDataMap().remove(meta.getConnection()); - } + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); connwrapper = null; readRequest = null; } } - + private void getPlcConnection() { + lock.lock(); //(01) + try { + + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + result = lookup.lookup(template); + if (!result.allItems().isEmpty()) { + System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; + if (connwrapper != null) connwrapper.retain(); + } + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + readRequest = null; + try{ + System.out.println("Creo una nueva conexión..."); + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + + if (conn.isConnected()) { + System.out.println("**** Agrego la segunda conexion. ****"); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + lookup.add(connwrapper); + } + + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + + } catch (HopException ex) { + Logger.getLogger(Plc4xRead.class.getName()).log(Level.SEVERE, null, ex); + } finally { + lock.unlock(); + } + } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java index 2f2b718a083..bf71bf6efd4 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java @@ -23,6 +23,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.lang3.StringUtils; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; @@ -48,13 +50,15 @@ import org.apache.hop.pipeline.transform.ITransform; import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xLookup; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; -import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.PlcWriteResponse; +import org.openide.util.Lookup; /** * Transform That contains the basic skeleton needed to create your own plugin @@ -70,6 +74,10 @@ public class Plc4xWrite extends BaseTransform { private PlcWriteRequest.Builder builder = null; private PlcWriteResponse writeResponse = null; + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result result = null; + private static final ReentrantLock lock = new ReentrantLock(); private static final String dummy = "dummy"; @@ -275,39 +283,51 @@ public boolean processRow() throws HopException { return false; } - lock.lock(); //(01) - try { - IHopMetadataProvider metaprovider = getMetadataProvider(); - connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) - if (connwrapper != null) connwrapper.retain(); - }; - - if (connmeta == null){ - logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); - } - - if ((connmeta != null) && (connwrapper == null)){ - writeRequest = null; - try{ - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - if (conn.isConnected()) { - connwrapper = new Plc4xWrapperConnection(conn); - getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) - } - } catch (Exception ex){ - setErrors(1L); - logError("Unable to create connection to PLC. " + ex.getMessage()); - } - } - } finally { - lock.unlock(); - } +// lock.lock(); //(02) +// try { +// +// IHopMetadataProvider metaprovider = getMetadataProvider(); +// connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); +// +// if (connwrapper == null) { +// template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); //(03) +// result = lookup.lookup(template); +// if (!result.allItems().isEmpty()) { +// System.out.println("Aqui encontro la conexion: " + meta.getConnection()); +// connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; +// if (connwrapper != null) connwrapper.retain(); +// } +// }; +// +// if (connmeta == null){ +// logError( +// BaseMessages.getString( +// PKG, +// "Plc4x.Read.Meta.Log.SetMetadata", +// meta.getConnection())); +// } +// +// if ((connmeta != null) && (connwrapper == null)){ +// writeRequest = null; +// try{ +// System.out.println("Creo una nueva conexión..."); +// PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(04) +// +// if (conn.isConnected()) { +// System.out.println("**** Agrego la segunda conexion. ****"); +// connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); +// lookup.add(connwrapper); //(05) +// } +// +// } catch (Exception ex){ +// setErrors(1L); +// logError("Unable to create connection to PLC. " + ex.getMessage()); +// } +// } +// +// } finally { +// lock.unlock(); +// } if ((connmeta != null) && (connwrapper != null)){ if (connwrapper.getConnection().isConnected()){ @@ -416,7 +436,7 @@ public boolean processRow() throws HopException { @Override public boolean init() { - + System.out.println("*************** INIT *****************"); try { if(super.init()){ // Determine the number of rows to generate... @@ -443,7 +463,9 @@ public boolean init() { data.outputRowData = outputRow.getData(); data.outputRowMeta = outputRow.getRowMeta(); - return true; + getPlcConnection(); + + return true; } return false; } catch (Exception ex){ @@ -460,10 +482,14 @@ public boolean init() { */ @Override public void cleanup() { + System.out.println("*************** CLEANUP *****************"); super.cleanup(); logBasic("Cleanup. Release connection."); - if (connwrapper != null) - connwrapper.release(); + if (connwrapper != null) { + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); + } } @@ -476,20 +502,68 @@ public void cleanup() { */ @Override public void dispose() { + System.out.println("*************** DISPOSE *****************"); super.dispose(); if (connwrapper != null) { logBasic("Dispose. Release connection: " + connwrapper.refCnt()); - connwrapper.release(); - if (!connwrapper.getConnection().isConnected()){ - getPipeline().getExtensionDataMap().remove(meta.getConnection()); - } + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); connwrapper = null; writeRequest = null; } } - + private void getPlcConnection() { + lock.lock(); //(01) + try { + + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + result = lookup.lookup(template); + if (!result.allItems().isEmpty()) { + System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; + if (connwrapper != null) connwrapper.retain(); + } + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + writeRequest = null; + try{ + System.out.println("Creo una nueva conexión..."); + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + + if (conn.isConnected()) { + System.out.println("**** Agrego la segunda conexion. ****"); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + lookup.add(connwrapper); + } + + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + + } catch (HopException ex) { + Logger.getLogger(Plc4xWrite.class.getName()).log(Level.SEVERE, null, ex); + } finally { + lock.unlock(); + } + } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java index 67003bf3b5e..5ed2513993d 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java @@ -27,6 +27,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.lang3.StringUtils; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; @@ -52,10 +54,12 @@ import org.apache.hop.pipeline.transform.ITransform; import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xLookup; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; import org.apache.plc4x.hop.transforms.util.Plc4xPlcSubscriptionTag; -import org.apache.plc4x.hop.transforms.util.Plc4xWrapperConnection; +import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; +import org.apache.plc4x.hop.transforms.plc4xinput.Plc4xRead; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcReadRequest; @@ -64,6 +68,7 @@ import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; import org.apache.plc4x.java.s7.events.S7Event; +import org.openide.util.Lookup; /** * Transform That contains the basic skeleton needed to create your own plugin @@ -71,27 +76,31 @@ */ public class Plc4xSubs extends BaseTransform { - private static final Class PKG = Plc4xSubs.class; // Needed by Translator - - private Plc4xConnection connmeta = null; - private Plc4xWrapperConnection connwrapper = null; - private PlcSubscriptionRequest subsRequest = null; - private PlcSubscriptionResponse subsResponse = null; - private int maxwait = 0; - private static final ReentrantLock lock = new ReentrantLock(); - - private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); - private boolean stopBundle = false; - - private static final String dummy = "dummy"; - - private Map index = new HashMap(); - private Map plctags = new HashMap(); + private static final Class PKG = Plc4xSubs.class; // Needed by Translator + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcSubscriptionRequest subsRequest = null; + private PlcSubscriptionResponse subsResponse = null; + private int maxwait = 0; + private static final ReentrantLock lock = new ReentrantLock(); + + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result result = null; + + private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); + private boolean stopBundle = false; - public Plc4xSubs(TransformMeta transformMeta, Plc4xSubsMeta meta, Plc4xSubsData data, int copyNr, PipelineMeta pipelineMeta, + private static final String dummy = "dummy"; + + private Map index = new HashMap(); + private Map plctags = new HashMap(); + + public Plc4xSubs(TransformMeta transformMeta, Plc4xSubsMeta meta, Plc4xSubsData data, int copyNr, PipelineMeta pipelineMeta, Pipeline pipeline ) { super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); - } + } /* * Including Date and Time field for every row @@ -295,7 +304,7 @@ public boolean processRow() throws HopException { try{ PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) if (conn.isConnected()) { - connwrapper = new Plc4xWrapperConnection(conn); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) } } catch (Exception ex){ @@ -391,6 +400,7 @@ public boolean processRow() throws HopException { @Override public boolean init() { + System.out.println("*************** INIT *****************"); try { if(super.init()){ // Determine the number of rows to generate... @@ -433,10 +443,15 @@ public boolean init() { */ @Override public void cleanup() { + System.out.println("*************** CLEANUP *****************"); + super.cleanup(); super.cleanup(); logBasic("Cleanup. Release connection."); - if (connwrapper != null) - connwrapper.release(); + if (connwrapper != null) { + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); + } } @@ -449,13 +464,13 @@ public void cleanup() { */ @Override public void dispose() { + System.out.println("*************** DISPOSE *****************"); super.dispose(); if (connwrapper != null) { - logBasic("Dispose. Release connection: " + connwrapper.refCnt()); - connwrapper.release(); - if (!connwrapper.getConnection().isConnected()){ - getPipeline().getExtensionDataMap().remove(meta.getConnection()); - } + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + connwrapper.release(); + if (connwrapper.refCnt() <= 0) + lookup.remove(connwrapper); connwrapper = null; subsRequest = null; } @@ -467,6 +482,56 @@ public void stopRunning() throws HopException { super.stopRunning(); stopBundle = true; } - + + private void getPlcConnection() { + lock.lock(); //(01) + try { + + IHopMetadataProvider metaprovider = getMetadataProvider(); + connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); + + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + result = lookup.lookup(template); + if (!result.allItems().isEmpty()) { + System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; + if (connwrapper != null) connwrapper.retain(); + } + }; + + if (connmeta == null){ + logError( + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); + } + + if ((connmeta != null) && (connwrapper == null)){ + subsRequest = null; + try{ + System.out.println("Creo una nueva conexión..."); + PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + + if (conn.isConnected()) { + System.out.println("**** Agrego la segunda conexion. ****"); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + lookup.add(connwrapper); + } + + } catch (Exception ex){ + setErrors(1L); + logError("Unable to create connection to PLC. " + ex.getMessage()); + } + } + + } catch (HopException ex) { + Logger.getLogger(Plc4xRead.class.getName()).log(Level.SEVERE, null, ex); + } finally { + lock.unlock(); + } + } + } diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xRequestType.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xRequestType.java index 4e118f5bd43..712be6fdf5e 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xRequestType.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xRequestType.java @@ -45,7 +45,7 @@ public enum Plc4xRequestType { } } - private short value; + private final short value; Plc4xRequestType(short value) { this.value = value; diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xResponseCode.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xResponseCode.java index 36b32de966a..03cef96a869 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xResponseCode.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xResponseCode.java @@ -44,7 +44,7 @@ public enum Plc4xResponseCode { } } - private short value; + private final short value; Plc4xResponseCode(short value) { this.value = value; diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xSubscriptionType.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xSubscriptionType.java index 9340c3c5547..60f730b3991 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xSubscriptionType.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xSubscriptionType.java @@ -36,7 +36,7 @@ public enum Plc4xSubscriptionType { } } - private short value; + private final short value; Plc4xSubscriptionType(short value) { this.value = value; diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValueType.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValueType.java index 78ae46a27fb..58e6216e8dc 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValueType.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValueType.java @@ -64,7 +64,7 @@ public enum Plc4xValueType { } } - private short value; + private final short value; Plc4xValueType(short value) { this.value = value; From 1408efe8d81f24971d8a506d146076d277e26dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Garc=C3=ADa?= Date: Wed, 7 Jun 2023 19:50:09 -0400 Subject: [PATCH 14/14] Solves the S7 driver problems for handling cyclic subscriptions. Make the corrections in the Hop integration for the correct handling of Actions and Transforms. --- .../s7/readwrite/Alarm8MessageQueryType.java | 3 - .../AlarmMessageAckObjectPushType.java | 3 - .../s7/readwrite/AlarmMessageAckPushType.java | 3 - .../AlarmMessageAckResponseType.java | 3 - .../s7/readwrite/AlarmMessageAckType.java | 3 - .../readwrite/AlarmMessageObjectAckType.java | 3 - .../readwrite/AlarmMessageObjectPushType.java | 3 - .../AlarmMessageObjectQueryType.java | 3 - .../s7/readwrite/AlarmMessagePushType.java | 3 - .../s7/readwrite/AlarmMessageQueryType.java | 3 - .../java/s7/readwrite/AlarmStateType.java | 2 +- .../plc4x/java/s7/readwrite/AlarmType.java | 2 +- .../readwrite/AssociatedQueryValueType.java | 3 - .../s7/readwrite/AssociatedValueType.java | 3 - .../COTPPacketConnectionRequest.java | 3 - .../COTPPacketConnectionResponse.java | 3 - .../java/s7/readwrite/COTPPacketData.java | 3 - .../COTPPacketDisconnectRequest.java | 3 - .../COTPPacketDisconnectResponse.java | 3 - .../s7/readwrite/COTPPacketTpduError.java | 3 - .../java/s7/readwrite/COTPParameter.java | 3 - .../s7/readwrite/COTPParameterCalledTsap.java | 3 - .../readwrite/COTPParameterCallingTsap.java | 3 - .../s7/readwrite/COTPParameterChecksum.java | 3 - ...ameterDisconnectAdditionalInformation.java | 3 - .../s7/readwrite/COTPParameterTpduSize.java | 3 - .../java/s7/readwrite/COTPProtocolClass.java | 2 +- .../plc4x/java/s7/readwrite/COTPTpduSize.java | 6 +- .../java/s7/readwrite/CpuSubscribeEvents.java | 2 +- .../s7/readwrite/CycServiceItemAnyType.java | 14 +- .../readwrite/CycServiceItemDbReadType.java | 3 - .../java/s7/readwrite/CycServiceItemType.java | 3 - .../s7/readwrite/DataTransportErrorCode.java | 2 +- .../java/s7/readwrite/DataTransportSize.java | 6 +- .../plc4x/java/s7/readwrite/DateAndTime.java | 3 - .../plc4x/java/s7/readwrite/DeviceGroup.java | 2 +- .../plc4x/java/s7/readwrite/EventType.java | 2 +- .../plc4x/java/s7/readwrite/MemoryArea.java | 6 +- .../java/s7/readwrite/ModeTransitionType.java | 2 +- .../plc4x/java/s7/readwrite/QueryType.java | 2 +- .../plc4x/java/s7/readwrite/S7Address.java | 3 - .../plc4x/java/s7/readwrite/S7AddressAny.java | 3 - .../java/s7/readwrite/S7DataAlarmMessage.java | 3 - .../plc4x/java/s7/readwrite/S7Message.java | 3 - .../s7/readwrite/S7MessageObjectRequest.java | 3 - .../s7/readwrite/S7MessageObjectResponse.java | 3 - .../java/s7/readwrite/S7MessageRequest.java | 3 - .../java/s7/readwrite/S7MessageResponse.java | 3 - .../s7/readwrite/S7MessageResponseData.java | 3 - .../java/s7/readwrite/S7MessageUserData.java | 3 - .../plc4x/java/s7/readwrite/S7Parameter.java | 3 - .../readwrite/S7ParameterModeTransition.java | 3 - .../readwrite/S7ParameterReadVarRequest.java | 3 - .../readwrite/S7ParameterReadVarResponse.java | 3 - .../S7ParameterSetupCommunication.java | 3 - .../s7/readwrite/S7ParameterUserData.java | 3 - .../s7/readwrite/S7ParameterUserDataItem.java | 3 - .../S7ParameterUserDataItemCPUFunctions.java | 3 - .../readwrite/S7ParameterWriteVarRequest.java | 3 - .../S7ParameterWriteVarResponse.java | 3 - .../plc4x/java/s7/readwrite/S7Payload.java | 3 - .../java/s7/readwrite/S7PayloadAlarm8.java | 3 - .../s7/readwrite/S7PayloadAlarmAckInd.java | 3 - .../java/s7/readwrite/S7PayloadAlarmS.java | 3 - .../java/s7/readwrite/S7PayloadAlarmSC.java | 3 - .../java/s7/readwrite/S7PayloadAlarmSQ.java | 3 - .../readwrite/S7PayloadDiagnosticMessage.java | 3 - .../java/s7/readwrite/S7PayloadNotify.java | 3 - .../java/s7/readwrite/S7PayloadNotify8.java | 3 - .../readwrite/S7PayloadReadVarResponse.java | 3 - .../java/s7/readwrite/S7PayloadUserData.java | 3 - .../s7/readwrite/S7PayloadUserDataItem.java | 3 - ...aItemCpuFunctionAlarmAckErrorResponse.java | 3 - ...serDataItemCpuFunctionAlarmAckRequest.java | 3 - ...erDataItemCpuFunctionAlarmAckResponse.java | 3 - ...rDataItemCpuFunctionAlarmQueryRequest.java | 3 - ...DataItemCpuFunctionAlarmQueryResponse.java | 3 - ...uFunctionMsgSubscriptionAlarmResponse.java | 3 - ...ItemCpuFunctionMsgSubscriptionRequest.java | 3 - ...temCpuFunctionMsgSubscriptionResponse.java | 3 - ...CpuFunctionMsgSubscriptionSysResponse.java | 3 - ...taItemCpuFunctionReadSzlNoDataRequest.java | 3 - ...UserDataItemCpuFunctionReadSzlRequest.java | 3 - ...serDataItemCpuFunctionReadSzlResponse.java | 3 - ...ataItemCyclicServicesChangeDrivenPush.java | 3 - ...ServicesChangeDrivenSubscribeResponse.java | 3 - ...erDataItemCyclicServicesErrorResponse.java | 3 - ...PayloadUserDataItemCyclicServicesPush.java | 3 - ...ataItemCyclicServicesSubscribeRequest.java | 3 - ...taItemCyclicServicesSubscribeResponse.java | 3 - ...aItemCyclicServicesUnsubscribeRequest.java | 3 - ...ItemCyclicServicesUnsubscribeResponse.java | 3 - .../readwrite/S7PayloadWriteVarRequest.java | 3 - .../readwrite/S7PayloadWriteVarResponse.java | 3 - .../s7/readwrite/S7VarPayloadDataItem.java | 3 - .../s7/readwrite/S7VarPayloadStatusItem.java | 3 - .../readwrite/S7VarRequestParameterItem.java | 3 - .../S7VarRequestParameterItemAddress.java | 3 - .../apache/plc4x/java/s7/readwrite/State.java | 3 - .../plc4x/java/s7/readwrite/SubItem.java | 3 - .../plc4x/java/s7/readwrite/SyntaxIdType.java | 2 +- .../java/s7/readwrite/SzlDataTreeItem.java | 3 - .../apache/plc4x/java/s7/readwrite/SzlId.java | 3 - .../java/s7/readwrite/SzlModuleTypeClass.java | 2 +- .../plc4x/java/s7/readwrite/SzlSublist.java | 2 +- .../plc4x/java/s7/readwrite/TPKTPacket.java | 3 - .../plc4x/java/s7/readwrite/TimeBase.java | 2 +- .../java/s7/readwrite/TransportSize.java | 46 +- .../plc4x/java/s7/events/S7CyclicEvent.java | 346 +++-- .../plc4x/java/s7/events/S7ModeEvent.java | 1 + .../plc4x/java/s7/readwrite/S7Driver.java | 2 + .../configuration/S7Configuration.java | 14 +- .../s7/readwrite/context/S7DriverContext.java | 5 +- .../s7/readwrite/optimizer/S7Optimizer.java | 9 +- .../protocol/S7HGeneratedDriverBase.java | 2 +- .../java/s7/readwrite/protocol/S7HMux.java | 1 + .../s7/readwrite/protocol/S7HMuxImpl.java | 100 +- ...cConnection.java => S7HPlcConnection.java} | 164 ++- .../protocol/S7ProtocolEventLogic.java | 41 +- .../readwrite/protocol/S7ProtocolLogic.java | 276 ++-- .../utils/S7PlcSubscriptionHandle.java | 12 + .../java/s7/readwrite/utils/StaticHelper.java | 3 +- .../plc4j/s7event/CycSubscription.java | 243 ++-- .../plc4j/s7event/EventSubscription.java | 24 +- .../plc4x/hop/metadata/util/Plc4xLookup.java | 4 +- .../apache-hop/plc4x-hop-transformer/pom.xml | 5 + .../hop/transforms/plc4xevent/Plc4xEvent.java | 569 +++++---- .../hop/transforms/plc4xinput/Plc4xRead.java | 1126 +++++++++++------ .../plc4xinput/Plc4xReadDialog.java | 44 +- .../transforms/plc4xinput/Plc4xReadMeta.java | 452 +++---- .../transforms/plc4xoutput/Plc4xWrite.java | 816 ++++++------ .../plc4xoutput/Plc4xWriteMeta.java | 9 +- .../hop/transforms/plc4xsubs/Plc4xSubs.java | 939 +++++++++----- .../hop/transforms/util/Plc4xPlcField.java | 148 +++ .../connection/DefaultNettyPlcConnection.java | 1 + .../plc4x/readwrite/Plc4xConnectRequest.java | 3 - .../plc4x/readwrite/Plc4xConnectResponse.java | 3 - .../java/plc4x/readwrite/Plc4xConstants.java | 3 - .../java/plc4x/readwrite/Plc4xMessage.java | 3 - .../plc4x/readwrite/Plc4xReadRequest.java | 3 - .../plc4x/readwrite/Plc4xReadResponse.java | 3 - .../plc4x/java/plc4x/readwrite/Plc4xTag.java | 3 - .../java/plc4x/readwrite/Plc4xTagRequest.java | 3 - .../plc4x/readwrite/Plc4xTagResponse.java | 3 - .../plc4x/readwrite/Plc4xTagValueRequest.java | 3 - .../readwrite/Plc4xTagValueResponse.java | 3 - .../plc4x/readwrite/Plc4xWriteRequest.java | 3 - .../plc4x/readwrite/Plc4xWriteResponse.java | 3 - .../src/main/resources/protocols/s7/s7.mspec | 11 +- src/site/asciidoc/images/01.png | Bin 0 -> 19058 bytes src/site/asciidoc/images/dt0.png | Bin 0 -> 19058 bytes src/site/asciidoc/images/dt01.png | Bin 0 -> 14671 bytes src/site/asciidoc/images/dt02.png | Bin 0 -> 19607 bytes .../asciidoc/users/protocols/01.png.cache | 1 + .../asciidoc/users/protocols/dt0.png.cache | 1 + .../asciidoc/users/protocols/dt01.png.cache | 1 + .../asciidoc/users/protocols/dt02.png.cache | 1 + .../users/protocols/image01.png.cache | 1 + .../users/protocols/image02.png.cache | 1 + .../users/protocols/image03.png.cache | 1 + .../users/protocols/image04.png.cache | 1 + .../users/protocols/image05.png.cache | 1 + .../users/protocols/image06.png.cache | 1 + .../users/protocols/image07.png.cache | 1 + src/site/asciidoc/users/protocols/s7.adoc | 145 +++ .../users/protocols/szlxy11demo.png.cache | 1 + 166 files changed, 3616 insertions(+), 2321 deletions(-) rename plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/{S7HDefaultNettyPlcConnection.java => S7HPlcConnection.java} (65%) create mode 100644 plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java create mode 100644 src/site/asciidoc/images/01.png create mode 100644 src/site/asciidoc/images/dt0.png create mode 100644 src/site/asciidoc/images/dt01.png create mode 100644 src/site/asciidoc/images/dt02.png create mode 100644 src/site/asciidoc/users/protocols/01.png.cache create mode 100644 src/site/asciidoc/users/protocols/dt0.png.cache create mode 100644 src/site/asciidoc/users/protocols/dt01.png.cache create mode 100644 src/site/asciidoc/users/protocols/dt02.png.cache create mode 100644 src/site/asciidoc/users/protocols/image01.png.cache create mode 100644 src/site/asciidoc/users/protocols/image02.png.cache create mode 100644 src/site/asciidoc/users/protocols/image03.png.cache create mode 100644 src/site/asciidoc/users/protocols/image04.png.cache create mode 100644 src/site/asciidoc/users/protocols/image05.png.cache create mode 100644 src/site/asciidoc/users/protocols/image06.png.cache create mode 100644 src/site/asciidoc/users/protocols/image07.png.cache create mode 100644 src/site/asciidoc/users/protocols/szlxy11demo.png.cache diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java index 4783b3b23be..31e7dab0922 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/Alarm8MessageQueryType.java @@ -88,7 +88,6 @@ public List getMessageObjects() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Alarm8MessageQueryType"); // Simple Field (functionId) @@ -173,8 +172,6 @@ public static Alarm8MessageQueryType staticParse(ReadBuffer readBuffer, Object.. public static Alarm8MessageQueryType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Alarm8MessageQueryType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = readSimpleField("functionId", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java index 579333c9b44..342589eba6d 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckObjectPushType.java @@ -95,7 +95,6 @@ public short getVariableSpec() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageAckObjectPushType"); // Const Field (variableSpec) @@ -172,8 +171,6 @@ public static AlarmMessageAckObjectPushType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageAckObjectPushType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short variableSpec = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java index 6aeaf270c60..48491b961ad 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckPushType.java @@ -74,7 +74,6 @@ public List getMessageObjects() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageAckPushType"); // Simple Field (TimeStamp) @@ -133,8 +132,6 @@ public static AlarmMessageAckPushType staticParse(ReadBuffer readBuffer, Object. public static AlarmMessageAckPushType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageAckPushType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DateAndTime TimeStamp = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java index 7d93a28b5c6..e588b6ca414 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckResponseType.java @@ -65,7 +65,6 @@ public List getMessageObjects() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageAckResponseType"); // Simple Field (functionId) @@ -115,8 +114,6 @@ public static AlarmMessageAckResponseType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageAckResponseType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = readSimpleField("functionId", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java index 0cb1b929663..bea2571d061 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageAckType.java @@ -65,7 +65,6 @@ public List getMessageObjects() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageAckType"); // Simple Field (functionId) @@ -118,8 +117,6 @@ public static AlarmMessageAckType staticParse(ReadBuffer readBuffer, Object... a public static AlarmMessageAckType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageAckType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = readSimpleField("functionId", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java index bbbfc213c01..fc3ff163982 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectAckType.java @@ -93,7 +93,6 @@ public short getLength() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageObjectAckType"); // Const Field (variableSpec) @@ -169,8 +168,6 @@ public static AlarmMessageObjectAckType staticParse(ReadBuffer readBuffer, Objec public static AlarmMessageObjectAckType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageObjectAckType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short variableSpec = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java index 7680db5fd86..42777096da9 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectPushType.java @@ -116,7 +116,6 @@ public short getVariableSpec() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageObjectPushType"); // Const Field (variableSpec) @@ -217,8 +216,6 @@ public static AlarmMessageObjectPushType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageObjectPushType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short variableSpec = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java index 49f8d6f2750..7d931070da7 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageObjectQueryType.java @@ -109,7 +109,6 @@ public short getVariableSpec() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageObjectQueryType"); // Simple Field (lengthDataset) @@ -199,8 +198,6 @@ public static AlarmMessageObjectQueryType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageObjectQueryType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short lengthDataset = readSimpleField("lengthDataset", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java index a34b68b1633..a6b578a1e97 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessagePushType.java @@ -74,7 +74,6 @@ public List getMessageObjects() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessagePushType"); // Simple Field (TimeStamp) @@ -133,8 +132,6 @@ public static AlarmMessagePushType staticParse(ReadBuffer readBuffer, Object... public static AlarmMessagePushType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessagePushType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DateAndTime TimeStamp = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java index 4174c085100..53eddc50a4d 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmMessageQueryType.java @@ -88,7 +88,6 @@ public int getDataLength() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AlarmMessageQueryType"); // Simple Field (functionId) @@ -173,8 +172,6 @@ public static AlarmMessageQueryType staticParse(ReadBuffer readBuffer, Object... public static AlarmMessageQueryType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AlarmMessageQueryType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = readSimpleField("functionId", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java index 10f555fd928..5a038892956 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmStateType.java @@ -39,7 +39,7 @@ public enum AlarmStateType { } } - private short value; + private final short value; AlarmStateType(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java index a11a6605086..3693907d2a4 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AlarmType.java @@ -36,7 +36,7 @@ public enum AlarmType { } } - private short value; + private final short value; AlarmType(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java index 035fc29feab..9f7a355161d 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedQueryValueType.java @@ -74,7 +74,6 @@ public List getData() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AssociatedQueryValueType"); // Simple Field (returnCode) @@ -143,8 +142,6 @@ public static AssociatedQueryValueType staticParse(ReadBuffer readBuffer, Object public static AssociatedQueryValueType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AssociatedQueryValueType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DataTransportErrorCode returnCode = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java index 8b090361375..d3807cd3865 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/AssociatedValueType.java @@ -74,7 +74,6 @@ public List getData() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("AssociatedValueType"); // Simple Field (returnCode) @@ -148,8 +147,6 @@ public static AssociatedValueType staticParse(ReadBuffer readBuffer, Object... a public static AssociatedValueType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("AssociatedValueType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DataTransportErrorCode returnCode = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java index afe5079f627..f5c7bb10507 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionRequest.java @@ -75,7 +75,6 @@ public COTPProtocolClass getProtocolClass() { protected void serializeCOTPPacketChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPPacketConnectionRequest"); // Simple Field (destinationReference) @@ -125,8 +124,6 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( ReadBuffer readBuffer, Integer cotpLen) throws ParseException { readBuffer.pullContext("COTPPacketConnectionRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int destinationReference = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java index 5fb6eb696e3..1d64fa5fa2e 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketConnectionResponse.java @@ -75,7 +75,6 @@ public COTPProtocolClass getProtocolClass() { protected void serializeCOTPPacketChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPPacketConnectionResponse"); // Simple Field (destinationReference) @@ -125,8 +124,6 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( ReadBuffer readBuffer, Integer cotpLen) throws ParseException { readBuffer.pullContext("COTPPacketConnectionResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int destinationReference = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java index 3b56645300b..d02dc78b246 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java @@ -65,7 +65,6 @@ public short getTpduRef() { protected void serializeCOTPPacketChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPPacketData"); // Simple Field (eot) @@ -101,8 +100,6 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( ReadBuffer readBuffer, Integer cotpLen) throws ParseException { readBuffer.pullContext("COTPPacketData"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); boolean eot = readSimpleField("eot", readBoolean(readBuffer)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java index 7a30250683d..8c1ef73f6fd 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectRequest.java @@ -75,7 +75,6 @@ public COTPProtocolClass getProtocolClass() { protected void serializeCOTPPacketChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPPacketDisconnectRequest"); // Simple Field (destinationReference) @@ -125,8 +124,6 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( ReadBuffer readBuffer, Integer cotpLen) throws ParseException { readBuffer.pullContext("COTPPacketDisconnectRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int destinationReference = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java index cf4df50c21e..90bae295940 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketDisconnectResponse.java @@ -68,7 +68,6 @@ public int getSourceReference() { protected void serializeCOTPPacketChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPPacketDisconnectResponse"); // Simple Field (destinationReference) @@ -105,8 +104,6 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( ReadBuffer readBuffer, Integer cotpLen) throws ParseException { readBuffer.pullContext("COTPPacketDisconnectResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int destinationReference = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java index 1cfaf8cf3c8..bb6c4ed3aa2 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketTpduError.java @@ -68,7 +68,6 @@ public short getRejectCause() { protected void serializeCOTPPacketChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPPacketTpduError"); // Simple Field (destinationReference) @@ -105,8 +104,6 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( ReadBuffer readBuffer, Integer cotpLen) throws ParseException { readBuffer.pullContext("COTPPacketTpduError"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int destinationReference = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameter.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameter.java index 76a3a88e1ed..d056c5f92fc 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameter.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameter.java @@ -50,7 +50,6 @@ protected abstract void serializeCOTPParameterChild(WriteBuffer writeBuffer) public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPParameter"); // Discriminator Field (parameterType) (Used as input to a switch field) @@ -113,8 +112,6 @@ public static COTPParameter staticParse(ReadBuffer readBuffer, Object... args) public static COTPParameter staticParse(ReadBuffer readBuffer, Short rest) throws ParseException { readBuffer.pullContext("COTPParameter"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short parameterType = readDiscriminatorField("parameterType", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java index 2a9f41aa980..154495f6808 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCalledTsap.java @@ -59,7 +59,6 @@ protected void serializeCOTPParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPParameterCalledTsap"); // Simple Field (tsapId) @@ -89,8 +88,6 @@ public static COTPParameterBuilder staticParseCOTPParameterBuilder( ReadBuffer readBuffer, Short rest) throws ParseException { readBuffer.pullContext("COTPParameterCalledTsap"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int tsapId = readSimpleField("tsapId", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java index bcbaf504572..b61845ae97a 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterCallingTsap.java @@ -59,7 +59,6 @@ protected void serializeCOTPParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPParameterCallingTsap"); // Simple Field (tsapId) @@ -89,8 +88,6 @@ public static COTPParameterBuilder staticParseCOTPParameterBuilder( ReadBuffer readBuffer, Short rest) throws ParseException { readBuffer.pullContext("COTPParameterCallingTsap"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int tsapId = readSimpleField("tsapId", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java index 23e0ceff571..bfa89f0ff1e 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterChecksum.java @@ -59,7 +59,6 @@ protected void serializeCOTPParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPParameterChecksum"); // Simple Field (crc) @@ -89,8 +88,6 @@ public static COTPParameterBuilder staticParseCOTPParameterBuilder( ReadBuffer readBuffer, Short rest) throws ParseException { readBuffer.pullContext("COTPParameterChecksum"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short crc = readSimpleField("crc", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java index b4a61e87748..9846b0517fe 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterDisconnectAdditionalInformation.java @@ -59,7 +59,6 @@ protected void serializeCOTPParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPParameterDisconnectAdditionalInformation"); // Array Field (data) @@ -91,8 +90,6 @@ public static COTPParameterBuilder staticParseCOTPParameterBuilder( ReadBuffer readBuffer, Short rest) throws ParseException { readBuffer.pullContext("COTPParameterDisconnectAdditionalInformation"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); byte[] data = readBuffer.readByteArray("data", Math.toIntExact(rest)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java index 4cb45b96b85..be740620a83 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPParameterTpduSize.java @@ -59,7 +59,6 @@ protected void serializeCOTPParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("COTPParameterTpduSize"); // Simple Field (tpduSize) @@ -94,8 +93,6 @@ public static COTPParameterBuilder staticParseCOTPParameterBuilder( ReadBuffer readBuffer, Short rest) throws ParseException { readBuffer.pullContext("COTPParameterTpduSize"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); COTPTpduSize tpduSize = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java index fd6ab7effda..01715721bc9 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPProtocolClass.java @@ -38,7 +38,7 @@ public enum COTPProtocolClass { } } - private short value; + private final short value; COTPProtocolClass(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java index f428cfee9b5..9f7df7129aa 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPTpduSize.java @@ -42,8 +42,8 @@ public enum COTPTpduSize { } } - private short value; - private int sizeInBytes; + private final short value; + private final int sizeInBytes; COTPTpduSize(short value, int sizeInBytes) { this.value = value; @@ -68,7 +68,7 @@ public static COTPTpduSize firstEnumForFieldSizeInBytes(int fieldValue) { } public static List enumsForFieldSizeInBytes(int fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (COTPTpduSize _val : COTPTpduSize.values()) { if (_val.getSizeInBytes() == fieldValue) { _values.add(_val); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java index b9cb3f0610b..10be0b999da 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CpuSubscribeEvents.java @@ -37,7 +37,7 @@ public enum CpuSubscribeEvents { } } - private short value; + private final short value; CpuSubscribeEvents(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java index 82cfa394db0..d93c31c1d21 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java @@ -87,16 +87,15 @@ protected void serializeCycServiceItemTypeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("CycServiceItemAnyType"); - // Simple Field (transportSize) - writeSimpleEnumField( + // Enum field (transportSize) + writeEnumField( "transportSize", "TransportSize", transportSize, new DataWriterEnumDefault<>( - TransportSize::getValue, TransportSize::name, writeUnsignedShort(writeBuffer, 8))); + TransportSize::getCode, TransportSize::name, writeUnsignedShort(writeBuffer, 8))); // Simple Field (length) writeSimpleField("length", length, writeUnsignedInt(writeBuffer, 16)); @@ -129,7 +128,7 @@ public int getLengthInBits() { CycServiceItemAnyType _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - // Simple field (transportSize) + // Enum Field (transportSize) lengthInBits += 8; // Simple field (length) @@ -151,16 +150,13 @@ public static CycServiceItemTypeBuilder staticParseCycServiceItemTypeBuilder( ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("CycServiceItemAnyType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); TransportSize transportSize = readEnumField( "transportSize", "TransportSize", - new DataReaderEnumDefault<>( - TransportSize::enumForValue, readUnsignedShort(readBuffer, 8))); + readEnum(TransportSize::firstEnumForFieldCode, readUnsignedShort(readBuffer, 8))); int length = readSimpleField("length", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java index c2ca696f026..73363758ddd 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemDbReadType.java @@ -63,7 +63,6 @@ protected void serializeCycServiceItemTypeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("CycServiceItemDbReadType"); // Simple Field (numberOfAreas) @@ -105,8 +104,6 @@ public static CycServiceItemTypeBuilder staticParseCycServiceItemTypeBuilder( ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("CycServiceItemDbReadType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short numberOfAreas = readSimpleField("numberOfAreas", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java index c7c6af1d4ee..9dca1f7e3ed 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemType.java @@ -70,7 +70,6 @@ protected abstract void serializeCycServiceItemTypeChild(WriteBuffer writeBuffer public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("CycServiceItemType"); // Const Field (functionId) @@ -122,8 +121,6 @@ public static CycServiceItemType staticParse(ReadBuffer readBuffer, Object... ar public static CycServiceItemType staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("CycServiceItemType"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java index 160a36c0edc..72da9d71528 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportErrorCode.java @@ -39,7 +39,7 @@ public enum DataTransportErrorCode { } } - private short value; + private final short value; DataTransportErrorCode(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java index 130f5f063d0..bc667c57c38 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataTransportSize.java @@ -42,8 +42,8 @@ public enum DataTransportSize { } } - private short value; - private boolean sizeInBits; + private final short value; + private final boolean sizeInBits; DataTransportSize(short value, boolean sizeInBits) { this.value = value; @@ -68,7 +68,7 @@ public static DataTransportSize firstEnumForFieldSizeInBits(boolean fieldValue) } public static List enumsForFieldSizeInBits(boolean fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (DataTransportSize _val : DataTransportSize.values()) { if (_val.getSizeInBits() == fieldValue) { _values.add(_val); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java index 26fa8d9a10e..fa0b0e1fbaa 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java @@ -102,7 +102,6 @@ public byte getDow() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("DateAndTime"); // Manual Field (year) @@ -200,8 +199,6 @@ public static DateAndTime staticParse(ReadBuffer readBuffer, Object... args) public static DateAndTime staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("DateAndTime"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short year = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java index 4fb8727c339..6386830857b 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DeviceGroup.java @@ -36,7 +36,7 @@ public enum DeviceGroup { } } - private short value; + private final short value; DeviceGroup(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java index 1d9931cc3e7..b80be908777 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/EventType.java @@ -38,7 +38,7 @@ public enum EventType { } } - private short value; + private final short value; EventType(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java index 0a244f9910f..16146f7ab20 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/MemoryArea.java @@ -44,8 +44,8 @@ public enum MemoryArea { } } - private short value; - private String shortName; + private final short value; + private final String shortName; MemoryArea(short value, String shortName) { this.value = value; @@ -70,7 +70,7 @@ public static MemoryArea firstEnumForFieldShortName(String fieldValue) { } public static List enumsForFieldShortName(String fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (MemoryArea _val : MemoryArea.values()) { if (_val.getShortName().equals(fieldValue)) { _values.add(_val); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java index f31562b7309..affc7ccb3eb 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/ModeTransitionType.java @@ -42,7 +42,7 @@ public enum ModeTransitionType { } } - private short value; + private final short value; ModeTransitionType(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java index 7a6eaf32042..6a0986380cb 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/QueryType.java @@ -37,7 +37,7 @@ public enum QueryType { } } - private short value; + private final short value; QueryType(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Address.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Address.java index 4e3b3ac8dbe..3fdb19bcae3 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Address.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Address.java @@ -50,7 +50,6 @@ protected abstract void serializeS7AddressChild(WriteBuffer writeBuffer) public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7Address"); // Discriminator Field (addressType) (Used as input to a switch field) @@ -89,8 +88,6 @@ public static S7Address staticParse(ReadBuffer readBuffer, Object... args) throw public static S7Address staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7Address"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short addressType = readDiscriminatorField("addressType", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java index 5fc9b8f1115..b9e124e6be8 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java @@ -94,7 +94,6 @@ public byte getBitAddress() { protected void serializeS7AddressChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7AddressAny"); // Enum field (transportSize) @@ -170,8 +169,6 @@ public static S7AddressBuilder staticParseS7AddressBuilder(ReadBuffer readBuffer throws ParseException { readBuffer.pullContext("S7AddressAny"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); TransportSize transportSize = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7DataAlarmMessage.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7DataAlarmMessage.java index d8109b76d10..92e453cc402 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7DataAlarmMessage.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7DataAlarmMessage.java @@ -62,7 +62,6 @@ protected abstract void serializeS7DataAlarmMessageChild(WriteBuffer writeBuffer public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7DataAlarmMessage"); // Const Field (functionId) @@ -123,8 +122,6 @@ public static S7DataAlarmMessage staticParse(ReadBuffer readBuffer, Byte cpuFunc throws ParseException { readBuffer.pullContext("S7DataAlarmMessage"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java index 4fc347ccb6f..19cf023dbf2 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Message.java @@ -77,7 +77,6 @@ protected abstract void serializeS7MessageChild(WriteBuffer writeBuffer) public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7Message"); // Const Field (protocolId) @@ -167,8 +166,6 @@ public static S7Message staticParse(ReadBuffer readBuffer, Object... args) throw public static S7Message staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7Message"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short protocolId = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java index 4c85600d34a..fcdf0b49c24 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectRequest.java @@ -83,7 +83,6 @@ protected void serializeS7DataAlarmMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7MessageObjectRequest"); // Const Field (variableSpec) @@ -164,8 +163,6 @@ public static S7DataAlarmMessageBuilder staticParseS7DataAlarmMessageBuilder( ReadBuffer readBuffer, Byte cpuFunctionType) throws ParseException { readBuffer.pullContext("S7MessageObjectRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short variableSpec = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java index 36bf1cea705..812a27a0bcf 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageObjectResponse.java @@ -66,7 +66,6 @@ protected void serializeS7DataAlarmMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7MessageObjectResponse"); // Simple Field (returnCode) @@ -122,8 +121,6 @@ public static S7DataAlarmMessageBuilder staticParseS7DataAlarmMessageBuilder( ReadBuffer readBuffer, Byte cpuFunctionType) throws ParseException { readBuffer.pullContext("S7MessageObjectResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DataTransportErrorCode returnCode = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java index a4b77504ea7..d7f55537d40 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageRequest.java @@ -50,7 +50,6 @@ public S7MessageRequest(int tpduReference, S7Parameter parameter, S7Payload payl protected void serializeS7MessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7MessageRequest"); writeBuffer.popContext("S7MessageRequest"); @@ -74,8 +73,6 @@ public static S7MessageBuilder staticParseS7MessageBuilder(ReadBuffer readBuffer throws ParseException { readBuffer.pullContext("S7MessageRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); readBuffer.closeContext("S7MessageRequest"); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java index 722f168b019..c32725f02a8 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponse.java @@ -69,7 +69,6 @@ public short getErrorCode() { protected void serializeS7MessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7MessageResponse"); // Simple Field (errorClass) @@ -105,8 +104,6 @@ public static S7MessageBuilder staticParseS7MessageBuilder(ReadBuffer readBuffer throws ParseException { readBuffer.pullContext("S7MessageResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short errorClass = readSimpleField("errorClass", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java index e41e0e2ff34..a4e957df96a 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageResponseData.java @@ -69,7 +69,6 @@ public short getErrorCode() { protected void serializeS7MessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7MessageResponseData"); // Simple Field (errorClass) @@ -105,8 +104,6 @@ public static S7MessageBuilder staticParseS7MessageBuilder(ReadBuffer readBuffer throws ParseException { readBuffer.pullContext("S7MessageResponseData"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short errorClass = readSimpleField("errorClass", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java index f9a557b4a2e..93c380103cd 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7MessageUserData.java @@ -50,7 +50,6 @@ public S7MessageUserData(int tpduReference, S7Parameter parameter, S7Payload pay protected void serializeS7MessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7MessageUserData"); writeBuffer.popContext("S7MessageUserData"); @@ -74,8 +73,6 @@ public static S7MessageBuilder staticParseS7MessageBuilder(ReadBuffer readBuffer throws ParseException { readBuffer.pullContext("S7MessageUserData"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); readBuffer.closeContext("S7MessageUserData"); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Parameter.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Parameter.java index 051ebd2a790..d02b9522305 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Parameter.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Parameter.java @@ -52,7 +52,6 @@ protected abstract void serializeS7ParameterChild(WriteBuffer writeBuffer) public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7Parameter"); // Discriminator Field (parameterType) (Used as input to a switch field) @@ -108,8 +107,6 @@ public static S7Parameter staticParse(ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7Parameter"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short parameterType = readDiscriminatorField("parameterType", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java index b65cb58a2e0..8858e89a028 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterModeTransition.java @@ -91,7 +91,6 @@ public short getSequenceNumber() { protected void serializeS7ParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterModeTransition"); // Reserved Field (reserved) @@ -159,8 +158,6 @@ public static S7ParameterBuilder staticParseS7ParameterBuilder( ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7ParameterModeTransition"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); Integer reservedField0 = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java index 4ca78328cf4..1cd784f0ee9 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarRequest.java @@ -62,7 +62,6 @@ public List getItems() { protected void serializeS7ParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterReadVarRequest"); // Implicit Field (numItems) (Used for parsing, but its value is not stored as it's implicitly @@ -106,8 +105,6 @@ public static S7ParameterBuilder staticParseS7ParameterBuilder( ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7ParameterReadVarRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short numItems = readImplicitField("numItems", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java index 18f8428caa4..c79fc96629b 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterReadVarResponse.java @@ -62,7 +62,6 @@ public short getNumItems() { protected void serializeS7ParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterReadVarResponse"); // Simple Field (numItems) @@ -92,8 +91,6 @@ public static S7ParameterBuilder staticParseS7ParameterBuilder( ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7ParameterReadVarResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short numItems = readSimpleField("numItems", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java index 4e12e06c3db..c9d4cf0974e 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterSetupCommunication.java @@ -74,7 +74,6 @@ public int getPduLength() { protected void serializeS7ParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterSetupCommunication"); // Reserved Field (reserved) @@ -122,8 +121,6 @@ public static S7ParameterBuilder staticParseS7ParameterBuilder( ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7ParameterSetupCommunication"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); Short reservedField0 = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java index aa681aade73..a0013a3181f 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserData.java @@ -62,7 +62,6 @@ public List getItems() { protected void serializeS7ParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterUserData"); // Implicit Field (numItems) (Used for parsing, but its value is not stored as it's implicitly @@ -106,8 +105,6 @@ public static S7ParameterBuilder staticParseS7ParameterBuilder( ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7ParameterUserData"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short numItems = readImplicitField("numItems", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItem.java index 4f9ec54ccf7..b041ad34770 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItem.java @@ -50,7 +50,6 @@ protected abstract void serializeS7ParameterUserDataItemChild(WriteBuffer writeB public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterUserDataItem"); // Discriminator Field (itemType) (Used as input to a switch field) @@ -90,8 +89,6 @@ public static S7ParameterUserDataItem staticParse(ReadBuffer readBuffer, Object. public static S7ParameterUserDataItem staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7ParameterUserDataItem"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short itemType = readDiscriminatorField("itemType", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java index 03c8bafb7c1..7f330b5b2b7 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterUserDataItemCPUFunctions.java @@ -110,7 +110,6 @@ protected void serializeS7ParameterUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterUserDataItemCPUFunctions"); // Implicit Field (itemLength) (Used for parsing, but its value is not stored as it's implicitly @@ -197,8 +196,6 @@ public static S7ParameterUserDataItemBuilder staticParseS7ParameterUserDataItemB ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7ParameterUserDataItemCPUFunctions"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short itemLength = readImplicitField("itemLength", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java index 88985ee3a6e..b70182a707d 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarRequest.java @@ -62,7 +62,6 @@ public List getItems() { protected void serializeS7ParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterWriteVarRequest"); // Implicit Field (numItems) (Used for parsing, but its value is not stored as it's implicitly @@ -106,8 +105,6 @@ public static S7ParameterBuilder staticParseS7ParameterBuilder( ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7ParameterWriteVarRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short numItems = readImplicitField("numItems", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java index 157e0db7559..58fb3442e63 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7ParameterWriteVarResponse.java @@ -62,7 +62,6 @@ public short getNumItems() { protected void serializeS7ParameterChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7ParameterWriteVarResponse"); // Simple Field (numItems) @@ -92,8 +91,6 @@ public static S7ParameterBuilder staticParseS7ParameterBuilder( ReadBuffer readBuffer, Short messageType) throws ParseException { readBuffer.pullContext("S7ParameterWriteVarResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short numItems = readSimpleField("numItems", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Payload.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Payload.java index 8f9b7d1f2a3..27068e8ebcc 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Payload.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7Payload.java @@ -52,7 +52,6 @@ protected abstract void serializeS7PayloadChild(WriteBuffer writeBuffer) public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7Payload"); // Switch field (Serialize the sub-type) @@ -108,8 +107,6 @@ public static S7Payload staticParse( ReadBuffer readBuffer, Short messageType, S7Parameter parameter) throws ParseException { readBuffer.pullContext("S7Payload"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java index d7369d05c54..8642ab90b7e 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarm8.java @@ -71,7 +71,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadAlarm8"); // Simple Field (alarmMessage) @@ -102,8 +101,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadAlarm8"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); AlarmMessagePushType alarmMessage = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java index 1d0300ffa04..15880f9c2af 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmAckInd.java @@ -71,7 +71,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadAlarmAckInd"); // Simple Field (alarmMessage) @@ -102,8 +101,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadAlarmAckInd"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); AlarmMessageAckPushType alarmMessage = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java index e589cd98c43..24a994f5fc1 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmS.java @@ -71,7 +71,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadAlarmS"); // Simple Field (alarmMessage) @@ -102,8 +101,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadAlarmS"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); AlarmMessagePushType alarmMessage = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java index a37b06e484a..e1ca33f3648 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSC.java @@ -71,7 +71,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadAlarmSC"); // Simple Field (alarmMessage) @@ -102,8 +101,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadAlarmSC"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); AlarmMessagePushType alarmMessage = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java index e69cd518f23..d944a03afc9 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java @@ -71,7 +71,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadAlarmSQ"); // Simple Field (alarmMessage) @@ -102,8 +101,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadAlarmSQ"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); AlarmMessagePushType alarmMessage = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java index b9392871abb..f22947b4779 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadDiagnosticMessage.java @@ -113,7 +113,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadDiagnosticMessage"); // Simple Field (EventId) @@ -180,8 +179,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadDiagnosticMessage"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int EventId = readSimpleField("EventId", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java index 7bcdc3efd54..f6bf5231723 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify.java @@ -71,7 +71,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadNotify"); // Simple Field (alarmMessage) @@ -102,8 +101,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadNotify"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); AlarmMessagePushType alarmMessage = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java index 43960bb4a84..1c7542a478f 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadNotify8.java @@ -71,7 +71,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadNotify8"); // Simple Field (alarmMessage) @@ -102,8 +101,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadNotify8"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); AlarmMessagePushType alarmMessage = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java index ced89add35d..4520e992e16 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadReadVarResponse.java @@ -62,7 +62,6 @@ public List getItems() { protected void serializeS7PayloadChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadReadVarResponse"); // Array Field (items) @@ -98,8 +97,6 @@ public static S7PayloadBuilder staticParseS7PayloadBuilder( ReadBuffer readBuffer, Short messageType, S7Parameter parameter) throws ParseException { readBuffer.pullContext("S7PayloadReadVarResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); List items = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java index 39b3de767ce..466513678c3 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserData.java @@ -62,7 +62,6 @@ public List getItems() { protected void serializeS7PayloadChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserData"); // Array Field (items) @@ -98,8 +97,6 @@ public static S7PayloadBuilder staticParseS7PayloadBuilder( ReadBuffer readBuffer, Short messageType, S7Parameter parameter) throws ParseException { readBuffer.pullContext("S7PayloadUserData"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); List items = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java index b66f98148d0..89e58d08883 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItem.java @@ -75,7 +75,6 @@ protected abstract void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuf public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItem"); // Simple Field (returnCode) @@ -177,8 +176,6 @@ public static S7PayloadUserDataItem staticParse( throws ParseException { readBuffer.pullContext("S7PayloadUserDataItem"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DataTransportErrorCode returnCode = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java index dfb5a9ef037..1d3d6828ff2 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse.java @@ -61,7 +61,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse"); writeBuffer.popContext("S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse"); @@ -86,8 +85,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); readBuffer.closeContext("S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse"); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java index 77d23edeba5..c74ec909136 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckRequest.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionAlarmAckRequest"); // Const Field (functionId) @@ -130,8 +129,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionAlarmAckRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java index c56ff8b8d66..3be0eb08c87 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmAckResponse.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionAlarmAckResponse"); // Simple Field (functionId) @@ -126,8 +125,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionAlarmAckResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = readSimpleField("functionId", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java index 67f0ed073d6..86ef1925c10 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryRequest.java @@ -108,7 +108,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionAlarmQueryRequest"); // Const Field (functionId) @@ -202,8 +201,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionAlarmQueryRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short functionId = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java index 1bff09b4c69..8cf96d3469a 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionAlarmQueryResponse.java @@ -72,7 +72,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionAlarmQueryResponse"); // Array Field (items) @@ -109,8 +108,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionAlarmQueryResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); byte[] items = readBuffer.readByteArray("items", Math.toIntExact(dataLength)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java index b3456d53b1e..642c00f863e 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse.java @@ -100,7 +100,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse"); // Simple Field (result) @@ -160,8 +159,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionAlarmResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short result = readSimpleField("result", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java index ad21923a356..c75ceaf52e1 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest.java @@ -93,7 +93,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest"); // Simple Field (Subscription) @@ -158,8 +157,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short Subscription = readSimpleField("Subscription", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java index 30778765efd..e63f6c495c0 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse.java @@ -61,7 +61,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse"); writeBuffer.popContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse"); @@ -86,8 +85,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); readBuffer.closeContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionResponse"); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java index b4af396e7f6..d8f5fac1d79 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse"); // Simple Field (result) @@ -116,8 +115,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionMsgSubscriptionSysResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short result = readSimpleField("result", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java index 2ef1caa82b7..947c57fa9dc 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest.java @@ -61,7 +61,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest"); writeBuffer.popContext("S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest"); @@ -86,8 +85,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); readBuffer.closeContext("S7PayloadUserDataItemCpuFunctionReadSzlNoDataRequest"); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java index a7ca1d27785..31c17cd57de 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlRequest.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionReadSzlRequest"); // Simple Field (szlId) @@ -116,8 +115,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionReadSzlRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); SzlId szlId = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java index 53d665b6938..59cd4a3653c 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCpuFunctionReadSzlResponse.java @@ -72,7 +72,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCpuFunctionReadSzlResponse"); // Array Field (items) @@ -109,8 +108,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCpuFunctionReadSzlResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); byte[] items = readBuffer.readByteArray("items", Math.toIntExact(dataLength)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java index 5befacafb65..c1ea18e262d 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenPush.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesChangeDrivenPush"); // Simple Field (itemsCount) @@ -122,8 +121,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesChangeDrivenPush"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int itemsCount = readSimpleField("itemsCount", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java index 8653ab2f18b..38bc3d39110 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse"); // Simple Field (itemsCount) @@ -122,8 +121,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int itemsCount = readSimpleField("itemsCount", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java index e6638a7ad49..f9613dcb1ad 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesErrorResponse.java @@ -61,7 +61,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesErrorResponse"); writeBuffer.popContext("S7PayloadUserDataItemCyclicServicesErrorResponse"); @@ -86,8 +85,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesErrorResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); readBuffer.closeContext("S7PayloadUserDataItemCyclicServicesErrorResponse"); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java index 0231b5d84b7..c2341a414b8 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesPush.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesPush"); // Simple Field (itemsCount) @@ -122,8 +121,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesPush"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int itemsCount = readSimpleField("itemsCount", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java index fb33e91d2cc..7376db3a7cf 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeRequest.java @@ -93,7 +93,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesSubscribeRequest"); // Simple Field (itemsCount) @@ -153,8 +152,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesSubscribeRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int itemsCount = readSimpleField("itemsCount", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java index bc9aae25987..fbef37afb23 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesSubscribeResponse.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesSubscribeResponse"); // Simple Field (itemsCount) @@ -122,8 +121,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesSubscribeResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int itemsCount = readSimpleField("itemsCount", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java index b1b484f92c2..eadbcbbb3f7 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeRequest.java @@ -79,7 +79,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesUnsubscribeRequest"); // Simple Field (function) @@ -116,8 +115,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesUnsubscribeRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short function = readSimpleField("function", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java index 47608319a09..9e3e74c323c 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadUserDataItemCyclicServicesUnsubscribeResponse.java @@ -61,7 +61,6 @@ protected void serializeS7PayloadUserDataItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadUserDataItemCyclicServicesUnsubscribeResponse"); writeBuffer.popContext("S7PayloadUserDataItemCyclicServicesUnsubscribeResponse"); @@ -86,8 +85,6 @@ public static S7PayloadUserDataItemBuilder staticParseS7PayloadUserDataItemBuild throws ParseException { readBuffer.pullContext("S7PayloadUserDataItemCyclicServicesUnsubscribeResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); readBuffer.closeContext("S7PayloadUserDataItemCyclicServicesUnsubscribeResponse"); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java index 48d4a5a334e..5c31abe5b18 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarRequest.java @@ -62,7 +62,6 @@ public List getItems() { protected void serializeS7PayloadChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadWriteVarRequest"); // Array Field (items) @@ -98,8 +97,6 @@ public static S7PayloadBuilder staticParseS7PayloadBuilder( ReadBuffer readBuffer, Short messageType, S7Parameter parameter) throws ParseException { readBuffer.pullContext("S7PayloadWriteVarRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); List items = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java index 1f6e13cea17..fca9a9f20d6 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7PayloadWriteVarResponse.java @@ -62,7 +62,6 @@ public List getItems() { protected void serializeS7PayloadChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7PayloadWriteVarResponse"); // Array Field (items) @@ -98,8 +97,6 @@ public static S7PayloadBuilder staticParseS7PayloadBuilder( ReadBuffer readBuffer, Short messageType, S7Parameter parameter) throws ParseException { readBuffer.pullContext("S7PayloadWriteVarResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); List items = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java index 4483814eac5..813eb4234a5 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java @@ -65,7 +65,6 @@ public byte[] getData() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7VarPayloadDataItem"); // Simple Field (returnCode) @@ -154,8 +153,6 @@ public static S7VarPayloadDataItem staticParse(ReadBuffer readBuffer, Object... public static S7VarPayloadDataItem staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7VarPayloadDataItem"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DataTransportErrorCode returnCode = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java index aec0f0e161a..718ce59fab0 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadStatusItem.java @@ -52,7 +52,6 @@ public DataTransportErrorCode getReturnCode() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7VarPayloadStatusItem"); // Simple Field (returnCode) @@ -94,8 +93,6 @@ public static S7VarPayloadStatusItem staticParse(ReadBuffer readBuffer, Object.. public static S7VarPayloadStatusItem staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7VarPayloadStatusItem"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); DataTransportErrorCode returnCode = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItem.java index 2623497f18c..a6bf2223a27 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItem.java @@ -50,7 +50,6 @@ protected abstract void serializeS7VarRequestParameterItemChild(WriteBuffer writ public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7VarRequestParameterItem"); // Discriminator Field (itemType) (Used as input to a switch field) @@ -90,8 +89,6 @@ public static S7VarRequestParameterItem staticParse(ReadBuffer readBuffer, Objec public static S7VarRequestParameterItem staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7VarRequestParameterItem"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short itemType = readDiscriminatorField("itemType", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java index 18cb81bd5fa..2acc460e075 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarRequestParameterItemAddress.java @@ -59,7 +59,6 @@ protected void serializeS7VarRequestParameterItemChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("S7VarRequestParameterItemAddress"); // Implicit Field (itemLength) (Used for parsing, but its value is not stored as it's implicitly @@ -97,8 +96,6 @@ public static S7VarRequestParameterItemBuilder staticParseS7VarRequestParameterI ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("S7VarRequestParameterItemAddress"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short itemLength = readImplicitField("itemLength", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java index 82d8fb4ae96..488cc8dc647 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/State.java @@ -102,7 +102,6 @@ public boolean getSIG_1() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("State"); // Simple Field (SIG_8) @@ -178,8 +177,6 @@ public static State staticParse(ReadBuffer readBuffer, Object... args) throws Pa public static State staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("State"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); boolean SIG_8 = readSimpleField("SIG_8", readBoolean(readBuffer)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java index ef70ef5de58..620086f2625 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SubItem.java @@ -64,7 +64,6 @@ public int getStartAddress() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("SubItem"); // Simple Field (bytesToRead) @@ -110,8 +109,6 @@ public static SubItem staticParse(ReadBuffer readBuffer, Object... args) throws public static SubItem staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("SubItem"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short bytesToRead = readSimpleField("bytesToRead", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java index 3dd2c85acbe..f0795feaa37 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SyntaxIdType.java @@ -46,7 +46,7 @@ public enum SyntaxIdType { } } - private short value; + private final short value; SyntaxIdType(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java index de5e20b0536..e656a4637ab 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlDataTreeItem.java @@ -76,7 +76,6 @@ public int getAusbe() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("SzlDataTreeItem"); // Simple Field (itemIndex) @@ -137,8 +136,6 @@ public static SzlDataTreeItem staticParse(ReadBuffer readBuffer, Object... args) public static SzlDataTreeItem staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("SzlDataTreeItem"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int itemIndex = readSimpleField("itemIndex", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java index 8f46b999d75..69c2b8d94d3 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlId.java @@ -64,7 +64,6 @@ public SzlSublist getSublistList() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("SzlId"); // Simple Field (typeClass) @@ -122,8 +121,6 @@ public static SzlId staticParse(ReadBuffer readBuffer, Object... args) throws Pa public static SzlId staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("SzlId"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); SzlModuleTypeClass typeClass = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java index 4f93cc8312e..18ffefb3f04 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlModuleTypeClass.java @@ -37,7 +37,7 @@ public enum SzlModuleTypeClass { } } - private byte value; + private final byte value; SzlModuleTypeClass(byte value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java index 36bb532d160..3659cf9fa0a 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/SzlSublist.java @@ -59,7 +59,7 @@ public enum SzlSublist { } } - private short value; + private final short value; SzlSublist(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java index 10351a8a735..10eab0edc43 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TPKTPacket.java @@ -59,7 +59,6 @@ public short getProtocolId() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("TPKTPacket"); // Const Field (protocolId) @@ -130,8 +129,6 @@ public static TPKTPacket staticParse(ReadBuffer readBuffer, Object... args) public static TPKTPacket staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("TPKTPacket"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short protocolId = diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java index 2552f372192..573645a8e68 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TimeBase.java @@ -36,7 +36,7 @@ public enum TimeBase { } } - private short value; + private final short value; TimeBase(short value) { this.value = value; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java index 4b70936705e..d99705e7540 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/TransportSize.java @@ -373,18 +373,18 @@ public enum TransportSize { } } - private short value; - private boolean supported_S7_300; - private boolean supported_LOGO; - private short code; - private short sizeInBytes; - private boolean supported_S7_400; - private boolean supported_S7_1200; - private short shortName; - private boolean supported_S7_1500; - private DataTransportSize dataTransportSize; - private String dataProtocolId; - private TransportSize baseType; + private final short value; + private final boolean supported_S7_300; + private final boolean supported_LOGO; + private final short code; + private final short sizeInBytes; + private final boolean supported_S7_400; + private final boolean supported_S7_1200; + private final short shortName; + private final boolean supported_S7_1500; + private final DataTransportSize dataTransportSize; + private final String dataProtocolId; + private final TransportSize baseType; TransportSize( short value, @@ -431,7 +431,7 @@ public static TransportSize firstEnumForFieldSupported_S7_300(boolean fieldValue } public static List enumsForFieldSupported_S7_300(boolean fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getSupported_S7_300() == fieldValue) { _values.add(_val); @@ -454,7 +454,7 @@ public static TransportSize firstEnumForFieldSupported_LOGO(boolean fieldValue) } public static List enumsForFieldSupported_LOGO(boolean fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getSupported_LOGO() == fieldValue) { _values.add(_val); @@ -477,7 +477,7 @@ public static TransportSize firstEnumForFieldCode(short fieldValue) { } public static List enumsForFieldCode(short fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getCode() == fieldValue) { _values.add(_val); @@ -500,7 +500,7 @@ public static TransportSize firstEnumForFieldSizeInBytes(short fieldValue) { } public static List enumsForFieldSizeInBytes(short fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getSizeInBytes() == fieldValue) { _values.add(_val); @@ -523,7 +523,7 @@ public static TransportSize firstEnumForFieldSupported_S7_400(boolean fieldValue } public static List enumsForFieldSupported_S7_400(boolean fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getSupported_S7_400() == fieldValue) { _values.add(_val); @@ -546,7 +546,7 @@ public static TransportSize firstEnumForFieldSupported_S7_1200(boolean fieldValu } public static List enumsForFieldSupported_S7_1200(boolean fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getSupported_S7_1200() == fieldValue) { _values.add(_val); @@ -569,7 +569,7 @@ public static TransportSize firstEnumForFieldShortName(short fieldValue) { } public static List enumsForFieldShortName(short fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getShortName() == fieldValue) { _values.add(_val); @@ -592,7 +592,7 @@ public static TransportSize firstEnumForFieldSupported_S7_1500(boolean fieldValu } public static List enumsForFieldSupported_S7_1500(boolean fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getSupported_S7_1500() == fieldValue) { _values.add(_val); @@ -615,7 +615,7 @@ public static TransportSize firstEnumForFieldDataTransportSize(DataTransportSize } public static List enumsForFieldDataTransportSize(DataTransportSize fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getDataTransportSize() == fieldValue) { _values.add(_val); @@ -638,7 +638,7 @@ public static TransportSize firstEnumForFieldDataProtocolId(String fieldValue) { } public static List enumsForFieldDataProtocolId(String fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getDataProtocolId().equals(fieldValue)) { _values.add(_val); @@ -661,7 +661,7 @@ public static TransportSize firstEnumForFieldBaseType(TransportSize fieldValue) } public static List enumsForFieldBaseType(TransportSize fieldValue) { - List _values = new ArrayList(); + List _values = new ArrayList<>(); for (TransportSize _val : TransportSize.values()) { if (_val.getBaseType() == fieldValue) { _values.add(_val); diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java index 9ca081a0bc4..1010e3eee3a 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7CyclicEvent.java @@ -23,6 +23,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.nio.charset.Charset; +import java.time.Duration; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; @@ -44,6 +45,7 @@ import org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse; import org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCyclicServicesPush; import org.apache.plc4x.java.s7.readwrite.S7PayloadUserDataItemCyclicServicesSubscribeResponse; +import org.apache.plc4x.java.s7.readwrite.utils.StaticHelper; /** * @@ -73,13 +75,15 @@ public enum Fields{ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesPush event) { this.map = new HashMap(); this.timeStamp = Instant.now(); - this.request = request; + this.request = request; map.put(Fields.TYPE.name(), "CYCEVENT"); map.put(Fields.TIMESTAMP.name(),this.timeStamp); map.put(Fields.JOBID.name(), jobid); - map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount()); - for (int i=0; i { + int i = n[0]; map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue()); map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue()); byte[] buffer = new byte[event.getItems().get(i).getData().size()]; @@ -88,8 +92,23 @@ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserD buffer[j] = s.byteValue(); j ++; }); - map.put(Fields.DATA_.name()+i, buffer); - } + map.put(tagname, buffer); + n[0]++; + }); + + +// for (int i=0; i{ +// buffer[j] = s.byteValue(); +// j ++; +// }); +// map.put(Fields.DATA_.name()+i, buffer); +// } } public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesChangeDrivenPush event) { @@ -99,8 +118,11 @@ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserD map.put(Fields.TYPE.name(), "CYCEVENT"); map.put(Fields.TIMESTAMP.name(),this.timeStamp); map.put(Fields.JOBID.name(), jobid); - map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount()); - for (int i=0; i { + int i = n[0]; map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue()); map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue()); byte[] buffer = new byte[event.getItems().get(i).getData().size()]; @@ -109,8 +131,20 @@ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserD buffer[j] = s.byteValue(); j ++; }); - map.put(Fields.DATA_.name()+i, buffer); - } + map.put(tagname, buffer); + n[0]++; + }); +// for (int i=0; i{ +// buffer[j] = s.byteValue(); +// j ++; +// }); +// map.put(Fields.DATA_.name()+i, buffer); +// } } public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesSubscribeResponse event) { @@ -121,7 +155,10 @@ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserD map.put(Fields.TIMESTAMP.name(),this.timeStamp); map.put(Fields.JOBID.name(), jobid); map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount()); - for (int i=0; i { + int i = n[0]; map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue()); map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue()); byte[] buffer = new byte[event.getItems().get(i).getData().size()]; @@ -130,8 +167,20 @@ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserD buffer[j] = s.byteValue(); j ++; }); - map.put(Fields.DATA_.name()+i, buffer); - } + map.put(tagname, buffer); + n[0]++; + }); +// for (int i=0; i{ +// buffer[j] = s.byteValue(); +// j ++; +// }); +// map.put(Fields.DATA_.name()+i, buffer); +// } } public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse event) { @@ -142,7 +191,10 @@ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserD map.put(Fields.TIMESTAMP.name(),this.timeStamp); map.put(Fields.JOBID.name(), jobid); map.put(Fields.ITEMSCOUNT.name(), event.getItemsCount()); - for (int i=0; i { + int i = n[0]; map.put(Fields.RETURNCODE_.name()+i, event.getItems().get(i).getReturnCode().getValue()); map.put(Fields.TRANSPORTSIZE_.name()+i, event.getItems().get(i).getTransportSize().getValue()); byte[] buffer = new byte[event.getItems().get(i).getData().size()]; @@ -151,8 +203,20 @@ public S7CyclicEvent(PlcSubscriptionRequest request, short jobid, S7PayloadUserD buffer[j] = s.byteValue(); j ++; }); - map.put(Fields.DATA_.name()+i, buffer); - } + map.put(tagname, buffer); + n[0]++; + }); +// for (int i=0; i{ +// buffer[j] = s.byteValue(); +// j ++; +// }); +// map.put(Fields.DATA_.name()+i, buffer); +// } } @Override @@ -167,22 +231,22 @@ public Instant getTimestamp() { @Override public PlcReadRequest getRequest() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public PlcValue getAsPlcValue() { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public PlcValue getPlcValue(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public int getNumberOfValues(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override @@ -193,54 +257,66 @@ public Object getObject(String name) { @Override public Object getObject(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public Collection getAllObjects(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public boolean isValidBoolean(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidBoolean(name, 0); } @Override public boolean isValidBoolean(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + boolean dummy = getBoolean(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public Boolean getBoolean(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getBoolean(name, 0); } @Override public Boolean getBoolean(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + if (!(map.get(name) instanceof byte[])) + throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); + ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); + int pos = index * 1; + return byteBuf.getBoolean(pos); } @Override public Collection getAllBooleans(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public boolean isValidByte(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidByte(name, 0); } @Override public boolean isValidByte(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + byte dummy = getByte(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public Byte getByte(String name) { - if (!(map.get(name) instanceof Byte)) - throw new UnsupportedOperationException("Field is not a Byte. Required Byte type."); - return (byte) map.get(name); + return getByte(name, 0); } @Override @@ -248,7 +324,7 @@ public Byte getByte(String name, int index) { if (!(map.get(name) instanceof byte[])) throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); - int pos = index*Byte.BYTES; + int pos = index * Byte.BYTES; return byteBuf.getByte(pos); } @@ -266,18 +342,22 @@ public Collection getAllBytes(String name) { @Override public boolean isValidShort(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidShort(name, 0); } @Override public boolean isValidShort(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + short dummy = getShort(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public Short getShort(String name) { - if (!(map.get(name) instanceof Short)) return null; - return (short) map.get(name); + return getShort(name, 0); } @Override @@ -285,8 +365,8 @@ public Short getShort(String name, int index) { if (!(map.get(name) instanceof byte[])) throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); - int pos = index*Short.BYTES; - return byteBuf.getShort(index); + int pos = index * Short.BYTES; + return byteBuf.getShort(pos); } @Override @@ -301,17 +381,22 @@ public Collection getAllShorts(String name) { @Override public boolean isValidInteger(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidInteger(name, 0); } @Override public boolean isValidInteger(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + int dummy = getInteger(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public Integer getInteger(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getInteger(name, 0); } @Override @@ -319,7 +404,7 @@ public Integer getInteger(String name, int index) { if (!(map.get(name) instanceof byte[])) throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); - int pos = index*Integer.BYTES; + int pos = index * Integer.BYTES; return byteBuf.getInt(pos); } @@ -335,42 +420,47 @@ public Collection getAllIntegers(String name) { @Override public boolean isValidBigInteger(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public boolean isValidBigInteger(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public BigInteger getBigInteger(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public BigInteger getBigInteger(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public Collection getAllBigIntegers(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public boolean isValidLong(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidLong(name, 0); } @Override public boolean isValidLong(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + long dummy = getLong(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public Long getLong(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getLong(name, 0); } @Override @@ -394,17 +484,22 @@ public Collection getAllLongs(String name) { @Override public boolean isValidFloat(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidFloat(name, 0); } @Override public boolean isValidFloat(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + float dummy = getFloat(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public Float getFloat(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getFloat(name, 0); } @Override @@ -428,17 +523,22 @@ public Collection getAllFloats(String name) { @Override public boolean isValidDouble(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidDouble(name, 0); } @Override public boolean isValidDouble(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + double dummy = getDouble(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public Double getDouble(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getDouble(name, 0); } @Override @@ -462,37 +562,42 @@ public Collection getAllDoubles(String name) { @Override public boolean isValidBigDecimal(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public boolean isValidBigDecimal(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public BigDecimal getBigDecimal(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public BigDecimal getBigDecimal(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public Collection getAllBigDecimals(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public boolean isValidString(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidString(name, 0); } @Override public boolean isValidString(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + String dummy = getString(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override @@ -505,102 +610,175 @@ public String getString(String name) { @Override public String getString(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public Collection getAllStrings(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } @Override public boolean isValidTime(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidTime(name, 0); } @Override public boolean isValidTime(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + LocalTime dummy = getTime(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public LocalTime getTime(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getTime(name, 0); } + /* + * In S7, data type TIME occupies one double word. + * The value is in milliseconds (ms). + */ @Override public LocalTime getTime(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + if (!(map.get(name) instanceof byte[])) + throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); + ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); + int pos = index * Integer.BYTES; + int value = byteBuf.getInt(pos); + Duration dr = StaticHelper.S7TimeToDuration(value); + LocalTime time = LocalTime.of((int) dr.toHoursPart(), (int) dr.toMinutesPart(), (int) dr.toSecondsPart(), (int) dr.toNanosPart()); + return time; } @Override public Collection getAllTimes(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + if (!(map.get(name) instanceof byte[])) + throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); + ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); + int nitems = (byteBuf.capacity() / Integer.BYTES); + + List items = new ArrayList(); + + for (int i = 0; i < nitems; i++) { + items.add(getTime(name, i)); + } + + return items; } @Override public boolean isValidDate(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidDate(name, 0); } @Override public boolean isValidDate(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + LocalDate dummy = getDate(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public LocalDate getDate(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getDate(name, 0); } @Override public LocalDate getDate(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + if (!(map.get(name) instanceof byte[])) + throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); + ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); + int pos = index * Short.BYTES; + short value = byteBuf.getShort(pos); + LocalDate date = StaticHelper.S7DateToLocalDate(value); + + return date; } @Override public Collection getAllDates(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + if (!(map.get(name) instanceof byte[])) + throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); + ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); + int nitems = (byteBuf.capacity() / Short.BYTES); + + List items = new ArrayList(); + + for (int i = 0; i < nitems; i++) { + items.add(getDate(name, i)); + } + + return items; } @Override public boolean isValidDateTime(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return isValidDateTime(name, 0); } @Override public boolean isValidDateTime(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + try { + LocalDateTime dummy = getDateTime(name, index); + return true; + } catch (Exception ex) { + return false; + } } @Override public LocalDateTime getDateTime(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + return getDateTime(name, 0); } @Override public LocalDateTime getDateTime(String name, int index) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + if (!(map.get(name) instanceof byte[])) + throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); + ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); + int pos = index * Long.BYTES; + + LocalDateTime datetime = StaticHelper.S7DateTimeToLocalDateTime(byteBuf.slice(pos, Long.BYTES)); + + return datetime; } @Override public Collection getAllDateTimes(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + if (!(map.get(name) instanceof byte[])) + throw new UnsupportedOperationException("Field is not a buffer of bytes. Required byte[] type."); + ByteBuf byteBuf = Unpooled.wrappedBuffer((byte[]) map.get(name)); + int nitems = (byteBuf.capacity() / Long.BYTES); + + List items = new ArrayList(); + + for (int i = 0; i < nitems; i++) { + items.add(getDateTime(name, i)); + } + + return items; } @Override public Collection getTagNames() { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + throw new UnsupportedOperationException("Not supported yet."); } @Override public PlcTag getTag(String name) { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + throw new UnsupportedOperationException("Not supported yet."); } @Override public PlcResponseCode getResponseCode(String name) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + throw new UnsupportedOperationException("Not supported yet."); } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7ModeEvent.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7ModeEvent.java index aeb1923ec85..d84122a60ac 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7ModeEvent.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/events/S7ModeEvent.java @@ -56,6 +56,7 @@ public S7ModeEvent(S7ParameterModeTransition parameter) { map.put(Fields.CURRENT_MODE.name(), parameter.getCurrentMode()); this.timeStamp = Instant.now(); map.put(Fields.TIMESTAMP .name(), this.timeStamp ); + map.put(Fields.MAP.name(), map); } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java index 8a931a3e789..89906f60c3b 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7Driver.java @@ -136,5 +136,7 @@ public void accept(ByteBuf byteBuf) { public S7Tag prepareTag(String tagAddress){ return S7Tag.of(tagAddress); } + + } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java index 039e91b1f78..466f0e8affd 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/configuration/S7Configuration.java @@ -76,20 +76,20 @@ public class S7Configuration implements Configuration, TcpTransportConfiguration public String controllerType; @ConfigurationParameter("read-timeout") - @IntDefaultValue(8) - public int readTimeout = 8; + @IntDefaultValue(0) + public int readTimeout = 0; @ConfigurationParameter("ping") @BooleanDefaultValue(false) public boolean ping = false; @ConfigurationParameter("ping-time") - @IntDefaultValue(-1) - public int pingTime = -1; + @IntDefaultValue(0) + public int pingTime = 0; @ConfigurationParameter("retry-time") - @IntDefaultValue(4) - public int retryTime = 4; + @IntDefaultValue(0) + public int retryTime = 0; public int getLocalRack() { @@ -213,7 +213,7 @@ public void setPingTime(int pingTime) { } public int getRetryTime() { - return pingTime; + return retryTime; } public void setRetryTime(int retryTime) { diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java index b4ccec193fe..40e6806c8d4 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/context/S7DriverContext.java @@ -84,7 +84,8 @@ public void setConfiguration(S7Configuration configuration) { this.readTimeout = configuration.readTimeout; this.ping = configuration.ping; - this.pingTime = configuration.pingTime; + this.pingTime = (configuration.pingTime == 0)?10:configuration.pingTime; + this.retryTime = configuration.retryTime; } public boolean isPassiveMode() { @@ -184,7 +185,7 @@ public void setPingTime(int pingTime) { } public int getRetryTime() { - return pingTime; + return retryTime; } public void setRetryTime(int retryTime) { diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java index d33ca435bee..0572fb9a1b8 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/optimizer/S7Optimizer.java @@ -50,9 +50,9 @@ public class S7Optimizer extends BaseOptimizer { new S7AddressAny(TransportSize.INT, 1, 1, MemoryArea.DATA_BLOCKS, 1, (byte) 0).getLengthInBytes(); @Override - protected List processReadRequest(PlcReadRequest readRequest, DriverContext driverContext) { + protected List processReadRequest(PlcReadRequest readRequest, DriverContext driverContext) { S7DriverContext s7DriverContext = (S7DriverContext) driverContext; - List processedRequests = new LinkedList<>(); + List processedRequests = new LinkedList<>(); // This calculates the size of the header for the request and response. int curRequestSize = EMPTY_READ_REQUEST_SIZE; @@ -116,10 +116,11 @@ protected List processReadRequest(PlcReadRequest readRequest, Driver return processedRequests; } + @Override - protected List processWriteRequest(PlcWriteRequest writeRequest, DriverContext driverContext) { + protected List processWriteRequest(PlcWriteRequest writeRequest, DriverContext driverContext) { S7DriverContext s7DriverContext = (S7DriverContext) driverContext; - List processedRequests = new LinkedList<>(); + List processedRequests = new LinkedList<>(); // This calculates the size of the header for the request and response. int curRequestSize = EMPTY_WRITE_REQUEST_SIZE; diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java index f8e91e6150b..bb700ae03ce 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HGeneratedDriverBase.java @@ -149,7 +149,7 @@ public PlcConnection getConnection(String connectionString) throws PlcConnection awaitDiscoverComplete = Boolean.parseBoolean(System.getProperty(PROPERTY_PLC4X_FORCE_AWAIT_DISCOVER_COMPLETE)); } - return new S7HDefaultNettyPlcConnection( + return new S7HPlcConnection( canRead(), canWrite(), canSubscribe(), canBrowse(), getTagHandler(), getValueHandler(), diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java index a7b68c30283..9697d6d774b 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMux.java @@ -25,5 +25,6 @@ public interface S7HMux { public void setEmbededhannel(Channel embeded_channel); public void setPrimaryChannel(Channel primary_channel); public void setSecondaryChannel(Channel secondary_channel); +public Channel getTCPChannel(); } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java index 58b9969bbeb..b0c02e71c90 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HMuxImpl.java @@ -30,8 +30,11 @@ import io.netty.util.AttributeKey; import java.time.LocalTime; import java.util.List; +import java.util.concurrent.TimeUnit; import org.apache.plc4x.java.spi.events.ConnectEvent; +import org.apache.plc4x.java.spi.events.ConnectedEvent; import org.apache.plc4x.java.spi.events.DisconnectEvent; +import org.apache.plc4x.java.spi.events.DisconnectedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,6 +63,15 @@ public class S7HMuxImpl extends MessageToMessageCodec implemen */ final static AttributeKey IS_CONNECTED = AttributeKey.valueOf("IS_CONNECTED"); + /* + * This attribute indicates to the other handlers that the channel is connected + * or disconnected because a switch is being made between TCP channels or + * both TCP channels are disconnected. + * Default value: false + */ + final static AttributeKey WAS_CONNECTED = AttributeKey.valueOf("WAS_CONNECTED"); + + /* * This attribute indicates to the other handlers which channel is being used, * this allows the request to be properly prepared. @@ -118,7 +130,6 @@ public class S7HMuxImpl extends MessageToMessageCodec implemen */ @Override protected void encode(ChannelHandlerContext ctx, ByteBuf outbb, List list) throws Exception { - //System.out.println("Llego aqui: " + ByteBufUtil.hexDump(outbb)); if ((embed_ctx == null) && (ctx.channel() instanceof EmbeddedChannel)) embed_ctx = ctx; if ((tcp_channel != null) && (embed_ctx == ctx)){ tcp_channel.writeAndFlush(outbb.copy()); @@ -133,7 +144,7 @@ protected void encode(ChannelHandlerContext ctx, ByteBuf outbb, List lis * the pipeline of the channel "embeded_channel" */ @Override - protected void decode(ChannelHandlerContext ctx, ByteBuf inbb, List list) throws Exception { + protected void decode(ChannelHandlerContext ctx, ByteBuf inbb, List list) throws Exception { embed_ctx.fireChannelRead(inbb.copy()); } @@ -157,28 +168,31 @@ public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exceptio /* * The events detected here flow from the S7ProtocolLogic object. - * Upon receiving the "ConnectEvent" event, we must safely add the watchdog + * Upon receiving the "ConnectedEvent" event, we must safely add the watchdog * to the pipeline of the "tcp_channel" connection. * The supervision time can be defined in the connection URL, - * the default value being 8 secs, this value being defined experimentally. + * the default value being 0 secs disabling this function. + * This value being defined experimentally, a typical value is 8 seconds. */ @Override public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception { super.userEventTriggered(ctx, evt); logger.info(LocalTime.now().toString() + " userEventTriggered: " + ctx.name() + " Event: " + evt); - if (evt instanceof ConnectEvent) { + if (evt instanceof ConnectedEvent) { try { tcp_channel.pipeline().remove("watchdog"); } catch (Exception ex){ logger.info(ex.toString()); } try { - tcp_channel.pipeline().addFirst("watchdog", new ReadTimeoutHandler(30)); + if (embeded_channel.attr(READ_TIME_OUT).get() > 0) + tcp_channel.pipeline().addFirst("watchdog", + new ReadTimeoutHandler(embeded_channel.attr(READ_TIME_OUT).get())); if (tcp_channel.isActive()) { - embeded_channel.attr(IS_CONNECTED).set(true); + embeded_channel.attr(IS_CONNECTED).set(true); } else { embeded_channel.attr(IS_CONNECTED).set(false); - } + } } catch (Exception ex){ logger.info(ex.toString()); } @@ -213,47 +227,53 @@ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception { super.channelUnregistered(ctx); logger.debug(LocalTime.now().toString() + " channelUnregistered: " + ctx.name() ); String strCanal = (tcp_channel == primary_channel)?"PRIMARY":"SECONDARY"; - logger.debug("Unregistered of channel: " + strCanal); + logger.info("Unregistered of channel: " + strCanal); //TODO: If embedded channel is closed, we need close all channels if (ctx == embed_ctx) return; - if (tcp_channel == ctx.channel()) - embeded_channel.attr(IS_CONNECTED).set(false); + if (tcp_channel == ctx.channel()) { + embeded_channel.attr(IS_CONNECTED).set(false); + embeded_channel.attr(WAS_CONNECTED).set(true); + embeded_channel.pipeline().fireUserEventTriggered(new DisconnectedEvent()); + } logger.info(embed_ctx.executor().toString()); if ((tcp_channel == primary_channel) && (primary_channel == ctx.channel())) if ((!primary_channel.isActive()) && - (secondary_channel != null)) { - if (secondary_channel.isActive()) + (secondary_channel != null)) + if (secondary_channel.isActive()) { synchronized(tcp_channel) { logger.info("Using secondary TCP channel."); tcp_channel = secondary_channel; embeded_channel.attr(IS_PRIMARY).set(false); - embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent()); + embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent()); } }; - + if ((tcp_channel == secondary_channel) && (secondary_channel == ctx.channel())) - if ((!secondary_channel.isActive() && - (primary_channel.isActive()))) { - synchronized(tcp_channel) { + if ((!secondary_channel.isActive()) && + (primary_channel != null)) + if (primary_channel.isActive()) { + synchronized(tcp_channel) { logger.info("Using primary TCP channel."); tcp_channel = primary_channel; - embeded_channel.attr(IS_PRIMARY).set(true); - embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent()); + embeded_channel.attr(IS_PRIMARY).set(true); + embeded_channel.pipeline().fireUserEventTriggered(new ConnectEvent()); } - } + } + } @Override public void setEmbededhannel(Channel embeded_channel) { this.embeded_channel = embeded_channel; - this.embeded_channel.attr(IS_CONNECTED).set(false); + this.embeded_channel.attr(IS_CONNECTED).set(false); + this.embeded_channel.attr(WAS_CONNECTED).set(false); this.embeded_channel.attr(IS_PRIMARY).set(true); this.embeded_channel.attr(READ_TIME_OUT).set(8); this.embeded_channel.attr(IS_PING_ACTIVE).set(false); @@ -261,25 +281,35 @@ public void setEmbededhannel(Channel embeded_channel) { this.embeded_channel.attr(RETRY_TIME).set(8); } + @Override public void setPrimaryChannel(Channel primary_channel) { if ((this.primary_channel == null) && (tcp_channel == null)){ if (primary_channel != null){ this.primary_channel = primary_channel; tcp_channel = primary_channel; - embeded_channel.attr(IS_PRIMARY).set(true); + embeded_channel.attr(IS_PRIMARY).set(true); } - } else if ((!this.primary_channel.isActive()) && (tcp_channel == secondary_channel)){ + } else if ((this.primary_channel == null) || + ((tcp_channel == secondary_channel)) && (tcp_channel.isActive())){ + this.primary_channel = primary_channel; + + } else if ((!this.primary_channel.isActive()) && (tcp_channel == secondary_channel)){ this.primary_channel = primary_channel; - } else if ((!this.primary_channel.isActive()) && (tcp_channel == this.primary_channel)){ + + } else if (((!this.primary_channel.isActive()) && (tcp_channel == this.primary_channel)) || + (primary_channel.isActive())) { synchronized(tcp_channel) { tcp_channel.close(); this.primary_channel = primary_channel; tcp_channel = primary_channel; - embeded_channel.attr(IS_PRIMARY).set(true); - if (tcp_channel.isActive()) { - embed_ctx.fireUserEventTriggered(new ConnectEvent()); + embeded_channel.attr(IS_PRIMARY).set(true); + + if (tcp_channel.isActive()) { + embed_ctx.fireUserEventTriggered(new ConnectEvent()); } } + } else if (primary_channel.isActive()) { + } } @@ -291,11 +321,16 @@ public void setSecondaryChannel(Channel secondary_channel) { tcp_channel = secondary_channel; embeded_channel.attr(IS_PRIMARY).set(false); } - } else if ((this.secondary_channel == null) || (tcp_channel == primary_channel)){ + + } else if ((this.secondary_channel == null) || + ((tcp_channel == primary_channel)) && (tcp_channel.isActive())){ this.secondary_channel = secondary_channel; + } else if ((!this.secondary_channel.isActive()) && (tcp_channel == primary_channel)){ this.secondary_channel = secondary_channel; - } else if ((!this.secondary_channel.isActive()) && (tcp_channel == this.secondary_channel)){ + + } else if (((!this.secondary_channel.isActive()) && (tcp_channel == this.secondary_channel)) || + (secondary_channel.isActive())){ synchronized(tcp_channel) { tcp_channel.close(); this.secondary_channel = secondary_channel; @@ -307,6 +342,11 @@ public void setSecondaryChannel(Channel secondary_channel) { } } } + + @Override + public Channel getTCPChannel() { + return tcp_channel; + } } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HDefaultNettyPlcConnection.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java similarity index 65% rename from plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HDefaultNettyPlcConnection.java rename to plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java index 4ff983d010d..0e93414c363 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HDefaultNettyPlcConnection.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7HPlcConnection.java @@ -20,16 +20,25 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; +import io.netty.channel.EventLoop; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.MessageToMessageCodec; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; +import java.util.Timer; +import java.util.TimerTask; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.apache.plc4x.java.api.authentication.PlcAuthentication; import org.apache.plc4x.java.api.exceptions.PlcConnectionException; +import org.apache.plc4x.java.api.listener.ConnectionStateListener; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; import org.apache.plc4x.java.api.value.PlcValueHandler; @@ -40,24 +49,38 @@ import org.apache.plc4x.java.spi.connection.PlcTagHandler; import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer; import org.apache.plc4x.java.spi.events.CloseConnectionEvent; +import org.apache.plc4x.java.spi.events.ConnectEvent; +import org.apache.plc4x.java.spi.events.ConnectedEvent; import org.apache.plc4x.java.spi.events.DisconnectEvent; +import org.apache.plc4x.java.spi.events.DisconnectedEvent; import org.apache.plc4x.java.spi.optimizer.BaseOptimizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * - * @author cgarcia + * This object generates the main connection and includes the management + * of multiple connections to the PLC, in the case of S7H there + * are two connections. + * Here the reference to the multiplexer object (S7HMuxImpl) is maintained, + * which is in charge of managing the physical TCP connections. + * + * TODO: It should be able to run in the "channel" executor. + * You should be able to remove the "executor". */ -public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection implements Runnable{ +public class S7HPlcConnection extends DefaultNettyPlcConnection implements Runnable { - private static final Logger logger = LoggerFactory.getLogger(S7HDefaultNettyPlcConnection.class); + private static final Logger logger = LoggerFactory.getLogger(S7HPlcConnection.class); private static final String MULTIPLEXOR = "MULTIPLEXOR"; private Boolean closed = false; private ScheduledFuture scf = null; - + private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new BasicThreadFactory.Builder() + .namingPattern("plc4x-s7ha-thread-%d") + .daemon(true) + .priority(Thread.MAX_PRIORITY) + .build()); + protected final ChannelFactory secondaryChannelFactory; protected Channel primary_channel = null; protected Channel secondary_channel = null; @@ -66,7 +89,7 @@ public class S7HDefaultNettyPlcConnection extends DefaultNettyPlcConnection impl protected int slice_ping = 0; protected int slice_retry_time = 0; - public S7HDefaultNettyPlcConnection(boolean canRead, + public S7HPlcConnection(boolean canRead, boolean canWrite, boolean canSubscribe, boolean canBrowse, @@ -142,11 +165,11 @@ public void connect() throws PlcConnectionException { sendChannelDisconectEvent(); throw new PlcConnectionException("Connection is not possible."); } - - scf = channel.eventLoop().scheduleWithFixedDelay(this, 1, 1, TimeUnit.SECONDS); + + scf = executor.scheduleAtFixedRate(this, 1, 1, TimeUnit.SECONDS); /* - primary_channel.closeFuture().addListener(future -> { + primary_channel.closeFuture().addListener(future -> {/watch?v=TmENMZFUU_0&list=RDlBlx1JffMQ4&index=27 if (!sessionDiscoveredCompleteFuture.isDone()) { //Do Nothing try { @@ -159,7 +182,6 @@ public void connect() throws PlcConnectionException { }); */ - // Send an event to the pipeline telling the Protocol filters what's going on. sendChannelCreatedEvent(); @@ -170,6 +192,7 @@ public void connect() throws PlcConnectionException { //channel.pipeline().write(new ConnectedEvent()); // Set the connection to "connected" connected = true; + //((EmbeddedChannel) channel).runPendingTasks(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); throw new PlcConnectionException(e); @@ -208,31 +231,40 @@ public void close() throws PlcConnectionException { channel.pipeline().fireUserEventTriggered(new DisconnectEvent()); closed = true; } - + + @Override + public boolean isConnected() { + return channel.attr(S7HMuxImpl.IS_CONNECTED).get(); + } + public void doPrimaryTcpConnections(){ try { - primary_channel = channelFactory.createChannel(new LoggingHandler(LogLevel.TRACE) ); + primary_channel = channelFactory.createChannel(new LoggingHandler(LogLevel.TRACE) ); } catch (Exception ex){ + primary_channel = null; logger.info(ex.toString()); } - if (primary_channel!=null) - if (primary_channel.isActive()) + if (primary_channel != null) + if (primary_channel.isActive()) { primary_channel.pipeline().addFirst(MULTIPLEXOR,s7hmux); - ((S7HMux) s7hmux).setPrimaryChannel(primary_channel); + ((S7HMux) s7hmux).setPrimaryChannel(primary_channel); + } } public void doSecondaryTcpConnections(){ try { secondary_channel = secondaryChannelFactory.createChannel(new LoggingHandler(LogLevel.TRACE) ); } catch (Exception ex){ + secondary_channel = null; logger.info(ex.toString()); } - if (secondary_channel!=null) - if (secondary_channel.isActive()) + if (secondary_channel != null) + if (secondary_channel.isActive()) { secondary_channel.pipeline().addFirst(MULTIPLEXOR,s7hmux); - ((S7HMux) s7hmux).setSecondaryChannel(secondary_channel); + ((S7HMux) s7hmux).setSecondaryChannel(secondary_channel); + } } /* @@ -251,51 +283,107 @@ protected void sendChannelDisconectEvent() { * To avoid creating new tasks associated with the supervision of the * driver, I execute these tasks in a few slices of time. This allows me * to keep a simple control of the state machines. + * Verifies disconnection of the channel, which notifies the client + * that they are listening. */ @Override - public void run() { + public void run() { + + /* + * Here a driver reconnection is detected. If so, a connection event + * is generated, so the user application can generate its requests again. + */ + if ((channel.attr(S7HMuxImpl.WAS_CONNECTED).get()) && + (channel.attr(S7HMuxImpl.IS_CONNECTED).get())) { + (channel.attr(S7HMuxImpl.WAS_CONNECTED)).set(false); + channel.pipeline().fireUserEventTriggered(new ConnectedEvent()); + } + + /* + * Execute the ping towards the PLC. Its purpose is to keep + * the TCP channel active, for very long sampling periods. + */ + if ((channel.attr(S7HMuxImpl.IS_PING_ACTIVE).get())) { + if (slice_ping >= channel.attr(S7HMuxImpl.PING_TIME).get()) { + ping(); + slice_ping = 0; + }; + slice_ping++; + } else slice_ping = 0; + + /* + * Here it is verified if the channels are active. If they are not, + * the connection is created again. + * For H type systems, at least one of the connections must be active, + * and if the other is down, the connection must be lifted. + * S7HMuxImpl, includes the switching logic between the TCP links. + */ if (slice_retry_time >= channel.attr(S7HMuxImpl.RETRY_TIME).get()) { + if (primary_channel != null){ if (!primary_channel.isActive()){ - logger.info("Creating prymary conection."); + logger.info("Creating prymary connection."); primary_channel.eventLoop().shutdownGracefully(); doPrimaryTcpConnections(); - } + } else if (null == secondary_channel) + if ((channel.attr(S7HMuxImpl.WAS_CONNECTED).get()) && + (!channel.attr(S7HMuxImpl.IS_CONNECTED).get())) { + logger.info("Reconnecting primary channel."); + if (null != ((S7HMux) s7hmux).getTCPChannel()) { + ((S7HMux) s7hmux).setPrimaryChannel(primary_channel); + } + } } else { - logger.info("Creating firts prymary conection."); + logger.info("Creating firts prymary connection."); doPrimaryTcpConnections(); } if (secondary_channel != null){ if (!secondary_channel.isActive()){ - logger.info("Creating secondary conection."); + logger.info("Creating secondary connection."); secondary_channel.eventLoop().shutdownGracefully(); doSecondaryTcpConnections(); - } + } else if (null == primary_channel) + if ((channel.attr(S7HMuxImpl.WAS_CONNECTED).get()) && + (!channel.attr(S7HMuxImpl.IS_CONNECTED).get())) { + logger.info("Reconnecting secondary channel."); + if (null != ((S7HMux) s7hmux).getTCPChannel()) { + ((S7HMux) s7hmux).setSecondaryChannel(secondary_channel); + } + } } else { if (secondaryChannelFactory != null ) { - logger.info("Creating firts secondary conection."); + logger.info("Creating firts secondary connection."); doSecondaryTcpConnections(); } } slice_retry_time = 0; }; - - if ((channel.attr(S7HMuxImpl.IS_PING_ACTIVE).get())) { - if (slice_ping >= channel.attr(S7HMuxImpl.PING_TIME).get()) { - ping(); - slice_ping = 0; - }; - } else slice_ping = 0; - - slice_retry_time++; - slice_ping++; + + if (channel.attr(S7HMuxImpl.RETRY_TIME).get() > 0) + slice_retry_time++; + + connected = channel.attr(S7HMuxImpl.IS_CONNECTED).get(); + logger.trace("*************************************************\r\n" + +"INSTAMCIA PRIMARIO : " + ((null == primary_channel)?"NULL":primary_channel.toString()) + "\r\n" + +"ACTIVO PRIMARIO : " + ((null == primary_channel)?"NULL":primary_channel.isActive()) + "\r\n" + +"INSTAMCIA SECUNDARIO : " + ((null == secondary_channel)?"NULL":secondary_channel.toString()) + "\r\n" + +"ACTIVO SECUNDARIO : " + ((null == secondary_channel)?"NULL":secondary_channel.isActive()) + "\r\n" + +"CANAL CONECTADO? : " + channel.attr(S7HMuxImpl.IS_CONNECTED).get() + "\r\n" + +"CANAL ESTUVO CONECTADO? : " + channel.attr(S7HMuxImpl.WAS_CONNECTED).get() + "\r\n" + +"CONTADORES : " + slice_ping + " : " + slice_retry_time + "\r\n" + +"*************************************************"); } - + + /* + * PING to PLC. + */ @Override public CompletableFuture ping() { if (channel.attr(S7HMuxImpl.IS_CONNECTED).get()) { - channel.eventLoop().execute(()->{ + + //channel.eventLoop().execute(()->{ + executor.execute(()->{ PlcReadRequest.Builder builder = readRequestBuilder(); builder.addTagAddress("value", "%MX1.0:BOOL"); @@ -303,7 +391,7 @@ public CompletableFuture ping() { try { PlcReadResponse readResponse = readRequest.execute().get(2, TimeUnit.SECONDS); - logger.info("PING: " + readResponse.getResponseCode("value")); + logger.debug("PING: " + readResponse.getResponseCode("value")); } catch (Exception ex){ logger.info("PING: " + ex.toString()); } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java index 56835b7e17c..f875d0cf8cf 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolEventLogic.java @@ -28,6 +28,7 @@ import java.util.function.Consumer; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent; import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; @@ -57,8 +58,8 @@ public class S7ProtocolEventLogic implements PlcSubscriber { private Map> mapIndex = new HashMap(); private Map eventtypehandles = new HashMap(); ; - private final Runnable runnProcessor; - private final Runnable runnDispacher; + private final Runnable runProcessor; + private final Runnable runDispacher; private Thread processor; @@ -66,10 +67,21 @@ public class S7ProtocolEventLogic implements PlcSubscriber { public S7ProtocolEventLogic(BlockingQueue eventqueue) { this.eventqueue = eventqueue; - runnProcessor = new ObjectProcessor(eventqueue,dispachqueue); - runnDispacher = new EventDispacher(dispachqueue); - processor = new Thread(runnProcessor); - dispacher = new Thread(runnDispacher); + runProcessor = new ObjectProcessor(eventqueue,dispachqueue); + runDispacher = new EventDispacher(dispachqueue); +// processor = new Thread(runnProcessor); +// dispacher = new Thread(runnDispacher); + processor = new BasicThreadFactory.Builder() + .namingPattern("plc4x-evt-processor-thread-%d") + .daemon(true) + .priority(Thread.MAX_PRIORITY) + .build().newThread(runProcessor); + + dispacher = new BasicThreadFactory.Builder() + .namingPattern("plc4x-evt-dispacher-thread-%d") + .daemon(true) + .priority(Thread.MAX_PRIORITY) + .build().newThread(runDispacher); } public void start() { @@ -78,8 +90,8 @@ public void start() { } public void stop(){ - ((ObjectProcessor) runnProcessor).doShutdown(); - ((EventDispacher) runnDispacher).doShutdown(); + ((ObjectProcessor) runProcessor).doShutdown(); + ((EventDispacher) runDispacher).doShutdown(); } @Override @@ -158,7 +170,7 @@ public void run() { Logger.getLogger(S7ProtocolEventLogic.class.getName()).log(Level.SEVERE, null, ex); } } - System.out.println("ObjectProcessor Bye!"); + logger.info("ObjectProcessor Bye!"); } public void doShutdown(){ @@ -209,12 +221,19 @@ public void run() { } }else if (obj instanceof S7CyclicEvent) { if (mapIndex.containsKey(EventType.CYC)) { + Map mapConsumers = mapIndex.get(EventType.CYC); if (cycDelayedObject != null) { mapConsumers.forEach((x,y) -> y.accept(cycDelayedObject)); cycDelayedObject = null; } - mapConsumers.forEach((x,y) -> y.accept(obj)); + mapConsumers.forEach((x,y) -> { + S7PlcSubscriptionHandle sh = (S7PlcSubscriptionHandle) x.getSubscriptionHandles().get(0); + Short id = Short.parseShort(sh.getEventId()); + if (((S7CyclicEvent) obj).getMap().get("JOBID") == id) + y.accept(obj); + }); + } else { cycDelayedObject = obj; } @@ -224,7 +243,7 @@ public void run() { Logger.getLogger(S7ProtocolEventLogic.class.getName()).log(Level.SEVERE, null, ex); } } - System.out.println("EventDispacher Bye!"); + logger.info("EventDispacher Bye!"); } public void doShutdown(){ diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java index 343754c0cb6..a27c3ce8dcc 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java @@ -23,6 +23,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; +import io.netty.channel.embedded.EmbeddedChannel; import org.apache.plc4x.java.api.exceptions.PlcProtocolException; import org.apache.plc4x.java.api.exceptions.PlcRuntimeException; import org.apache.plc4x.java.api.messages.PlcReadRequest; @@ -97,7 +98,7 @@ */ public class S7ProtocolLogic extends Plc4xProtocolBase { - private final Logger logger = LoggerFactory.getLogger(S7ProtocolLogic.class); + private static final Logger logger = LoggerFactory.getLogger(S7ProtocolLogic.class); public static final Duration REQUEST_TIMEOUT = Duration.ofMillis(10000); private final AtomicInteger tpduGenerator = new AtomicInteger(10); @@ -125,7 +126,7 @@ public class S7ProtocolLogic extends Plc4xProtocolBase { private final S7PlcSubscriptionHandle sysHandle = new S7PlcSubscriptionHandle(EventType.SYS, EventLogic); private final S7PlcSubscriptionHandle usrHandle = new S7PlcSubscriptionHandle(EventType.USR, EventLogic); private final S7PlcSubscriptionHandle almHandle = new S7PlcSubscriptionHandle(EventType.ALM, EventLogic); - private final S7PlcSubscriptionHandle cycHandle = new S7PlcSubscriptionHandle(EventType.CYC,EventLogic); + //private final S7PlcSubscriptionHandle cycHandle = new S7PlcSubscriptionHandle(EventType.CYC, EventLogic); /* * For the reconnection functionality by a "TimeOut" of the connection, @@ -136,6 +137,15 @@ public class S7ProtocolLogic extends Plc4xProtocolBase { * his request. */ private HashMap> active_requests = new HashMap<>(); + + /* + * This array stores the cyclic subscription requests between the driver + * and the PLC. The purpose is to document the tags associated with the + * request. Each subscription uses a 'JobID' that is managed by the PLC and + * obtained from the response to the request. In the following, + * the values sent PUSH from the PLC to the driver refer to this JobID. + */ + private final Map cycrequests = new HashMap<>(); private S7DriverContext s7DriverContext; @@ -165,9 +175,13 @@ public void onConnect(ConversationContext context) { return; } + // If the call is for a reconnection, we must clean up + // the queued messages so that they release the transaction handler. + cleanFutures(); + //Set feature for all handlers in the pipeline from //the driver configuration. - setChannelFeatures(); + setChannelFeatures(); // Only the TCP transport supports login. logger.info("S7 Driver running in ACTIVE mode."); @@ -217,7 +231,7 @@ public void onConnect(ConversationContext context) { // in order to detect the type of PLC. if (s7DriverContext.getControllerType() != S7ControllerType.ANY) { // Send an event that connection setup is complete. - context.fireConnected(); + context.fireConnected(); return; } @@ -373,11 +387,13 @@ private CompletableFuture readInternal(S7Message request) { S7Message message = (request instanceof S7MessageUserData) ? new S7MessageUserData(tpduId, request.getParameter(), request.getPayload()) : new S7MessageRequest(tpduId, request.getParameter(), request.getPayload()); - + TPKTPacket tpktPacket = new TPKTPacket(new COTPPacketData(null, message, true, (short) tpduId)); - + // Start a new request-transaction (Is ended in the response-handler) + RequestTransactionManager.RequestTransaction transaction = tm.startRequest(); + transaction.submit(() -> context.sendRequest(tpktPacket) .onTimeout(new TransactionErrorCallback<>(future, transaction)) .onError(new TransactionErrorCallback<>(future, transaction)) @@ -391,7 +407,7 @@ private CompletableFuture readInternal(S7Message request) { active_requests.remove(future); future.complete(p); // Finish the request-transaction. - transaction.endRequest(); + transaction.endRequest(); })); active_requests.put(future, new MutablePair<>(transaction, null)); @@ -489,6 +505,8 @@ public CompletableFuture subscribe(PlcSubscriptionReque CompletableFuture response = new CompletableFuture<>(); subscriptionRequest.getTagNames().forEach(fieldname -> futures.put(fieldname, new CompletableFuture<>())); + // + futures.put("DATA_", new CompletableFuture<>()); DefaultPlcSubscriptionRequest request = (DefaultPlcSubscriptionRequest) subscriptionRequest; @@ -502,8 +520,10 @@ public CompletableFuture subscribe(PlcSubscriptionReque Thread t1 = new Thread(()->{ - for (String tagName : request.getTagNames()) { - final DefaultPlcSubscriptionTag sf = (DefaultPlcSubscriptionTag) request.getTag(tagName); + //for (String tagName : request.getTagNames()) { + //System.out.println("Aqui repite: " + tagName); + //final DefaultPlcSubscriptionTag sf = (DefaultPlcSubscriptionTag) request.getTag(tagName); + final DefaultPlcSubscriptionTag sf = (DefaultPlcSubscriptionTag) request.getTags().get(0); final S7SubscriptionTag tag = (S7SubscriptionTag) sf.getTag(); switch (tag.getTagType()) { @@ -520,69 +540,76 @@ public CompletableFuture subscribe(PlcSubscriptionReque encodeAlarmQueryRequest(request, parameterItems, payloadItems); break; case CYCLIC_SUBSCRIPTION: - encodeCycledS7ANYSubscriptionRequest(request.getTag(tagName), parameterItems, payloadItems); + encodeCycledS7ANYSubscriptionRequest(request, parameterItems, payloadItems); break; case CYCLIC_DB_SUBSCRIPTION: - encodeCycledDBREADSubscriptionRequest(request.getTag(tagName), parameterItems, payloadItems); + encodeCycledDBREADSubscriptionRequest(request, parameterItems, payloadItems); break; case CYCLIC_UNSUBSCRIPTION: - //encodeCycledUnSubscriptionRequest(request, parameterItems, payloadItems); + encodeCycledUnSubscriptionRequest(request, parameterItems, payloadItems); break; default: - } - //final PlcValue plcValue = request.getPlcValue(tagName); - //parameterItems.add(new S7VarRequestParameterItemAddress(encodeS7Address(tag))); - //payloadItems.add(serializePlcValue(tag, plcValue)); - final int tpduId = tpduGenerator.getAndIncrement(); - // If we've reached the max value for a 16 bit transaction identifier, reset back to 1 - if (tpduGenerator.get() == 0xFFFF) { - tpduGenerator.set(1); - } + } + //} //Next + + //final PlcValue plcValue = request.getPlcValue(tagName); + //parameterItems.add(new S7VarRequestParameterItemAddress(encodeS7Address(tag))); + //payloadItems.add(serializePlcValue(tag, plcValue)); + final int tpduId = tpduGenerator.getAndIncrement(); + // If we've reached the max value for a 16 bit transaction identifier, reset back to 1 + if (tpduGenerator.get() == 0xFFFF) { + tpduGenerator.set(1); + } - TPKTPacket tpktPacket = new TPKTPacket(new COTPPacketData(null, - new S7MessageUserData(tpduId, - new S7ParameterUserData(parameterItems), - new S7PayloadUserData(payloadItems)), - true, (short) tpduId)); - - // Start a new request-transaction (Is ended in the response-handler) - RequestTransactionManager.RequestTransaction transaction = tm.startRequest(); - transaction.submit(() -> context.sendRequest(tpktPacket) - .onTimeout(new TransactionErrorCallback<>(future, transaction)) - .onError(new TransactionErrorCallback<>(future, transaction)) - .expectResponse(TPKTPacket.class, REQUEST_TIMEOUT) - .check(p -> p.getPayload() instanceof COTPPacketData) - .unwrap(p -> ((COTPPacketData) p.getPayload())) - .unwrap(COTPPacket::getPayload) - .check(p -> p.getTpduReference() == tpduId) - .handle(p -> { - try { - //future.complete(decodeEventSubscriptionRequest(tagName, p, subscriptionRequest)); - futures.get(tagName).complete(p); - } catch (Exception e) { - logger.warn("Error sending 'write' message: '{}'", e.getMessage(), e); - } - // Finish the request-transaction. - transaction.endRequest(); - })); + TPKTPacket tpktPacket = new TPKTPacket(new COTPPacketData(null, + new S7MessageUserData(tpduId, + new S7ParameterUserData(parameterItems), + new S7PayloadUserData(payloadItems)), + true, (short) tpduId)); + + // Start a new request-transaction (Is ended in the response-handler) + RequestTransactionManager.RequestTransaction transaction = tm.startRequest(); + transaction.submit(() -> context.sendRequest(tpktPacket) + .onTimeout(new TransactionErrorCallback<>(future, transaction)) + .onError(new TransactionErrorCallback<>(future, transaction)) + .expectResponse(TPKTPacket.class, REQUEST_TIMEOUT) + .check(p -> p.getPayload() instanceof COTPPacketData) + .unwrap(p -> ((COTPPacketData) p.getPayload())) + .unwrap(COTPPacket::getPayload) + .check(p -> p.getTpduReference() == tpduId) + .handle(p -> { + try { + //future.complete(decodeEventSubscriptionRequest(tagName, p, subscriptionRequest)); + futures.get("DATA_").complete(p); + } catch (Exception e) { + logger.warn("Error sending 'write' message: '{}'", e.getMessage(), e); + } + // Finish the request-transaction. + transaction.endRequest(); + })); + + try { + S7Message responseMessage = futures.get("DATA_").get(); + S7ParameterUserData parameter = (S7ParameterUserData) responseMessage.getParameter(); + S7ParameterUserDataItemCPUFunctions msgparameter = (S7ParameterUserDataItemCPUFunctions) parameter.getItems().get(0); - try { - valuesResponse.put(tagName, decodeEventSubscriptionRequest(tagName, subscriptionRequest, futures.get(tagName).get())); - } catch (Exception ex) { - logger.warn(ex.toString()); - } + valuesResponse.put(Integer.toString(msgparameter.getSequenceNumber()), + decodeEventSubscriptionRequest(Integer.toString(msgparameter.getSequenceNumber()), subscriptionRequest, futures.get("DATA_").get())); - } //Next + } catch (Exception ex) { + logger.warn(ex.toString()); + } + try { - maintask.get(); + ///maintask.get(); HashMap> values = new HashMap<>(); - + valuesResponse.forEach((s,p)->{ if (p != null) values.putAll(((DefaultPlcSubscriptionResponse)p).getValues()); }); - + response.complete(new DefaultPlcSubscriptionResponse(subscriptionRequest, values)); } catch (Exception ex) { @@ -644,7 +671,7 @@ private void encodeEventSubscriptionRequest(DefaultPlcSubscriptionRequest reques S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest payload; - //System.out.println("Subsevent: " + subsevent + " : " + String.format("0x%04X", subsevent)); + if (subsevent > 0) { payload = new S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest( DataTransportErrorCode.OK, @@ -876,11 +903,15 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName S7ParameterUserDataItemCPUFunctions msgparameter = (S7ParameterUserDataItemCPUFunctions) parameter.getItems().get(0); + cycrequests.put(msgparameter.getSequenceNumber(), plcSubscriptionRequest); + S7CyclicEvent cycevent = new S7CyclicEvent(plcSubscriptionRequest, msgparameter.getSequenceNumber(), (S7PayloadUserDataItemCyclicServicesSubscribeResponse) payloadItems.get(0)); - eventQueue.add(cycevent); + eventQueue.add(cycevent); + + S7PlcSubscriptionHandle cycHandle = new S7PlcSubscriptionHandle(strTagName, EventType.CYC, EventLogic); values.put(strTagName, new ResponseItem(PlcResponseCode.OK, cycHandle)); return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values); @@ -889,11 +920,15 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName S7ParameterUserDataItemCPUFunctions msgparameter = (S7ParameterUserDataItemCPUFunctions) parameter.getItems().get(0); + cycrequests.put(msgparameter.getSequenceNumber(), plcSubscriptionRequest); + S7CyclicEvent cycevent = new S7CyclicEvent(plcSubscriptionRequest, msgparameter.getSequenceNumber(), (S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) payloadItems.get(0)); - eventQueue.add(cycevent); + eventQueue.add(cycevent); + + S7PlcSubscriptionHandle cycHandle = new S7PlcSubscriptionHandle(strTagName, EventType.CYC, EventLogic); values.put(strTagName, new ResponseItem(PlcResponseCode.OK, cycHandle)); return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest,values); @@ -1041,7 +1076,7 @@ private void encodeCycledSubscriptionRequest(DefaultPlcSubscriptionRequest reque } - private void encodeCycledS7ANYSubscriptionRequest(PlcSubscriptionTag plctag, + private void encodeCycledS7ANYSubscriptionRequest(DefaultPlcSubscriptionRequest request, List parameterItems, List payloadItems){ S7ParameterUserDataItemCPUFunctions parameter = new S7ParameterUserDataItemCPUFunctions( @@ -1059,25 +1094,46 @@ private void encodeCycledS7ANYSubscriptionRequest(PlcSubscriptionTag plctag, parameterItems.add(parameter); //TODO: Chequear la asignacionde tipo - - PlcTag tag = ((DefaultPlcSubscriptionTag) plctag).getTag(); - S7SubscriptionTag s7tag = (S7SubscriptionTag) tag; + + //PlcTag tag = ((DefaultPlcSubscriptionTag) plctag).getTag(); + //S7SubscriptionTag s7tag = (S7SubscriptionTag) tag; // - List items = new ArrayList(); + List items = new ArrayList(); + + request.getTags().forEach(tag -> { + +// PlcTag plctag = ((DefaultPlcSubscriptionTag) tag).getTag(); + S7SubscriptionTag s7tag = (S7SubscriptionTag ) ((DefaultPlcSubscriptionTag) ((PlcSubscriptionTag) tag)).getTag(); +// + for (S7Tag userfield:s7tag.getS7Tags()) { + items.add(new CycServiceItemAnyType( + (short) 0x0a, + (short) 0x10, //S7ANY + userfield.getDataType(), + userfield.getNumberOfElements(), + userfield.getBlockNumber(), + userfield.getMemoryArea(), + (long) (((userfield.getByteOffset() << 3) | (userfield.getBitOffset() & 0x0007))) + )); + } + }); + + S7SubscriptionTag s7tag_base = (S7SubscriptionTag) ((DefaultPlcSubscriptionTag) ((PlcSubscriptionTag) request.getTags().get(0))).getTag(); + // - int i=0; - for (S7Tag userfield:s7tag.getS7Tags()) { - items.add(new CycServiceItemAnyType( - (short) 0x0a, - (short) 0x10, //S7ANY - userfield.getDataType(), - userfield.getNumberOfElements(), - userfield.getBlockNumber(), - userfield.getMemoryArea(), - (long) (((userfield.getByteOffset() << 3) | (userfield.getBitOffset() & 0x0007))) - )); - i++; - } +// int i=0; +// for (S7Tag userfield:s7tag.getS7Tags()) { +// items.add(new CycServiceItemAnyType( +// (short) 0x0a, +// (short) 0x10, //S7ANY +// userfield.getDataType(), +// userfield.getNumberOfElements(), +// userfield.getBlockNumber(), +// userfield.getMemoryArea(), +// (long) (((userfield.getByteOffset() << 3) | (userfield.getBitOffset() & 0x0007))) +// )); +// i++; +// } // // //Length in bytes // //4+12*items.legth @@ -1089,17 +1145,17 @@ private void encodeCycledS7ANYSubscriptionRequest(PlcSubscriptionTag plctag, DataTransportSize.OCTET_STRING, lengthInBytes, items.size(), - s7tag.getTimeBase(), - s7tag.getMultiplier(), + s7tag_base.getTimeBase(), + s7tag_base.getMultiplier(), items ); - + payloadItems.clear(); payloadItems.add(payload); } - private void encodeCycledDBREADSubscriptionRequest(PlcSubscriptionTag plctag, + private void encodeCycledDBREADSubscriptionRequest(DefaultPlcSubscriptionRequest request, List parameterItems, List payloadItems){ S7ParameterUserDataItemCPUFunctions parameter = new S7ParameterUserDataItemCPUFunctions( @@ -1118,6 +1174,8 @@ private void encodeCycledDBREADSubscriptionRequest(PlcSubscriptionTag plctag, //TODO: Chequear la asignacionde tipo + PlcSubscriptionTag plctag = request.getTags().get(0); + PlcTag tag = ((DefaultPlcSubscriptionTag) plctag).getTag(); S7SubscriptionTag s7tag = (S7SubscriptionTag) tag; @@ -1186,25 +1244,25 @@ private void encodeCycledUnSubscriptionRequest(DefaultPlcSubscriptionRequest req parameterItems.clear(); parameterItems.add(parameter); - PlcSubscriptionTag tag = request.getTags().get(0); - S7SubscriptionTag s7tag = (S7SubscriptionTag) tag; + DefaultPlcSubscriptionTag tag = (DefaultPlcSubscriptionTag) request.getTags().get(0); + S7SubscriptionTag s7tag = (S7SubscriptionTag) tag.getTag(); //PlcField field = ((DefaultPlcSubscriptionField) plcfield).getPlcField(); //S7SubscriptionField s7field = (S7SubscriptionField) field; + payloadItems.clear(); //TODO:Check CPU type - S7PayloadUserDataItemCyclicServicesUnsubscribeRequest payload = - new S7PayloadUserDataItemCyclicServicesUnsubscribeRequest ( - DataTransportErrorCode.OK, - DataTransportSize.OCTET_STRING, - 0x02, - (short) 0x05, - s7tag.getAckAlarms().get(0).byteValue() - ); - - payloadItems.clear(); - payloadItems.add(payload); - + s7tag.getAckAlarms().forEach(jobid -> { + S7PayloadUserDataItemCyclicServicesUnsubscribeRequest payload = + new S7PayloadUserDataItemCyclicServicesUnsubscribeRequest ( + DataTransportErrorCode.OK, + DataTransportSize.OCTET_STRING, + 0x02, + (short) 0x05, + jobid.byteValue()); + + payloadItems.add(payload); + }); } /** @@ -1252,12 +1310,12 @@ protected void decode(ConversationContext context, TPKTPacket msg) t ((S7ParameterUserData) parameter).getItems().get(0); S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload(); - + S7PayloadUserDataItemCyclicServicesPush payloaditem = (S7PayloadUserDataItemCyclicServicesPush) payload.getItems().get(0); - S7CyclicEvent cycevent = new S7CyclicEvent(null, + S7CyclicEvent cycevent = new S7CyclicEvent(cycrequests.get(parameteritem.getSequenceNumber()), parameteritem.getSequenceNumber(), payloaditem); eventQueue.add(cycevent); @@ -1740,7 +1798,12 @@ protected S7Address encodeS7Address(PlcTag tag) { s7Tag.getMemoryArea(), s7Tag.getByteOffset(), s7Tag.getBitOffset()); } - + /* + * In the case of a reconnection, there may be requests waiting, + * for which the operation must be terminated by exception and canceled + * in the transaction manager. If this does not happen, + * the driver operation can be frozen. + */ private void cleanFutures(){ //TODO: Debe ser ejecutado si la conexion esta levanta. active_requests.forEach((f,p)->{ @@ -1758,8 +1821,7 @@ private void cleanFutures(){ logger.info(ex.toString()); } }); - active_requests.clear(); - + active_requests.clear(); } private boolean isConnected(){ @@ -1777,7 +1839,7 @@ private void setChannelFeatures(){ context.getChannel().attr(S7HMuxImpl.READ_TIME_OUT).set(s7DriverContext.getReadTimeout()); context.getChannel().attr(S7HMuxImpl.IS_PING_ACTIVE).set(s7DriverContext.getPing()); context.getChannel().attr(S7HMuxImpl.PING_TIME).set(s7DriverContext.getPingTime()); - context.getChannel().attr(S7HMuxImpl.RETRY_TIME).set(s7DriverContext.getRetryTime()); + context.getChannel().attr(S7HMuxImpl.RETRY_TIME).set(s7DriverContext.getRetryTime()); } @@ -1896,13 +1958,21 @@ static class TransactionErrorCallback implements Consume @Override public void accept(TimeoutException e) { - transaction.endRequest(); + try { + transaction.endRequest(); + } catch (Exception ex) { + logger.info(ex.getMessage()); + } future.completeExceptionally(e); } @Override public void accept(TPKTPacket tpktPacket, E e) { - transaction.endRequest(); + try { + transaction.endRequest(); + } catch (Exception ex) { + logger.info(ex.getMessage()); + } future.completeExceptionally(e); } } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java index dc5d7aac94c..d1fab5d82db 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/S7PlcSubscriptionHandle.java @@ -25,14 +25,26 @@ public class S7PlcSubscriptionHandle extends DefaultPlcSubscriptionHandle { private EventType eventtype; + private final String id; public S7PlcSubscriptionHandle(EventType eventtype, PlcSubscriber plcSubscriber) { super(plcSubscriber); this.eventtype = eventtype; + this.id = null; } + public S7PlcSubscriptionHandle(String id, EventType eventtype, PlcSubscriber plcSubscriber) { + super(plcSubscriber); + this.eventtype = eventtype; + this.id = id; + } + public EventType getEventType() { return eventtype; } + public String getEventId() { + return id; + } + } diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java index 10917dd3831..aa294fde283 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/utils/StaticHelper.java @@ -2138,7 +2138,8 @@ public static int RightShift3(final ReadBuffer buffer) throws ParseException { public static int RightShift3(final ReadBuffer buffer, DataTransportSize tsize) throws ParseException { int value = 0; - if (tsize == DataTransportSize.OCTET_STRING){ + if ((tsize == DataTransportSize.OCTET_STRING) || + (tsize == DataTransportSize.REAL)) { value = buffer.readUnsignedInt(16); } else { value = buffer.readUnsignedInt(16) >> 3; diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java index efd9b521455..58333b64720 100644 --- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java +++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/CycSubscription.java @@ -19,109 +19,210 @@ package org.apache.plc4x.examples.plc4j.s7event; import java.util.Map; +import java.util.Scanner; +import java.util.concurrent.TimeUnit; import org.apache.plc4x.java.DefaultPlcDriverManager; -import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; -import org.apache.plc4x.java.s7.events.S7AlarmEvent; import org.apache.plc4x.java.s7.events.S7CyclicEvent; -import org.apache.plc4x.java.s7.events.S7ModeEvent; -import org.apache.plc4x.java.s7.events.S7SysEvent; -import org.apache.plc4x.java.s7.events.S7UserEvent; -import org.apache.plc4x.java.s7.readwrite.protocol.S7ProtocolLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.simple.SimpleLogger; import org.apache.commons.codec.binary.Hex; +import org.apache.plc4x.java.api.exceptions.PlcConnectionException; +import org.apache.plc4x.java.api.listener.ConnectionStateListener; +import org.apache.plc4x.java.api.model.PlcConsumerRegistration; +import org.apache.plc4x.java.s7.readwrite.protocol.S7HPlcConnection; /** * Example for capturing events generated from a Siemens S7-300, S7-400 or VIPA PLC. - * Support for mode events ("MODE"), system events ("SYS"), user events ("USR") - * and alarms ("ALM"). + * Support for cyclical (CYC) subscriptions. * Each consumer shows the tags and associated values of the "map" containing * the event parameters. */ -public class CycSubscription { +public class CycSubscription implements ConnectionStateListener { //01 - private static final Logger logger = LoggerFactory.getLogger(CycSubscription.class); + private static final Logger logger = LoggerFactory.getLogger(CycSubscription.class); + private S7HPlcConnection connection = null; + private PlcSubscriptionRequest.Builder subs_request_builder; + private PlcSubscriptionRequest subs_request; + + private PlcSubscriptionResponse subs_response; + + private PlcConsumerRegistration csmr; + + private String jobId; /** * @param args the command line arguments */ public static void main(String[] args) throws Exception { - System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "trace"); - - try (PlcConnection connection = new DefaultPlcDriverManager().getConnection("s7://10.10.1.33?remote-rack=0&remote-slot=3&controller-type=S7_400")) { - final PlcSubscriptionRequest.Builder subscription = connection.subscriptionRequestBuilder(); + System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "debug"); + + try { + CycSubscription cyc = new CycSubscription(); + + cyc.OpenConnection(); + cyc.RegisterPlcTags(); + cyc.GetConnections(); + cyc.RegisterCYCHandles(); + + System.out.println("Waiting for events..."); + Scanner scanner = new Scanner(System.in); + System.out.println(scanner.nextLine()); + + cyc.UnRegisterCYCHandles(); + cyc.CloseConnection(); - //subscription.addEventTagAddress("myCYC", "CYC(B01SEC:5):%DB9002.DBB0[1]"); - subscription.addEventTagAddress("myCYC", "CYC(B01SEC:5):%MB190:BYTE"); + scanner.close(); + + } catch (Exception ex) { - final PlcSubscriptionRequest sub = subscription.build(); - final PlcSubscriptionResponse subresponse = sub.execute().get(); + } + } - //Si todo va bien con la subscripción puedo -// subresponse -// .getSubscriptionHandle("myMODE") -// .register(msg -> { -// System.out.println("******** S7ModeEvent ********"); -// Map map = ((S7ModeEvent) msg).getMap(); -// map.forEach((x, y) -> { -// System.out.println(x + " : " + y); -// }); -// System.out.println("****************************"); -// }); -// -// subresponse -// .getSubscriptionHandle("mySYS") -// .register(msg -> { -// System.out.println("******** S7SysEvent ********"); -// Map map = ((S7SysEvent) msg).getMap(); -// map.forEach((x, y) -> { -// if ("INFO1".equals(x)) { -// System.out.println(x + " : " + String.format("0x%04X", y)); -// } else if ("INFO2".equals(x)) { -// System.out.println(x + " : " + String.format("0x%08X", y)); -// } else System.out.println(x + " : " + y); -// }); -// System.out.println("****************************"); -// }); -// -// subresponse -// .getSubscriptionHandle("myUSR") -// .register(msg -> { -// System.out.println("******** S7UserEvent *******"); -// Map map = ((S7UserEvent) msg).getMap(); -// map.forEach((x, y) -> { -// System.out.println(x + " : " + y); -// }); -// System.out.println("****************************"); -// }); + /* + * Open the connection to the controller. + * This connection specifies the monitoring parameters of the connection. + * read-timeout = 8 ; Maximum wait time to see input data over the + * ; TCP channel (sec.). + * ping = true ; Enable the PING function. (boolean) + * ping-time = 4 ; Run the PING every N seconds. + * retry-time = 5 ; Number of seconds to wait for connection monitoring. + * ; Default value zero (0) disables it. + */ + public void OpenConnection() { + try { + connection = (S7HPlcConnection) new DefaultPlcDriverManager(). + getConnection("s7://10.10.1.33/10.10.1.34?remote-rack=0&remote-slot=3&remote-rack2=0&remote-slot=4&controller-type=S7_400&read-timeout=8&ping=true&ping-time=4&retry-time=5"); + connection.addEventListener(this); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + /* + * + */ + public void RegisterPlcTags(){ + subs_request_builder = connection.subscriptionRequestBuilder(); + + subs_request_builder.addEventTagAddress("myCYC01", "CYC(B1SEC:2):%DB2.DBD2:REAL"); + subs_request_builder.addEventTagAddress("myCYC02", "CYC(B1SEC:2):%DB2.DBB3:BYTE"); + subs_request_builder.addEventTagAddress("myCYC03", "CYC(B1SEC:2):%MB190:BYTE"); - subresponse - .getSubscriptionHandle("myCYC") - .register(msg -> { - System.out.println("******** CYC Event *********"); - Map map = ((S7CyclicEvent) msg).getMap(); - map.forEach((x, y) -> { - if (x.startsWith("DATA_", 0)) { - System.out.println("Longitud de datos: " + ((byte[]) y).length); - System.out.println(x + ": " + Hex.encodeHexString((byte[]) y)); - } else - System.out.println(x + " : " + y); - }); + subs_request = subs_request_builder.build(); + } + + /* + * Create the subscription Tags, only the first Tag is taken into account + * to define the request time. + * Here the jobId is also captured, which is a value sent from the PLC. + * At the moment it is received instead of the Tagname assigned in + * the subscription. + */ + public void GetConnections(){ + try { + subs_response = subs_request.execute().get(); + jobId = (String) subs_response.getTagNames().toArray()[0]; + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + /* + * Closes the connection to the PLC. + */ + public void CloseConnection() { + try { + connection.close(); + } catch (PlcConnectionException ex) { + ex.printStackTrace(); + } + } + + /* + * Here I register my event consumer with the associated jobId. + */ + public void RegisterCYCHandles() { + System.out.println("JOBID: " + jobId); + csmr = subs_response + .getSubscriptionHandle(jobId) + .register( msg -> { + final S7CyclicEvent cycMsg = (S7CyclicEvent) msg; + System.out.println("******** *********"); + Map map = cycMsg.getMap(); + map.keySet().forEach(key -> {System.out.println("Field available: " + key);}); + byte[] data01 = (byte[]) map.get("myCYC01"); + byte[] data02 = (byte[]) map.get("myCYC02"); + System.out.println("myCYC01" + ": " + Hex.encodeHexString(data01)); + System.out.println("myCYC02" + ": " + Hex.encodeHexString(data02)); + System.out.println("myCYC01" + ": " + cycMsg.getFloat("myCYC01")); + System.out.println("myCYC02" + ": " + cycMsg.getByte("myCYC02")); + System.out.println("myCYC03" + ": " + cycMsg.getByte("myCYC03")); System.out.println("****************************"); }); - - System.out.println("Waiting for events"); + } + + /* + * Secure unregistration process for event consumption. + * 1. Unsubscribe from the event dispatcher. + * 2. Cancels the subscription to the PLC, with the associated jobId. + */ + public void UnRegisterCYCHandles() { + + csmr.unregister(); - Thread.sleep(10000); + PlcSubscriptionResponse subresponse03 = null; + + final PlcSubscriptionRequest.Builder subscription03 = connection.subscriptionRequestBuilder(); + subscription03.addEventTagAddress("CANCELTAG", "CANCEL:" + jobId); + + final PlcSubscriptionRequest sub03 = subscription03.build(); - System.out.println("Bye..."); + try { + subresponse03 = sub03.execute().get(500, TimeUnit.MILLISECONDS); + } catch (Exception ex) { + ex.printStackTrace(); + } + System.out.println("UnRegisterCYCHandles: " + subresponse03.getResponseCode(jobId)); + + } + + /* + * For the S7H driver, up to three connections are foreseen, + * two real TCP and one virtual or embedded. + * The connection of interest is the embedded one. + * It is the one that we must monitor until the internal + * machine changes its state to connected. + */ + @Override + public void connected() { + System.out.println("Some connection return!"); + if (connection.isConnected()) { + System.out.println("Reconnecting return!"); + System.out.println("PASO 1!"); + RegisterPlcTags(); + System.out.println("PASO 2!"); + GetConnections(); + System.out.println("PASO 3!"); + RegisterCYCHandles(); + System.out.println("Salio de aqui!!!!."); } } + /* + * For the disconnection event we must unregister the event consumer. + * For asynchronous events, subscriptions must be restarted. + */ + @Override + public void disconnected() { + System.out.println("Trouble, trouble, we're offline! Status: " + connection.isConnected()); + csmr.unregister(); + } + + } diff --git a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java index a6a111b3829..d21c38d83a1 100644 --- a/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java +++ b/plc4j/examples/plc4j-s7event/src/main/java/org/apache/plc4x/examples/plc4j/s7event/EventSubscription.java @@ -53,25 +53,25 @@ public static void main(String[] args) throws Exception { try (PlcConnection connection = new DefaultPlcDriverManager().getConnection("s7://10.10.1.33?remote-rack=0&remote-slot=3&controller-type=S7_400")) { final PlcSubscriptionRequest.Builder subscription = connection.subscriptionRequestBuilder(); -// subscription.addEventTagAddress("myMODE", "MODE"); + subscription.addEventTagAddress("myMODE", "MODE"); // subscription.addEventTagAddress("mySYS", "SYS"); - subscription.addEventTagAddress("myUSR", "USR"); +// subscription.addEventTagAddress("myUSR", "USR"); // subscription.addEventTagAddress("myALM", "ALM"); final PlcSubscriptionRequest sub = subscription.build(); final PlcSubscriptionResponse subresponse = sub.execute().get(); //Si todo va bien con la subscripción puedo -// subresponse -// .getSubscriptionHandle("myMODE") -// .register(msg -> { -// System.out.println("******** S7ModeEvent ********"); -// Map map = ((S7ModeEvent) msg).getMap(); -// map.forEach((x, y) -> { -// System.out.println(x + " : " + y); -// }); -// System.out.println("****************************"); -// }); + subresponse + .getSubscriptionHandle("myMODE") + .register(msg -> { + System.out.println("******** S7ModeEvent ********"); + Map map = ((S7ModeEvent) msg).getMap(); + map.forEach((x, y) -> { + System.out.println(x + " : " + y); + }); + System.out.println("****************************"); + }); // // subresponse // .getSubscriptionHandle("mySYS") diff --git a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java index fac064e6fcc..6289b44ffb6 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-metadata/src/main/java/org/apache/plc4x/hop/metadata/util/Plc4xLookup.java @@ -35,7 +35,7 @@ */ public class Plc4xLookup extends AbstractLookup { private InstanceContent content = null; - private static Plc4xLookup def = new Plc4xLookup (); + private static Plc4xLookup INSTANCE = new Plc4xLookup (); public Plc4xLookup(InstanceContent content) { super(content); @@ -61,7 +61,7 @@ public void remove(Object obj) { } public static Plc4xLookup getDefault(){ - return def; + return INSTANCE; } private static final Convertor Plc4xConvertor = diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml index 1091369b0a1..036b24df72c 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/pom.xml @@ -160,5 +160,10 @@ org-openide-util-lookup RELEASE170 + + commons-codec + commons-codec + 1.15 + \ No newline at end of file diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java index 099dc1de1fc..a4d7a8d5bde 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xevent/Plc4xEvent.java @@ -14,20 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.plc4x.hop.transforms.plc4xevent; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.locks.ReentrantLock; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; @@ -43,68 +37,63 @@ import org.apache.hop.core.util.StringUtil; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.IHopMetadataProvider; +import org.apache.hop.pipeline.IExecutionStoppedListener; import org.apache.hop.pipeline.Pipeline; import org.apache.hop.pipeline.PipelineMeta; +import org.apache.hop.pipeline.engine.IPipelineEngine; import org.apache.hop.pipeline.transform.BaseTransform; -import org.apache.hop.pipeline.transform.ITransform; import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; import org.apache.plc4x.hop.metadata.util.Plc4xLookup; -import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; -import org.apache.plc4x.hop.transforms.plc4xinput.Plc4xRead; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; +import org.apache.plc4x.java.api.listener.ConnectionStateListener; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; import org.apache.plc4x.java.api.model.PlcConsumerRegistration; import org.apache.plc4x.java.api.types.PlcResponseCode; -import org.apache.plc4x.java.s7.events.S7AlarmEvent; import org.apache.plc4x.java.s7.events.S7Event; import org.apache.plc4x.java.s7.events.S7ModeEvent; -import org.apache.plc4x.java.s7.events.S7ModeEvent.Fields; import org.apache.plc4x.java.s7.events.S7SysEvent; import org.apache.plc4x.java.s7.events.S7UserEvent; -import org.apache.plc4x.java.s7.readwrite.ModeTransitionType; import org.openide.util.Lookup; /** - * This transform receives an event from the S7 driver, of type MODE, SYS, - * USR or ALM. Only one type can be processed at a time. + * This transform receives an event from the S7 driver, of type MODE, SYS, USR + * or ALM. Only one type can be processed at a time. * */ -public class Plc4xEvent extends BaseTransform { +public class Plc4xEvent extends BaseTransform implements ConnectionStateListener { public static String FIELD_MODE_EVENT = "MODE"; public static String FIELD_USER_EVENT = "USR"; public static String FIELD_SYS_EVENT = "SYS"; public static String FIELD_ALARM_EVENT = "ALM"; - private static final Class PKG = Plc4xEvent.class; // Needed by Translator - private Plc4xConnection connmeta = null; - private Plc4xWrapperConnection connwrapper = null; - private PlcReadRequest readRequest = null; - private PlcConsumerRegistration registerMode = null; - private PlcConsumerRegistration registerUser = null; - private PlcConsumerRegistration registerSys = null; - private PlcConsumerRegistration registerAlarm = null; - private PlcSubscriptionRequest subsbuild = null; - private PlcSubscriptionResponse subresponse = null; + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcConsumerRegistration registerMode = null; + private PlcConsumerRegistration registerUser = null; + private PlcConsumerRegistration registerSys = null; + private PlcConsumerRegistration registerAlarm = null; + private PlcSubscriptionRequest subsRequest = null; + private PlcSubscriptionResponse subresponse = null; private List remarks = new ArrayList<>(); // stores the errors... private Plc4xLookup lookup = Plc4xLookup.getDefault(); private Lookup.Template template = null; - private Lookup.Result result = null; + private Lookup.Result result = null; /* * The transfer of events is done from the driver tasks. A delay can be added * for the execution of this transformer. - */ + */ private ObjectMapper mapper = new ObjectMapper(); private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); private boolean stopBundle = false; @@ -115,8 +104,8 @@ public class Plc4xEvent extends BaseTransform { private static final String dummy = "dummy"; public Plc4xEvent(TransformMeta transformMeta, Plc4xEventMeta meta, Plc4xEventData data, int copyNr, PipelineMeta pipelineMeta, - Pipeline pipeline ) { - super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); + Pipeline pipeline) { + super(transformMeta, meta, data, copyNr, pipelineMeta, pipeline); } /* @@ -125,11 +114,11 @@ public Plc4xEvent(TransformMeta transformMeta, Plc4xEventMeta meta, Plc4xEventDa * @param meta Meta data from user dialog * @param remarks Error registers * @param origin transform instance name - */ - public static final RowMetaAndData buildRow(Plc4xEventMeta meta, - List remarks, - String origin) throws HopPluginException { - + */ + public static final RowMetaAndData buildRow(Plc4xEventMeta meta, + List remarks, + String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); Object[] rowData = RowDataUtil.allocateRowData(2); int index = 0; @@ -137,35 +126,35 @@ public static final RowMetaAndData buildRow(Plc4xEventMeta meta, ArrayList fields = new ArrayList(); if (meta.isModeEvent()) { - for (S7ModeEvent.Fields field:S7ModeEvent.Fields.values()) { + for (S7ModeEvent.Fields field : S7ModeEvent.Fields.values()) { fields.add(field.name()); } } else if (meta.isSysEvent()) { - for (S7SysEvent.Fields field:S7SysEvent.Fields.values()) { + for (S7SysEvent.Fields field : S7SysEvent.Fields.values()) { fields.add(field.name()); - } + } } else if (meta.isUserEvent()) { - for (S7UserEvent.Fields field:S7UserEvent.Fields.values()) { + for (S7UserEvent.Fields field : S7UserEvent.Fields.values()) { fields.add(field.name()); - } + } } else if (meta.isAlarmEvent()) { - fields.add("ALARM"); + fields.add("ALARM"); } for (String field : fields) { - IValueMeta valueMeta = - ValueMetaFactory.createValueMeta(field, IValueMeta.TYPE_STRING); // build a - rowData[index] = StringUtil.EMPTY_STRING; + IValueMeta valueMeta + = ValueMetaFactory.createValueMeta(field, IValueMeta.TYPE_STRING); // build a + rowData[index] = StringUtil.EMPTY_STRING; // Now add value to the row! // This is in fact a copy from the fields row, but now with data. rowMeta.addValueMeta(valueMeta); - index++; + index++; } return new RowMetaAndData(rowMeta, rowData); - } - - /* + } + + /* * 1. Block the other instances by means of a lock. * 2. Try to locate an existing connection. * 3. If it doesn't exist, it tries to take control of the routine to @@ -174,196 +163,103 @@ public static final RowMetaAndData buildRow(Plc4xEventMeta meta, * 5. If the connection to the PLC is made, then it creates the query * and executes it. * - */ - @Override - public boolean processRow() throws HopException { - Object[] r = getRow(); // Get row from input rowset & set row busy! - setLogLevel(LogLevel.DEBUG); - - if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { - setOutputDone(); // signal end to receiver(s) - return false; - } - - lock.lock(); //(01) - try { - IHopMetadataProvider metaprovider = getMetadataProvider(); - connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) - if (connwrapper != null) connwrapper.retain(); - }; - - if (connmeta == null){ - logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); - } + */ + @Override + public boolean processRow() throws HopException { + Object[] r = getRow(); // Get row from input rowset & set row busy! + setLogLevel(LogLevel.DEBUG); - if ((connmeta != null) && (connwrapper == null)){ - readRequest = null; - try{ - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - if (conn.isConnected()) { - connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); - getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) - } - } catch (Exception ex){ - setErrors(1L); - logError("Unable to create connection to PLC. " + ex.getMessage()); - } - } - } finally { - lock.unlock(); - } - - if ((connmeta != null) && (connwrapper != null)){ - if (connwrapper.getConnection().isConnected()){ - if (readRequest == null){ - final PlcSubscriptionRequest.Builder subscription = connwrapper.getConnection().subscriptionRequestBuilder(); //(05) - if (meta.isModeEvent()) subscription.addEventTagAddress(FIELD_MODE_EVENT, FIELD_MODE_EVENT); - if (meta.isUserEvent()) subscription.addEventTagAddress(FIELD_USER_EVENT, FIELD_USER_EVENT); - if (meta.isSysEvent()) subscription.addEventTagAddress(FIELD_SYS_EVENT, FIELD_SYS_EVENT); - if (meta.isAlarmEvent()) subscription.addEventTagAddress(FIELD_ALARM_EVENT, FIELD_ALARM_EVENT); - - subsbuild = subscription.build(); - - } - try { - subresponse = subsbuild.execute().get(); - - if (meta.isModeEvent() && subresponse.getResponseCode(FIELD_MODE_EVENT) == PlcResponseCode.OK) { - registerMode = - subresponse - .getSubscriptionHandle(FIELD_MODE_EVENT) - .register(msg -> { - events.add((S7Event) msg); - }); - } - - if (meta.isUserEvent() && subresponse.getResponseCode(FIELD_USER_EVENT) == PlcResponseCode.OK) { - registerUser = - subresponse - .getSubscriptionHandle(FIELD_USER_EVENT) - .register(msg -> { - events.add((S7Event) msg); - }); - } - - if (meta.isSysEvent() && subresponse.getResponseCode(FIELD_SYS_EVENT) == PlcResponseCode.OK) { - registerSys = - subresponse - .getSubscriptionHandle(FIELD_SYS_EVENT) - .register(msg -> { - events.add((S7Event) msg); - }); - } - - if (meta.isAlarmEvent() && subresponse.getResponseCode(FIELD_ALARM_EVENT) == PlcResponseCode.OK) { - registerAlarm = - subresponse - .getSubscriptionHandle(FIELD_ALARM_EVENT) - .register(msg -> { - events.add((S7Event) msg); - }); - } - - } catch (Exception ex) { - setErrors(1L); - logError("Unable read from PLC. " + ex.getMessage()); - } - - } else { - setErrors(1L); - logError("PLC is not connected."); - setOutputDone(); - return false; + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; } - - } else { - setErrors(1L); - logError("PLC connection don't exist."); - setOutputDone(); - return false; - } - while (events.size() == 0) { - try { - Thread.sleep(100); - if (stopBundle) { - setOutputDone(); // signal end to receiver(s) - return false; - } - } catch (InterruptedException ex) { - break; + // If we do not have the jobId, it is because we have not completed + // the CYC subscription. + if (null == subsRequest) { + RegisterPlcTags(); + GetSubscriptions(); + RegisterEventHandler(); } - } - - S7Event s7event = events.poll(); - index = 0; - r = data.outputRowMeta.cloneRow(data.outputRowData); - for (String name:data.outputRowMeta.getFieldNames()) { - System.out.println(name + ": " + s7event.getMap().get(name)); - if (null != s7event.getMap().get(name)) { - r[index++] = s7event.getMap().get(name).toString(); - } else { - try { - r[index++] = mapper.writer() - .writeValueAsString(s7event.getMap()); - } catch (Exception ex) { - Logger.getLogger(Plc4xEvent.class.getName()).log(Level.SEVERE, null, ex); + + if (!events.isEmpty()) { + S7Event s7event = events.poll(); + index = 0; + r = data.outputRowMeta.cloneRow(data.outputRowData); + for (String name : data.outputRowMeta.getFieldNames()) { + if (null != s7event.getMap().get(name)) { + if ("MAP".equals(name)) { + try { + r[index++] = mapper.writer() + .writeValueAsString(s7event.getMap()); + } catch (Exception ex) { + logError(ex.getMessage()); + } + } else { + r[index++] = s7event.getMap().get(name).toString(); + }; + } else { + try { + // r[index++] = mapper.writer() + // .writeValueAsString(s7event.getMap()); + r[index++] = null; + } catch (Exception ex) { + logError(ex.getMessage()); + } + } } - } - } - - data.prevDate = data.rowDate; - data.rowDate = new Date(); + data.prevDate = data.rowDate; + data.rowDate = new Date(); + + putRow(data.outputRowMeta, r); // return your data + data.rowsWritten++; + } - putRow(data.outputRowMeta, r ); // return your data - data.rowsWritten++; - return true; - } + if (isStopped()) { + setStopped(true); + return false; + } + return true; + } @Override public boolean init() { try { - if(super.init()){ + if (super.init()) { // Determine the number of rows to generate... data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); if (data.rowLimit < 0L) { // Unable to parse - logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); - return false; // fail - } + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } // Create a row (constants) with all the values in it... List remarks = new ArrayList<>(); // stores the errors... RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); if (!remarks.isEmpty()) { - for (int i = 0; i < remarks.size(); i++) { - CheckResult cr = (CheckResult) remarks.get(i); - logError(cr.getText()); - } - return false; + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; } data.outputRowData = outputRow.getData(); - data.outputRowMeta = outputRow.getRowMeta(); + data.outputRowMeta = outputRow.getRowMeta(); mapper.findAndRegisterModules(); getPlcConnection(); - + return true; } - + return false; - - } catch (Exception ex){ + + } catch (Exception ex) { setErrors(1L); logError("Error initializing transform", ex); return false; @@ -373,55 +269,75 @@ public boolean init() { /* * Here, must perform the cleaning of any resource, main of the connection to * the associated PLC. - */ + */ @Override public void cleanup() { - System.out.println("*************** CLEANUP *****************"); super.cleanup(); logBasic("Cleanup. Release connection."); if (null != connwrapper) { - if (null != registerMode ) registerMode.unregister(); - if (null != registerUser) registerUser.unregister(); - if (null != registerSys) registerSys.unregister(); - if (null != registerAlarm) registerAlarm.unregister(); - connwrapper.release(); - if (connwrapper.refCnt() <= 0) - lookup.remove(connwrapper); + if (null != registerMode) { + registerMode.unregister(); + } + if (null != registerUser) { + registerUser.unregister(); + } + if (null != registerSys) { + registerSys.unregister(); + } + if (null != registerAlarm) { + registerAlarm.unregister(); + } + connwrapper.release(); + if (connwrapper.refCnt() <= 0) { + lookup.remove(connwrapper); + } } } - + /* * Here, must perform the cleaning of any resource. * 1. Check if we have reference to wrapper. * 2. Release de reference to object. * 3. The lastone remove the global reference to connection wrapper. * 4. Clear local references. - */ + */ @Override public void dispose() { - System.out.println("*************** DISPOSE *****************"); super.dispose(); + if (null != registerMode) { + registerMode.unregister(); + } + if (null != registerUser) { + registerUser.unregister(); + } + if (null != registerSys) { + registerSys.unregister(); + } + if (null != registerAlarm) { + registerAlarm.unregister(); + } + if (connwrapper != null) { - logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); connwrapper.release(); - if (connwrapper.refCnt() <= 0) - lookup.remove(connwrapper); + if (connwrapper.refCnt() <= 0) { + lookup.remove(connwrapper); + } connwrapper = null; - readRequest = null; - registerMode = null; - registerUser = null; - registerSys = null; - registerAlarm = null; + subsRequest = null; + registerMode = null; + registerUser = null; + registerSys = null; + registerAlarm = null; } } - @Override public void stopRunning() throws HopException { super.stopRunning(); stopBundle = true; } - + private void getPlcConnection() { lock.lock(); //(01) try { @@ -429,37 +345,38 @@ private void getPlcConnection() { IHopMetadataProvider metaprovider = getMetadataProvider(); connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); result = lookup.lookup(template); if (!result.allItems().isEmpty()) { - System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + logBasic("Using connection: " + meta.getConnection()); connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; - if (connwrapper != null) connwrapper.retain(); + if (connwrapper != null) { + connwrapper.retain(); + } } }; - if (connmeta == null){ + if (connmeta == null) { logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); } - if ((connmeta != null) && (connwrapper == null)){ - readRequest = null; - try{ - System.out.println("Creo una nueva conexión..."); - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - + if ((connmeta != null) && (connwrapper == null)) { + subsRequest = null; + try { + final PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + Thread.sleep(200); if (conn.isConnected()) { - System.out.println("**** Agrego la segunda conexion. ****"); - connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + logBasic("Create new connection with url : " + connmeta.getUrl()); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); lookup.add(connwrapper); } - } catch (Exception ex){ + } catch (Exception ex) { setErrors(1L); logError("Unable to create connection to PLC. " + ex.getMessage()); } @@ -469,8 +386,160 @@ private void getPlcConnection() { logError("Unable to create connection to PLC. " + ex.getMessage()); } finally { lock.unlock(); - } - } - - + } + } + + /* + * Registers the tags for the cyclical subscription. + * In the first processing of the rows, a check of the tags is + * carried out in order that they are well formed, generating an exception + * if they are not. + */ + public boolean RegisterPlcTags() { + if ((connmeta != null) && (connwrapper != null)) { + if (connwrapper.getConnection().isConnected()) { + if (subsRequest == null) { + final PlcSubscriptionRequest.Builder subscription = connwrapper.getConnection().subscriptionRequestBuilder(); //(05) + if (meta.isModeEvent()) { + subscription.addEventTagAddress(FIELD_MODE_EVENT, FIELD_MODE_EVENT); + } + if (meta.isUserEvent()) { + subscription.addEventTagAddress(FIELD_USER_EVENT, FIELD_USER_EVENT); + } + if (meta.isSysEvent()) { + subscription.addEventTagAddress(FIELD_SYS_EVENT, FIELD_SYS_EVENT); + } + if (meta.isAlarmEvent()) { + subscription.addEventTagAddress(FIELD_ALARM_EVENT, FIELD_ALARM_EVENT); + } + + subsRequest = subscription.build(); + + } + + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + return true; + } + + /* + * This method performs the subscription to the events within the PLC. + * 1. Take the waiting time as a reference to monitor the request. + * 2. Captures the jobId associated with the subscription + * which is assigned by the PLC. + */ + public void GetSubscriptions() { + try { + subresponse = subsRequest.execute().get(); + } catch (Exception ex) { + setErrors(1L); + logError("Unable read from PLC. " + ex.getMessage()); + } + } + + /* + * Subscribe to incoming events by transferring them to + * the local event buffer. + */ + public void RegisterEventHandler() { + + if (meta.isModeEvent() && subresponse.getResponseCode(FIELD_MODE_EVENT) == PlcResponseCode.OK) { + registerMode + = subresponse + .getSubscriptionHandle(FIELD_MODE_EVENT) + .register(msg -> { + events.add((S7Event) msg); + }); + } + + if (meta.isUserEvent() && subresponse.getResponseCode(FIELD_USER_EVENT) == PlcResponseCode.OK) { + registerUser + = subresponse + .getSubscriptionHandle(FIELD_USER_EVENT) + .register(msg -> { + events.add((S7Event) msg); + }); + } + + if (meta.isSysEvent() && subresponse.getResponseCode(FIELD_SYS_EVENT) == PlcResponseCode.OK) { + registerSys + = subresponse + .getSubscriptionHandle(FIELD_SYS_EVENT) + .register(msg -> { + events.add((S7Event) msg); + }); + } + + if (meta.isAlarmEvent() && subresponse.getResponseCode(FIELD_ALARM_EVENT) == PlcResponseCode.OK) { + registerAlarm + = subresponse + .getSubscriptionHandle(FIELD_ALARM_EVENT) + .register(msg -> { + events.add((S7Event) msg); + }); + } + } + + /* + * Unsubscribes to the event generator from the driver. + * TODO: It remains to verify the unsubscription in line. + * At the moment only with the disconnection of the PLC. + */ + public void UnRegisterCYCHandler() { + if (null != registerMode) { + registerMode.unregister(); + } + if (null != registerUser) { + registerUser.unregister(); + } + if (null != registerSys) { + registerSys.unregister(); + } + if (null != registerAlarm) { + registerAlarm.unregister(); + } + registerMode = null; + registerUser = null; + registerSys = null; + registerAlarm = null; + subsRequest = null; + } + + /* + * When the driver makes a connection this method is called. + * In the case of the S7 driver, only the connection of the embedded channel + * is served. + */ + @Override + public void connected() { + if (connwrapper.getConnection().isConnected()) { + RegisterPlcTags(); + GetSubscriptions(); + RegisterEventHandler(); + } + } + + /* + * This method is called from the driver to indicate that it has + * disconnected from the PLC. + * If the PLC is disconnected, it automatically deletes all + * the status associated with this connection. + */ + @Override + public void disconnected() { + logError("Driver disconnected!"); + UnRegisterCYCHandler(); + } + } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java index 0d8332d4ffb..308049167af 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xRead.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.plc4x.hop.transforms.plc4xinput; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -26,6 +26,8 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Collectors; +import org.apache.commons.codec.binary.BinaryCodec; import org.apache.commons.lang3.StringUtils; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; @@ -33,6 +35,7 @@ import org.apache.hop.core.RowMetaAndData; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.exception.HopPluginException; +import org.apache.hop.core.exception.HopTransformException; import org.apache.hop.core.exception.HopValueException; import org.apache.hop.core.logging.LogLevel; import org.apache.hop.core.row.IRowMeta; @@ -48,198 +51,234 @@ import org.apache.hop.pipeline.Pipeline; import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.transform.BaseTransform; -import org.apache.hop.pipeline.transform.ITransform; import org.apache.hop.pipeline.transform.TransformMeta; import org.apache.plc4x.hop.metadata.Plc4xConnection; import org.apache.plc4x.hop.metadata.util.Plc4xLookup; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; +import org.apache.plc4x.hop.transforms.util.Plc4xDataType; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.BYTE; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.DATE; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.DATE_AND_TIME; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.DINT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.DWORD; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.INT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.LDATE; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.LDATE_AND_TIME; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.LINT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.LREAL; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.LTIME; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.LTIME_OF_DAY; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.LWORD; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.REAL; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.SINT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.TIME; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.TIME_OF_DAY; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.UDINT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.UINT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.ULINT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.USINT; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.WORD; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; +import org.apache.plc4x.java.api.types.PlcResponseCode; import org.openide.util.Lookup; /** - * Transform That contains the basic skeleton needed to create your own plugin + * * */ public class Plc4xRead extends BaseTransform { - private static final Class PKG = Plc4xRead.class; // Needed by Translator - - private Plc4xConnection connmeta = null; - private Plc4xWrapperConnection connwrapper = null; - private PlcReadRequest readRequest = null; - private PlcReadResponse readResponse = null; - - private Plc4xLookup lookup = Plc4xLookup.getDefault(); - private Lookup.Template template = null; - private Lookup.Result result = null; - - private int maxwait = 0; - private static final ReentrantLock lock = new ReentrantLock(); - - private static final String dummy = "dummy"; - - private Map index = new HashMap(); - private Map plcfields = new HashMap(); - - public Plc4xRead(TransformMeta transformMeta, Plc4xReadMeta meta, Plc4xReadData data, int copyNr, PipelineMeta pipelineMeta, - Pipeline pipeline ) { - super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); - } - - /* + private static final Class PKG = Plc4xRead.class; // Needed by Translator + + private Object[] r = null; + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcReadRequest.Builder builder = null; + private PlcReadRequest readRequest = null; + private PlcReadResponse readResponse = null; + + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result result = null; + + private BinaryCodec binarycodec = new BinaryCodec(); + + private int maxwait = 0; + private int counter = 0; + private int intField = 0; + private String strField = null; + + private static final ReentrantLock lock = new ReentrantLock(); + + private static final String dummy = "dummy"; + + private Map index = new HashMap(); + private Map plctags = new HashMap(); + private Plc4xDataType valuetype = null; + + private ObjectMapper mapper = new ObjectMapper(); + + public Plc4xRead(TransformMeta transformMeta, Plc4xReadMeta meta, Plc4xReadData data, int copyNr, PipelineMeta pipelineMeta, + Pipeline pipeline) { + super(transformMeta, meta, data, copyNr, pipelineMeta, pipeline); + } + + /* * Including Date and Time field for every row * * @param meta Meta data from user dialog * @param remarks Error registers * @param origin transform instance name - */ - public static final RowMetaAndData buildRow(Plc4xReadMeta meta, - List remarks, - String origin) throws HopPluginException { - - IRowMeta rowMeta = new RowMeta(); - Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); - int index = 0; - - if (!Utils.isEmpty(meta.getRowTimeField())) { - rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); - rowData[index++] = null; - } + */ + public static final RowMetaAndData buildRow(Plc4xReadMeta meta, + List remarks, + String origin) throws HopPluginException { + + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); + int index = 0; + + if (!Utils.isEmpty(meta.getRowTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); + rowData[index++] = null; + } - if (!Utils.isEmpty(meta.getLastTimeField())) { - rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); - rowData[index++] = null; - } - - for (Plc4xGeneratorField field : meta.getFields()) { - int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); - if (StringUtils.isNotEmpty(field.getType())) { - - IValueMeta valueMeta = - ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a - // value! - valueMeta.setLength(field.getLength()); - valueMeta.setPrecision(field.getPrecision()); - valueMeta.setConversionMask(field.getFormat()); - valueMeta.setCurrencySymbol(field.getCurrency()); - valueMeta.setGroupingSymbol(field.getGroup()); - valueMeta.setDecimalSymbol(field.getDecimal()); - valueMeta.setOrigin(origin); - - IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); - - if (field.isSetEmptyString()) { - // Set empty string - rowData[index] = StringUtil.EMPTY_STRING; - } else { - String stringValue = field.getValue(); - - // If the value is empty: consider it to be NULL. - if (Utils.isEmpty(stringValue)) { - rowData[index] = null; - - if (valueMeta.getType() == IValueMeta.TYPE_NONE) { - String message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", - valueMeta.getName(), - stringValue); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - } - } else { - // Convert the data from String to the specified type ... - // - try { - System.out.println("stringValue: " + stringValue); - rowData[index] = valueMeta.convertData(stringMeta, stringValue); - } catch (HopValueException e) { - switch (valueMeta.getType()) { - case IValueMeta.TYPE_NUMBER: - String message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_DATE: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_INTEGER: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_BIGNUMBER: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_TIMESTAMP: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - default: - // Boolean and binary don't throw errors normally, so it's probably an unspecified - // error problem... - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", - valueMeta.getName(), - stringValue); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - } + if (!Utils.isEmpty(meta.getLastTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); + rowData[index++] = null; + } + + for (Plc4xGeneratorField field : meta.getFields()) { + int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); + if (StringUtils.isNotEmpty(field.getType())) { + + IValueMeta valueMeta + = ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a + // value! + valueMeta.setLength(field.getLength()); + valueMeta.setPrecision(field.getPrecision()); + valueMeta.setConversionMask(field.getFormat()); + valueMeta.setCurrencySymbol(field.getCurrency()); + valueMeta.setGroupingSymbol(field.getGroup()); + valueMeta.setDecimalSymbol(field.getDecimal()); + valueMeta.setOrigin(origin); + + IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); + + if (field.isSetEmptyString()) { + // Set empty string + rowData[index] = StringUtil.EMPTY_STRING; + } else { + String stringValue = field.getValue(); + + // If the value is empty: consider it to be NULL. + if (Utils.isEmpty(stringValue)) { + rowData[index] = null; + + if (valueMeta.getType() == IValueMeta.TYPE_NONE) { + String message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + } + } else { + // Convert the data from String to the specified type ... + // + try { +// System.out.println("stringValue: " + stringValue); + rowData[index] = valueMeta.convertData(stringMeta, stringValue); + } catch (HopValueException e) { + switch (valueMeta.getType()) { + case IValueMeta.TYPE_NUMBER: + String message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_DATE: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_INTEGER: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_BIGNUMBER: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_TIMESTAMP: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + default: + // Boolean and binary don't throw errors normally, so it's probably an unspecified + // error problem... + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + } + } + } + } + + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; } - } } - // Now add value to the row! - // This is in fact a copy from the fields row, but now with data. - rowMeta.addValueMeta(valueMeta); - index++; - } + return new RowMetaAndData(rowMeta, rowData); } - return new RowMetaAndData(rowMeta, rowData); - } - + /* * 1. Block the other instances by means of a lock. * 2. Try to locate an existing connection. @@ -249,207 +288,509 @@ public static final RowMetaAndData buildRow(Plc4xReadMeta meta, * 5. If the connection to the PLC is made, then it creates the query * and executes it. * TODO: Field validation. - */ + */ @Override - public boolean processRow() throws HopException { - System.out.println("*************** PROCESSROW *****************"); - Object[] r = getRow(); // Get row from input rowset & set row busy! + public boolean processRow() throws HopException { + + r = getRow(); // Get row from input rowset & set row busy! setLogLevel(LogLevel.DEBUG); - - if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { - setOutputDone(); // signal end to receiver(s) - return false; - } - - System.out.println("Nombre del transform: " + getName() + " : " + getPipeline().getFilename()); - System.out.println("Plc4xRead Objetos registrados: " + getPipeline().getExtensionDataMap().size()); - - if (first) { - index.clear(); - plcfields.clear(); - //This performs a minimal check on the user item. - //It guarantees that the rates are within those managed by Plc4x. - meta.getFields().forEach((f) ->{ - plcfields.put(f.getName(),Plc4xPlcTag.of(f.getItem())); - }); - first = false; - } - -// lock.lock(); //(01) -// try { -// -// IHopMetadataProvider metaprovider = getMetadataProvider(); -// connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); -// -// if (connwrapper == null) { -// template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); -// result = lookup.lookup(template); -// if (!result.allItems().isEmpty()) { -// System.out.println("Aqui encontro la conexion: " + meta.getConnection()); -// connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; -// if (connwrapper != null) connwrapper.retain(); -// } -// }; -// -// if (connmeta == null){ -// logError( -// BaseMessages.getString( -// PKG, -// "Plc4x.Read.Meta.Log.SetMetadata", -// meta.getConnection())); -// } -// -// if ((connmeta != null) && (connwrapper == null)){ -// readRequest = null; -// try{ -// System.out.println("Creo una nueva conexión..."); -// PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) -// -// if (conn.isConnected()) { -// System.out.println("**** Agrego la segunda conexion. ****"); -// connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); -// lookup.add(connwrapper); -// } -// -// } catch (Exception ex){ -// setErrors(1L); -// logError("Unable to create connection to PLC. " + ex.getMessage()); -// } -// } -// -// } finally { -// lock.unlock(); -// } - - if ((connmeta != null) && (connwrapper != null)){ - if (connwrapper.getConnection().isConnected()){ - if (readRequest == null){ - PlcReadRequest.Builder builder = connwrapper.getConnection().readRequestBuilder(); //(05) - for (Plc4xGeneratorField field: meta.getFields()){ - builder.addTagAddress(field.getName(), field.getItem()); - } - readRequest = builder.build(); - } - try { - maxwait = Integer.parseInt(meta.getMaxwaitInMs()); - maxwait = (maxwait<100)?100:maxwait; - readResponse = readRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); - - for (Plc4xGeneratorField field: meta.getFields()){ - field.setValue(readResponse.getString(field.getName())); - } - } catch (Exception ex) { - setErrors(1L); - logError("Unable read from PLC. " + ex.getMessage()); - } - - } else { - setErrors(1L); - logError("PLC is not connected."); - setOutputDone(); - return false; + + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; } - - } else { - setErrors(1L); - logError("PLC connection don't exist."); - setOutputDone(); - return false; - } - // - int interval = Integer.parseInt(meta.getIntervalInMs()); - - try { - Thread.sleep(interval); - } catch (InterruptedException ex) { - setErrors(1L); - logError(ex.getMessage()); - } - - r = data.outputRowMeta.cloneRow(data.outputRowData); - - data.prevDate = data.rowDate; - data.rowDate = new Date(); - int index = 0; - - if (!Utils.isEmpty(meta.getRowTimeField())) { - r[index++] = data.rowDate; - } - - if (!Utils.isEmpty(meta.getLastTimeField())) { - r[index++] = data.prevDate; - } - - for (Plc4xGeneratorField field: meta.getFields()){ - if (field.getType().equalsIgnoreCase("Boolean")){ - r[index++] = Boolean.parseBoolean(field.getValue()); - } else if (field.getType().equalsIgnoreCase("Number")){ - r[index++] = Double.parseDouble(field.getValue()); - } else if (field.getType().equalsIgnoreCase("Integer")){ - r[index++] = Integer.parseInt(field.getValue()); + if (first) { + index.clear(); + plctags.clear(); + //This performs a minimal check on the user item. + //It guarantees that the rates are within those managed by Plc4x. + meta.getFields().forEach((f) -> { + if (null == r) { + plctags.put(f.getName(), Plc4xPlcTag.of(f.getItem())); + } else { + intField = getInputRowMeta().indexOfValue(f.getItem()); + if (intField != -1) { + strField = r[intField].toString(); + plctags.put(f.getName(), Plc4xPlcTag.of(strField)); + } else { + plctags.put(f.getName(), Plc4xPlcTag.of(f.getItem())); + } + } + }); + first = false; } - } - putRow(data.outputRowMeta, r ); // return your data - data.rowsWritten++; - return true; - } + //In case of any problem I end the processing of the row. + if (!RegisterPlcTags()) { + return false; + } + if (!GetReads()) { + return false; + } + // + int interval = Integer.parseInt(meta.getIntervalInMs()); + + try { + Thread.sleep(interval); + } catch (InterruptedException ex) { + setErrors(1L); + logError(ex.getMessage()); + } + + r = data.outputRowMeta.cloneRow(data.outputRowData); + + data.prevDate = data.rowDate; + data.rowDate = new Date(); + int index = 0; + + if (!Utils.isEmpty(meta.getRowTimeField())) { + r[index++] = data.rowDate; + } + + if (!Utils.isEmpty(meta.getLastTimeField())) { + r[index++] = data.prevDate; + } + + for (Plc4xGeneratorField field : meta.getFields()) { + try { + valuetype = plctags.get(field.getName()).getDataType(); + + if (field.getType().equalsIgnoreCase("Avro Record")) { + throw new HopException("'Avro Record' type is not supported"); + } else if (field.getType().equalsIgnoreCase("BigNumber")) { + throw new HopException("'BigNumber' type is not supported"); + } else if (field.getType().equalsIgnoreCase("Binary")) { + switch (valuetype) { + case BYTE: + r[index++] = binarycodec.toByteArray( + Long.toBinaryString(readResponse.getByte(field.getName()))); + break; + case WORD: + r[index++] = binarycodec.toByteArray( + Long.toBinaryString(readResponse.getShort(field.getName()))); + break; + case DWORD: + r[index++] = binarycodec.toByteArray( + Integer.toBinaryString(readResponse.getInteger(field.getName()))); + break; + case LWORD: + r[index++] = binarycodec.toByteArray( + Long.toBinaryString(readResponse.getLong(field.getName()))); + break; + default: + throw new HopException("Tag type is not supported. Check tag definition."); + } + + } else if (field.getType().equalsIgnoreCase("Boolean")) { + switch (valuetype) { + case BOOL: + r[index++] = readResponse.getBoolean(field.getName()); + break; + default: + } + } else if (field.getType().equalsIgnoreCase("Date")) { + switch (valuetype) { + case DATE:; + case LDATE: + r[index++] = readResponse.getDate(field.getName()); + break; + case DATE_AND_TIME:; + case LDATE_AND_TIME: + r[index++] = readResponse.getDateTime(field.getName()); + break; + default: + throw new HopException("'Date' type is not supported"); + } + } else if (field.getType().equalsIgnoreCase("Graph")) { + throw new HopException("'Graph' type is not supported"); + } else if (field.getType().equalsIgnoreCase("Integer")) { + switch (valuetype) { + case BYTE: + r[index++] = Long.valueOf(readResponse.getByte(field.getName())); + break; + case WORD: + r[index++] = Long.valueOf(readResponse.getShort(field.getName())); + break; + case DWORD: + r[index++] = Long.valueOf(readResponse.getInteger(field.getName())); + break; + case LWORD: + r[index++] = readResponse.getLong(field.getName()); + break; + case INT: + r[index++] = Long.valueOf(readResponse.getShort(field.getName())); + break; + case UINT: + r[index++] = Long.valueOf(readResponse.getShort(field.getName()) & 0xFFFF); + break; + case SINT: + r[index++] = Long.valueOf(readResponse.getByte(field.getName())); + break; + case USINT: + r[index++] = Long.valueOf(readResponse.getByte(field.getName()) & 0xFF); + break; + case DINT: + r[index++] = Long.valueOf(readResponse.getInteger(field.getName())); + break; + case UDINT: + r[index++] = Long.valueOf(readResponse.getInteger(field.getName()) & 0xFFFF); + break; + case LINT: + r[index++] = readResponse.getLong(field.getName()); + break; + case ULINT: + r[index++] = readResponse.getLong(field.getName()) & 0xFFFFFFFFL; + break; + default: + throw new HopException("Tag type is not supported. Check tag definition."); + } + } else if (field.getType().equalsIgnoreCase("Internet Address")) { + throw new HopException("'Internet Address' type is not supported"); + } else if (field.getType().equalsIgnoreCase("JSON")) { + switch (valuetype) { + case BYTE: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllBytes(field.getName()))); + break; + case WORD: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllShorts(field.getName()))); + break; + case DWORD: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllIntegers(field.getName()))); + break; + case LWORD: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllLongs(field.getName()))); + break; + case INT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllShorts(field.getName()))); + break; + case UINT: { + List numbers = readResponse.getAllShorts(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFFFF); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)); + } + break; + case SINT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllBytes(field.getName()))); + break; + case USINT: { + List numbers = readResponse.getAllBytes(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFF); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)); + } + break; + case DINT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllIntegers(field.getName()))); + break; + case UDINT: { + List numbers = readResponse.getAllBytes(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFFFF); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)); + } + break; + case LINT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllLongs(field.getName()))); + break; + case ULINT: { + List numbers = readResponse.getAllLongs(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFFFFFFFFL); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)); + } + break; + case REAL: + case LREAL: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllFloats(field.getName()))); + break; + case DATE:; + case LDATE: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllDates(field.getName()))); + break; + case DATE_AND_TIME:; + case LDATE_AND_TIME: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllDateTimes(field.getName()))); + break; + case TIME:; + case LTIME:; + case TIME_OF_DAY:; + case LTIME_OF_DAY: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllTimes(field.getName()))); + break; + default: + throw new HopException("Tag type is not supported. Check tag definition."); + + } + } else if (field.getType().equalsIgnoreCase("Number")) { + switch (valuetype) { + case REAL: + case LREAL: + r[index++] = Double.valueOf(readResponse.getFloat(field.getName())); + break; + default: + throw new HopException("Tag type is not supported. Check tag definition."); + } + + } else if (field.getType().equalsIgnoreCase("String")) { + switch (valuetype) { + case BYTE: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllBytes(field.getName()))).toString(); + break; + case WORD: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllShorts(field.getName()))).toString(); + break; + case DWORD: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllIntegers(field.getName()))).toString(); + break; + case LWORD: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllLongs(field.getName()))).toString(); + break; + case INT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllShorts(field.getName()))).toString(); + case UINT: { + List numbers = readResponse.getAllShorts(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFFFF); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)).toString(); + } + break; + case SINT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllBytes(field.getName()))).toString(); + break; + case USINT: { + List numbers = readResponse.getAllBytes(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFF); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)).toString(); + } + break; + case DINT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllIntegers(field.getName()))).toString(); + break; + case UDINT: { + List numbers = readResponse.getAllBytes(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFFFF); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)).toString(); + } + break; + case LINT: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllLongs(field.getName()))).toString(); + break; + case ULINT: { + List numbers = readResponse.getAllLongs(field.getName()) + .stream() + .map(n -> { + return Long.valueOf(n & 0xFFFFFFFFL); + }) + .collect(Collectors.toList()); + + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + numbers)).toString(); + } + break; + case REAL: + case LREAL: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllFloats(field.getName()))).toString(); + case DATE:; + case LDATE: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllDates(field.getName()))).toString(); + break; + case DATE_AND_TIME:; + case LDATE_AND_TIME: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllDateTimes(field.getName()))).toString(); + break; + case TIME:; + case LTIME:; + case TIME_OF_DAY:; + case LTIME_OF_DAY: + r[index++] = mapper.createObjectNode().set(field.getName(), + mapper.valueToTree( + readResponse.getAllTimes(field.getName()))).toString(); + break; + case STRING:; + default: + throw new HopException("'STRING' type is not supported"); + } + } else if (field.getType().equalsIgnoreCase("Timestamp")) { + switch (valuetype) { + case TIME: + case LTIME: + r[index++] = readResponse.getTime(field.getName()); + break; + case TIME_OF_DAY:; + case LTIME_OF_DAY: + r[index++] = readResponse.getTime(field.getName()); + break; + default: + throw new HopException("'LTIME, LTIME_OF_DAY' type is not supported"); + } + } + } catch (Exception ex) { + try { + System.out.println("META: " + data.outputRowMeta.toStringMeta()); + putError(data.outputRowMeta, r, 1, + "Tag error!.", field.getName(), + ex.getMessage()); + } catch (HopTransformException ex1) { + logError(ex1.toString()); + } + System.out.println("TagName: " + field.getName()); + } + } // for + + readResponse = null; //To GC? - @Override + putRow(data.outputRowMeta, r); // return your data + data.rowsWritten++; + + return true; + } + + @Override public boolean init() { - System.out.println("*************** INIT *****************"); try { - if(super.init()){ + if (super.init()) { // Determine the number of rows to generate... data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); data.rowsWritten = 0L; data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); if (data.rowLimit < 0L) { // Unable to parse - logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); - return false; // fail - } + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } // Create a row (constants) with all the values in it... List remarks = new ArrayList<>(); // stores the errors... RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); if (!remarks.isEmpty()) { - for (int i = 0; i < remarks.size(); i++) { - CheckResult cr = (CheckResult) remarks.get(i); - logError(cr.getText()); - } - return false; + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; } data.outputRowData = outputRow.getData(); - data.outputRowMeta = outputRow.getRowMeta(); + data.outputRowMeta = outputRow.getRowMeta(); getPlcConnection(); - + return true; } return false; - } catch (Exception ex){ + } catch (Exception ex) { setErrors(1L); logError("Error initializing transform", ex); return false; } } - /* - * Here, must perform the cleaning of any resource, main of the connection to - * the associated PLC. - */ + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ @Override public void cleanup() { - System.out.println("*************** CLEANUP *****************"); super.cleanup(); logBasic("Cleanup. Release connection."); if (connwrapper != null) { connwrapper.release(); - if (connwrapper.refCnt() <= 0) + if (connwrapper.refCnt() <= 0) { lookup.remove(connwrapper); + } } } @@ -460,22 +801,22 @@ public void cleanup() { * 2. Release de reference to object. * 3. The lastone remove the global reference to connection wrapper. * 4. Clear local references. - */ + */ @Override public void dispose() { - System.out.println("*************** DISPOSE *****************"); super.dispose(); if (connwrapper != null) { - logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); connwrapper.release(); - if (connwrapper.refCnt() <= 0) - lookup.remove(connwrapper); + if (connwrapper.refCnt() <= 0) { + lookup.remove(connwrapper); + } connwrapper = null; readRequest = null; } } - + private void getPlcConnection() { lock.lock(); //(01) try { @@ -483,48 +824,127 @@ private void getPlcConnection() { IHopMetadataProvider metaprovider = getMetadataProvider(); connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); result = lookup.lookup(template); if (!result.allItems().isEmpty()) { - System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + logBasic("Using connection: " + meta.getConnection()); connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; - if (connwrapper != null) connwrapper.retain(); + if (connwrapper != null) { + connwrapper.retain(); + } } }; - if (connmeta == null){ + if (connmeta == null) { logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); } - if ((connmeta != null) && (connwrapper == null)){ + if ((connmeta != null) && (connwrapper == null)) { readRequest = null; - try{ - System.out.println("Creo una nueva conexión..."); - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - + try { + final PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + Thread.sleep(200); if (conn.isConnected()) { - System.out.println("**** Agrego la segunda conexion. ****"); - connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + logBasic("Create new connection with url : " + connmeta.getUrl()); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); lookup.add(connwrapper); } - } catch (Exception ex){ + } catch (Exception ex) { setErrors(1L); logError("Unable to create connection to PLC. " + ex.getMessage()); } } } catch (HopException ex) { - Logger.getLogger(Plc4xRead.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(Plc4xRead.class.getName()).log(Level.SEVERE, null, ex); } finally { lock.unlock(); - } + } } - - + + /* + * Registers the tags to write. + * In the first processing of the rows, a check of the tags is + * carried out in order that they are well formed, generating an exception + * if they are not. + */ + public boolean RegisterPlcTags() { + if ((connmeta != null) && (connwrapper != null)) { + if (connwrapper.getConnection().isConnected()) { + if (readRequest == null) { + builder = connwrapper.getConnection().readRequestBuilder(); //(05) + for (Plc4xGeneratorField field : meta.getFields()) { + if (null == r) { + builder.addTagAddress(field.getName(), field.getItem()); + } else { + intField = getInputRowMeta().indexOfValue(field.getItem()); + if (intField != -1) { + strField = r[intField].toString(); + builder.addTagAddress(field.getName(), strField); + } else { + builder.addTagAddress(field.getName(), field.getItem()); + } + } + } + readRequest = builder.build(); + } + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + + return true; + } + + public boolean GetReads() { + + try { + maxwait = Integer.parseInt(meta.getMaxwaitInMs()); + maxwait = (maxwait < 100) ? 100 : maxwait; + readResponse = readRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); + + for (Plc4xGeneratorField field : meta.getFields()) { + if (readResponse.getResponseCode(field.getName()) != PlcResponseCode.OK) { + logDebug(field.getName() + " : " + readResponse.getResponseCode(field.getName()).name()); + try { + putError(data.outputRowMeta, r, 1, + "Tag error.", field.getName(), + readResponse.getResponseCode(field.getName()).name()); + } catch (HopTransformException ex) { + logError(ex.toString()); + } + } + } + } catch (Exception ex) { + setErrors(1L); + try { + putError(getInputRowMeta(), r, 1, + "Tag error!.", ex.getMessage(), + ex.toString()); + } catch (HopTransformException ex1) { + logError(ex.toString()); + } + logError("Unable read from PLC. " + ex.getMessage()); + setOutputDone(); + return false; + } + + return true; + } + } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java index 96a47e5f166..928ee6d4956 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadDialog.java @@ -19,6 +19,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; +import org.apache.hop.core.row.IRowMeta; import org.apache.hop.core.row.value.ValueMetaFactory; import org.apache.hop.core.util.Utils; import org.apache.hop.core.variables.IVariables; @@ -40,6 +41,7 @@ import org.apache.hop.ui.core.widget.TextVar; import org.apache.hop.ui.pipeline.dialog.PipelinePreviewProgressDialog; import org.apache.hop.ui.pipeline.transform.BaseTransformDialog; +import org.apache.hop.ui.pipeline.transform.ITableItemInsertListener; import org.apache.hop.ui.util.SwtSvgImageUtil; import org.apache.plc4x.hop.metadata.Plc4xConnection; import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; @@ -272,14 +274,20 @@ public void widgetSelected(SelectionEvent e) { wOk = new Button(shell, SWT.PUSH); wOk.setText(BaseMessages.getString(PKG, "System.Button.OK")); wOk.addListener(SWT.Selection, e -> ok()); + + wGet = new Button(shell, SWT.PUSH); + wGet.setText(BaseMessages.getString(PKG, "Get Fields")); + wGet.addListener(SWT.Selection, e -> getfields()); + wPreview = new Button(shell, SWT.PUSH); wPreview.setText(BaseMessages.getString(PKG, "System.Button.Preview")); wPreview.addListener(SWT.Selection, e -> preview()); + wCancel = new Button(shell, SWT.PUSH); wCancel.setText(BaseMessages.getString(PKG, "System.Button.Cancel")); wCancel.addListener(SWT.Selection, e -> cancel()); - setButtonPositions(new Button[] {wOk, wPreview, wCancel}, margin, null); + setButtonPositions(new Button[] {wOk, wPreview, wGet , wCancel}, margin, null); Label wlFields = new Label(shell, SWT.NONE); wlFields.setText(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Fields.Label")); @@ -528,6 +536,40 @@ private void ok() { } } + private void getfields() { + try { + + IRowMeta r = pipelineMeta.getPrevTransformFields(variables, transformName); + + if (r != null && !r.isEmpty()) { + ITableItemInsertListener listener = + (tableItem, v) -> { + + tableItem.setText(2, ""); + tableItem.setText(3, v.getTypeDesc()); + tableItem.setText(4, v.getFormatMask()==null?"":v.getFormatMask()); + tableItem.setText(5, Integer.toString(v.getLength())); + tableItem.setText(6, Integer.toString(v.getPrecision())); + tableItem.setText(7, v.getCurrencySymbol()==null?"":v.getCurrencySymbol()); + tableItem.setText(8, v.getDecimalSymbol()==null?"":v.getDecimalSymbol()); + tableItem.setText(9, v.getGroupingSymbol()==null?"":v.getGroupingSymbol()); + //tableItem.setText(10, "N"); + tableItem.setText(11, "N"); + return true; + }; + BaseTransformDialog.getFieldsFromPrevious( + r, wFields, 1, new int[] {1}, null, -1, -1, listener); + } + + + } catch (Exception ex){ + new ErrorDialog( + shell, + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Title"), + BaseMessages.getString(PKG, "Plc4x.Read.Meta.Dialog.Illegal.Dialog.Settings.Message"), + ex); + } + } /** * Preview the data generated by this transform. This generates a pipeline using this transform & diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java index c43178958ac..559dce2bd69 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xinput/Plc4xReadMeta.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.plc4x.hop.transforms.plc4xinput; import java.util.ArrayList; @@ -52,251 +51,266 @@ ) public class Plc4xReadMeta extends BaseTransformMeta { - private static final Class PKG = Plc4xReadMeta.class; // Needed by Translator - - - @HopMetadataProperty( - key = "connection", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.Connection") - private String connection; - - @HopMetadataProperty( - key = "never_ending", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") - private boolean neverEnding; - - @HopMetadataProperty( - key = "maxwait_in_ms", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.MaxwaitInMs") - private String maxwaitInMs; - - @HopMetadataProperty( - key = "interval_in_ms", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.IntervalInMs") - private String intervalInMs; - - @HopMetadataProperty( - key = "row_time_field", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowTimeField") - private String rowTimeField; - - @HopMetadataProperty( - key = "last_time_field", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.LastTimeField") - private String lastTimeField; - - @HopMetadataProperty( - key = "limit", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowLimit") - private String rowLimit; - - @HopMetadataProperty( - groupKey = "fields", - key = "field", - injectionGroupDescription = "Plc4x.Read.Meta.Injection.Fields", - injectionKeyDescription = "Plc4x.Read.Meta.Injection.Fields") - private List fields; - - public Plc4xReadMeta() { - fields = new ArrayList<>(); - - rowLimit = "10"; - neverEnding = false; - maxwaitInMs = "1000"; - intervalInMs = "5000"; - rowTimeField = "now"; - lastTimeField = "last"; - } - - public Plc4xReadMeta(Plc4xReadMeta m) { - this.connection = m.connection; - this.neverEnding = m.neverEnding; - this.intervalInMs = m.intervalInMs; - this.rowTimeField = m.rowTimeField; - this.lastTimeField = m.lastTimeField; - this.rowLimit = m.rowLimit; - this.fields = new ArrayList<>(); - for (Plc4xGeneratorField field : m.fields) { - this.fields.add(new Plc4xGeneratorField(field)); + private static final Class PKG = Plc4xReadMeta.class; // Needed by Translator + + @HopMetadataProperty( + key = "connection", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Connection") + private String connection; + + @HopMetadataProperty( + key = "never_ending", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.NeverEnding") + private boolean neverEnding; + + @HopMetadataProperty( + key = "maxwait_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.MaxwaitInMs") + private String maxwaitInMs; + + @HopMetadataProperty( + key = "interval_in_ms", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.IntervalInMs") + private String intervalInMs; + + @HopMetadataProperty( + key = "row_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowTimeField") + private String rowTimeField; + + @HopMetadataProperty( + key = "last_time_field", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.LastTimeField") + private String lastTimeField; + + @HopMetadataProperty( + key = "limit", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.RowLimit") + private String rowLimit; + + @HopMetadataProperty( + groupKey = "fields", + key = "field", + injectionGroupDescription = "Plc4x.Read.Meta.Injection.Fields", + injectionKeyDescription = "Plc4x.Read.Meta.Injection.Fields") + private List fields; + + public Plc4xReadMeta() { + fields = new ArrayList<>(); + + rowLimit = "10"; + neverEnding = false; + maxwaitInMs = "1000"; + intervalInMs = "5000"; + rowTimeField = "now"; + lastTimeField = "last"; } - } - public Plc4xReadMeta clone() { - return new Plc4xReadMeta(this); - } - - - - public void getFields( IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, - IVariables variables, IHopMetadataProvider metadataProvider ) throws HopTransformException { - try { - List remarks = new ArrayList<>(); - RowMetaAndData rowMetaAndData = Plc4xRead.buildRow(this, remarks, name); - - if (!remarks.isEmpty()) { - StringBuilder stringRemarks = new StringBuilder(); - for (ICheckResult remark : remarks) { - stringRemarks.append(remark.toString()).append(Const.CR); - } - throw new HopTransformException(stringRemarks.toString()); - } - - for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { - valueMeta.setOrigin(name); + public Plc4xReadMeta(Plc4xReadMeta m) { + this.connection = m.connection; + this.neverEnding = m.neverEnding; + this.intervalInMs = m.intervalInMs; + this.rowTimeField = m.rowTimeField; + this.lastTimeField = m.lastTimeField; + this.rowLimit = m.rowLimit; + this.fields = new ArrayList<>(); + for (Plc4xGeneratorField field : m.fields) { + this.fields.add(new Plc4xGeneratorField(field)); } + } - inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); - } catch (Exception e) { - throw new HopTransformException(e); + public Plc4xReadMeta clone() { + return new Plc4xReadMeta(this); } - } + public void getFields(IRowMeta inputRowMeta, String name, IRowMeta[] info, TransformMeta nextTransform, + IVariables variables, IHopMetadataProvider metadataProvider) throws HopTransformException { + try { + List remarks = new ArrayList<>(); + RowMetaAndData rowMetaAndData = Plc4xRead.buildRow(this, remarks, name); + + if (!remarks.isEmpty()) { + StringBuilder stringRemarks = new StringBuilder(); + for (ICheckResult remark : remarks) { + stringRemarks.append(remark.toString()).append(Const.CR); + } + throw new HopTransformException(stringRemarks.toString()); + } + + for (IValueMeta valueMeta : rowMetaAndData.getRowMeta().getValueMetaList()) { + valueMeta.setOrigin(name); + } + + inputRowMeta.mergeRowMeta(rowMetaAndData.getRowMeta()); + } catch (Exception e) { + throw new HopTransformException(e); + } + } - public Plc4xRead createTransform(TransformMeta transformMeta, Plc4xReadData data, int copyNr, - PipelineMeta pipelineMeta, Pipeline pipeline ) { - return new Plc4xRead( transformMeta, this, data, copyNr, pipelineMeta, pipeline ); - } + public Plc4xRead createTransform(TransformMeta transformMeta, Plc4xReadData data, int copyNr, + PipelineMeta pipelineMeta, Pipeline pipeline) { + return new Plc4xRead(transformMeta, this, data, copyNr, pipelineMeta, pipeline); + } + public Plc4xReadData getTransformData() { + return new Plc4xReadData(); + } - public Plc4xReadData getTransformData() { - return new Plc4xReadData(); - } - -/* + /* @Override public void loadXml( Node transformNode, IHopMetadataProvider metadataProvider ) throws HopXmlException { //load the saved values from the transformnode String sampleValue = XmlHandler.getTagValue( transformNode, "sampleValue" ); } -*/ - @Override - public void setDefault() { - //default values when creating a new transform - } - - - /** - * Returns the Input/Output metadata for this transform. - * The generator transform only produces output, does not accept input! - * TransformIOMeta(inputAcceptor, outputProducer, inputOptional, outputDynamic, inputDynamic) - */ - @Override - public ITransformIOMeta getTransformIOMeta() { - return new TransformIOMeta(false, true, false, false, false, false); - } + */ + @Override + public void setDefault() { + //default values when creating a new transform + } - /** - * Gets Plc4xConnection metadata name. - * - * @return value of intervalInMs - */ - public String getConnection() { - return connection; - } + /** + * Returns the Input/Output metadata for this transform. The generator + * transform only produces output, does not accept input! + * TransformIOMeta(inputAcceptor, outputProducer, inputOptional, + * outputDynamic, inputDynamic) + */ + @Override + public ITransformIOMeta getTransformIOMeta() { + return new TransformIOMeta(true, true, false, false, false, false); + } - /** @param connection */ - public void setConnection(String connection) { - this.connection = connection; - } - - - /** - * Gets neverEnding - * - * @return value of neverEnding - */ - public boolean isNeverEnding() { - return neverEnding; - } + /** + * Gets Plc4xConnection metadata name. + * + * @return value of intervalInMs + */ + public String getConnection() { + return connection; + } - /** @param neverEnding The neverEnding to set */ - public void setNeverEnding(boolean neverEnding) { - this.neverEnding = neverEnding; - } - /** - * Gets intervalInMs - * - * @return value of intervalInMs - */ - public String getMaxwaitInMs() { - return maxwaitInMs; - } + * @param connection + */ + public void setConnection(String connection) { + this.connection = connection; + } - /** @param intervalInMs The intervalInMs to set */ - public void setMaxwaitInMs(String maxwaitInMs) { - this.maxwaitInMs = maxwaitInMs; - } + /** + * Gets neverEnding + * + * @return value of neverEnding + */ + public boolean isNeverEnding() { + return neverEnding; + } - /** - * Gets intervalInMs - * - * @return value of intervalInMs - */ - public String getIntervalInMs() { - return intervalInMs; - } + /** + * @param neverEnding The neverEnding to set + */ + public void setNeverEnding(boolean neverEnding) { + this.neverEnding = neverEnding; + } - /** @param intervalInMs The intervalInMs to set */ - public void setIntervalInMs(String intervalInMs) { - this.intervalInMs = intervalInMs; - } + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getMaxwaitInMs() { + return maxwaitInMs; + } - /** - * Gets rowTimeField - * - * @return value of rowTimeField - */ - public String getRowTimeField() { - return rowTimeField; - } + /** + * @param intervalInMs The intervalInMs to set + */ + public void setMaxwaitInMs(String maxwaitInMs) { + this.maxwaitInMs = maxwaitInMs; + } - /** @param rowTimeField The rowTimeField to set */ - public void setRowTimeField(String rowTimeField) { - this.rowTimeField = rowTimeField; - } + /** + * Gets intervalInMs + * + * @return value of intervalInMs + */ + public String getIntervalInMs() { + return intervalInMs; + } - /** - * Gets lastTimeField - * - * @return value of lastTimeField - */ - public String getLastTimeField() { - return lastTimeField; - } + /** + * @param intervalInMs The intervalInMs to set + */ + public void setIntervalInMs(String intervalInMs) { + this.intervalInMs = intervalInMs; + } - /** @param lastTimeField The lastTimeField to set */ - public void setLastTimeField(String lastTimeField) { - this.lastTimeField = lastTimeField; - } + /** + * Gets rowTimeField + * + * @return value of rowTimeField + */ + public String getRowTimeField() { + return rowTimeField; + } - /** - * Gets rowLimit - * - * @return value of rowLimit - */ - public String getRowLimit() { - return rowLimit; - } + /** + * @param rowTimeField The rowTimeField to set + */ + public void setRowTimeField(String rowTimeField) { + this.rowTimeField = rowTimeField; + } - /** @param rowLimit The rowLimit to set */ - public void setRowLimit(String rowLimit) { - this.rowLimit = rowLimit; - } + /** + * Gets lastTimeField + * + * @return value of lastTimeField + */ + public String getLastTimeField() { + return lastTimeField; + } + + /** + * @param lastTimeField The lastTimeField to set + */ + public void setLastTimeField(String lastTimeField) { + this.lastTimeField = lastTimeField; + } + + /** + * Gets rowLimit + * + * @return value of rowLimit + */ + public String getRowLimit() { + return rowLimit; + } + + /** + * @param rowLimit The rowLimit to set + */ + public void setRowLimit(String rowLimit) { + this.rowLimit = rowLimit; + } + + /** + * Gets fields + * + * @return value of fields + */ + public List getFields() { + return fields; + } + + /** + * @param fields The fields to set + */ + public void setFields(List fields) { + this.fields = fields; + } + + @Override + public boolean supportsErrorHandling() { + return true; + } - /** - * Gets fields - * - * @return value of fields - */ - public List getFields() { - return fields; - } - - /** @param fields The fields to set */ - public void setFields(List fields) { - this.fields = fields; - } - } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java index bf71bf6efd4..5f972d39c98 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWrite.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.plc4x.hop.transforms.plc4xoutput; import java.util.ArrayList; @@ -32,6 +31,7 @@ import org.apache.hop.core.RowMetaAndData; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.exception.HopPluginException; +import org.apache.hop.core.exception.HopTransformException; import org.apache.hop.core.exception.HopValueException; import org.apache.hop.core.logging.LogLevel; import org.apache.hop.core.row.IRowMeta; @@ -54,10 +54,15 @@ import org.apache.plc4x.hop.transforms.util.Plc4xGeneratorField; import org.apache.plc4x.hop.transforms.util.Plc4xPlcTag; import org.apache.plc4x.hop.metadata.util.Plc4xWrapperConnection; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.BOOL; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.BYTE; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.REAL; +import static org.apache.plc4x.hop.transforms.util.Plc4xDataType.WORD; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.messages.PlcWriteRequest; import org.apache.plc4x.java.api.messages.PlcWriteResponse; +import org.apache.plc4x.java.api.types.PlcResponseCode; import org.openide.util.Lookup; /** @@ -66,177 +71,179 @@ */ public class Plc4xWrite extends BaseTransform { - private static final Class PKG = Plc4xWrite.class; // Needed by Translator - - private Plc4xConnection connmeta = null; - private Plc4xWrapperConnection connwrapper = null; - private PlcWriteRequest writeRequest = null; - private PlcWriteRequest.Builder builder = null; - private PlcWriteResponse writeResponse = null; - - private Plc4xLookup lookup = Plc4xLookup.getDefault(); - private Lookup.Template template = null; - private Lookup.Result result = null; - - private static final ReentrantLock lock = new ReentrantLock(); - - private static final String dummy = "dummy"; - - private Map index = new HashMap(); - private Map plcfields = new HashMap(); - - public Plc4xWrite(TransformMeta transformMeta, Plc4xWriteMeta meta, Plc4xWriteData data, int copyNr, PipelineMeta pipelineMeta, - Pipeline pipeline ) { - super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); - } - - /* + private static final Class PKG = Plc4xWrite.class; // Needed by Translator + + private Object[] r = null; + + private Plc4xConnection connmeta = null; + private Plc4xWrapperConnection connwrapper = null; + private PlcWriteRequest writeRequest = null; + private PlcWriteRequest.Builder builder = null; + private PlcWriteResponse writeResponse = null; + + private Plc4xLookup lookup = Plc4xLookup.getDefault(); + private Lookup.Template template = null; + private Lookup.Result result = null; + + private static final ReentrantLock lock = new ReentrantLock(); + + private static final String dummy = "dummy"; + + private Map index = new HashMap(); + private Map plcfields = new HashMap(); + + public Plc4xWrite(TransformMeta transformMeta, Plc4xWriteMeta meta, Plc4xWriteData data, int copyNr, PipelineMeta pipelineMeta, + Pipeline pipeline) { + super(transformMeta, meta, data, copyNr, pipelineMeta, pipeline); + } + + /* * Including Date and Time field for every row * * @param meta Meta data from user dialog * @param remarks Error registers * @param origin transform instance name - */ - public static final RowMetaAndData buildRow( - Plc4xWriteMeta meta, List remarks, String origin) throws HopPluginException { - IRowMeta rowMeta = new RowMeta(); - Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); - int index = 0; - - if (!Utils.isEmpty(meta.getRowTimeField())) { - rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); - rowData[index++] = null; - } + */ + public static final RowMetaAndData buildRow( + Plc4xWriteMeta meta, List remarks, String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); + int index = 0; + + if (!Utils.isEmpty(meta.getRowTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); + rowData[index++] = null; + } - if (!Utils.isEmpty(meta.getLastTimeField())) { - rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); - rowData[index++] = null; - } - - for (Plc4xGeneratorField field : meta.getFields()) { - int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); - if (StringUtils.isNotEmpty(field.getType())) { - IValueMeta valueMeta = - ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a - // value! - valueMeta.setLength(field.getLength()); - valueMeta.setPrecision(field.getPrecision()); - valueMeta.setConversionMask(field.getFormat()); - valueMeta.setCurrencySymbol(field.getCurrency()); - valueMeta.setGroupingSymbol(field.getGroup()); - valueMeta.setDecimalSymbol(field.getDecimal()); - valueMeta.setOrigin(origin); - - IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); - - if (field.isSetEmptyString()) { - // Set empty string - rowData[index] = StringUtil.EMPTY_STRING; - } else { - String stringValue = field.getValue(); - - // If the value is empty: consider it to be NULL. - if (Utils.isEmpty(stringValue)) { - rowData[index] = null; - - if (valueMeta.getType() == IValueMeta.TYPE_NONE) { - String message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", - valueMeta.getName(), - stringValue); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - } - } else { - // Convert the data from String to the specified type ... - // - try { - rowData[index] = valueMeta.convertData(stringMeta, stringValue); - } catch (HopValueException e) { - switch (valueMeta.getType()) { - case IValueMeta.TYPE_NUMBER: - String message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_DATE: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_INTEGER: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_BIGNUMBER: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_TIMESTAMP: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - default: - // Boolean and binary don't throw errors normally, so it's probably an unspecified - // error problem... - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", - valueMeta.getName(), - stringValue); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - } + if (!Utils.isEmpty(meta.getLastTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); + rowData[index++] = null; + } + + for (Plc4xGeneratorField field : meta.getFields()) { + int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); + if (StringUtils.isNotEmpty(field.getType())) { + IValueMeta valueMeta + = ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a + // value! + valueMeta.setLength(field.getLength()); + valueMeta.setPrecision(field.getPrecision()); + valueMeta.setConversionMask(field.getFormat()); + valueMeta.setCurrencySymbol(field.getCurrency()); + valueMeta.setGroupingSymbol(field.getGroup()); + valueMeta.setDecimalSymbol(field.getDecimal()); + valueMeta.setOrigin(origin); + + IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); + + if (field.isSetEmptyString()) { + // Set empty string + rowData[index] = StringUtil.EMPTY_STRING; + } else { + String stringValue = field.getValue(); + + // If the value is empty: consider it to be NULL. + if (Utils.isEmpty(stringValue)) { + rowData[index] = null; + + if (valueMeta.getType() == IValueMeta.TYPE_NONE) { + String message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + } + } else { + // Convert the data from String to the specified type ... + // + try { + rowData[index] = valueMeta.convertData(stringMeta, stringValue); + } catch (HopValueException e) { + switch (valueMeta.getType()) { + case IValueMeta.TYPE_NUMBER: + String message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_DATE: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_INTEGER: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_BIGNUMBER: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_TIMESTAMP: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + default: + // Boolean and binary don't throw errors normally, so it's probably an unspecified + // error problem... + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + } + } + } + } + + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; } - } } - // Now add value to the row! - // This is in fact a copy from the fields row, but now with data. - rowMeta.addValueMeta(valueMeta); - index++; - } + return new RowMetaAndData(rowMeta, rowData); } - return new RowMetaAndData(rowMeta, rowData); - } - - /* + /* * 1. Stores the indexes of the incoming fields from the user's selection. * It is only done during the first cycle. * 2. Block the other instances by means of a lock. @@ -247,249 +254,103 @@ public static final RowMetaAndData buildRow( * 6. If the connection to the PLC is made, then it creates the query * and executes it. * - */ - @Override - public boolean processRow() throws HopException { - final Object[] r = getRow(); // Get row from input rowset & set row busy! - - if (r == null) { - setOutputDone(); - return false; - } - - data.outputRowMeta = getInputRowMeta(); - - first = true; - if (first) { - index.clear(); - plcfields.clear(); - meta.getFields().forEach((f) ->{ - Integer i = getInputRowMeta().indexOfValue(f.getName()); //(01) - if (i>=0) { - logDebug(">> i: " + i + " : " + f.getName() + " : " + f.getItem()); - index.put(f.getName(), i); - plcfields.put(f.getName(), Plc4xPlcTag.of(f.getItem())); - } - }); - first = false; - } - - IRowMeta inputRowMeta = getInputRowMeta(); - - setLogLevel(LogLevel.DEBUG); - - if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { - setOutputDone(); // signal end to receiver(s) - return false; - } - -// lock.lock(); //(02) -// try { -// -// IHopMetadataProvider metaprovider = getMetadataProvider(); -// connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); -// -// if (connwrapper == null) { -// template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); //(03) -// result = lookup.lookup(template); -// if (!result.allItems().isEmpty()) { -// System.out.println("Aqui encontro la conexion: " + meta.getConnection()); -// connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; -// if (connwrapper != null) connwrapper.retain(); -// } -// }; -// -// if (connmeta == null){ -// logError( -// BaseMessages.getString( -// PKG, -// "Plc4x.Read.Meta.Log.SetMetadata", -// meta.getConnection())); -// } -// -// if ((connmeta != null) && (connwrapper == null)){ -// writeRequest = null; -// try{ -// System.out.println("Creo una nueva conexión..."); -// PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(04) -// -// if (conn.isConnected()) { -// System.out.println("**** Agrego la segunda conexion. ****"); -// connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); -// lookup.add(connwrapper); //(05) -// } -// -// } catch (Exception ex){ -// setErrors(1L); -// logError("Unable to create connection to PLC. " + ex.getMessage()); -// } -// } -// -// } finally { -// lock.unlock(); -// } - - if ((connmeta != null) && (connwrapper != null)){ - if (connwrapper.getConnection().isConnected()){ - logDebug(">>>> Paso por aqui!"); - builder = null; - builder = connwrapper.getConnection().writeRequestBuilder(); //(05) - Integer i; - for (Plc4xGeneratorField field: meta.getFields()){ - logDebug(">>>> Paso por aqui! 22"); - i = index.get(field.getName()); - if (i != null) { - //From Input Type - logDebug(">>>> Paso por aqui! 33: " + inputRowMeta.getValueMeta(i).getTypeDesc() + " : " + field.getType()); - if (inputRowMeta.getValueMeta(i).getTypeDesc(). - equalsIgnoreCase(field.getType())) - switch(inputRowMeta.getValueMeta(i).getType()) { - case IValueMeta.TYPE_BOOLEAN: - case IValueMeta.TYPE_INTEGER: - case IValueMeta.TYPE_NUMBER: - case IValueMeta.TYPE_BIGNUMBER: - Object value= null; - switch(plcfields.get(field.getName()).getDataType()) { - case BOOL: - case BYTE: - case WORD: - value = Short.parseShort(r[i].toString()); - break; - case REAL: - value = Float.parseFloat(r[i].toString()); - break; - } - - logDebug(">>>> " + field.getName() + " : " + field.getItem() + " : " + r[i] + " : " + plcfields.get(field.getName()).getDataType().name()); - builder.addTagAddress(field.getName(), - field.getItem(), - value); - break; - case IValueMeta.TYPE_DATE: - builder.addTagAddress(field.getName(), - field.getItem(), - Double.parseDouble(inputRowMeta.getString(r, i))); - break; - case IValueMeta.TYPE_TIMESTAMP: - builder.addTagAddress(field.getName(), - field.getItem(), - Double.parseDouble(inputRowMeta.getString(r, i))); - break; - case IValueMeta.TYPE_INET: - builder.addTagAddress(field.getName(), - field.getItem(), - Double.parseDouble(inputRowMeta.getString(r, i))); - break; - case IValueMeta.TYPE_STRING: - builder.addTagAddress(field.getName(), - field.getItem(), - Double.parseDouble(inputRowMeta.getString(r, i))); - break; - case IValueMeta.TYPE_SERIALIZABLE: - builder.addTagAddress(field.getName(), - field.getItem(), - Double.parseDouble(inputRowMeta.getString(r, i))); - break; - - } - //field.setValue(inputRowMeta.getString(r, i)); - }; - } + */ + @Override + public boolean processRow() throws HopException { +// final Object[] r = getRow(); // Get row from input rowset & set row busy! + r = getRow(); - writeRequest = builder.build(); - - try { - int maxwait = Integer.parseInt(meta.getMaxwaitInMs()); - maxwait = (maxwait<100)?100:maxwait; - writeResponse = writeRequest.execute().get(maxwait, TimeUnit.MILLISECONDS); - - if (isDebug()) - index.forEach((n,y)->{ - logDebug("Result: " + writeResponse.getResponseCode(n)); - }); - - } catch (Exception ex) { - setErrors(1L); - logError("Unable write to PLC. " + ex.getMessage()); - } - - } else { - setErrors(1L); - logError("PLC is not connected."); + if (r == null) { setOutputDone(); - return false; + return false; } - - } else { - setErrors(1L); - logError("PLC connection don't exist."); - setOutputDone(); - return false; - } - - - putRow(data.outputRowMeta, r); // return your data - data.rowsWritten++; - return true; - } - - - @Override - public boolean init() { - System.out.println("*************** INIT *****************"); - try { - if(super.init()){ - // Determine the number of rows to generate... - data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); - data.rowsWritten = 0L; - data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); - - if (data.rowLimit < 0L) { // Unable to parse - logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); - return false; // fail - } - - // Create a row (constants) with all the values in it... - List remarks = new ArrayList<>(); // stores the errors... - RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); - if (!remarks.isEmpty()) { - for (int i = 0; i < remarks.size(); i++) { - CheckResult cr = (CheckResult) remarks.get(i); - logError(cr.getText()); - } - return false; - } - data.outputRowData = outputRow.getData(); - data.outputRowMeta = outputRow.getRowMeta(); + data.outputRowMeta = getInputRowMeta(); + + first = true; + if (first) { + index.clear(); + plcfields.clear(); + meta.getFields().forEach((f) -> { + final Integer i = getInputRowMeta().indexOfValue(f.getName()); //(01) + if (i >= 0) { + index.put(f.getName(), i); + plcfields.put(f.getName(), Plc4xPlcTag.of(f.getItem())); + } + }); + first = false; + } - getPlcConnection(); - - return true; + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; } - return false; - } catch (Exception ex){ - setErrors(1L); - logError("Error initializing transform", ex); - return false; + + if (!RegisterPlcTags()) { + return false; + } + GetWrites(); + + putRow(data.outputRowMeta, r); // return your data + data.rowsWritten++; + return true; } - } + @Override + public boolean init() { + try { + if (super.init()) { + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + data.rowsWritten = 0L; + data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); + + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } + + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + return false; + } + + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); + + getPlcConnection(); - /* - * Here, must perform the cleaning of any resource, main of the connection to - * the associated PLC. - */ + return true; + } + return false; + } catch (Exception ex) { + setErrors(1L); + logError("Error initializing transform", ex); + return false; + } + + } + + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ @Override public void cleanup() { - System.out.println("*************** CLEANUP *****************"); super.cleanup(); logBasic("Cleanup. Release connection."); if (connwrapper != null) { connwrapper.release(); - if (connwrapper.refCnt() <= 0) + if (connwrapper.refCnt() <= 0) { lookup.remove(connwrapper); - } + } + } } @@ -499,22 +360,22 @@ public void cleanup() { * 2. Release de reference to object. * 3. The lastone remove the global reference to connection wrapper. * 4. Clear local references. - */ + */ @Override public void dispose() { - System.out.println("*************** DISPOSE *****************"); super.dispose(); if (connwrapper != null) { - logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); connwrapper.release(); - if (connwrapper.refCnt() <= 0) - lookup.remove(connwrapper); + if (connwrapper.refCnt() <= 0) { + lookup.remove(connwrapper); + } connwrapper = null; writeRequest = null; } } - + private void getPlcConnection() { lock.lock(); //(01) try { @@ -522,48 +383,171 @@ private void getPlcConnection() { IHopMetadataProvider metaprovider = getMetadataProvider(); connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); result = lookup.lookup(template); if (!result.allItems().isEmpty()) { - System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + logBasic("Using connection: " + meta.getConnection()); connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; - if (connwrapper != null) connwrapper.retain(); + if (connwrapper != null) { + connwrapper.retain(); + } } }; - if (connmeta == null){ + if (connmeta == null) { logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); } - if ((connmeta != null) && (connwrapper == null)){ + if ((connmeta != null) && (connwrapper == null)) { writeRequest = null; - try{ - System.out.println("Creo una nueva conexión..."); - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - + try { + final PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + Thread.sleep(200); if (conn.isConnected()) { - System.out.println("**** Agrego la segunda conexion. ****"); - connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + logBasic("Create new connection with url : " + connmeta.getUrl()); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); lookup.add(connwrapper); } - } catch (Exception ex){ + } catch (Exception ex) { setErrors(1L); logError("Unable to create connection to PLC. " + ex.getMessage()); } } } catch (HopException ex) { - Logger.getLogger(Plc4xWrite.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(Plc4xWrite.class.getName()).log(Level.SEVERE, null, ex); } finally { lock.unlock(); - } - } - - + } + } + + /* + * Registers the tags to write. + * In the first processing of the rows, a check of the tags is + * carried out in order that they are well formed, generating an exception + * if they are not. + */ + public boolean RegisterPlcTags() { + if ((connmeta != null) && (connwrapper != null)) { + if (connwrapper.getConnection().isConnected()) { + builder = null; + builder = connwrapper.getConnection().writeRequestBuilder(); //(05) + Integer i = null; + + for (Plc4xGeneratorField field : meta.getFields()) { + try { + i = index.get(field.getName()); + if (i != null) { + //From Input Type + if (getInputRowMeta().getValueMeta(i).getTypeDesc(). + equalsIgnoreCase(field.getType())) { + switch (getInputRowMeta().getValueMeta(i).getType()) { + case IValueMeta.TYPE_BOOLEAN: + case IValueMeta.TYPE_INTEGER: + case IValueMeta.TYPE_NUMBER: + case IValueMeta.TYPE_BIGNUMBER: + Object value = null; + switch (plcfields.get(field.getName()).getDataType()) { + case BOOL: + case BYTE: + case WORD: + value = Short.parseShort(r[i].toString()); + break; + case REAL: + value = Float.parseFloat(r[i].toString()); + break; + } + + builder.addTagAddress(field.getName(), + field.getItem(), + value); + break; + case IValueMeta.TYPE_DATE: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(getInputRowMeta().getString(r, i))); + break; + case IValueMeta.TYPE_TIMESTAMP: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(getInputRowMeta().getString(r, i))); + break; + case IValueMeta.TYPE_INET: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(getInputRowMeta().getString(r, i))); + break; + case IValueMeta.TYPE_STRING: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(getInputRowMeta().getString(r, i))); + break; + case IValueMeta.TYPE_SERIALIZABLE: + builder.addTagAddress(field.getName(), + field.getItem(), + Double.parseDouble(getInputRowMeta().getString(r, i))); + break; + + } + } + //field.setValue(inputRowMeta.getString(r, i)); + }; + } catch (HopValueException ex) { + try { + putError(getInputRowMeta(), r, 1, + "Tag error!.", r[i].toString(), + ex.getMessage()); + } catch (HopTransformException ex1) { + logError(ex1.toString()); + } + } + } + + writeRequest = builder.build(); + + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + + return true; + } + + public void GetWrites() { + try { + int maxwait = Integer.parseInt(meta.getMaxwaitInMs()); + maxwait = (maxwait < 100) ? 100 : maxwait; + writeResponse = writeRequest.execute().get(2 * maxwait, TimeUnit.MILLISECONDS); + index.forEach((n, y) -> { + logDebug("Result: " + writeResponse.getResponseCode(n)); + if (writeResponse.getResponseCode(n) != PlcResponseCode.OK) { + try { + putError(getInputRowMeta(), r, 1, + "Tag error.", n, + writeResponse.getResponseCode(n).toString()); + } catch (HopTransformException ex) { + logError(ex.toString()); + } + } + }); + } catch (Exception ex) { + setErrors(1L); + logError("Unable write to PLC. " + ex.getMessage()); + } + } } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java index d9461f6d07c..d32959fe587 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xoutput/Plc4xWriteMeta.java @@ -185,7 +185,7 @@ public void setDefault() { */ @Override public ITransformIOMeta getTransformIOMeta() { - return new TransformIOMeta(false, true, false, false, false, false); + return new TransformIOMeta(true, true, false, false, false, false); } /** @@ -295,10 +295,15 @@ public void setRowLimit(String rowLimit) { public List getFields() { return fields; } - + /** @param fields The fields to set */ public void setFields(List fields) { this.fields = fields; } + @Override + public boolean supportsErrorHandling() { + return true; + } + } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java index 5ed2513993d..efc1dc7df9c 100644 --- a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.plc4x.hop.transforms.plc4xsubs; import java.time.Duration; @@ -29,7 +28,10 @@ import java.util.function.Consumer; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.codec.binary.BinaryCodec; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; @@ -62,195 +64,228 @@ import org.apache.plc4x.hop.transforms.plc4xinput.Plc4xRead; import org.apache.plc4x.java.DefaultPlcDriverManager; import org.apache.plc4x.java.api.PlcConnection; +import org.apache.plc4x.java.api.exceptions.PlcProtocolException; +import org.apache.plc4x.java.api.listener.ConnectionStateListener; import org.apache.plc4x.java.api.messages.PlcReadRequest; import org.apache.plc4x.java.api.messages.PlcReadResponse; import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent; import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest; import org.apache.plc4x.java.api.messages.PlcSubscriptionResponse; +import org.apache.plc4x.java.api.model.PlcConsumerRegistration; +import org.apache.plc4x.java.api.model.PlcTag; +import org.apache.plc4x.java.api.types.PlcValueType; +import static org.apache.plc4x.java.api.types.PlcValueType.BYTE; +import static org.apache.plc4x.java.api.types.PlcValueType.DATE; +import static org.apache.plc4x.java.api.types.PlcValueType.DATE_AND_TIME; +import static org.apache.plc4x.java.api.types.PlcValueType.DWORD; +import static org.apache.plc4x.java.api.types.PlcValueType.LDATE; +import static org.apache.plc4x.java.api.types.PlcValueType.LDATE_AND_TIME; +import static org.apache.plc4x.java.api.types.PlcValueType.LTIME; +import static org.apache.plc4x.java.api.types.PlcValueType.LWORD; +import static org.apache.plc4x.java.api.types.PlcValueType.STRING; +import static org.apache.plc4x.java.api.types.PlcValueType.TIME; +import static org.apache.plc4x.java.api.types.PlcValueType.WORD; +import org.apache.plc4x.java.s7.events.S7CyclicEvent; import org.apache.plc4x.java.s7.events.S7Event; +import org.apache.plc4x.java.s7.readwrite.protocol.S7HPlcConnection; +import org.apache.plc4x.java.s7.readwrite.tag.S7SubscriptionTag; +import org.apache.plc4x.java.spi.utils.hex.Hex; import org.openide.util.Lookup; /** - * Transform That contains the basic skeleton needed to create your own plugin + * * */ -public class Plc4xSubs extends BaseTransform { +public class Plc4xSubs extends BaseTransform implements ConnectionStateListener { private static final Class PKG = Plc4xSubs.class; // Needed by Translator private Plc4xConnection connmeta = null; private Plc4xWrapperConnection connwrapper = null; private PlcSubscriptionRequest subsRequest = null; - private PlcSubscriptionResponse subsResponse = null; + private PlcSubscriptionResponse subsResponse = null; + + private PlcConsumerRegistration csmr; + private int maxwait = 0; private static final ReentrantLock lock = new ReentrantLock(); private Plc4xLookup lookup = Plc4xLookup.getDefault(); private Lookup.Template template = null; - private Lookup.Result result = null; + private Lookup.Result result = null; private ConcurrentLinkedQueue events = new ConcurrentLinkedQueue(); private boolean stopBundle = false; + private boolean isConnected = false; + + private String jobId = null; - private static final String dummy = "dummy"; + private BinaryCodec binarycodec = new BinaryCodec(); - private Map index = new HashMap(); - private Map plctags = new HashMap(); + private static final String DUMMY = "dummy"; + private static final String DATA = "DATA_"; + + private int counter = 0; + private String strData; + private PlcValueType valuetype = null; + + private Map tags_index = new HashMap(); + private Map> plctags = new HashMap(); public Plc4xSubs(TransformMeta transformMeta, Plc4xSubsMeta meta, Plc4xSubsData data, int copyNr, PipelineMeta pipelineMeta, - Pipeline pipeline ) { - super( transformMeta, meta, data, copyNr, pipelineMeta, pipeline ); + Pipeline pipeline) { + super(transformMeta, meta, data, copyNr, pipelineMeta, pipeline); } - /* + /* * Including Date and Time field for every row * * @param meta Meta data from user dialog * @param remarks Error registers * @param origin transform instance name - */ - public static final RowMetaAndData buildRow( - Plc4xSubsMeta meta, List remarks, String origin) throws HopPluginException { - IRowMeta rowMeta = new RowMeta(); - Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); - int index = 0; - - if (!Utils.isEmpty(meta.getRowTimeField())) { - rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); - rowData[index++] = null; - } + */ + public static final RowMetaAndData buildRow( + Plc4xSubsMeta meta, List remarks, String origin) throws HopPluginException { + IRowMeta rowMeta = new RowMeta(); + Object[] rowData = RowDataUtil.allocateRowData(meta.getFields().size() + 2); + int index = 0; + + if (!Utils.isEmpty(meta.getRowTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getRowTimeField())); + rowData[index++] = null; + } - if (!Utils.isEmpty(meta.getLastTimeField())) { - rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); - rowData[index++] = null; - } - - for (Plc4xGeneratorField field : meta.getFields()) { - int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); - if (StringUtils.isNotEmpty(field.getType())) { - - IValueMeta valueMeta = - ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a - // value! - valueMeta.setLength(field.getLength()); - valueMeta.setPrecision(field.getPrecision()); - valueMeta.setConversionMask(field.getFormat()); - valueMeta.setCurrencySymbol(field.getCurrency()); - valueMeta.setGroupingSymbol(field.getGroup()); - valueMeta.setDecimalSymbol(field.getDecimal()); - valueMeta.setOrigin(origin); - - IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); - - if (field.isSetEmptyString()) { - // Set empty string - rowData[index] = StringUtil.EMPTY_STRING; - } else { - String stringValue = field.getValue(); - - // If the value is empty: consider it to be NULL. - if (Utils.isEmpty(stringValue)) { - rowData[index] = null; - - if (valueMeta.getType() == IValueMeta.TYPE_NONE) { - String message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", - valueMeta.getName(), - stringValue); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - } - } else { - // Convert the data from String to the specified type ... - // - try { + if (!Utils.isEmpty(meta.getLastTimeField())) { + rowMeta.addValueMeta(new ValueMetaDate(meta.getLastTimeField())); + rowData[index++] = null; + } - rowData[index] = valueMeta.convertData(stringMeta, stringValue); - } catch (HopValueException e) { - switch (valueMeta.getType()) { - case IValueMeta.TYPE_NUMBER: - String message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_DATE: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_INTEGER: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_BIGNUMBER: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - case IValueMeta.TYPE_TIMESTAMP: - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", - valueMeta.getName(), - stringValue, - e.toString()); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - - default: - // Boolean and binary don't throw errors normally, so it's probably an unspecified - // error problem... - message = - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", - valueMeta.getName(), - stringValue); - remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); - break; - } + for (Plc4xGeneratorField field : meta.getFields()) { + int typeString = ValueMetaFactory.getIdForValueMeta(field.getType()); + if (StringUtils.isNotEmpty(field.getType())) { + + IValueMeta valueMeta + = ValueMetaFactory.createValueMeta(field.getName(), typeString); // build a + // value! + valueMeta.setLength(field.getLength()); + valueMeta.setPrecision(field.getPrecision()); + valueMeta.setConversionMask(field.getFormat()); + valueMeta.setCurrencySymbol(field.getCurrency()); + valueMeta.setGroupingSymbol(field.getGroup()); + valueMeta.setDecimalSymbol(field.getDecimal()); + valueMeta.setOrigin(origin); + + IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING); + + if (field.isSetEmptyString()) { + // Set empty string + rowData[index] = StringUtil.EMPTY_STRING; + } else { + String stringValue = field.getValue(); + + // If the value is empty: consider it to be NULL. + if (Utils.isEmpty(stringValue)) { + rowData[index] = null; + + if (valueMeta.getType() == IValueMeta.TYPE_NONE) { + String message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + } + } else { + // Convert the data from String to the specified type ... + // + try { + System.out.println("stringValue: " + stringValue); + rowData[index] = valueMeta.convertData(stringMeta, stringValue); + } catch (HopValueException e) { + switch (valueMeta.getType()) { + case IValueMeta.TYPE_NUMBER: + String message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Number", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_DATE: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Date", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_INTEGER: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Integer", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_BIGNUMBER: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.BigNumber", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + case IValueMeta.TYPE_TIMESTAMP: + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.BuildRow.Error.Parsing.Timestamp", + valueMeta.getName(), + stringValue, + e.toString()); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + + default: + // Boolean and binary don't throw errors normally, so it's probably an unspecified + // error problem... + message + = BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.CheckResult.SpecifyTypeError", + valueMeta.getName(), + stringValue); + remarks.add(new CheckResult(ICheckResult.TYPE_RESULT_ERROR, message, null)); + break; + } + } + } + } + + // Now add value to the row! + // This is in fact a copy from the fields row, but now with data. + rowMeta.addValueMeta(valueMeta); + index++; } - } } - // Now add value to the row! - // This is in fact a copy from the fields row, but now with data. - rowMeta.addValueMeta(valueMeta); - index++; - } + return new RowMetaAndData(rowMeta, rowData); } - return new RowMetaAndData(rowMeta, rowData); - } - - /* + /* * 1. Block the other instances by means of a lock. * 2. Try to locate an existing connection. * 3. If it doesn't exist, it tries to take control of the routine to @@ -259,199 +294,275 @@ public static final RowMetaAndData buildRow( * 5. If the connection to the PLC is made, then it creates the query * and executes it. * - */ - @Override - public boolean processRow() throws HopException { - Object[] r = getRow(); // Get row from input rowset & set row busy! - setLogLevel(LogLevel.DEBUG); - - if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { - setOutputDone(); // signal end to receiver(s) - return false; - } - - if (first) { - index.clear(); - plctags.clear(); - //This performs a minimal check on the user item. - //It guarantees that the rates are within those managed by Plc4x. - meta.getFields().forEach((f) ->{ - plctags.put(f.getName(),Plc4xPlcSubscriptionTag.of(f.getItem())); - }); - first = false; - } - - lock.lock(); //(01) - try { - IHopMetadataProvider metaprovider = getMetadataProvider(); - connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - System.out.println("PASO 02"); - connwrapper = (Plc4xWrapperConnection) getPipeline().getExtensionDataMap().get(meta.getConnection()); //(02) - if (connwrapper != null) connwrapper.retain(); - }; - - if (connmeta == null){ - logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); + */ + @Override + public boolean processRow() throws HopException { + Object[] r = getRow(); // Get row from input rowset & set row busy! + setLogLevel(LogLevel.DEBUG); + + if ((!meta.isNeverEnding() && data.rowsWritten >= data.rowLimit) && !isStopped()) { + setOutputDone(); // signal end to receiver(s) + return false; } - if ((connmeta != null) && (connwrapper == null)){ - subsRequest = null; - try{ - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - if (conn.isConnected()) { - connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); - getPipeline().getExtensionDataMap().put(meta.getConnection(), connwrapper); //(04) + if (first) { + plctags.clear(); + //This performs a minimal check on the user item. + //It guarantees that the rates are within those managed by Plc4x. + meta.getFields().forEach((f) -> { + plctags.put(f.getName(), new ImmutablePair(f.getName(), S7SubscriptionTag.of(f.getItem()))); + }); + first = false; + } + + // If we do not have the jobId, it is because we have not completed + // the CYC subscription. + if ((null == jobId) && (null == subsRequest)) { + RegisterPlcTags(); + GetSubscriptions(); + RegisterCYCHandler(); + } + + while (events.size() == 0) { + try { + Thread.sleep(100); + if (stopBundle) { + setOutputDone(); // signal end to receiver(s) + return false; } - } catch (Exception ex){ - setErrors(1L); - logError("Unable to create connection to PLC. " + ex.getMessage()); + } catch (InterruptedException ex) { + break; } } - } finally { - lock.unlock(); - } - - if ((connmeta != null) && (connwrapper != null)){ - if (connwrapper.getConnection().isConnected()){ - if (subsRequest == null){ - PlcSubscriptionRequest.Builder builder = connwrapper.getConnection().subscriptionRequestBuilder(); //(05) - for (Plc4xGeneratorField field: meta.getFields()){ - System.out.println(field.getName() + " : " + field.getItem().toString()); - builder.addCyclicTagAddress(field.getName(), field.getItem().toString(), Duration.ofMillis(1000)); - } - System.out.println("PASO: 05"); - subsRequest = builder.build(); - } - try { - maxwait = Integer.parseInt(meta.getMaxwaitInMs()); - maxwait = (maxwait<1000)?1000:maxwait; - System.out.println("PASO: 06"); - subsResponse = subsRequest.execute().get(); - System.out.println("PASO: 07"); - //Only for Siemens S7 - subsResponse.getSubscriptionHandles().forEach(a -> a.register(e -> events.add(e))); - System.out.println("PASO: 08"); - } catch (Exception ex) { - setErrors(1L); - logError("Unable read from PLC. " + ex.getMessage()); - ex.printStackTrace(); - } - - } else { - setErrors(1L); - logError("PLC is not connected."); - setOutputDone(); - return false; + + S7CyclicEvent s7event = (S7CyclicEvent) events.poll(); + //System.out.println("Ejecuto el consumidor en el cliente..." + s7event.getTagNames()); + + r = data.outputRowMeta.cloneRow(data.outputRowData); + + //s7event.getTimestamp() Takes the time sent by the PLC + data.prevDate = data.rowDate; + data.rowDate = Date.from(s7event.getTimestamp()); + int index = 0; + if (!Utils.isEmpty(meta.getRowTimeField())) { + r[index++] = data.rowDate; + } + if (!Utils.isEmpty(meta.getLastTimeField())) { + r[index++] = data.prevDate; } - - } else { - setErrors(1L); - logError("PLC connection don't exist."); - setOutputDone(); - return false; - } - // - while (events.size() == 0) { - try { - Thread.sleep(100); - if (stopBundle) { - setOutputDone(); // signal end to receiver(s) - return false; + counter = 0; + for (Plc4xGeneratorField field : meta.getFields()) { + valuetype = ((S7SubscriptionTag) plctags.get(field.getName()).getRight()).getS7Tags()[0].getPlcValueType(); + if (null != valuetype) { + System.out.println("Tipo enviado desde el PLC: " + valuetype.name()); + } else { + System.out.println("El tipo de NULL."); + } + + if (field.getType().equalsIgnoreCase("Avro Record")) { + throw new HopException("'Avro Record' type is not supported"); + } else if (field.getType().equalsIgnoreCase("BigNumber")) { + throw new HopException("'BigNumber' type is not supported"); + } else if (field.getType().equalsIgnoreCase("Binary")) { + switch (valuetype) { + case BYTE: + r[index++] = binarycodec.toByteArray( + Long.toBinaryString(Long.valueOf(s7event.getByte(field.getName())))); + break; + case WORD: + r[index++] = binarycodec.toByteArray( + Long.toBinaryString(Long.valueOf(s7event.getShort(field.getName())))); + break; + case DWORD: + r[index++] = binarycodec.toByteArray( + Integer.toBinaryString(s7event.getInteger(field.getName()))); + break; + case LWORD: + r[index++] = binarycodec.toByteArray( + Long.toBinaryString(s7event.getLong(field.getName()))); + break; + default: + throw new HopException("'DATE, LDATE, DATE_AND_TIME, LDATE_AND_TIME' type is not supported"); + } + + } else if (field.getType().equalsIgnoreCase("Boolean")) { + switch (valuetype) { + case BOOL: + r[index++] = s7event.getBoolean(plctags.get(field.getName()).getKey()); + break; + default: + } + } else if (field.getType().equalsIgnoreCase("Date")) { + switch (valuetype) { + case DATE:; + break; + case LDATE:; + break; + case DATE_AND_TIME:; + break; + case LDATE_AND_TIME:; + break; + default: + throw new HopException("'DATE, LDATE, DATE_AND_TIME, LDATE_AND_TIME' type is not supported"); + } + } else if (field.getType().equalsIgnoreCase("Graph")) { + throw new HopException("'Graph' type is not supported"); + } else if (field.getType().equalsIgnoreCase("Integer")) { + switch (valuetype) { + case BYTE: + r[index++] = Long.valueOf(s7event.getByte(field.getName())); + break; + case WORD: + r[index++] = Long.valueOf(s7event.getShort(field.getName())); + break; + case DWORD: + r[index++] = Long.valueOf(s7event.getInteger(field.getName())); + break; + case LWORD: + r[index++] = s7event.getLong(field.getName()); + break; + case INT: + r[index++] = Long.valueOf(s7event.getShort(field.getName())); + break; + case UINT: + r[index++] = Long.valueOf((s7event.getShort(field.getName())) & 0xFFFF); + break; + case SINT: + r[index++] = Long.valueOf(s7event.getByte(field.getName())); + break; + case USINT: + r[index++] = Long.valueOf(s7event.getByte(field.getName()) & 0xFF); + break; + case DINT: + r[index++] = Long.valueOf(s7event.getInteger(field.getName())); + break; + case UDINT: + r[index++] = Long.valueOf(s7event.getInteger(field.getName()) & 0xFFFF); + break; + case LINT: + r[index++] = s7event.getLong(field.getName()); + break; + case ULINT: + r[index++] = (s7event.getLong(field.getName())) & 0xFFFFFFFFL; + break; + default: + throw new HopException("Tag type is not supported. Check tag definition."); + } + } else if (field.getType().equalsIgnoreCase("Internet Address")) { + throw new HopException("'Internet Address' type is not supported"); + } else if (field.getType().equalsIgnoreCase("JSON")) { + throw new HopException("'JSON' type is not supported"); + } else if (field.getType().equalsIgnoreCase("Number")) { + switch (valuetype) { + case REAL: + System.out.println("Hex: " + Hex.dump((byte[]) s7event.getMap().get(field.getName()))); + r[index++] = Double.valueOf(s7event.getFloat(field.getName())); + break; + case LREAL: + r[index++] = s7event.getDouble(field.getName()); + break; + default: + throw new HopException("Tag type is not supported. Check tag definition."); + } + + } else if (field.getType().equalsIgnoreCase("String")) { + switch (valuetype) { + case STRING:; + case DWORD: + r[index++] = String.valueOf(s7event.getFloat(field.getName())); + break; + default: + throw new HopException("'STRING' type is not supported"); + } + } else if (field.getType().equalsIgnoreCase("Timestamp")) { + switch (valuetype) { + case TIME:; + r[index++] = s7event.getTime(plctags.get(field.getName()).getKey()); + break; + case LTIME:; + break; + case TIME_OF_DAY:; + r[index++] = s7event.getTime(plctags.get(field.getName()).getKey()); + break; + case LTIME_OF_DAY:; + break; + default: + throw new HopException("'LTIME, LTIME_OF_DAY' type is not supported"); + } } - } catch (InterruptedException ex) { - break; - } - } - - PlcSubscriptionEvent s7event = events.poll(); - System.out.println("Ejecuto el consumidor en el cliente..." + s7event.getTagNames()); - - r = data.outputRowMeta.cloneRow(data.outputRowData); - - data.prevDate = data.rowDate; - data.rowDate = new Date(); - int index = 0; - if (!Utils.isEmpty(meta.getRowTimeField())) { - r[index++] = data.rowDate; - } - if (!Utils.isEmpty(meta.getLastTimeField())) { - r[index++] = data.prevDate; - } - for (Plc4xGeneratorField field: meta.getFields()){ - if (field.getType().equalsIgnoreCase("Boolean")){ - r[index++] = Boolean.parseBoolean(field.getValue()); - } else if (field.getType().equalsIgnoreCase("Number")){ - r[index++] = Double.parseDouble(field.getValue()); - } else if (field.getType().equalsIgnoreCase("Integer")){ - r[index++] = Integer.parseInt(field.getValue()); } + + putRow(data.outputRowMeta, r); // return your data + data.rowsWritten++; + return true; } - putRow(data.outputRowMeta, r ); // return your data - data.rowsWritten++; - return true; - } - - - @Override - public boolean init() { - System.out.println("*************** INIT *****************"); - try { - if(super.init()){ - // Determine the number of rows to generate... - data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); - data.rowsWritten = 0L; - data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); - - if (data.rowLimit < 0L) { // Unable to parse - logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); - return false; // fail - } - - // Create a row (constants) with all the values in it... - List remarks = new ArrayList<>(); // stores the errors... - RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); - if (!remarks.isEmpty()) { - for (int i = 0; i < remarks.size(); i++) { - CheckResult cr = (CheckResult) remarks.get(i); - logError(cr.getText()); - } - return false; - } - data.outputRowData = outputRow.getData(); - data.outputRowMeta = outputRow.getRowMeta(); + @Override + public boolean init() { + try { + if (super.init()) { + // Determine the number of rows to generate... + data.rowLimit = Const.toLong(resolve(meta.getRowLimit()), -1L); + data.rowsWritten = 0L; + data.delay = Const.toLong(resolve(meta.getIntervalInMs()), -1L); + + if (data.rowLimit < 0L) { // Unable to parse + logError(BaseMessages.getString(PKG, "Plc4x.Read.Meta.Wrong.RowLimit.Number")); + return false; // fail + } + + // Create a row (constants) with all the values in it... + List remarks = new ArrayList<>(); // stores the errors... + RowMetaAndData outputRow = buildRow(meta, remarks, getTransformName()); + if (!remarks.isEmpty()) { + for (int i = 0; i < remarks.size(); i++) { + CheckResult cr = (CheckResult) remarks.get(i); + logError(cr.getText()); + } + + return false; + } + + data.outputRowData = outputRow.getData(); + data.outputRowMeta = outputRow.getRowMeta(); + + jobId = null; + subsRequest = null; + subsResponse = null; + + getPlcConnection(); + + final S7HPlcConnection conn = (S7HPlcConnection) connwrapper.getConnection(); + conn.addEventListener(this); - return true; + return true; + } + return false; + } catch (Exception ex) { + setErrors(1L); + logError("Error initializing transform", ex); + return false; } - return false; - } catch (Exception ex){ - setErrors(1L); - logError("Error initializing transform", ex); - return false; } - } - /* - * Here, must perform the cleaning of any resource, main of the connection to - * the associated PLC. - */ + /* + * Here, must perform the cleaning of any resource, main of the connection to + * the associated PLC. + */ @Override public void cleanup() { - System.out.println("*************** CLEANUP *****************"); super.cleanup(); super.cleanup(); logBasic("Cleanup. Release connection."); if (connwrapper != null) { connwrapper.release(); - if (connwrapper.refCnt() <= 0) + if (connwrapper.refCnt() <= 0) { lookup.remove(connwrapper); - } + } + connwrapper = null; + subsRequest = null; + } } @@ -461,27 +572,34 @@ public void cleanup() { * 2. Release de reference to object. * 3. The lastone remove the global reference to connection wrapper. * 4. Clear local references. - */ + */ @Override public void dispose() { - System.out.println("*************** DISPOSE *****************"); + + UnRegisterCYCHandler(); + + if (connwrapper.getConnection() instanceof S7HPlcConnection) { + final S7HPlcConnection conn = (S7HPlcConnection) connwrapper.getConnection(); + conn.removeEventListener(this); + } + super.dispose(); if (connwrapper != null) { - logBasic("Dispose. Release connection: " + connwrapper.refCnt()); + logBasic("Dispose. Release connection: " + connwrapper.refCnt()); connwrapper.release(); - if (connwrapper.refCnt() <= 0) - lookup.remove(connwrapper); + if (connwrapper.refCnt() <= 0) { + lookup.remove(connwrapper); + } connwrapper = null; subsRequest = null; } } - @Override public void stopRunning() throws HopException { super.stopRunning(); stopBundle = true; - } + } private void getPlcConnection() { lock.lock(); //(01) @@ -490,48 +608,177 @@ private void getPlcConnection() { IHopMetadataProvider metaprovider = getMetadataProvider(); connmeta = metaprovider.getSerializer(Plc4xConnection.class).load(meta.getConnection()); - if (connwrapper == null) { - template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); + if (connwrapper == null) { + template = new Lookup.Template<>(Plc4xWrapperConnection.class, meta.getConnection(), null); result = lookup.lookup(template); if (!result.allItems().isEmpty()) { - System.out.println("Aqui encontro la conexion: " + meta.getConnection()); + logBasic("Using connection: " + meta.getConnection()); connwrapper = (Plc4xWrapperConnection) result.allInstances().toArray()[0]; - if (connwrapper != null) connwrapper.retain(); + if (connwrapper != null) { + connwrapper.retain(); + } } }; - if (connmeta == null){ + if (connmeta == null) { logError( - BaseMessages.getString( - PKG, - "Plc4x.Read.Meta.Log.SetMetadata", - meta.getConnection())); + BaseMessages.getString( + PKG, + "Plc4x.Read.Meta.Log.SetMetadata", + meta.getConnection())); } - if ((connmeta != null) && (connwrapper == null)){ + if ((connmeta != null) && (connwrapper == null)) { subsRequest = null; - try{ - System.out.println("Creo una nueva conexión..."); - PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) - + try { + final PlcConnection conn = new DefaultPlcDriverManager().getConnection(connmeta.getUrl()); //(03) + Thread.sleep(200); if (conn.isConnected()) { - System.out.println("**** Agrego la segunda conexion. ****"); - connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); + logBasic("Create new connection with url : " + connmeta.getUrl()); + connwrapper = new Plc4xWrapperConnection(conn, meta.getConnection()); lookup.add(connwrapper); } - } catch (Exception ex){ + } catch (Exception ex) { setErrors(1L); logError("Unable to create connection to PLC. " + ex.getMessage()); } } } catch (HopException ex) { - Logger.getLogger(Plc4xRead.class.getName()).log(Level.SEVERE, null, ex); + logError(ex.getMessage()); } finally { lock.unlock(); - } - } - - + } + } + + /* + * Registers the tags for the cyclical subscription. + * In the first processing of the rows, a check of the tags is + * carried out in order that they are well formed, generating an exception + * if they are not. + */ + public boolean RegisterPlcTags() { + if ((connmeta != null) && (connwrapper != null)) { + if (connwrapper.getConnection().isConnected()) { + if (subsRequest == null) { + final PlcSubscriptionRequest.Builder builder = connwrapper.getConnection().subscriptionRequestBuilder(); //(05) + for (Plc4xGeneratorField field : meta.getFields()) { + builder.addEventTagAddress(field.getName(), field.getItem().toString()); + } + + subsRequest = builder.build(); + + } + } else { + setErrors(1L); + logError("PLC is not connected."); + setOutputDone(); + return false; + } + + } else { + setErrors(1L); + logError("PLC connection don't exist."); + setOutputDone(); + return false; + } + return true; + } + + /* + * This method performs the subscription to the events within the PLC. + * 1. Take the waiting time as a reference to monitor the request. + * 2. Captures the jobId associated with the subscription + * which is assigned by the PLC. + */ + public void GetSubscriptions() { + jobId = null; + try { + if (null != subsRequest) { + maxwait = Integer.parseInt(meta.getMaxwaitInMs()); + maxwait = (maxwait < 1000) ? 1000 : maxwait; + + subsResponse = subsRequest.execute().get(maxwait * 2, TimeUnit.MILLISECONDS); + + //Only for Siemens S7 +// subsResponse.getTagNames().forEach(s -> logDebug("Capture JobID: " + s)); + //Only one JobId per subscription will be obtained. + jobId = (String) subsResponse.getTagNames().toArray()[0]; + } + } catch (Exception ex) { + logError(ex.toString()); + jobId = null; + subsResponse = null; + } + } + + /* + * Subscribe to incoming events by transferring them to + * the local event buffer. + */ + public void RegisterCYCHandler() { + if (null != subsResponse) { + csmr = subsResponse + .getSubscriptionHandle(jobId) + .register(evt -> { + events.add(evt); + }); + } + } + + /* + * Unsubscribes to the event generator from the driver and requests + * to cancel the sending of PLC events for the specified job. + */ + public void UnRegisterCYCHandler() { + if (null != csmr) { + csmr.unregister(); + + PlcSubscriptionResponse unregister_response = null; + + final PlcSubscriptionRequest.Builder unregister_builder = connwrapper.getConnection().subscriptionRequestBuilder(); + unregister_builder.addEventTagAddress("CANCELTAG", "CANCEL:" + jobId); + + final PlcSubscriptionRequest unregister_request = unregister_builder.build(); + + try { + unregister_response = unregister_request.execute().get(500, TimeUnit.MILLISECONDS); + } catch (Exception ex) { + logError(ex.getMessage()); + } + + logBasic("UnRegisterCYCHandles: " + unregister_response.getResponseCode(jobId)); + } + } + + /* + * When the driver makes a connection this method is called. + * In the case of the S7 driver, only the connection of the embedded channel + * is served. + */ + @Override + public void connected() { + if (connwrapper.getConnection().isConnected()) { + RegisterPlcTags(); + GetSubscriptions(); + RegisterCYCHandler(); + } + } + + /* + * This method is called from the driver to indicate that it has + * disconnected from the PLC. + * If the PLC is disconnected, it automatically deletes all + * the status associated with this connection. + */ + @Override + public void disconnected() { + logError("Driver disconnected!"); + isConnected = false; + csmr.unregister(); + csmr = null; + subsRequest = null; + } + } diff --git a/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java new file mode 100644 index 00000000000..295dc9f1765 --- /dev/null +++ b/plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/Plc4xPlcField.java @@ -0,0 +1,148 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.hop.transforms.util; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException; +import org.apache.plc4x.java.api.model.PlcTag; +import org.apache.plc4x.java.spi.generation.ParseException; +import org.apache.plc4x.java.spi.generation.SerializationException; +import org.apache.plc4x.java.spi.generation.WriteBuffer; +import org.apache.plc4x.java.spi.utils.Serializable; + +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/* +* Code taken from the Modbus driver implementation. +* This allows me to make the correct interpretation of the "Hop" values +* towards the writing fields. +* +* TODO: The HOP interpreter generates an error when processing +* the "Integer" fields. +*/ + +public class Plc4xPlcField implements PlcTag, Serializable { + + public static final Pattern ADDRESS_PATTERN = Pattern.compile("(?
[\\%a-zA-Z_\\.0-9]+)(:(?[a-zA-Z_]+))?(\\[(?\\d+)])?"); + + protected static final int PROTOCOL_ADDRESS_OFFSET = 1; + + private final String address; + + private final int quantity; + + private final Plc4xDataType dataType; + + public static Plc4xPlcField of(String addressString) { + if (Plc4xPlcField.matches(addressString)) { + Matcher matcher = ADDRESS_PATTERN.matcher(addressString); + + matcher.matches(); + + String address = matcher.group("address"); + + String quantityString = matcher.group("quantity"); + int quantity = quantityString != null ? Integer.parseInt(quantityString) : 1; + + Plc4xDataType dataType = (matcher.group("datatype") != null) ? Plc4xDataType.valueOf(matcher.group("datatype")) : Plc4xDataType.BOOL; + + + return new Plc4xPlcField(address, quantity, dataType); + } + + throw new PlcInvalidTagException("Unable to parse address: " + addressString); + } + + protected Plc4xPlcField(String address, Integer quantity, Plc4xDataType dataType) { + this.address = address; + + this.quantity = quantity != null ? quantity : 1; + + this.dataType = dataType != null ? dataType : Plc4xDataType.INT; + } + + public static boolean matches(String addressString) { + return ADDRESS_PATTERN.matcher(addressString).matches(); + } + + public String getAddress() { + return address; + } + + public int getNumberOfElements() { + return quantity; + } + + public int getLengthBytes() { + return quantity * dataType.getDataTypeSize(); + } + + @JsonIgnore + public int getLengthWords() { + return (int) ((quantity * (float) dataType.getDataTypeSize()) / 2.0f); + } + + public Plc4xDataType getDataType() { + return dataType; + } + + public String getPlcDataType() { + return dataType.name(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Plc4xPlcField)) { + return false; + } + Plc4xPlcField that = (Plc4xPlcField) o; + return address == that.address; + } + + @Override + public int hashCode() { + return Objects.hash(address); + } + + @Override + public String toString() { + return "Plc4xPlcField{" + + " address=" + address + + " datatype=" + dataType + + " quantity=" + quantity + + " }"; + } + + @Override + public void serialize(WriteBuffer wb) throws SerializationException { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public String getAddressString() { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + +} diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/DefaultNettyPlcConnection.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/DefaultNettyPlcConnection.java index 7e301043182..58353c27dc6 100644 --- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/DefaultNettyPlcConnection.java +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/DefaultNettyPlcConnection.java @@ -40,6 +40,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; import java.util.stream.Stream; public class DefaultNettyPlcConnection extends AbstractPlcConnection implements ChannelExposingConnection, EventPlcConnection { diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectRequest.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectRequest.java index c632933923f..b1146e15775 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectRequest.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectRequest.java @@ -58,7 +58,6 @@ public String getConnectionString() { protected void serializePlc4xMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xConnectRequest"); // Implicit Field (connectionStringLen) (Used for parsing, but its value is not stored as it's @@ -104,8 +103,6 @@ public static Plc4xMessageBuilder staticParsePlc4xMessageBuilder(ReadBuffer read throws ParseException { readBuffer.pullContext("Plc4xConnectRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short connectionStringLen = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectResponse.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectResponse.java index 60178785e18..c3f74bc29fa 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectResponse.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConnectResponse.java @@ -64,7 +64,6 @@ public Plc4xResponseCode getResponseCode() { protected void serializePlc4xMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xConnectResponse"); // Simple Field (connectionId) @@ -112,8 +111,6 @@ public static Plc4xMessageBuilder staticParsePlc4xMessageBuilder(ReadBuffer read throws ParseException { readBuffer.pullContext("Plc4xConnectResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int connectionId = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConstants.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConstants.java index 5891b021226..686c63b4b13 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConstants.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xConstants.java @@ -51,7 +51,6 @@ public int getPlc4xTcpDefaultPort() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xConstants"); // Const Field (plc4xTcpDefaultPort) @@ -86,8 +85,6 @@ public static Plc4xConstants staticParse(ReadBuffer readBuffer, Object... args) public static Plc4xConstants staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Plc4xConstants"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int plc4xTcpDefaultPort = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xMessage.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xMessage.java index e8019cd783d..dfb051e649c 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xMessage.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xMessage.java @@ -65,7 +65,6 @@ protected abstract void serializePlc4xMessageChild(WriteBuffer writeBuffer) public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xMessage"); // Const Field (version) @@ -143,8 +142,6 @@ public static Plc4xMessage staticParse(ReadBuffer readBuffer, Object... args) public static Plc4xMessage staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Plc4xMessage"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short version = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadRequest.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadRequest.java index b8426a5ac02..5d24a78136f 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadRequest.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadRequest.java @@ -64,7 +64,6 @@ public List getTags() { protected void serializePlc4xMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xReadRequest"); // Simple Field (connectionId) @@ -123,8 +122,6 @@ public static Plc4xMessageBuilder staticParsePlc4xMessageBuilder(ReadBuffer read throws ParseException { readBuffer.pullContext("Plc4xReadRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int connectionId = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadResponse.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadResponse.java index 96a85cd71cc..e57738d1f8c 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadResponse.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xReadResponse.java @@ -74,7 +74,6 @@ public List getTags() { protected void serializePlc4xMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xReadResponse"); // Simple Field (connectionId) @@ -147,8 +146,6 @@ public static Plc4xMessageBuilder staticParsePlc4xMessageBuilder(ReadBuffer read throws ParseException { readBuffer.pullContext("Plc4xReadResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int connectionId = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTag.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTag.java index 110c3072856..c5a9b366bcd 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTag.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTag.java @@ -58,7 +58,6 @@ public String getTagQuery() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xTag"); // Implicit Field (nameLen) (Used for parsing, but its value is not stored as it's implicitly @@ -114,8 +113,6 @@ public static Plc4xTag staticParse(ReadBuffer readBuffer, Object... args) throws public static Plc4xTag staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Plc4xTag"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); short nameLen = readImplicitField("nameLen", readUnsignedShort(readBuffer, 8)); diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagRequest.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagRequest.java index 0a30976e34d..6eec2a4b7a7 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagRequest.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagRequest.java @@ -52,7 +52,6 @@ public Plc4xTag getTag() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xTagRequest"); // Simple Field (tag) @@ -87,8 +86,6 @@ public static Plc4xTagRequest staticParse(ReadBuffer readBuffer, Object... args) public static Plc4xTagRequest staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Plc4xTagRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); Plc4xTag tag = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagResponse.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagResponse.java index b603c118756..03db129e010 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagResponse.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagResponse.java @@ -58,7 +58,6 @@ public Plc4xResponseCode getResponseCode() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xTagResponse"); // Simple Field (tag) @@ -106,8 +105,6 @@ public static Plc4xTagResponse staticParse(ReadBuffer readBuffer, Object... args public static Plc4xTagResponse staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Plc4xTagResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); Plc4xTag tag = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueRequest.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueRequest.java index cc092c5a803..7b5f5dc1d86 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueRequest.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueRequest.java @@ -64,7 +64,6 @@ public PlcValue getValue() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xTagValueRequest"); // Simple Field (tag) @@ -123,8 +122,6 @@ public static Plc4xTagValueRequest staticParse(ReadBuffer readBuffer, Object... public static Plc4xTagValueRequest staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Plc4xTagValueRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); Plc4xTag tag = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueResponse.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueResponse.java index af2af4f8cad..ebfc6c35e51 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueResponse.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xTagValueResponse.java @@ -71,7 +71,6 @@ public PlcValue getValue() { public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xTagValueResponse"); // Simple Field (tag) @@ -143,8 +142,6 @@ public static Plc4xTagValueResponse staticParse(ReadBuffer readBuffer, Object... public static Plc4xTagValueResponse staticParse(ReadBuffer readBuffer) throws ParseException { readBuffer.pullContext("Plc4xTagValueResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); Plc4xTag tag = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteRequest.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteRequest.java index 6a0cb1486ba..8020ba0d7ca 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteRequest.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteRequest.java @@ -64,7 +64,6 @@ public List getTags() { protected void serializePlc4xMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xWriteRequest"); // Simple Field (connectionId) @@ -123,8 +122,6 @@ public static Plc4xMessageBuilder staticParsePlc4xMessageBuilder(ReadBuffer read throws ParseException { readBuffer.pullContext("Plc4xWriteRequest"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int connectionId = diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteResponse.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteResponse.java index 0c50b76159f..7966508f0c6 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteResponse.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xWriteResponse.java @@ -74,7 +74,6 @@ public List getTags() { protected void serializePlc4xMessageChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - int startPos = positionAware.getPos(); writeBuffer.pushContext("Plc4xWriteResponse"); // Simple Field (connectionId) @@ -147,8 +146,6 @@ public static Plc4xMessageBuilder staticParsePlc4xMessageBuilder(ReadBuffer read throws ParseException { readBuffer.pullContext("Plc4xWriteResponse"); PositionAware positionAware = readBuffer; - int startPos = positionAware.getPos(); - int curPos; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); int connectionId = diff --git a/protocols/s7/src/main/resources/protocols/s7/s7.mspec b/protocols/s7/src/main/resources/protocols/s7/s7.mspec index d6df405d0d5..c6cfcdd4eca 100644 --- a/protocols/s7/src/main/resources/protocols/s7/s7.mspec +++ b/protocols/s7/src/main/resources/protocols/s7/s7.mspec @@ -285,10 +285,10 @@ ] ] -//TODO: Se debe modificar el calculo para incluir el tipo -// . si es tipo 4 usa el desplazamiento -// . si es tipo 3, la longitud es la indicada -// . verificar calculo con los otros tipos +//TODO: The calculation must be modified to include the type +// . if it is type 0x07(REAL) or 0x09 (OCTET_STRING), the length is indicated +// . another type uses scrolling +// . verify calculation with the other types [type AssociatedValueType [simple DataTransportErrorCode returnCode] [simple DataTransportSize transportSize] @@ -439,7 +439,8 @@ [simple uint 8 syntaxId] [typeSwitch syntaxId ['0x10' CycServiceItemAnyType - [simple TransportSize transportSize] + //[simple TransportSize transportSize] + [enum TransportSize transportSize code] [simple uint 16 length] [simple uint 16 dbNumber] [simple MemoryArea memoryArea] diff --git a/src/site/asciidoc/images/01.png b/src/site/asciidoc/images/01.png new file mode 100644 index 0000000000000000000000000000000000000000..cdaee053bf2401557e899cae49836bb39247cc78 GIT binary patch literal 19058 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

wkv32$CU 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 literal 0 HcmV?d00001 diff --git a/src/site/asciidoc/images/dt0.png b/src/site/asciidoc/images/dt0.png new file mode 100644 index 0000000000000000000000000000000000000000..cdaee053bf2401557e899cae49836bb39247cc78 GIT binary patch literal 19058 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

wkv32$CU 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 literal 0 HcmV?d00001 diff --git a/src/site/asciidoc/images/dt01.png b/src/site/asciidoc/images/dt01.png new file mode 100644 index 0000000000000000000000000000000000000000..317499115f66ace6fe352821eee46e53096dc54f GIT binary patch literal 14671 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 : {ping-time} +@enduml +.... + +[plantuml, target="../../dt02", format=png, align="center"] +.... + +Title S7-comm driver reconnection diagram +clock clk with period 1 +binary "PING" as PING +binary "READ_TIMEOUT" as RTOUT +binary "CONNECT" as CONNECT +concise "tcp channel" as db + +@0 +PING is low +CONNECT is high +db is {-} + +@1 +CONNECT is low + +@2 +db is {-} + +@3 + +@4 + +@5 +PING is high +db is "0101" + +@6 +PING is low +db is {-} + +@7 + +@8 + +@9 +PING is high : rise timeout + +@10 +PING is low +RTOUT is low + +@11 +CONNECT is low + +@12 + +@13 +PING is high : rise timeout + +@14 +PING is low +RTOUT is high + + +@15 +PING is low +RTOUT is low +CONNECT is high + +@16 +CONNECT is low +db is "1010" + +@PING +@1<->@+4 : {ping-time} + +@RTOUT +@6<->@+8 : {read-timeout} + +highlight 14 to 16 : reconnect +@enduml +.... + + + + ==== TWO After defining the URL, the connection is made. Driver selection from the URL is done via PLC4X's SPI support, so driver instantiation and mapping originating from the URL is done transparently by the Java SPI services. diff --git a/src/site/asciidoc/users/protocols/szlxy11demo.png.cache b/src/site/asciidoc/users/protocols/szlxy11demo.png.cache new file mode 100644 index 00000000000..39abd6ef3f2 --- /dev/null +++ b/src/site/asciidoc/users/protocols/szlxy11demo.png.cache @@ -0,0 +1 @@ +{"checksum":"e6cb1ec63fc034e73a05158cc1168cf5","options":{"size_limit":"4096"},"width":487,"height":479} \ No newline at end of file