You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ke...@apache.org on 2018/01/05 10:18:00 UTC
[incubator-plc4x] branch PLC4X-12 updated (3be1fc5 -> 0edd683)
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a change to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 3be1fc5 Merge branch 'master' into PLC4X-12
add 2d1b219 stop RTE when passing empty or null messages
add ce7f0c8 stop RTE when passing empty or null messages
add 1e49bb5 stop RTE when passing empty or null messages
add 9942cc3 sonar project properties
add 70b1a8e add .scannerwork
add f49a686 ignore test and mock classes
add 0bc9f43 private final static is the preferred order
add 6b64873 fix version and add tests and coverage
add fe4b740 add api coverage
add ce7eaee fix build by adding missing apache headers
add 8ebeeef PLC4X-21 - Code coverage doesn't seem to work
add b3d4564 Test extension: - added Tests for Plc4XS7Protocol - added basic test implementation for S7Protocol
add ef6084a no need for abstract method as it's in base class and class is abstract
add 641c99f refactor and clean up switches
add 63bba4d clean up switch statements a little
add f9d3fa1 no need for local variable
add 02b8f57 unnneeded import
add c4c9ac2 statics come first
add 8917742 prefer parseInt to valueOf
add c0c3bb1 local var had some name as field
add 4166952 local var had some name as field
add 4612ae3 if you don't return null to here's no need to check for it
add 4619484 exception can't be throw
add 125e630 no need for nested ifs
add 708f563 Merge remote-tracking branch 'origin/master'
add 4eadf74 PLC4X-21 - Code coverage doesn't seem to work
add 08fc594 PLC4X-21 - Code coverage doesn't seem to work
add d0adfde PLC4X-21 - Code coverage doesn't seem to work
new 0edd683 Merge branch 'master' into PLC4X-12
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
Jenkinsfile | 4 +-
.../plc4x/java/applications/iotree/IoTree.java | 2 +-
.../java/applications/plclogger/PlcLogger.java | 2 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 10 +-
.../java/api/connection/AbstractPlcConnection.java | 4 -
.../PlcUsernamePasswordAuthenticationTest.java | 0
.../plc4x/java/api/messages/APIMessageTests.java | 0
.../plc4x/java/api/messages/mock/MockAddress.java | 0
plc4j/pom.xml | 7 +
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 265 ++++++++++++---------
.../java/isotp/netty/model/types/DeviceGroup.java | 4 +-
.../isotp/netty/model/types/DisconnectReason.java | 4 +-
.../isotp/netty/model/types/ParameterCode.java | 4 +-
.../isotp/netty/model/types/ProtocolClass.java | 4 +-
.../java/isotp/netty/model/types/RejectCause.java | 4 +-
.../java/isotp/netty/model/types/TpduCode.java | 4 +-
.../java/isotp/netty/model/types/TpduSize.java | 4 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 8 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 9 +-
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 167 ++++++-------
.../netty/model/types/DataTransportErrorCode.java | 4 +-
.../s7/netty/model/types/DataTransportSize.java | 4 +-
.../java/s7/netty/model/types/MemoryArea.java | 4 +-
.../java/s7/netty/model/types/MessageType.java | 4 +-
.../java/s7/netty/model/types/ParameterType.java | 4 +-
.../s7/netty/model/types/SpecificationType.java | 4 +-
.../java/s7/netty/model/types/TransportSize.java | 4 +-
.../netty/model/types/VariableAddressingMode.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 30 +++
.../apache/plc4x/java/isotp/netty/MockChannel.java | 18 ++
.../isotp/netty/MockChannelHandlerContext.java | 18 ++
.../java/isotp/netty/MockChannelPipeline.java | 18 ++
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 2 +-
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 2 +-
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 2 +-
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 2 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 205 +++++++++++++++-
.../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 62 ++++-
pom.xml | 227 ++++++++++--------
sonar-project.properties.sav | 46 ++++
41 files changed, 804 insertions(+), 367 deletions(-)
rename plc4j/api/src/test/{ => java}/org/apache/plc4x/java/api/authentication/PlcUsernamePasswordAuthenticationTest.java (100%)
rename plc4j/api/src/test/{ => java}/org/apache/plc4x/java/api/messages/APIMessageTests.java (100%)
rename plc4j/api/src/test/{ => java}/org/apache/plc4x/java/api/messages/mock/MockAddress.java (100%)
create mode 100644 sonar-project.properties.sav
--
To stop receiving notification emails like this one, please contact
['"commits@plc4x.apache.org" <co...@plc4x.apache.org>'].
[incubator-plc4x] 01/01: Merge branch 'master' into PLC4X-12
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 0edd6835b779bd0095e4f639585d85cf8a4a4021
Merge: 3be1fc5 d0adfde
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Fri Jan 5 11:08:47 2018 +0100
Merge branch 'master' into PLC4X-12
.gitignore | 1 +
Jenkinsfile | 4 +-
.../plc4x/java/applications/iotree/IoTree.java | 2 +-
.../java/applications/plclogger/PlcLogger.java | 2 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 10 +-
.../java/api/connection/AbstractPlcConnection.java | 4 -
.../PlcUsernamePasswordAuthenticationTest.java | 0
.../plc4x/java/api/messages/APIMessageTests.java | 0
.../plc4x/java/api/messages/mock/MockAddress.java | 0
plc4j/pom.xml | 7 +
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 265 ++++++++++++---------
.../java/isotp/netty/model/types/DeviceGroup.java | 4 +-
.../isotp/netty/model/types/DisconnectReason.java | 4 +-
.../isotp/netty/model/types/ParameterCode.java | 4 +-
.../isotp/netty/model/types/ProtocolClass.java | 4 +-
.../java/isotp/netty/model/types/RejectCause.java | 4 +-
.../java/isotp/netty/model/types/TpduCode.java | 4 +-
.../java/isotp/netty/model/types/TpduSize.java | 4 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 8 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 9 +-
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 167 ++++++-------
.../netty/model/types/DataTransportErrorCode.java | 4 +-
.../s7/netty/model/types/DataTransportSize.java | 4 +-
.../java/s7/netty/model/types/MemoryArea.java | 4 +-
.../java/s7/netty/model/types/MessageType.java | 4 +-
.../java/s7/netty/model/types/ParameterType.java | 4 +-
.../s7/netty/model/types/SpecificationType.java | 4 +-
.../java/s7/netty/model/types/TransportSize.java | 4 +-
.../netty/model/types/VariableAddressingMode.java | 4 +-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 30 +++
.../apache/plc4x/java/isotp/netty/MockChannel.java | 18 ++
.../isotp/netty/MockChannelHandlerContext.java | 18 ++
.../java/isotp/netty/MockChannelPipeline.java | 18 ++
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 2 +-
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 2 +-
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 2 +-
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 2 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 205 +++++++++++++++-
.../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 62 ++++-
pom.xml | 227 ++++++++++--------
sonar-project.properties.sav | 46 ++++
41 files changed, 804 insertions(+), 367 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.