RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Clean up code according to rubocop checks

Browse Source
This commit is contained in:
Tim Eilers
2019-06-25 15:25:11 +02:00
committed by lionce
parent c0748f164f
commit da548082fe
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/adopt.pp
View File

@@ -172,6 +172,7 @@ define java::adopt (
} else { } else {
$_version = $version $_version = $version
$_version_int = Numeric($_version)
# use default versions if no specific major and minor version parameters are provided # use default versions if no specific major and minor version parameters are provided
case $version { case $version {
'8' : { '8' : {
@@ -276,7 +277,7 @@ define java::adopt (
# jre just replaces jdk with jre in the archive name, but not in the path name! # jre just replaces jdk with jre in the archive name, but not in the path name!
# https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz # https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz
if ( "${_version}" == '8' ) { if ( $_version_int == 8 ) {
$_release_minor_package_name = $release_minor $_release_minor_package_name = $release_minor
} else { } else {
$_release_minor_package_name = "_${release_minor}" $_release_minor_package_name = "_${release_minor}"
@@ -293,7 +294,7 @@ define java::adopt (
# naming convention changed after major version 8, setting variables to consider that # naming convention changed after major version 8, setting variables to consider that
# download_folder_prefix always begins with "jdk", even for jre! see comments for package_name above # download_folder_prefix always begins with "jdk", even for jre! see comments for package_name above
if ( "${_version}" == '8' ) { if ( $_version_int == 8 ) {
$spacer = '-' $spacer = '-'
$download_folder_prefix = 'jdk' $download_folder_prefix = 'jdk'
} else { } else {

10
spec/defines/adopt_spec.rb
View File

@@ -49,7 +49,6 @@ describe 'java::adopt', type: :define do
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') } it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') }
end end
context 'when AdoptOpenJDK Java 8 JRE' do context 'when AdoptOpenJDK Java 8 JRE' do
let(:params) { { ensure: 'present', version: '8', java: 'jre' } } let(:params) { { ensure: 'present', version: '8', java: 'jre' } }
let(:title) { 'jre8' } let(:title) { 'jre8' }
@@ -249,10 +248,10 @@ describe 'java::adopt', type: :define do
context 'when installing multiple versions' do context 'when installing multiple versions' do
let(:params) do let(:params) do
{ {
ensure: 'present', ensure: 'present',
version_major: '8u202', version_major: '8u202',
version_minor: 'b08', version_minor: 'b08',
java: 'jdk', java: 'jdk',
} }
end end
let(:title) { 'jdk8' } let(:title) { 'jdk8' }
@@ -271,7 +270,6 @@ describe 'java::adopt', type: :define do
it { is_expected.to compile } it { is_expected.to compile }
end end
end end
describe 'incompatible OSes' do describe 'incompatible OSes' do
[ [