JAVAFICATION: Move PluginFactory to Java

Author: original-brownbear

logstash-core/lib/logstash/config/mixin.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "logstash/plugins/registry"
 require "logstash/util/password"
 require "logstash/util/safe_uri"
 require "logstash/version"

logstash-core/lib/logstash/java_pipeline.rb

@@ -2,9 +2,6 @@
 require "thread"
 require "concurrent"
 require "logstash/event"
-require "logstash/filters/base"
-require "logstash/inputs/base"
-require "logstash/outputs/base"
 require "logstash/shutdown_watcher"
 require "logstash/pipeline_reporter"
 require "logstash/instrument/collector"

logstash-core/lib/logstash/pipeline.rb

@@ -5,15 +5,11 @@
 require "logstash-core/logstash-core"
 require "logstash/event"
 require "logstash/config/file"
-require "logstash/filters/base"
-require "logstash/inputs/base"
-require "logstash/outputs/base"
 require "logstash/shutdown_watcher"
 require "logstash/pipeline_reporter"
 require "logstash/instrument/collector"
 require "logstash/filter_delegator"
 require "logstash/queue_factory"
-require "logstash/plugins/plugin_factory"
 require "logstash/compiler"
 require "securerandom"
 

logstash-core/lib/logstash/plugins/plugin_factory.rb

@@ -3,6 +3,9 @@
 require "logstash/plugin"
 require "logstash/plugins/hooks_registry"
 require "logstash/modules/scaffold"
+require "logstash/codecs/base"
+require "logstash/filters/base"
+require "logstash/outputs/base"
 
 module LogStash module Plugins
   class Registry

logstash-core/lib/logstash/plugins/registry.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "forwardable"
 require "logstash/util/password"
 
 module LogStash module Util class ModulesSettingArray

logstash-core/lib/logstash/util/modules_setting_array.rb

@@ -138,6 +138,8 @@ public final class RubyUtil {
 
     public static final RubyClass PLUGIN_METRIC_FACTORY_CLASS;
 
+    public static final RubyClass PLUGIN_FACTORY_CLASS;
+
     public static final RubyClass LOGGER;
 
     public static final RubyModule LOGGABLE_MODULE;
@@ -146,6 +148,8 @@ public final class RubyUtil {
 
     public static final RubyModule UTIL_MODULE;
 
+    public static final RubyClass CONFIGURATION_ERROR_CLASS;
+
     /**
      * Logstash Ruby Module.
      */
@@ -350,7 +354,7 @@ public final class RubyUtil {
         LOGSTASH_MODULE.defineClassUnder(
             "EnvironmentError", stdErr, JRubyLogstashErrorsExt.LogstashEnvironmentError::new
         );
-        LOGSTASH_MODULE.defineClassUnder(
+        CONFIGURATION_ERROR_CLASS = LOGSTASH_MODULE.defineClassUnder(
             "ConfigurationError", stdErr, JRubyLogstashErrorsExt.ConfigurationError::new
         );
         LOGSTASH_MODULE.defineClassUnder(
@@ -403,6 +407,10 @@ public final class RubyUtil {
         RUBY_EVENT_CLASS.setConstant("VERSION_ONE", RUBY.newString(Event.VERSION_ONE));
         RUBY_EVENT_CLASS.defineAnnotatedMethods(JrubyEventExtLibrary.RubyEvent.class);
         RUBY_EVENT_CLASS.defineAnnotatedConstants(JrubyEventExtLibrary.RubyEvent.class);
+        PLUGIN_FACTORY_CLASS = PLUGINS_MODULE.defineClassUnder(
+            "PluginFactory", RUBY.getObject(), PluginFactoryExt.Plugins::new
+        );
+        PLUGIN_FACTORY_CLASS.defineAnnotatedMethods(PluginFactoryExt.Plugins.class);
         RUBY.getGlobalVariables().set("$LS_JARS_LOADED", RUBY.newString("true"));
         RubyJavaIntegration.setupRubyJavaIntegration(RUBY);
     }