This is an automated email from the ASF dual-hosted git repository.
chrisdutz pushed a change to branch refactor/spi3
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from e2f7cab41e test: Updated the testsuite to actually do more sensible
testing.
add 787db55919 refactor: Refactored the IEC-60870 driver to the new SPI.
No new revisions were added by this update.
Summary of changes:
plc4j/drivers/iec-60870/pom.xml | 106 ++++-
.../plc4x/java/iec608705104/readwrite/APDU.java | 16 +-
.../java/iec608705104/readwrite/APDUIFormat.java | 12 +-
.../java/iec608705104/readwrite/APDUSFormat.java | 8 +-
.../APDUUFormatStartDataTransferActivation.java | 4 +-
.../APDUUFormatStartDataTransferConfirmation.java | 4 +-
.../APDUUFormatStopDataTransferActivation.java | 4 +-
.../APDUUFormatStopDataTransferConfirmation.java | 4 +-
.../readwrite/APDUUFormatTestFrameActivation.java | 4 +-
.../APDUUFormatTestFrameConfirmation.java | 4 +-
.../plc4x/java/iec608705104/readwrite/ASDU.java | 40 +-
.../AcknowledgeFileOrSectionQualifier.java | 4 +-
.../readwrite/BinaryCounterReading.java | 24 +-
.../readwrite/BinaryStateInformation.java | 8 +-
.../readwrite/CauseOfInitialization.java | 12 +-
.../java/iec608705104/readwrite/Checksum.java | 4 +-
.../java/iec608705104/readwrite/DoubleCommand.java | 12 +-
.../readwrite/DoublePointInformation.java | 24 +-
.../iec608705104/readwrite/FileReadyQualifier.java | 4 +-
.../readwrite/FixedTestBitPatternTwoOctet.java | 8 +-
.../iec608705104/readwrite/InformationObject.java | 8 +-
.../InformationObjectWithSevenByteTime.java | 4 +-
...bjectWithSevenByteTime_BITSTRING_OF_32_BIT.java | 16 +-
...WithSevenByteTime_DOUBLE_POINT_INFORMATION.java | 12 +-
...evenByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java | 12 +-
...nObjectWithSevenByteTime_INTEGRATED_TOTALS.java | 12 +-
...enByteTime_MEASURED_VALUE_NORMALISED_VALUE.java | 16 +-
...hSevenByteTime_MEASURED_VALUE_SCALED_VALUE.java | 16 +-
...MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java | 16 +-
...IRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java | 20 +-
...ACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java | 20 +-
...WithSevenByteTime_SINGLE_POINT_INFORMATION.java | 12 +-
...ithSevenByteTime_STEP_POSITION_INFORMATION.java | 16 +-
.../InformationObjectWithTreeByteTime.java | 4 +-
...ObjectWithTreeByteTime_BITSTRING_OF_32_BIT.java | 16 +-
...tWithTreeByteTime_DOUBLE_POINT_INFORMATION.java | 12 +-
...TreeByteTime_EVENT_OF_PROTECTION_EQUIPMENT.java | 12 +-
...onObjectWithTreeByteTime_INTEGRATED_TOTALS.java | 12 +-
...eeByteTime_MEASURED_VALUE_NORMALIZED_VALUE.java | 16 +-
...thTreeByteTime_MEASURED_VALUE_SCALED_VALUE.java | 16 +-
...MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java | 16 +-
...IRCUIT_INFORMATION_OF_PROTECTION_EQUIPMENT.java | 20 +-
...ACKED_START_EVENTS_OF_PROTECTION_EQUIPMENT.java | 20 +-
...tWithTreeByteTime_SINGLE_POINT_INFORMATION.java | 12 +-
...WithTreeByteTime_STEP_POSITION_INFORMATION.java | 16 +-
.../readwrite/InformationObjectWithoutTime.java | 4 +-
...tionObjectWithoutTime_ACK_FILE_ACK_SECTION.java | 16 +-
...ObjectWithoutTime_BITSTRING_32_BIT_COMMAND.java | 8 +-
...ationObjectWithoutTime_BITSTRING_OF_32_BIT.java | 12 +-
...RECTORY_SELECT_FILE_CALL_FILE_CALL_SECTION.java | 16 +-
...tWithoutTime_CLOCK_SYNCHRONISATION_COMMAND.java | 8 +-
...tWithoutTime_COUNTER_INTERROGATION_COMMAND.java | 8 +-
...bjectWithoutTime_DELAY_ACQUISITION_COMMAND.java | 8 +-
.../InformationObjectWithoutTime_DIRECTORY.java | 20 +-
...nformationObjectWithoutTime_DOUBLE_COMMAND.java | 8 +-
...ObjectWithoutTime_DOUBLE_POINT_INFORMATION.java | 8 +-
...ionObjectWithoutTime_END_OF_INITIALISATION.java | 8 +-
.../InformationObjectWithoutTime_FILE_READY.java | 16 +-
...rmationObjectWithoutTime_INTEGRATED_TOTALS.java | 8 +-
...ionObjectWithoutTime_INTERROGATION_COMMAND.java | 8 +-
...bjectWithoutTime_LAST_SECTION_LAST_SEGMENT.java | 20 +-
...ithoutTime_MEASURED_VALUE_NORMALISED_VALUE.java | 12 +-
...ORMALIZED_VALUE_WITHOUT_QUALITY_DESCRIPTOR.java | 8 +-
...ectWithoutTime_MEASURED_VALUE_SCALED_VALUE.java | 12 +-
...MEASURED_VALUE_SHORT_FLOATING_POINT_NUMBER.java | 12 +-
...T_INFORMATION_WITH_STATUS_CHANGE_DETECTION.java | 12 +-
...tionObjectWithoutTime_PARAMETER_ACTIVATION.java | 8 +-
...AMETER_OF_MEASURED_VALUES_NORMALIZED_VALUE.java | 12 +-
..._PARAMETER_OF_MEASURED_VALUES_SCALED_VALUE.java | 12 +-
...EASURED_VALUES_SHORT_FLOATING_POINT_NUMBER.java | 12 +-
.../InformationObjectWithoutTime_READ_COMMAND.java | 4 +-
...nObjectWithoutTime_REGULATING_STEP_COMMAND.java | 8 +-
...ionObjectWithoutTime_RESET_PROCESS_COMMAND.java | 8 +-
...InformationObjectWithoutTime_SECTION_READY.java | 20 +-
.../InformationObjectWithoutTime_SEGMENT.java | 16 +-
...outTime_SET_POINT_COMMAND_NORMALISED_VALUE.java | 12 +-
...WithoutTime_SET_POINT_COMMAND_SCALED_VALUE.java | 12 +-
..._POINT_COMMAND_SHORT_FLOATING_POINT_NUMBER.java | 12 +-
...nformationObjectWithoutTime_SINGLE_COMMAND.java | 8 +-
...ObjectWithoutTime_SINGLE_POINT_INFORMATION.java | 8 +-
...bjectWithoutTime_STEP_POSITION_INFORMATION.java | 12 +-
.../InformationObjectWithoutTime_TEST_COMMAND.java | 8 +-
.../readwrite/LastSectionOrSegmentQualifier.java | 4 +-
.../java/iec608705104/readwrite/LengthOfFile.java | 4 +-
.../iec608705104/readwrite/LengthOfSegment.java | 4 +-
.../java/iec608705104/readwrite/NameOfFile.java | 4 +-
.../java/iec608705104/readwrite/NameOfSection.java | 4 +-
.../iec608705104/readwrite/NormalizedValue.java | 8 +-
.../readwrite/OutputCircuitInformation.java | 20 +-
.../iec608705104/readwrite/QualifierOfCommand.java | 12 +-
.../QualifierOfCounterInterrogationCommand.java | 12 +-
.../readwrite/QualifierOfInterrogation.java | 8 +-
.../readwrite/QualifierOfParameterActivation.java | 8 +-
.../QualifierOfParameterOfMeasuredValues.java | 16 +-
.../readwrite/QualifierOfResetProcessCommand.java | 8 +-
.../readwrite/QualifierOfSetPointCommand.java | 12 +-
.../iec608705104/readwrite/QualityDescriptor.java | 24 +-
...tyDescriptorForPointsOfProtectionEquipment.java | 24 +-
.../readwrite/RegulatingStepCommand.java | 12 +-
.../java/iec608705104/readwrite/ScaledValue.java | 8 +-
.../readwrite/SectionReadyQualifier.java | 4 +-
.../readwrite/SelectAndCallQualifier.java | 4 +-
.../readwrite/SevenOctetBinaryTime.java | 44 +-
.../readwrite/ShortFloatingPointNumber.java | 8 +-
.../java/iec608705104/readwrite/SingleCommand.java | 12 +-
.../SingleEventOfProtectionEquipment.java | 28 +-
.../readwrite/SinglePointInformation.java | 24 +-
.../StartEventsOfProtectionEquipment.java | 28 +-
.../readwrite/StatusChangeDetection.java | 8 +-
.../readwrite/ThreeOctetBinaryTime.java | 16 +-
.../iec608705104/readwrite/TwoOctetBinaryTime.java | 8 +-
.../ValueWithTransientStateIndication.java | 12 +-
.../java/iec608705104/Iec60870514PlcDriver.java} | 48 +-
.../java/iec608705104/Iec60870Connection.java | 399 +++++++++++++++++
.../java/iec608705104/Iec60870MessageCodec.java} | 39 +-
.../configuration/Iec608705014Configuration.java | 14 +-
.../Iec608705014TcpTransportConfiguration.java | 6 +-
.../messages/Iec608705104PlcSubscriptionEvent.java | 20 +-
.../model/Iec608705104SubscriptionHandle.java} | 34 +-
.../protocol/Iec608705104TagParser.java | 2 +-
.../readwrite/Iec60870514PlcDriver.java | 125 ------
.../model/Iec608705104SubscriptionHandle.java | 77 ----
.../readwrite/protocol/Iec608705104Protocol.java | 238 ----------
.../iec608705104/readwrite/utils/StaticHelper.java | 4 +-
.../{readwrite => }/tag/Iec608705104Tag.java | 2 +-
.../tag/Iec608705104TagHandler.java | 4 +-
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../iec608705104/readwrite/utils/StaticHelper.java | 30 --
.../java/iec608705104/IEC608705104DriverIT.java | 13 +-
.../IEC608705104ParserSerializerTest.java | 2 +-
.../iec608705104/Iec60870514PlcDriverTest.java} | 44 +-
.../iec608705104/ManualParserSerializerTest.java | 7 +-
.../apache/plc4x/java/iec608705104/ManualTest.java | 2 +-
.../Iec608705014ConfigurationTest.java} | 30 +-
...Iec608705014TcpTransportConfigurationTest.java} | 12 +-
.../Iec608705104PlcSubscriptionEventTest.java | 65 +++
.../model/Iec608705104SubscriptionHandleTest.java | 100 +++++
.../protocol/Iec608705104TagParserTest.java | 489 +++++++++++++++++++++
.../tag/Iec608705104TagHandlerTest.java} | 36 +-
.../java/iec608705104/tag/Iec608705104TagTest.java | 60 +++
.../java/iec608705104/utils/StaticHelperTest.java} | 32 +-
.../protocols/iec608705104/iec-60870-5-104.mspec | 86 ++--
142 files changed, 2106 insertions(+), 1366 deletions(-)
copy
plc4j/drivers/{firmata/src/main/java/org/apache/plc4x/java/firmata/FirmataDriver.java
=>
iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/Iec60870514PlcDriver.java}
(63%)
create mode 100644
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/Iec60870Connection.java
copy
plc4j/drivers/{ads/src/main/java/org/apache/plc4x/java/ads/AdsTcpMessageCodec.java
=>
iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/Iec60870MessageCodec.java}
(52%)
rename
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/{readwrite
=> }/configuration/Iec608705014Configuration.java (67%)
rename
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/{readwrite
=> }/configuration/Iec608705014TcpTransportConfiguration.java (81%)
rename
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/{readwrite
=> }/messages/Iec608705104PlcSubscriptionEvent.java (61%)
copy
plc4j/drivers/{firmata/src/main/java/org/apache/plc4x/java/firmata/model/FirmataSubscriptionHandle.java
=>
iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/model/Iec608705104SubscriptionHandle.java}
(63%)
rename
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/{readwrite
=> }/protocol/Iec608705104TagParser.java (99%)
delete mode 100644
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/Iec60870514PlcDriver.java
delete mode 100644
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/model/Iec608705104SubscriptionHandle.java
delete mode 100644
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/readwrite/protocol/Iec608705104Protocol.java
rename
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/{readwrite
=> }/tag/Iec608705104Tag.java (97%)
rename
plc4j/drivers/iec-60870/src/main/java/org/apache/plc4x/java/iec608705104/{readwrite
=> }/tag/Iec608705104TagHandler.java (90%)
delete mode 100644
plc4j/drivers/iec-60870/src/main/temp/org/apache/plc4x/java/iec608705104/readwrite/utils/StaticHelper.java
copy
plc4j/drivers/{modbus/src/test/java/org/apache/plc4x/java/modbus/rtu/ModbusRtuDriverTest.java
=>
iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/Iec60870514PlcDriverTest.java}
(54%)
copy
plc4j/{utils/test-utils/src/test/java/org/apache/plc4x/java/utils/testutils/driver/internal/StepTypeTest.java
=>
drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/configuration/Iec608705014ConfigurationTest.java}
(53%)
copy
plc4j/drivers/{firmata/src/test/java/org/apache/plc4x/java/firmata/configuration/FirmataConfigurationTest.java
=>
iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/configuration/Iec608705014TcpTransportConfigurationTest.java}
(70%)
create mode 100644
plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/messages/Iec608705104PlcSubscriptionEventTest.java
create mode 100644
plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/model/Iec608705104SubscriptionHandleTest.java
create mode 100644
plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/protocol/Iec608705104TagParserTest.java
copy
plc4j/{transports/test/src/test/java/org/apache/plc4x/java/transport/test/config/TestTransportConfigurationTest.java
=>
drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/tag/Iec608705104TagHandlerTest.java}
(50%)
create mode 100644
plc4j/drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/tag/Iec608705104TagTest.java
copy
plc4j/{utils/test-utils/src/test/java/org/apache/plc4x/java/utils/testutils/driver/xmlunit/SkipAttributeFilterTest.java
=>
drivers/iec-60870/src/test/java/org/apache/plc4x/java/iec608705104/utils/StaticHelperTest.java}
(54%)
