Merge 56447064-code-climate to master

Glyn Normington · Glyn Normington · commit 426848efa478 · 2013-09-16T14:16:45.000+01:00
[#56447064]
diff --git a/lib/java_buildpack/container/groovy.rb b/lib/java_buildpack/container/groovy.rb
@@ -39,11 +39,7 @@ class Groovy
     # @option context [String] :lib_directory the directory that additional libraries are placed in
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
-      @app_dir = context[:app_dir]
-      @java_home = context[:java_home]
-      @java_opts = context[:java_opts]
-      @lib_directory = context[:lib_directory]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
       @version, @uri = Groovy.main_groovy(@app_dir) ? Groovy.find_groovy(@configuration) : [nil, nil]
     end
 
diff --git a/lib/java_buildpack/container/main.rb b/lib/java_buildpack/container/main.rb
@@ -34,11 +34,7 @@ class Main
     # @option context [String] :lib_directory the directory that additional libraries are placed in
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
-      @app_dir = context[:app_dir]
-      @java_home = context[:java_home]
-      @java_opts = context[:java_opts]
-      @lib_directory = context[:lib_directory]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # Detects whether this application is Java +main()+ application.
diff --git a/lib/java_buildpack/container/spring_boot_cli.rb b/lib/java_buildpack/container/spring_boot_cli.rb
@@ -40,11 +40,7 @@ class SpringBootCli
     # @option context [String] :lib_directory the directory that additional libraries are placed in
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
-      @app_dir = context[:app_dir]
-      @java_home = context[:java_home]
-      @java_opts = context[:java_opts]
-      @lib_directory = context[:lib_directory]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
       @version, @uri = SpringBootCli.find_spring_boot_cli(@app_dir, @configuration)
     end
 
diff --git a/lib/java_buildpack/framework/java_opts.rb b/lib/java_buildpack/framework/java_opts.rb
@@ -29,8 +29,7 @@ class JavaOpts
     # @option context [Array<String>] :java_opts an array that Java options can be added to
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
-      @java_opts = context[:java_opts]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # Detects whether this application contributes Java options.
diff --git a/lib/java_buildpack/framework/new_relic.rb b/lib/java_buildpack/framework/new_relic.rb
@@ -33,11 +33,7 @@ class NewRelic
     # @option context [Hash] :vcap_services The contents of the +VCAP_SERVICES+ environment variable
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
-      @app_dir = context[:app_dir]
-      @java_opts = context[:java_opts]
-      @vcap_application = context[:vcap_application]
-      @vcap_services = context[:vcap_services]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
       @version, @uri = NewRelic.find_new_relic_agent(@vcap_services, @configuration)
     end
 
diff --git a/lib/java_buildpack/framework/play_auto_reconfiguration.rb b/lib/java_buildpack/framework/play_auto_reconfiguration.rb
@@ -34,9 +34,7 @@ class PlayAutoReconfiguration
     # @option context [String] :lib_directory the directory that additional libraries are placed in
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
-      @app_dir = context[:app_dir]
-      @lib_directory = context[:lib_directory]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
       @version, @uri = PlayAutoReconfiguration.find_auto_reconfiguration(@app_dir, @configuration)
     end
 
diff --git a/lib/java_buildpack/framework/play_jpa_plugin.rb b/lib/java_buildpack/framework/play_jpa_plugin.rb
@@ -34,9 +34,7 @@ class PlayJpaPlugin
     # @option context [String] :lib_directory the directory that additional libraries are placed in
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
-      @app_dir = context[:app_dir]
-      @lib_directory = context[:lib_directory]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
       @version, @uri = PlayJpaPlugin.find_play_jpa_plugin(@app_dir, @configuration)
     end
 
diff --git a/lib/java_buildpack/framework/spring_auto_reconfiguration.rb b/lib/java_buildpack/framework/spring_auto_reconfiguration.rb
@@ -34,9 +34,7 @@ class SpringAutoReconfiguration
     # @option context [Hash] :configuration the properties provided by the user
     def initialize(context = {})
       @logger = JavaBuildpack::Diagnostics::LoggerFactory.get_logger
-      @app_dir = context[:app_dir]
-      @lib_directory = context[:lib_directory]
-      @configuration = context[:configuration]
+      context.each { |key, value| instance_variable_set("@#{key}", value) }
       @auto_reconfiguration_version, @auto_reconfiguration_uri = SpringAutoReconfiguration.find_auto_reconfiguration(@app_dir, @configuration)
     end
 
