Skip to content

Commit

Permalink
Restructure things module
Browse files Browse the repository at this point in the history
Signed-off-by: Yannic Klem <[email protected]>
  • Loading branch information
Yannic92 committed Apr 23, 2021
1 parent 37305d7 commit 0dedd39
Show file tree
Hide file tree
Showing 1,109 changed files with 5,663 additions and 8,170 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Build the Docker images
run: |
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-policies-service --build-arg SERVICE_VERSION=0-SNAPSHOT -t eclipse/ditto-policies:$IMAGE_TAG .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-things-starter --build-arg SERVICE_VERSION=0-SNAPSHOT -t eclipse/ditto-things:$IMAGE_TAG .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-things-service --build-arg SERVICE_VERSION=0-SNAPSHOT -t eclipse/ditto-things:$IMAGE_TAG .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-thingsearch-starter --build-arg SERVICE_VERSION=0-SNAPSHOT -t eclipse/ditto-things-search:$IMAGE_TAG .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-concierge-starter --build-arg SERVICE_VERSION=0-SNAPSHOT -t eclipse/ditto-concierge:$IMAGE_TAG .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-gateway-starter --build-arg SERVICE_VERSION=0-SNAPSHOT -t eclipse/ditto-gateway:$IMAGE_TAG .;
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Build the Docker images
run: |
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-policies-service --build-arg SERVICE_VERSION=$IMAGE_TAG -t eclipse/ditto-policies:$IMAGE_TAG -t eclipse/ditto-policies:$IMAGE_MINOR_TAG -t eclipse/ditto-policies:$IMAGE_MAJOR_TAG -t eclipse/ditto-policies:latest .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-things-starter --build-arg SERVICE_VERSION=$IMAGE_TAG -t eclipse/ditto-things:$IMAGE_TAG -t eclipse/ditto-things:$IMAGE_MINOR_TAG -t eclipse/ditto-things:$IMAGE_MAJOR_TAG -t eclipse/ditto-things:latest .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-things-service --build-arg SERVICE_VERSION=$IMAGE_TAG -t eclipse/ditto-things:$IMAGE_TAG -t eclipse/ditto-things:$IMAGE_MINOR_TAG -t eclipse/ditto-things:$IMAGE_MAJOR_TAG -t eclipse/ditto-things:latest .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-thingsearch-starter --build-arg SERVICE_VERSION=$IMAGE_TAG -t eclipse/ditto-things-search:$IMAGE_TAG -t eclipse/ditto-things-search:$IMAGE_MINOR_TAG -t eclipse/ditto-things-search:$IMAGE_MAJOR_TAG -t eclipse/ditto-things-search:latest .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-concierge-starter --build-arg SERVICE_VERSION=$IMAGE_TAG -t eclipse/ditto-concierge:$IMAGE_TAG -t eclipse/ditto-concierge:$IMAGE_MINOR_TAG -t eclipse/ditto-concierge:$IMAGE_MAJOR_TAG -t eclipse/ditto-concierge:latest .;
docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-gateway-starter --build-arg SERVICE_VERSION=$IMAGE_TAG -t eclipse/ditto-gateway:$IMAGE_TAG -t eclipse/ditto-gateway:$IMAGE_MINOR_TAG -t eclipse/ditto-gateway:$IMAGE_MAJOR_TAG -t eclipse/ditto-gateway:latest .;
Expand Down
54 changes: 4 additions & 50 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-model-things</artifactId>
<artifactId>ditto-things-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -503,11 +503,6 @@
<artifactId>ditto-signals-acks-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-acks-things</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-commands-base</artifactId>
Expand All @@ -533,11 +528,6 @@
<artifactId>ditto-signals-commands-namespaces</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-commands-things</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-commands-thingsearch</artifactId>
Expand All @@ -564,11 +554,6 @@
<artifactId>ditto-signals-events-connectivity</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-events-things</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-events-thingsearch</artifactId>
Expand Down Expand Up @@ -722,7 +707,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-services-models-things</artifactId>
<artifactId>ditto-things-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -839,28 +824,11 @@
<artifactId>ditto-policies-service</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-services-things-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-services-things-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-services-things-persistence</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-services-things-starter</artifactId>
<artifactId>ditto-things-service</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-services-thingsearch-config</artifactId>
Expand Down Expand Up @@ -1083,7 +1051,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-model-things</artifactId>
<artifactId>ditto-things-model</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
Expand Down Expand Up @@ -1111,13 +1079,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-commands-things</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.ditto</groupId>
Expand All @@ -1126,13 +1087,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-signals-events-things</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.ditto</groupId>
Expand Down
2 changes: 1 addition & 1 deletion model/connectivity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-model-things</artifactId>
<artifactId>ditto-things-model</artifactId>
</dependency>

<!-- ### Testing ### -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;

import org.eclipse.ditto.model.things.ThingFieldSelector;
import org.eclipse.ditto.things.model.ThingFieldSelector;

/**
* A mutable builder with a fluent API for creating a {@link FilteredTopic}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import javax.annotation.concurrent.NotThreadSafe;

import org.eclipse.ditto.json.JsonFieldSelector;
import org.eclipse.ditto.model.things.ThingFieldSelector;
import org.eclipse.ditto.things.model.ThingFieldSelector;

/**
* Immutable implementation of {@link FilteredTopic}.
Expand Down Expand Up @@ -81,7 +81,7 @@ public static ImmutableFilteredTopicBuilder getBuilder(final Topic topic) {
* @param filteredTopicString the string representation of a FilteredTopic.
* @return instance.
* @throws NullPointerException if {@code filteredTopicString} is {@code null}.
* @throws org.eclipse.ditto.model.things.InvalidThingFieldSelectionException when the given
* @throws org.eclipse.ditto.things.model.InvalidThingFieldSelectionException when the given
* {@code filteredTopicString} contained a field selector with invalid fields.
*/
public static ImmutableFilteredTopic fromString(final String filteredTopicString) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.eclipse.ditto.json.JsonObjectBuilder;
import org.eclipse.ditto.json.JsonParseException;
import org.eclipse.ditto.model.base.json.JsonSchemaVersion;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* Immutable implementation of {@link LogEntry}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.eclipse.ditto.model.base.json.FieldType;
import org.eclipse.ditto.model.base.json.JsonSchemaVersion;
import org.eclipse.ditto.model.base.json.Jsonifiable;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* Represents connection log entry.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import javax.annotation.Nullable;

import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* A mutable builder for a {@link org.eclipse.ditto.model.connectivity.LogEntry} with a fluent API.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import org.assertj.core.util.Lists;
import org.eclipse.ditto.json.JsonFieldSelector;
import org.eclipse.ditto.model.things.ThingFieldSelector;
import org.eclipse.ditto.things.model.ThingFieldSelector;
import org.junit.Test;

import nl.jqno.equalsverifier.EqualsVerifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.eclipse.ditto.json.JsonFactory;
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.json.JsonParseException;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;
import org.junit.Test;

import nl.jqno.equalsverifier.EqualsVerifier;
Expand Down
2 changes: 1 addition & 1 deletion model/enforcers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-model-things</artifactId>
<artifactId>ditto-things-model</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.eclipse.ditto.policies.model.Policy;
import org.eclipse.ditto.policies.model.PolicyId;
import org.eclipse.ditto.policies.model.SubjectIssuer;
import org.eclipse.ditto.model.things.Thing;
import org.eclipse.ditto.model.things.ThingsModelFactory;
import org.eclipse.ditto.things.model.Thing;
import org.eclipse.ditto.things.model.ThingsModelFactory;


public interface JsonViewScenario extends Scenario {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
import org.eclipse.ditto.policies.model.SubjectId;
import org.eclipse.ditto.policies.model.SubjectIssuer;
import org.eclipse.ditto.policies.model.SubjectType;
import org.eclipse.ditto.model.things.Feature;
import org.eclipse.ditto.model.things.Features;
import org.eclipse.ditto.model.things.Thing;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.model.things.ThingsModelFactory;
import org.eclipse.ditto.things.model.Feature;
import org.eclipse.ditto.things.model.Features;
import org.eclipse.ditto.things.model.Thing;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.things.model.ThingsModelFactory;

/**
* Tests Policy with granted permissions only.
Expand Down
2 changes: 1 addition & 1 deletion model/messages/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.ditto</groupId>
<artifactId>ditto-model-things</artifactId>
<artifactId>ditto-things-model</artifactId>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.eclipse.ditto.model.base.exceptions.DittoHeaderInvalidException;
import org.eclipse.ditto.model.base.headers.AbstractHeaderValueValidator;
import org.eclipse.ditto.model.base.headers.HeaderDefinition;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.model.things.ThingIdInvalidException;
import org.eclipse.ditto.things.model.ThingId;
import org.eclipse.ditto.things.model.ThingIdInvalidException;

/**
* This validator checks if a CharSequence is a valid {@link ThingId}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.eclipse.ditto.model.base.auth.AuthorizationContext;
import org.eclipse.ditto.model.base.common.ByteBufferUtils;
import org.eclipse.ditto.model.base.common.HttpStatus;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* An Immutable implementation of {@link Message}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.eclipse.ditto.model.base.headers.DittoHeaderDefinition;
import org.eclipse.ditto.model.base.headers.DittoHeaders;
import org.eclipse.ditto.model.base.headers.HeaderDefinition;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* Immutable implementation of {@code MessageHeaders}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.model.base.auth.AuthorizationContext;
import org.eclipse.ditto.model.base.common.HttpStatus;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* Represents a {@code Message} <em>FROM</em> or <em>TO</em> a {@code Thing} or a {@code Feature}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import javax.annotation.concurrent.NotThreadSafe;

import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* A mutable builder with a fluent API for an immutable {@link Message}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.model.base.common.HttpStatus;
import org.eclipse.ditto.model.base.headers.DittoHeaders;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* This interface represents headers to be used for {@link Message}s.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.eclipse.ditto.model.base.common.HttpStatus;
import org.eclipse.ditto.model.base.headers.AbstractDittoHeadersBuilder;
import org.eclipse.ditto.model.base.headers.DittoHeaders;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* A mutable builder with a fluent API for an immutable {@link MessageHeaders} object.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.eclipse.ditto.model.base.exceptions.DittoRuntimeExceptionBuilder;
import org.eclipse.ditto.model.base.headers.DittoHeaders;
import org.eclipse.ditto.model.base.json.JsonParsableException;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* Thrown if a message cannot be send because the affected thing does not exist or because of a missing permission.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import javax.annotation.concurrent.Immutable;

import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;

/**
* Factory that creates new {@code messages} objects.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;

import org.eclipse.ditto.model.base.exceptions.DittoHeaderInvalidException;
import org.eclipse.ditto.model.things.ThingIdInvalidException;
import org.eclipse.ditto.things.model.ThingIdInvalidException;
import org.junit.Test;

public final class DittoMessageThingIdValueValidatorTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import java.time.Duration;

import org.eclipse.ditto.json.JsonObject;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;
import org.junit.Test;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.eclipse.ditto.model.base.headers.DittoHeaderDefinition;
import org.eclipse.ditto.model.base.headers.DittoHeaders;
import org.eclipse.ditto.model.base.json.JsonSchemaVersion;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;
import org.junit.Test;

import nl.jqno.equalsverifier.EqualsVerifier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.eclipse.ditto.model.base.common.HttpStatus;
import org.eclipse.ditto.model.base.exceptions.DittoHeaderInvalidException;
import org.eclipse.ditto.model.base.headers.DittoHeaderDefinition;
import org.eclipse.ditto.model.things.ThingId;
import org.eclipse.ditto.things.model.ThingId;
import org.junit.Before;
import org.junit.Test;

Expand Down
1 change: 0 additions & 1 deletion model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<module>namespaces</module>
<module>enforcers</module>
<module>jwt</module>
<module>things</module>
<module>thingsearch</module>
<module>thingsearch-parser</module>
<module>query</module>
Expand Down
Loading

0 comments on commit 0dedd39

Please sign in to comment.