From 84546ca9a74d618f38215160152970c7594ee57c Mon Sep 17 00:00:00 2001
From: lionce <loredana.ionce@puppet.com>
Date: Tue, 14 Jan 2020 15:38:31 +0200
Subject: [PATCH] Rebase with master, fix conflicts and rubocop issues

---
 lib/facter/java_libjvm_path.rb   | 21 ++++++++-------------
 lib/facter/java_major_version.rb | 10 +++++-----
 spec/acceptance/install_spec.rb  | 24 ++++++++++++------------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/lib/facter/java_libjvm_path.rb b/lib/facter/java_libjvm_path.rb
index 1cd51a8..7ae549f 100644
--- a/lib/facter/java_libjvm_path.rb
+++ b/lib/facter/java_libjvm_path.rb
@@ -17,20 +17,15 @@ Facter.add(:java_libjvm_path) do
     java_default_home = Facter.value(:java_default_home)
     java_major_version = Facter.value(:java_major_version)
     unless java_major_version.nil?
-      if java_major_version.to_i >= 11
-        java_libjvm_file = Dir.glob("#{java_default_home}/lib/**/libjvm.so")
-        if java_libjvm_file.nil? || java_libjvm_file.empty?
-          nil
-        else
-          File.dirname(java_libjvm_file[0])
-        end
+      java_libjvm_file = if java_major_version.to_i >= 11
+                           Dir.glob("#{java_default_home}/lib/**/libjvm.so")
+                         else
+                           Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
+                         end
+      if java_libjvm_file.nil? || java_libjvm_file.empty?
+        nil
       else
-        java_libjvm_file = Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
-        if java_libjvm_file.nil? || java_libjvm_file.empty?
-          nil
-        else
-          File.dirname(java_libjvm_file[0])
-        end
+        File.dirname(java_libjvm_file[0])
       end
     end
   end
diff --git a/lib/facter/java_major_version.rb b/lib/facter/java_major_version.rb
index 123c70a..3afd994 100644
--- a/lib/facter/java_major_version.rb
+++ b/lib/facter/java_major_version.rb
@@ -17,11 +17,11 @@ Facter.add(:java_major_version) do
   setcode do
     java_version = Facter.value(:java_version)
     unless java_version.nil?
-      if java_version.strip[0..1] == '1.'
-        java_major_version = java_version.strip.split('_')[0].split('.')[1]
-      else
-        java_major_version = java_version.strip.split('.')[0]
-      end
+      java_major_version = if java_version.strip[0..1] == '1.'
+                             java_version.strip.split('_')[0].split('.')[1]
+                           else
+                             java_version.strip.split('.')[0]
+                           end
     end
   end
   java_major_version
diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb
index 9578443..2ea2885 100644
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper_acceptance'
+require 'pry'
 
 java_class_jre = "class { 'java':\n"\
                  "  distribution => 'jre',\n"\
@@ -41,7 +42,6 @@ bogus_alternative = "class { 'java':\n"\
                     "  java_alternative_path => '/whatever',\n"\
                     '}'
 
-context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
 # Oracle installs are disabled by default, because the links to valid oracle installations
 # change often. Look the parameters up from the Oracle download URLs at https://java.oracle.com and
 # enable the tests:
@@ -138,7 +138,7 @@ install_adopt_jdk_jre = <<EOL
   }
 EOL
 
-context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   it 'installs jre' do
     idempotent_apply(java_class_jre)
   end
@@ -176,17 +176,17 @@ context 'with failure cases' do
   end
 end
 
-context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   let(:install_path) do
-    (fact('osfamily') == 'RedHat') ? '/usr/java' : '/usr/lib/jvm'
+    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
   end
 
   let(:version_suffix) do
-    (fact('osfamily') == 'RedHat') ? '-amd64' : ''
+    (os[:family] == 'redhat') ? '-amd64' : ''
   end
 
   it 'installs oracle jdk and jre' do
-    idempotent_apply(default, install_oracle_jdk_jre)
+    idempotent_apply(install_oracle_jdk_jre)
     jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
     jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
     expect(jdk_result.exit_code).to eq(0)
@@ -194,28 +194,28 @@ context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.includ
   end
 
   it 'installs oracle jdk with jce' do
-    idempotent_apply(default, install_oracle_jdk_jce)
+    idempotent_apply(install_oracle_jdk_jce)
     result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
     expect(result.exit_code).to eq(0)
   end
 
   it 'installs oracle jre with jce' do
-    idempotent_apply(default, install_oracle_jre_jce)
+    idempotent_apply(install_oracle_jre_jce)
     result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
     expect(result.exit_code).to eq(0)
   end
 end
 
-context 'java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+context 'java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   let(:install_path) do
-    (fact('osfamily') == 'RedHat') ? '/usr/java' : '/usr/lib/jvm'
+    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
   end
 
   let(:version_suffix) do
-    (fact('osfamily') == 'RedHat') ? '-amd64' : ''
+    (os[:family] == 'redhat') ? '-amd64' : ''
   end
 
   it 'installs adopt jdk and jre' do
-    idempotent_apply(default, install_adopt_jdk_jre)
+    idempotent_apply(install_adopt_jdk_jre)
   end
 end