From becae16234278847b79aea15242386013403eb27 Mon Sep 17 00:00:00 2001 From: cgardens Date: Sat, 18 Jun 2022 17:12:36 -0700 Subject: [PATCH] clean up --- .../test/java/io/airbyte/commons/util/MoreListsTest.java | 7 +++---- .../config/persistence/split_secrets/SecretsHelpers.java | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airbyte-commons/src/test/java/io/airbyte/commons/util/MoreListsTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/util/MoreListsTest.java index 7672bffd589e..3243f370bc57 100644 --- a/airbyte-commons/src/test/java/io/airbyte/commons/util/MoreListsTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/util/MoreListsTest.java @@ -6,7 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -36,7 +35,7 @@ void testReverse() { @Test void testConcat() { final List> lists = List.of(List.of(1, 2, 3), List.of(4, 5, 6), List.of(7, 8, 9)); - final List expected = List.of(1,2,3,4,5,6,7,8,9); + final List expected = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9); final List actual = MoreLists.concat(lists.get(0), lists.get(1), lists.get(2)); assertEquals(expected, actual); } @@ -45,9 +44,9 @@ void testConcat() { void testAdd() { final List originalList = List.of(1, 2, 3); - assertEquals(List.of(1,2,3,4), MoreLists.add(originalList, 4)); + assertEquals(List.of(1, 2, 3, 4), MoreLists.add(originalList, 4)); // verify original list was not mutated. - assertEquals(List.of(1,2,3), originalList); + assertEquals(List.of(1, 2, 3), originalList); } } diff --git a/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java b/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java index edeb7c89b0aa..eef92dcdfd97 100644 --- a/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java +++ b/airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java @@ -177,6 +177,7 @@ public static List getSortedSecretPaths(final JsonNode spec) { .stream() .anyMatch(field -> field.getKey().equals(JsonSecretsProcessor.AIRBYTE_SECRET_FIELD))) .stream() + .map(JsonPaths::mapJsonSchemaPathToJsonPath) .sorted() .toList(); }