Issue eclipse-ditto#878: review: renamed methid PublisherIndex.allot.…

….. to assign... Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
bosch-io · Nov 25, 2020 · 0792e18 · 0792e18
1 parent 05d3591
commit 0792e18
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.../utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/actors/Publisher.java b/.../utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/actors/Publisher.java
@@ -160,7 +160,8 @@ private List<Pair<ActorRef, PublishSignal>> doPublish(final Collection<String> t
         topicCounter.increment(topics.size());
         final List<Long> hashes = topics.stream().map(ddataReader::approximate).collect(Collectors.toList());
         final ActorRef sender = getSender();
-        final List<Pair<ActorRef, PublishSignal>> subscribers = publisherIndex.allotGroupsToSubscribers(signal, hashes);
+        final List<Pair<ActorRef, PublishSignal>> subscribers =
+                publisherIndex.assignGroupsToSubscribers(signal, hashes);
         subscribers.forEach(pair -> pair.first().tell(pair.second(), sender));
         return subscribers;
     }

diff --git a/...s/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/actors/PublisherIndex.java b/...s/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/actors/PublisherIndex.java
@@ -75,11 +75,11 @@ static PublisherIndex<String> fromSubscriptionsReader(final SubscriptionsReader
         return new PublisherIndex<>(index, filterMap);
     }
 
-    List<Pair<ActorRef, PublishSignal>> allotGroupsToSubscribers(final Signal<?> signal, final Collection<T> topics) {
-        return allotGroupsToSubscribers(signal, topics, null);
+    List<Pair<ActorRef, PublishSignal>> assignGroupsToSubscribers(final Signal<?> signal, final Collection<T> topics) {
+        return assignGroupsToSubscribers(signal, topics, null);
     }
 
-    List<Pair<ActorRef, PublishSignal>> allotGroupsToSubscribers(final Signal<?> signal, final Collection<T> topics,
+    List<Pair<ActorRef, PublishSignal>> assignGroupsToSubscribers(final Signal<?> signal, final Collection<T> topics,
             @Nullable final Map<String, Integer> chosenGroups) {
         final Map<String, List<ActorRef>> groupToSubscribers = new HashMap<>();
         final Map<ActorRef, Map<String, Integer>> subscriberToChosenGroups = new HashMap<>();

diff --git a/...utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/actors/Subscriber.java b/...utils/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/actors/Subscriber.java
@@ -96,7 +96,7 @@ private void broadcastToLocalSubscribers(final PublishSignal command) {
         final T message = messageClass.cast(command.getSignal());
         final Collection<String> topics = topicExtractor.getTopics(message);
         final Set<ActorRef> localSubscribers =
-                publisherIndex.allotGroupsToSubscribers(message, topics, command.getGroups())
+                publisherIndex.assignGroupsToSubscribers(message, topics, command.getGroups())
                         .stream()
                         .map(Pair::first)
                         .collect(Collectors.toSet());

diff --git a/signals/base/src/main/java/org/eclipse/ditto/signals/base/AbstractJsonParsableRegistry.java b/signals/base/src/main/java/org/eclipse/ditto/signals/base/AbstractJsonParsableRegistry.java
@@ -96,7 +96,7 @@ private T fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders,
             try {
                 return jsonObjectParsable.parse(jsonObject, dittoHeaders, inner);
             } catch (final JsonRuntimeException jre) {
-                final JsonExceptionBuilder builder = JsonRuntimeException.newBuilder(jre.getErrorCode())
+                final JsonExceptionBuilder<?> builder = JsonRuntimeException.newBuilder(jre.getErrorCode())
                         .message("Error when parsing Json type '" + type + "': " + jre.getMessage())
                         .cause(jre.getCause());
                 jre.getDescription().ifPresent(builder::description);

diff --git a/signals/base/src/main/java/org/eclipse/ditto/signals/base/JsonParsable.java b/signals/base/src/main/java/org/eclipse/ditto/signals/base/JsonParsable.java
@@ -80,6 +80,6 @@ interface ParseInnerJson {
          * @return the deserialized Jsonifiable object.
          * @throws NotSerializableException if inner JSON cannot be deserialized.
          */
-        Jsonifiable<?> parseInnerJson(final JsonObject jsonObject) throws NotSerializableException;
+        Jsonifiable<?> parseInnerJson(JsonObject jsonObject) throws NotSerializableException;
     }
 }