Skip to content

Commit 0023891

Browse files
author
David O'Sullivan
committed
fixes bug with supports logic for cfenv
1 parent b0c4bfe commit 0023891

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

lib/java_buildpack/framework/spring_auto_reconfiguration.rb

+3-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ def spring?
5959
end
6060

6161
def java_cfenv?
62-
(@droplet.root + '**/*java-cfenv*.jar').glob.any? ||
63-
@droplet.additional_libraries.sort.map do |additional_library|
64-
return false unless (additional_library.dirname + '*java-cfenv*.jar').glob.any?
65-
end
62+
(@droplet.root + '**/*java-cfenv*.jar').glob.any? || @droplet.additional_libraries.any? do |additional_library|
63+
additional_library.instance_variable_get(:@pathname).fnmatch?('*java-cfenv*.jar')
64+
end
6665
end
6766

6867
def spring_cloud_connectors?

spec/fixtures/framework_auto_reconfiguration_java_cfenv_bp/WEB-INF/lib/spring-boot-3.2.3.RELEASE.jar

Whitespace-only changes.

spec/java_buildpack/framework/spring_auto_reconfiguration_spec.rb

+17-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@
4545
expect(component.detect).to be_nil
4646
end
4747

48-
it 'does not detect with Spring JAR and buildpack java-cfenv',
49-
app_fixture: 'framework_auto_reconfiguration_java_cfenv_bp' do
50-
51-
expect(component.detect).to be_nil
52-
end
53-
5448
it 'does not detect without Spring JAR' do
5549
expect(component.detect).to be_nil
5650
end
@@ -110,4 +104,21 @@
110104
expect(additional_libraries).to include(sandbox + "spring_auto_reconfiguration-#{version}.jar")
111105
end
112106

107+
context('when java-cfenv injects its lib') do
108+
109+
before do
110+
additional_libraries.insert 0, additional_libs_directory + 'stub-java-cfenv.jar'
111+
end
112+
113+
after do
114+
additional_libraries.delete additional_libs_directory + 'stub-java-cfenv.jar'
115+
end
116+
117+
it 'does not detect with Spring JAR and injected cfenv',
118+
app_fixture: 'framework_auto_reconfiguration_servlet_3' do
119+
120+
expect(component.detect).to be_nil
121+
end
122+
123+
end
113124
end

0 commit comments

Comments
 (0)