stop double unpacking sources JsonArray during migration of source fi…

…lters.
eclipse-ditto · Mar 8, 2019 · 6d82f56 · 6d82f56
1 parent 43f6944
commit 6d82f56
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/...rg/eclipse/ditto/services/connectivity/messaging/persistence/ConnectionMigrationUtil.java b/...rg/eclipse/ditto/services/connectivity/messaging/persistence/ConnectionMigrationUtil.java
@@ -112,7 +112,7 @@ static class MigrateSourceFilters implements UnaryOperator<JsonObject> {
         @Override
         public JsonObject apply(final JsonObject connectionJsonObject) {
             final Optional<JsonArray> sources = connectionJsonObject.getValue(Connection.JsonFields.SOURCES);
-            if (sources.isPresent() && needsSourceFilterMigration(connectionJsonObject)) {
+            if (sources.isPresent() && needsSourceFilterMigration(sources.get())) {
                 final JsonArray sourcesArray = sources.get().stream()
                         .filter(JsonValue::isObject)
                         .map(JsonValue::asObject)
@@ -124,10 +124,11 @@ public JsonObject apply(final JsonObject connectionJsonObject) {
             }
         }
 
-        private static boolean needsSourceFilterMigration(final JsonObject connectionJsonObject) {
-            final Optional<JsonArray> sources = connectionJsonObject.getValue(Connection.JsonFields.SOURCES);
-            return sources.isPresent() && sources.get().stream().filter(JsonValue::isObject)
-                    .map(JsonValue::asObject).anyMatch(source -> source.contains("filters"));
+        private static boolean needsSourceFilterMigration(final JsonArray sources) {
+            return sources.stream()
+                    .filter(JsonValue::isObject)
+                    .map(JsonValue::asObject)
+                    .anyMatch(source -> source.contains("filters"));
         }
 
         static JsonObject migrateSourceFilters(final JsonObject source) {
@@ -183,8 +184,7 @@ private JsonArray migrateSource(final JsonArray sources) {
             return sources.stream()
                     .filter(JsonValue::isObject)
                     .map(JsonValue::asObject)
-                    .map(o -> MigrateTopicActionSubjectFilters.migrateHeaderMapping(o,
-                            Source.JsonFields.HEADER_MAPPING))
+                    .map(o -> MigrateTopicActionSubjectFilters.migrateHeaderMapping(o, Source.JsonFields.HEADER_MAPPING))
                     .collect(JsonCollectors.valuesToArray());
         }
 
@@ -193,8 +193,7 @@ private JsonArray migrateTarget(final JsonArray targets) {
                     .filter(JsonValue::isObject)
                     .map(JsonValue::asObject)
                     .map(MigrateTopicActionSubjectFilters::migrateTargetAddress)
-                    .map(o -> MigrateTopicActionSubjectFilters.migrateHeaderMapping(o,
-                            Target.JsonFields.HEADER_MAPPING))
+                    .map(o -> MigrateTopicActionSubjectFilters.migrateHeaderMapping(o, Target.JsonFields.HEADER_MAPPING))
                     .collect(JsonCollectors.valuesToArray());
         }