Skip to content

Commit 45e36a9

Browse files
committed
Renames the enabled configuration to enabled_plugins.
Signed-off-by: David Venable <dlv@amazon.com>
1 parent e29586a commit 45e36a9

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/ExperimentalConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public class ExperimentalConfiguration {
2424
@JsonProperty("enable_all")
2525
private boolean enableAll = false;
2626

27-
@JsonProperty("enabled")
28-
private Map<String, Set<String>> enabled;
27+
@JsonProperty("enabled_plugins")
28+
private Map<String, Set<String>> enabledPlugins;
2929

3030
public static ExperimentalConfiguration defaultConfiguration() {
3131
return new ExperimentalConfiguration();
@@ -46,7 +46,7 @@ public boolean isEnableAll() {
4646
* @return A map of plugin types to list of allowed plugins by name.
4747
* @since 2.12
4848
*/
49-
public Map<String, Set<String>> getEnabled() {
50-
return enabled != null ? enabled : Collections.emptyMap();
49+
public Map<String, Set<String>> getEnabledPlugins() {
50+
return enabledPlugins != null ? enabledPlugins : Collections.emptyMap();
5151
}
5252
}

data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/ExperimentalPluginValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private boolean isPluginDisallowedAsExperimental(final DefinedPlugin<?> definedP
4141
return false;
4242

4343
final Set<String> enabledPluginsForType =
44-
experimentalConfiguration.getEnabled()
44+
experimentalConfiguration.getEnabledPlugins()
4545
.getOrDefault(definedPlugin.getPluginTypeName(), Collections.emptySet());
4646
return !enabledPluginsForType.contains(definedPlugin.getPluginName());
4747
}

data-prepper-plugin-framework/src/test/java/org/opensearch/dataprepper/plugin/ExperimentalConfigurationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ void defaultConfiguration_should_return_config_with_isEnableAll_false() {
2626
}
2727

2828
@Test
29-
void defaultConfiguration_should_return_config_with_empty_enabled_mp() {
29+
void defaultConfiguration_should_return_config_with_empty_enabledPlugins_map() {
3030
final ExperimentalConfiguration objectUnderTest = ExperimentalConfiguration.defaultConfiguration();
3131
assertThat(objectUnderTest, notNullValue());
32-
assertThat(objectUnderTest.getEnabled(), notNullValue());
33-
assertThat(objectUnderTest.getEnabled(), is(anEmptyMap()));
32+
assertThat(objectUnderTest.getEnabledPlugins(), notNullValue());
33+
assertThat(objectUnderTest.getEnabledPlugins(), is(anEmptyMap()));
3434
}
3535
}

data-prepper-plugin-framework/src/test/java/org/opensearch/dataprepper/plugin/ExperimentalPluginValidatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void accept_with_Experimental_plugin_throws_if_experimental_is_enabled_for_plugi
106106
final String pluginTypeName = UUID.randomUUID().toString();
107107
when(definedPlugin.getPluginName()).thenReturn(pluginName);
108108
when(definedPlugin.getPluginTypeName()).thenReturn(pluginTypeName);
109-
experimentalConfiguration.getEnabled().put(pluginTypeName, Set.of(UUID.randomUUID().toString()));
109+
experimentalConfiguration.getEnabledPlugins().put(pluginTypeName, Set.of(UUID.randomUUID().toString()));
110110

111111
final ExperimentalPluginValidator objectUnderTest = createObjectUnderTest();
112112

@@ -123,7 +123,7 @@ void accept_with_Experimental_plugin_does_not_throw_if_experimental_is_enabled_f
123123
final String pluginTypeName = UUID.randomUUID().toString();
124124
when(definedPlugin.getPluginName()).thenReturn(pluginName);
125125
when(definedPlugin.getPluginTypeName()).thenReturn(pluginTypeName);
126-
when(experimentalConfiguration.getEnabled()).thenReturn(Map.of(pluginTypeName, Set.of(UUID.randomUUID().toString(), pluginName)));
126+
when(experimentalConfiguration.getEnabledPlugins()).thenReturn(Map.of(pluginTypeName, Set.of(UUID.randomUUID().toString(), pluginName)));
127127

128128
createObjectUnderTest().accept(definedPlugin);
129129
}

0 commit comments

Comments
 (0)