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/13 21:40:59 UTC
[incubator-plc4x] branch PLC4X-12 updated (0edd683 -> 6f6f00a)
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 0edd683 Merge branch 'master' into PLC4X-12
add a2a4d84 Migrate PlcDriverManagerTest to assertj
add d4fdb5b Java-Gernerify APIs
add 3d65ec7 Merge branch 'master' into refactoring/java_generify
add 51075d9 added Tests for Plc4XS7Protocol
add 88a32d3 added basic test implementation for S7Protocol
add 71fecb8 added unchecked variants of plc requests.
add d7730f0 Merge branch 'master' into refactoring/java_generify
add cead5c1 split plcRequest into single and bulk plc request
add 1eb41f8 added a checked variant of bulk requests/responses.
add 6badd3b added a couple of default methods to the interfaces
add cfe70db Introduced Optional for single elements
add 7c78c45 added missing overload methods
add fd66d1d added request build for convenient request creation.
add 0a22610 PLC4X-22: temporary disable camel BOM due to long build-time on site:site
add 99fb948 Merge branch 'master' into refactoring/java_generify
add 1c71c7b moved specific messages into a sub package to declutter the API
add 80fa0ae fix tests
add b3869eb fixed firstType builder bug; added getValue to bulk; added getValue tests
add 6a3da68 comment surefire back in
add b86dc42 fixed one more builder bug
add ff882df fix up switch and endless loops
add 04245aa refactor to reduce complexity and fix endless loops
add 4383c38 log exception
add 1e853eb add @override
add 79f031d unneeded brackets
add 7df5be8 SONAR Make the programs terminate (getting rid of the two blocker issues)
add 464d125 SONAR Some further fixing of issues sonarqube reported
add 74617fc mask slot number
add ecba61f add calling parameter test
add 7b849a1 get rid of a level of nesting
add 5ad5d2d no real need to calculate size/length every time through the loop
add bd85953 add more encode and decode parameter tests
add 44e01ea Sort divided by a int is always an int no need to round up with Math.ceil
add 25a752c Enable coverage checks (Report warnings but don't break the build for now)
add 85fb9cb may need a extra byte if not on byte boundry
add 06fd936 Coverage shows this should be Byte not Byte[]
add 9e04f92 Add support for Stings
add ab2c1d8 multiple string is a little broken add TODOs so don't forget
add 5378c4a support for multiple strings
add 3e19b41 chars not bytes and add another check to stop running off end of buffer
add 2267211 Merge branch 'master' into refactoring/java_generify
add d6497dc link response into request to retrieve a typed response.
add 675a108 fixed test by cleaning up the generics.
add 76f1d0b move getValue() method up to parent
add b1aa871 added indicator methods to reponses.
add 6402596 minor generic adjustments
add fc694ac small cleanup on api
add 1361a0a use list instead of array and get rid of some more suppress warnings
add 6fbc8de make single requests/responses extend from checked BulkResponse
add 3ce27ea fixed edgent test
add a643675 deprecated BulkPlc*
add 4078c58 get rid of BulkPlc*
add 3615ee4 Rename CheckedPlc* to TypeSafePlc*
add c28c5ee Deprecated SinglePlc*
add c9b36e9 get rid of SinglePlc*
add 9504a16 implement actual typesafety into TypeSafePlc*
add fd31bad polished builders and code cleanup
add be5fec1 added missing Objects.requireNonNull assertion
add ea71d93 small pre-merge fixes.
add 9b46c5e Merge branch 'master' into assertj_migration
add 9dc57dc get response from request as completable future as at access time the response might not be there yet.
add af2ca39 refactored common code of request and responses into abstract classes
add 8b89e9c added missing licences header
add b10c70d rename generic from REQUEST_TYPE to REQUEST_ITEM
add 9f6fc95 refactored much common code to a abstract class
add 1426495 disable get response tests for now due to timing issues
add 7ecbdd5 added some more top level boundaries und requests and responses
add f091908 implement double null check to avoid unnecessary waits
add 4a2d257 see https://www.ibm.com/developerworks/java/library/j-jtp05236/index.html?ca=drs-#2.1
add 0eafa62 unneeded import
add 3e9e12a use isEmpty()
add c4595a4 right order
add 4b94b85 use isEmpty()
add a0ee2e8 use isEmpty()
add 023282f add @Overrides
add 5ea1720 unneeded import
add f079d20 add @Overrides
add 52d1979 add @Overrides
add 9a62440 add private constructors to utility classes
new 6f6f00a 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:
applications/iotree/pom.xml | 5 +
.../plc4x/java/applications/iotree/IoTree.java | 18 +-
applications/plclogger/pom.xml | 5 +
.../java/applications/plclogger/PlcLogger.java | 18 +-
integrations/apache-camel/pom.xml | 23 +-
.../java/org/apache/plc4x/camel/Constants.java | 6 +-
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 23 +-
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 3 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 253 +++--
.../java/org/apache/plc4x/edgent/PlcFunctions.java | 4 +
.../plc4x/edgent/PlcConnectionAdapterTest.java | 1030 ++++++++++----------
.../apache/plc4x/edgent/mock/MockConnection.java | 123 ++-
.../plc4x/java/api/connection/PlcReader.java | 17 +-
.../plc4x/java/api/connection/PlcWriter.java | 18 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 79 +-
.../plc4x/java/api/messages/PlcReadResponse.java | 23 +-
.../apache/plc4x/java/api/messages/PlcRequest.java | 72 +-
.../plc4x/java/api/messages/PlcResponse.java | 54 +-
.../plc4x/java/api/messages/PlcWriteRequest.java | 78 +-
.../plc4x/java/api/messages/PlcWriteResponse.java | 23 +-
.../java/api/messages/items/ReadRequestItem.java | 24 +-
.../java/api/messages/items/ReadResponseItem.java | 24 +-
.../plc4x/java/api/messages/items/RequestItem.java | 84 ++
.../{WriteResponseItem.java => ResponseItem.java} | 9 +-
.../java/api/messages/items/WriteRequestItem.java | 33 +-
.../java/api/messages/items/WriteResponseItem.java | 20 +-
.../messages/specific/TypeSafePlcReadRequest.java | 85 ++
.../messages/specific/TypeSafePlcReadResponse.java | 83 ++
.../messages/specific/TypeSafePlcWriteRequest.java | 77 ++
.../specific/TypeSafePlcWriteResponse.java | 59 ++
.../plc4x/java/api/messages/APIMessageTests.java | 231 +++--
.../apache/plc4x/java/PlcDriverManagerTest.java | 52 +-
plc4j/pom.xml | 31 -
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 152 +--
.../plc4x/java/s7/connection/S7PlcConnection.java | 6 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 154 +--
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 112 ++-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 294 +++++-
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 15 +-
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 18 +-
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 14 +-
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 11 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 27 +-
.../org/apache/plc4x/java/utils/PcapngUtils.java | 4 +
pom.xml | 36 +-
45 files changed, 2330 insertions(+), 1200 deletions(-)
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/RequestItem.java
copy plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/items/{WriteResponseItem.java => ResponseItem.java} (82%)
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadRequest.java
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcReadResponse.java
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteRequest.java
create mode 100644 plc4j/api/src/main/java/org/apache/plc4x/java/api/messages/specific/TypeSafePlcWriteResponse.java
--
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 6f6f00a1baa5b1655f3db6c9f7dfcae34c6f1ca5
Merge: 0edd683 9a62440
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Fri Jan 12 06:45:51 2018 +0100
Merge branch 'master' into PLC4X-12
applications/iotree/pom.xml | 5 +
.../plc4x/java/applications/iotree/IoTree.java | 18 +-
applications/plclogger/pom.xml | 5 +
.../java/applications/plclogger/PlcLogger.java | 18 +-
integrations/apache-camel/pom.xml | 23 +-
.../java/org/apache/plc4x/camel/Constants.java | 6 +-
.../java/org/apache/plc4x/camel/PLC4XProducer.java | 23 +-
.../org/apache/plc4x/camel/PLC4XComponentTest.java | 3 +-
.../apache/plc4x/edgent/PlcConnectionAdapter.java | 253 +++--
.../java/org/apache/plc4x/edgent/PlcFunctions.java | 4 +
.../plc4x/edgent/PlcConnectionAdapterTest.java | 1030 ++++++++++----------
.../apache/plc4x/edgent/mock/MockConnection.java | 123 ++-
.../plc4x/java/api/connection/PlcReader.java | 17 +-
.../plc4x/java/api/connection/PlcWriter.java | 18 +-
.../plc4x/java/api/messages/PlcReadRequest.java | 79 +-
.../plc4x/java/api/messages/PlcReadResponse.java | 23 +-
.../apache/plc4x/java/api/messages/PlcRequest.java | 72 +-
.../plc4x/java/api/messages/PlcResponse.java | 54 +-
.../plc4x/java/api/messages/PlcWriteRequest.java | 78 +-
.../plc4x/java/api/messages/PlcWriteResponse.java | 23 +-
.../java/api/messages/items/ReadRequestItem.java | 24 +-
.../java/api/messages/items/ReadResponseItem.java | 24 +-
.../plc4x/java/api/messages/items/RequestItem.java | 84 ++
.../{WriteResponseItem.java => ResponseItem.java} | 9 +-
.../java/api/messages/items/WriteRequestItem.java | 33 +-
.../java/api/messages/items/WriteResponseItem.java | 20 +-
.../messages/specific/TypeSafePlcReadRequest.java | 85 ++
.../messages/specific/TypeSafePlcReadResponse.java | 83 ++
.../messages/specific/TypeSafePlcWriteRequest.java | 77 ++
.../specific/TypeSafePlcWriteResponse.java | 59 ++
.../plc4x/java/api/messages/APIMessageTests.java | 231 +++--
.../apache/plc4x/java/PlcDriverManagerTest.java | 52 +-
plc4j/pom.xml | 31 -
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 152 +--
.../plc4x/java/s7/connection/S7PlcConnection.java | 6 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 154 +--
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 112 ++-
.../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 294 +++++-
.../apache/plc4x/java/s7/S7PlcReaderSample.java | 15 +-
.../org/apache/plc4x/java/s7/S7PlcScanner.java | 18 +-
.../org/apache/plc4x/java/s7/S7PlcTestConsole.java | 14 +-
.../apache/plc4x/java/s7/S7PlcWriterSample.java | 11 +-
.../plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 27 +-
.../org/apache/plc4x/java/utils/PcapngUtils.java | 4 +
pom.xml | 36 +-
45 files changed, 2330 insertions(+), 1200 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.