Organized some imports and sorted Ditto modules alphabetically.

Signed-off-by: Juergen Fickel <juergen.fickel@bosch.io>
eclipse-ditto · Sep 6, 2021 · 4665e03 · 4665e03
1 parent a543c91
commit 4665e03
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 34 deletions.
diff --git a/.../main/java/org/eclipse/ditto/gateway/service/endpoints/routes/policies/PoliciesRoute.java b/.../main/java/org/eclipse/ditto/gateway/service/endpoints/routes/policies/PoliciesRoute.java
@@ -41,9 +41,6 @@
 import org.eclipse.ditto.policies.model.SubjectAnnouncement;
 import org.eclipse.ditto.policies.model.SubjectExpiry;
 import org.eclipse.ditto.policies.model.SubjectId;
-import org.eclipse.ditto.protocol.HeaderTranslator;
-import org.eclipse.ditto.gateway.service.endpoints.routes.AbstractRoute;
-import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.policies.model.signals.commands.actions.ActivateTokenIntegration;
 import org.eclipse.ditto.policies.model.signals.commands.actions.DeactivateTokenIntegration;
 import org.eclipse.ditto.policies.model.signals.commands.actions.TopLevelPolicyActionCommand;

diff --git a/pom.xml b/pom.xml
@@ -187,24 +187,24 @@
     </developers>
 
     <modules>
+        <module>base</module>
         <module>bom</module>
-        <module>legal</module>
+        <module>concierge</module>
+        <module>connectivity</module>
         <module>documentation</module>
+        <module>gateway</module>
+        <module>internal</module>
         <module>json</module>
         <module>json-cbor</module>
-        <module>protocol</module>
-        <module>utils</module>
-        <module>internal</module>
+        <module>jwt</module>
+        <module>legal</module>
+        <module>messages</module>
         <module>policies</module>
+        <module>protocol</module>
+        <module>rql</module>
         <module>things</module>
-        <module>base</module>
-        <module>concierge</module>
-        <module>connectivity</module>
-        <module>gateway</module>
         <module>thingsearch</module>
-        <module>rql</module>
-        <module>jwt</module>
-        <module>messages</module>
+        <module>utils</module>
     </modules>
 
     <properties>

diff --git a/...e/ditto/services/thingsearch/persistence/write/streaming/DefaultSearchUpdateListener.java b/...e/ditto/services/thingsearch/persistence/write/streaming/DefaultSearchUpdateListener.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.services.thingsearch.persistence.write.streaming;
+package org.eclipse.ditto.thingsearch.service.persistence.write.streaming;
 
 import java.util.List;
 
-import org.eclipse.ditto.services.thingsearch.persistence.write.model.AbstractWriteModel;
+import org.eclipse.ditto.thingsearch.service.persistence.write.model.AbstractWriteModel;
 
 import akka.actor.ActorSystem;
 
 /**
  * Default {@code SearchUpdateListener} for custom search update processing.
  */
-public final class DefaultSearchUpdateListener extends SearchUpdateListener{
+public final class DefaultSearchUpdateListener extends SearchUpdateListener {
 
     /**
      * Instantiate this provider. Called by reflection.

diff --git a/.../eclipse/ditto/services/thingsearch/persistence/write/streaming/SearchUpdateListener.java b/.../eclipse/ditto/services/thingsearch/persistence/write/streaming/SearchUpdateListener.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.services.thingsearch.persistence.write.streaming;
+package org.eclipse.ditto.thingsearch.service.persistence.write.streaming;
 
 import java.util.List;
 
-import org.eclipse.ditto.services.thingsearch.common.config.DittoSearchConfig;
-import org.eclipse.ditto.services.thingsearch.common.config.SearchConfig;
-import org.eclipse.ditto.services.thingsearch.persistence.write.model.AbstractWriteModel;
-import org.eclipse.ditto.services.utils.akka.AkkaClassLoader;
-import org.eclipse.ditto.services.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.internal.utils.akka.AkkaClassLoader;
+import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.thingsearch.service.common.config.DittoSearchConfig;
+import org.eclipse.ditto.thingsearch.service.common.config.SearchConfig;
+import org.eclipse.ditto.thingsearch.service.persistence.write.model.AbstractWriteModel;
 
 import akka.actor.AbstractExtensionId;
 import akka.actor.ActorSystem;

diff --git a/...pi/src/main/java/org/eclipse/ditto/thingsearch/api/commands/sudo/UpdateThingResponse.java b/...pi/src/main/java/org/eclipse/ditto/thingsearch/api/commands/sudo/UpdateThingResponse.java
@@ -19,22 +19,22 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableCommandResponse;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
+import org.eclipse.ditto.base.model.signals.commands.AbstractCommandResponse;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.json.JsonFieldMarker;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonPointer;
-import org.eclipse.ditto.base.model.common.HttpStatus;
-import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.json.JsonParsableCommandResponse;
-import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingId;
-import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
-import org.eclipse.ditto.base.model.signals.commands.AbstractCommandResponse;
 import org.eclipse.ditto.thingsearch.model.signals.commands.ThingSearchCommand;
 import org.eclipse.ditto.thingsearch.model.signals.commands.ThingSearchCommandResponse;
 import org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault;
@@ -47,8 +47,8 @@
 @AllValuesAreNonnullByDefault
 @JsonParsableCommandResponse(type = UpdateThingResponse.TYPE)
 // When making this a ThingSearchCommand, beware that it is WithId but actually yes.
-public final class UpdateThingResponse extends AbstractCommandResponse<UpdateThingResponse> implements
-        SignalWithEntityId<UpdateThingResponse> {
+public final class UpdateThingResponse extends AbstractCommandResponse<UpdateThingResponse>
+        implements SignalWithEntityId<UpdateThingResponse> {
 
     /**
      * Type of this command.

diff --git a/...clipse/ditto/thingsearch/service/persistence/write/streaming/TestSearchUpdaterStream.java b/...clipse/ditto/thingsearch/service/persistence/write/streaming/TestSearchUpdaterStream.java
@@ -50,9 +50,12 @@ private TestSearchUpdaterStream(final MongoSearchUpdaterFlow mongoSearchUpdaterF
      * @param database the MongoDB database.
      * @return the test stream.
      */
-    public static TestSearchUpdaterStream of(final MongoDatabase database, final SearchUpdateListener searchUpdateListener) {
+    public static TestSearchUpdaterStream of(final MongoDatabase database,
+            final SearchUpdateListener searchUpdateListener) {
+
         final var mongoSearchUpdaterFlow = MongoSearchUpdaterFlow.of(database,
-                DefaultPersistenceStreamConfig.of(ConfigFactory.empty()),searchUpdateListener);
+                DefaultPersistenceStreamConfig.of(ConfigFactory.empty()),
+                searchUpdateListener);
         return new TestSearchUpdaterStream(mongoSearchUpdaterFlow);
     }
 

diff --git a/...ain/java/org/eclipse/ditto/thingsearch/service/updater/actors/SearchUpdaterRootActor.java b/...ain/java/org/eclipse/ditto/thingsearch/service/updater/actors/SearchUpdaterRootActor.java
@@ -33,6 +33,7 @@
 import org.eclipse.ditto.thingsearch.service.persistence.read.ThingsSearchPersistence;
 import org.eclipse.ditto.thingsearch.service.persistence.write.impl.MongoThingsSearchUpdaterPersistence;
 import org.eclipse.ditto.thingsearch.service.persistence.write.streaming.ChangeQueueActor;
+import org.eclipse.ditto.thingsearch.service.persistence.write.streaming.SearchUpdateListener;
 import org.eclipse.ditto.thingsearch.service.persistence.write.streaming.SearchUpdaterStream;
 
 import com.mongodb.event.CommandListener;

diff --git a/...g/eclipse/ditto/thingsearch/service/persistence/AbstractThingSearchPersistenceITBase.java b/...g/eclipse/ditto/thingsearch/service/persistence/AbstractThingSearchPersistenceITBase.java
@@ -33,6 +33,7 @@
 import org.eclipse.ditto.thingsearch.service.common.model.ResultList;
 import org.eclipse.ditto.thingsearch.service.persistence.read.MongoThingsSearchPersistence;
 import org.eclipse.ditto.thingsearch.service.persistence.read.query.MongoQueryBuilderFactory;
+import org.eclipse.ditto.thingsearch.service.persistence.write.streaming.SearchUpdateListener;
 import org.eclipse.ditto.thingsearch.service.persistence.write.streaming.TestSearchUpdaterStream;
 import org.eclipse.ditto.internal.utils.persistence.mongo.DittoMongoClient;
 import org.eclipse.ditto.internal.utils.persistence.mongo.MongoClientWrapper;

diff --git a/...ice/src/test/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchActorIT.java b/...ice/src/test/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchActorIT.java
@@ -29,7 +29,6 @@
 import org.eclipse.ditto.base.model.auth.AuthorizationSubject;
 import org.eclipse.ditto.base.model.auth.DittoAuthorizationContextType;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.DittoMongoClient;
 import org.eclipse.ditto.internal.utils.persistence.mongo.MongoClientWrapper;
 import org.eclipse.ditto.internal.utils.test.mongo.MongoDbResource;