From a17ff35dc056fdcc7358b699755cee8f434af198 Mon Sep 17 00:00:00 2001
From: Taylor Gray <tylgry@amazon.com>
Date: Wed, 13 Mar 2024 20:50:29 -0500
Subject: [PATCH] Address PR comments

Signed-off-by: Taylor Gray <tylgry@amazon.com>
---
 .../{plugins => plugin}/DefaultPluginFactoryIT.java       | 8 ++------
 .../dataprepper/plugin/PluginBeanFactoryProvider.java     | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/{plugins => plugin}/DefaultPluginFactoryIT.java (94%)

diff --git a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/DefaultPluginFactoryIT.java b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java
similarity index 94%
rename from data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/DefaultPluginFactoryIT.java
rename to data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java
index cf12221209..ea0654563a 100644
--- a/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugins/DefaultPluginFactoryIT.java
+++ b/data-prepper-core/src/integrationTest/java/org/opensearch/dataprepper/plugin/DefaultPluginFactoryIT.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.dataprepper.plugins;
+package org.opensearch.dataprepper.plugin;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -15,11 +15,7 @@
 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.plugin.DefaultPluginFactory;
-import org.opensearch.dataprepper.plugin.ExtensionsConfiguration;
-import org.opensearch.dataprepper.plugin.PluginBeanFactoryProvider;
-import org.opensearch.dataprepper.plugin.TestPluggableInterface;
-import org.opensearch.dataprepper.plugin.TestPluginConfiguration;
+import org.opensearch.dataprepper.plugins.TestObjectPlugin;
 import org.opensearch.dataprepper.plugins.test.TestPlugin;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
diff --git a/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/PluginBeanFactoryProvider.java b/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/PluginBeanFactoryProvider.java
index ba5b6c1e0e..66a42eb36a 100644
--- a/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/PluginBeanFactoryProvider.java
+++ b/data-prepper-plugin-framework/src/main/java/org/opensearch/dataprepper/plugin/PluginBeanFactoryProvider.java
@@ -25,7 +25,7 @@
  * <p><i>publicContext</i> is the root {@link ApplicationContext}</p>
  */
 @Named
-public class PluginBeanFactoryProvider implements Provider<BeanFactory> {
+class PluginBeanFactoryProvider implements Provider<BeanFactory> {
     private final GenericApplicationContext sharedPluginApplicationContext;
     private final GenericApplicationContext coreApplicationContext;