Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f008ca0

Browse filesBrowse files
author
Glyn Normington
committed
Remove duplicate download code associated with ApplicationCache
Also tighten up the ApplicationCache interface by hding the constructor. [#56447064]
1 parent ad3b538 commit f008ca0
Copy full SHA for f008ca0

File tree

Expand file treeCollapse file tree

12 files changed

+67
-95
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

12 files changed

+67
-95
lines changed
Open diff view settings
Collapse file

‎lib/java_buildpack/container/groovy.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/container/groovy.rb
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ def detect
6464
#
6565
# @return [void]
6666
def compile
67-
download_start_time = Time.now
68-
print "-----> Downloading Groovy #{@version} from #{@uri} "
69-
70-
JavaBuildpack::Util::ApplicationCache.new.get(@uri) do |file| # TODO: Use global cache #50175265
71-
puts "(#{(Time.now - download_start_time).duration})"
67+
JavaBuildpack::Util::ApplicationCache.download('Groovy', @version, @uri) do |file|
7268
expand(file, @configuration)
7369
end
7470
end
Collapse file

‎lib/java_buildpack/container/play.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/container/play.rb
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
require 'java_buildpack/container/container_utils'
1919
require 'java_buildpack/repository/configured_item'
2020
require 'java_buildpack/util/application_cache'
21-
require 'java_buildpack/util/format_duration'
2221
require 'java_buildpack/util/play_utils'
2322
require 'pathname'
2423

Collapse file

‎lib/java_buildpack/container/spring_boot_cli.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/container/spring_boot_cli.rb
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ def detect
6464
#
6565
# @return [void]
6666
def compile
67-
download_start_time = Time.now
68-
print "-----> Downloading Spring Boot CLI #{@version} from #{@uri} "
69-
70-
JavaBuildpack::Util::ApplicationCache.new.get(@uri) do |file| # TODO: Use global cache #50175265
71-
puts "(#{(Time.now - download_start_time).duration})"
67+
JavaBuildpack::Util::ApplicationCache.download('Spring Boot CLI', @version, @uri) do |file|
7268
expand(file, @configuration)
7369
end
7470
link_classpath_jars
Collapse file

‎lib/java_buildpack/container/tomcat.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/container/tomcat.rb
+2-12Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,13 @@ def copy_resources(tomcat_home)
9898
end
9999

100100
def download_tomcat
101-
download_start_time = Time.now
102-
print "-----> Downloading Tomcat #{@tomcat_version} from #{@tomcat_uri} "
103-
104-
JavaBuildpack::Util::ApplicationCache.new.get(@tomcat_uri) do |file| # TODO: Use global cache #50175265
105-
puts "(#{(Time.now - download_start_time).duration})"
101+
JavaBuildpack::Util::ApplicationCache.download('Tomcat', @tomcat_version, @tomcat_uri) do |file|
106102
expand(file, @configuration)
107103
end
108104
end
109105

110106
def download_support
111-
download_start_time = Time.now
112-
print " Downloading Buildpack Tomcat Support #{@support_version} from #{@support_uri} "
113-
114-
JavaBuildpack::Util::ApplicationCache.new.get(@support_uri) do |file| # TODO: Use global cache #50175265
115-
system "cp #{file.path} #{File.join(tomcat_home, 'lib', support_jar_name(@support_version))}"
116-
puts "(#{(Time.now - download_start_time).duration})"
117-
end
107+
JavaBuildpack::Util::ApplicationCache.download_jar(@support_version, @support_uri, 'Buildpack Tomcat Support', support_jar_name(@support_version), File.join(tomcat_home, 'lib'))
118108
end
119109

120110
def expand(file, configuration)
Collapse file

‎lib/java_buildpack/framework/new_relic.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/framework/new_relic.rb
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
require 'java_buildpack/framework'
1818
require 'java_buildpack/repository/configured_item'
19-
require 'java_buildpack/util/download'
19+
require 'java_buildpack/util/application_cache'
2020

2121
module JavaBuildpack::Framework
2222

@@ -56,7 +56,7 @@ def compile
5656
system "mkdir -p #{new_relic_home}"
5757
system "mkdir -p #{File.join new_relic_home, 'logs'}"
5858

59-
JavaBuildpack::Util.download(@version, @uri, 'New Relic Agent', jar_name(@version), new_relic_home)
59+
JavaBuildpack::Util::ApplicationCache.download_jar(@version, @uri, 'New Relic Agent', jar_name(@version), new_relic_home)
6060
copy_resources new_relic_home
6161
end
6262

Collapse file

‎lib/java_buildpack/framework/play_auto_reconfiguration.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/framework/play_auto_reconfiguration.rb
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
require 'java_buildpack/framework'
1818
require 'java_buildpack/repository/configured_item'
19-
require 'java_buildpack/util/download'
19+
require 'java_buildpack/util/application_cache'
2020
require 'java_buildpack/util/play_utils'
2121

2222
module JavaBuildpack::Framework
@@ -52,7 +52,7 @@ def detect
5252
#
5353
# @return [void]
5454
def compile
55-
JavaBuildpack::Util.download(@version, @uri, 'Auto Reconfiguration', jar_name(@version), @lib_directory)
55+
JavaBuildpack::Util::ApplicationCache.download_jar(@version, @uri, 'Auto Reconfiguration', jar_name(@version), @lib_directory)
5656
end
5757

5858
# Does nothing
Collapse file

‎lib/java_buildpack/framework/play_jpa_plugin.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/framework/play_jpa_plugin.rb
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
require 'java_buildpack/framework'
1818
require 'java_buildpack/repository/configured_item'
1919
require 'java_buildpack/util/application_cache'
20-
require 'java_buildpack/util/download'
21-
require 'java_buildpack/util/format_duration'
2220
require 'java_buildpack/util/play_utils'
2321

2422
module JavaBuildpack::Framework
@@ -54,7 +52,7 @@ def detect
5452
#
5553
# @return [void]
5654
def compile
57-
JavaBuildpack::Util.download(@version, @uri, 'Play JPA Plugin', jar_name(@version), @lib_directory)
55+
JavaBuildpack::Util::ApplicationCache.download_jar(@version, @uri, 'Play JPA Plugin', jar_name(@version), @lib_directory)
5856
end
5957

6058
# Does nothing
Collapse file

‎lib/java_buildpack/framework/spring_auto_reconfiguration.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/framework/spring_auto_reconfiguration.rb
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
require 'java_buildpack/framework/spring_auto_reconfiguration/web_xml_modifier'
2020
require 'java_buildpack/repository/configured_item'
2121
require 'java_buildpack/util/application_cache'
22-
require 'java_buildpack/util/download'
23-
require 'java_buildpack/util/format_duration'
2422

2523
module JavaBuildpack::Framework
2624

@@ -54,7 +52,7 @@ def detect
5452
#
5553
# @return [void]
5654
def compile
57-
JavaBuildpack::Util.download(@auto_reconfiguration_version, @auto_reconfiguration_uri, 'Auto Reconfiguration', jar_name(@auto_reconfiguration_version), @lib_directory)
55+
JavaBuildpack::Util::ApplicationCache.download_jar(@auto_reconfiguration_version, @auto_reconfiguration_uri, 'Auto Reconfiguration', jar_name(@auto_reconfiguration_version), @lib_directory)
5856
modify_web_xml
5957
end
6058

Collapse file

‎lib/java_buildpack/jre/openjdk.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/jre/openjdk.rb
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ def detect
6060
#
6161
# @return [void]
6262
def compile
63-
download_start_time = Time.now
64-
print "-----> Downloading OpenJDK #{@version} JRE from #{@uri} "
65-
66-
JavaBuildpack::Util::ApplicationCache.new.get(@uri) do |file| # TODO: Use global cache #50175265
67-
puts "(#{(Time.now - download_start_time).duration})"
63+
JavaBuildpack::Util::ApplicationCache.download('OpenJDK JRE', @version, @uri) do |file|
6864
expand file
6965
end
7066
copy_killjava_script
Collapse file

‎lib/java_buildpack/util/application_cache.rb‎

Copy file name to clipboardExpand all lines: lib/java_buildpack/util/application_cache.rb
+34-1Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
require 'time'
1718
require 'java_buildpack/util'
1819
require 'java_buildpack/util/download_cache'
20+
require 'java_buildpack/util/format_duration'
1921

2022
module JavaBuildpack::Util
2123

@@ -25,10 +27,41 @@ module JavaBuildpack::Util
2527
# <b>WARNING: This cache should only by used by code run by the +compile+ script</b>
2628
class ApplicationCache < DownloadCache
2729

28-
# Creates an instance that is configured to use the application cache. The application cache location is defined by
30+
# Downloads an item with the given name and version from the given URI, then yields the resultant
31+
# file to the given block. The application cache location is defined by
2932
# the second argument (<tt>ARGV[1]</tt>) to the +compile+ script.
3033
#
34+
# @param [String] name
35+
# @param [JavaBuildpack::Util::TokenizedVersion] version
36+
# @param [String] uri
3137
# @raise if the second argument (<tt>ARGV[1]</tt>) to the +compile+ script is +nil+
38+
def self.download(name, version, uri)
39+
download_start_time = Time.now
40+
print "-----> Downloading #{name} #{version} from #{uri} "
41+
42+
new.get(uri) do |file| # TODO: Use global cache #50175265
43+
puts "(#{(Time.now - download_start_time).duration})"
44+
yield file
45+
end
46+
end
47+
48+
# Downloads a given JAR and copies it to a given destination. The application cache location is defined by
49+
# the second argument (<tt>ARGV[1]</tt>) to the +compile+ script.
50+
#
51+
# @param [JavaBuildpack::Util::TokenizedVersion] version the version of the item
52+
# @param [String] uri the URI of the item
53+
# @param [String] description a description of the item
54+
# @param [String] jar_name the filename of the item
55+
# @param [String] target_directory the path of the directory into which to download the item
56+
# @raise if the second argument (<tt>ARGV[1]</tt>) to the +compile+ script is +nil+
57+
def self.download_jar(version, uri, description, jar_name, target_directory)
58+
download(description, version, uri) do |file|
59+
system "cp #{file.path} #{File.join(target_directory, jar_name)}"
60+
end
61+
end
62+
63+
private_class_method :new
64+
3265
def initialize
3366
application_cache_directory = ARGV[1]
3467
raise 'Application cache directory is undefined' if application_cache_directory.nil?

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.