From a05857e0dd18951223293e73beaaa1c46f6c78ab Mon Sep 17 00:00:00 2001 From: Christofer Dutz Date: Mon, 4 Sep 2023 14:24:37 +0200 Subject: [PATCH] Feature/iec 60870 5 104 (#1088) * feat(plc4j/iec-60870): Finished implementing the decoding of most of the datatypes as well as the timestamp handling * feat(plc4j/iec-60870): Finished a first rough version of the code to publish incoming IEC 60870-5-104 events to PLC4X Subscription Handlers (Still query expressions and filtering isn't implemented) * feat(plc4j/iec-60870): Slightly changed the API for the new MetaData in PlcValues * feat(plc4j/plc-values): Improved the PlcNull implementation of the Metadata methods. * feat(plc4j/plc-values): Removed an odd character from the file. * feat(plc4j/iec-60870): Made the Tag-informaiton available in subscription events. --- .../apache/plc4x/java/api/value/PlcValue.java | 6 + plc4j/drivers/iec-60870/pom.xml | 4 + .../java/iec608705104/readwrite/ASDU.java | 4 +- .../readwrite/InformationObject.java | 371 +- .../InformationObjectWithSevenByteTime.java | 230 + ...ithSevenByteTime_BITSTRING_OF_32_BIT.java} | 48 +- ...venByteTime_DOUBLE_POINT_INFORMATION.java} | 48 +- ...teTime_EVENT_OF_PROTECTION_EQUIPMENT.java} | 54 +- ...tWithSevenByteTime_INTEGRATED_TOTALS.java} | 50 +- ...Time_MEASURED_VALUE_NORMALISED_VALUE.java} | 55 +- ...ByteTime_MEASURED_VALUE_SCALED_VALUE.java} | 54 +- ...ED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} | 53 +- ..._INFORMATION_OF_PROTECTION_EQUIPMENT.java} | 48 +- ...START_EVENTS_OF_PROTECTION_EQUIPMENT.java} | 57 +- ...venByteTime_SINGLE_POINT_INFORMATION.java} | 48 +- ...enByteTime_STEP_POSITION_INFORMATION.java} | 49 +- .../InformationObjectWithTreeByteTime.java | 226 + ...WithTreeByteTime_BITSTRING_OF_32_BIT.java} | 49 +- ...reeByteTime_DOUBLE_POINT_INFORMATION.java} | 49 +- ...teTime_EVENT_OF_PROTECTION_EQUIPMENT.java} | 48 +- ...ctWithTreeByteTime_INTEGRATED_TOTALS.java} | 48 +- ...Time_MEASURED_VALUE_NORMALIZED_VALUE.java} | 48 +- ...ByteTime_MEASURED_VALUE_SCALED_VALUE.java} | 50 +- ...ED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} | 48 +- ..._INFORMATION_OF_PROTECTION_EQUIPMENT.java} | 53 +- ...START_EVENTS_OF_PROTECTION_EQUIPMENT.java} | 48 +- ...reeByteTime_SINGLE_POINT_INFORMATION.java} | 49 +- ...eeByteTime_STEP_POSITION_INFORMATION.java} | 48 +- .../InformationObjectWithoutTime.java | 355 + ...jectWithoutTime_ACK_FILE_ACK_SECTION.java} | 44 +- ...WithoutTime_BITSTRING_32_BIT_COMMAND.java} | 48 +- ...bjectWithoutTime_BITSTRING_OF_32_BIT.java} | 44 +- ...Y_SELECT_FILE_CALL_FILE_CALL_SECTION.java} | 56 +- ...utTime_CLOCK_SYNCHRONISATION_COMMAND.java} | 47 +- ...utTime_COUNTER_INTERROGATION_COMMAND.java} | 47 +- ...ithoutTime_DELAY_ACQUISITION_COMMAND.java} | 48 +- ...formationObjectWithoutTime_DIRECTORY.java} | 42 +- ...tionObjectWithoutTime_DOUBLE_COMMAND.java} | 43 +- ...WithoutTime_DOUBLE_POINT_INFORMATION.java} | 48 +- ...ectWithoutTime_END_OF_INITIALISATION.java} | 46 +- ...ormationObjectWithoutTime_FILE_READY.java} | 42 +- ...nObjectWithoutTime_INTEGRATED_TOTALS.java} | 44 +- ...ectWithoutTime_INTERROGATION_COMMAND.java} | 46 +- ...ithoutTime_LAST_SECTION_LAST_SEGMENT.java} | 48 +- ...Time_MEASURED_VALUE_NORMALISED_VALUE.java} | 47 +- ...ZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java} | 52 +- ...houtTime_MEASURED_VALUE_SCALED_VALUE.java} | 46 +- ...ED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} | 55 +- ...RMATION_WITH_STATUS_CHANGE_DETECTION.java} | 52 +- ...jectWithoutTime_PARAMETER_ACTIVATION.java} | 46 +- ..._OF_MEASURED_VALUES_NORMALIZED_VALUE.java} | 55 +- ...ETER_OF_MEASURED_VALUES_SCALED_VALUE.java} | 55 +- ...D_VALUES_SHORT_FLOATING_POINT_NUMBER.java} | 52 +- ...mationObjectWithoutTime_READ_COMMAND.java} | 42 +- ...tWithoutTime_REGULATING_STEP_COMMAND.java} | 47 +- ...ectWithoutTime_RESET_PROCESS_COMMAND.java} | 46 +- ...ationObjectWithoutTime_SECTION_READY.java} | 43 +- ...InformationObjectWithoutTime_SEGMENT.java} | 42 +- ...e_SET_POINT_COMMAND_NORMALISED_VALUE.java} | 48 +- ...tTime_SET_POINT_COMMAND_SCALED_VALUE.java} | 47 +- ..._COMMAND_SHORT_FLOATING_POINT_NUMBER.java} | 54 +- ...tionObjectWithoutTime_SINGLE_COMMAND.java} | 43 +- ...WithoutTime_SINGLE_POINT_INFORMATION.java} | 48 +- ...ithoutTime_STEP_POSITION_INFORMATION.java} | 46 +- ...mationObjectWithoutTime_TEST_COMMAND.java} | 42 +- ..._BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 132 - ...UBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 126 - ...ALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 138 - ...ALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 137 - ...MBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 144 - ...STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 126 - ...NGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 126 - ...TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java | 126 - .../readwrite/SevenOctetBinaryTime.java | 328 +- .../readwrite/ThreeOctetBinaryTime.java | 102 +- .../readwrite/TwoOctetBinaryTime.java | 40 +- .../readwrite/TypeIdentification.java | 165 +- .../readwrite/Iec60870514PlcDriver.java | 10 - .../Iec608705104PlcSubscriptionEvent.java | 43 + .../model/Iec608705104SubscriptionHandle.java | 77 + .../protocol/Iec608705104Protocol.java | 135 +- .../protocol/Iec608705104TagParser.java | 526 ++ .../readwrite/tag/Iec608705104Tag.java | 77 + .../readwrite/tag/Iec608705104TagHandler.java | 2 +- .../IEC608705104ParserSerializerTest.java | 2 +- .../plc4x/java/iec608705104/ManualTest.java | 13 + .../apache/plc4x/java/spi/values/PlcNull.java | 16 + .../java/spi/values/PlcValueAdapter.java | 28 +- .../iec608705104/iec-60870-5-104.mspec | 696 +- .../iec608705104/IEC-60870-5-104.xml | 6636 ++++++++++------- 90 files changed, 7991 insertions(+), 5959 deletions(-) create mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime.java rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT.java} (75%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java} (70%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_INTEGRATED_TOTALS.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE.java} (72%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java} (73%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} (72%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java} (75%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java} (74%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java => InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION.java} (74%) create mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime.java rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java} (75%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_INTEGRATED_TOTALS.java} (72%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java} (73%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG.java => InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java} (73%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} (73%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java} (75%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java} (76%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG.java => InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION.java} (75%) create mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime.java rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_ACK_FILE_ACK_SECTION.java => InformationObjectWithoutTime_ACK_FILE_ACK_SECTION.java} (76%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_BITSTRING_32_BIT_COMMAND.java => InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java} (67%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_BITSTRING_OF_32_BIT.java => InformationObjectWithoutTime_BITSTRING_OF_32_BIT.java} (73%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java => InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_CLOCK_SYNCHRONISATION_COMMAND.java => InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java} (68%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_COUNTER_INTERROGATION_COMMAND.java => InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND.java} (68%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_DELAY_ACQUISITION_COMMAND.java => InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND.java} (67%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_DIRECTORY.java => InformationObjectWithoutTime_DIRECTORY.java} (80%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_DOUBLE_COMMAND.java => InformationObjectWithoutTime_DOUBLE_COMMAND.java} (70%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_DOUBLE_POINT_INFORMATION.java => InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION.java} (67%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_END_OF_INITIALISATION.java => InformationObjectWithoutTime_END_OF_INITIALISATION.java} (68%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_FILE_READY.java => InformationObjectWithoutTime_FILE_READY.java} (78%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_INTEGRATED_TOTALS.java => InformationObjectWithoutTime_INTEGRATED_TOTALS.java} (69%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_INTERROGATION_COMMAND.java => InformationObjectWithoutTime_INTERROGATION_COMMAND.java} (68%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_LAST_SECTION_LAST_SEGMENT.java => InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java} (77%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_NORMALISED_VALUE.java => InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java => InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java} (65%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_SCALED_VALUE.java => InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java => InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java} (67%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java => InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java} (69%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PARAMETER_ACTIVATION.java => InformationObjectWithoutTime_PARAMETER_ACTIVATION.java} (68%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java => InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java} (69%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java => InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java} (69%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java => InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java} (69%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_READ_COMMAND.java => InformationObjectWithoutTime_READ_COMMAND.java} (66%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_REGULATING_STEP_COMMAND.java => InformationObjectWithoutTime_REGULATING_STEP_COMMAND.java} (67%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_RESET_PROCESS_COMMAND.java => InformationObjectWithoutTime_RESET_PROCESS_COMMAND.java} (68%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SECTION_READY.java => InformationObjectWithoutTime_SECTION_READY.java} (79%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SEGMENT.java => InformationObjectWithoutTime_SEGMENT.java} (78%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.java => InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE.java} (70%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SET_POINT_COMMAND_SCALED_VALUE.java => InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java} (71%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java => InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java} (68%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SINGLE_COMMAND.java => InformationObjectWithoutTime_SINGLE_COMMAND.java} (70%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_SINGLE_POINT_INFORMATION.java => InformationObjectWithoutTime_SINGLE_POINT_INFORMATION.java} (67%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_STEP_POSITION_INFORMATION.java => InformationObjectWithoutTime_STEP_POSITION_INFORMATION.java} (72%) rename plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/{InformationObject_TEST_COMMAND.java => InformationObjectWithoutTime_TEST_COMMAND.java} (70%) delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java delete mode 100644 plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java create mode 100644 plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/messages/Iec608705104PlcSubscriptionEvent.java create mode 100644 plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/model/Iec608705104SubscriptionHandle.java create mode 100644 plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104TagParser.java create mode 100644 plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104Tag.java diff --git a/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java b/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java index e5436aad4ab..754eea0f640 100644 --- a/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java +++ b/plc4j/api/src/main/java/org/apache/plc4x/java/api/value/PlcValue.java @@ -149,4 +149,10 @@ public interface PlcValue { Map getStruct(); + Set getMetaDataNames(); + + boolean hasMetaData(String key); + + PlcValue getMetaData(String key); + } diff --git a/plc4j/drivers/iec-60870/pom.xml b/plc4j/drivers/iec-60870/pom.xml index e5c206ba23f..db89bbef38f 100644 --- a/plc4j/drivers/iec-60870/pom.xml +++ b/plc4j/drivers/iec-60870/pom.xml @@ -141,6 +141,10 @@ commons-codec commons-codec + + org.apache.commons + commons-lang3 + org.apache.plc4x diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java index 698be607d60..c5d9b7e956c 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ASDU.java @@ -288,7 +288,9 @@ public static ASDU staticParse(ReadBuffer readBuffer) throws ParseException { new DataReaderComplexDefault<>( () -> InformationObject.staticParse( - readBuffer, (TypeIdentification) (typeIdentification)), + readBuffer, + (TypeIdentification) (typeIdentification), + (byte) (typeIdentification.getNumTimeBytes())), readBuffer), numberOfObjects, WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java index d08b0ad14cb..ed5974b7f72 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject.java @@ -38,7 +38,7 @@ public abstract class InformationObject implements Message { // Abstract accessors for discriminator values. - public abstract TypeIdentification getTypeIdentification(); + public abstract Byte getNumTimeByte(); // Properties. protected final int address; @@ -95,9 +95,9 @@ public int getLengthInBits() { public static InformationObject staticParse(ReadBuffer readBuffer, Object... args) throws ParseException { PositionAware positionAware = readBuffer; - if ((args == null) || (args.length != 1)) { + if ((args == null) || (args.length != 2)) { throw new PlcRuntimeException( - "Wrong number of arguments, expected 1, but got " + args.length); + "Wrong number of arguments, expected 2, but got " + args.length); } TypeIdentification typeIdentification; if (args[0] instanceof TypeIdentification) { @@ -110,11 +110,22 @@ public static InformationObject staticParse(ReadBuffer readBuffer, Object... arg + " was " + args[0].getClass().getName()); } - return staticParse(readBuffer, typeIdentification); + Byte numTimeByte; + if (args[1] instanceof Byte) { + numTimeByte = (Byte) args[1]; + } else if (args[1] instanceof String) { + numTimeByte = Byte.valueOf((String) args[1]); + } else { + throw new PlcRuntimeException( + "Argument 1 expected to be of type Byte or a string which is parseable but was " + + args[1].getClass().getName()); + } + return staticParse(readBuffer, typeIdentification, numTimeByte); } public static InformationObject staticParse( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext("InformationObject"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -127,353 +138,25 @@ public static InformationObject staticParse( // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) InformationObjectBuilder builder = null; - if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION)) { - builder = - InformationObject_SINGLE_POINT_INFORMATION.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG)) { - builder = - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION)) { - builder = - InformationObject_DOUBLE_POINT_INFORMATION.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG)) { - builder = - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION)) { - builder = - InformationObject_STEP_POSITION_INFORMATION.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG)) { - builder = - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT)) { - builder = - InformationObject_BITSTRING_OF_32_BIT.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG)) { - builder = - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE)) { - builder = - InformationObject_MEASURED_VALUE_NORMALISED_VALUE.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG)) { - builder = - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE)) { - builder = - InformationObject_MEASURED_VALUE_SCALED_VALUE.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG)) { - builder = - InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) { - builder = - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG)) { - builder = - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.INTEGRATED_TOTALS)) { - builder = - InformationObject_INTEGRATED_TOTALS.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG)) { - builder = - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { - builder = - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { - builder = - InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification - .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { - builder = - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) { - builder = - InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) { - builder = - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification - .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_COMMAND)) { - builder = - InformationObject_SINGLE_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DOUBLE_COMMAND)) { - builder = - InformationObject_DOUBLE_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.REGULATING_STEP_COMMAND)) { - builder = - InformationObject_REGULATING_STEP_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.SET_POINT_COMMAND_NORMALISED_VALUE)) { - builder = - InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.SET_POINT_COMMAND_SCALED_VALUE)) { - builder = - InformationObject_SET_POINT_COMMAND_SCALED_VALUE.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) { - builder = - InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.BITSTRING_32_BIT_COMMAND)) { - builder = - InformationObject_BITSTRING_32_BIT_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification - .MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.END_OF_INITIALISATION)) { - builder = - InformationObject_END_OF_INITIALISATION.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.INTERROGATION_COMMAND)) { - builder = - InformationObject_INTERROGATION_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.COUNTER_INTERROGATION_COMMAND)) { - builder = - InformationObject_COUNTER_INTERROGATION_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.READ_COMMAND)) { - builder = - InformationObject_READ_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.CLOCK_SYNCHRONISATION_COMMAND)) { - builder = - InformationObject_CLOCK_SYNCHRONISATION_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.TEST_COMMAND)) { - builder = - InformationObject_TEST_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.RESET_PROCESS_COMMAND)) { - builder = - InformationObject_RESET_PROCESS_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.DELAY_ACQUISITION_COMMAND)) { - builder = - InformationObject_DELAY_ACQUISITION_COMMAND.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - builder = - InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) { - builder = - InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) { - builder = - InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, - TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) { - builder = - InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.PARAMETER_ACTIVATION)) { - builder = - InformationObject_PARAMETER_ACTIVATION.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.FILE_READY)) { - builder = - InformationObject_FILE_READY.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SECTION_READY)) { - builder = - InformationObject_SECTION_READY.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) { - builder = - InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION - .staticParseInformationObjectBuilder(readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.LAST_SECTION_LAST_SEGMENT)) { - builder = - InformationObject_LAST_SECTION_LAST_SEGMENT.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals( - typeIdentification, TypeIdentification.ACK_FILE_ACK_SECTION)) { + if (EvaluationHelper.equals(numTimeByte, (byte) 0)) { builder = - InformationObject_ACK_FILE_ACK_SECTION.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SEGMENT)) { + InformationObjectWithoutTime.staticParseInformationObjectBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(numTimeByte, (byte) 3)) { builder = - InformationObject_SEGMENT.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); - } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DIRECTORY)) { + InformationObjectWithTreeByteTime.staticParseInformationObjectBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(numTimeByte, (byte) 7)) { builder = - InformationObject_DIRECTORY.staticParseInformationObjectBuilder( - readBuffer, typeIdentification); + InformationObjectWithSevenByteTime.staticParseInformationObjectBuilder( + readBuffer, typeIdentification, numTimeByte); } if (builder == null) { throw new ParseException( "Unsupported case for discriminated type" + " parameters [" - + "typeIdentification=" - + typeIdentification + + "numTimeByte=" + + numTimeByte + "]"); } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime.java new file mode 100644 index 00000000000..f32fe7cbd35 --- /dev/null +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime.java @@ -0,0 +1,230 @@ +/* + * 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 + * + * https://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.java.iec608705104.readwrite; + +import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; +import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; +import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; +import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; +import static org.apache.plc4x.java.spi.generation.StaticHelper.*; + +import java.time.*; +import java.util.*; +import org.apache.plc4x.java.api.exceptions.*; +import org.apache.plc4x.java.api.value.*; +import org.apache.plc4x.java.spi.codegen.*; +import org.apache.plc4x.java.spi.codegen.fields.*; +import org.apache.plc4x.java.spi.codegen.io.*; +import org.apache.plc4x.java.spi.generation.*; + +// Code generated by code-generation. DO NOT EDIT. + +public abstract class InformationObjectWithSevenByteTime extends InformationObject + implements Message { + + // Accessors for discriminator values. + public Byte getNumTimeByte() { + return (byte) 7; + } + + // Abstract accessors for discriminator values. + public abstract TypeIdentification getTypeIdentification(); + + public InformationObjectWithSevenByteTime(int address) { + super(address); + } + + public abstract SevenOctetBinaryTime getCp56Time2a(); + + protected abstract void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) + throws SerializationException; + + @Override + protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + throws SerializationException { + PositionAware positionAware = writeBuffer; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + writeBuffer.pushContext("InformationObjectWithSevenByteTime"); + + // Switch field (Serialize the sub-type) + serializeInformationObjectWithSevenByteTimeChild(writeBuffer); + + writeBuffer.popContext("InformationObjectWithSevenByteTime"); + } + + @Override + public int getLengthInBytes() { + return (int) Math.ceil((float) getLengthInBits() / 8.0); + } + + @Override + public int getLengthInBits() { + int lengthInBits = super.getLengthInBits(); + InformationObjectWithSevenByteTime _value = this; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + + // Length of sub-type elements will be added by sub-type... + + return lengthInBits; + } + + public static InformationObjectBuilder staticParseInformationObjectBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime"); + PositionAware positionAware = readBuffer; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + + // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) + InformationObjectWithSevenByteTimeBuilder builder = null; + if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_INTEGRATED_TOTALS + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification + .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { + builder = + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + .staticParseInformationObjectWithSevenByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } + if (builder == null) { + throw new ParseException( + "Unsupported case for discriminated type" + + " parameters [" + + "typeIdentification=" + + typeIdentification + + "]"); + } + + readBuffer.closeContext("InformationObjectWithSevenByteTime"); + // Create the instance + return new InformationObjectWithSevenByteTimeBuilderImpl(builder); + } + + public interface InformationObjectWithSevenByteTimeBuilder { + InformationObjectWithSevenByteTime build(int address); + } + + public static class InformationObjectWithSevenByteTimeBuilderImpl + implements InformationObject.InformationObjectBuilder { + private final InformationObjectWithSevenByteTimeBuilder builder; + + public InformationObjectWithSevenByteTimeBuilderImpl( + InformationObjectWithSevenByteTimeBuilder builder) { + this.builder = builder; + } + + public InformationObjectWithSevenByteTime build(int address) { + return builder.build(address); + } + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof InformationObjectWithSevenByteTime)) { + return false; + } + InformationObjectWithSevenByteTime that = (InformationObjectWithSevenByteTime) o; + return super.equals(that) && true; + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode()); + } + + @Override + public String toString() { + WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); + try { + writeBufferBoxBased.writeSerializable(this); + } catch (SerializationException e) { + throw new RuntimeException(e); + } + return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; + } +} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT.java similarity index 75% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT.java index 58e0d3af2c4..cd1574c5f6f 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT( int address, BinaryStateInformation bsi, QualityDescriptor qds, @@ -72,11 +72,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT"); // Simple Field (bsi) writeSimpleField( @@ -99,7 +99,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT"); } @Override @@ -110,7 +110,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (bsi) @@ -125,9 +125,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -152,31 +154,31 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT"); // Create the instance - return new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_BITSTRING_OF_32_BITBuilderImpl( bsi, qds, cp56Time2a); } - public static class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_BITSTRING_OF_32_BITBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final BinaryStateInformation bsi; private final QualityDescriptor qds; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_BITSTRING_OF_32_BITBuilderImpl( BinaryStateInformation bsi, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { this.bsi = bsi; this.qds = qds; this.cp56Time2a = cp56Time2a; } - public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A - informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT build(int address) { + InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT + informationObjectWithSevenByteTime_BITSTRING_OF_32_BIT = + new InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT( address, bsi, qds, cp56Time2a); - return informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_BITSTRING_OF_32_BIT; } } @@ -185,11 +187,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT)) { return false; } - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT that = + (InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT) o; return (getBsi() == that.getBsi()) && (getQds() == that.getQds()) && (getCp56Time2a() == that.getCp56Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION.java index 52eaf719657..74a2f611741 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final DoublePointInformation diq; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION( int address, DoublePointInformation diq, SevenOctetBinaryTime cp56Time2a) { super(address); this.diq = diq; @@ -63,11 +63,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION"); // Simple Field (diq) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (diq) @@ -106,9 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,29 +128,29 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION"); // Create the instance - return new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl( diq, cp56Time2a); } - public static class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final DoublePointInformation diq; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl( DoublePointInformation diq, SevenOctetBinaryTime cp56Time2a) { this.diq = diq; this.cp56Time2a = cp56Time2a; } - public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION build(int address) { + InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION + informationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION = + new InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION( address, diq, cp56Time2a); - return informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION; } } @@ -157,11 +159,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION)) { return false; } - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION that = + (InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION) o; return (getDiq() == that.getDiq()) && (getCp56Time2a() == that.getCp56Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java similarity index 70% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java index dd1f6d4fc0d..6ab2be7e8ae 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final TwoOctetBinaryTime cp16Time2a; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT( int address, TwoOctetBinaryTime cp16Time2a, SevenOctetBinaryTime cp56Time2a) { super(address); this.cp16Time2a = cp16Time2a; @@ -63,12 +63,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext( - "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); // Simple Field (cp16Time2a) writeSimpleField( @@ -84,8 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext( - "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); } @Override @@ -96,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (cp16Time2a) @@ -108,10 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext( - "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -129,32 +128,29 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext( - "InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); // Create the instance - return new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl( cp16Time2a, cp56Time2a); } - public static - class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final TwoOctetBinaryTime cp16Time2a; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl( TwoOctetBinaryTime cp16Time2a, SevenOctetBinaryTime cp56Time2a) { this.cp16Time2a = cp16Time2a; this.cp56Time2a = cp56Time2a; } - public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A build( - int address) { - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT build(int address) { + InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT + informationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT = + new InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT( address, cp16Time2a, cp56Time2a); - return informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT; } } @@ -163,11 +159,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT)) { return false; } - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT that = + (InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT) o; return (getCp16Time2a() == that.getCp16Time2a()) && (getCp56Time2a() == that.getCp56Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_INTEGRATED_TOTALS.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_INTEGRATED_TOTALS.java index 5e903ec3cb7..a59939472bc 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_INTEGRATED_TOTALS.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A extends InformationObject - implements Message { +public class InformationObjectWithSevenByteTime_INTEGRATED_TOTALS + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final BinaryCounterReading bcr; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_INTEGRATED_TOTALS( int address, BinaryCounterReading bcr, SevenOctetBinaryTime cp56Time2a) { super(address); this.bcr = bcr; @@ -63,11 +63,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS"); // Simple Field (bcr) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_INTEGRATED_TOTALS _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (bcr) @@ -106,9 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,29 +128,27 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_INTEGRATED_TOTALS"); // Create the instance - return new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2ABuilderImpl( - bcr, cp56Time2a); + return new InformationObjectWithSevenByteTime_INTEGRATED_TOTALSBuilderImpl(bcr, cp56Time2a); } - public static class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_INTEGRATED_TOTALSBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final BinaryCounterReading bcr; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_INTEGRATED_TOTALSBuilderImpl( BinaryCounterReading bcr, SevenOctetBinaryTime cp56Time2a) { this.bcr = bcr; this.cp56Time2a = cp56Time2a; } - public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A - informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A( - address, bcr, cp56Time2a); - return informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A; + public InformationObjectWithSevenByteTime_INTEGRATED_TOTALS build(int address) { + InformationObjectWithSevenByteTime_INTEGRATED_TOTALS + informationObjectWithSevenByteTime_INTEGRATED_TOTALS = + new InformationObjectWithSevenByteTime_INTEGRATED_TOTALS(address, bcr, cp56Time2a); + return informationObjectWithSevenByteTime_INTEGRATED_TOTALS; } } @@ -157,11 +157,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_INTEGRATED_TOTALS)) { return false; } - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_INTEGRATED_TOTALS that = + (InformationObjectWithSevenByteTime_INTEGRATED_TOTALS) o; return (getBcr() == that.getBcr()) && (getCp56Time2a() == that.getCp56Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE.java similarity index 72% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE.java index 9cda1ef9185..d9777474a16 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE( int address, NormalizedValue nva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { super(address); this.nva = nva; @@ -69,12 +69,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE"); // Simple Field (nva) writeSimpleField( @@ -97,8 +96,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE"); } @Override @@ -109,7 +107,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nva) @@ -124,10 +122,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -152,34 +151,31 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE"); // Create the instance - return new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl( nva, qds, cp56Time2a); } - public static - class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final NormalizedValue nva; private final QualityDescriptor qds; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl( NormalizedValue nva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { this.nva = nva; this.qds = qds; this.cp56Time2a = cp56Time2a; } - public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A build( - int address) { - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A - informationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE build(int address) { + InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE + informationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE = + new InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE( address, nva, qds, cp56Time2a); - return informationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE; } } @@ -188,12 +184,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o - instanceof InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE)) { return false; } - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE that = + (InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE) o; return (getNva() == that.getNva()) && (getQds() == that.getQds()) && (getCp56Time2a() == that.getCp56Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java similarity index 73% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java index 432540a227d..176e20ae5e4 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE( int address, ScaledValue sva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { super(address); this.sva = sva; @@ -69,12 +69,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE"); // Simple Field (sva) writeSimpleField( @@ -97,8 +96,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE"); } @Override @@ -109,7 +107,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sva) @@ -124,10 +122,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -151,34 +150,31 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE"); // Create the instance - return new InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl( sva, qds, cp56Time2a); } - public static - class InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final ScaledValue sva; private final QualityDescriptor qds; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl( ScaledValue sva, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { this.sva = sva; this.qds = qds; this.cp56Time2a = cp56Time2a; } - public InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A build( - int address) { - InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A - informationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE build(int address) { + InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE + informationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE = + new InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE( address, sva, qds, cp56Time2a); - return informationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE; } } @@ -187,11 +183,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE)) { return false; } - InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE that = + (InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE) o; return (getSva() == that.getSva()) && (getQds() == that.getQds()) && (getCp56Time2a() == that.getCp56Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java similarity index 72% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java index c94b7a46390..7b4bcc751b6 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER( int address, float value, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { super(address); this.value = value; @@ -69,12 +69,12 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); // Simple Field (value) writeSimpleField( @@ -98,7 +98,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); } @Override @@ -109,8 +109,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A _value = - this; + InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (value) @@ -125,10 +124,12 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -151,34 +152,33 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); // Create the instance - return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl( value, qds, cp56Time2a); } public static - class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final float value; private final QualityDescriptor qds; private final SevenOctetBinaryTime cp56Time2a; - public - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl( float value, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { this.value = value; this.qds = qds; this.cp56Time2a = cp56Time2a; } - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A - build(int address) { - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A - informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build( + int address) { + InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + informationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER = + new InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER( address, value, qds, cp56Time2a); - return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER; } } @@ -188,12 +188,11 @@ public boolean equals(Object o) { return true; } if (!(o - instanceof - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A)) { + instanceof InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) { return false; } - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that = + (InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o; return (getValue() == that.getValue()) && (getQds() == that.getQds()) && (getCp56Time2a() == that.getCp56Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java similarity index 75% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java index 63a42d1d187..b02bea929c0 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java @@ -36,8 +36,8 @@ // Code generated by code-generation. DO NOT EDIT. public -class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +class InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -52,7 +52,7 @@ public TypeIdentification getTypeIdentification() { protected final SevenOctetBinaryTime cp56Time2a; public - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A( + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT( int address, OutputCircuitInformation oci, QualityDescriptorForPointsOfProtectionEquipment qdp, @@ -82,12 +82,12 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); // Simple Field (oci) writeSimpleField( @@ -118,7 +118,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); } @Override @@ -129,7 +129,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -148,10 +148,12 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -185,22 +187,22 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + "InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); // Create the instance - return new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl( oci, qdp, cp16Time2a, cp56Time2a); } public static - class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final OutputCircuitInformation oci; private final QualityDescriptorForPointsOfProtectionEquipment qdp; private final TwoOctetBinaryTime cp16Time2a; private final SevenOctetBinaryTime cp56Time2a; public - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl( OutputCircuitInformation oci, QualityDescriptorForPointsOfProtectionEquipment qdp, TwoOctetBinaryTime cp16Time2a, @@ -212,13 +214,13 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN } public - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT build(int address) { - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A( + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + informationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT = + new InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT( address, oci, qdp, cp16Time2a, cp56Time2a); - return informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT; } } @@ -229,12 +231,12 @@ public boolean equals(Object o) { } if (!(o instanceof - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT)) { return false; } - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT that = - (InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A) + (InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT) o; return (getOci() == that.getOci()) && (getQdp() == that.getQdp()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java similarity index 74% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java index 23d145a21b4..d29250d63f2 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -49,7 +49,7 @@ public TypeIdentification getTypeIdentification() { protected final TwoOctetBinaryTime cp16Time2a; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT( int address, SingleEventOfProtectionEquipment sep, QualityDescriptorForPointsOfProtectionEquipment qdp, @@ -79,11 +79,12 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext( + "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); // Simple Field (sep) writeSimpleField( @@ -113,7 +114,8 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext( + "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); } @Override @@ -124,7 +126,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sep) @@ -142,9 +144,12 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext( + "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -177,20 +182,23 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext( + "InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); // Create the instance - return new InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl( sep, qdp, cp16Time2a, cp56Time2a); } - public static class InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static + class InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final SingleEventOfProtectionEquipment sep; private final QualityDescriptorForPointsOfProtectionEquipment qdp; private final TwoOctetBinaryTime cp16Time2a; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public + InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl( SingleEventOfProtectionEquipment sep, QualityDescriptorForPointsOfProtectionEquipment qdp, TwoOctetBinaryTime cp16Time2a, @@ -201,12 +209,13 @@ public InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2ABuilderImp this.cp56Time2a = cp56Time2a; } - public InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - informationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT build( + int address) { + InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + informationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT = + new InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT( address, sep, qdp, cp16Time2a, cp56Time2a); - return informationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT; } } @@ -215,11 +224,13 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o + instanceof + InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT)) { return false; } - InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT that = + (InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT) o; return (getSep() == that.getSep()) && (getQdp() == that.getQdp()) && (getCp16Time2a() == that.getCp16Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION.java index 4c2228bc26b..ea806686ad3 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final SinglePointInformation siq; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION( int address, SinglePointInformation siq, SevenOctetBinaryTime cp56Time2a) { super(address); this.siq = siq; @@ -63,11 +63,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION"); // Simple Field (siq) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (siq) @@ -106,9 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,29 +128,29 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION"); // Create the instance - return new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATIONBuilderImpl( siq, cp56Time2a); } - public static class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATIONBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final SinglePointInformation siq; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATIONBuilderImpl( SinglePointInformation siq, SevenOctetBinaryTime cp56Time2a) { this.siq = siq; this.cp56Time2a = cp56Time2a; } - public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION build(int address) { + InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION + informationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION = + new InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION( address, siq, cp56Time2a); - return informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION; } } @@ -157,11 +159,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION)) { return false; } - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION that = + (InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION) o; return (getSiq() == that.getSiq()) && (getCp56Time2a() == that.getCp56Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION.java similarity index 74% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION.java index 0d8ac8cdc5a..4eacb0fc467 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { +public class InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION + extends InformationObjectWithSevenByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION( int address, ValueWithTransientStateIndication vti, QualityDescriptor qds, @@ -72,11 +72,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithSevenByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.pushContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION"); // Simple Field (vti) writeSimpleField( @@ -99,7 +99,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + writeBuffer.popContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION"); } @Override @@ -110,7 +110,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A _value = this; + InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (vti) @@ -125,9 +125,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + public static InformationObjectWithSevenByteTimeBuilder + staticParseInformationObjectWithSevenByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -152,20 +154,19 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A"); + readBuffer.closeContext("InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION"); // Create the instance - return new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + return new InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATIONBuilderImpl( vti, qds, cp56Time2a); } - public static - class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATIONBuilderImpl + implements InformationObjectWithSevenByteTime.InformationObjectWithSevenByteTimeBuilder { private final ValueWithTransientStateIndication vti; private final QualityDescriptor qds; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuilderImpl( + public InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATIONBuilderImpl( ValueWithTransientStateIndication vti, QualityDescriptor qds, SevenOctetBinaryTime cp56Time2a) { @@ -174,12 +175,12 @@ public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2ABuild this.cp56Time2a = cp56Time2a; } - public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A - informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A( + public InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION build(int address) { + InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION + informationObjectWithSevenByteTime_STEP_POSITION_INFORMATION = + new InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION( address, vti, qds, cp56Time2a); - return informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A; + return informationObjectWithSevenByteTime_STEP_POSITION_INFORMATION; } } @@ -188,11 +189,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A)) { + if (!(o instanceof InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION)) { return false; } - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A) o; + InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION that = + (InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION) o; return (getVti() == that.getVti()) && (getQds() == that.getQds()) && (getCp56Time2a() == that.getCp56Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime.java new file mode 100644 index 00000000000..cd85315749a --- /dev/null +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime.java @@ -0,0 +1,226 @@ +/* + * 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 + * + * https://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.java.iec608705104.readwrite; + +import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; +import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; +import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; +import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; +import static org.apache.plc4x.java.spi.generation.StaticHelper.*; + +import java.time.*; +import java.util.*; +import org.apache.plc4x.java.api.exceptions.*; +import org.apache.plc4x.java.api.value.*; +import org.apache.plc4x.java.spi.codegen.*; +import org.apache.plc4x.java.spi.codegen.fields.*; +import org.apache.plc4x.java.spi.codegen.io.*; +import org.apache.plc4x.java.spi.generation.*; + +// Code generated by code-generation. DO NOT EDIT. + +public abstract class InformationObjectWithTreeByteTime extends InformationObject + implements Message { + + // Accessors for discriminator values. + public Byte getNumTimeByte() { + return (byte) 3; + } + + // Abstract accessors for discriminator values. + public abstract TypeIdentification getTypeIdentification(); + + public InformationObjectWithTreeByteTime(int address) { + super(address); + } + + public abstract ThreeOctetBinaryTime getCp24Time2a(); + + protected abstract void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) + throws SerializationException; + + @Override + protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + throws SerializationException { + PositionAware positionAware = writeBuffer; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + writeBuffer.pushContext("InformationObjectWithTreeByteTime"); + + // Switch field (Serialize the sub-type) + serializeInformationObjectWithTreeByteTimeChild(writeBuffer); + + writeBuffer.popContext("InformationObjectWithTreeByteTime"); + } + + @Override + public int getLengthInBytes() { + return (int) Math.ceil((float) getLengthInBits() / 8.0); + } + + @Override + public int getLengthInBits() { + int lengthInBits = super.getLengthInBits(); + InformationObjectWithTreeByteTime _value = this; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + + // Length of sub-type elements will be added by sub-type... + + return lengthInBits; + } + + public static InformationObjectBuilder staticParseInformationObjectBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime"); + PositionAware positionAware = readBuffer; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + + // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) + InformationObjectWithTreeByteTimeBuilder builder = null; + if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.INTEGRATED_TOTALS_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_INTEGRATED_TOTALS + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification + .PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { + builder = + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + .staticParseInformationObjectWithTreeByteTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } + if (builder == null) { + throw new ParseException( + "Unsupported case for discriminated type" + + " parameters [" + + "typeIdentification=" + + typeIdentification + + "]"); + } + + readBuffer.closeContext("InformationObjectWithTreeByteTime"); + // Create the instance + return new InformationObjectWithTreeByteTimeBuilderImpl(builder); + } + + public interface InformationObjectWithTreeByteTimeBuilder { + InformationObjectWithTreeByteTime build(int address); + } + + public static class InformationObjectWithTreeByteTimeBuilderImpl + implements InformationObject.InformationObjectBuilder { + private final InformationObjectWithTreeByteTimeBuilder builder; + + public InformationObjectWithTreeByteTimeBuilderImpl( + InformationObjectWithTreeByteTimeBuilder builder) { + this.builder = builder; + } + + public InformationObjectWithTreeByteTime build(int address) { + return builder.build(address); + } + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof InformationObjectWithTreeByteTime)) { + return false; + } + InformationObjectWithTreeByteTime that = (InformationObjectWithTreeByteTime) o; + return super.equals(that) && true; + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode()); + } + + @Override + public String toString() { + WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); + try { + writeBufferBoxBased.writeSerializable(this); + } catch (SerializationException e) { + throw new RuntimeException(e); + } + return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; + } +} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java similarity index 75% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java index 7bf46b0f13b..895e8998896 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG extends InformationObject - implements Message { +public class InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT( int address, BinaryStateInformation bsi, QualityDescriptor qds, @@ -72,11 +72,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT"); // Simple Field (bsi) writeSimpleField( @@ -99,7 +99,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT"); } @Override @@ -110,7 +110,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (bsi) @@ -125,9 +125,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -152,30 +154,31 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT"); // Create the instance - return new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAGBuilderImpl(bsi, qds, cp24Time2a); + return new InformationObjectWithTreeByteTime_BITSTRING_OF_32_BITBuilderImpl( + bsi, qds, cp24Time2a); } - public static class InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_BITSTRING_OF_32_BITBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final BinaryStateInformation bsi; private final QualityDescriptor qds; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_BITSTRING_OF_32_BITBuilderImpl( BinaryStateInformation bsi, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { this.bsi = bsi; this.qds = qds; this.cp24Time2a = cp24Time2a; } - public InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG build(int address) { - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG - informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG = - new InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT build(int address) { + InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT + informationObjectWithTreeByteTime_BITSTRING_OF_32_BIT = + new InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT( address, bsi, qds, cp24Time2a); - return informationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_BITSTRING_OF_32_BIT; } } @@ -184,11 +187,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT)) { return false; } - InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG that = - (InformationObject_BITSTRING_OF_32_BIT_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT that = + (InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT) o; return (getBsi() == that.getBsi()) && (getQds() == that.getQds()) && (getCp24Time2a() == that.getCp24Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION.java index bec5445595d..c1f76aefd2c 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG extends InformationObject - implements Message { +public class InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final DoublePointInformation diq; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION( int address, DoublePointInformation diq, ThreeOctetBinaryTime cp24Time2a) { super(address); this.diq = diq; @@ -63,11 +63,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION"); // Simple Field (diq) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (diq) @@ -106,9 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,28 +128,29 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION"); // Create the instance - return new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl(diq, cp24Time2a); + return new InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl( + diq, cp24Time2a); } - public static class InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final DoublePointInformation diq; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATIONBuilderImpl( DoublePointInformation diq, ThreeOctetBinaryTime cp24Time2a) { this.diq = diq; this.cp24Time2a = cp24Time2a; } - public InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG build(int address) { - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG - informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG = - new InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION build(int address) { + InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION + informationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION = + new InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION( address, diq, cp24Time2a); - return informationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION; } } @@ -156,11 +159,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION)) { return false; } - InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG that = - (InformationObject_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION that = + (InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION) o; return (getDiq() == that.getDiq()) && (getCp24Time2a() == that.getCp24Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java index c39ac875d58..542b12d1b28 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG extends InformationObject - implements Message { +public class InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final TwoOctetBinaryTime cp16Time2a; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT( int address, TwoOctetBinaryTime cp16Time2a, ThreeOctetBinaryTime cp24Time2a) { super(address); this.cp16Time2a = cp16Time2a; @@ -63,11 +63,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); // Simple Field (cp16Time2a) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (cp16Time2a) @@ -106,9 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,29 +128,29 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT"); // Create the instance - return new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl( + return new InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl( cp16Time2a, cp24Time2a); } - public static class InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final TwoOctetBinaryTime cp16Time2a; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENTBuilderImpl( TwoOctetBinaryTime cp16Time2a, ThreeOctetBinaryTime cp24Time2a) { this.cp16Time2a = cp16Time2a; this.cp24Time2a = cp24Time2a; } - public InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG build(int address) { - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG = - new InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT build(int address) { + InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT + informationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT = + new InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT( address, cp16Time2a, cp24Time2a); - return informationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT; } } @@ -157,11 +159,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT)) { return false; } - InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG that = - (InformationObject_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT that = + (InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT) o; return (getCp16Time2a() == that.getCp16Time2a()) && (getCp24Time2a() == that.getCp24Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_INTEGRATED_TOTALS.java similarity index 72% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_INTEGRATED_TOTALS.java index f855f9f5398..0a1e9de6ff7 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_INTEGRATED_TOTALS.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG extends InformationObject - implements Message { +public class InformationObjectWithTreeByteTime_INTEGRATED_TOTALS + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final BinaryCounterReading bcr; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_INTEGRATED_TOTALS( int address, BinaryCounterReading bcr, ThreeOctetBinaryTime cp24Time2a) { super(address); this.bcr = bcr; @@ -63,11 +63,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS"); // Simple Field (bcr) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_INTEGRATED_TOTALS _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (bcr) @@ -106,9 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,27 +128,27 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_INTEGRATED_TOTALS"); // Create the instance - return new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAGBuilderImpl(bcr, cp24Time2a); + return new InformationObjectWithTreeByteTime_INTEGRATED_TOTALSBuilderImpl(bcr, cp24Time2a); } - public static class InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_INTEGRATED_TOTALSBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final BinaryCounterReading bcr; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_INTEGRATED_TOTALSBuilderImpl( BinaryCounterReading bcr, ThreeOctetBinaryTime cp24Time2a) { this.bcr = bcr; this.cp24Time2a = cp24Time2a; } - public InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG build(int address) { - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG - informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG = - new InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG(address, bcr, cp24Time2a); - return informationObject_INTEGRATED_TOTALS_WITH_TIME_TAG; + public InformationObjectWithTreeByteTime_INTEGRATED_TOTALS build(int address) { + InformationObjectWithTreeByteTime_INTEGRATED_TOTALS + informationObjectWithTreeByteTime_INTEGRATED_TOTALS = + new InformationObjectWithTreeByteTime_INTEGRATED_TOTALS(address, bcr, cp24Time2a); + return informationObjectWithTreeByteTime_INTEGRATED_TOTALS; } } @@ -155,11 +157,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_INTEGRATED_TOTALS)) { return false; } - InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG that = - (InformationObject_INTEGRATED_TOTALS_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_INTEGRATED_TOTALS that = + (InformationObjectWithTreeByteTime_INTEGRATED_TOTALS) o; return (getBcr() == that.getBcr()) && (getCp24Time2a() == that.getCp24Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java similarity index 73% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java index 323f6ec2024..492eeba182c 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG - extends InformationObject implements Message { +public class InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE( int address, NormalizedValue nva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { super(address); this.nva = nva; @@ -69,11 +69,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE"); // Simple Field (nva) writeSimpleField( @@ -96,7 +96,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE"); } @Override @@ -107,7 +107,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nva) @@ -122,9 +122,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -149,31 +151,31 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE"); // Create the instance - return new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAGBuilderImpl( + return new InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUEBuilderImpl( nva, qds, cp24Time2a); } - public static class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUEBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final NormalizedValue nva; private final QualityDescriptor qds; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUEBuilderImpl( NormalizedValue nva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { this.nva = nva; this.qds = qds; this.cp24Time2a = cp24Time2a; } - public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG build(int address) { - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG - informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG = - new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE build(int address) { + InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE + informationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE = + new InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE( address, nva, qds, cp24Time2a); - return informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE; } } @@ -182,11 +184,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE)) { return false; } - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG that = - (InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE that = + (InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE) o; return (getNva() == that.getNva()) && (getQds() == that.getQds()) && (getCp24Time2a() == that.getCp24Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java similarity index 73% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java index b0f8ec1a9f2..b9502c4452a 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java @@ -35,12 +35,12 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG extends InformationObject - implements Message { +public class InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { - return TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG; + return TypeIdentification.MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG; } // Properties. @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE( int address, ScaledValue sva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { super(address); this.sva = sva; @@ -69,11 +69,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE"); // Simple Field (sva) writeSimpleField( @@ -96,7 +96,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE"); } @Override @@ -107,7 +107,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sva) @@ -122,9 +122,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -148,31 +150,31 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE"); // Create the instance - return new InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAGBuilderImpl( + return new InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl( sva, qds, cp24Time2a); } - public static class InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final ScaledValue sva; private final QualityDescriptor qds; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl( ScaledValue sva, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { this.sva = sva; this.qds = qds; this.cp24Time2a = cp24Time2a; } - public InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG build(int address) { - InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG - informationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG = - new InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE build(int address) { + InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE + informationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE = + new InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE( address, sva, qds, cp24Time2a); - return informationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG; + return informationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE; } } @@ -181,11 +183,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE)) { return false; } - InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG that = - (InformationObject_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG) o; + InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE that = + (InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE) o; return (getSva() == that.getSva()) && (getQds() == that.getQds()) && (getCp24Time2a() == that.getCp24Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java similarity index 73% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java index 421df5ec816..098b47b99c5 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG - extends InformationObject implements Message { +public class InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER( int address, float value, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { super(address); this.value = value; @@ -69,12 +69,12 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); // Simple Field (value) writeSimpleField( @@ -98,7 +98,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); } @Override @@ -109,7 +109,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (value) @@ -124,10 +124,12 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -150,33 +152,33 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); // Create the instance - return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAGBuilderImpl( + return new InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl( value, qds, cp24Time2a); } public static - class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final float value; private final QualityDescriptor qds; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl( float value, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { this.value = value; this.qds = qds; this.cp24Time2a = cp24Time2a; } - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG build( + public InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build( int address) { - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG - informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG = - new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG( + InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + informationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER = + new InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER( address, value, qds, cp24Time2a); - return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER; } } @@ -186,11 +188,11 @@ public boolean equals(Object o) { return true; } if (!(o - instanceof InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG)) { + instanceof InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) { return false; } - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG that = - (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that = + (InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o; return (getValue() == that.getValue()) && (getQds() == that.getQds()) && (getCp24Time2a() == that.getCp24Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java similarity index 75% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java index 8131142672a..43104d5ae93 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java @@ -36,8 +36,8 @@ // Code generated by code-generation. DO NOT EDIT. public -class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - extends InformationObject implements Message { +class InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -51,7 +51,8 @@ public TypeIdentification getTypeIdentification() { protected final TwoOctetBinaryTime cp16Time2a; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG( + public + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT( int address, OutputCircuitInformation oci, QualityDescriptorForPointsOfProtectionEquipment qdp, @@ -81,12 +82,12 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); // Simple Field (oci) writeSimpleField( @@ -117,7 +118,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); } @Override @@ -128,7 +129,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -147,10 +148,12 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -184,22 +187,22 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT"); // Create the instance - return new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl( + return new InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl( oci, qdp, cp16Time2a, cp24Time2a); } public static - class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final OutputCircuitInformation oci; private final QualityDescriptorForPointsOfProtectionEquipment qdp; private final TwoOctetBinaryTime cp16Time2a; private final ThreeOctetBinaryTime cp24Time2a; public - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl( + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENTBuilderImpl( OutputCircuitInformation oci, QualityDescriptorForPointsOfProtectionEquipment qdp, TwoOctetBinaryTime cp16Time2a, @@ -210,13 +213,14 @@ class InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMEN this.cp24Time2a = cp24Time2a; } - public InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG + public + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT build(int address) { - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG = - new InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG( + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + informationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT = + new InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT( address, oci, qdp, cp16Time2a, cp24Time2a); - return informationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT; } } @@ -227,12 +231,13 @@ public boolean equals(Object o) { } if (!(o instanceof - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT)) { return false; } - InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG that = - (InformationObject_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG) - o; + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + that = + (InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT) + o; return (getOci() == that.getOci()) && (getQdp() == that.getQdp()) && (getCp16Time2a() == that.getCp16Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java similarity index 76% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java index b3989c91810..c018db14eee 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - extends InformationObject implements Message { +public class InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -49,7 +49,7 @@ public TypeIdentification getTypeIdentification() { protected final TwoOctetBinaryTime cp16Time2a; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT( int address, SingleEventOfProtectionEquipment sep, QualityDescriptorForPointsOfProtectionEquipment qdp, @@ -79,12 +79,12 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); // Simple Field (sep) writeSimpleField( @@ -115,7 +115,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); } @Override @@ -126,7 +126,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sep) @@ -144,10 +144,12 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -181,21 +183,21 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG"); + "InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT"); // Create the instance - return new InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl( + return new InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl( sep, qdp, cp16Time2a, cp24Time2a); } public static - class InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final SingleEventOfProtectionEquipment sep; private final QualityDescriptorForPointsOfProtectionEquipment qdp; private final TwoOctetBinaryTime cp16Time2a; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENTBuilderImpl( SingleEventOfProtectionEquipment sep, QualityDescriptorForPointsOfProtectionEquipment qdp, TwoOctetBinaryTime cp16Time2a, @@ -206,13 +208,13 @@ public InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_T this.cp24Time2a = cp24Time2a; } - public InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG build( + public InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT build( int address) { - InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - informationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG = - new InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG( + InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + informationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT = + new InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT( address, sep, qdp, cp16Time2a, cp24Time2a); - return informationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT; } } @@ -222,11 +224,11 @@ public boolean equals(Object o) { return true; } if (!(o - instanceof InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG)) { + instanceof InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT)) { return false; } - InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG that = - (InformationObject_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT that = + (InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT) o; return (getSep() == that.getSep()) && (getQdp() == that.getQdp()) && (getCp16Time2a() == that.getCp16Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION.java index b02400b976f..6d4fd3e06e4 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG extends InformationObject - implements Message { +public class InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final SinglePointInformation siq; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION( int address, SinglePointInformation siq, ThreeOctetBinaryTime cp24Time2a) { super(address); this.siq = siq; @@ -63,11 +63,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION"); // Simple Field (siq) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (siq) @@ -106,9 +106,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,28 +128,29 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION"); // Create the instance - return new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl(siq, cp24Time2a); + return new InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATIONBuilderImpl( + siq, cp24Time2a); } - public static class InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATIONBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final SinglePointInformation siq; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATIONBuilderImpl( SinglePointInformation siq, ThreeOctetBinaryTime cp24Time2a) { this.siq = siq; this.cp24Time2a = cp24Time2a; } - public InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG build(int address) { - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG - informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG = - new InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION build(int address) { + InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION + informationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION = + new InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION( address, siq, cp24Time2a); - return informationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION; } } @@ -156,11 +159,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION)) { return false; } - InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG that = - (InformationObject_SINGLE_POINT_INFORMATION_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION that = + (InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION) o; return (getSiq() == that.getSiq()) && (getCp24Time2a() == that.getCp24Time2a()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION.java similarity index 75% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION.java index e480cbd49bd..70e90734463 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG extends InformationObject - implements Message { +public class InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION + extends InformationObjectWithTreeByteTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final QualityDescriptor qds; protected final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION( int address, ValueWithTransientStateIndication vti, QualityDescriptor qds, @@ -72,11 +72,11 @@ public ThreeOctetBinaryTime getCp24Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithTreeByteTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG"); + writeBuffer.pushContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION"); // Simple Field (vti) writeSimpleField( @@ -99,7 +99,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG"); + writeBuffer.popContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION"); } @Override @@ -110,7 +110,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG _value = this; + InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (vti) @@ -125,9 +125,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG"); + public static InformationObjectWithTreeByteTimeBuilder + staticParseInformationObjectWithTreeByteTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -152,19 +154,19 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> ThreeOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG"); + readBuffer.closeContext("InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION"); // Create the instance - return new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAGBuilderImpl( + return new InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATIONBuilderImpl( vti, qds, cp24Time2a); } - public static class InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAGBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATIONBuilderImpl + implements InformationObjectWithTreeByteTime.InformationObjectWithTreeByteTimeBuilder { private final ValueWithTransientStateIndication vti; private final QualityDescriptor qds; private final ThreeOctetBinaryTime cp24Time2a; - public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAGBuilderImpl( + public InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATIONBuilderImpl( ValueWithTransientStateIndication vti, QualityDescriptor qds, ThreeOctetBinaryTime cp24Time2a) { @@ -173,12 +175,12 @@ public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAGBuilderImpl( this.cp24Time2a = cp24Time2a; } - public InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG build(int address) { - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG - informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG = - new InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG( + public InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION build(int address) { + InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION + informationObjectWithTreeByteTime_STEP_POSITION_INFORMATION = + new InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION( address, vti, qds, cp24Time2a); - return informationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG; + return informationObjectWithTreeByteTime_STEP_POSITION_INFORMATION; } } @@ -187,11 +189,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG)) { + if (!(o instanceof InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION)) { return false; } - InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG that = - (InformationObject_STEP_POSITION_INFORMATION_WITH_TIME_TAG) o; + InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION that = + (InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION) o; return (getVti() == that.getVti()) && (getQds() == that.getQds()) && (getCp24Time2a() == that.getCp24Time2a()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime.java new file mode 100644 index 00000000000..f057c2339ae --- /dev/null +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime.java @@ -0,0 +1,355 @@ +/* + * 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 + * + * https://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.java.iec608705104.readwrite; + +import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; +import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; +import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; +import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; +import static org.apache.plc4x.java.spi.generation.StaticHelper.*; + +import java.time.*; +import java.util.*; +import org.apache.plc4x.java.api.exceptions.*; +import org.apache.plc4x.java.api.value.*; +import org.apache.plc4x.java.spi.codegen.*; +import org.apache.plc4x.java.spi.codegen.fields.*; +import org.apache.plc4x.java.spi.codegen.io.*; +import org.apache.plc4x.java.spi.generation.*; + +// Code generated by code-generation. DO NOT EDIT. + +public abstract class InformationObjectWithoutTime extends InformationObject implements Message { + + // Accessors for discriminator values. + public Byte getNumTimeByte() { + return (byte) 0; + } + + // Abstract accessors for discriminator values. + public abstract TypeIdentification getTypeIdentification(); + + public InformationObjectWithoutTime(int address) { + super(address); + } + + protected abstract void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) + throws SerializationException; + + @Override + protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + throws SerializationException { + PositionAware positionAware = writeBuffer; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + writeBuffer.pushContext("InformationObjectWithoutTime"); + + // Switch field (Serialize the sub-type) + serializeInformationObjectWithoutTimeChild(writeBuffer); + + writeBuffer.popContext("InformationObjectWithoutTime"); + } + + @Override + public int getLengthInBytes() { + return (int) Math.ceil((float) getLengthInBits() / 8.0); + } + + @Override + public int getLengthInBits() { + int lengthInBits = super.getLengthInBits(); + InformationObjectWithoutTime _value = this; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + + // Length of sub-type elements will be added by sub-type... + + return lengthInBits; + } + + public static InformationObjectBuilder staticParseInformationObjectBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime"); + PositionAware positionAware = readBuffer; + boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); + + // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) + InformationObjectWithoutTimeBuilder builder = null; + if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_POINT_INFORMATION)) { + builder = + InformationObjectWithoutTime_SINGLE_POINT_INFORMATION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.DOUBLE_POINT_INFORMATION)) { + builder = + InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.STEP_POSITION_INFORMATION)) { + builder = + InformationObjectWithoutTime_STEP_POSITION_INFORMATION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.BITSTRING_OF_32_BIT)) { + builder = + InformationObjectWithoutTime_BITSTRING_OF_32_BIT + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE)) { + builder = + InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.MEASURED_VALUE_SCALED_VALUE)) { + builder = + InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) { + builder = + InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.INTEGRATED_TOTALS)) { + builder = + InformationObjectWithoutTime_INTEGRATED_TOTALS + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) { + builder = + InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) { + builder = + InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SINGLE_COMMAND)) { + builder = + InformationObjectWithoutTime_SINGLE_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DOUBLE_COMMAND)) { + builder = + InformationObjectWithoutTime_DOUBLE_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.REGULATING_STEP_COMMAND)) { + builder = + InformationObjectWithoutTime_REGULATING_STEP_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.SET_POINT_COMMAND_NORMALISED_VALUE)) { + builder = + InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.SET_POINT_COMMAND_SCALED_VALUE)) { + builder = + InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) { + builder = + InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.BITSTRING_32_BIT_COMMAND)) { + builder = + InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.END_OF_INITIALISATION)) { + builder = + InformationObjectWithoutTime_END_OF_INITIALISATION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.INTERROGATION_COMMAND)) { + builder = + InformationObjectWithoutTime_INTERROGATION_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.COUNTER_INTERROGATION_COMMAND)) { + builder = + InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.READ_COMMAND)) { + builder = + InformationObjectWithoutTime_READ_COMMAND.staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.CLOCK_SYNCHRONISATION_COMMAND)) { + builder = + InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.TEST_COMMAND)) { + builder = + InformationObjectWithoutTime_TEST_COMMAND.staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.RESET_PROCESS_COMMAND)) { + builder = + InformationObjectWithoutTime_RESET_PROCESS_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.DELAY_ACQUISITION_COMMAND)) { + builder = + InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) { + builder = + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) { + builder = + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, + TypeIdentification.PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) { + builder = + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.PARAMETER_ACTIVATION)) { + builder = + InformationObjectWithoutTime_PARAMETER_ACTIVATION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.FILE_READY)) { + builder = + InformationObjectWithoutTime_FILE_READY.staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SECTION_READY)) { + builder = + InformationObjectWithoutTime_SECTION_READY.staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) { + builder = + InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.LAST_SECTION_LAST_SEGMENT)) { + builder = + InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals( + typeIdentification, TypeIdentification.ACK_FILE_ACK_SECTION)) { + builder = + InformationObjectWithoutTime_ACK_FILE_ACK_SECTION + .staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.SEGMENT)) { + builder = + InformationObjectWithoutTime_SEGMENT.staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } else if (EvaluationHelper.equals(typeIdentification, TypeIdentification.DIRECTORY)) { + builder = + InformationObjectWithoutTime_DIRECTORY.staticParseInformationObjectWithoutTimeBuilder( + readBuffer, typeIdentification, numTimeByte); + } + if (builder == null) { + throw new ParseException( + "Unsupported case for discriminated type" + + " parameters [" + + "typeIdentification=" + + typeIdentification + + "]"); + } + + readBuffer.closeContext("InformationObjectWithoutTime"); + // Create the instance + return new InformationObjectWithoutTimeBuilderImpl(builder); + } + + public interface InformationObjectWithoutTimeBuilder { + InformationObjectWithoutTime build(int address); + } + + public static class InformationObjectWithoutTimeBuilderImpl + implements InformationObject.InformationObjectBuilder { + private final InformationObjectWithoutTimeBuilder builder; + + public InformationObjectWithoutTimeBuilderImpl(InformationObjectWithoutTimeBuilder builder) { + this.builder = builder; + } + + public InformationObjectWithoutTime build(int address) { + return builder.build(address); + } + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof InformationObjectWithoutTime)) { + return false; + } + InformationObjectWithoutTime that = (InformationObjectWithoutTime) o; + return super.equals(that) && true; + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode()); + } + + @Override + public String toString() { + WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); + try { + writeBufferBoxBased.writeSerializable(this); + } catch (SerializationException e) { + throw new RuntimeException(e); + } + return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; + } +} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_ACK_FILE_ACK_SECTION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_ACK_FILE_ACK_SECTION.java similarity index 76% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_ACK_FILE_ACK_SECTION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_ACK_FILE_ACK_SECTION.java index 7a0338422fa..caaecdb5746 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_ACK_FILE_ACK_SECTION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_ACK_FILE_ACK_SECTION.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_ACK_FILE_ACK_SECTION extends InformationObject implements Message { +public class InformationObjectWithoutTime_ACK_FILE_ACK_SECTION extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final NameOfSection nos; protected final AcknowledgeFileOrSectionQualifier afq; - public InformationObject_ACK_FILE_ACK_SECTION( + public InformationObjectWithoutTime_ACK_FILE_ACK_SECTION( int address, NameOfFile nof, NameOfSection nos, AcknowledgeFileOrSectionQualifier afq) { super(address); this.nof = nof; @@ -68,11 +69,11 @@ public AcknowledgeFileOrSectionQualifier getAfq() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_ACK_FILE_ACK_SECTION"); + writeBuffer.pushContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION"); // Simple Field (nof) writeSimpleField( @@ -95,7 +96,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_ACK_FILE_ACK_SECTION"); + writeBuffer.popContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION"); } @Override @@ -106,7 +107,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_ACK_FILE_ACK_SECTION _value = this; + InformationObjectWithoutTime_ACK_FILE_ACK_SECTION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nof) @@ -121,9 +122,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_ACK_FILE_ACK_SECTION"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -146,28 +148,29 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> AcknowledgeFileOrSectionQualifier.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_ACK_FILE_ACK_SECTION"); + readBuffer.closeContext("InformationObjectWithoutTime_ACK_FILE_ACK_SECTION"); // Create the instance - return new InformationObject_ACK_FILE_ACK_SECTIONBuilderImpl(nof, nos, afq); + return new InformationObjectWithoutTime_ACK_FILE_ACK_SECTIONBuilderImpl(nof, nos, afq); } - public static class InformationObject_ACK_FILE_ACK_SECTIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_ACK_FILE_ACK_SECTIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NameOfFile nof; private final NameOfSection nos; private final AcknowledgeFileOrSectionQualifier afq; - public InformationObject_ACK_FILE_ACK_SECTIONBuilderImpl( + public InformationObjectWithoutTime_ACK_FILE_ACK_SECTIONBuilderImpl( NameOfFile nof, NameOfSection nos, AcknowledgeFileOrSectionQualifier afq) { this.nof = nof; this.nos = nos; this.afq = afq; } - public InformationObject_ACK_FILE_ACK_SECTION build(int address) { - InformationObject_ACK_FILE_ACK_SECTION informationObject_ACK_FILE_ACK_SECTION = - new InformationObject_ACK_FILE_ACK_SECTION(address, nof, nos, afq); - return informationObject_ACK_FILE_ACK_SECTION; + public InformationObjectWithoutTime_ACK_FILE_ACK_SECTION build(int address) { + InformationObjectWithoutTime_ACK_FILE_ACK_SECTION + informationObjectWithoutTime_ACK_FILE_ACK_SECTION = + new InformationObjectWithoutTime_ACK_FILE_ACK_SECTION(address, nof, nos, afq); + return informationObjectWithoutTime_ACK_FILE_ACK_SECTION; } } @@ -176,10 +179,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_ACK_FILE_ACK_SECTION)) { + if (!(o instanceof InformationObjectWithoutTime_ACK_FILE_ACK_SECTION)) { return false; } - InformationObject_ACK_FILE_ACK_SECTION that = (InformationObject_ACK_FILE_ACK_SECTION) o; + InformationObjectWithoutTime_ACK_FILE_ACK_SECTION that = + (InformationObjectWithoutTime_ACK_FILE_ACK_SECTION) o; return (getNof() == that.getNof()) && (getNos() == that.getNos()) && (getAfq() == that.getAfq()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_32_BIT_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java similarity index 67% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_32_BIT_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java index 0bb4d7e0e43..76a57b6375f 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_32_BIT_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_BITSTRING_32_BIT_COMMAND extends InformationObject - implements Message { +public class InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final BinaryStateInformation bsi; - public InformationObject_BITSTRING_32_BIT_COMMAND(int address, BinaryStateInformation bsi) { + public InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND( + int address, BinaryStateInformation bsi) { super(address); this.bsi = bsi; } @@ -56,11 +57,11 @@ public BinaryStateInformation getBsi() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_BITSTRING_32_BIT_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND"); // Simple Field (bsi) writeSimpleField( @@ -69,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_BITSTRING_32_BIT_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND"); } @Override @@ -80,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_BITSTRING_32_BIT_COMMAND _value = this; + InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (bsi) @@ -89,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_BITSTRING_32_BIT_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -102,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> BinaryStateInformation.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_BITSTRING_32_BIT_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND"); // Create the instance - return new InformationObject_BITSTRING_32_BIT_COMMANDBuilderImpl(bsi); + return new InformationObjectWithoutTime_BITSTRING_32_BIT_COMMANDBuilderImpl(bsi); } - public static class InformationObject_BITSTRING_32_BIT_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_BITSTRING_32_BIT_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final BinaryStateInformation bsi; - public InformationObject_BITSTRING_32_BIT_COMMANDBuilderImpl(BinaryStateInformation bsi) { + public InformationObjectWithoutTime_BITSTRING_32_BIT_COMMANDBuilderImpl( + BinaryStateInformation bsi) { this.bsi = bsi; } - public InformationObject_BITSTRING_32_BIT_COMMAND build(int address) { - InformationObject_BITSTRING_32_BIT_COMMAND informationObject_BITSTRING_32_BIT_COMMAND = - new InformationObject_BITSTRING_32_BIT_COMMAND(address, bsi); - return informationObject_BITSTRING_32_BIT_COMMAND; + public InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND build(int address) { + InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND + informationObjectWithoutTime_BITSTRING_32_BIT_COMMAND = + new InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND(address, bsi); + return informationObjectWithoutTime_BITSTRING_32_BIT_COMMAND; } } @@ -127,11 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_BITSTRING_32_BIT_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND)) { return false; } - InformationObject_BITSTRING_32_BIT_COMMAND that = - (InformationObject_BITSTRING_32_BIT_COMMAND) o; + InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND that = + (InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND) o; return (getBsi() == that.getBsi()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_OF_32_BIT.java similarity index 73% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_OF_32_BIT.java index 9c7f11da3d8..a7c5b99f302 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_BITSTRING_OF_32_BIT.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_BITSTRING_OF_32_BIT extends InformationObject implements Message { +public class InformationObjectWithoutTime_BITSTRING_OF_32_BIT extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final BinaryStateInformation bsi; protected final QualityDescriptor qds; - public InformationObject_BITSTRING_OF_32_BIT( + public InformationObjectWithoutTime_BITSTRING_OF_32_BIT( int address, BinaryStateInformation bsi, QualityDescriptor qds) { super(address); this.bsi = bsi; @@ -62,11 +63,11 @@ public QualityDescriptor getQds() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_BITSTRING_OF_32_BIT"); + writeBuffer.pushContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT"); // Simple Field (bsi) writeSimpleField( @@ -82,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_BITSTRING_OF_32_BIT"); + writeBuffer.popContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT"); } @Override @@ -93,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_BITSTRING_OF_32_BIT _value = this; + InformationObjectWithoutTime_BITSTRING_OF_32_BIT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (bsi) @@ -105,9 +106,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_BITSTRING_OF_32_BIT"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -125,26 +127,27 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualityDescriptor.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_BITSTRING_OF_32_BIT"); + readBuffer.closeContext("InformationObjectWithoutTime_BITSTRING_OF_32_BIT"); // Create the instance - return new InformationObject_BITSTRING_OF_32_BITBuilderImpl(bsi, qds); + return new InformationObjectWithoutTime_BITSTRING_OF_32_BITBuilderImpl(bsi, qds); } - public static class InformationObject_BITSTRING_OF_32_BITBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_BITSTRING_OF_32_BITBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final BinaryStateInformation bsi; private final QualityDescriptor qds; - public InformationObject_BITSTRING_OF_32_BITBuilderImpl( + public InformationObjectWithoutTime_BITSTRING_OF_32_BITBuilderImpl( BinaryStateInformation bsi, QualityDescriptor qds) { this.bsi = bsi; this.qds = qds; } - public InformationObject_BITSTRING_OF_32_BIT build(int address) { - InformationObject_BITSTRING_OF_32_BIT informationObject_BITSTRING_OF_32_BIT = - new InformationObject_BITSTRING_OF_32_BIT(address, bsi, qds); - return informationObject_BITSTRING_OF_32_BIT; + public InformationObjectWithoutTime_BITSTRING_OF_32_BIT build(int address) { + InformationObjectWithoutTime_BITSTRING_OF_32_BIT + informationObjectWithoutTime_BITSTRING_OF_32_BIT = + new InformationObjectWithoutTime_BITSTRING_OF_32_BIT(address, bsi, qds); + return informationObjectWithoutTime_BITSTRING_OF_32_BIT; } } @@ -153,10 +156,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT)) { + if (!(o instanceof InformationObjectWithoutTime_BITSTRING_OF_32_BIT)) { return false; } - InformationObject_BITSTRING_OF_32_BIT that = (InformationObject_BITSTRING_OF_32_BIT) o; + InformationObjectWithoutTime_BITSTRING_OF_32_BIT that = + (InformationObjectWithoutTime_BITSTRING_OF_32_BIT) o; return (getBsi() == that.getBsi()) && (getQds() == that.getQds()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java index c91ac591b17..de7009ad53b 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION - extends InformationObject implements Message { +public class InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final NameOfSection nos; protected final SelectAndCallQualifier scq; - public InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION( + public InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION( int address, NameOfFile nof, NameOfSection nos, SelectAndCallQualifier scq) { super(address); this.nof = nof; @@ -69,11 +69,12 @@ public SelectAndCallQualifier getScq() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); + writeBuffer.pushContext( + "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); // Simple Field (nof) writeSimpleField( @@ -96,7 +97,8 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); + writeBuffer.popContext( + "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); } @Override @@ -107,7 +109,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION _value = this; + InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nof) @@ -122,9 +124,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext( + "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -147,31 +151,35 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SelectAndCallQualifier.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); + readBuffer.closeContext( + "InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION"); // Create the instance - return new InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl( + return new InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl( nof, nos, scq); } - public static class InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static + class InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NameOfFile nof; private final NameOfSection nos; private final SelectAndCallQualifier scq; - public InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl( + public + InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTIONBuilderImpl( NameOfFile nof, NameOfSection nos, SelectAndCallQualifier scq) { this.nof = nof; this.nos = nos; this.scq = scq; } - public InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION build(int address) { - InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION - informationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION = - new InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION( + public InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION build( + int address) { + InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION + informationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION = + new InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION( address, nof, nos, scq); - return informationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION; + return informationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION; } } @@ -180,11 +188,13 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) { + if (!(o + instanceof + InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION)) { return false; } - InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION that = - (InformationObject_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION) o; + InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION that = + (InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION) o; return (getNof() == that.getNof()) && (getNos() == that.getNos()) && (getScq() == that.getScq()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CLOCK_SYNCHRONISATION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java similarity index 68% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CLOCK_SYNCHRONISATION_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java index a2158200831..f3e906ac872 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_CLOCK_SYNCHRONISATION_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_CLOCK_SYNCHRONISATION_COMMAND extends InformationObject - implements Message { +public class InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,7 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_CLOCK_SYNCHRONISATION_COMMAND( + public InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND( int address, SevenOctetBinaryTime cp56Time2a) { super(address); this.cp56Time2a = cp56Time2a; @@ -57,11 +57,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND"); // Simple Field (cp56Time2a) writeSimpleField( @@ -70,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND"); } @Override @@ -81,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_CLOCK_SYNCHRONISATION_COMMAND _value = this; + InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (cp56Time2a) @@ -90,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -103,25 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_CLOCK_SYNCHRONISATION_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND"); // Create the instance - return new InformationObject_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl(cp56Time2a); + return new InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl(cp56Time2a); } - public static class InformationObject_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl( + public InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMANDBuilderImpl( SevenOctetBinaryTime cp56Time2a) { this.cp56Time2a = cp56Time2a; } - public InformationObject_CLOCK_SYNCHRONISATION_COMMAND build(int address) { - InformationObject_CLOCK_SYNCHRONISATION_COMMAND - informationObject_CLOCK_SYNCHRONISATION_COMMAND = - new InformationObject_CLOCK_SYNCHRONISATION_COMMAND(address, cp56Time2a); - return informationObject_CLOCK_SYNCHRONISATION_COMMAND; + public InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND build(int address) { + InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND + informationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND = + new InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND(address, cp56Time2a); + return informationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND; } } @@ -130,11 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_CLOCK_SYNCHRONISATION_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND)) { return false; } - InformationObject_CLOCK_SYNCHRONISATION_COMMAND that = - (InformationObject_CLOCK_SYNCHRONISATION_COMMAND) o; + InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND that = + (InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND) o; return (getCp56Time2a() == that.getCp56Time2a()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_COUNTER_INTERROGATION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND.java similarity index 68% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_COUNTER_INTERROGATION_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND.java index d122f2efc50..02835514d31 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_COUNTER_INTERROGATION_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_COUNTER_INTERROGATION_COMMAND extends InformationObject - implements Message { +public class InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,7 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final QualifierOfCounterInterrogationCommand qcc; - public InformationObject_COUNTER_INTERROGATION_COMMAND( + public InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND( int address, QualifierOfCounterInterrogationCommand qcc) { super(address); this.qcc = qcc; @@ -57,11 +57,11 @@ public QualifierOfCounterInterrogationCommand getQcc() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_COUNTER_INTERROGATION_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND"); // Simple Field (qcc) writeSimpleField( @@ -70,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_COUNTER_INTERROGATION_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND"); } @Override @@ -81,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_COUNTER_INTERROGATION_COMMAND _value = this; + InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (qcc) @@ -90,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_COUNTER_INTERROGATION_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -103,25 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfCounterInterrogationCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_COUNTER_INTERROGATION_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND"); // Create the instance - return new InformationObject_COUNTER_INTERROGATION_COMMANDBuilderImpl(qcc); + return new InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMANDBuilderImpl(qcc); } - public static class InformationObject_COUNTER_INTERROGATION_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final QualifierOfCounterInterrogationCommand qcc; - public InformationObject_COUNTER_INTERROGATION_COMMANDBuilderImpl( + public InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMANDBuilderImpl( QualifierOfCounterInterrogationCommand qcc) { this.qcc = qcc; } - public InformationObject_COUNTER_INTERROGATION_COMMAND build(int address) { - InformationObject_COUNTER_INTERROGATION_COMMAND - informationObject_COUNTER_INTERROGATION_COMMAND = - new InformationObject_COUNTER_INTERROGATION_COMMAND(address, qcc); - return informationObject_COUNTER_INTERROGATION_COMMAND; + public InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND build(int address) { + InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND + informationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND = + new InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND(address, qcc); + return informationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND; } } @@ -130,11 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_COUNTER_INTERROGATION_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND)) { return false; } - InformationObject_COUNTER_INTERROGATION_COMMAND that = - (InformationObject_COUNTER_INTERROGATION_COMMAND) o; + InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND that = + (InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND) o; return (getQcc() == that.getQcc()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DELAY_ACQUISITION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND.java similarity index 67% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DELAY_ACQUISITION_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND.java index e88ce7e1647..17a30cad02c 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DELAY_ACQUISITION_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_DELAY_ACQUISITION_COMMAND extends InformationObject - implements Message { +public class InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final TwoOctetBinaryTime cp16Time2a; - public InformationObject_DELAY_ACQUISITION_COMMAND(int address, TwoOctetBinaryTime cp16Time2a) { + public InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND( + int address, TwoOctetBinaryTime cp16Time2a) { super(address); this.cp16Time2a = cp16Time2a; } @@ -56,11 +57,11 @@ public TwoOctetBinaryTime getCp16Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_DELAY_ACQUISITION_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND"); // Simple Field (cp16Time2a) writeSimpleField( @@ -69,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_DELAY_ACQUISITION_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND"); } @Override @@ -80,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_DELAY_ACQUISITION_COMMAND _value = this; + InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (cp16Time2a) @@ -89,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_DELAY_ACQUISITION_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -102,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> TwoOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_DELAY_ACQUISITION_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND"); // Create the instance - return new InformationObject_DELAY_ACQUISITION_COMMANDBuilderImpl(cp16Time2a); + return new InformationObjectWithoutTime_DELAY_ACQUISITION_COMMANDBuilderImpl(cp16Time2a); } - public static class InformationObject_DELAY_ACQUISITION_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_DELAY_ACQUISITION_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final TwoOctetBinaryTime cp16Time2a; - public InformationObject_DELAY_ACQUISITION_COMMANDBuilderImpl(TwoOctetBinaryTime cp16Time2a) { + public InformationObjectWithoutTime_DELAY_ACQUISITION_COMMANDBuilderImpl( + TwoOctetBinaryTime cp16Time2a) { this.cp16Time2a = cp16Time2a; } - public InformationObject_DELAY_ACQUISITION_COMMAND build(int address) { - InformationObject_DELAY_ACQUISITION_COMMAND informationObject_DELAY_ACQUISITION_COMMAND = - new InformationObject_DELAY_ACQUISITION_COMMAND(address, cp16Time2a); - return informationObject_DELAY_ACQUISITION_COMMAND; + public InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND build(int address) { + InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND + informationObjectWithoutTime_DELAY_ACQUISITION_COMMAND = + new InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND(address, cp16Time2a); + return informationObjectWithoutTime_DELAY_ACQUISITION_COMMAND; } } @@ -127,11 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_DELAY_ACQUISITION_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND)) { return false; } - InformationObject_DELAY_ACQUISITION_COMMAND that = - (InformationObject_DELAY_ACQUISITION_COMMAND) o; + InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND that = + (InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND) o; return (getCp16Time2a() == that.getCp16Time2a()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DIRECTORY.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DIRECTORY.java similarity index 80% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DIRECTORY.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DIRECTORY.java index 25ec67ab647..85cd4795b8d 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DIRECTORY.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DIRECTORY.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_DIRECTORY extends InformationObject implements Message { +public class InformationObjectWithoutTime_DIRECTORY extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +49,7 @@ public TypeIdentification getTypeIdentification() { protected final StatusOfFile sof; protected final SevenOctetBinaryTime cp56Time2a; - public InformationObject_DIRECTORY( + public InformationObjectWithoutTime_DIRECTORY( int address, NameOfFile nof, LengthOfFile lof, @@ -78,11 +79,11 @@ public SevenOctetBinaryTime getCp56Time2a() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_DIRECTORY"); + writeBuffer.pushContext("InformationObjectWithoutTime_DIRECTORY"); // Simple Field (nof) writeSimpleField( @@ -112,7 +113,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_DIRECTORY"); + writeBuffer.popContext("InformationObjectWithoutTime_DIRECTORY"); } @Override @@ -123,7 +124,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_DIRECTORY _value = this; + InformationObjectWithoutTime_DIRECTORY _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nof) @@ -141,9 +142,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_DIRECTORY"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_DIRECTORY"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -172,19 +174,19 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SevenOctetBinaryTime.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_DIRECTORY"); + readBuffer.closeContext("InformationObjectWithoutTime_DIRECTORY"); // Create the instance - return new InformationObject_DIRECTORYBuilderImpl(nof, lof, sof, cp56Time2a); + return new InformationObjectWithoutTime_DIRECTORYBuilderImpl(nof, lof, sof, cp56Time2a); } - public static class InformationObject_DIRECTORYBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_DIRECTORYBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NameOfFile nof; private final LengthOfFile lof; private final StatusOfFile sof; private final SevenOctetBinaryTime cp56Time2a; - public InformationObject_DIRECTORYBuilderImpl( + public InformationObjectWithoutTime_DIRECTORYBuilderImpl( NameOfFile nof, LengthOfFile lof, StatusOfFile sof, SevenOctetBinaryTime cp56Time2a) { this.nof = nof; this.lof = lof; @@ -192,10 +194,10 @@ public InformationObject_DIRECTORYBuilderImpl( this.cp56Time2a = cp56Time2a; } - public InformationObject_DIRECTORY build(int address) { - InformationObject_DIRECTORY informationObject_DIRECTORY = - new InformationObject_DIRECTORY(address, nof, lof, sof, cp56Time2a); - return informationObject_DIRECTORY; + public InformationObjectWithoutTime_DIRECTORY build(int address) { + InformationObjectWithoutTime_DIRECTORY informationObjectWithoutTime_DIRECTORY = + new InformationObjectWithoutTime_DIRECTORY(address, nof, lof, sof, cp56Time2a); + return informationObjectWithoutTime_DIRECTORY; } } @@ -204,10 +206,10 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_DIRECTORY)) { + if (!(o instanceof InformationObjectWithoutTime_DIRECTORY)) { return false; } - InformationObject_DIRECTORY that = (InformationObject_DIRECTORY) o; + InformationObjectWithoutTime_DIRECTORY that = (InformationObjectWithoutTime_DIRECTORY) o; return (getNof() == that.getNof()) && (getLof() == that.getLof()) && (getSof() == that.getSof()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_COMMAND.java similarity index 70% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_COMMAND.java index 1ab45934be4..0553beb3365 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_COMMAND.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_DOUBLE_COMMAND extends InformationObject implements Message { +public class InformationObjectWithoutTime_DOUBLE_COMMAND extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,7 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final DoubleCommand dco; - public InformationObject_DOUBLE_COMMAND(int address, DoubleCommand dco) { + public InformationObjectWithoutTime_DOUBLE_COMMAND(int address, DoubleCommand dco) { super(address); this.dco = dco; } @@ -55,11 +56,11 @@ public DoubleCommand getDco() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_DOUBLE_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_DOUBLE_COMMAND"); // Simple Field (dco) writeSimpleField( @@ -68,7 +69,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_DOUBLE_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_DOUBLE_COMMAND"); } @Override @@ -79,7 +80,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_DOUBLE_COMMAND _value = this; + InformationObjectWithoutTime_DOUBLE_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (dco) @@ -88,9 +89,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_DOUBLE_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_DOUBLE_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -100,23 +102,23 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( new DataReaderComplexDefault<>(() -> DoubleCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_DOUBLE_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_DOUBLE_COMMAND"); // Create the instance - return new InformationObject_DOUBLE_COMMANDBuilderImpl(dco); + return new InformationObjectWithoutTime_DOUBLE_COMMANDBuilderImpl(dco); } - public static class InformationObject_DOUBLE_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_DOUBLE_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final DoubleCommand dco; - public InformationObject_DOUBLE_COMMANDBuilderImpl(DoubleCommand dco) { + public InformationObjectWithoutTime_DOUBLE_COMMANDBuilderImpl(DoubleCommand dco) { this.dco = dco; } - public InformationObject_DOUBLE_COMMAND build(int address) { - InformationObject_DOUBLE_COMMAND informationObject_DOUBLE_COMMAND = - new InformationObject_DOUBLE_COMMAND(address, dco); - return informationObject_DOUBLE_COMMAND; + public InformationObjectWithoutTime_DOUBLE_COMMAND build(int address) { + InformationObjectWithoutTime_DOUBLE_COMMAND informationObjectWithoutTime_DOUBLE_COMMAND = + new InformationObjectWithoutTime_DOUBLE_COMMAND(address, dco); + return informationObjectWithoutTime_DOUBLE_COMMAND; } } @@ -125,10 +127,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_DOUBLE_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_DOUBLE_COMMAND)) { return false; } - InformationObject_DOUBLE_COMMAND that = (InformationObject_DOUBLE_COMMAND) o; + InformationObjectWithoutTime_DOUBLE_COMMAND that = + (InformationObjectWithoutTime_DOUBLE_COMMAND) o; return (getDco() == that.getDco()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION.java similarity index 67% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION.java index 7782b91b78f..ea64e859d31 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_POINT_INFORMATION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_DOUBLE_POINT_INFORMATION extends InformationObject - implements Message { +public class InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final DoublePointInformation diq; - public InformationObject_DOUBLE_POINT_INFORMATION(int address, DoublePointInformation diq) { + public InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION( + int address, DoublePointInformation diq) { super(address); this.diq = diq; } @@ -56,11 +57,11 @@ public DoublePointInformation getDiq() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_DOUBLE_POINT_INFORMATION"); + writeBuffer.pushContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION"); // Simple Field (diq) writeSimpleField( @@ -69,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_DOUBLE_POINT_INFORMATION"); + writeBuffer.popContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION"); } @Override @@ -80,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_DOUBLE_POINT_INFORMATION _value = this; + InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (diq) @@ -89,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_DOUBLE_POINT_INFORMATION"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -102,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> DoublePointInformation.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_DOUBLE_POINT_INFORMATION"); + readBuffer.closeContext("InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION"); // Create the instance - return new InformationObject_DOUBLE_POINT_INFORMATIONBuilderImpl(diq); + return new InformationObjectWithoutTime_DOUBLE_POINT_INFORMATIONBuilderImpl(diq); } - public static class InformationObject_DOUBLE_POINT_INFORMATIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_DOUBLE_POINT_INFORMATIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final DoublePointInformation diq; - public InformationObject_DOUBLE_POINT_INFORMATIONBuilderImpl(DoublePointInformation diq) { + public InformationObjectWithoutTime_DOUBLE_POINT_INFORMATIONBuilderImpl( + DoublePointInformation diq) { this.diq = diq; } - public InformationObject_DOUBLE_POINT_INFORMATION build(int address) { - InformationObject_DOUBLE_POINT_INFORMATION informationObject_DOUBLE_POINT_INFORMATION = - new InformationObject_DOUBLE_POINT_INFORMATION(address, diq); - return informationObject_DOUBLE_POINT_INFORMATION; + public InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION build(int address) { + InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION + informationObjectWithoutTime_DOUBLE_POINT_INFORMATION = + new InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION(address, diq); + return informationObjectWithoutTime_DOUBLE_POINT_INFORMATION; } } @@ -127,11 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_DOUBLE_POINT_INFORMATION)) { + if (!(o instanceof InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION)) { return false; } - InformationObject_DOUBLE_POINT_INFORMATION that = - (InformationObject_DOUBLE_POINT_INFORMATION) o; + InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION that = + (InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION) o; return (getDiq() == that.getDiq()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_END_OF_INITIALISATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_END_OF_INITIALISATION.java similarity index 68% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_END_OF_INITIALISATION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_END_OF_INITIALISATION.java index 1b845c19f6b..246e452ef7e 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_END_OF_INITIALISATION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_END_OF_INITIALISATION.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_END_OF_INITIALISATION extends InformationObject implements Message { +public class InformationObjectWithoutTime_END_OF_INITIALISATION extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final CauseOfInitialization coi; - public InformationObject_END_OF_INITIALISATION(int address, CauseOfInitialization coi) { + public InformationObjectWithoutTime_END_OF_INITIALISATION( + int address, CauseOfInitialization coi) { super(address); this.coi = coi; } @@ -55,11 +57,11 @@ public CauseOfInitialization getCoi() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_END_OF_INITIALISATION"); + writeBuffer.pushContext("InformationObjectWithoutTime_END_OF_INITIALISATION"); // Simple Field (coi) writeSimpleField( @@ -68,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_END_OF_INITIALISATION"); + writeBuffer.popContext("InformationObjectWithoutTime_END_OF_INITIALISATION"); } @Override @@ -79,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_END_OF_INITIALISATION _value = this; + InformationObjectWithoutTime_END_OF_INITIALISATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (coi) @@ -88,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_END_OF_INITIALISATION"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_END_OF_INITIALISATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> CauseOfInitialization.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_END_OF_INITIALISATION"); + readBuffer.closeContext("InformationObjectWithoutTime_END_OF_INITIALISATION"); // Create the instance - return new InformationObject_END_OF_INITIALISATIONBuilderImpl(coi); + return new InformationObjectWithoutTime_END_OF_INITIALISATIONBuilderImpl(coi); } - public static class InformationObject_END_OF_INITIALISATIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_END_OF_INITIALISATIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final CauseOfInitialization coi; - public InformationObject_END_OF_INITIALISATIONBuilderImpl(CauseOfInitialization coi) { + public InformationObjectWithoutTime_END_OF_INITIALISATIONBuilderImpl( + CauseOfInitialization coi) { this.coi = coi; } - public InformationObject_END_OF_INITIALISATION build(int address) { - InformationObject_END_OF_INITIALISATION informationObject_END_OF_INITIALISATION = - new InformationObject_END_OF_INITIALISATION(address, coi); - return informationObject_END_OF_INITIALISATION; + public InformationObjectWithoutTime_END_OF_INITIALISATION build(int address) { + InformationObjectWithoutTime_END_OF_INITIALISATION + informationObjectWithoutTime_END_OF_INITIALISATION = + new InformationObjectWithoutTime_END_OF_INITIALISATION(address, coi); + return informationObjectWithoutTime_END_OF_INITIALISATION; } } @@ -126,10 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_END_OF_INITIALISATION)) { + if (!(o instanceof InformationObjectWithoutTime_END_OF_INITIALISATION)) { return false; } - InformationObject_END_OF_INITIALISATION that = (InformationObject_END_OF_INITIALISATION) o; + InformationObjectWithoutTime_END_OF_INITIALISATION that = + (InformationObjectWithoutTime_END_OF_INITIALISATION) o; return (getCoi() == that.getCoi()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_FILE_READY.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_FILE_READY.java similarity index 78% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_FILE_READY.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_FILE_READY.java index 189a3d11ff6..128d9028a47 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_FILE_READY.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_FILE_READY.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_FILE_READY extends InformationObject implements Message { +public class InformationObjectWithoutTime_FILE_READY extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final LengthOfFile lof; protected final FileReadyQualifier frq; - public InformationObject_FILE_READY( + public InformationObjectWithoutTime_FILE_READY( int address, NameOfFile nof, LengthOfFile lof, FileReadyQualifier frq) { super(address); this.nof = nof; @@ -68,11 +69,11 @@ public FileReadyQualifier getFrq() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_FILE_READY"); + writeBuffer.pushContext("InformationObjectWithoutTime_FILE_READY"); // Simple Field (nof) writeSimpleField( @@ -95,7 +96,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_FILE_READY"); + writeBuffer.popContext("InformationObjectWithoutTime_FILE_READY"); } @Override @@ -106,7 +107,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_FILE_READY _value = this; + InformationObjectWithoutTime_FILE_READY _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nof) @@ -121,9 +122,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_FILE_READY"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_FILE_READY"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -146,28 +148,28 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> FileReadyQualifier.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_FILE_READY"); + readBuffer.closeContext("InformationObjectWithoutTime_FILE_READY"); // Create the instance - return new InformationObject_FILE_READYBuilderImpl(nof, lof, frq); + return new InformationObjectWithoutTime_FILE_READYBuilderImpl(nof, lof, frq); } - public static class InformationObject_FILE_READYBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_FILE_READYBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NameOfFile nof; private final LengthOfFile lof; private final FileReadyQualifier frq; - public InformationObject_FILE_READYBuilderImpl( + public InformationObjectWithoutTime_FILE_READYBuilderImpl( NameOfFile nof, LengthOfFile lof, FileReadyQualifier frq) { this.nof = nof; this.lof = lof; this.frq = frq; } - public InformationObject_FILE_READY build(int address) { - InformationObject_FILE_READY informationObject_FILE_READY = - new InformationObject_FILE_READY(address, nof, lof, frq); - return informationObject_FILE_READY; + public InformationObjectWithoutTime_FILE_READY build(int address) { + InformationObjectWithoutTime_FILE_READY informationObjectWithoutTime_FILE_READY = + new InformationObjectWithoutTime_FILE_READY(address, nof, lof, frq); + return informationObjectWithoutTime_FILE_READY; } } @@ -176,10 +178,10 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_FILE_READY)) { + if (!(o instanceof InformationObjectWithoutTime_FILE_READY)) { return false; } - InformationObject_FILE_READY that = (InformationObject_FILE_READY) o; + InformationObjectWithoutTime_FILE_READY that = (InformationObjectWithoutTime_FILE_READY) o; return (getNof() == that.getNof()) && (getLof() == that.getLof()) && (getFrq() == that.getFrq()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTEGRATED_TOTALS.java similarity index 69% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTEGRATED_TOTALS.java index 5dfea6d56a8..bef7e981838 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTEGRATED_TOTALS.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTEGRATED_TOTALS.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_INTEGRATED_TOTALS extends InformationObject implements Message { +public class InformationObjectWithoutTime_INTEGRATED_TOTALS extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,7 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final BinaryCounterReading bcr; - public InformationObject_INTEGRATED_TOTALS(int address, BinaryCounterReading bcr) { + public InformationObjectWithoutTime_INTEGRATED_TOTALS(int address, BinaryCounterReading bcr) { super(address); this.bcr = bcr; } @@ -55,11 +56,11 @@ public BinaryCounterReading getBcr() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_INTEGRATED_TOTALS"); + writeBuffer.pushContext("InformationObjectWithoutTime_INTEGRATED_TOTALS"); // Simple Field (bcr) writeSimpleField( @@ -68,7 +69,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_INTEGRATED_TOTALS"); + writeBuffer.popContext("InformationObjectWithoutTime_INTEGRATED_TOTALS"); } @Override @@ -79,7 +80,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_INTEGRATED_TOTALS _value = this; + InformationObjectWithoutTime_INTEGRATED_TOTALS _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (bcr) @@ -88,9 +89,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_INTEGRATED_TOTALS"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_INTEGRATED_TOTALS"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,23 +103,24 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> BinaryCounterReading.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_INTEGRATED_TOTALS"); + readBuffer.closeContext("InformationObjectWithoutTime_INTEGRATED_TOTALS"); // Create the instance - return new InformationObject_INTEGRATED_TOTALSBuilderImpl(bcr); + return new InformationObjectWithoutTime_INTEGRATED_TOTALSBuilderImpl(bcr); } - public static class InformationObject_INTEGRATED_TOTALSBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_INTEGRATED_TOTALSBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final BinaryCounterReading bcr; - public InformationObject_INTEGRATED_TOTALSBuilderImpl(BinaryCounterReading bcr) { + public InformationObjectWithoutTime_INTEGRATED_TOTALSBuilderImpl(BinaryCounterReading bcr) { this.bcr = bcr; } - public InformationObject_INTEGRATED_TOTALS build(int address) { - InformationObject_INTEGRATED_TOTALS informationObject_INTEGRATED_TOTALS = - new InformationObject_INTEGRATED_TOTALS(address, bcr); - return informationObject_INTEGRATED_TOTALS; + public InformationObjectWithoutTime_INTEGRATED_TOTALS build(int address) { + InformationObjectWithoutTime_INTEGRATED_TOTALS + informationObjectWithoutTime_INTEGRATED_TOTALS = + new InformationObjectWithoutTime_INTEGRATED_TOTALS(address, bcr); + return informationObjectWithoutTime_INTEGRATED_TOTALS; } } @@ -126,10 +129,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_INTEGRATED_TOTALS)) { + if (!(o instanceof InformationObjectWithoutTime_INTEGRATED_TOTALS)) { return false; } - InformationObject_INTEGRATED_TOTALS that = (InformationObject_INTEGRATED_TOTALS) o; + InformationObjectWithoutTime_INTEGRATED_TOTALS that = + (InformationObjectWithoutTime_INTEGRATED_TOTALS) o; return (getBcr() == that.getBcr()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTERROGATION_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTERROGATION_COMMAND.java similarity index 68% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTERROGATION_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTERROGATION_COMMAND.java index 98a3c91cdf7..13bdfc0c687 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_INTERROGATION_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_INTERROGATION_COMMAND.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_INTERROGATION_COMMAND extends InformationObject implements Message { +public class InformationObjectWithoutTime_INTERROGATION_COMMAND extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final QualifierOfInterrogation qoi; - public InformationObject_INTERROGATION_COMMAND(int address, QualifierOfInterrogation qoi) { + public InformationObjectWithoutTime_INTERROGATION_COMMAND( + int address, QualifierOfInterrogation qoi) { super(address); this.qoi = qoi; } @@ -55,11 +57,11 @@ public QualifierOfInterrogation getQoi() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_INTERROGATION_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_INTERROGATION_COMMAND"); // Simple Field (qoi) writeSimpleField( @@ -68,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_INTERROGATION_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_INTERROGATION_COMMAND"); } @Override @@ -79,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_INTERROGATION_COMMAND _value = this; + InformationObjectWithoutTime_INTERROGATION_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (qoi) @@ -88,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_INTERROGATION_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_INTERROGATION_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfInterrogation.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_INTERROGATION_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_INTERROGATION_COMMAND"); // Create the instance - return new InformationObject_INTERROGATION_COMMANDBuilderImpl(qoi); + return new InformationObjectWithoutTime_INTERROGATION_COMMANDBuilderImpl(qoi); } - public static class InformationObject_INTERROGATION_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_INTERROGATION_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final QualifierOfInterrogation qoi; - public InformationObject_INTERROGATION_COMMANDBuilderImpl(QualifierOfInterrogation qoi) { + public InformationObjectWithoutTime_INTERROGATION_COMMANDBuilderImpl( + QualifierOfInterrogation qoi) { this.qoi = qoi; } - public InformationObject_INTERROGATION_COMMAND build(int address) { - InformationObject_INTERROGATION_COMMAND informationObject_INTERROGATION_COMMAND = - new InformationObject_INTERROGATION_COMMAND(address, qoi); - return informationObject_INTERROGATION_COMMAND; + public InformationObjectWithoutTime_INTERROGATION_COMMAND build(int address) { + InformationObjectWithoutTime_INTERROGATION_COMMAND + informationObjectWithoutTime_INTERROGATION_COMMAND = + new InformationObjectWithoutTime_INTERROGATION_COMMAND(address, qoi); + return informationObjectWithoutTime_INTERROGATION_COMMAND; } } @@ -126,10 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_INTERROGATION_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_INTERROGATION_COMMAND)) { return false; } - InformationObject_INTERROGATION_COMMAND that = (InformationObject_INTERROGATION_COMMAND) o; + InformationObjectWithoutTime_INTERROGATION_COMMAND that = + (InformationObjectWithoutTime_INTERROGATION_COMMAND) o; return (getQoi() == that.getQoi()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_LAST_SECTION_LAST_SEGMENT.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java similarity index 77% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_LAST_SECTION_LAST_SEGMENT.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java index e13913bd367..99b3c1dda49 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_LAST_SECTION_LAST_SEGMENT.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_LAST_SECTION_LAST_SEGMENT extends InformationObject - implements Message { +public class InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -49,7 +49,7 @@ public TypeIdentification getTypeIdentification() { protected final LastSectionOrSegmentQualifier lsq; protected final Checksum chs; - public InformationObject_LAST_SECTION_LAST_SEGMENT( + public InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT( int address, NameOfFile nof, NameOfSection nos, @@ -79,11 +79,11 @@ public Checksum getChs() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_LAST_SECTION_LAST_SEGMENT"); + writeBuffer.pushContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT"); // Simple Field (nof) writeSimpleField( @@ -113,7 +113,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_LAST_SECTION_LAST_SEGMENT"); + writeBuffer.popContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT"); } @Override @@ -124,7 +124,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_LAST_SECTION_LAST_SEGMENT _value = this; + InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nof) @@ -142,9 +142,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_LAST_SECTION_LAST_SEGMENT"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -173,19 +174,20 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( new DataReaderComplexDefault<>(() -> Checksum.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_LAST_SECTION_LAST_SEGMENT"); + readBuffer.closeContext("InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT"); // Create the instance - return new InformationObject_LAST_SECTION_LAST_SEGMENTBuilderImpl(nof, nos, lsq, chs); + return new InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENTBuilderImpl( + nof, nos, lsq, chs); } - public static class InformationObject_LAST_SECTION_LAST_SEGMENTBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENTBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NameOfFile nof; private final NameOfSection nos; private final LastSectionOrSegmentQualifier lsq; private final Checksum chs; - public InformationObject_LAST_SECTION_LAST_SEGMENTBuilderImpl( + public InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENTBuilderImpl( NameOfFile nof, NameOfSection nos, LastSectionOrSegmentQualifier lsq, Checksum chs) { this.nof = nof; this.nos = nos; @@ -193,10 +195,12 @@ public InformationObject_LAST_SECTION_LAST_SEGMENTBuilderImpl( this.chs = chs; } - public InformationObject_LAST_SECTION_LAST_SEGMENT build(int address) { - InformationObject_LAST_SECTION_LAST_SEGMENT informationObject_LAST_SECTION_LAST_SEGMENT = - new InformationObject_LAST_SECTION_LAST_SEGMENT(address, nof, nos, lsq, chs); - return informationObject_LAST_SECTION_LAST_SEGMENT; + public InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT build(int address) { + InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT + informationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT = + new InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT( + address, nof, nos, lsq, chs); + return informationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT; } } @@ -205,11 +209,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_LAST_SECTION_LAST_SEGMENT)) { + if (!(o instanceof InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT)) { return false; } - InformationObject_LAST_SECTION_LAST_SEGMENT that = - (InformationObject_LAST_SECTION_LAST_SEGMENT) o; + InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT that = + (InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT) o; return (getNof() == that.getNof()) && (getNos() == that.getNos()) && (getLsq() == that.getLsq()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java index df43e033616..9aed1a3719b 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE extends InformationObject - implements Message { +public class InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final NormalizedValue nva; protected final QualityDescriptor qds; - public InformationObject_MEASURED_VALUE_NORMALISED_VALUE( + public InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE( int address, NormalizedValue nva, QualityDescriptor qds) { super(address); this.nva = nva; @@ -63,11 +63,11 @@ public QualityDescriptor getQds() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE"); + writeBuffer.pushContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE"); // Simple Field (nva) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE"); + writeBuffer.popContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_NORMALISED_VALUE _value = this; + InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nva) @@ -106,9 +106,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,27 +127,27 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualityDescriptor.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_MEASURED_VALUE_NORMALISED_VALUE"); + readBuffer.closeContext("InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE"); // Create the instance - return new InformationObject_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(nva, qds); + return new InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl(nva, qds); } - public static class InformationObject_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NormalizedValue nva; private final QualityDescriptor qds; - public InformationObject_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl( + public InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUEBuilderImpl( NormalizedValue nva, QualityDescriptor qds) { this.nva = nva; this.qds = qds; } - public InformationObject_MEASURED_VALUE_NORMALISED_VALUE build(int address) { - InformationObject_MEASURED_VALUE_NORMALISED_VALUE - informationObject_MEASURED_VALUE_NORMALISED_VALUE = - new InformationObject_MEASURED_VALUE_NORMALISED_VALUE(address, nva, qds); - return informationObject_MEASURED_VALUE_NORMALISED_VALUE; + public InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE build(int address) { + InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE + informationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE = + new InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE(address, nva, qds); + return informationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE; } } @@ -155,11 +156,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_MEASURED_VALUE_NORMALISED_VALUE)) { + if (!(o instanceof InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE)) { return false; } - InformationObject_MEASURED_VALUE_NORMALISED_VALUE that = - (InformationObject_MEASURED_VALUE_NORMALISED_VALUE) o; + InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE that = + (InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE) o; return (getNva() == that.getNva()) && (getQds() == that.getQds()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java similarity index 65% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java index af19f65f4f0..25499838dc3 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR - extends InformationObject implements Message { +public class InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,7 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final NormalizedValue nva; - public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR( + public InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR( int address, NormalizedValue nva) { super(address); this.nva = nva; @@ -57,12 +57,12 @@ public NormalizedValue getNva() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); + "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); // Simple Field (nva) writeSimpleField( @@ -72,7 +72,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); + "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); } @Override @@ -83,7 +83,8 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR _value = this; + InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR _value = + this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nva) @@ -92,10 +93,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); + "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -107,29 +109,30 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); + "InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR"); // Create the instance - return new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl( + return new InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl( nva); } public static - class InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NormalizedValue nva; - public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl( + public + InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTORBuilderImpl( NormalizedValue nva) { this.nva = nva; } - public InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR build( - int address) { - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR - informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR = - new InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR( + public InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR + build(int address) { + InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR + informationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR = + new InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR( address, nva); - return informationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR; + return informationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR; } } @@ -139,11 +142,12 @@ public boolean equals(Object o) { return true; } if (!(o - instanceof InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) { + instanceof + InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR)) { return false; } - InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR that = - (InformationObject_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR) o; + InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR that = + (InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR) o; return (getNva() == that.getNva()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java index 2f7d4ce75fe..a0f722a4a87 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_SCALED_VALUE extends InformationObject - implements Message { +public class InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final ScaledValue sva; protected final QualityDescriptor qds; - public InformationObject_MEASURED_VALUE_SCALED_VALUE( + public InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE( int address, ScaledValue sva, QualityDescriptor qds) { super(address); this.sva = sva; @@ -63,11 +63,11 @@ public QualityDescriptor getQds() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_MEASURED_VALUE_SCALED_VALUE"); + writeBuffer.pushContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE"); // Simple Field (sva) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_MEASURED_VALUE_SCALED_VALUE"); + writeBuffer.popContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SCALED_VALUE _value = this; + InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sva) @@ -106,9 +106,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_MEASURED_VALUE_SCALED_VALUE"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -125,26 +126,27 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualityDescriptor.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_MEASURED_VALUE_SCALED_VALUE"); + readBuffer.closeContext("InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE"); // Create the instance - return new InformationObject_MEASURED_VALUE_SCALED_VALUEBuilderImpl(sva, qds); + return new InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl(sva, qds); } - public static class InformationObject_MEASURED_VALUE_SCALED_VALUEBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final ScaledValue sva; private final QualityDescriptor qds; - public InformationObject_MEASURED_VALUE_SCALED_VALUEBuilderImpl( + public InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUEBuilderImpl( ScaledValue sva, QualityDescriptor qds) { this.sva = sva; this.qds = qds; } - public InformationObject_MEASURED_VALUE_SCALED_VALUE build(int address) { - InformationObject_MEASURED_VALUE_SCALED_VALUE informationObject_MEASURED_VALUE_SCALED_VALUE = - new InformationObject_MEASURED_VALUE_SCALED_VALUE(address, sva, qds); - return informationObject_MEASURED_VALUE_SCALED_VALUE; + public InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE build(int address) { + InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE + informationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE = + new InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE(address, sva, qds); + return informationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE; } } @@ -153,11 +155,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_MEASURED_VALUE_SCALED_VALUE)) { + if (!(o instanceof InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE)) { return false; } - InformationObject_MEASURED_VALUE_SCALED_VALUE that = - (InformationObject_MEASURED_VALUE_SCALED_VALUE) o; + InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE that = + (InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE) o; return (getSva() == that.getSva()) && (getQds() == that.getQds()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java similarity index 67% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java index 982bf34032b..0f071ec714d 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER extends InformationObject - implements Message { +public class InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final float value; protected final QualityDescriptor qds; - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER( + public InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER( int address, float value, QualityDescriptor qds) { super(address); this.value = value; @@ -63,11 +63,12 @@ public QualityDescriptor getQds() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); + writeBuffer.pushContext( + "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); // Simple Field (value) writeSimpleField( @@ -83,7 +84,8 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); + writeBuffer.popContext( + "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); } @Override @@ -94,7 +96,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this; + InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (value) @@ -106,9 +108,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext( + "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -123,27 +127,32 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualityDescriptor.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); + readBuffer.closeContext( + "InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER"); // Create the instance - return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl(value, qds); + return new InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl( + value, qds); } - public static class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static + class InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final float value; private final QualityDescriptor qds; - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl( + public InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBERBuilderImpl( float value, QualityDescriptor qds) { this.value = value; this.qds = qds; } - public InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build(int address) { - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER - informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER = - new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER(address, value, qds); - return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER; + public InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER build( + int address) { + InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + informationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER = + new InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER( + address, value, qds); + return informationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER; } } @@ -152,11 +161,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) { + if (!(o instanceof InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER)) { return false; } - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that = - (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o; + InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER that = + (InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) o; return (getValue() == that.getValue()) && (getQds() == that.getQds()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java similarity index 69% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java index 964ae9eaf23..c95e80a3d82 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java @@ -35,8 +35,9 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION - extends InformationObject implements Message { +public +class InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final StatusChangeDetection scd; protected final QualityDescriptor qds; - public InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION( + public InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION( int address, StatusChangeDetection scd, QualityDescriptor qds) { super(address); this.scd = scd; @@ -63,12 +64,12 @@ public QualityDescriptor getQds() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); + "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); // Simple Field (scd) writeSimpleField( @@ -85,7 +86,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); + "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); } @Override @@ -96,7 +97,8 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION _value = this; + InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION + _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (scd) @@ -108,10 +110,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); + "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -130,32 +133,32 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); + "InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION"); // Create the instance - return new InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl( + return new InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl( scd, qds); } public static - class InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final StatusChangeDetection scd; private final QualityDescriptor qds; public - InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl( + InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTIONBuilderImpl( StatusChangeDetection scd, QualityDescriptor qds) { this.scd = scd; this.qds = qds; } - public InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION build( - int address) { - InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION - informationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION = - new InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION( + public InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION + build(int address) { + InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION + informationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION = + new InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION( address, scd, qds); - return informationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION; + return informationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION; } } @@ -166,11 +169,12 @@ public boolean equals(Object o) { } if (!(o instanceof - InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) { + InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION)) { return false; } - InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION that = - (InformationObject_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION) o; + InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION that = + (InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION) + o; return (getScd() == that.getScd()) && (getQds() == that.getQds()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_ACTIVATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_ACTIVATION.java similarity index 68% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_ACTIVATION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_ACTIVATION.java index 8d757bbdecf..7b39f30c1d4 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_ACTIVATION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_ACTIVATION.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_PARAMETER_ACTIVATION extends InformationObject implements Message { +public class InformationObjectWithoutTime_PARAMETER_ACTIVATION extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final QualifierOfParameterActivation qpa; - public InformationObject_PARAMETER_ACTIVATION(int address, QualifierOfParameterActivation qpa) { + public InformationObjectWithoutTime_PARAMETER_ACTIVATION( + int address, QualifierOfParameterActivation qpa) { super(address); this.qpa = qpa; } @@ -55,11 +57,11 @@ public QualifierOfParameterActivation getQpa() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_PARAMETER_ACTIVATION"); + writeBuffer.pushContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION"); // Simple Field (qpa) writeSimpleField( @@ -68,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_PARAMETER_ACTIVATION"); + writeBuffer.popContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION"); } @Override @@ -79,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PARAMETER_ACTIVATION _value = this; + InformationObjectWithoutTime_PARAMETER_ACTIVATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (qpa) @@ -88,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_PARAMETER_ACTIVATION"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfParameterActivation.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_PARAMETER_ACTIVATION"); + readBuffer.closeContext("InformationObjectWithoutTime_PARAMETER_ACTIVATION"); // Create the instance - return new InformationObject_PARAMETER_ACTIVATIONBuilderImpl(qpa); + return new InformationObjectWithoutTime_PARAMETER_ACTIVATIONBuilderImpl(qpa); } - public static class InformationObject_PARAMETER_ACTIVATIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_PARAMETER_ACTIVATIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final QualifierOfParameterActivation qpa; - public InformationObject_PARAMETER_ACTIVATIONBuilderImpl(QualifierOfParameterActivation qpa) { + public InformationObjectWithoutTime_PARAMETER_ACTIVATIONBuilderImpl( + QualifierOfParameterActivation qpa) { this.qpa = qpa; } - public InformationObject_PARAMETER_ACTIVATION build(int address) { - InformationObject_PARAMETER_ACTIVATION informationObject_PARAMETER_ACTIVATION = - new InformationObject_PARAMETER_ACTIVATION(address, qpa); - return informationObject_PARAMETER_ACTIVATION; + public InformationObjectWithoutTime_PARAMETER_ACTIVATION build(int address) { + InformationObjectWithoutTime_PARAMETER_ACTIVATION + informationObjectWithoutTime_PARAMETER_ACTIVATION = + new InformationObjectWithoutTime_PARAMETER_ACTIVATION(address, qpa); + return informationObjectWithoutTime_PARAMETER_ACTIVATION; } } @@ -126,10 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_PARAMETER_ACTIVATION)) { + if (!(o instanceof InformationObjectWithoutTime_PARAMETER_ACTIVATION)) { return false; } - InformationObject_PARAMETER_ACTIVATION that = (InformationObject_PARAMETER_ACTIVATION) o; + InformationObjectWithoutTime_PARAMETER_ACTIVATION that = + (InformationObjectWithoutTime_PARAMETER_ACTIVATION) o; return (getQpa() == that.getQpa()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java similarity index 69% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java index e10515167aa..8b162e688bf 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE - extends InformationObject implements Message { +public class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final NormalizedValue nva; protected final QualifierOfParameterOfMeasuredValues qpm; - public InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE( + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE( int address, NormalizedValue nva, QualifierOfParameterOfMeasuredValues qpm) { super(address); this.nva = nva; @@ -63,11 +63,12 @@ public QualifierOfParameterOfMeasuredValues getQpm() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); + writeBuffer.pushContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); // Simple Field (nva) writeSimpleField( @@ -83,7 +84,8 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); + writeBuffer.popContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); } @Override @@ -94,7 +96,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE _value = this; + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nva) @@ -106,9 +108,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,28 +130,32 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfParameterOfMeasuredValues.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); + readBuffer.closeContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE"); // Create the instance - return new InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl(nva, qpm); + return new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl( + nva, qpm); } - public static class InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static + class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NormalizedValue nva; private final QualifierOfParameterOfMeasuredValues qpm; - public InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl( + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUEBuilderImpl( NormalizedValue nva, QualifierOfParameterOfMeasuredValues qpm) { this.nva = nva; this.qpm = qpm; } - public InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE build(int address) { - InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE - informationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE = - new InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE( + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE build( + int address) { + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE + informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE = + new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE( address, nva, qpm); - return informationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE; + return informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE; } } @@ -156,11 +164,12 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) { + if (!(o + instanceof InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE)) { return false; } - InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE that = - (InformationObject_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE) o; + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE that = + (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE) o; return (getNva() == that.getNva()) && (getQpm() == that.getQpm()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java similarity index 69% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java index 587dd5f51e9..09ed9df81e1 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE extends InformationObject - implements Message { +public class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final ScaledValue sva; protected final QualifierOfParameterOfMeasuredValues qpm; - public InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE( + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE( int address, ScaledValue sva, QualifierOfParameterOfMeasuredValues qpm) { super(address); this.sva = sva; @@ -63,11 +63,12 @@ public QualifierOfParameterOfMeasuredValues getQpm() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); + writeBuffer.pushContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); // Simple Field (sva) writeSimpleField( @@ -83,7 +84,8 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); + writeBuffer.popContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); } @Override @@ -94,7 +96,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE _value = this; + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sva) @@ -106,9 +108,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -125,27 +129,32 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfParameterOfMeasuredValues.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); + readBuffer.closeContext( + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE"); // Create the instance - return new InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl(sva, qpm); + return new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl( + sva, qpm); } - public static class InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static + class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final ScaledValue sva; private final QualifierOfParameterOfMeasuredValues qpm; - public InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl( + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUEBuilderImpl( ScaledValue sva, QualifierOfParameterOfMeasuredValues qpm) { this.sva = sva; this.qpm = qpm; } - public InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE build(int address) { - InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE - informationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE = - new InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE(address, sva, qpm); - return informationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE; + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE build( + int address) { + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE + informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE = + new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE( + address, sva, qpm); + return informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE; } } @@ -154,11 +163,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) { + if (!(o instanceof InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE)) { return false; } - InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE that = - (InformationObject_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE) o; + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE that = + (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE) o; return (getSva() == that.getSva()) && (getQpm() == that.getQpm()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java similarity index 69% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java index fb7aca161a1..6ad3b0fda84 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER - extends InformationObject implements Message { +public class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final float value; protected final QualifierOfParameterOfMeasuredValues qpm; - public InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER( + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER( int address, float value, QualifierOfParameterOfMeasuredValues qpm) { super(address); this.value = value; @@ -63,12 +63,12 @@ public QualifierOfParameterOfMeasuredValues getQpm() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext( - "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); // Simple Field (value) writeSimpleField( @@ -85,7 +85,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext( - "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); } @Override @@ -96,7 +96,8 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER _value = this; + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER _value = + this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (value) @@ -108,10 +109,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { readBuffer.pullContext( - "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -127,31 +129,32 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext( - "InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); + "InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER"); // Create the instance - return new InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl( + return new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl( value, qpm); } public static - class InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl - implements InformationObject.InformationObjectBuilder { + class InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final float value; private final QualifierOfParameterOfMeasuredValues qpm; - public InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl( + public + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBERBuilderImpl( float value, QualifierOfParameterOfMeasuredValues qpm) { this.value = value; this.qpm = qpm; } - public InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER build( - int address) { - InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER - informationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER = - new InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER( + public InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER + build(int address) { + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER + informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER = + new InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER( address, value, qpm); - return informationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER; + return informationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER; } } @@ -161,11 +164,12 @@ public boolean equals(Object o) { return true; } if (!(o - instanceof InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) { + instanceof + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER)) { return false; } - InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER that = - (InformationObject_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER) o; + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER that = + (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER) o; return (getValue() == that.getValue()) && (getQpm() == that.getQpm()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_READ_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_READ_COMMAND.java similarity index 66% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_READ_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_READ_COMMAND.java index 98e287bf7c3..b72e67555d3 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_READ_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_READ_COMMAND.java @@ -35,25 +35,26 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_READ_COMMAND extends InformationObject implements Message { +public class InformationObjectWithoutTime_READ_COMMAND extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { return TypeIdentification.READ_COMMAND; } - public InformationObject_READ_COMMAND(int address) { + public InformationObjectWithoutTime_READ_COMMAND(int address) { super(address); } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_READ_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_READ_COMMAND"); - writeBuffer.popContext("InformationObject_READ_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_READ_COMMAND"); } @Override @@ -64,32 +65,33 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_READ_COMMAND _value = this; + InformationObjectWithoutTime_READ_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_READ_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_READ_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - readBuffer.closeContext("InformationObject_READ_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_READ_COMMAND"); // Create the instance - return new InformationObject_READ_COMMANDBuilderImpl(); + return new InformationObjectWithoutTime_READ_COMMANDBuilderImpl(); } - public static class InformationObject_READ_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_READ_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { - public InformationObject_READ_COMMANDBuilderImpl() {} + public InformationObjectWithoutTime_READ_COMMANDBuilderImpl() {} - public InformationObject_READ_COMMAND build(int address) { - InformationObject_READ_COMMAND informationObject_READ_COMMAND = - new InformationObject_READ_COMMAND(address); - return informationObject_READ_COMMAND; + public InformationObjectWithoutTime_READ_COMMAND build(int address) { + InformationObjectWithoutTime_READ_COMMAND informationObjectWithoutTime_READ_COMMAND = + new InformationObjectWithoutTime_READ_COMMAND(address); + return informationObjectWithoutTime_READ_COMMAND; } } @@ -98,10 +100,10 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_READ_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_READ_COMMAND)) { return false; } - InformationObject_READ_COMMAND that = (InformationObject_READ_COMMAND) o; + InformationObjectWithoutTime_READ_COMMAND that = (InformationObjectWithoutTime_READ_COMMAND) o; return super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_REGULATING_STEP_COMMAND.java similarity index 67% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_REGULATING_STEP_COMMAND.java index ffccf6ede2e..13d24a7fb0c 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_REGULATING_STEP_COMMAND.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_REGULATING_STEP_COMMAND extends InformationObject - implements Message { +public class InformationObjectWithoutTime_REGULATING_STEP_COMMAND + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final RegulatingStepCommand rco; - public InformationObject_REGULATING_STEP_COMMAND(int address, RegulatingStepCommand rco) { + public InformationObjectWithoutTime_REGULATING_STEP_COMMAND( + int address, RegulatingStepCommand rco) { super(address); this.rco = rco; } @@ -56,11 +57,11 @@ public RegulatingStepCommand getRco() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_REGULATING_STEP_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND"); // Simple Field (rco) writeSimpleField( @@ -69,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_REGULATING_STEP_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND"); } @Override @@ -80,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_REGULATING_STEP_COMMAND _value = this; + InformationObjectWithoutTime_REGULATING_STEP_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (rco) @@ -89,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_REGULATING_STEP_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -102,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> RegulatingStepCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_REGULATING_STEP_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_REGULATING_STEP_COMMAND"); // Create the instance - return new InformationObject_REGULATING_STEP_COMMANDBuilderImpl(rco); + return new InformationObjectWithoutTime_REGULATING_STEP_COMMANDBuilderImpl(rco); } - public static class InformationObject_REGULATING_STEP_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_REGULATING_STEP_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final RegulatingStepCommand rco; - public InformationObject_REGULATING_STEP_COMMANDBuilderImpl(RegulatingStepCommand rco) { + public InformationObjectWithoutTime_REGULATING_STEP_COMMANDBuilderImpl( + RegulatingStepCommand rco) { this.rco = rco; } - public InformationObject_REGULATING_STEP_COMMAND build(int address) { - InformationObject_REGULATING_STEP_COMMAND informationObject_REGULATING_STEP_COMMAND = - new InformationObject_REGULATING_STEP_COMMAND(address, rco); - return informationObject_REGULATING_STEP_COMMAND; + public InformationObjectWithoutTime_REGULATING_STEP_COMMAND build(int address) { + InformationObjectWithoutTime_REGULATING_STEP_COMMAND + informationObjectWithoutTime_REGULATING_STEP_COMMAND = + new InformationObjectWithoutTime_REGULATING_STEP_COMMAND(address, rco); + return informationObjectWithoutTime_REGULATING_STEP_COMMAND; } } @@ -127,10 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_REGULATING_STEP_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_REGULATING_STEP_COMMAND)) { return false; } - InformationObject_REGULATING_STEP_COMMAND that = (InformationObject_REGULATING_STEP_COMMAND) o; + InformationObjectWithoutTime_REGULATING_STEP_COMMAND that = + (InformationObjectWithoutTime_REGULATING_STEP_COMMAND) o; return (getRco() == that.getRco()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_RESET_PROCESS_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_RESET_PROCESS_COMMAND.java similarity index 68% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_RESET_PROCESS_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_RESET_PROCESS_COMMAND.java index 8103bb987c5..25389bf1614 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_RESET_PROCESS_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_RESET_PROCESS_COMMAND.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_RESET_PROCESS_COMMAND extends InformationObject implements Message { +public class InformationObjectWithoutTime_RESET_PROCESS_COMMAND extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final QualifierOfResetProcessCommand qrp; - public InformationObject_RESET_PROCESS_COMMAND(int address, QualifierOfResetProcessCommand qrp) { + public InformationObjectWithoutTime_RESET_PROCESS_COMMAND( + int address, QualifierOfResetProcessCommand qrp) { super(address); this.qrp = qrp; } @@ -55,11 +57,11 @@ public QualifierOfResetProcessCommand getQrp() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_RESET_PROCESS_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND"); // Simple Field (qrp) writeSimpleField( @@ -68,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_RESET_PROCESS_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND"); } @Override @@ -79,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_RESET_PROCESS_COMMAND _value = this; + InformationObjectWithoutTime_RESET_PROCESS_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (qrp) @@ -88,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_RESET_PROCESS_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfResetProcessCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_RESET_PROCESS_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_RESET_PROCESS_COMMAND"); // Create the instance - return new InformationObject_RESET_PROCESS_COMMANDBuilderImpl(qrp); + return new InformationObjectWithoutTime_RESET_PROCESS_COMMANDBuilderImpl(qrp); } - public static class InformationObject_RESET_PROCESS_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_RESET_PROCESS_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final QualifierOfResetProcessCommand qrp; - public InformationObject_RESET_PROCESS_COMMANDBuilderImpl(QualifierOfResetProcessCommand qrp) { + public InformationObjectWithoutTime_RESET_PROCESS_COMMANDBuilderImpl( + QualifierOfResetProcessCommand qrp) { this.qrp = qrp; } - public InformationObject_RESET_PROCESS_COMMAND build(int address) { - InformationObject_RESET_PROCESS_COMMAND informationObject_RESET_PROCESS_COMMAND = - new InformationObject_RESET_PROCESS_COMMAND(address, qrp); - return informationObject_RESET_PROCESS_COMMAND; + public InformationObjectWithoutTime_RESET_PROCESS_COMMAND build(int address) { + InformationObjectWithoutTime_RESET_PROCESS_COMMAND + informationObjectWithoutTime_RESET_PROCESS_COMMAND = + new InformationObjectWithoutTime_RESET_PROCESS_COMMAND(address, qrp); + return informationObjectWithoutTime_RESET_PROCESS_COMMAND; } } @@ -126,10 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_RESET_PROCESS_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_RESET_PROCESS_COMMAND)) { return false; } - InformationObject_RESET_PROCESS_COMMAND that = (InformationObject_RESET_PROCESS_COMMAND) o; + InformationObjectWithoutTime_RESET_PROCESS_COMMAND that = + (InformationObjectWithoutTime_RESET_PROCESS_COMMAND) o; return (getQrp() == that.getQrp()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SECTION_READY.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SECTION_READY.java similarity index 79% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SECTION_READY.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SECTION_READY.java index 7347c6c59dc..1fc25ef1b78 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SECTION_READY.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SECTION_READY.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SECTION_READY extends InformationObject implements Message { +public class InformationObjectWithoutTime_SECTION_READY extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -48,7 +49,7 @@ public TypeIdentification getTypeIdentification() { protected final LengthOfFile lof; protected final SectionReadyQualifier srq; - public InformationObject_SECTION_READY( + public InformationObjectWithoutTime_SECTION_READY( int address, NameOfFile nof, NameOfSection nos, LengthOfFile lof, SectionReadyQualifier srq) { super(address); this.nof = nof; @@ -74,11 +75,11 @@ public SectionReadyQualifier getSrq() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SECTION_READY"); + writeBuffer.pushContext("InformationObjectWithoutTime_SECTION_READY"); // Simple Field (nof) writeSimpleField( @@ -108,7 +109,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SECTION_READY"); + writeBuffer.popContext("InformationObjectWithoutTime_SECTION_READY"); } @Override @@ -119,7 +120,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SECTION_READY _value = this; + InformationObjectWithoutTime_SECTION_READY _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nof) @@ -137,9 +138,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SECTION_READY"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_SECTION_READY"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -168,19 +170,19 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SectionReadyQualifier.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SECTION_READY"); + readBuffer.closeContext("InformationObjectWithoutTime_SECTION_READY"); // Create the instance - return new InformationObject_SECTION_READYBuilderImpl(nof, nos, lof, srq); + return new InformationObjectWithoutTime_SECTION_READYBuilderImpl(nof, nos, lof, srq); } - public static class InformationObject_SECTION_READYBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_SECTION_READYBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NameOfFile nof; private final NameOfSection nos; private final LengthOfFile lof; private final SectionReadyQualifier srq; - public InformationObject_SECTION_READYBuilderImpl( + public InformationObjectWithoutTime_SECTION_READYBuilderImpl( NameOfFile nof, NameOfSection nos, LengthOfFile lof, SectionReadyQualifier srq) { this.nof = nof; this.nos = nos; @@ -188,10 +190,10 @@ public InformationObject_SECTION_READYBuilderImpl( this.srq = srq; } - public InformationObject_SECTION_READY build(int address) { - InformationObject_SECTION_READY informationObject_SECTION_READY = - new InformationObject_SECTION_READY(address, nof, nos, lof, srq); - return informationObject_SECTION_READY; + public InformationObjectWithoutTime_SECTION_READY build(int address) { + InformationObjectWithoutTime_SECTION_READY informationObjectWithoutTime_SECTION_READY = + new InformationObjectWithoutTime_SECTION_READY(address, nof, nos, lof, srq); + return informationObjectWithoutTime_SECTION_READY; } } @@ -200,10 +202,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SECTION_READY)) { + if (!(o instanceof InformationObjectWithoutTime_SECTION_READY)) { return false; } - InformationObject_SECTION_READY that = (InformationObject_SECTION_READY) o; + InformationObjectWithoutTime_SECTION_READY that = + (InformationObjectWithoutTime_SECTION_READY) o; return (getNof() == that.getNof()) && (getNos() == that.getNos()) && (getLof() == that.getLof()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SEGMENT.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SEGMENT.java similarity index 78% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SEGMENT.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SEGMENT.java index 87da39bfcf4..aad2e54b433 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SEGMENT.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SEGMENT.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SEGMENT extends InformationObject implements Message { +public class InformationObjectWithoutTime_SEGMENT extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +48,7 @@ public TypeIdentification getTypeIdentification() { protected final NameOfSection nos; protected final LengthOfSegment los; - public InformationObject_SEGMENT( + public InformationObjectWithoutTime_SEGMENT( int address, NameOfFile nof, NameOfSection nos, LengthOfSegment los) { super(address); this.nof = nof; @@ -68,11 +69,11 @@ public LengthOfSegment getLos() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SEGMENT"); + writeBuffer.pushContext("InformationObjectWithoutTime_SEGMENT"); // Simple Field (nof) writeSimpleField( @@ -95,7 +96,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SEGMENT"); + writeBuffer.popContext("InformationObjectWithoutTime_SEGMENT"); } @Override @@ -106,7 +107,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SEGMENT _value = this; + InformationObjectWithoutTime_SEGMENT _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nof) @@ -121,9 +122,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SEGMENT"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_SEGMENT"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -146,28 +148,28 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> LengthOfSegment.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SEGMENT"); + readBuffer.closeContext("InformationObjectWithoutTime_SEGMENT"); // Create the instance - return new InformationObject_SEGMENTBuilderImpl(nof, nos, los); + return new InformationObjectWithoutTime_SEGMENTBuilderImpl(nof, nos, los); } - public static class InformationObject_SEGMENTBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_SEGMENTBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NameOfFile nof; private final NameOfSection nos; private final LengthOfSegment los; - public InformationObject_SEGMENTBuilderImpl( + public InformationObjectWithoutTime_SEGMENTBuilderImpl( NameOfFile nof, NameOfSection nos, LengthOfSegment los) { this.nof = nof; this.nos = nos; this.los = los; } - public InformationObject_SEGMENT build(int address) { - InformationObject_SEGMENT informationObject_SEGMENT = - new InformationObject_SEGMENT(address, nof, nos, los); - return informationObject_SEGMENT; + public InformationObjectWithoutTime_SEGMENT build(int address) { + InformationObjectWithoutTime_SEGMENT informationObjectWithoutTime_SEGMENT = + new InformationObjectWithoutTime_SEGMENT(address, nof, nos, los); + return informationObjectWithoutTime_SEGMENT; } } @@ -176,10 +178,10 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SEGMENT)) { + if (!(o instanceof InformationObjectWithoutTime_SEGMENT)) { return false; } - InformationObject_SEGMENT that = (InformationObject_SEGMENT) o; + InformationObjectWithoutTime_SEGMENT that = (InformationObjectWithoutTime_SEGMENT) o; return (getNof() == that.getNof()) && (getNos() == that.getNos()) && (getLos() == that.getLos()) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE.java similarity index 70% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE.java index d50db764153..dc3c1070e13 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE extends InformationObject - implements Message { +public class InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final NormalizedValue nva; protected final QualifierOfSetPointCommand qos; - public InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE( + public InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE( int address, NormalizedValue nva, QualifierOfSetPointCommand qos) { super(address); this.nva = nva; @@ -63,11 +63,11 @@ public QualifierOfSetPointCommand getQos() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE"); + writeBuffer.pushContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE"); // Simple Field (nva) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE"); + writeBuffer.popContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE _value = this; + InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (nva) @@ -106,9 +106,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,27 +127,28 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfSetPointCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE"); + readBuffer.closeContext("InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE"); // Create the instance - return new InformationObject_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl(nva, qos); + return new InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl(nva, qos); } - public static class InformationObject_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final NormalizedValue nva; private final QualifierOfSetPointCommand qos; - public InformationObject_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl( + public InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUEBuilderImpl( NormalizedValue nva, QualifierOfSetPointCommand qos) { this.nva = nva; this.qos = qos; } - public InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE build(int address) { - InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE - informationObject_SET_POINT_COMMAND_NORMALISED_VALUE = - new InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE(address, nva, qos); - return informationObject_SET_POINT_COMMAND_NORMALISED_VALUE; + public InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE build(int address) { + InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE + informationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE = + new InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE( + address, nva, qos); + return informationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE; } } @@ -155,11 +157,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE)) { + if (!(o instanceof InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE)) { return false; } - InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE that = - (InformationObject_SET_POINT_COMMAND_NORMALISED_VALUE) o; + InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE that = + (InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE) o; return (getNva() == that.getNva()) && (getQos() == that.getQos()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SCALED_VALUE.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java similarity index 71% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SCALED_VALUE.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java index b22d4c5bd6f..65bb43fdc25 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SCALED_VALUE.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SET_POINT_COMMAND_SCALED_VALUE extends InformationObject - implements Message { +public class InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final ScaledValue sva; protected final QualifierOfSetPointCommand qos; - public InformationObject_SET_POINT_COMMAND_SCALED_VALUE( + public InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE( int address, ScaledValue sva, QualifierOfSetPointCommand qos) { super(address); this.sva = sva; @@ -63,11 +63,11 @@ public QualifierOfSetPointCommand getQos() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE"); + writeBuffer.pushContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE"); // Simple Field (sva) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE"); + writeBuffer.popContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SET_POINT_COMMAND_SCALED_VALUE _value = this; + InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sva) @@ -106,9 +106,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -125,27 +126,27 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfSetPointCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SET_POINT_COMMAND_SCALED_VALUE"); + readBuffer.closeContext("InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE"); // Create the instance - return new InformationObject_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl(sva, qos); + return new InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl(sva, qos); } - public static class InformationObject_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final ScaledValue sva; private final QualifierOfSetPointCommand qos; - public InformationObject_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl( + public InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUEBuilderImpl( ScaledValue sva, QualifierOfSetPointCommand qos) { this.sva = sva; this.qos = qos; } - public InformationObject_SET_POINT_COMMAND_SCALED_VALUE build(int address) { - InformationObject_SET_POINT_COMMAND_SCALED_VALUE - informationObject_SET_POINT_COMMAND_SCALED_VALUE = - new InformationObject_SET_POINT_COMMAND_SCALED_VALUE(address, sva, qos); - return informationObject_SET_POINT_COMMAND_SCALED_VALUE; + public InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE build(int address) { + InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE + informationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE = + new InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE(address, sva, qos); + return informationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE; } } @@ -154,11 +155,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SET_POINT_COMMAND_SCALED_VALUE)) { + if (!(o instanceof InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE)) { return false; } - InformationObject_SET_POINT_COMMAND_SCALED_VALUE that = - (InformationObject_SET_POINT_COMMAND_SCALED_VALUE) o; + InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE that = + (InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE) o; return (getSva() == that.getSva()) && (getQos() == that.getQos()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java similarity index 68% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java index 0e4e80664e7..37518ec4737 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER - extends InformationObject implements Message { +public class InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final float value; protected final QualifierOfSetPointCommand qos; - public InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER( + public InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER( int address, float value, QualifierOfSetPointCommand qos) { super(address); this.value = value; @@ -63,11 +63,12 @@ public QualifierOfSetPointCommand getQos() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); + writeBuffer.pushContext( + "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); // Simple Field (value) writeSimpleField( @@ -83,7 +84,8 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); + writeBuffer.popContext( + "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); } @Override @@ -94,7 +96,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER _value = this; + InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (value) @@ -106,9 +108,11 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext( + "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -123,29 +127,32 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualifierOfSetPointCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); + readBuffer.closeContext( + "InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER"); // Create the instance - return new InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl( + return new InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl( value, qos); } - public static class InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static + class InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final float value; private final QualifierOfSetPointCommand qos; - public InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl( + public InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBERBuilderImpl( float value, QualifierOfSetPointCommand qos) { this.value = value; this.qos = qos; } - public InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER build(int address) { - InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER - informationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER = - new InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER( + public InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER build( + int address) { + InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER + informationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER = + new InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER( address, value, qos); - return informationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER; + return informationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER; } } @@ -154,11 +161,12 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) { + if (!(o + instanceof InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER)) { return false; } - InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER that = - (InformationObject_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER) o; + InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER that = + (InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER) o; return (getValue() == that.getValue()) && (getQos() == that.getQos()) && super.equals(that) diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_COMMAND.java similarity index 70% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_COMMAND.java index 722956e01ed..14c944c974a 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_COMMAND.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SINGLE_COMMAND extends InformationObject implements Message { +public class InformationObjectWithoutTime_SINGLE_COMMAND extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,7 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final SingleCommand sco; - public InformationObject_SINGLE_COMMAND(int address, SingleCommand sco) { + public InformationObjectWithoutTime_SINGLE_COMMAND(int address, SingleCommand sco) { super(address); this.sco = sco; } @@ -55,11 +56,11 @@ public SingleCommand getSco() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SINGLE_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_SINGLE_COMMAND"); // Simple Field (sco) writeSimpleField( @@ -68,7 +69,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SINGLE_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_SINGLE_COMMAND"); } @Override @@ -79,7 +80,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SINGLE_COMMAND _value = this; + InformationObjectWithoutTime_SINGLE_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (sco) @@ -88,9 +89,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SINGLE_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_SINGLE_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -100,23 +102,23 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( new DataReaderComplexDefault<>(() -> SingleCommand.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SINGLE_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_SINGLE_COMMAND"); // Create the instance - return new InformationObject_SINGLE_COMMANDBuilderImpl(sco); + return new InformationObjectWithoutTime_SINGLE_COMMANDBuilderImpl(sco); } - public static class InformationObject_SINGLE_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_SINGLE_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final SingleCommand sco; - public InformationObject_SINGLE_COMMANDBuilderImpl(SingleCommand sco) { + public InformationObjectWithoutTime_SINGLE_COMMANDBuilderImpl(SingleCommand sco) { this.sco = sco; } - public InformationObject_SINGLE_COMMAND build(int address) { - InformationObject_SINGLE_COMMAND informationObject_SINGLE_COMMAND = - new InformationObject_SINGLE_COMMAND(address, sco); - return informationObject_SINGLE_COMMAND; + public InformationObjectWithoutTime_SINGLE_COMMAND build(int address) { + InformationObjectWithoutTime_SINGLE_COMMAND informationObjectWithoutTime_SINGLE_COMMAND = + new InformationObjectWithoutTime_SINGLE_COMMAND(address, sco); + return informationObjectWithoutTime_SINGLE_COMMAND; } } @@ -125,10 +127,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SINGLE_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_SINGLE_COMMAND)) { return false; } - InformationObject_SINGLE_COMMAND that = (InformationObject_SINGLE_COMMAND) o; + InformationObjectWithoutTime_SINGLE_COMMAND that = + (InformationObjectWithoutTime_SINGLE_COMMAND) o; return (getSco() == that.getSco()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_POINT_INFORMATION.java similarity index 67% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_POINT_INFORMATION.java index cd8ce729bf7..a7ab233ad0c 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_POINT_INFORMATION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_SINGLE_POINT_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_SINGLE_POINT_INFORMATION extends InformationObject - implements Message { +public class InformationObjectWithoutTime_SINGLE_POINT_INFORMATION + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -46,7 +46,8 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final SinglePointInformation siq; - public InformationObject_SINGLE_POINT_INFORMATION(int address, SinglePointInformation siq) { + public InformationObjectWithoutTime_SINGLE_POINT_INFORMATION( + int address, SinglePointInformation siq) { super(address); this.siq = siq; } @@ -56,11 +57,11 @@ public SinglePointInformation getSiq() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SINGLE_POINT_INFORMATION"); + writeBuffer.pushContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION"); // Simple Field (siq) writeSimpleField( @@ -69,7 +70,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_SINGLE_POINT_INFORMATION"); + writeBuffer.popContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION"); } @Override @@ -80,7 +81,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_SINGLE_POINT_INFORMATION _value = this; + InformationObjectWithoutTime_SINGLE_POINT_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (siq) @@ -89,9 +90,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SINGLE_POINT_INFORMATION"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -102,23 +104,25 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> SinglePointInformation.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_SINGLE_POINT_INFORMATION"); + readBuffer.closeContext("InformationObjectWithoutTime_SINGLE_POINT_INFORMATION"); // Create the instance - return new InformationObject_SINGLE_POINT_INFORMATIONBuilderImpl(siq); + return new InformationObjectWithoutTime_SINGLE_POINT_INFORMATIONBuilderImpl(siq); } - public static class InformationObject_SINGLE_POINT_INFORMATIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_SINGLE_POINT_INFORMATIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final SinglePointInformation siq; - public InformationObject_SINGLE_POINT_INFORMATIONBuilderImpl(SinglePointInformation siq) { + public InformationObjectWithoutTime_SINGLE_POINT_INFORMATIONBuilderImpl( + SinglePointInformation siq) { this.siq = siq; } - public InformationObject_SINGLE_POINT_INFORMATION build(int address) { - InformationObject_SINGLE_POINT_INFORMATION informationObject_SINGLE_POINT_INFORMATION = - new InformationObject_SINGLE_POINT_INFORMATION(address, siq); - return informationObject_SINGLE_POINT_INFORMATION; + public InformationObjectWithoutTime_SINGLE_POINT_INFORMATION build(int address) { + InformationObjectWithoutTime_SINGLE_POINT_INFORMATION + informationObjectWithoutTime_SINGLE_POINT_INFORMATION = + new InformationObjectWithoutTime_SINGLE_POINT_INFORMATION(address, siq); + return informationObjectWithoutTime_SINGLE_POINT_INFORMATION; } } @@ -127,11 +131,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_SINGLE_POINT_INFORMATION)) { + if (!(o instanceof InformationObjectWithoutTime_SINGLE_POINT_INFORMATION)) { return false; } - InformationObject_SINGLE_POINT_INFORMATION that = - (InformationObject_SINGLE_POINT_INFORMATION) o; + InformationObjectWithoutTime_SINGLE_POINT_INFORMATION that = + (InformationObjectWithoutTime_SINGLE_POINT_INFORMATION) o; return (getSiq() == that.getSiq()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_STEP_POSITION_INFORMATION.java similarity index 72% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_STEP_POSITION_INFORMATION.java index a7d9f70dccd..fa7eefa8507 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_STEP_POSITION_INFORMATION.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_STEP_POSITION_INFORMATION.java @@ -35,8 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_STEP_POSITION_INFORMATION extends InformationObject - implements Message { +public class InformationObjectWithoutTime_STEP_POSITION_INFORMATION + extends InformationObjectWithoutTime implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -47,7 +47,7 @@ public TypeIdentification getTypeIdentification() { protected final ValueWithTransientStateIndication vti; protected final QualityDescriptor qds; - public InformationObject_STEP_POSITION_INFORMATION( + public InformationObjectWithoutTime_STEP_POSITION_INFORMATION( int address, ValueWithTransientStateIndication vti, QualityDescriptor qds) { super(address); this.vti = vti; @@ -63,11 +63,11 @@ public QualityDescriptor getQds() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_STEP_POSITION_INFORMATION"); + writeBuffer.pushContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION"); // Simple Field (vti) writeSimpleField( @@ -83,7 +83,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_STEP_POSITION_INFORMATION"); + writeBuffer.popContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION"); } @Override @@ -94,7 +94,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_STEP_POSITION_INFORMATION _value = this; + InformationObjectWithoutTime_STEP_POSITION_INFORMATION _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (vti) @@ -106,9 +106,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_STEP_POSITION_INFORMATION"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -126,26 +127,27 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> QualityDescriptor.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_STEP_POSITION_INFORMATION"); + readBuffer.closeContext("InformationObjectWithoutTime_STEP_POSITION_INFORMATION"); // Create the instance - return new InformationObject_STEP_POSITION_INFORMATIONBuilderImpl(vti, qds); + return new InformationObjectWithoutTime_STEP_POSITION_INFORMATIONBuilderImpl(vti, qds); } - public static class InformationObject_STEP_POSITION_INFORMATIONBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_STEP_POSITION_INFORMATIONBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final ValueWithTransientStateIndication vti; private final QualityDescriptor qds; - public InformationObject_STEP_POSITION_INFORMATIONBuilderImpl( + public InformationObjectWithoutTime_STEP_POSITION_INFORMATIONBuilderImpl( ValueWithTransientStateIndication vti, QualityDescriptor qds) { this.vti = vti; this.qds = qds; } - public InformationObject_STEP_POSITION_INFORMATION build(int address) { - InformationObject_STEP_POSITION_INFORMATION informationObject_STEP_POSITION_INFORMATION = - new InformationObject_STEP_POSITION_INFORMATION(address, vti, qds); - return informationObject_STEP_POSITION_INFORMATION; + public InformationObjectWithoutTime_STEP_POSITION_INFORMATION build(int address) { + InformationObjectWithoutTime_STEP_POSITION_INFORMATION + informationObjectWithoutTime_STEP_POSITION_INFORMATION = + new InformationObjectWithoutTime_STEP_POSITION_INFORMATION(address, vti, qds); + return informationObjectWithoutTime_STEP_POSITION_INFORMATION; } } @@ -154,11 +156,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_STEP_POSITION_INFORMATION)) { + if (!(o instanceof InformationObjectWithoutTime_STEP_POSITION_INFORMATION)) { return false; } - InformationObject_STEP_POSITION_INFORMATION that = - (InformationObject_STEP_POSITION_INFORMATION) o; + InformationObjectWithoutTime_STEP_POSITION_INFORMATION that = + (InformationObjectWithoutTime_STEP_POSITION_INFORMATION) o; return (getVti() == that.getVti()) && (getQds() == that.getQds()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_TEST_COMMAND.java similarity index 70% rename from plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND.java rename to plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_TEST_COMMAND.java index 831d27dc726..bcb0ab77342 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObjectWithoutTime_TEST_COMMAND.java @@ -35,7 +35,8 @@ // Code generated by code-generation. DO NOT EDIT. -public class InformationObject_TEST_COMMAND extends InformationObject implements Message { +public class InformationObjectWithoutTime_TEST_COMMAND extends InformationObjectWithoutTime + implements Message { // Accessors for discriminator values. public TypeIdentification getTypeIdentification() { @@ -45,7 +46,7 @@ public TypeIdentification getTypeIdentification() { // Properties. protected final FixedTestBitPatternTwoOctet fbp; - public InformationObject_TEST_COMMAND(int address, FixedTestBitPatternTwoOctet fbp) { + public InformationObjectWithoutTime_TEST_COMMAND(int address, FixedTestBitPatternTwoOctet fbp) { super(address); this.fbp = fbp; } @@ -55,11 +56,11 @@ public FixedTestBitPatternTwoOctet getFbp() { } @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) + protected void serializeInformationObjectWithoutTimeChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_TEST_COMMAND"); + writeBuffer.pushContext("InformationObjectWithoutTime_TEST_COMMAND"); // Simple Field (fbp) writeSimpleField( @@ -68,7 +69,7 @@ protected void serializeInformationObjectChild(WriteBuffer writeBuffer) new DataWriterComplexDefault<>(writeBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - writeBuffer.popContext("InformationObject_TEST_COMMAND"); + writeBuffer.popContext("InformationObjectWithoutTime_TEST_COMMAND"); } @Override @@ -79,7 +80,7 @@ public int getLengthInBytes() { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - InformationObject_TEST_COMMAND _value = this; + InformationObjectWithoutTime_TEST_COMMAND _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (fbp) @@ -88,9 +89,10 @@ public int getLengthInBits() { return lengthInBits; } - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_TEST_COMMAND"); + public static InformationObjectWithoutTimeBuilder staticParseInformationObjectWithoutTimeBuilder( + ReadBuffer readBuffer, TypeIdentification typeIdentification, Byte numTimeByte) + throws ParseException { + readBuffer.pullContext("InformationObjectWithoutTime_TEST_COMMAND"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -101,23 +103,23 @@ public static InformationObjectBuilder staticParseInformationObjectBuilder( () -> FixedTestBitPatternTwoOctet.staticParse(readBuffer), readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); - readBuffer.closeContext("InformationObject_TEST_COMMAND"); + readBuffer.closeContext("InformationObjectWithoutTime_TEST_COMMAND"); // Create the instance - return new InformationObject_TEST_COMMANDBuilderImpl(fbp); + return new InformationObjectWithoutTime_TEST_COMMANDBuilderImpl(fbp); } - public static class InformationObject_TEST_COMMANDBuilderImpl - implements InformationObject.InformationObjectBuilder { + public static class InformationObjectWithoutTime_TEST_COMMANDBuilderImpl + implements InformationObjectWithoutTime.InformationObjectWithoutTimeBuilder { private final FixedTestBitPatternTwoOctet fbp; - public InformationObject_TEST_COMMANDBuilderImpl(FixedTestBitPatternTwoOctet fbp) { + public InformationObjectWithoutTime_TEST_COMMANDBuilderImpl(FixedTestBitPatternTwoOctet fbp) { this.fbp = fbp; } - public InformationObject_TEST_COMMAND build(int address) { - InformationObject_TEST_COMMAND informationObject_TEST_COMMAND = - new InformationObject_TEST_COMMAND(address, fbp); - return informationObject_TEST_COMMAND; + public InformationObjectWithoutTime_TEST_COMMAND build(int address) { + InformationObjectWithoutTime_TEST_COMMAND informationObjectWithoutTime_TEST_COMMAND = + new InformationObjectWithoutTime_TEST_COMMAND(address, fbp); + return informationObjectWithoutTime_TEST_COMMAND; } } @@ -126,10 +128,10 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof InformationObject_TEST_COMMAND)) { + if (!(o instanceof InformationObjectWithoutTime_TEST_COMMAND)) { return false; } - InformationObject_TEST_COMMAND that = (InformationObject_TEST_COMMAND) o; + InformationObjectWithoutTime_TEST_COMMAND that = (InformationObjectWithoutTime_TEST_COMMAND) o; return (getFbp() == that.getFbp()) && super.equals(that) && true; } diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index e3f7aa934d1..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public class InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification.BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext( - "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext( - "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext( - "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext( - "InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static - class InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A build( - int address) { - InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A(address); - return informationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A) o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index 40b1fb94c1b..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public class InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A extends InformationObject - implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification.DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext("InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static class InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(address); - return informationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index bd88a27f1f0..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification.MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A( - int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = - this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static - class InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A build( - int address) { - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A( - address); - return informationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o - instanceof - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index a1f9a03fd3e..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public class InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification.MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A( - int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static - class InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public - InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A build( - int address) { - InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A( - address); - return informationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o - instanceof - InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index 2058c6e64e5..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public -class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification - .MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A( - int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A - _value = this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext( - "InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static - class InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A - build(int address) { - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A( - address); - return informationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o - instanceof - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A - that = - (InformationObject_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A) - o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index 8826f270c4d..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public class InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A - extends InformationObject implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification.REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext("InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static class InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A(address); - return informationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A) o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index 419a35b5588..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public class InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A extends InformationObject - implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification.SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext("InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static class InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A(address); - return informationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A) o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java deleted file mode 100644 index 75bebdbd1a9..00000000000 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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 - * - * https://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.java.iec608705104.readwrite; - -import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*; -import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; -import static org.apache.plc4x.java.spi.generation.StaticHelper.*; - -import java.time.*; -import java.util.*; -import org.apache.plc4x.java.api.exceptions.*; -import org.apache.plc4x.java.api.value.*; -import org.apache.plc4x.java.spi.codegen.*; -import org.apache.plc4x.java.spi.codegen.fields.*; -import org.apache.plc4x.java.spi.codegen.io.*; -import org.apache.plc4x.java.spi.generation.*; - -// Code generated by code-generation. DO NOT EDIT. - -public class InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A extends InformationObject - implements Message { - - // Accessors for discriminator values. - public TypeIdentification getTypeIdentification() { - return TypeIdentification.TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - - public InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A(int address) { - super(address); - } - - @Override - protected void serializeInformationObjectChild(WriteBuffer writeBuffer) - throws SerializationException { - PositionAware positionAware = writeBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - - writeBuffer.popContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - } - - @Override - public int getLengthInBytes() { - return (int) Math.ceil((float) getLengthInBits() / 8.0); - } - - @Override - public int getLengthInBits() { - int lengthInBits = super.getLengthInBits(); - InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A _value = this; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - return lengthInBits; - } - - public static InformationObjectBuilder staticParseInformationObjectBuilder( - ReadBuffer readBuffer, TypeIdentification typeIdentification) throws ParseException { - readBuffer.pullContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - PositionAware positionAware = readBuffer; - boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - - readBuffer.closeContext("InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A"); - // Create the instance - return new InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl(); - } - - public static class InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl - implements InformationObject.InformationObjectBuilder { - - public InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2ABuilderImpl() {} - - public InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A build(int address) { - InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A - informationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A = - new InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A(address); - return informationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A; - } - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A)) { - return false; - } - InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A that = - (InformationObject_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A) o; - return super.equals(that) && true; - } - - @Override - public int hashCode() { - return Objects.hash(super.hashCode()); - } - - @Override - public String toString() { - WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true); - try { - writeBufferBoxBased.writeSerializable(this); - } catch (SerializationException e) { - throw new RuntimeException(e); - } - return "\n" + writeBufferBoxBased.getBox().toString() + "\n"; - } -} diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java index c53951ed107..efdcd9720cb 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/SevenOctetBinaryTime.java @@ -38,15 +38,79 @@ public class SevenOctetBinaryTime implements Message { // Properties. - protected final byte[] value; + protected final int milliseconds; + protected final boolean invalid; + protected final boolean substituted; + protected final byte minutes; + protected final boolean daylightSaving; + protected final byte hour; + protected final byte dayOfWeek; + protected final byte day; + protected final byte month; + protected final byte year; - public SevenOctetBinaryTime(byte[] value) { + public SevenOctetBinaryTime( + int milliseconds, + boolean invalid, + boolean substituted, + byte minutes, + boolean daylightSaving, + byte hour, + byte dayOfWeek, + byte day, + byte month, + byte year) { super(); - this.value = value; + this.milliseconds = milliseconds; + this.invalid = invalid; + this.substituted = substituted; + this.minutes = minutes; + this.daylightSaving = daylightSaving; + this.hour = hour; + this.dayOfWeek = dayOfWeek; + this.day = day; + this.month = month; + this.year = year; } - public byte[] getValue() { - return value; + public int getMilliseconds() { + return milliseconds; + } + + public boolean getInvalid() { + return invalid; + } + + public boolean getSubstituted() { + return substituted; + } + + public byte getMinutes() { + return minutes; + } + + public boolean getDaylightSaving() { + return daylightSaving; + } + + public byte getHour() { + return hour; + } + + public byte getDayOfWeek() { + return dayOfWeek; + } + + public byte getDay() { + return day; + } + + public byte getMonth() { + return month; + } + + public byte getYear() { + return year; } public void serialize(WriteBuffer writeBuffer) throws SerializationException { @@ -54,11 +118,95 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext("SevenOctetBinaryTime"); - // Array Field (value) - writeByteArrayField( - "value", - value, - writeByteArray(writeBuffer, 8), + // Simple Field (milliseconds) + writeSimpleField( + "milliseconds", + milliseconds, + writeUnsignedInt(writeBuffer, 16), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (invalid) + writeSimpleField( + "invalid", + invalid, + writeBoolean(writeBuffer), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (substituted) + writeSimpleField( + "substituted", + substituted, + writeBoolean(writeBuffer), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (minutes) + writeSimpleField( + "minutes", + minutes, + writeUnsignedByte(writeBuffer, 6), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (daylightSaving) + writeSimpleField( + "daylightSaving", + daylightSaving, + writeBoolean(writeBuffer), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Reserved Field (reserved) + writeReservedField( + "reserved", + (byte) 0x00, + writeUnsignedByte(writeBuffer, 2), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (hour) + writeSimpleField( + "hour", + hour, + writeUnsignedByte(writeBuffer, 5), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (dayOfWeek) + writeSimpleField( + "dayOfWeek", + dayOfWeek, + writeUnsignedByte(writeBuffer, 3), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (day) + writeSimpleField( + "day", + day, + writeUnsignedByte(writeBuffer, 5), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Reserved Field (reserved) + writeReservedField( + "reserved", + (byte) 0x00, + writeUnsignedByte(writeBuffer, 4), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (month) + writeSimpleField( + "month", + month, + writeUnsignedByte(writeBuffer, 4), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Reserved Field (reserved) + writeReservedField( + "reserved", + (byte) 0x00, + writeUnsignedByte(writeBuffer, 1), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (year) + writeSimpleField( + "year", + year, + writeUnsignedByte(writeBuffer, 7), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext("SevenOctetBinaryTime"); @@ -75,10 +223,44 @@ public int getLengthInBits() { SevenOctetBinaryTime _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - // Array field - if (value != null) { - lengthInBits += 8 * value.length; - } + // Simple field (milliseconds) + lengthInBits += 16; + + // Simple field (invalid) + lengthInBits += 1; + + // Simple field (substituted) + lengthInBits += 1; + + // Simple field (minutes) + lengthInBits += 6; + + // Simple field (daylightSaving) + lengthInBits += 1; + + // Reserved Field (reserved) + lengthInBits += 2; + + // Simple field (hour) + lengthInBits += 5; + + // Simple field (dayOfWeek) + lengthInBits += 3; + + // Simple field (day) + lengthInBits += 5; + + // Reserved Field (reserved) + lengthInBits += 4; + + // Simple field (month) + lengthInBits += 4; + + // Reserved Field (reserved) + lengthInBits += 1; + + // Simple field (year) + lengthInBits += 7; return lengthInBits; } @@ -94,14 +276,100 @@ public static SevenOctetBinaryTime staticParse(ReadBuffer readBuffer) throws Par PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - byte[] value = - readBuffer.readByteArray( - "value", Math.toIntExact(7), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + int milliseconds = + readSimpleField( + "milliseconds", + readUnsignedInt(readBuffer, 16), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + boolean invalid = + readSimpleField( + "invalid", readBoolean(readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + boolean substituted = + readSimpleField( + "substituted", + readBoolean(readBuffer), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + byte minutes = + readSimpleField( + "minutes", + readUnsignedByte(readBuffer, 6), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + boolean daylightSaving = + readSimpleField( + "daylightSaving", + readBoolean(readBuffer), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + Byte reservedField0 = + readReservedField( + "reserved", + readUnsignedByte(readBuffer, 2), + (byte) 0x00, + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + byte hour = + readSimpleField( + "hour", + readUnsignedByte(readBuffer, 5), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + byte dayOfWeek = + readSimpleField( + "dayOfWeek", + readUnsignedByte(readBuffer, 3), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + byte day = + readSimpleField( + "day", + readUnsignedByte(readBuffer, 5), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + Byte reservedField1 = + readReservedField( + "reserved", + readUnsignedByte(readBuffer, 4), + (byte) 0x00, + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + byte month = + readSimpleField( + "month", + readUnsignedByte(readBuffer, 4), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + Byte reservedField2 = + readReservedField( + "reserved", + readUnsignedByte(readBuffer, 1), + (byte) 0x00, + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + byte year = + readSimpleField( + "year", + readUnsignedByte(readBuffer, 7), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext("SevenOctetBinaryTime"); // Create the instance SevenOctetBinaryTime _sevenOctetBinaryTime; - _sevenOctetBinaryTime = new SevenOctetBinaryTime(value); + _sevenOctetBinaryTime = + new SevenOctetBinaryTime( + milliseconds, + invalid, + substituted, + minutes, + daylightSaving, + hour, + dayOfWeek, + day, + month, + year); return _sevenOctetBinaryTime; } @@ -114,12 +382,32 @@ public boolean equals(Object o) { return false; } SevenOctetBinaryTime that = (SevenOctetBinaryTime) o; - return (getValue() == that.getValue()) && true; + return (getMilliseconds() == that.getMilliseconds()) + && (getInvalid() == that.getInvalid()) + && (getSubstituted() == that.getSubstituted()) + && (getMinutes() == that.getMinutes()) + && (getDaylightSaving() == that.getDaylightSaving()) + && (getHour() == that.getHour()) + && (getDayOfWeek() == that.getDayOfWeek()) + && (getDay() == that.getDay()) + && (getMonth() == that.getMonth()) + && (getYear() == that.getYear()) + && true; } @Override public int hashCode() { - return Objects.hash(getValue()); + return Objects.hash( + getMilliseconds(), + getInvalid(), + getSubstituted(), + getMinutes(), + getDaylightSaving(), + getHour(), + getDayOfWeek(), + getDay(), + getMonth(), + getYear()); } @Override diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ThreeOctetBinaryTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ThreeOctetBinaryTime.java index 5ffb21fcf3c..dcdb4520e43 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ThreeOctetBinaryTime.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/ThreeOctetBinaryTime.java @@ -38,15 +38,27 @@ public class ThreeOctetBinaryTime implements Message { // Properties. - protected final byte[] value; + protected final int milliseconds; + protected final boolean invalid; + protected final byte minutes; - public ThreeOctetBinaryTime(byte[] value) { + public ThreeOctetBinaryTime(int milliseconds, boolean invalid, byte minutes) { super(); - this.value = value; + this.milliseconds = milliseconds; + this.invalid = invalid; + this.minutes = minutes; } - public byte[] getValue() { - return value; + public int getMilliseconds() { + return milliseconds; + } + + public boolean getInvalid() { + return invalid; + } + + public byte getMinutes() { + return minutes; } public void serialize(WriteBuffer writeBuffer) throws SerializationException { @@ -54,11 +66,32 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext("ThreeOctetBinaryTime"); - // Array Field (value) - writeByteArrayField( - "value", - value, - writeByteArray(writeBuffer, 8), + // Simple Field (milliseconds) + writeSimpleField( + "milliseconds", + milliseconds, + writeUnsignedInt(writeBuffer, 16), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (invalid) + writeSimpleField( + "invalid", + invalid, + writeBoolean(writeBuffer), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Reserved Field (reserved) + writeReservedField( + "reserved", + (byte) 0x00, + writeUnsignedByte(writeBuffer, 1), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + // Simple Field (minutes) + writeSimpleField( + "minutes", + minutes, + writeUnsignedByte(writeBuffer, 6), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext("ThreeOctetBinaryTime"); @@ -75,10 +108,17 @@ public int getLengthInBits() { ThreeOctetBinaryTime _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - // Array field - if (value != null) { - lengthInBits += 8 * value.length; - } + // Simple field (milliseconds) + lengthInBits += 16; + + // Simple field (invalid) + lengthInBits += 1; + + // Reserved Field (reserved) + lengthInBits += 1; + + // Simple field (minutes) + lengthInBits += 6; return lengthInBits; } @@ -94,14 +134,33 @@ public static ThreeOctetBinaryTime staticParse(ReadBuffer readBuffer) throws Par PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - byte[] value = - readBuffer.readByteArray( - "value", Math.toIntExact(3), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + int milliseconds = + readSimpleField( + "milliseconds", + readUnsignedInt(readBuffer, 16), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + boolean invalid = + readSimpleField( + "invalid", readBoolean(readBuffer), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + Byte reservedField0 = + readReservedField( + "reserved", + readUnsignedByte(readBuffer, 1), + (byte) 0x00, + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + + byte minutes = + readSimpleField( + "minutes", + readUnsignedByte(readBuffer, 6), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext("ThreeOctetBinaryTime"); // Create the instance ThreeOctetBinaryTime _threeOctetBinaryTime; - _threeOctetBinaryTime = new ThreeOctetBinaryTime(value); + _threeOctetBinaryTime = new ThreeOctetBinaryTime(milliseconds, invalid, minutes); return _threeOctetBinaryTime; } @@ -114,12 +173,15 @@ public boolean equals(Object o) { return false; } ThreeOctetBinaryTime that = (ThreeOctetBinaryTime) o; - return (getValue() == that.getValue()) && true; + return (getMilliseconds() == that.getMilliseconds()) + && (getInvalid() == that.getInvalid()) + && (getMinutes() == that.getMinutes()) + && true; } @Override public int hashCode() { - return Objects.hash(getValue()); + return Objects.hash(getMilliseconds(), getInvalid(), getMinutes()); } @Override diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TwoOctetBinaryTime.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TwoOctetBinaryTime.java index 73e36f383e4..a4613a64c7d 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TwoOctetBinaryTime.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TwoOctetBinaryTime.java @@ -38,15 +38,15 @@ public class TwoOctetBinaryTime implements Message { // Properties. - protected final byte[] value; + protected final int milliseconds; - public TwoOctetBinaryTime(byte[] value) { + public TwoOctetBinaryTime(int milliseconds) { super(); - this.value = value; + this.milliseconds = milliseconds; } - public byte[] getValue() { - return value; + public int getMilliseconds() { + return milliseconds; } public void serialize(WriteBuffer writeBuffer) throws SerializationException { @@ -54,11 +54,11 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext("TwoOctetBinaryTime"); - // Array Field (value) - writeByteArrayField( - "value", - value, - writeByteArray(writeBuffer, 8), + // Simple Field (milliseconds) + writeSimpleField( + "milliseconds", + milliseconds, + writeUnsignedInt(writeBuffer, 16), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); writeBuffer.popContext("TwoOctetBinaryTime"); @@ -75,10 +75,8 @@ public int getLengthInBits() { TwoOctetBinaryTime _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - // Array field - if (value != null) { - lengthInBits += 8 * value.length; - } + // Simple field (milliseconds) + lengthInBits += 16; return lengthInBits; } @@ -94,14 +92,16 @@ public static TwoOctetBinaryTime staticParse(ReadBuffer readBuffer) throws Parse PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - byte[] value = - readBuffer.readByteArray( - "value", Math.toIntExact(2), WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); + int milliseconds = + readSimpleField( + "milliseconds", + readUnsignedInt(readBuffer, 16), + WithOption.WithByteOrder(ByteOrder.LITTLE_ENDIAN)); readBuffer.closeContext("TwoOctetBinaryTime"); // Create the instance TwoOctetBinaryTime _twoOctetBinaryTime; - _twoOctetBinaryTime = new TwoOctetBinaryTime(value); + _twoOctetBinaryTime = new TwoOctetBinaryTime(milliseconds); return _twoOctetBinaryTime; } @@ -114,12 +114,12 @@ public boolean equals(Object o) { return false; } TwoOctetBinaryTime that = (TwoOctetBinaryTime) o; - return (getValue() == that.getValue()) && true; + return (getMilliseconds() == that.getMilliseconds()) && true; } @Override public int hashCode() { - return Objects.hash(getValue()); + return Objects.hash(getMilliseconds()); } @Override diff --git a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TypeIdentification.java b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TypeIdentification.java index 85721849897..c246c43108b 100644 --- a/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TypeIdentification.java +++ b/plc4j/drivers/iec-60870/src/main/generated/org/apache/plc4x/java/iec608705104/readwrite/TypeIdentification.java @@ -18,79 +18,83 @@ */ package org.apache.plc4x.java.iec608705104.readwrite; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; // Code generated by code-generation. DO NOT EDIT. public enum TypeIdentification { - NOT_USED((short) 0x00), - SINGLE_POINT_INFORMATION((short) 0x01), - SINGLE_POINT_INFORMATION_WITH_TIME_TAG((short) 0x02), - DOUBLE_POINT_INFORMATION((short) 0x03), - DOUBLE_POINT_INFORMATION_WITH_TIME_TAG((short) 0x04), - STEP_POSITION_INFORMATION((short) 0x05), - STEP_POSITION_INFORMATION_WITH_TIME_TAG((short) 0x06), - BITSTRING_OF_32_BIT((short) 0x07), - BITSTRING_OF_32_BIT_WITH_TIME_TAG((short) 0x08), - MEASURED_VALUE_NORMALISED_VALUE((short) 0x09), - MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG((short) 0x0A), - MEASURED_VALUE_SCALED_VALUE((short) 0x0B), - MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG((short) 0x0C), - MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER((short) 0x0D), - MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG((short) 0x0E), - INTEGRATED_TOTALS((short) 0x0F), - INTEGRATED_TOTALS_WITH_TIME_TAG((short) 0x10), - EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG((short) 0x11), - PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG((short) 0x12), - PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG((short) 0x13), - PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION((short) 0x14), - MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR((short) 0x15), - SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A((short) 0x1E), - DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A((short) 0x1F), - STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A((short) 0x20), - BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A((short) 0x21), - MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A((short) 0x22), - MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A((short) 0x23), - MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A((short) 0x24), - INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A((short) 0x25), - EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A((short) 0x26), - PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A((short) 0x27), - PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A((short) 0x28), - SINGLE_COMMAND((short) 0x2D), - DOUBLE_COMMAND((short) 0x2E), - REGULATING_STEP_COMMAND((short) 0x2F), - SET_POINT_COMMAND_NORMALISED_VALUE((short) 0x30), - SET_POINT_COMMAND_SCALED_VALUE((short) 0x31), - SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER((short) 0x32), - BITSTRING_32_BIT_COMMAND((short) 0x33), - SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3A), - DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3B), - REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3C), - MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3D), - MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3E), - MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3F), - BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x40), - END_OF_INITIALISATION((short) 0x46), - INTERROGATION_COMMAND((short) 0x64), - COUNTER_INTERROGATION_COMMAND((short) 0x65), - READ_COMMAND((short) 0x66), - CLOCK_SYNCHRONISATION_COMMAND((short) 0x67), - TEST_COMMAND((short) 0x68), - RESET_PROCESS_COMMAND((short) 0x69), - DELAY_ACQUISITION_COMMAND((short) 0x6A), - TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x6B), - PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE((short) 0x6E), - PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE((short) 0x6F), - PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER((short) 0x70), - PARAMETER_ACTIVATION((short) 0x71), - FILE_READY((short) 0x78), - SECTION_READY((short) 0x79), - CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION((short) 0x7A), - LAST_SECTION_LAST_SEGMENT((short) 0x7B), - ACK_FILE_ACK_SECTION((short) 0x7C), - SEGMENT((short) 0x7D), - DIRECTORY((short) 0x7E); + NOT_USED((short) 0x00, (byte) 0), + SINGLE_POINT_INFORMATION((short) 0x01, (byte) 0), + SINGLE_POINT_INFORMATION_WITH_TIME_TAG((short) 0x02, (byte) 3), + DOUBLE_POINT_INFORMATION((short) 0x03, (byte) 0), + DOUBLE_POINT_INFORMATION_WITH_TIME_TAG((short) 0x04, (byte) 3), + STEP_POSITION_INFORMATION((short) 0x05, (byte) 0), + STEP_POSITION_INFORMATION_WITH_TIME_TAG((short) 0x06, (byte) 3), + BITSTRING_OF_32_BIT((short) 0x07, (byte) 0), + BITSTRING_OF_32_BIT_WITH_TIME_TAG((short) 0x08, (byte) 3), + MEASURED_VALUE_NORMALISED_VALUE((short) 0x09, (byte) 0), + MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG((short) 0x0A, (byte) 3), + MEASURED_VALUE_SCALED_VALUE((short) 0x0B, (byte) 0), + MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG((short) 0x0C, (byte) 3), + MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER((short) 0x0D, (byte) 0), + MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG((short) 0x0E, (byte) 3), + INTEGRATED_TOTALS((short) 0x0F, (byte) 0), + INTEGRATED_TOTALS_WITH_TIME_TAG((short) 0x10, (byte) 3), + EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG((short) 0x11, (byte) 3), + PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG((short) 0x12, (byte) 3), + PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG((short) 0x13, (byte) 3), + PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION((short) 0x14, (byte) 0), + MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR((short) 0x15, (byte) 0), + SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A((short) 0x1E, (byte) 7), + DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A((short) 0x1F, (byte) 7), + STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A((short) 0x20, (byte) 7), + BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A((short) 0x21, (byte) 7), + MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A((short) 0x22, (byte) 7), + MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A((short) 0x23, (byte) 7), + MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A((short) 0x24, (byte) 7), + INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A((short) 0x25, (byte) 7), + EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A((short) 0x26, (byte) 7), + PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A((short) 0x27, (byte) 7), + PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A( + (short) 0x28, (byte) 7), + SINGLE_COMMAND((short) 0x2D, (byte) 0), + DOUBLE_COMMAND((short) 0x2E, (byte) 0), + REGULATING_STEP_COMMAND((short) 0x2F, (byte) 0), + SET_POINT_COMMAND_NORMALISED_VALUE((short) 0x30, (byte) 0), + SET_POINT_COMMAND_SCALED_VALUE((short) 0x31, (byte) 0), + SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER((short) 0x32, (byte) 0), + BITSTRING_32_BIT_COMMAND((short) 0x33, (byte) 0), + SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3A, (byte) 7), + DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3B, (byte) 7), + REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3C, (byte) 7), + MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3D, (byte) 7), + MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x3E, (byte) 7), + MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A( + (short) 0x3F, (byte) 7), + BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x40, (byte) 7), + END_OF_INITIALISATION((short) 0x46, (byte) 0), + INTERROGATION_COMMAND((short) 0x64, (byte) 0), + COUNTER_INTERROGATION_COMMAND((short) 0x65, (byte) 0), + READ_COMMAND((short) 0x66, (byte) 0), + CLOCK_SYNCHRONISATION_COMMAND((short) 0x67, (byte) 0), + TEST_COMMAND((short) 0x68, (byte) 0), + RESET_PROCESS_COMMAND((short) 0x69, (byte) 0), + DELAY_ACQUISITION_COMMAND((short) 0x6A, (byte) 0), + TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A((short) 0x6B, (byte) 0), + PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE((short) 0x6E, (byte) 0), + PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE((short) 0x6F, (byte) 0), + PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER((short) 0x70, (byte) 0), + PARAMETER_ACTIVATION((short) 0x71, (byte) 0), + FILE_READY((short) 0x78, (byte) 0), + SECTION_READY((short) 0x79, (byte) 0), + CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION((short) 0x7A, (byte) 0), + LAST_SECTION_LAST_SEGMENT((short) 0x7B, (byte) 0), + ACK_FILE_ACK_SECTION((short) 0x7C, (byte) 0), + SEGMENT((short) 0x7D, (byte) 0), + DIRECTORY((short) 0x7E, (byte) 7); private static final Map map; static { @@ -101,15 +105,40 @@ public enum TypeIdentification { } private final short value; + private final byte numTimeBytes; - TypeIdentification(short value) { + TypeIdentification(short value, byte numTimeBytes) { this.value = value; + this.numTimeBytes = numTimeBytes; } public short getValue() { return value; } + public byte getNumTimeBytes() { + return numTimeBytes; + } + + public static TypeIdentification firstEnumForFieldNumTimeBytes(byte fieldValue) { + for (TypeIdentification _val : TypeIdentification.values()) { + if (_val.getNumTimeBytes() == fieldValue) { + return _val; + } + } + return null; + } + + public static List enumsForFieldNumTimeBytes(byte fieldValue) { + List _values = new ArrayList<>(); + for (TypeIdentification _val : TypeIdentification.values()) { + if (_val.getNumTimeBytes() == fieldValue) { + _values.add(_val); + } + } + return _values; + } + public static TypeIdentification enumForValue(short value) { return map.get(value); } diff --git a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/Iec60870514PlcDriver.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/Iec60870514PlcDriver.java index 00a5caf4413..eade9094ee8 100644 --- a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/Iec60870514PlcDriver.java +++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/Iec60870514PlcDriver.java @@ -50,16 +50,6 @@ public String getProtocolName() { return "IEC 60870-5-104"; } - @Override - protected boolean canRead() { - return true; - } - - @Override - protected boolean canWrite() { - return true; - } - @Override protected boolean canSubscribe() { return true; diff --git a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/messages/Iec608705104PlcSubscriptionEvent.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/messages/Iec608705104PlcSubscriptionEvent.java new file mode 100644 index 00000000000..3ce735b3c19 --- /dev/null +++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/messages/Iec608705104PlcSubscriptionEvent.java @@ -0,0 +1,43 @@ +/* + * 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.java.iec608705104.readwrite.messages; + +import org.apache.plc4x.java.api.model.PlcTag; +import org.apache.plc4x.java.api.value.PlcValue; +import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionEvent; +import org.apache.plc4x.java.spi.messages.utils.ResponseItem; + +import java.time.Instant; +import java.util.Map; + +public class Iec608705104PlcSubscriptionEvent extends DefaultPlcSubscriptionEvent { + + private final Map tags; + public Iec608705104PlcSubscriptionEvent(Instant timestamp, Map tags, Map> values) { + super(timestamp, values); + this.tags = tags; + } + + @Override + public PlcTag getTag(String name) { + return tags.get(name); + } + +} diff --git a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/model/Iec608705104SubscriptionHandle.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/model/Iec608705104SubscriptionHandle.java new file mode 100644 index 00000000000..b9c456ed1a6 --- /dev/null +++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/model/Iec608705104SubscriptionHandle.java @@ -0,0 +1,77 @@ +/* + * 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 + * + * https://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.java.iec608705104.readwrite.model; + +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.plc4x.java.iec608705104.readwrite.tag.Iec608705104Tag; +import org.apache.plc4x.java.spi.messages.PlcSubscriber; +import org.apache.plc4x.java.spi.model.DefaultPlcSubscriptionHandle; + +public class Iec608705104SubscriptionHandle extends DefaultPlcSubscriptionHandle { + + private final Iec608705104Tag tag; + + public Iec608705104SubscriptionHandle(PlcSubscriber plcSubscriber, Iec608705104Tag tag) { + super(plcSubscriber); + this.tag = tag; + } + + public Iec608705104Tag getTag() { + return tag; + } + + /*public boolean matches(Iec608705104Tag address) { + return tag.matchesGroupAddress(address); + }*/ + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof Iec608705104SubscriptionHandle)) { + return false; + } + + Iec608705104SubscriptionHandle that = (Iec608705104SubscriptionHandle) o; + + return new EqualsBuilder() + .append(getTag(), that.getTag()) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .appendSuper(super.hashCode()) + .append(getTag()) + .toHashCode(); + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("tag", tag) + .toString(); + } + +} diff --git a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104Protocol.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104Protocol.java index 0131790d867..2f5552c2cfd 100644 --- a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104Protocol.java +++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104Protocol.java @@ -20,20 +20,34 @@ package org.apache.plc4x.java.iec608705104.readwrite.protocol; 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.PlcSubscriptionHandle; +import org.apache.plc4x.java.api.types.PlcResponseCode; +import org.apache.plc4x.java.api.value.PlcValue; import org.apache.plc4x.java.iec608705104.readwrite.*; import org.apache.plc4x.java.iec608705104.readwrite.configuration.Iec608705014Configuration; +import org.apache.plc4x.java.iec608705104.readwrite.messages.Iec608705104PlcSubscriptionEvent; +import org.apache.plc4x.java.iec608705104.readwrite.model.Iec608705104SubscriptionHandle; +import org.apache.plc4x.java.iec608705104.readwrite.tag.Iec608705104Tag; import org.apache.plc4x.java.spi.ConversationContext; import org.apache.plc4x.java.spi.Plc4xProtocolBase; import org.apache.plc4x.java.spi.configuration.HasConfiguration; +import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionEvent; +import org.apache.plc4x.java.spi.messages.DefaultPlcSubscriptionResponse; import org.apache.plc4x.java.spi.messages.PlcBrowser; import org.apache.plc4x.java.spi.messages.PlcSubscriber; +import org.apache.plc4x.java.spi.messages.utils.ResponseItem; +import org.apache.plc4x.java.spi.model.DefaultPlcConsumerRegistration; +import org.apache.plc4x.java.spi.model.DefaultPlcSubscriptionTag; import org.apache.plc4x.java.spi.transaction.RequestTransactionManager; -import java.time.Duration; -import java.util.Collection; +import java.time.*; +import java.time.format.DateTimeFormatter; +import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; public class Iec608705104Protocol extends Plc4xProtocolBase implements HasConfiguration, PlcSubscriber, PlcBrowser { @@ -41,9 +55,14 @@ public class Iec608705104Protocol extends Plc4xProtocolBase implements Has private Iec608705014Configuration configuration; private final RequestTransactionManager tm; + private int unconfirmedPackets; + + private final Map> consumers = new ConcurrentHashMap<>(); + public Iec608705104Protocol() { // We're starting with allowing only one message in-flight. this.tm = new RequestTransactionManager(1); + unconfirmedPackets = 0; } @Override @@ -89,20 +108,126 @@ public void close(ConversationContext context) { @Override protected void decode(ConversationContext context, APDU msg) throws Exception { + // When receiving a test-frame, send the expected response. if (msg instanceof APDUUFormatTestFrameActivation) { APDUUFormatTestFrameConfirmation testFrameConfirmation = new APDUUFormatTestFrameConfirmation(0x83); context.sendToWire(testFrameConfirmation); } + // When receiving incoming data, process that. + else if (msg instanceof APDUIFormat){ + APDUIFormat apduiFormat = (APDUIFormat) msg; + + // Make sure we send an acknowledgement packet every few packets. + unconfirmedPackets++; + if(unconfirmedPackets >= 8) { + // Confirm the reception of the packet. + APDUSFormat confirmPacket = new APDUSFormat(0x01, apduiFormat.getReceiveSequenceNo() + 1); + context.sendToWire(confirmPacket); + unconfirmedPackets = 0; + } + + // Handle the incoming messages. + processData(apduiFormat.getAsdu()); + } } @Override - public PlcConsumerRegistration register(Consumer consumer, Collection handles) { - return null; + public CompletableFuture subscribe(PlcSubscriptionRequest subscriptionRequest) { + Map> values = new HashMap<>(); + for (String tagName : subscriptionRequest.getTagNames()) { + final DefaultPlcSubscriptionTag tag = (DefaultPlcSubscriptionTag) subscriptionRequest.getTag(tagName); + if (!(tag.getTag() instanceof Iec608705104Tag)) { + values.put(tagName, new ResponseItem<>(PlcResponseCode.INVALID_ADDRESS, null)); + } else { + values.put(tagName, new ResponseItem<>(PlcResponseCode.OK, + new Iec608705104SubscriptionHandle(this, (Iec608705104Tag) tag.getTag()))); + } + } + return CompletableFuture.completedFuture( + new DefaultPlcSubscriptionResponse(subscriptionRequest, values)); } @Override - public void unregister(PlcConsumerRegistration registration) { + public PlcConsumerRegistration register(Consumer consumer, Collection collection) { + final DefaultPlcConsumerRegistration consumerRegistration = + new DefaultPlcConsumerRegistration(this, consumer, collection.toArray(new PlcSubscriptionHandle[0])); + consumers.put(consumerRegistration, consumer); + return consumerRegistration; + } + @Override + public void unregister(PlcConsumerRegistration plcConsumerRegistration) { + DefaultPlcConsumerRegistration consumerRegistration = (DefaultPlcConsumerRegistration) plcConsumerRegistration; + consumers.remove(consumerRegistration); + } + + protected void processData(ASDU asdu) { + int asduAddress = asdu.getAsduAddressField(); + for (InformationObject informationObject : asdu.getInformationObjects()) { + int objectAddress = informationObject.getAddress(); + Iec608705104Tag tag = new Iec608705104Tag(asduAddress, objectAddress); + PlcValue plcValue = Iec608705104TagParser.parseTag(informationObject, asdu.getTypeIdentification()); + + // If this is a datatype that comes with time-information, parse this + // and use this instead of the generated timestamp. + LocalDateTime eventTime; + if (informationObject instanceof InformationObjectWithTreeByteTime) { + InformationObjectWithTreeByteTime informationObjectWithTreeByteTime = (InformationObjectWithTreeByteTime) informationObject; + ThreeOctetBinaryTime time = informationObjectWithTreeByteTime.getCp24Time2a(); + eventTime = convertCp24Time2aToCalendar(time); + } else if (informationObject instanceof InformationObjectWithSevenByteTime) { + InformationObjectWithSevenByteTime informationObjectWithSevenByteTime = (InformationObjectWithSevenByteTime) informationObject; + SevenOctetBinaryTime time = informationObjectWithSevenByteTime.getCp56Time2a(); + eventTime = convertCp56Time2aToCalendar(time); + } else { + eventTime = LocalDateTime.now(); + } + + // Send the event out to all subscribed listeners. + publishEvent(eventTime, tag, plcValue); + } + } + + protected LocalDateTime convertCp24Time2aToCalendar(ThreeOctetBinaryTime cp24Time2) { + LocalDateTime now = LocalDateTime.now(); + return LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), now.getHour(), cp24Time2.getMinutes(), cp24Time2.getMilliseconds() / 1000, (cp24Time2.getMilliseconds() % 1000) * 1000000); + } + + protected LocalDateTime convertCp56Time2aToCalendar(SevenOctetBinaryTime cp56Time2) { + // It seems that the time is sent in UTC, so we need to convert that into our local timezone. + TimeZone localTimeZone = TimeZone.getDefault(); + Duration localTimeZoneOffsetFromUTC = Duration.ofMillis(localTimeZone.getRawOffset()); + if(cp56Time2.getDaylightSaving()) { + Duration daylightSavingOffset = Duration.ofMillis(localTimeZone.getDSTSavings()); + localTimeZoneOffsetFromUTC = localTimeZoneOffsetFromUTC.plus(daylightSavingOffset); + } + return LocalDateTime.of(2000 + cp56Time2.getYear(), cp56Time2.getMonth(), cp56Time2.getDay(), cp56Time2.getHour() , cp56Time2.getMinutes(), cp56Time2.getMilliseconds() / 1000, (cp56Time2.getMilliseconds() % 1000) * 1000000) + .minus(localTimeZoneOffsetFromUTC); + } + + protected void publishEvent(LocalDateTime timeStamp, Iec608705104Tag tag, PlcValue plcValue) { + // Create a subscription event from the input. + final PlcSubscriptionEvent event = new Iec608705104PlcSubscriptionEvent( + timeStamp.atZone(ZoneId.systemDefault()).toInstant(), + Collections.singletonMap(tag.toString(), tag), + Collections.singletonMap(tag.toString(), + new ResponseItem<>(PlcResponseCode.OK, plcValue))); + + // Try sending the subscription event to all listeners. + for (Map.Entry> entry : consumers.entrySet()) { + final DefaultPlcConsumerRegistration registration = entry.getKey(); + final Consumer consumer = entry.getValue(); + // Only if the current data point matches the subscription, publish the event to it. + for (PlcSubscriptionHandle handle : registration.getSubscriptionHandles()) { + if (handle instanceof Iec608705104SubscriptionHandle) { + Iec608705104SubscriptionHandle subscriptionHandle = (Iec608705104SubscriptionHandle) handle; + // Check if the subscription matches this current event. + if (/*subscriptionHandle.getTag().matchesGroupAddress(groupAddress)*/true) { + consumer.accept(event); + } + } + } + } } } diff --git a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104TagParser.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104TagParser.java new file mode 100644 index 00000000000..711b7c50042 --- /dev/null +++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104TagParser.java @@ -0,0 +1,526 @@ +/* + * 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.java.iec608705104.readwrite.protocol; + +import org.apache.commons.lang3.NotImplementedException; +import org.apache.plc4x.java.api.value.PlcValue; +import org.apache.plc4x.java.iec608705104.readwrite.*; +import org.apache.plc4x.java.spi.values.*; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +public class Iec608705104TagParser { + + public static PlcValue parseTag(InformationObject informationObject, TypeIdentification typeIdentification) { + switch (typeIdentification) { + case NOT_USED: { + break; + } + case SINGLE_POINT_INFORMATION: { + InformationObjectWithoutTime_SINGLE_POINT_INFORMATION castedObject = (InformationObjectWithoutTime_SINGLE_POINT_INFORMATION) informationObject; + return processSinglePointInformation(castedObject.getSiq()); + } + case DOUBLE_POINT_INFORMATION: { + InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION castedObject = (InformationObjectWithoutTime_DOUBLE_POINT_INFORMATION) informationObject; + return processDoublePointInformation(castedObject.getDiq()); + } + case STEP_POSITION_INFORMATION: { + InformationObjectWithoutTime_STEP_POSITION_INFORMATION castedObject = (InformationObjectWithoutTime_STEP_POSITION_INFORMATION) informationObject; + PlcValueAdapter plcValue = processValueWithTransientStateIndication(castedObject.getVti()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case BITSTRING_OF_32_BIT: { + InformationObjectWithoutTime_BITSTRING_OF_32_BIT castedObject = (InformationObjectWithoutTime_BITSTRING_OF_32_BIT) informationObject; + PlcValueAdapter plcValue = processBinaryStateInformation(castedObject.getBsi()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_NORMALISED_VALUE: { + InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE castedObject = (InformationObjectWithoutTime_MEASURED_VALUE_NORMALISED_VALUE) informationObject; + PlcValueAdapter plcValue = processNormalizedValue(castedObject.getNva()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_SCALED_VALUE: { + InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE castedObject = (InformationObjectWithoutTime_MEASURED_VALUE_SCALED_VALUE) informationObject; + PlcValueAdapter plcValue = processScaledValue(castedObject.getSva()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER: { + InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER castedObject = (InformationObjectWithoutTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) informationObject; + PlcValueAdapter plcValue = PlcREAL.of(castedObject.getValue()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case INTEGRATED_TOTALS: { + InformationObjectWithoutTime_INTEGRATED_TOTALS castedObject = (InformationObjectWithoutTime_INTEGRATED_TOTALS) informationObject; + return processBinaryCounterReading(castedObject.getBcr()); + } + case PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION: { + InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION castedObject = (InformationObjectWithoutTime_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION) informationObject; + PlcValueAdapter plcValue = processStatusChangeDetection(castedObject.getScd()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR: { + InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR castedObject = (InformationObjectWithoutTime_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR) informationObject; + return processNormalizedValue(castedObject.getNva()); + } + case SINGLE_COMMAND: { + InformationObjectWithoutTime_SINGLE_COMMAND castedObject = (InformationObjectWithoutTime_SINGLE_COMMAND) informationObject; + return processSingleCommand(castedObject.getSco()); + } + case DOUBLE_COMMAND: { + InformationObjectWithoutTime_DOUBLE_COMMAND castedObject = (InformationObjectWithoutTime_DOUBLE_COMMAND) informationObject; + return processDoubleCommand(castedObject.getDco()); + } + case REGULATING_STEP_COMMAND: { + InformationObjectWithoutTime_REGULATING_STEP_COMMAND castedObject = (InformationObjectWithoutTime_REGULATING_STEP_COMMAND) informationObject; + return processRegulatingStepCommand(castedObject.getRco()); + } + case SET_POINT_COMMAND_NORMALISED_VALUE: { + InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE castedObject = (InformationObjectWithoutTime_SET_POINT_COMMAND_NORMALISED_VALUE) informationObject; + PlcValueAdapter plcValue = processNormalizedValue(castedObject.getNva()); + processQualifierOfSetPointCommand(castedObject.getQos(), plcValue); + return plcValue; + } + case SET_POINT_COMMAND_SCALED_VALUE: { + InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE castedObject = (InformationObjectWithoutTime_SET_POINT_COMMAND_SCALED_VALUE) informationObject; + PlcValueAdapter plcValue = processScaledValue(castedObject.getSva()); + processQualifierOfSetPointCommand(castedObject.getQos(), plcValue); + return plcValue; + } + case SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER: { + InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER castedObject = (InformationObjectWithoutTime_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER) informationObject; + PlcValueAdapter plcValue = PlcREAL.of(castedObject.getValue()); + processQualifierOfSetPointCommand(castedObject.getQos(), plcValue); + return plcValue; + } + case BITSTRING_32_BIT_COMMAND: { + InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND castedObject = (InformationObjectWithoutTime_BITSTRING_32_BIT_COMMAND) informationObject; + return processBinaryStateInformation(castedObject.getBsi()); + } + case END_OF_INITIALISATION: { + InformationObjectWithoutTime_END_OF_INITIALISATION castedObject = (InformationObjectWithoutTime_END_OF_INITIALISATION) informationObject; + return processCauseOfInitialization(castedObject.getCoi()); + } + case INTERROGATION_COMMAND: { + InformationObjectWithoutTime_INTERROGATION_COMMAND castedObject = (InformationObjectWithoutTime_INTERROGATION_COMMAND) informationObject; + return processQualifierOfInterrogation(castedObject.getQoi()); + } + case COUNTER_INTERROGATION_COMMAND: { + InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND castedObject = (InformationObjectWithoutTime_COUNTER_INTERROGATION_COMMAND) informationObject; + return processQualifierOfCounterInterrogationCommand(castedObject.getQcc()); + } + case READ_COMMAND: { + InformationObjectWithoutTime_READ_COMMAND castedObject = (InformationObjectWithoutTime_READ_COMMAND) informationObject; + // TODO: Implement + break; + } + case CLOCK_SYNCHRONISATION_COMMAND: { + InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND castedObject = (InformationObjectWithoutTime_CLOCK_SYNCHRONISATION_COMMAND) informationObject; + return processSevenOctetBinaryTime(castedObject.getCp56Time2a()); + } + case TEST_COMMAND: { + InformationObjectWithoutTime_TEST_COMMAND castedObject = (InformationObjectWithoutTime_TEST_COMMAND) informationObject; + return processFixedTestBitPatternTwoOctet(castedObject.getFbp()); + } + case RESET_PROCESS_COMMAND: { + InformationObjectWithoutTime_RESET_PROCESS_COMMAND castedObject = (InformationObjectWithoutTime_RESET_PROCESS_COMMAND) informationObject; + return processQualifierOfResetProcessCommand(castedObject.getQrp()); + } + case DELAY_ACQUISITION_COMMAND: { + InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND castedObject = (InformationObjectWithoutTime_DELAY_ACQUISITION_COMMAND) informationObject; + return processTwoOctetBinaryTime(castedObject.getCp16Time2a()); + } + case PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE: { + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE castedObject = (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE) informationObject; + PlcValueAdapter plcValue = processNormalizedValue(castedObject.getNva()); + processQualifierOfParameterOfMeasuredValues(castedObject.getQpm(), plcValue); + return plcValue; + } + case PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE: { + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE castedObject = (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE) informationObject; + PlcValueAdapter plcValue = processScaledValue(castedObject.getSva()); + processQualifierOfParameterOfMeasuredValues(castedObject.getQpm(), plcValue); + return plcValue; + } + case PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER: { + InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER castedObject = (InformationObjectWithoutTime_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER) informationObject; + PlcValueAdapter plcValue = PlcREAL.of(castedObject.getValue()); + processQualifierOfParameterOfMeasuredValues(castedObject.getQpm(), plcValue); + return plcValue; + } + case PARAMETER_ACTIVATION: { + InformationObjectWithoutTime_PARAMETER_ACTIVATION castedObject = (InformationObjectWithoutTime_PARAMETER_ACTIVATION) informationObject; + return processQualifierOfParameterActivation(castedObject.getQpa()); + } + case FILE_READY: { + InformationObjectWithoutTime_FILE_READY castedObject = (InformationObjectWithoutTime_FILE_READY) informationObject; + // TODO: Implement + break; + } + case SECTION_READY: { + InformationObjectWithoutTime_SECTION_READY castedObject = (InformationObjectWithoutTime_SECTION_READY) informationObject; + // TODO: Implement + break; + } + case CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION: { + InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION castedObject = (InformationObjectWithoutTime_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION) informationObject; + // TODO: Implement + break; + } + case LAST_SECTION_LAST_SEGMENT: { + InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT castedObject = (InformationObjectWithoutTime_LAST_SECTION_LAST_SEGMENT) informationObject; + // TODO: Implement + break; + } + case ACK_FILE_ACK_SECTION: { + InformationObjectWithoutTime_ACK_FILE_ACK_SECTION castedObject = (InformationObjectWithoutTime_ACK_FILE_ACK_SECTION) informationObject; + // TODO: Implement + break; + } + case SEGMENT: { + InformationObjectWithoutTime_SEGMENT castedObject = (InformationObjectWithoutTime_SEGMENT) informationObject; + // TODO: Implement + break; + } + case DIRECTORY: { + InformationObjectWithoutTime_DIRECTORY castedObject = (InformationObjectWithoutTime_DIRECTORY) informationObject; + // TODO: Implement + break; + } + + + + + case MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE castedObject = (InformationObjectWithTreeByteTime_MEASURED_VALUE_SCALED_VALUE) informationObject; + PlcValueAdapter plcValue = processScaledValue(castedObject.getSva()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case SINGLE_POINT_INFORMATION_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION castedObject = (InformationObjectWithTreeByteTime_SINGLE_POINT_INFORMATION) informationObject; + return processSinglePointInformation(castedObject.getSiq()); + } + case DOUBLE_POINT_INFORMATION_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION castedObject = (InformationObjectWithTreeByteTime_DOUBLE_POINT_INFORMATION) informationObject; + return processDoublePointInformation(castedObject.getDiq()); + } + case STEP_POSITION_INFORMATION_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION castedObject = (InformationObjectWithTreeByteTime_STEP_POSITION_INFORMATION) informationObject; + PlcValueAdapter plcValue = processValueWithTransientStateIndication(castedObject.getVti()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case BITSTRING_OF_32_BIT_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT castedObject = (InformationObjectWithTreeByteTime_BITSTRING_OF_32_BIT) informationObject; + PlcValueAdapter plcValue = processBinaryStateInformation(castedObject.getBsi()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE castedObject = (InformationObjectWithTreeByteTime_MEASURED_VALUE_NORMALIZED_VALUE) informationObject; + PlcValueAdapter plcValue = processNormalizedValue(castedObject.getNva()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER castedObject = (InformationObjectWithTreeByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER) informationObject; + PlcValueAdapter plcValue = PlcREAL.of(castedObject.getValue()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case INTEGRATED_TOTALS_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_INTEGRATED_TOTALS castedObject = (InformationObjectWithTreeByteTime_INTEGRATED_TOTALS) informationObject; + return processBinaryCounterReading(castedObject.getBcr()); + } + case EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT castedObject = (InformationObjectWithTreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT) informationObject; + // TODO: Implement + break; + } + case PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT castedObject = (InformationObjectWithTreeByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT) informationObject; + // TODO: Implement + break; + } + case PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG: { + InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT castedObject = (InformationObjectWithTreeByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT) informationObject; + // TODO: Implement + break; + } + + + case SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION castedObject = (InformationObjectWithSevenByteTime_SINGLE_POINT_INFORMATION ) informationObject; + return processSinglePointInformation(castedObject.getSiq()); + } + case DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION castedObject = (InformationObjectWithSevenByteTime_DOUBLE_POINT_INFORMATION ) informationObject; + return processDoublePointInformation(castedObject.getDiq()); + } + case STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION castedObject = (InformationObjectWithSevenByteTime_STEP_POSITION_INFORMATION ) informationObject; + PlcValueAdapter plcValue = processValueWithTransientStateIndication(castedObject.getVti()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT castedObject = (InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT ) informationObject; + PlcValueAdapter plcValue = processBinaryStateInformation(castedObject.getBsi()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE castedObject = (InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE ) informationObject; + PlcValueAdapter plcValue = processNormalizedValue(castedObject.getNva()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE castedObject = (InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE ) informationObject; + PlcValueAdapter plcValue = processScaledValue(castedObject.getSva()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER castedObject = (InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER ) informationObject; + PlcValueAdapter plcValue = PlcREAL.of(castedObject.getValue()); + processQualityDescriptor(castedObject.getQds(), plcValue); + return plcValue; + } + case INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_INTEGRATED_TOTALS castedObject = (InformationObjectWithSevenByteTime_INTEGRATED_TOTALS ) informationObject; + return processBinaryCounterReading(castedObject.getBcr()); + } + case EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT castedObject = (InformationObjectWithSevenByteTime_EVENT_OF_PROTECTION_EQUIPMENT ) informationObject; + // TODO: Implement + break; + } + case PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT castedObject = (InformationObjectWithSevenByteTime_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT ) informationObject; + // TODO: Implement + break; + } + case PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT castedObject = (InformationObjectWithSevenByteTime_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT ) informationObject; + // TODO: Implement + break; + } + /*case SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_SINGLE_COMMAND castedObject = (InformationObjectWithSevenByteTime_SINGLE_COMMAND ) informationObject; + } + case DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_DOUBLE_COMMAND castedObject = (InformationObjectWithSevenByteTime_DOUBLE_COMMAND ) informationObject; + } + case REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_REGULATING_STEP_COMMAND castedObject = (InformationObjectWithSevenByteTime_REGULATING_STEP_COMMAND ) informationObject; + } + case MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE_COMMAND castedObject = (InformationObjectWithSevenByteTime_MEASURED_VALUE_NORMALISED_VALUE_COMMAND ) informationObject; + } + case MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE_COMMAND castedObject = (InformationObjectWithSevenByteTime_MEASURED_VALUE_SCALED_VALUE_COMMAND ) informationObject; + } + case MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND castedObject = (InformationObjectWithSevenByteTime_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND ) informationObject; + } + case BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT_COMMAND castedObject = (InformationObjectWithSevenByteTime_BITSTRING_OF_32_BIT_COMMAND ) informationObject; + } + case TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A: { + InformationObjectWithSevenByteTime_TEST_COMMAND castedObject = (InformationObjectWithSevenByteTime_TEST_COMMAND ) informationObject; + }*/ + + } + throw new NotImplementedException("Datatype " + typeIdentification.name() + " not implemented."); + } + + public static PlcValueAdapter processSinglePointInformation(SinglePointInformation siq) { + PlcBOOL plcValue = PlcBOOL.of(siq.getStausOn()); + plcValue.addMetaData("invalid", PlcBOOL.of(siq.getInvalid())); + plcValue.addMetaData("notTopical", PlcBOOL.of(siq.getNotTopical())); + plcValue.addMetaData("substituted", PlcBOOL.of(siq.getSubstituted())); + plcValue.addMetaData("blocked", PlcBOOL.of(siq.getBlocked())); + return plcValue; + } + + public static PlcValueAdapter processDoublePointInformation(DoublePointInformation diq) { + boolean firstPoint = (diq.getDpiCode() & 0x01) != 0; + boolean secondPoint = (diq.getDpiCode() & 0x02) != 0; + PlcList plcValue = new PlcList(Arrays.asList(PlcBOOL.of(firstPoint), PlcBOOL.of(secondPoint))); + plcValue.addMetaData("invalid", PlcBOOL.of(diq.getInvalid())); + plcValue.addMetaData("notTopical", PlcBOOL.of(diq.getNotTopical())); + plcValue.addMetaData("substituted", PlcBOOL.of(diq.getSubstituted())); + plcValue.addMetaData("blocked", PlcBOOL.of(diq.getBlocked())); + return plcValue; + } + + public static PlcValueAdapter processBinaryStateInformation(BinaryStateInformation bsi) { + // TODO: Implement + return null; + } + + public static PlcValueAdapter processStatusChangeDetection(StatusChangeDetection scd) { + // TODO: Implement + return null; + } + + public static void processQualityDescriptor(QualityDescriptor qds, PlcValueAdapter plcValue) { + plcValue.addMetaData("invalid", PlcBOOL.of(qds.getInvalid())); + plcValue.addMetaData("notTopical", PlcBOOL.of(qds.getNotTopical())); + plcValue.addMetaData("substituted", PlcBOOL.of(qds.getSubstituted())); + plcValue.addMetaData("blocked", PlcBOOL.of(qds.getBlocked())); + plcValue.addMetaData("overflow", PlcBOOL.of(qds.getOverflow())); + } + + public static PlcValueAdapter processValueWithTransientStateIndication(ValueWithTransientStateIndication vti) { + PlcValueAdapter plcValue = PlcUSINT.of(vti.getValue()); + plcValue.addMetaData("transientState", PlcBOOL.of(vti.getTransientState())); + return plcValue; + } + + public static PlcValueAdapter processNormalizedValue(NormalizedValue nva) { + return PlcUINT.of(nva.getValue()); + } + + public static PlcValueAdapter processScaledValue(ScaledValue sva) { + return PlcUINT.of(sva.getValue()); + } + + public static PlcValueAdapter processBinaryCounterReading(BinaryCounterReading bcr) { + PlcValueAdapter plcValue = PlcUDINT.of(bcr.getCounterValue()); + plcValue.addMetaData("counterValid", PlcBOOL.of(bcr.getCounterValid())); + plcValue.addMetaData("counterAdjusted", PlcBOOL.of(bcr.getCounterAdjusted())); + plcValue.addMetaData("carry", PlcBOOL.of(bcr.getCarry())); + plcValue.addMetaData("sequenceNumber", PlcUSINT.of(bcr.getSequenceNumber())); + return plcValue; + } + + public static PlcValueAdapter processSingleEventOfProtectionEquipment(SingleEventOfProtectionEquipment sep) { + PlcValueAdapter plcValue = PlcUSINT.of(sep.getEventState()); + plcValue.addMetaData("invalid", PlcBOOL.of(sep.getInvalid())); + plcValue.addMetaData("notTopical", PlcBOOL.of(sep.getNotTopical())); + plcValue.addMetaData("substituted", PlcBOOL.of(sep.getSubstituted())); + plcValue.addMetaData("blocked", PlcBOOL.of(sep.getBlocked())); + plcValue.addMetaData("elapsedTimeInvalid", PlcBOOL.of(sep.getElapsedTimeInvalid())); + return plcValue; + } + + public static PlcValueAdapter processOutputCircuitInformation(OutputCircuitInformation oci) { + Map plcValues = new HashMap<>(); + plcValues.put("stateOfOperationPhaseL3", PlcBOOL.of(oci.getStateOfOperationPhaseL3())); + plcValues.put("stateOfOperationPhaseL2", PlcBOOL.of(oci.getStateOfOperationPhaseL2())); + plcValues.put("stateOfOperationPhaseL1", PlcBOOL.of(oci.getStateOfOperationPhaseL1())); + plcValues.put("generalStartOfOperation", PlcBOOL.of(oci.getGeneralStartOfOperation())); + return new PlcStruct(plcValues); + } + + public static void processQualityDescriptorForPointsOfProtectionEquipment(QualityDescriptorForPointsOfProtectionEquipment qdp, PlcValueAdapter plcValue) { + plcValue.addMetaData("invalid", PlcBOOL.of(qdp.getInvalid())); + plcValue.addMetaData("notTopical", PlcBOOL.of(qdp.getNotTopical())); + plcValue.addMetaData("substituted", PlcBOOL.of(qdp.getSubstituted())); + plcValue.addMetaData("blocked", PlcBOOL.of(qdp.getBlocked())); + plcValue.addMetaData("elapsedTimeInvalid", PlcBOOL.of(qdp.getElapsedTimeInvalid())); + } + + public static PlcValueAdapter processSingleCommand(SingleCommand sco) { + return null; + } + + public static PlcValueAdapter processDoubleCommand(DoubleCommand dco) { + return null; + } + + public static PlcValueAdapter processRegulatingStepCommand(RegulatingStepCommand rco) { + return null; + } + + public static PlcValueAdapter processSevenOctetBinaryTime(SevenOctetBinaryTime cp56Time2a) { + // TODO: Implement ... + return null; + } + + public static PlcValueAdapter processThreeOctetBinaryTime(ThreeOctetBinaryTime cp24Time2a) { + // TODO: Implement ... + return null; + } + + public static PlcValueAdapter processTwoOctetBinaryTime(TwoOctetBinaryTime cp16Time2a) { + // TODO: Implement ... + return null; + } + + public static PlcValueAdapter processQualifierOfInterrogation(QualifierOfInterrogation qoi) { + return PlcUINT.of(qoi.getQualifierOfCommand()); + } + + public static PlcValueAdapter processQualifierOfCounterInterrogationCommand(QualifierOfCounterInterrogationCommand qcc) { + return new PlcStruct(Map.of( + "freeze", PlcUSINT.of(qcc.getFreeze()), + "request", PlcUSINT.of(qcc.getRequest()))); + } + + public static PlcValueAdapter processQualifierOfParameterOfMeasuredValues(QualifierOfParameterOfMeasuredValues qpm, PlcValueAdapter plcValue) { + plcValue.addMetaData("parameterInOperation", PlcBOOL.of(qpm.getParameterInOperation())); + plcValue.addMetaData("localParameterChange", PlcBOOL.of(qpm.getLocalParameterChange())); + plcValue.addMetaData("kindOfParameter", PlcUSINT.of(qpm.getKindOfParameter())); + return plcValue; + } + + public static PlcValueAdapter processQualifierOfParameterActivation(QualifierOfParameterActivation qpa) { + return PlcUINT.of(qpa.getQualifier()); + } + + public static PlcValueAdapter processQualifierOfCommand(QualifierOfCommand qoc) { + PlcUSINT plcValue = PlcUSINT.of(qoc.getQualifier()); + plcValue.addMetaData("select", PlcBOOL.of(qoc.getSelect())); + return plcValue; + } + + public static PlcValueAdapter processQualifierOfResetProcessCommand(QualifierOfResetProcessCommand qrp) { + return PlcUINT.of(qrp.getQualifier()); + } + + public static void processQualifierOfSetPointCommand(QualifierOfSetPointCommand qos, PlcValueAdapter plcValue) { + plcValue.addMetaData("select", PlcBOOL.of(qos.getSelect())); + plcValue.addMetaData("qualifier", PlcUSINT.of(qos.getQualifier())); + } + + // Skipping the file handles ... + + public static PlcValueAdapter processCauseOfInitialization(CauseOfInitialization coi) { + PlcUSINT plcValue = PlcUSINT.of(coi.getQualifier()); + plcValue.addMetaData("select", PlcBOOL.of(coi.getSelect())); + return plcValue; + } + + public static PlcValueAdapter processFixedTestBitPatternTwoOctet(FixedTestBitPatternTwoOctet fbp) { + return PlcWORD.of(fbp.getPattern()); + } + +} diff --git a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104Tag.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104Tag.java new file mode 100644 index 00000000000..8c486472566 --- /dev/null +++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104Tag.java @@ -0,0 +1,77 @@ +/* + * 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.java.iec608705104.readwrite.tag; + +import org.apache.plc4x.java.api.model.ArrayInfo; +import org.apache.plc4x.java.api.model.PlcTag; +import org.apache.plc4x.java.api.types.PlcValueType; + +import java.util.List; + +public class Iec608705104Tag implements PlcTag { + + /*private static final Pattern IEC_60870_5_104_ADDRESS = + Pattern.compile("^(?(\\d|\\*))|((?(\\d|\\*))/(?(\\d|\\*)))/((?(\\d|\\*))\\.(?(\\d|\\*))\\.(?(\\d|\\*))))"); + */ + + private final int adsuAddress; + private final int objectAddress; + + /*public static boolean matches(String tagString) { + return IEC_60870_5_104_ADDRESS.matcher(tagString).matches(); + }*/ + + public Iec608705104Tag(int adsuAddress, int objectAddress) { + this.adsuAddress = adsuAddress; + this.objectAddress = objectAddress; + } + + public int getAdsuAddress() { + return adsuAddress; + } + + public int getObjectAddress() { + return objectAddress; + } + + @Override + public String getAddressString() { + return null; + } + + @Override + public PlcValueType getPlcValueType() { + return PlcValueType.NULL; + } + + @Override + public List getArrayInfo() { + return PlcTag.super.getArrayInfo(); + } + + @Override + public String toString() { + return "Iec608705104Tag{" + + "adsuAddress=" + adsuAddress + + ", objectAddress=" + objectAddress + + '}'; + } + +} diff --git a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104TagHandler.java b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104TagHandler.java index 27d8004dc84..4de3be91db6 100644 --- a/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104TagHandler.java +++ b/plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/tag/Iec608705104TagHandler.java @@ -27,7 +27,7 @@ public class Iec608705104TagHandler implements PlcTagHandler { @Override public PlcTag parseTag(String tagAddress) { - return null; + return new Iec608705104Tag(0, 0); } @Override diff --git a/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/IEC608705104ParserSerializerTest.java b/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/IEC608705104ParserSerializerTest.java index ae236265f44..a2d0cf460de 100644 --- a/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/IEC608705104ParserSerializerTest.java +++ b/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/IEC608705104ParserSerializerTest.java @@ -23,7 +23,7 @@ public class IEC608705104ParserSerializerTest extends ParserSerializerTestsuiteRunner { public IEC608705104ParserSerializerTest() { - super("/protocols/iec608705104/IEC-60870-5-104.xml", true); + super("/protocols/iec608705104/IEC-60870-5-104.xml"); } } diff --git a/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/ManualTest.java b/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/ManualTest.java index 9aee98e764a..a974b129c12 100644 --- a/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/ManualTest.java +++ b/plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/ManualTest.java @@ -21,6 +21,8 @@ import org.apache.plc4x.java.api.PlcConnection; import org.apache.plc4x.java.api.PlcDriverManager; +import org.apache.plc4x.java.api.model.PlcTag; +import org.apache.plc4x.java.iec608705104.readwrite.tag.Iec608705104Tag; import java.util.concurrent.CompletableFuture; @@ -32,6 +34,17 @@ public static void main(String[] args) throws Exception { shutdown.complete(null); })); try (PlcConnection plcConnection = PlcDriverManager.getDefault().getConnectionManager().getConnection("iec-60870-5-104://192.168.23.10")) { + if(!plcConnection.getMetadata().canSubscribe()) { + throw new RuntimeException("Subscription not supported"); + } + + plcConnection.subscriptionRequestBuilder().addChangeOfStateTagAddress("all", "*").addPreRegisteredConsumer("all", plcSubscriptionEvent -> { + for (String tagName : plcSubscriptionEvent.getTagNames()) { + Iec608705104Tag tag = (Iec608705104Tag) plcSubscriptionEvent.getTag(tagName); + System.out.println(String.format("TS: %s, Addr: %d:%d, Value; %s", plcSubscriptionEvent.getTimestamp().toString(), tag.getAdsuAddress(), tag.getObjectAddress(), plcSubscriptionEvent.getPlcValue(tagName).toString())); + } + }).build().execute(); + // Wait till shutdown. shutdown.get(); } diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcNull.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcNull.java index dadeca66aa8..895423f97b1 100644 --- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcNull.java +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcNull.java @@ -30,6 +30,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -271,6 +272,21 @@ public PlcValue getValue(String key) { return null; } + @Override + public Set getMetaDataNames() { + return Collections.emptySet(); + } + + @Override + public boolean hasMetaData(String key) { + return false; + } + + @Override + public PlcValue getMetaData(String key) { + return null; + } + @Override public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.pushContext("PlcNull"); diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcValueAdapter.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcValueAdapter.java index 37d4e3e8e5c..62ec4105e41 100644 --- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcValueAdapter.java +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcValueAdapter.java @@ -28,12 +28,12 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public abstract class PlcValueAdapter implements PlcValue, Serializable { + private Map metaData = Collections.emptyMap(); + @Override public Object getObject() { return null; @@ -268,4 +268,26 @@ public PlcValue getValue(String key) { throw new PlcIncompatibleDatatypeException(""); } + public void addMetaData(String key, PlcValue value) { + if (metaData.isEmpty()) { + metaData = new HashMap<>(); + } + metaData.put(key, value); + } + + @Override + public Set getMetaDataNames() { + return metaData.keySet(); + } + + @Override + public boolean hasMetaData(String key) { + return metaData.containsKey(key); + } + + @Override + public PlcValue getMetaData(String key) { + return metaData.get(key); + } + } diff --git a/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec b/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec index 942ff8bd2c4..133c6902521 100644 --- a/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec +++ b/protocols/iec-60870/src/main/resources/protocols/iec608705104/iec-60870-5-104.mspec @@ -79,272 +79,286 @@ [simple CauseOfTransmission causeOfTransmission ] [simple uint 8 originatorAddress ] [simple uint 16 asduAddressField ] - [array InformationObject('typeIdentification') informationObjects count 'numberOfObjects' ] + [array InformationObject('typeIdentification', 'typeIdentification.numTimeBytes') informationObjects count 'numberOfObjects' ] ] // http://ijlalhaider.pbworks.com/w/file/fetch/64131148/Practical%20Modern%20SCADA%20Protocols.pdf -[discriminatedType InformationObject(TypeIdentification typeIdentification) byteOrder='LITTLE_ENDIAN' +[discriminatedType InformationObject(TypeIdentification typeIdentification, uint 7 numTimeByte) byteOrder='LITTLE_ENDIAN' [simple uint 24 address] - [typeSwitch typeIdentification - ['SINGLE_POINT_INFORMATION' *_SINGLE_POINT_INFORMATION - [simple SinglePointInformation siq] - ] - ['SINGLE_POINT_INFORMATION_WITH_TIME_TAG' *_SINGLE_POINT_INFORMATION_WITH_TIME_TAG - [simple SinglePointInformation siq] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['DOUBLE_POINT_INFORMATION' *_DOUBLE_POINT_INFORMATION - [simple DoublePointInformation diq] - ] - ['DOUBLE_POINT_INFORMATION_WITH_TIME_TAG' *_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG - [simple DoublePointInformation diq] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['STEP_POSITION_INFORMATION' *_STEP_POSITION_INFORMATION - [simple ValueWithTransientStateIndication vti] - [simple QualityDescriptor qds] - ] - ['STEP_POSITION_INFORMATION_WITH_TIME_TAG' *_STEP_POSITION_INFORMATION_WITH_TIME_TAG - [simple ValueWithTransientStateIndication vti] - [simple QualityDescriptor qds] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['BITSTRING_OF_32_BIT' *_BITSTRING_OF_32_BIT - [simple BinaryStateInformation bsi] - [simple QualityDescriptor qds] - ] - ['BITSTRING_OF_32_BIT_WITH_TIME_TAG' *_BITSTRING_OF_32_BIT_WITH_TIME_TAG - [simple BinaryStateInformation bsi] - [simple QualityDescriptor qds] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['MEASURED_VALUE_NORMALISED_VALUE' *_MEASURED_VALUE_NORMALISED_VALUE - [simple NormalizedValue nva] - [simple QualityDescriptor qds] - ] - ['MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG' *_MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG - [simple NormalizedValue nva] - [simple QualityDescriptor qds] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['MEASURED_VALUE_SCALED_VALUE' *_MEASURED_VALUE_SCALED_VALUE - [simple ScaledValue sva] - [simple QualityDescriptor qds] - ] - ['MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG' *_MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG - [simple ScaledValue sva] - [simple QualityDescriptor qds] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER - [simple float 32 value] - [simple QualityDescriptor qds] - ] - ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG - [simple float 32 value] - [simple QualityDescriptor qds] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['INTEGRATED_TOTALS' *_INTEGRATED_TOTALS - [simple BinaryCounterReading bcr] - ] - ['INTEGRATED_TOTALS_WITH_TIME_TAG' *_INTEGRATED_TOTALS_WITH_TIME_TAG - [simple BinaryCounterReading bcr] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG' *_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - [simple TwoOctetBinaryTime cp16Time2a] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG' *_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - [simple SingleEventOfProtectionEquipment sep] - [simple QualityDescriptorForPointsOfProtectionEquipment qdp] - [simple TwoOctetBinaryTime cp16Time2a] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG' *_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG - [simple OutputCircuitInformation oci] - [simple QualityDescriptorForPointsOfProtectionEquipment qdp] - [simple TwoOctetBinaryTime cp16Time2a] - [simple ThreeOctetBinaryTime cp24Time2a] - ] - ['PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION' *_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION - [simple StatusChangeDetection scd] - [simple QualityDescriptor qds] - ] - ['MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR' *_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR - [simple NormalizedValue nva] - ] - ['SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A' *_SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - [simple SinglePointInformation siq] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A' *_DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A - [simple DoublePointInformation diq] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A' *_STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A - [simple ValueWithTransientStateIndication vti] - [simple QualityDescriptor qds] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A' *_BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A - [simple BinaryStateInformation bsi] - [simple QualityDescriptor qds] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A - [simple NormalizedValue nva] - [simple QualityDescriptor qds] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A - [simple ScaledValue sva] - [simple QualityDescriptor qds] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A - [simple float 32 value] - [simple QualityDescriptor qds] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A' *_INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A - [simple BinaryCounterReading bcr] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A' *_EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - [simple TwoOctetBinaryTime cp16Time2a] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A' *_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - [simple SingleEventOfProtectionEquipment sep] - [simple QualityDescriptorForPointsOfProtectionEquipment qdp] - [simple TwoOctetBinaryTime cp16Time2a] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A' *_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A - [simple OutputCircuitInformation oci] - [simple QualityDescriptorForPointsOfProtectionEquipment qdp] - [simple TwoOctetBinaryTime cp16Time2a] - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['SINGLE_COMMAND' *_SINGLE_COMMAND - [simple SingleCommand sco] - ] - ['DOUBLE_COMMAND' *_DOUBLE_COMMAND - [simple DoubleCommand dco] - ] - ['REGULATING_STEP_COMMAND' *_REGULATING_STEP_COMMAND - [simple RegulatingStepCommand rco] - ] - ['SET_POINT_COMMAND_NORMALISED_VALUE' *_SET_POINT_COMMAND_NORMALISED_VALUE - [simple NormalizedValue nva] - [simple QualifierOfSetPointCommand qos] - ] - ['SET_POINT_COMMAND_SCALED_VALUE' *_SET_POINT_COMMAND_SCALED_VALUE - [simple ScaledValue sva] - [simple QualifierOfSetPointCommand qos] - ] - ['SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER' *_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER - [simple float 32 value] - [simple QualifierOfSetPointCommand qos] - ] - ['BITSTRING_32_BIT_COMMAND' *_BITSTRING_32_BIT_COMMAND - [simple BinaryStateInformation bsi] - ] - ['SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['END_OF_INITIALISATION' *_END_OF_INITIALISATION - [simple CauseOfInitialization coi] - ] - ['INTERROGATION_COMMAND' *_INTERROGATION_COMMAND - [simple QualifierOfInterrogation qoi] - ] - ['COUNTER_INTERROGATION_COMMAND' *_COUNTER_INTERROGATION_COMMAND - [simple QualifierOfCounterInterrogationCommand qcc] - ] - ['READ_COMMAND' *_READ_COMMAND - ] - ['CLOCK_SYNCHRONISATION_COMMAND' *_CLOCK_SYNCHRONISATION_COMMAND - [simple SevenOctetBinaryTime cp56Time2a] - ] - ['TEST_COMMAND' *_TEST_COMMAND - [simple FixedTestBitPatternTwoOctet fbp] - ] - ['RESET_PROCESS_COMMAND' *_RESET_PROCESS_COMMAND - [simple QualifierOfResetProcessCommand qrp] - ] - ['DELAY_ACQUISITION_COMMAND' *_DELAY_ACQUISITION_COMMAND - [simple TwoOctetBinaryTime cp16Time2a] - ] - ['TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A - ] - ['PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE' *_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE - [simple NormalizedValue nva] - [simple QualifierOfParameterOfMeasuredValues qpm] - ] - ['PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE' *_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE - [simple ScaledValue sva] - [simple QualifierOfParameterOfMeasuredValues qpm] - ] - ['PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER' *_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER - [simple float 32 value] - [simple QualifierOfParameterOfMeasuredValues qpm] - ] - ['PARAMETER_ACTIVATION' *_PARAMETER_ACTIVATION - [simple QualifierOfParameterActivation qpa] - ] - ['FILE_READY' *_FILE_READY - [simple NameOfFile nof] - [simple LengthOfFile lof] - [simple FileReadyQualifier frq] - ] - ['SECTION_READY' *_SECTION_READY - [simple NameOfFile nof] - [simple NameOfSection nos] - [simple LengthOfFile lof] - [simple SectionReadyQualifier srq] - ] - ['CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION' *_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION - [simple NameOfFile nof] - [simple NameOfSection nos] - [simple SelectAndCallQualifier scq] - ] - ['LAST_SECTION_LAST_SEGMENT' *_LAST_SECTION_LAST_SEGMENT - [simple NameOfFile nof] - [simple NameOfSection nos] - [simple LastSectionOrSegmentQualifier lsq] - [simple Checksum chs] - ] - ['ACK_FILE_ACK_SECTION' *_ACK_FILE_ACK_SECTION - [simple NameOfFile nof] - [simple NameOfSection nos] - [simple AcknowledgeFileOrSectionQualifier afq] - ] - ['SEGMENT' *_SEGMENT - [simple NameOfFile nof] - [simple NameOfSection nos] - [simple LengthOfSegment los] -// NOF + NOS + LOS + *segment* - ] - ['DIRECTORY' *_DIRECTORY - [simple NameOfFile nof] - [simple LengthOfFile lof] - [simple StatusOfFile sof] - [simple SevenOctetBinaryTime cp56Time2a] + [typeSwitch numTimeByte + ['0' *WithoutTime + [typeSwitch typeIdentification + ['SINGLE_POINT_INFORMATION' *_SINGLE_POINT_INFORMATION + [simple SinglePointInformation siq] + ] + ['DOUBLE_POINT_INFORMATION' *_DOUBLE_POINT_INFORMATION + [simple DoublePointInformation diq] + ] + ['STEP_POSITION_INFORMATION' *_STEP_POSITION_INFORMATION + [simple ValueWithTransientStateIndication vti] + [simple QualityDescriptor qds] + ] + ['BITSTRING_OF_32_BIT' *_BITSTRING_OF_32_BIT + [simple BinaryStateInformation bsi] + [simple QualityDescriptor qds] + ] + ['MEASURED_VALUE_NORMALISED_VALUE' *_MEASURED_VALUE_NORMALISED_VALUE + [simple NormalizedValue nva] + [simple QualityDescriptor qds] + ] + ['MEASURED_VALUE_SCALED_VALUE' *_MEASURED_VALUE_SCALED_VALUE + [simple ScaledValue sva] + [simple QualityDescriptor qds] + ] + ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + [simple float 32 value] + [simple QualityDescriptor qds] + ] + ['INTEGRATED_TOTALS' *_INTEGRATED_TOTALS + [simple BinaryCounterReading bcr] + ] + ['PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION' *_PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION + [simple StatusChangeDetection scd] + [simple QualityDescriptor qds] + ] + ['MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR' *_MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR + [simple NormalizedValue nva] + ] + ['SINGLE_COMMAND' *_SINGLE_COMMAND + [simple SingleCommand sco] + ] + ['DOUBLE_COMMAND' *_DOUBLE_COMMAND + [simple DoubleCommand dco] + ] + ['REGULATING_STEP_COMMAND' *_REGULATING_STEP_COMMAND + [simple RegulatingStepCommand rco] + ] + ['SET_POINT_COMMAND_NORMALISED_VALUE' *_SET_POINT_COMMAND_NORMALISED_VALUE + [simple NormalizedValue nva] + [simple QualifierOfSetPointCommand qos] + ] + ['SET_POINT_COMMAND_SCALED_VALUE' *_SET_POINT_COMMAND_SCALED_VALUE + [simple ScaledValue sva] + [simple QualifierOfSetPointCommand qos] + ] + ['SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER' *_SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER + [simple float 32 value] + [simple QualifierOfSetPointCommand qos] + ] + ['BITSTRING_32_BIT_COMMAND' *_BITSTRING_32_BIT_COMMAND + [simple BinaryStateInformation bsi] + ] + ['END_OF_INITIALISATION' *_END_OF_INITIALISATION + [simple CauseOfInitialization coi] + ] + ['INTERROGATION_COMMAND' *_INTERROGATION_COMMAND + [simple QualifierOfInterrogation qoi] + ] + ['COUNTER_INTERROGATION_COMMAND' *_COUNTER_INTERROGATION_COMMAND + [simple QualifierOfCounterInterrogationCommand qcc] + ] + ['READ_COMMAND' *_READ_COMMAND + ] + ['CLOCK_SYNCHRONISATION_COMMAND' *_CLOCK_SYNCHRONISATION_COMMAND + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['TEST_COMMAND' *_TEST_COMMAND + [simple FixedTestBitPatternTwoOctet fbp] + ] + ['RESET_PROCESS_COMMAND' *_RESET_PROCESS_COMMAND + [simple QualifierOfResetProcessCommand qrp] + ] + ['DELAY_ACQUISITION_COMMAND' *_DELAY_ACQUISITION_COMMAND + [simple TwoOctetBinaryTime cp16Time2a] + ] + ['PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE' *_PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE + [simple NormalizedValue nva] + [simple QualifierOfParameterOfMeasuredValues qpm] + ] + ['PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE' *_PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE + [simple ScaledValue sva] + [simple QualifierOfParameterOfMeasuredValues qpm] + ] + ['PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER' *_PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER + [simple float 32 value] + [simple QualifierOfParameterOfMeasuredValues qpm] + ] + ['PARAMETER_ACTIVATION' *_PARAMETER_ACTIVATION + [simple QualifierOfParameterActivation qpa] + ] + ['FILE_READY' *_FILE_READY + [simple NameOfFile nof] + [simple LengthOfFile lof] + [simple FileReadyQualifier frq] + ] + ['SECTION_READY' *_SECTION_READY + [simple NameOfFile nof] + [simple NameOfSection nos] + [simple LengthOfFile lof] + [simple SectionReadyQualifier srq] + ] + ['CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION' *_CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION + [simple NameOfFile nof] + [simple NameOfSection nos] + [simple SelectAndCallQualifier scq] + ] + ['LAST_SECTION_LAST_SEGMENT' *_LAST_SECTION_LAST_SEGMENT + [simple NameOfFile nof] + [simple NameOfSection nos] + [simple LastSectionOrSegmentQualifier lsq] + [simple Checksum chs] + ] + ['ACK_FILE_ACK_SECTION' *_ACK_FILE_ACK_SECTION + [simple NameOfFile nof] + [simple NameOfSection nos] + [simple AcknowledgeFileOrSectionQualifier afq] + ] + ['SEGMENT' *_SEGMENT + [simple NameOfFile nof] + [simple NameOfSection nos] + [simple LengthOfSegment los] + // NOF + NOS + LOS + *segment* + ] + ['DIRECTORY' *_DIRECTORY + [simple NameOfFile nof] + [simple LengthOfFile lof] + [simple StatusOfFile sof] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ] + ] + ['3' *WithTreeByteTime + [abstract ThreeOctetBinaryTime cp24Time2a] + [typeSwitch typeIdentification + ['SINGLE_POINT_INFORMATION_WITH_TIME_TAG' *_SINGLE_POINT_INFORMATION + [simple SinglePointInformation siq] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['DOUBLE_POINT_INFORMATION_WITH_TIME_TAG' *_DOUBLE_POINT_INFORMATION + [simple DoublePointInformation diq] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['STEP_POSITION_INFORMATION_WITH_TIME_TAG' *_STEP_POSITION_INFORMATION + [simple ValueWithTransientStateIndication vti] + [simple QualityDescriptor qds] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['BITSTRING_OF_32_BIT_WITH_TIME_TAG' *_BITSTRING_OF_32_BIT + [simple BinaryStateInformation bsi] + [simple QualityDescriptor qds] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG' *_MEASURED_VALUE_NORMALIZED_VALUE + [simple NormalizedValue nva] + [simple QualityDescriptor qds] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG' *_MEASURED_VALUE_SCALED_VALUE + [simple ScaledValue sva] + [simple QualityDescriptor qds] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + [simple float 32 value] + [simple QualityDescriptor qds] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['INTEGRATED_TOTALS_WITH_TIME_TAG' *_INTEGRATED_TOTALS + [simple BinaryCounterReading bcr] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG' *_EVENT_OF_PROTECTION_EQUIPMENT + [simple TwoOctetBinaryTime cp16Time2a] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG' *_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + [simple SingleEventOfProtectionEquipment sep] + [simple QualityDescriptorForPointsOfProtectionEquipment qdp] + [simple TwoOctetBinaryTime cp16Time2a] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ['PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG' *_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + [simple OutputCircuitInformation oci] + [simple QualityDescriptorForPointsOfProtectionEquipment qdp] + [simple TwoOctetBinaryTime cp16Time2a] + [simple ThreeOctetBinaryTime cp24Time2a] + ] + ] + ] + ['7' *WithSevenByteTime + [abstract SevenOctetBinaryTime cp56Time2a] + [typeSwitch typeIdentification + ['SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A' *_SINGLE_POINT_INFORMATION + [simple SinglePointInformation siq] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A' *_DOUBLE_POINT_INFORMATION + [simple DoublePointInformation diq] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A' *_STEP_POSITION_INFORMATION + [simple ValueWithTransientStateIndication vti] + [simple QualityDescriptor qds] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A' *_BITSTRING_OF_32_BIT + [simple BinaryStateInformation bsi] + [simple QualityDescriptor qds] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_NORMALISED_VALUE + [simple NormalizedValue nva] + [simple QualityDescriptor qds] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SCALED_VALUE + [simple ScaledValue sva] + [simple QualityDescriptor qds] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER + [simple float 32 value] + [simple QualityDescriptor qds] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A' *_INTEGRATED_TOTALS + [simple BinaryCounterReading bcr] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A' *_EVENT_OF_PROTECTION_EQUIPMENT + [simple TwoOctetBinaryTime cp16Time2a] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A' *_PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT + [simple SingleEventOfProtectionEquipment sep] + [simple QualityDescriptorForPointsOfProtectionEquipment qdp] + [simple TwoOctetBinaryTime cp16Time2a] + [simple SevenOctetBinaryTime cp56Time2a] + ] + ['PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A' *_PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT + [simple OutputCircuitInformation oci] + [simple QualityDescriptorForPointsOfProtectionEquipment qdp] + [simple TwoOctetBinaryTime cp16Time2a] + [simple SevenOctetBinaryTime cp56Time2a] + ] + /*['SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_SINGLE_COMMAND + ] + ['DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_DOUBLE_COMMAND + ] + ['REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_REGULATING_STEP_COMMAND + ] + ['MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_NORMALISED_VALUE_COMMAND + ] + ['MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SCALED_VALUE_COMMAND + ] + ['MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND + ] + ['BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_BITSTRING_OF_32_BIT_COMMAND + ] + ['TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A' *_TEST_COMMAND + ]*/ + ] ] ] ] @@ -493,20 +507,32 @@ // CP56Time2a [type SevenOctetBinaryTime byteOrder='LITTLE_ENDIAN' - [array byte value count '7'] - // TODO: Implement + [simple uint 16 milliseconds ] + [simple bit invalid ] + [simple bit substituted ] + [simple uint 6 minutes ] + [simple bit daylightSaving] + [reserved uint 2 '0x00' ] + [simple uint 5 hour ] + [simple uint 3 dayOfWeek ] + [simple uint 5 day ] + [reserved uint 4 '0x00' ] + [simple uint 4 month ] + [reserved uint 1 '0x00' ] + [simple uint 7 year ] ] // CP24Time2a [type ThreeOctetBinaryTime byteOrder='LITTLE_ENDIAN' - [array byte value count '3'] - // TODO: Implement + [simple uint 16 milliseconds] + [simple bit invalid ] + [reserved uint 1 '0x00' ] + [simple uint 6 minutes ] ] // CP16Time2av [type TwoOctetBinaryTime byteOrder='LITTLE_ENDIAN' - [array byte value count '2'] - // TODO: Implement + [simple uint 16 milliseconds] ] ////////////////////////////////////////////////////////// @@ -627,74 +653,74 @@ [simple uint 16 pattern] // TODO: Possibly bit-string ] -[enum uint 8 TypeIdentification - ['0x00' NOT_USED ] - ['0x01' SINGLE_POINT_INFORMATION ] - ['0x02' SINGLE_POINT_INFORMATION_WITH_TIME_TAG ] - ['0x03' DOUBLE_POINT_INFORMATION ] - ['0x04' DOUBLE_POINT_INFORMATION_WITH_TIME_TAG ] - ['0x05' STEP_POSITION_INFORMATION ] - ['0x06' STEP_POSITION_INFORMATION_WITH_TIME_TAG ] - ['0x07' BITSTRING_OF_32_BIT ] - ['0x08' BITSTRING_OF_32_BIT_WITH_TIME_TAG ] - ['0x09' MEASURED_VALUE_NORMALISED_VALUE ] - ['0x0A' MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG ] - ['0x0B' MEASURED_VALUE_SCALED_VALUE ] - ['0x0C' MEASURED_VALUE_SCALED_VALUE_WIT_TIME_TAG ] - ['0x0D' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER ] - ['0x0E' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG ] - ['0x0F' INTEGRATED_TOTALS ] - ['0x10' INTEGRATED_TOTALS_WITH_TIME_TAG ] - ['0x11' EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG ] - ['0x12' PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG ] - ['0x13' PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG ] - ['0x14' PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION ] - ['0x15' MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR ] - ['0x1E' SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A ] - ['0x1F' DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A ] - ['0x20' STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A ] - ['0x21' BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A ] - ['0x22' MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A ] - ['0x23' MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A ] - ['0x24' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A ] - ['0x25' INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A ] - ['0x26' EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A ] - ['0x27' PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A ] - ['0x28' PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A] - ['0x2D' SINGLE_COMMAND ] - ['0x2E' DOUBLE_COMMAND ] - ['0x2F' REGULATING_STEP_COMMAND ] - ['0x30' SET_POINT_COMMAND_NORMALISED_VALUE ] - ['0x31' SET_POINT_COMMAND_SCALED_VALUE ] - ['0x32' SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER ] - ['0x33' BITSTRING_32_BIT_COMMAND ] - ['0x3A' SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x3B' DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x3C' REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x3D' MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x3E' MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x3F' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x40' BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x46' END_OF_INITIALISATION ] - ['0x64' INTERROGATION_COMMAND ] - ['0x65' COUNTER_INTERROGATION_COMMAND ] - ['0x66' READ_COMMAND ] - ['0x67' CLOCK_SYNCHRONISATION_COMMAND ] - ['0x68' TEST_COMMAND ] - ['0x69' RESET_PROCESS_COMMAND ] - ['0x6A' DELAY_ACQUISITION_COMMAND ] - ['0x6B' TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A ] - ['0x6E' PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE ] - ['0x6F' PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE ] - ['0x70' PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER ] - ['0x71' PARAMETER_ACTIVATION ] - ['0x78' FILE_READY ] - ['0x79' SECTION_READY ] - ['0x7A' CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION ] - ['0x7B' LAST_SECTION_LAST_SEGMENT ] - ['0x7C' ACK_FILE_ACK_SECTION ] - ['0x7D' SEGMENT ] - ['0x7E' DIRECTORY ] +[enum uint 8 TypeIdentification (uint 7 numTimeBytes) + ['0x00' NOT_USED ['0' ]] + ['0x01' SINGLE_POINT_INFORMATION ['0' ]] + ['0x02' SINGLE_POINT_INFORMATION_WITH_TIME_TAG ['3' ]] + ['0x03' DOUBLE_POINT_INFORMATION ['0' ]] + ['0x04' DOUBLE_POINT_INFORMATION_WITH_TIME_TAG ['3' ]] + ['0x05' STEP_POSITION_INFORMATION ['0' ]] + ['0x06' STEP_POSITION_INFORMATION_WITH_TIME_TAG ['3' ]] + ['0x07' BITSTRING_OF_32_BIT ['0' ]] + ['0x08' BITSTRING_OF_32_BIT_WITH_TIME_TAG ['3' ]] + ['0x09' MEASURED_VALUE_NORMALISED_VALUE ['0' ]] + ['0x0A' MEASURED_VALUE_NORMALIZED_VALUE_WITH_TIME_TAG ['3' ]] + ['0x0B' MEASURED_VALUE_SCALED_VALUE ['0' ]] + ['0x0C' MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG ['3' ]] + ['0x0D' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER ['0' ]] + ['0x0E' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG ['3' ]] + ['0x0F' INTEGRATED_TOTALS ['0' ]] + ['0x10' INTEGRATED_TOTALS_WITH_TIME_TAG ['3' ]] + ['0x11' EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG ['3' ]] + ['0x12' PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG ['3' ]] + ['0x13' PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG ['3' ]] + ['0x14' PACKED_SINGLE_POINT_INFORMATION_WITH_STATUS_CHANGE_DETECTION ['0' ]] + ['0x15' MEASURED_VALUE_NORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR ['0' ]] + ['0x1E' SINGLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x1F' DOUBLE_POINT_INFORMATION_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x20' STEP_POSITION_INFORMATION_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x21' BITSTRING_OF_32_BIT_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x22' MEASURED_VALUE_NORMALISED_VALUE_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x23' MEASURED_VALUE_SCALED_VALUE_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x24' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x25' INTEGRATED_TOTALS_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x26' EVENT_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x27' PACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x28' PACKED_OUTPUT_CIRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT_WITH_TIME_TAG_CP56TIME2A['7' ]] + ['0x2D' SINGLE_COMMAND ['0' ]] + ['0x2E' DOUBLE_COMMAND ['0' ]] + ['0x2F' REGULATING_STEP_COMMAND ['0' ]] + ['0x30' SET_POINT_COMMAND_NORMALISED_VALUE ['0' ]] + ['0x31' SET_POINT_COMMAND_SCALED_VALUE ['0' ]] + ['0x32' SET_POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER ['0' ]] + ['0x33' BITSTRING_32_BIT_COMMAND ['0' ]] + ['0x3A' SINGLE_COMMAND_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x3B' DOUBLE_COMMAND_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x3C' REGULATING_STEP_COMMAND_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x3D' MEASURED_VALUE_NORMALISED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x3E' MEASURED_VALUE_SCALED_VALUE_COMMAND_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x3F' MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER_COMMAND_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x40' BITSTRING_OF_32_BIT_COMMAND_WITH_TIME_TAG_CP56TIME2A ['7' ]] + ['0x46' END_OF_INITIALISATION ['0' ]] + ['0x64' INTERROGATION_COMMAND ['0' ]] + ['0x65' COUNTER_INTERROGATION_COMMAND ['0' ]] + ['0x66' READ_COMMAND ['0' ]] + ['0x67' CLOCK_SYNCHRONISATION_COMMAND ['0' ]] + ['0x68' TEST_COMMAND ['0' ]] + ['0x69' RESET_PROCESS_COMMAND ['0' ]] + ['0x6A' DELAY_ACQUISITION_COMMAND ['0' ]] + ['0x6B' TEST_COMMAND_WITH_TIME_TAG_CP56TIME2A ['0' ]] + ['0x6E' PARAMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE ['0' ]] + ['0x6F' PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE ['0' ]] + ['0x70' PARAMETER_OF_MEASURED_VALUES_SHORT_FLOATING_POINT_NUMBER ['0' ]] + ['0x71' PARAMETER_ACTIVATION ['0' ]] + ['0x78' FILE_READY ['0' ]] + ['0x79' SECTION_READY ['0' ]] + ['0x7A' CALL_DIRECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION ['0' ]] + ['0x7B' LAST_SECTION_LAST_SEGMENT ['0' ]] + ['0x7C' ACK_FILE_ACK_SECTION ['0' ]] + ['0x7D' SEGMENT ['0' ]] + ['0x7E' DIRECTORY ['7' ]] ] [enum uint 6 CauseOfTransmission diff --git a/protocols/iec-60870/src/test/resources/protocols/iec608705104/IEC-60870-5-104.xml b/protocols/iec-60870/src/test/resources/protocols/iec608705104/IEC-60870-5-104.xml index 2cb5036da0f..a1058196e84 100644 --- a/protocols/iec-60870/src/test/resources/protocols/iec608705104/IEC-60870-5-104.xml +++ b/protocols/iec-60870/src/test/resources/protocols/iec608705104/IEC-60870-5-104.xml @@ -145,13 +145,15 @@
0
- - - - 20 - - - + + + + + 20 + + + + @@ -193,14 +195,16 @@
0
- - - - - 0 - - - + + + + + + 0 + + + + @@ -242,13 +246,15 @@
0
- - - - 20 - - - + + + + + 20 + + + + @@ -290,13 +296,15 @@
0
- - - - 20 - - - + + + + + 20 + + + + @@ -326,63 +334,71 @@
1
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + +
2
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + +
3
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + +
4
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + + @@ -412,63 +428,71 @@
1
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + +
2
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + +
3
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + +
4
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + + @@ -510,87 +534,95 @@
1
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -620,83 +652,91 @@
1
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -726,83 +766,91 @@
1
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -832,83 +880,91 @@
1
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -938,67 +994,75 @@
1
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + +
2
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + +
3
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + +
4
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + @@ -1028,83 +1092,139 @@
11
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -1134,83 +1254,139 @@
11
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -1240,107 +1416,163 @@
11
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -1370,103 +1602,159 @@
11
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -1528,103 +1816,159 @@
11
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -1654,103 +1998,159 @@
11
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -1780,87 +2180,143 @@
11
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -1890,13 +2346,15 @@
0
- - - - 20 - - - + + + + + 20 + + + + @@ -1926,13 +2384,15 @@
0
- - - - 20 - - - + + + + + 20 + + + + @@ -1962,63 +2422,71 @@
1
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + +
2
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + +
3
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + +
4
- - - - false - false - false - false - 0 - false - - - + + + + + false + false + false + false + 0 + false + + + + @@ -2048,63 +2516,71 @@
1
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + +
2
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + +
3
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + +
4
- - - - false - false - false - false - 0 - 0 - - - + + + + + false + false + false + false + 0 + 0 + + + + @@ -2134,87 +2610,95 @@
1
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -2244,83 +2728,91 @@
1
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -2350,83 +2842,91 @@
1
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -2456,83 +2956,91 @@
1
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
2
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
3
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + +
4
- - - - 0 - - - - - false - false - false - false - 0 - false - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + @@ -2562,67 +3070,75 @@
1
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + +
2
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + +
3
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + +
4
- - 0.0 - - - false - false - false - false - 0 - false - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + @@ -2684,83 +3200,139 @@
11
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -2790,83 +3362,139 @@
11
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - false - false - false - false - 0 - 0 - - - - - 0x3110170884070d - - - + + + + + false + false + false + false + 0 + 0 + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -2896,107 +3524,163 @@
11
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - false - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + false + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -3026,103 +3710,159 @@
11
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -3152,103 +3892,159 @@
11
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -3278,103 +4074,159 @@
11
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - - - 0 - - - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + + + 0 + + + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -3404,87 +4256,143 @@
11
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
12
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
13
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +
14
- - 0.0 - - - false - false - false - false - 0 - false - - - - - 0x3110170884070d - - - + + + 0.0 + + + false + false + false + false + 0 + false + + + + + 4145 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -3514,13 +4422,15 @@
0
- - - - 20 - - - + + + + + 20 + + + + @@ -3562,20 +4472,22 @@
2
- - - - - - - 0 - - - 0 - true - - - + + + + + + + + 0 + + + 0 + true + + + + @@ -3617,20 +4529,22 @@
2
- - - - - - - 0 - - - 0 - true - - - + + + + + + + + 0 + + + 0 + true + + + + @@ -3660,20 +4574,22 @@
2
- - - - - - - 0 - - - 0 - true - - - + + + + + + + + 0 + + + 0 + true + + + + @@ -3703,18 +4619,20 @@
2
- - - - false - false - false - false - 0 - true - - - + + + + + false + false + false + false + 0 + true + + + + @@ -3776,20 +4694,22 @@
13
- - - - - - - 0 - - - 0 - true - - - + + + + + + + + 0 + + + 0 + true + + + + @@ -3831,20 +4751,22 @@
13
- - - - - - - 0 - - - 0 - true - - - + + + + + + + + 0 + + + 0 + true + + + + @@ -3874,20 +4796,22 @@
13
- - - - - - - 0 - - - 0 - true - - - + + + + + + + + 0 + + + 0 + true + + + + @@ -3917,23 +4841,37 @@
13
- - - - false - false - false - false - 0 - true - - - - - 0xc75d170884070d - - - + + + + + false + false + false + false + 0 + true + + + + + 24007 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -3995,19 +4933,21 @@
1
- - - - - - - 0 - - - 1 - - - + + + + + + + + 0 + + + 1 + + + + @@ -4049,19 +4989,21 @@
1
- - - - - - - 0 - - - 1 - - - + + + + + + + + 0 + + + 1 + + + + @@ -4103,19 +5045,21 @@
1
- - - - - - - 0 - - - 1 - - - + + + + + + + + 0 + + + 1 + + + + @@ -4145,18 +5089,20 @@
1
- - - - false - false - false - false - 0 - 1 - - - + + + + + false + false + false + false + 0 + 1 + + + + @@ -4198,19 +5144,21 @@
14
- - - - - - - 0 - - - 2 - - - + + + + + + + + 0 + + + 2 + + + + @@ -4252,19 +5200,21 @@
14
- - - - - - - 0 - - - 2 - - - + + + + + + + + 0 + + + 2 + + + + @@ -4294,19 +5244,21 @@
14
- - - - - - - 0 - - - 2 - - - + + + + + + + + 0 + + + 2 + + + + @@ -4336,23 +5288,37 @@
14
- - - - false - false - false - false - 0 - 2 - - - - - 0xe679170884070d - - - + + + + + false + false + false + false + 0 + 2 + + + + + 31206 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -4414,19 +5380,21 @@
1
- - - - - - - 0 - - - 2 - - - + + + + + + + + 0 + + + 2 + + + + @@ -4468,19 +5436,21 @@
1
- - - - - - - 0 - - - 2 - - - + + + + + + + + 0 + + + 2 + + + + @@ -4510,19 +5480,21 @@
1
- - - - - - - 0 - - - 2 - - - + + + + + + + + 0 + + + 2 + + + + @@ -4552,24 +5524,26 @@
1
- - - - false - 1 - - - - - false - false - false - false - 0 - false - - - + + + + + false + 1 + + + + + false + false + false + false + 0 + false + + + + @@ -4611,19 +5585,21 @@
12
- - - - - - - 0 - - - 1 - - - + + + + + + + + 0 + + + 1 + + + + @@ -4665,19 +5641,21 @@
12
- - - - - - - 0 - - - 1 - - - + + + + + + + + 0 + + + 1 + + + + @@ -4707,19 +5685,21 @@
12
- - - - - - - 0 - - - 1 - - - + + + + + + + + 0 + + + 1 + + + + @@ -4749,29 +5729,43 @@
12
- - - - false - 127 - - - - - false - false - false - false - 0 - false - - - - - 0x648f170884070d - - - + + + + + false + 127 + + + + + false + false + false + false + 0 + false + + + + + 36708 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -4853,13 +5847,15 @@
3
- - - - 2 - - - + + + + + 2 + + + + @@ -4901,13 +5897,15 @@
3
- - - - 2 - - - + + + + + 2 + + + + @@ -4949,13 +5947,15 @@
3
- - - - 2 - - - + + + + + 2 + + + + @@ -4985,23 +5985,25 @@
3
- - - - 2 - - - - - false - false - false - false - 0 - false - - - + + + + + 2 + + + + + false + false + false + false + 0 + false + + + + @@ -5043,13 +6045,15 @@
14
- - - - 4 - - - + + + + + 4 + + + + @@ -5091,13 +6095,15 @@
14
- - - - 4 - - - + + + + + 4 + + + + @@ -5127,13 +6133,15 @@
14
- - - - 4 - - - + + + + + 4 + + + + @@ -5163,28 +6171,42 @@
14
- - - - 4 - - - - - false - false - false - false - 0 - false - - - - - 0x40ae170884070d - - - + + + + + 4 + + + + + false + false + false + false + 0 + false + + + + + 44608 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -5226,19 +6248,21 @@
1
- - - - 1024 - - - - - - 0 - - - + + + + + 1024 + + + + + + 0 + + + + @@ -5280,19 +6304,21 @@
1
- - - - 1024 - - - - - - 0 - - - + + + + + 1024 + + + + + + 0 + + + + @@ -5334,19 +6360,21 @@
1
- - - - 1024 - - - - - - 0 - - - + + + + + 1024 + + + + + + 0 + + + + @@ -5376,23 +6404,25 @@
1
- - - - 1024 - - - - - false - false - false - false - 0 - false - - - + + + + + 1024 + + + + + false + false + false + false + 0 + false + + + + @@ -5434,19 +6464,21 @@
12
- - - - 8192 - - - - - - 0 - - - + + + + + 8192 + + + + + + 0 + + + + @@ -5488,19 +6520,21 @@
12
- - - - 8192 - - - - - - 0 - - - + + + + + 8192 + + + + + + 0 + + + + @@ -5530,19 +6564,21 @@
12
- - - - 8192 - - - - - - 0 - - - + + + + + 8192 + + + + + + 0 + + + + @@ -5572,28 +6608,42 @@
12
- - - - 8192 - - - - - false - false - false - false - 0 - false - - - - - 0x27cb170884070d - - - + + + + + 8192 + + + + + false + false + false + false + 0 + false + + + + + 52007 + false + false + 23 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -5695,19 +6745,21 @@
3
- - - - 123 - - - - - - 0 - - - + + + + + 123 + + + + + + 0 + + + + @@ -5749,19 +6801,21 @@
3
- - - - 123 - - - - - - 0 - - - + + + + + 123 + + + + + + 0 + + + + @@ -5803,19 +6857,21 @@
3
- - - - 123 - - - - - - 0 - - - + + + + + 123 + + + + + + 0 + + + + @@ -5845,23 +6901,25 @@
3
- - - - 123 - - - - - false - false - false - false - 0 - false - - - + + + + + 123 + + + + + false + false + false + false + 0 + false + + + + @@ -5903,19 +6961,21 @@
14
- - - - 456 - - - - - - 0 - - - + + + + + 456 + + + + + + 0 + + + + @@ -5957,19 +7017,21 @@
14
- - - - 456 - - - - - - 0 - - - + + + + + 456 + + + + + + 0 + + + + @@ -5999,19 +7061,21 @@
14
- - - - 456 - - - - - - 0 - - - + + + + + 456 + + + + + + 0 + + + + @@ -6041,28 +7105,42 @@
14
- - - - 456 - - - - - false - false - false - false - 0 - false - - - - - 0x6412180884070d - - - + + + + + 456 + + + + + false + false + false + false + 0 + false + + + + + 4708 + false + false + 24 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + + @@ -6104,15 +7182,17 @@
1
- - 3.14 - - - - 0 - - - + + + 3.14 + + + + 0 + + + + @@ -6154,15 +7234,17 @@
1
- - 3.14 - - - - 0 - - - + + + 3.14 + + + + 0 + + + + @@ -6192,15 +7274,17 @@
1
- - 3.14 - - - - 0 - - - + + + 3.14 + + + + 0 + + + + @@ -6230,19 +7314,21 @@
1
- - 3.14 - - - false - false - false - false - 0 - false - - - + + + 3.14 + + + false + false + false + false + 0 + false + + + + @@ -6324,15 +7410,17 @@
12
- - 9.87 - - - - 0 - - - + + + 9.87 + + + + 0 + + + + @@ -6374,15 +7462,17 @@
12
- - 9.87 - - - - 0 - - - + + + 9.87 + + + + 0 + + + + @@ -6424,15 +7514,17 @@
12
- - 9.87 - - - - 0 - - - + + + 9.87 + + + + 0 + + + + @@ -6462,24 +7554,38 @@
12
- - 9.87 - - - false - false - false - false - 0 - false - - - - - 0xe337180884070d - - - + + + 9.87 + + + false + false + false + false + 0 + false + + + + + 14307 + false + false + 24 + false + 0 + 8 + 4 + 4 + 0 + 7 + 0 + 13 + + + +