[#1761] Add AMQP adapter client. #1765

b-abel · 2020-02-12T11:09:00Z

This is the first solution for #1761, which on the one hand uses existing code from the client module and on the other hand aims to expose as few classes as possible to the outside world that are designed for internal use in the protocol adapters.

The entry point is the factory interface AmqpAdapterClientFactory, which can be used to create clients.
I had to put some classes into the existing client.impl package because of the visibility of the code used, the rest I tried to separate a little bit.
Tests (and documentation) will be added once we have agreed on the overall direction.

It is a quick and easy solution, in a next step it would be good to have a simpler client interface that does not expose the link handling and scopes the connection to the tenant, but provides simple send methods. I hope to do another PR on this soon. For that, I would make a separate Maven module with minimal dependencies.

b-abel · 2020-02-19T13:37:19Z

Added tracing and inherit from classes used inside the protocol adapters.

client/src/main/java/org/eclipse/hono/client/device/amqp/AmqpAdapterClientFactory.java

...main/java/org/eclipse/hono/client/device/amqp/internal/AmqpAdapterClientCommandConsumer.java

client/src/main/java/org/eclipse/hono/client/device/amqp/internal/AmqpSenderLink.java

client/src/main/java/org/eclipse/hono/client/device/amqp/TraceableCommandResponder.java

client/src/main/java/org/eclipse/hono/client/impl/AmqpAdapterClientCommandResponseSender.java

client/src/main/java/org/eclipse/hono/client/impl/AmqpAdapterClientEventSenderImpl.java

client/src/main/java/org/eclipse/hono/client/impl/AmqpAdapterClientTelemetrySenderImpl.java

client/src/main/java/org/eclipse/hono/client/impl/AmqpAdapterClientCommandResponseSender.java

client/src/main/java/org/eclipse/hono/client/impl/AmqpAdapterClientEventSenderImpl.java

client/src/main/java/org/eclipse/hono/client/impl/AmqpAdapterClientTelemetrySenderImpl.java

b-abel · 2020-03-09T09:06:27Z

@calohmn What is the status of this issue?

calohmn · 2020-03-10T07:30:42Z

@b-abel Can you squash and rebase (also to check with the new checkstyle rules introduced since) ?

b-abel · 2020-03-10T09:24:28Z

Done.

calohmn

LGTM

client/src/main/java/org/eclipse/hono/client/device/amqp/TraceableCommandResponder.java

client/src/main/java/org/eclipse/hono/client/device/amqp/AmqpAdapterClientFactory.java

sophokles73

LGTM

client/src/main/java/org/eclipse/hono/client/device/amqp/AmqpAdapterClientFactory.java

client/src/main/java/org/eclipse/hono/client/device/amqp/TraceableCommandResponder.java

sophokles73 · 2020-03-11T12:36:15Z

@b-abel are you going to integrate this new client into the protocol gateway example code?

b-abel · 2020-03-11T12:44:36Z

@b-abel are you going to integrate this new client into the protocol gateway example code?

Yes.

b-abel · 2020-03-11T12:48:10Z

I would add tests and documentation to this PR. Or do you prefer to open a new one for that?

sophokles73 · 2020-03-11T12:51:25Z

@b-abel any way you want it ... as long as you do create docs and tests ;-)

sophokles73 · 2020-03-11T13:13:11Z

@b-abel so, what's it gonna be? This PR or a separate one?

b-abel · 2020-03-11T14:36:13Z

I will add them in this PR.

sophokles73 · 2020-03-17T12:23:25Z

@b-abel what is the status of this PR? Are you still working on docs and tests?

b-abel · 2020-03-18T11:25:14Z

@b-abel what is the status of this PR? Are you still working on docs and tests?

Yes.

b-abel · 2020-03-18T17:53:17Z

@b-abel what is the status of this PR? Are you still working on docs and tests?

Done.

client/src/test/java/org/eclipse/hono/client/device/amqp/TelemetrySenderTest.java

client/src/test/java/org/eclipse/hono/client/device/amqp/EventSenderTest.java

client/src/test/java/org/eclipse/hono/client/device/amqp/TraceableCommandResponderTest.java

site/documentation/content/dev-guide/amqp_adapter_client.md

b-abel · 2020-03-23T07:36:58Z

I added the requested changes.

...src/test/java/org/eclipse/hono/client/AbstractAmqpAdapterClientDownstreamSenderTestBase.java

client/src/test/java/org/eclipse/hono/client/device/amqp/CommandResponderTest.java

Device (or gateway) clients that connect to the AMQP adapter can be created using AmqpAdapterClientFactory. The implementation reopens closed connections and restores the receiver link for consuming commands afterward. Sender links are cached and removed from the cache when closed so that they are recreated the next time they are retrieved from the factory. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

…ownstream messages. Having the content type required to send telemetry, event or command responses was a copy&paste error. The content type might not always be available. + Fix Javadoc around that. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

…write required ones. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

…Client. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

… Adapter Client. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

b-abel · 2020-03-23T14:58:19Z

I just pushed an update.

sophokles73 · 2020-03-23T16:34:33Z

client/src/test/java/org/eclipse/hono/client/device/amqp/TelemetrySenderTest.java

+        deliveryFuture.setHandler(ctx.completing());
+
+        // THEN the future waits for the disposition to be updated by the peer
+        Thread.sleep(100L);


can you please make sure to remove all occurrences of this?

Sorry, I missed them.

…p() from tests. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

sophokles73

LGTM

b-abel requested a review from calohmn as a code owner February 12, 2020 11:09

b-abel force-pushed the 1761_amqp_adapter_client branch from e6d1c0c to 4de17bb Compare February 19, 2020 13:35

calohmn reviewed Feb 20, 2020

View reviewed changes

calohmn added Client enhancement labels Feb 20, 2020

b-abel mentioned this pull request Feb 20, 2020

Improve usability of CLI #1486

Closed

calohmn reviewed Feb 20, 2020

View reviewed changes

b-abel force-pushed the 1761_amqp_adapter_client branch from f23135b to 62d06b1 Compare March 10, 2020 09:24

calohmn approved these changes Mar 10, 2020

View reviewed changes

sophokles73 reviewed Mar 10, 2020

View reviewed changes

client/src/main/java/org/eclipse/hono/client/device/amqp/TraceableCommandResponder.java Show resolved Hide resolved

client/src/main/java/org/eclipse/hono/client/device/amqp/AmqpAdapterClientFactory.java Show resolved Hide resolved

sophokles73 approved these changes Mar 11, 2020

View reviewed changes

client/src/main/java/org/eclipse/hono/client/device/amqp/AmqpAdapterClientFactory.java Show resolved Hide resolved

client/src/main/java/org/eclipse/hono/client/device/amqp/TraceableCommandResponder.java Show resolved Hide resolved

sophokles73 added this to In progress in 1.2.0 via automation Mar 11, 2020

sophokles73 added this to the 1.2.0 milestone Mar 11, 2020

b-abel force-pushed the 1761_amqp_adapter_client branch from c57a1be to 7ae1740 Compare March 18, 2020 17:52

sophokles73 reviewed Mar 19, 2020

View reviewed changes

sophokles73 reviewed Mar 23, 2020

View reviewed changes

b-abel added 6 commits March 23, 2020 15:53

[eclipse-hono#1761] Fix: custom application properties no longer over…

b22a2ff

…write required ones. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

[eclipse-hono#1761] Add tests and documentation for the AMQP Adapter …

e9d2568

…Client. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

[eclipse-hono#1761] Add tests, documentation and example for the AMQP…

baaac20

… Adapter Client. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

[eclipse-hono#1761] Requested changes: use constants and helper methods.

a89fe00

Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

b-abel force-pushed the 1761_amqp_adapter_client branch from 636840e to a89fe00 Compare March 23, 2020 14:56

sophokles73 reviewed Mar 23, 2020

View reviewed changes

[eclipse-hono#1761] Requested changes: remove superfluous Thread.slee…

5dcecd4

…p() from tests. Signed-off-by: Abel Buechner-Mihaljevic <abel.buechner-mihaljevic@bosch.io>

sophokles73 approved these changes Mar 24, 2020

View reviewed changes

sophokles73 merged commit e07eb47 into eclipse-hono:master Mar 24, 2020

1.2.0 automation moved this from In progress to Done Mar 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#1761] Add AMQP adapter client. #1765

[#1761] Add AMQP adapter client. #1765

b-abel commented Feb 12, 2020

b-abel commented Feb 19, 2020

b-abel commented Mar 9, 2020

calohmn commented Mar 10, 2020

b-abel commented Mar 10, 2020

calohmn left a comment

sophokles73 left a comment

sophokles73 commented Mar 11, 2020

b-abel commented Mar 11, 2020

b-abel commented Mar 11, 2020

sophokles73 commented Mar 11, 2020

sophokles73 commented Mar 11, 2020

b-abel commented Mar 11, 2020

sophokles73 commented Mar 17, 2020

b-abel commented Mar 18, 2020

b-abel commented Mar 18, 2020

b-abel commented Mar 23, 2020

b-abel commented Mar 23, 2020

sophokles73 Mar 23, 2020

b-abel Mar 23, 2020

sophokles73 left a comment

[#1761] Add AMQP adapter client. #1765

[#1761] Add AMQP adapter client. #1765

Conversation

b-abel commented Feb 12, 2020

b-abel commented Feb 19, 2020

b-abel commented Mar 9, 2020

calohmn commented Mar 10, 2020

b-abel commented Mar 10, 2020

calohmn left a comment

Choose a reason for hiding this comment

sophokles73 left a comment

Choose a reason for hiding this comment

sophokles73 commented Mar 11, 2020

b-abel commented Mar 11, 2020

b-abel commented Mar 11, 2020

sophokles73 commented Mar 11, 2020

sophokles73 commented Mar 11, 2020

b-abel commented Mar 11, 2020

sophokles73 commented Mar 17, 2020

b-abel commented Mar 18, 2020

b-abel commented Mar 18, 2020

b-abel commented Mar 23, 2020

b-abel commented Mar 23, 2020

sophokles73 Mar 23, 2020

Choose a reason for hiding this comment

b-abel Mar 23, 2020

Choose a reason for hiding this comment

sophokles73 left a comment

Choose a reason for hiding this comment