Skip to content

Commit bf9cd2b

Browse files
gosusnpgosusnp
authored
Remove unused interfaces (#18880)
1 parent b1ca1c2 commit bf9cd2b

File tree

5 files changed

+5
-140
lines changed

5 files changed

+5
-140
lines changed

‎airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package io.airbyte.config.persistence;
66

77
import io.airbyte.config.AirbyteConfig;
8-
import io.airbyte.config.ConfigWithMetadata;
98
import io.airbyte.validation.json.JsonValidationException;
109
import java.io.IOException;
1110
import java.util.List;
@@ -21,11 +20,6 @@ public interface ConfigPersistence {
2120

2221
<T> List<T> listConfigs(AirbyteConfig configType, Class<T> clazz) throws JsonValidationException, IOException;
2322

24-
<T> ConfigWithMetadata<T> getConfigWithMetadata(AirbyteConfig configType, String configId, Class<T> clazz)
25-
throws ConfigNotFoundException, JsonValidationException, IOException;
26-
27-
<T> List<ConfigWithMetadata<T>> listConfigsWithMetadata(AirbyteConfig configType, Class<T> clazz) throws JsonValidationException, IOException;
28-
2923
<T> void writeConfig(AirbyteConfig configType, String configId, T config) throws JsonValidationException, IOException;
3024

3125
<T> void writeConfigs(AirbyteConfig configType, Map<String, T> configs) throws IOException, JsonValidationException;

‎airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/DatabaseConfigPersistence.java‎

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -240,57 +240,16 @@ private <T> void validate(final String configId, final List<ConfigWithMetadata<T
240240
}
241241
}
242242

243-
private <T> ConfigWithMetadata<T> validateAndReturn(final String configId,
244-
final List<ConfigWithMetadata<T>> result,
245-
final AirbyteConfig airbyteConfig)
246-
throws ConfigNotFoundException {
247-
validate(configId, result, airbyteConfig);
248-
return result.get(0);
249-
}
250-
251243
@Override
252244
public <T> List<T> listConfigs(final AirbyteConfig configType, final Class<T> clazz) throws JsonValidationException, IOException {
253245
final List<T> config = new ArrayList<>();
254246
listConfigsWithMetadata(configType, clazz).forEach(c -> config.add(c.getConfig()));
255247
return config;
256248
}
257249

258-
@Override
259-
public <T> ConfigWithMetadata<T> getConfigWithMetadata(final AirbyteConfig configType, final String configId, final Class<T> clazz)
260-
throws ConfigNotFoundException, JsonValidationException, IOException {
261-
final Optional<UUID> configIdOpt = Optional.of(UUID.fromString(configId));
262-
if (configType == ConfigSchema.STANDARD_WORKSPACE) {
263-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listStandardWorkspaceWithMetadata(configIdOpt), configType);
264-
} else if (configType == ConfigSchema.STANDARD_SOURCE_DEFINITION) {
265-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listStandardSourceDefinitionWithMetadata(configIdOpt), configType);
266-
} else if (configType == ConfigSchema.STANDARD_DESTINATION_DEFINITION) {
267-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listStandardDestinationDefinitionWithMetadata(configIdOpt), configType);
268-
} else if (configType == ConfigSchema.SOURCE_CONNECTION) {
269-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listSourceConnectionWithMetadata(configIdOpt), configType);
270-
} else if (configType == ConfigSchema.DESTINATION_CONNECTION) {
271-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listDestinationConnectionWithMetadata(configIdOpt), configType);
272-
} else if (configType == ConfigSchema.SOURCE_OAUTH_PARAM) {
273-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listSourceOauthParamWithMetadata(configIdOpt), configType);
274-
} else if (configType == ConfigSchema.DESTINATION_OAUTH_PARAM) {
275-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listDestinationOauthParamWithMetadata(configIdOpt), configType);
276-
} else if (configType == ConfigSchema.STANDARD_SYNC_OPERATION) {
277-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listStandardSyncOperationWithMetadata(configIdOpt), configType);
278-
} else if (configType == ConfigSchema.STANDARD_SYNC) {
279-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listStandardSyncWithMetadata(configIdOpt), configType);
280-
} else if (configType == ConfigSchema.STANDARD_SYNC_STATE) {
281-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listStandardSyncStateWithMetadata(configIdOpt), configType);
282-
} else if (configType == ConfigSchema.ACTOR_CATALOG) {
283-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listActorCatalogWithMetadata(configIdOpt), configType);
284-
} else if (configType == ConfigSchema.ACTOR_CATALOG_FETCH_EVENT) {
285-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listActorCatalogFetchEventWithMetadata(configIdOpt), configType);
286-
} else if (configType == ConfigSchema.WORKSPACE_SERVICE_ACCOUNT) {
287-
return (ConfigWithMetadata<T>) validateAndReturn(configId, listWorkspaceServiceAccountWithMetadata(configIdOpt), configType);
288-
} else {
289-
throw new IllegalArgumentException(UNKNOWN_CONFIG_TYPE + configType);
290-
}
291-
}
292-
293-
@Override
250+
// listConfigWithMetadata seems to be unused at this point.
251+
// It is only called by listConfigs and it only reads the config. The "metadata" part seems to be
252+
// unused.
294253
public <T> List<ConfigWithMetadata<T>> listConfigsWithMetadata(final AirbyteConfig configType, final Class<T> clazz) throws IOException {
295254
final List<ConfigWithMetadata<T>> configWithMetadata = new ArrayList<>();
296255
if (configType == ConfigSchema.STANDARD_WORKSPACE) {

‎airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/ValidatingConfigPersistence.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.fasterxml.jackson.databind.JsonNode;
88
import io.airbyte.commons.json.Jsons;
99
import io.airbyte.config.AirbyteConfig;
10-
import io.airbyte.config.ConfigWithMetadata;
1110
import io.airbyte.validation.json.JsonSchemaValidator;
1211
import io.airbyte.validation.json.JsonValidationException;
1312
import java.io.IOException;
@@ -51,24 +50,6 @@ public <T> List<T> listConfigs(final AirbyteConfig configType, final Class<T> cl
5150
return configs;
5251
}
5352

54-
@Override
55-
public <T> ConfigWithMetadata<T> getConfigWithMetadata(final AirbyteConfig configType, final String configId, final Class<T> clazz)
56-
throws ConfigNotFoundException, JsonValidationException, IOException {
57-
final ConfigWithMetadata<T> config = decoratedPersistence.getConfigWithMetadata(configType, configId, clazz);
58-
validateJson(config.getConfig(), configType);
59-
return config;
60-
}
61-
62-
@Override
63-
public <T> List<ConfigWithMetadata<T>> listConfigsWithMetadata(final AirbyteConfig configType, final Class<T> clazz)
64-
throws JsonValidationException, IOException {
65-
final List<ConfigWithMetadata<T>> configs = decoratedPersistence.listConfigsWithMetadata(configType, clazz);
66-
for (final ConfigWithMetadata<T> config : configs) {
67-
validateJson(config.getConfig(), configType);
68-
}
69-
return configs;
70-
}
71-
7253
@Override
7354
public <T> void writeConfig(final AirbyteConfig configType, final String configId, final T config) throws JsonValidationException, IOException {
7455

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceTest.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,6 @@ void testWriteAndGetConfig() throws Exception {
9696
.hasSameElementsAs(List.of(DESTINATION_SNOWFLAKE, DESTINATION_S3));
9797
}
9898

99-
@Test
100-
void testGetConfigWithMetadata() throws Exception {
101-
final Instant now = Instant.now().minus(Duration.ofSeconds(1));
102-
writeDestination(configPersistence, DESTINATION_S3);
103-
final ConfigWithMetadata<StandardDestinationDefinition> configWithMetadata = configPersistence.getConfigWithMetadata(
104-
STANDARD_DESTINATION_DEFINITION,
105-
DESTINATION_S3.getDestinationDefinitionId().toString(),
106-
StandardDestinationDefinition.class);
107-
assertEquals("STANDARD_DESTINATION_DEFINITION", configWithMetadata.getConfigType());
108-
assertTrue(configWithMetadata.getCreatedAt().isAfter(now));
109-
assertTrue(configWithMetadata.getUpdatedAt().isAfter(now));
110-
assertEquals(DESTINATION_S3.getDestinationDefinitionId().toString(), configWithMetadata.getConfigId());
111-
assertEquals(DESTINATION_S3, configWithMetadata.getConfig());
112-
}
113-
11499
@Test
115100
void testListConfigWithMetadata() throws Exception {
116101
final Instant now = Instant.now().minus(Duration.ofSeconds(1));

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/ValidatingConfigPersistenceTest.java‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import com.google.common.collect.Sets;
1717
import io.airbyte.config.ConfigSchema;
18-
import io.airbyte.config.ConfigWithMetadata;
1918
import io.airbyte.config.StandardSourceDefinition;
2019
import io.airbyte.validation.json.JsonSchemaValidator;
2120
import io.airbyte.validation.json.JsonValidationException;
@@ -48,14 +47,14 @@ class ValidatingConfigPersistenceTest {
4847
private JsonSchemaValidator schemaValidator;
4948

5049
private ValidatingConfigPersistence configPersistence;
51-
private ConfigPersistence decoratedConfigPersistence;
50+
private DatabaseConfigPersistence decoratedConfigPersistence;
5251
private static final String ERROR_MESSAGE = "error";
5352

5453
@BeforeEach
5554
void setUp() {
5655
schemaValidator = mock(JsonSchemaValidator.class);
5756

58-
decoratedConfigPersistence = mock(ConfigPersistence.class);
57+
decoratedConfigPersistence = mock(DatabaseConfigPersistence.class);
5958
configPersistence = new ValidatingConfigPersistence(decoratedConfigPersistence, schemaValidator);
6059
}
6160

@@ -144,57 +143,4 @@ void testListConfigsFailure() throws JsonValidationException, IOException {
144143
.listConfigs(ConfigSchema.STANDARD_SOURCE_DEFINITION, StandardSourceDefinition.class));
145144
}
146145

147-
@Test
148-
void testGetConfigWithMetadataSuccess() throws IOException, JsonValidationException, ConfigNotFoundException {
149-
when(decoratedConfigPersistence.getConfigWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, UUID_1.toString(), StandardSourceDefinition.class))
150-
.thenReturn(withMetadata(SOURCE_1));
151-
final ConfigWithMetadata<StandardSourceDefinition> actualConfig = configPersistence
152-
.getConfigWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, UUID_1.toString(), StandardSourceDefinition.class);
153-
154-
assertEquals(withMetadata(SOURCE_1), actualConfig);
155-
}
156-
157-
@Test
158-
void testGetConfigWithMetadataFailure() throws IOException, JsonValidationException, ConfigNotFoundException {
159-
doThrow(new JsonValidationException(ERROR_MESSAGE)).when(schemaValidator).ensure(any(), any());
160-
when(decoratedConfigPersistence.getConfigWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, UUID_1.toString(), StandardSourceDefinition.class))
161-
.thenReturn(withMetadata(SOURCE_1));
162-
163-
assertThrows(
164-
JsonValidationException.class,
165-
() -> configPersistence.getConfigWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, UUID_1.toString(), StandardSourceDefinition.class));
166-
}
167-
168-
@Test
169-
void testListConfigsWithMetadataSuccess() throws JsonValidationException, IOException {
170-
when(decoratedConfigPersistence.listConfigsWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, StandardSourceDefinition.class))
171-
.thenReturn(List.of(withMetadata(SOURCE_1), withMetadata(SOURCE_2)));
172-
173-
final List<ConfigWithMetadata<StandardSourceDefinition>> actualConfigs = configPersistence
174-
.listConfigsWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, StandardSourceDefinition.class);
175-
176-
// noinspection unchecked
177-
assertEquals(
178-
Sets.newHashSet(withMetadata(SOURCE_1), withMetadata(SOURCE_2)),
179-
Sets.newHashSet(actualConfigs));
180-
}
181-
182-
@Test
183-
void testListConfigsWithMetadataFailure() throws JsonValidationException, IOException {
184-
doThrow(new JsonValidationException(ERROR_MESSAGE)).when(schemaValidator).ensure(any(), any());
185-
when(decoratedConfigPersistence.listConfigsWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, StandardSourceDefinition.class))
186-
.thenReturn(List.of(withMetadata(SOURCE_1), withMetadata(SOURCE_2)));
187-
188-
assertThrows(JsonValidationException.class, () -> configPersistence
189-
.listConfigsWithMetadata(ConfigSchema.STANDARD_SOURCE_DEFINITION, StandardSourceDefinition.class));
190-
}
191-
192-
private static ConfigWithMetadata<StandardSourceDefinition> withMetadata(final StandardSourceDefinition sourceDef) {
193-
return new ConfigWithMetadata<>(sourceDef.getSourceDefinitionId().toString(),
194-
ConfigSchema.STANDARD_SOURCE_DEFINITION.name(),
195-
INSTANT,
196-
INSTANT,
197-
sourceDef);
198-
}
199-
200146
}

0 commit comments

Comments
 (0)