Chagne PluginRegistry -> PLUGIN_REGISTRY

Fixes #6109

logstash-core-event-java/lib/logstash-core-event-java_jars.rb

@@ -1,20 +1,9 @@
 # this is a generated file, to avoid over-writing it just delete this comment
-begin
+require 'jar_dependencies'
-  require 'jar_dependencies'
-rescue LoadError
-  require 'com/fasterxml/jackson/core/jackson-databind/2.7.3/jackson-databind-2.7.3.jar'
-  require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
-  require 'com/fasterxml/jackson/core/jackson-annotations/2.7.0/jackson-annotations-2.7.0.jar'
-  require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.7.3/jackson-module-afterburner-2.7.3.jar'
-  require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.7.3/jackson-dataformat-cbor-2.7.3.jar'
-  require 'com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar'
-end
 
-if defined? Jars
+require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.7.0' )
-  require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.7.3' )
+require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.7.3' )
-  require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.6.2' )
+require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.6.2' )
-  require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.7.0' )
+require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.3' )
-  require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.3' )
+require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.7.3' )
-  require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.7.3' )
+require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.7.3' )
-  require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.7.3' )
-end

logstash-core/lib/logstash/agent.rb

@@ -55,7 +55,7 @@ class LogStash::Agent
     @reload_metric = metric.namespace([:stats, :pipelines])
 
     @dispatcher = LogStash::EventDispatcher.new(self)
-    LogStash::PluginRegistry.hooks.register_emitter(self.class, dispatcher)
+    LogStash::PLUGIN_REGISTRY.hooks.register_emitter(self.class, dispatcher)
     dispatcher.fire(:after_initialize)
   end
 

logstash-core/lib/logstash/plugin.rb

@@ -124,6 +124,6 @@ class LogStash::Plugin
   # Should I remove this now and make sure the pipeline invoke the Registry or I should wait for 6.0
   # Its not really part of the public api but its used by the tests a lot to mock the plugins.
   def self.lookup(type, name)
-    LogStash::PluginRegistry.lookup_pipeline_plugin(type, name)
+    LogStash::PLUGIN_REGISTRY.lookup_pipeline_plugin(type, name)
   end
 end # class LogStash::Plugin

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

@@ -172,7 +172,7 @@ module LogStash module Plugins
     end
 
     def lookup_pipeline_plugin(type, name)
-      LogStash::PluginRegistry.lookup(type, name) do |plugin_klass, plugin_name|
+      LogStash::PLUGIN_REGISTRY.lookup(type, name) do |plugin_klass, plugin_name|
         is_a_plugin?(plugin_klass, plugin_name)
       end
     rescue LoadError, NameError => e
@@ -244,5 +244,5 @@ module LogStash module Plugins
     end
   end end
 
-  PluginRegistry = Plugins::Registry.new
+  PLUGIN_REGISTRY = Plugins::Registry.new
 end

logstash-core/lib/logstash/runner.rb

@@ -201,7 +201,7 @@ class LogStash::Runner < Clamp::StrictCommand
 
     # We configure the registry and load any plugin that can register hooks
     # with logstash, this need to be done before any operation.
-    LogStash::PluginRegistry.setup!
+    LogStash::PLUGIN_REGISTRY.setup!
     @settings.validate_all
 
     LogStash::Util::set_thread_name(self.class.name)

logstash-core/spec/conditionals_spec.rb

@@ -35,7 +35,7 @@ describe "conditionals in output" do
   end
 
   before do
-    LogStash::PluginRegistry.add(:output, "dummynull", DummyNullOutput)
+    LogStash::PLUGIN_REGISTRY.add(:output, "dummynull", DummyNullOutput)
   end
 
   describe "simple" do