Move tomcat_version from config to a constructor param

Signed-off-by: Emily Casey <[email protected]>
(cherry picked from commit 1a9733e)

Author: ekcasey

config/open_jdk_jre.yml

@@ -25,6 +25,6 @@ jvmkill_agent:
 memory_calculator:
   version: 3.+
   repository_root: "{default.repository.root}/memory-calculator/{platform}/{architecture}"
-  class_count: 
-  headroom: 
+  class_count:
+  headroom:
   stack_threads: 250

lib/java_buildpack/container/tomcat.rb

@@ -54,12 +54,12 @@ def command
       def sub_components(context)
         instance = TomcatInstance.new(sub_configuration_context(context, 'tomcat'))
         # pass Tomcat major version to geode_store so we can verify compatibility.
-        @configuration['geode_store']['tomcat_version'] = instance.instance_variable_get(:@version)[0]
+        tomcat_version = instance.instance_variable_get(:@version)[0]
 
         components = [
           instance,
           TomcatAccessLoggingSupport.new(sub_configuration_context(context, 'access_logging_support')),
-          TomcatGeodeStore.new(sub_configuration_context(context, 'geode_store')),
+          TomcatGeodeStore.new(sub_configuration_context(context, 'geode_store'), tomcat_version),
           TomcatInsightSupport.new(context),
           TomcatLifecycleSupport.new(sub_configuration_context(context, 'lifecycle_support')),
           TomcatLoggingSupport.new(sub_configuration_context(context, 'logging_support')),

lib/java_buildpack/container/tomcat/tomcat_geode_store.rb

@@ -27,6 +27,16 @@ module Container
     class TomcatGeodeStore < JavaBuildpack::Component::VersionedDependencyComponent
       include JavaBuildpack::Container
 
+      # Creates an instance.  In addition to the functionality inherited from +VersionedDependencyComponent+
+      # +@tomcat_version+ instance variable is exposed.
+      #
+      # @param [Hash] context a collection of utilities used by components
+      # @param [String] tomcat_version is the major version of tomcat
+      def initialize(context, tomcat_version)
+        super(context)
+        @tomcat_version = tomcat_version
+      end
+
       # (see JavaBuildpack::Component::BaseComponent#compile)
       def compile
         return unless supports?
@@ -144,16 +154,15 @@ def detect_geode_tomcat_version
             'Please verify your geode_store tar contains a geode-modules-tomcat jar.')
         end
 
-        tomcat_version = @configuration['tomcat_version']
+        puts "       Detected Geode Tomcat #{geode_tomcat_version} module"
 
         # leave possibility for generic jar/session manager class that is compatible with all tomcat versions
-        if !geode_tomcat_version.empty? && geode_tomcat_version != tomcat_version
-          puts "       WARNING: Tomcat version #{tomcat_version} " \
+        if !geode_tomcat_version.empty? && geode_tomcat_version != @tomcat_version
+          puts "       WARNING: Tomcat version #{@tomcat_version} " \
                   "does not match Geode Tomcat #{geode_tomcat_version} module. " \
                   'If you encounter compatibility issues, please make sure these versions match.'
         end
 
-        puts "       Detected Geode Tomcat #{geode_tomcat_version} module"
         @session_manager_classname =
           "org.apache.geode.modules.session.catalina.Tomcat#{geode_tomcat_version}DeltaSessionManager"
       end

spec/fixtures/container_no_tomcat_version_geode_store_context_after.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
   ~ Cloud Foundry Java Buildpack
-  ~ Copyright 2013-2021 the original author or authors.
+  ~ Copyright 2013-2020 the original author or authors.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

spec/fixtures/container_tomcat8_geode_store_context_after.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
   ~ Cloud Foundry Java Buildpack
-  ~ Copyright 2013-2021 the original author or authors.
+  ~ Copyright 2013-2020 the original author or authors.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

spec/fixtures/container_tomcat_geode_store_context_after.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
   ~ Cloud Foundry Java Buildpack
-  ~ Copyright 2013-2021 the original author or authors.
+  ~ Copyright 2013-2020 the original author or authors.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

spec/java_buildpack/container/tomcat/tomcat_geode_store_spec.rb

@@ -22,6 +22,8 @@
 describe JavaBuildpack::Container::TomcatGeodeStore do
   include_context 'with component help'
 
+  let(:component) { described_class.new(context, '9') }
+
   let(:component_id) { 'tomcat' }
 
   let(:configuration) do
@@ -83,9 +85,11 @@
        app_fixture: 'container_tomcat_geode_store',
        cache_fixture: 'stub-geode-store.tar' do
 
+      component = described_class.new(context, '8')
+
       expect { component.compile }.to output(
         # rubocop:disable Layout/LineLength
-        /WARNING: Tomcat version  does not match Geode Tomcat 9 module\. If you encounter compatibility issues, please make sure these versions match\./
+        /WARNING: Tomcat version 8 does not match Geode Tomcat 9 module\. If you encounter compatibility issues, please make sure these versions match\./
         # rubocop:enable Layout/LineLength
       ).to_stdout
     end

spec/java_buildpack/container/tomcat_spec.rb

@@ -47,8 +47,8 @@
   let(:lifecycle_support_configuration) { instance_double('lifecycle-support-configuration') }
 
   let(:logging_support_configuration) { instance_double('logging-support-configuration') }
-  # pass empty hash, so tomcat_version can be added in `sub_components` method
-  let(:geode_store_configuration) { {} }
+
+  let(:geode_store_configuration) { instance_double('geode_store_configuration') }
 
   let(:redis_store_configuration) { instance_double('redis-store-configuration') }
 
@@ -84,7 +84,7 @@
     allow(JavaBuildpack::Container::TomcatAccessLoggingSupport)
       .to receive(:new).with(sub_configuration_context(access_logging_support_configuration))
     allow(JavaBuildpack::Container::TomcatGeodeStore)
-      .to receive(:new).with(sub_configuration_context(geode_store_configuration))
+      .to receive(:new).with(sub_configuration_context(geode_store_configuration), '9')
     allow(JavaBuildpack::Container::TomcatInsightSupport).to receive(:new).with(context)
     allow(JavaBuildpack::Container::TomcatLifecycleSupport)
       .to receive(:new).with(sub_configuration_context(lifecycle_support_configuration))