Merge pull request sous-chefs#606 from sous-chefs/automated/cookstyle

Automated PR: Cookstyle Changes

Author: xorima

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 This file is used to list changes made in each version of the Java cookbook.
 
+## Unreleased
+
+- resolved cookstyle error: resources/alternatives.rb:49:13 refactor: `ChefCorrectness/ChefApplicationFatal`
+- resolved cookstyle error: resources/alternatives.rb:62:13 refactor: `ChefCorrectness/ChefApplicationFatal`
+- resolved cookstyle error: resources/alternatives.rb:75:11 refactor: `ChefCorrectness/ChefApplicationFatal`
+- resolved cookstyle error: resources/jce.rb:51:6 refactor: `ChefStyle/UnnecessaryOSCheck`
+
 ## 8.1.0 (10-04-2020)
 
 - Added `openjdk_pkg_install` resource & documentation

resources/alternatives.rb

@@ -46,7 +46,7 @@
           remove_cmd = shell_out("#{alternatives_cmd} --remove #{cmd} #{alt_path}")
           alternative_exists = false
           unless remove_cmd.exitstatus == 0
-            Chef::Application.fatal!(%( remove alternative failed ))
+            raise(%( remove alternative failed ))
           end
         end
       end
@@ -59,7 +59,7 @@
           end
           install_cmd = shell_out("#{alternatives_cmd} --install #{bin_path} #{cmd} #{alt_path} #{priority}")
           unless install_cmd.exitstatus == 0
-            Chef::Application.fatal!(%( install alternative failed ))
+            raise(%( install alternative failed ))
           end
         end
       end
@@ -72,7 +72,7 @@
         Chef::Log.debug "Setting alternative for #{cmd}"
         set_cmd = shell_out("#{alternatives_cmd} --set #{cmd} #{alt_path}")
         unless set_cmd.exitstatus == 0
-          Chef::Application.fatal!(%( set alternative failed ))
+          raise(%( set alternative failed ))
         end
       end
     end

resources/jce.rb

@@ -48,7 +48,7 @@
   # JRE installation does not have a jre folder
   jre_path = node['java']['install_type'] == 'jdk' ? 'jre' : ''
 
-  if node['os'] == 'windows'
+  if platform_family?('windows')
 
     staging_path = ::File.join(jce_home, jdk_version)
     staging_local_policy = ::File.join(staging_path, "UnlimitedJCEPolicyJDK#{jdk_version}", 'local_policy.jar')