Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract the data-prepper-plugin-framework from data-prepper-core #4260

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Extract the data-prepper-plugin-framework from data-prepper-core #4260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04048c9
Extract parsing in data-prepper-core to data-prepper-pipeline-parser …
graytaylor0 Mar 7, 2024
0102a91
Extract data-prepper-plugin-framework code from data-prepper-core to …
graytaylor0 Mar 11, 2024
a17ff35
Address PR comments
graytaylor0 Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build-resources.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ ext.coreProjects = [
project(':data-prepper-pipeline-parser'),
project(':data-prepper-plugins'),
project(':data-prepper-test-common'),
project(':data-prepper-test-event')
project(':data-prepper-test-event'),
project(':data-prepper-plugin-framework')
]
3 changes: 2 additions & 1 deletion data-prepper-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ dependencies {
implementation project(':data-prepper-plugins:common')
implementation project(':data-prepper-logstash-configuration')
implementation project(':data-prepper-pipeline-parser')
implementation project(':data-prepper-plugin-framework')
testImplementation project(':data-prepper-plugin-framework').sourceSets.test.output
testImplementation project(':data-prepper-plugins:common').sourceSets.test.output
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
Expand All @@ -28,7 +30,6 @@ dependencies {
implementation 'io.micrometer:micrometer-registry-cloudwatch2'
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
implementation 'software.amazon.awssdk:cloudwatch'
implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
implementation platform('org.apache.logging.log4j:log4j-bom:2.22.1')
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.logging.log4j:log4j-slf4j2-impl'
Expand Down
7 changes: 3 additions & 4 deletions ...repper/plugin/DefaultPluginFactoryIT.java → ...repper/plugin/DefaultPluginFactoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel;
import org.opensearch.dataprepper.model.configuration.PluginSetting;
import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException;
import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;
import org.opensearch.dataprepper.plugins.TestObjectPlugin;
import org.opensearch.dataprepper.plugins.TestPlugin;
import org.opensearch.dataprepper.plugins.test.TestPlugin;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;

import java.util.HashMap;
Expand All @@ -39,7 +38,7 @@ class DefaultPluginFactoryIT {
@Mock
private PipelinesDataFlowModel pipelinesDataFlowModel;
@Mock
private DataPrepperConfiguration dataPrepperConfiguration;
private ExtensionsConfiguration extensionsConfiguration;
private String pluginName;
private String objectPluginName;
private String pipelineName;
Expand All @@ -62,7 +61,7 @@ private DefaultPluginFactory createObjectUnderTest() {
coreContext.scan(DefaultAcknowledgementSetManager.class.getPackage().getName());
coreContext.scan(DefaultPluginFactory.class.getPackage().getName());
coreContext.register(PluginBeanFactoryProvider.class);
coreContext.registerBean(DataPrepperConfiguration.class, () -> dataPrepperConfiguration);
coreContext.registerBean(ExtensionsConfiguration.class, () -> extensionsConfiguration);
coreContext.registerBean(PipelinesDataFlowModel.class, () -> pipelinesDataFlowModel);
coreContext.refresh();

Expand Down
10 changes: 6 additions & 4 deletions ...arch/dataprepper/plugin/ExtensionsIT.java → ...rch/dataprepper/plugins/ExtensionsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.dataprepper.plugin;
package org.opensearch.dataprepper.plugins;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -25,8 +26,9 @@
import org.opensearch.dataprepper.parser.config.PipelineParserConfiguration;
import org.opensearch.dataprepper.peerforwarder.PeerForwarderProvider;
import org.opensearch.dataprepper.pipeline.router.RouterFactory;
import org.opensearch.dataprepper.plugins.TestPluginUsingExtension;
import org.opensearch.dataprepper.plugins.TestPluginUsingExtensionWithConfig;
import org.opensearch.dataprepper.plugin.DefaultPluginFactory;
import org.opensearch.dataprepper.plugin.ObjectMapperConfiguration;
import org.opensearch.dataprepper.plugin.TestPluggableInterface;
import org.opensearch.dataprepper.plugins.test.TestExtension;
import org.opensearch.dataprepper.sourcecoordination.SourceCoordinatorFactory;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
Expand Down Expand Up @@ -114,7 +116,7 @@ void tearDown() {

@Test
void applyExtensions_creates_a_single_instance_of_the_extension() {
assertThat(TestExtension.getConstructedInstances(), equalTo(1));
MatcherAssert.assertThat(TestExtension.getConstructedInstances(), equalTo(1));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...e/src/main/java/org/opensearch/dataprepper/parser/config/DataPrepperAppConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import org.opensearch.dataprepper.model.configuration.PluginModel;
import org.opensearch.dataprepper.model.types.ByteCount;
import org.opensearch.dataprepper.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.parser.DataPrepperDurationDeserializer;
import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer;
import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
4 changes: 3 additions & 1 deletion ...-core/src/main/java/org/opensearch/dataprepper/parser/model/DataPrepperConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.opensearch.dataprepper.parser.config.MetricTagFilter;
import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
import org.opensearch.dataprepper.pipeline.PipelineShutdownOption;
import org.opensearch.dataprepper.plugin.ExtensionsConfiguration;

import java.time.Duration;
import java.util.Collections;
Expand All @@ -28,7 +29,7 @@
/**
* Class to hold configuration for DataPrepper, including server port and Log4j settings
*/
public class DataPrepperConfiguration {
public class DataPrepperConfiguration implements ExtensionsConfiguration {
static final Duration DEFAULT_SHUTDOWN_DURATION = Duration.ofSeconds(30L);

private static final String DEFAULT_SOURCE_COORDINATION_STORE = "in_memory";
Expand Down Expand Up @@ -225,6 +226,7 @@ public PipelineShutdownOption getPipelineShutdown() {
return pipelineShutdown;
}

@Override
public PipelineExtensions getPipelineExtensions() {
return pipelineExtensions;
}
Expand Down
4 changes: 0 additions & 4 deletions data-prepper-core/src/test/java/org/opensearch/dataprepper/TestDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ public class TestDataProvider {
public static final String VALID_PEER_FORWARDER_WITH_ACM_SSL_CONFIG_FILE = "src/test/resources/valid_peer_forwarder_config_with_acm_ssl.yml";
public static final String VALID_DATA_PREPPER_CONFIG_WITH_METRIC_FILTER = "src/test/resources/valid_data_prepper_config_with_metric_filter.yml";
public static final String INVALID_DATA_PREPPER_CONFIG_WITH_METRIC_FILTER = "src/test/resources/invalid_data_prepper_config_with_metric_filter.yml";




public static Set<String> VALID_MULTIPLE_PIPELINE_NAMES = new HashSet<>(Arrays.asList("test-pipeline-1",
"test-pipeline-2", "test-pipeline-3"));
}
4 changes: 2 additions & 2 deletions .../src/test/java/org/opensearch/dataprepper/parser/model/DataPrepperConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import org.opensearch.dataprepper.TestDataProvider;
import org.opensearch.dataprepper.model.types.ByteCount;
import org.opensearch.dataprepper.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.peerforwarder.PeerForwarderConfiguration;
import org.opensearch.dataprepper.parser.DataPrepperDurationDeserializer;
import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
Expand Down
4 changes: 2 additions & 2 deletions ...e/src/test/java/org/opensearch/dataprepper/parser/model/HeapCircuitBreakerConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.opensearch.dataprepper.model.types.ByteCount;
import org.opensearch.dataprepper.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.parser.DataPrepperDurationDeserializer;
import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer;

import java.io.IOException;
import java.io.InputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarderConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import org.opensearch.dataprepper.TestDataProvider;
import org.opensearch.dataprepper.peerforwarder.discovery.DiscoveryMode;
import org.opensearch.dataprepper.parser.DataPrepperDurationDeserializer;
import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
Expand Down
4 changes: 2 additions & 2 deletions data-prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.opensearch.dataprepper.pipeline.router.Router;
import org.opensearch.dataprepper.pipeline.router.RouterCopyRecordStrategy;
import org.opensearch.dataprepper.pipeline.router.RouterGetRecordStrategy;
import org.opensearch.dataprepper.plugins.TestSink;
import org.opensearch.dataprepper.plugins.TestSource;
import org.opensearch.dataprepper.plugins.test.TestSink;
import org.opensearch.dataprepper.plugins.test.TestSource;
import org.opensearch.dataprepper.plugins.TestSourceWithCoordination;
import org.opensearch.dataprepper.plugins.TestSourceWithEnhancedCoordination;
import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
Expand Down
5 changes: 5 additions & 0 deletions data-prepper-pipeline-parser/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

dependencies {
implementation project(':data-prepper-api')
implementation project(':data-prepper-plugins:blocking-buffer')
Expand Down
2 changes: 1 addition & 1 deletion ...prepper/parser/ByteCountDeserializer.java → ...ipeline/parser/ByteCountDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.dataprepper.parser;
package org.opensearch.dataprepper.pipeline.parser;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should look to see if we can make this package protected. Perhaps in another PR. It might involve moving a few other classes to reside in the same package.


import com.fasterxml.jackson.core.JacksonException;
import com.fasterxml.jackson.core.JsonParser;
Expand Down
2 changes: 1 addition & 1 deletion ...rser/DataPrepperDurationDeserializer.java → ...rser/DataPrepperDurationDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.dataprepper.parser;
package org.opensearch.dataprepper.pipeline.parser;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should look to see if we can make this package protected. Perhaps in another PR. It might involve moving a few other classes to reside in the same package.


import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
Expand Down
2 changes: 1 addition & 1 deletion ...per/parser/ByteCountDeserializerTest.java → ...ine/parser/ByteCountDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.dataprepper.parser;
package org.opensearch.dataprepper.pipeline.parser;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
Expand Down
4 changes: 2 additions & 2 deletions .../DataPrepperDurationDeserializerTest.java → .../DataPrepperDurationDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.dataprepper.parser;
package org.opensearch.dataprepper.pipeline.parser;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
Expand All @@ -14,8 +14,8 @@

import java.time.Duration;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;

public class DataPrepperDurationDeserializerTest {
Expand Down
22 changes: 22 additions & 0 deletions data-prepper-plugin-framework/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

dependencies {
implementation project(':data-prepper-api')
implementation project(':data-prepper-pipeline-parser')
implementation libs.commons.lang3
implementation 'javax.inject:javax.inject:1'
implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
implementation(libs.spring.core) {
exclude group: 'commons-logging', module: 'commons-logging'
}
implementation(libs.spring.context) {
exclude group: 'commons-logging', module: 'commons-logging'
}
implementation libs.reflections.core
implementation 'com.fasterxml.jackson.core:jackson-databind'
testImplementation testLibs.mockito.inline
}
0 ...n/ApplicationContextToTypedSuppliers.java → ...n/ApplicationContextToTypedSuppliers.java
View file
Open in desktop
File renamed without changes.
0 ...ugin/ClasspathExtensionClassProvider.java → ...ugin/ClasspathExtensionClassProvider.java
View file
Open in desktop
File renamed without changes.
0 ...epper/plugin/ClasspathPluginProvider.java → ...epper/plugin/ClasspathPluginProvider.java
View file
Open in desktop
File renamed without changes.
0 ...ugin/ComponentPluginArgumentsContext.java → ...ugin/ComponentPluginArgumentsContext.java
View file
Open in desktop
File renamed without changes.
0 ...er/plugin/DataPrepperExtensionPoints.java → ...er/plugin/DataPrepperExtensionPoints.java
View file
Open in desktop
File renamed without changes.
0 ...in/DataPrepperScalarTypeDeserializer.java → ...in/DataPrepperScalarTypeDeserializer.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...plugin/DefaultPluginConfigObservable.java → ...plugin/DefaultPluginConfigObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package org.opensearch.dataprepper.plugin;

import org.opensearch.dataprepper.model.configuration.PluginSetting;
import org.opensearch.dataprepper.model.plugin.PluginConfigObserver;
import org.opensearch.dataprepper.model.plugin.PluginConfigObservable;
import org.opensearch.dataprepper.model.plugin.PluginConfigObserver;

import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
0 ...aprepper/plugin/DefaultPluginFactory.java → ...aprepper/plugin/DefaultPluginFactory.java
View file
Open in desktop
File renamed without changes.
0 ...repper/plugin/ExtensionClassProvider.java → ...repper/plugin/ExtensionClassProvider.java
View file
Open in desktop
File renamed without changes.
0 ...h/dataprepper/plugin/ExtensionLoader.java → ...h/dataprepper/plugin/ExtensionLoader.java
View file
Open in desktop
File renamed without changes.
0 ...xtensionPluginConfigurationConverter.java → ...xtensionPluginConfigurationConverter.java
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions ...ExtensionPluginConfigurationResolver.java → ...ExtensionPluginConfigurationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package org.opensearch.dataprepper.plugin;

import org.opensearch.dataprepper.model.configuration.PipelinesDataFlowModel;
import org.opensearch.dataprepper.parser.model.DataPrepperConfiguration;

import javax.inject.Inject;
import javax.inject.Named;
Expand All @@ -21,10 +20,10 @@ public class ExtensionPluginConfigurationResolver {
private final Map<String, Object> dataPrepperConfigExtensionMap;

@Inject
public ExtensionPluginConfigurationResolver(final DataPrepperConfiguration dataPrepperConfiguration,
public ExtensionPluginConfigurationResolver(final ExtensionsConfiguration extensionsConfiguration,
final PipelinesDataFlowModel pipelinesDataFlowModel) {
this.dataPrepperConfigExtensionMap = dataPrepperConfiguration.getPipelineExtensions() == null?
new HashMap<>() : new HashMap<>(dataPrepperConfiguration.getPipelineExtensions().getExtensionMap());
this.dataPrepperConfigExtensionMap = extensionsConfiguration.getPipelineExtensions() == null?
new HashMap<>() : new HashMap<>(extensionsConfiguration.getPipelineExtensions().getExtensionMap());
combinedExtensionMap = new HashMap<>(dataPrepperConfigExtensionMap);
if (pipelinesDataFlowModel.getPipelineExtensions() != null) {
combinedExtensionMap.putAll(pipelinesDataFlowModel.getPipelineExtensions().getExtensionMap());
Expand Down
0 ...dataprepper/plugin/ExtensionsApplier.java → ...dataprepper/plugin/ExtensionsApplier.java
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions ...in-framework/src/main/java/org/opensearch/dataprepper/plugin/ExtensionsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.opensearch.dataprepper.plugin;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably change this package to be something else. But, maybe in another PR.


import org.opensearch.dataprepper.model.configuration.PipelineExtensions;

public interface ExtensionsConfiguration {
PipelineExtensions getPipelineExtensions();
}
4 changes: 2 additions & 2 deletions ...per/plugin/ObjectMapperConfiguration.java → ...per/plugin/ObjectMapperConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.module.SimpleModule;
import org.opensearch.dataprepper.model.types.ByteCount;
import org.opensearch.dataprepper.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.parser.DataPrepperDurationDeserializer;
import org.opensearch.dataprepper.pipeline.parser.ByteCountDeserializer;
import org.opensearch.dataprepper.pipeline.parser.DataPrepperDurationDeserializer;
import org.springframework.context.annotation.Bean;

import javax.inject.Named;
Expand Down
0 ...repper/plugin/PluginArgumentsContext.java → ...repper/plugin/PluginArgumentsContext.java
View file
Open in desktop
File renamed without changes.
0 ...per/plugin/PluginBeanFactoryProvider.java → ...per/plugin/PluginBeanFactoryProvider.java
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions .../plugin/PluginConfigurationConverter.java → .../plugin/PluginConfigurationConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
package org.opensearch.dataprepper.plugin;

import com.fasterxml.jackson.core.type.TypeReference;
import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin;
import org.opensearch.dataprepper.model.configuration.PluginSetting;
import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.Validator;
import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin;
import org.opensearch.dataprepper.model.configuration.PluginSetting;
import org.opensearch.dataprepper.model.plugin.InvalidPluginConfigurationException;
import org.springframework.context.annotation.DependsOn;

import javax.inject.Named;
Expand Down
0 ...PluginConfigurationObservableFactory.java → ...PluginConfigurationObservableFactory.java
View file
Open in desktop
File renamed without changes.
0 ...luginConfigurationObservableRegister.java → ...luginConfigurationObservableRegister.java
View file
Open in desktop
File renamed without changes.
0 ...rch/dataprepper/plugin/PluginCreator.java → ...rch/dataprepper/plugin/PluginCreator.java
View file
Open in desktop
File renamed without changes.
0 ...aprepper/plugin/PluginCreatorContext.java → ...aprepper/plugin/PluginCreatorContext.java
View file
Open in desktop
File renamed without changes.
0 ...repper/plugin/PluginPackagesSupplier.java → ...repper/plugin/PluginPackagesSupplier.java
View file
Open in desktop
File renamed without changes.
0 ...ch/dataprepper/plugin/PluginProvider.java → ...ch/dataprepper/plugin/PluginProvider.java
View file
Open in desktop
File renamed without changes.
0 ...aprepper/plugin/PluginProviderLoader.java → ...aprepper/plugin/PluginProviderLoader.java
View file
Open in desktop
File renamed without changes.
0 ...taprepper/plugin/SupportSecretString.java → ...taprepper/plugin/SupportSecretString.java
View file
Open in desktop
File renamed without changes.
0 ...repper/plugin/ValidatorConfiguration.java → ...repper/plugin/ValidatorConfiguration.java
View file
Open in desktop
File renamed without changes.
0 .../dataprepper/plugin/VariableExpander.java → .../dataprepper/plugin/VariableExpander.java
View file
Open in desktop
File renamed without changes.
0 ...plicationContextToTypedSuppliersTest.java → ...plicationContextToTypedSuppliersTest.java
View file
Open in desktop
File renamed without changes.
0 .../ClasspathExtensionClassProviderTest.java → .../ClasspathExtensionClassProviderTest.java
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...r/plugin/ClasspathPluginProviderTest.java → ...r/plugin/ClasspathPluginProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

package org.opensearch.dataprepper.plugin;

import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin;
import org.opensearch.dataprepper.model.sink.Sink;
import org.opensearch.dataprepper.model.source.Source;
import org.opensearch.dataprepper.plugins.TestSink;
import org.opensearch.dataprepper.plugins.TestSource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin;
import org.opensearch.dataprepper.model.sink.Sink;
import org.opensearch.dataprepper.model.source.Source;
import org.opensearch.dataprepper.plugins.test.TestSink;
import org.opensearch.dataprepper.plugins.test.TestSource;
import org.reflections.Reflections;

import java.util.Arrays;
Expand Down
0 .../ComponentPluginArgumentsContextTest.java → .../ComponentPluginArgumentsContextTest.java
View file
Open in desktop
File renamed without changes.
0 ...lugin/DataPrepperExtensionPointsTest.java → ...lugin/DataPrepperExtensionPointsTest.java
View file
Open in desktop
File renamed without changes.
0 ...ataPrepperScalarTypeDeserializerTest.java → ...ataPrepperScalarTypeDeserializerTest.java
View file
Open in desktop
File renamed without changes.
15 changes: 8 additions & 7 deletions ...pper/plugin/DefaultPluginFactoryTest.java → ...pper/plugin/DefaultPluginFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@

package org.opensearch.dataprepper.plugin;

import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.ArgumentCaptor;
import org.opensearch.dataprepper.model.annotations.DataPrepperPlugin;
import org.opensearch.dataprepper.model.configuration.PipelineDescription;
import org.opensearch.dataprepper.model.configuration.PluginSetting;
import org.opensearch.dataprepper.model.plugin.NoPluginFoundException;
import org.opensearch.dataprepper.model.plugin.PluginConfigObservable;
import org.opensearch.dataprepper.model.sink.Sink;
import org.opensearch.dataprepper.plugins.TestSink;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.opensearch.dataprepper.plugins.test.TestSink;
import org.springframework.beans.factory.BeanFactory;

import java.util.ArrayList;
Expand Down Expand Up @@ -396,7 +397,7 @@ void loadPlugin_should_create_a_new_instance_of_the_first_plugin_found_with_corr
.willReturn(expectedInstance);

assertThat(createObjectUnderTest().loadPlugin(baseClass, pluginSetting), equalTo(expectedInstance));
assertThat(expectedInstance.getClass().getAnnotation(DataPrepperPlugin.class).deprecatedName(), equalTo(TEST_SINK_DEPRECATED_NAME));
MatcherAssert.assertThat(expectedInstance.getClass().getAnnotation(DataPrepperPlugin.class).deprecatedName(), equalTo(TEST_SINK_DEPRECATED_NAME));
verify(beanFactoryProvider).get();
}
}
Expand Down
0 ...taprepper/plugin/ExtensionLoaderTest.java → ...taprepper/plugin/ExtensionLoaderTest.java
View file
Open in desktop
File renamed without changes.
Loading
Loading