Skip to content

Commit

Permalink
Adapt to moval of ditto-model-messages module
Browse files Browse the repository at this point in the history
Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
  • Loading branch information
Yannic92 committed Apr 29, 2021
1 parent 94b04cf commit 9917d46
Show file tree
Hide file tree
Showing 36 changed files with 97 additions and 97 deletions.
2 changes: 1 addition & 1 deletion java/pom.xml
Expand Up @@ -823,7 +823,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-model-messages</artifactId>
<artifactId>ditto-messages-model</artifactId>
<version>${ditto.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/assembly/assembly.xml
Expand Up @@ -39,7 +39,7 @@
<include>org.eclipse.ditto:ditto-policies-model</include>
<include>org.eclipse.ditto:ditto-things-model</include>
<include>org.eclipse.ditto:ditto-thingsearch-model</include>
<include>org.eclipse.ditto:ditto-model-messages</include>
<include>org.eclipse.ditto:ditto-messages-model</include>
<include>org.eclipse.ditto:ditto-protocol</include>
<include>org.eclipse.ditto:ditto-client</include>
</includes>
Expand Down
Expand Up @@ -58,9 +58,9 @@
import org.eclipse.ditto.base.model.entity.id.WithEntityId;
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageDirection;
import org.eclipse.ditto.model.messages.MessageHeaders;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageDirection;
import org.eclipse.ditto.messages.model.MessageHeaders;
import org.eclipse.ditto.policies.model.Policy;
import org.eclipse.ditto.things.model.Feature;
import org.eclipse.ditto.things.model.Features;
Expand Down
Expand Up @@ -44,8 +44,8 @@
import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
import org.eclipse.ditto.base.model.headers.DittoHeadersBuilder;
import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageDirection;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageDirection;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.protocol.Adaptable;
import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
Expand Down
Expand Up @@ -40,10 +40,10 @@
import org.eclipse.ditto.base.model.headers.entitytag.EntityTagMatcher;
import org.eclipse.ditto.base.model.headers.entitytag.EntityTagMatchers;
import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageBuilder;
import org.eclipse.ditto.model.messages.MessageHeaders;
import org.eclipse.ditto.model.messages.MessagesModelFactory;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageBuilder;
import org.eclipse.ditto.messages.model.MessageHeaders;
import org.eclipse.ditto.messages.model.MessagesModelFactory;
import org.eclipse.ditto.policies.model.Policy;
import org.eclipse.ditto.policies.model.PolicyId;
import org.eclipse.ditto.policies.model.PolicyIdInvalidException;
Expand Down
Expand Up @@ -40,7 +40,7 @@
import org.eclipse.ditto.json.JsonPointer;
import org.eclipse.ditto.json.JsonValue;
import org.eclipse.ditto.json.JsonValueContainer;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.messages.model.Message;
import org.slf4j.Logger;

/**
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/org/eclipse/ditto/client/live/Live.java
Expand Up @@ -40,7 +40,7 @@ public interface Live extends CommonManagement<LiveThingHandle, LiveFeatureHandl
FeaturesCommandHandling, FeaturePropertiesCommandHandling, EventEmitter<GlobalEventFactory> {

/**
* Provides the functionality to create and send a new {@link org.eclipse.ditto.model.messages.Message}
* Provides the functionality to create and send a new {@link org.eclipse.ditto.messages.model.Message}
* <em>FROM</em> or <em>TO</em> a "Live" {@link Thing} or a "Live" Thing's {@link
* org.eclipse.ditto.things.model.Feature Feature}. <p> Example: </p>
* <pre>
Expand Down
Expand Up @@ -29,7 +29,7 @@ public interface LiveFeatureHandle extends FeatureHandle, MessageRegistration, F
EventEmitter<FeatureEventFactory> {

/**
* Provides the functionality to create and send a new {@link org.eclipse.ditto.model.messages.Message} <em>TO</em>
* Provides the functionality to create and send a new {@link org.eclipse.ditto.messages.model.Message} <em>TO</em>
* or <em>FROM</em> the {@code Feature} handled by this {@code LiveFeatureHandle}. <p> Example: </p>
* <pre>
* client.live()
Expand Down
Expand Up @@ -34,7 +34,7 @@ public interface LiveThingHandle
FeaturesCommandHandling, FeaturePropertiesCommandHandling, EventEmitter<ThingEventFactory> {

/**
* Provides the functionality to create and send a new {@link org.eclipse.ditto.model.messages.Message}
* Provides the functionality to create and send a new {@link org.eclipse.ditto.messages.model.Message}
* <em>FROM</em> or <em>TO</em> the {@code Thing} handled by this {@code LiveThingHandle}. <p> Example: </p>
* <pre>
* client.live().forId("org.eclipse.ditto:fireDetectionDevice").message()
Expand Down
Expand Up @@ -49,17 +49,17 @@
import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
import org.eclipse.ditto.model.messages.KnownMessageSubjects;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.messages.model.KnownMessageSubjects;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.things.model.WithThingId;
import org.eclipse.ditto.protocol.Adaptable;
import org.eclipse.ditto.protocol.ProtocolFactory;
import org.eclipse.ditto.protocol.TopicPath;
import org.eclipse.ditto.base.model.signals.Signal;
import org.eclipse.ditto.base.model.signals.commands.Command;
import org.eclipse.ditto.model.messages.signals.commands.MessageCommand;
import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
import org.eclipse.ditto.base.model.signals.events.Event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Expand Up @@ -26,20 +26,20 @@
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.headers.DittoHeadersBuilder;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageBuilder;
import org.eclipse.ditto.model.messages.MessagesModelFactory;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageBuilder;
import org.eclipse.ditto.messages.model.MessagesModelFactory;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.protocol.Adaptable;
import org.eclipse.ditto.protocol.adapter.ProtocolAdapter;
import org.eclipse.ditto.protocol.TopicPath;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
import org.eclipse.ditto.model.messages.signals.commands.MessageCommand;
import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
import org.eclipse.ditto.model.messages.signals.commands.SendFeatureMessage;
import org.eclipse.ditto.model.messages.signals.commands.SendFeatureMessageResponse;
import org.eclipse.ditto.model.messages.signals.commands.SendThingMessage;
import org.eclipse.ditto.model.messages.signals.commands.SendThingMessageResponse;
import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
import org.eclipse.ditto.messages.model.signals.commands.SendFeatureMessage;
import org.eclipse.ditto.messages.model.signals.commands.SendFeatureMessageResponse;
import org.eclipse.ditto.messages.model.signals.commands.SendThingMessage;
import org.eclipse.ditto.messages.model.signals.commands.SendThingMessageResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Expand Up @@ -40,7 +40,7 @@
import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
import org.eclipse.ditto.model.messages.KnownMessageSubjects;
import org.eclipse.ditto.messages.model.KnownMessageSubjects;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.protocol.TopicPath;
import org.eclipse.ditto.base.model.signals.Signal;
Expand Down
Expand Up @@ -26,7 +26,7 @@
import org.eclipse.ditto.client.live.messages.PendingMessageWithThingId;
import org.eclipse.ditto.client.live.messages.internal.ImmutableMessageSender;
import org.eclipse.ditto.client.messaging.MessagingProvider;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.protocol.adapter.ProtocolAdapter;
import org.eclipse.ditto.base.model.signals.Signal;
Expand Down
Expand Up @@ -28,7 +28,7 @@ public interface ClaimMessageRegistration extends HandlerDeregistration {

/**
* Registers a {@link Consumer} to receive {@link RepliableMessage}s with the {@link
* org.eclipse.ditto.model.messages.KnownMessageSubjects#CLAIM_SUBJECT} and the specified payload Java {@code type}
* org.eclipse.ditto.messages.model.KnownMessageSubjects#CLAIM_SUBJECT} and the specified payload Java {@code type}
* . <p> Example: </p>
* <pre>
* DittoClient client = ...
Expand All @@ -53,7 +53,7 @@ <T, U> void registerForClaimMessage(String registrationId, Class<T> type,

/**
* Registers a {@link Consumer} to receive {@link RepliableMessage}'s with the {@link
* org.eclipse.ditto.model.messages.KnownMessageSubjects#CLAIM_SUBJECT} regardless of the payload Java {@code type}
* org.eclipse.ditto.messages.model.KnownMessageSubjects#CLAIM_SUBJECT} regardless of the payload Java {@code type}
* . As a consequence, the Consumer will only be provided with the raw {@link ByteBuffer} payload of the Message.
* <p> Example: </p>
* <pre>
Expand Down
Expand Up @@ -21,7 +21,7 @@
import org.eclipse.ditto.client.ack.ResponseConsumer;
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.things.model.ThingId;

/**
Expand Down
Expand Up @@ -13,7 +13,7 @@
package org.eclipse.ditto.client.live.messages;

/**
* Thrown in case a {@link org.eclipse.ditto.model.messages.Message}'s payload could not be serialized/deserialized
* Thrown in case a {@link org.eclipse.ditto.messages.model.Message}'s payload could not be serialized/deserialized
* appropriately.
*
* @since 1.0.0
Expand Down
Expand Up @@ -16,15 +16,15 @@

/**
* This interface defines the entrance point to the fluent API to create and send a new {@link
* org.eclipse.ditto.model.messages.Message}.
* org.eclipse.ditto.messages.model.Message}.
*
* @param <T> the type of the Message's payload.
* @since 1.0.0
*/
public interface PendingMessage<T> {

/**
* Sets the {@link org.eclipse.ditto.model.messages.Message} as being sent <em>FROM</em> the specified {@link
* Sets the {@link org.eclipse.ditto.messages.model.Message} as being sent <em>FROM</em> the specified {@link
* org.eclipse.ditto.things.model.Thing}.
*
* @param thingId the ID of the Thing from which the Message will be sent.
Expand All @@ -34,7 +34,7 @@ public interface PendingMessage<T> {
MessageSender.SetFeatureIdOrSubject<T> from(ThingId thingId);

/**
* Sets the {@link org.eclipse.ditto.model.messages.Message} as being sent <em>TO</em> the specified {@link
* Sets the {@link org.eclipse.ditto.messages.model.Message} as being sent <em>TO</em> the specified {@link
* org.eclipse.ditto.things.model.Thing}.
*
* @param thingId the identifier of the Thing to which the Message will be sent.
Expand Down
Expand Up @@ -14,23 +14,23 @@

/**
* This interface defines the entrance point to the fluent API to create and send a new {@link
* org.eclipse.ditto.model.messages.Message}.
* org.eclipse.ditto.messages.model.Message}.
*
* @param <T> the type of the Message's payload.
* @since 1.0.0
*/
public interface PendingMessageWithFeatureId<T> {

/**
* Sets the {@link org.eclipse.ditto.model.messages.Message} as being sent <em>FROM</em> the {@link
* Sets the {@link org.eclipse.ditto.messages.model.Message} as being sent <em>FROM</em> the {@link
* org.eclipse.ditto.things.model.Feature}.
*
* @return fluent API builder that provides the functionality to set the subject of the Message.
*/
MessageSender.SetSubject<T> from();

/**
* Sets the {@link org.eclipse.ditto.model.messages.Message} as being sent <em>TO</em> the {@link
* Sets the {@link org.eclipse.ditto.messages.model.Message} as being sent <em>TO</em> the {@link
* org.eclipse.ditto.things.model.Feature}.
*
* @return fluent API builder that provides the functionality to set the subject of the Message.
Expand Down
Expand Up @@ -14,23 +14,23 @@

/**
* This interface defines the entrance point to the fluent API to create and send a new {@link
* org.eclipse.ditto.model.messages.Message}.
* org.eclipse.ditto.messages.model.Message}.
*
* @param <T> the type of the Message's payload.
* @since 1.0.0
*/
public interface PendingMessageWithThingId<T> {

/**
* Sets the {@link org.eclipse.ditto.model.messages.Message} as being sent <em>FROM</em> the {@link
* Sets the {@link org.eclipse.ditto.messages.model.Message} as being sent <em>FROM</em> the {@link
* org.eclipse.ditto.things.model.Thing}.
*
* @return fluent API builder that provides the functionality to set the subject of the Message.
*/
MessageSender.SetSubject<T> from();

/**
* Sets the {@link org.eclipse.ditto.model.messages.Message} as being sent <em>TO</em> the {@link
* Sets the {@link org.eclipse.ditto.messages.model.Message} as being sent <em>TO</em> the {@link
* org.eclipse.ditto.things.model.Thing}.
*
* @return fluent API builder that provides the functionality to set the subject of the Message.
Expand Down
Expand Up @@ -13,7 +13,7 @@
package org.eclipse.ditto.client.live.messages;

import org.eclipse.ditto.client.ack.Acknowledgeable;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.messages.model.Message;

/**
* A {@link Message} which can be replied to.
Expand Down
Expand Up @@ -29,9 +29,9 @@
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.base.model.auth.AuthorizationContext;
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageDirection;
import org.eclipse.ditto.model.messages.MessageHeaders;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageDirection;
import org.eclipse.ditto.messages.model.MessageHeaders;
import org.eclipse.ditto.things.model.ThingId;

/**
Expand Down
Expand Up @@ -34,19 +34,19 @@
import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageBuilder;
import org.eclipse.ditto.model.messages.MessageDirection;
import org.eclipse.ditto.model.messages.MessageHeaders;
import org.eclipse.ditto.model.messages.MessageHeadersBuilder;
import org.eclipse.ditto.model.messages.MessagesModelFactory;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageBuilder;
import org.eclipse.ditto.messages.model.MessageDirection;
import org.eclipse.ditto.messages.model.MessageHeaders;
import org.eclipse.ditto.messages.model.MessageHeadersBuilder;
import org.eclipse.ditto.messages.model.MessagesModelFactory;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
import org.eclipse.ditto.base.model.signals.commands.ErrorResponse;
import org.eclipse.ditto.model.messages.signals.commands.MessageCommandResponse;
import org.eclipse.ditto.model.messages.signals.commands.MessagePayloadSerializer;
import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
import org.eclipse.ditto.messages.model.signals.commands.MessagePayloadSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Expand Up @@ -37,9 +37,9 @@
import org.eclipse.ditto.base.model.acks.AcknowledgementRequest;
import org.eclipse.ditto.base.model.auth.AuthorizationContext;
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageDirection;
import org.eclipse.ditto.model.messages.MessageHeaders;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageDirection;
import org.eclipse.ditto.messages.model.MessageHeaders;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;

Expand Down
Expand Up @@ -12,6 +12,6 @@
*/

/**
* Contains an API for handling {@link org.eclipse.ditto.model.messages.Message Message}s.
* Contains an API for handling {@link org.eclipse.ditto.messages.model.Message Message}s.
*/
package org.eclipse.ditto.client.live.messages;
Expand Up @@ -35,10 +35,10 @@
import org.eclipse.ditto.json.JsonValue;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageDirection;
import org.eclipse.ditto.model.messages.MessageHeaders;
import org.eclipse.ditto.model.messages.MessagesModelFactory;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageDirection;
import org.eclipse.ditto.messages.model.MessageHeaders;
import org.eclipse.ditto.messages.model.MessagesModelFactory;
import org.eclipse.ditto.things.model.Attributes;
import org.eclipse.ditto.things.model.Feature;
import org.eclipse.ditto.things.model.FeatureProperties;
Expand Down
Expand Up @@ -27,10 +27,10 @@
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.json.JsonPointer;
import org.eclipse.ditto.json.JsonValue;
import org.eclipse.ditto.model.messages.Message;
import org.eclipse.ditto.model.messages.MessageDirection;
import org.eclipse.ditto.model.messages.MessageHeaders;
import org.eclipse.ditto.model.messages.MessagesModelFactory;
import org.eclipse.ditto.messages.model.Message;
import org.eclipse.ditto.messages.model.MessageDirection;
import org.eclipse.ditto.messages.model.MessageHeaders;
import org.eclipse.ditto.messages.model.MessagesModelFactory;
import org.eclipse.ditto.things.model.Thing;
import org.eclipse.ditto.things.model.ThingsModelFactory;
import org.eclipse.ditto.base.model.signals.Signal;
Expand Down

0 comments on commit 9917d46

Please sign in to comment.