(PUP-11767) Fix EmptyCaseCondition and remove from rubocop_todo

Author: tvpartytonight

.rubocop_todo.yml

@@ -422,17 +422,6 @@ Style/DoubleNegation:
     - 'lib/puppet/util/feature.rb'
     - 'lib/puppet/util/windows/adsi.rb'
 
-# This cop supports safe auto-correction (--auto-correct).
-Style/EmptyCaseCondition:
-  Exclude:
-    - 'lib/puppet/pops/serialization/serializer.rb'
-    - 'lib/puppet/pops/types/type_calculator.rb'
-    - 'lib/puppet/settings.rb'
-    - 'lib/puppet/settings/duration_setting.rb'
-    - 'lib/puppet/settings/priority_setting.rb'
-    - 'lib/puppet/settings/ttl_setting.rb'
-    - 'lib/puppet/type.rb'
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty, nil, both

lib/puppet/pops/serialization/serializer.rb

@@ -105,32 +105,31 @@ def inspect
     # @param [Object] value the value to write
     # @api private
     def write_tabulated_first_time(value)
-      case
-      when value.instance_of?(Symbol),
-          value.instance_of?(Regexp),
-          value.instance_of?(SemanticPuppet::Version),
-          value.instance_of?(SemanticPuppet::VersionRange),
-          value.instance_of?(Time::Timestamp),
-          value.instance_of?(Time::Timespan),
-          value.instance_of?(Types::PBinaryType::Binary),
-          value.is_a?(URI)
+      if value.instance_of?(Symbol) ||
+         value.instance_of?(Regexp) ||
+         value.instance_of?(SemanticPuppet::Version) ||
+         value.instance_of?(SemanticPuppet::VersionRange) ||
+         value.instance_of?(Time::Timestamp) ||
+         value.instance_of?(Time::Timespan) ||
+         value.instance_of?(Types::PBinaryType::Binary) ||
+         value.is_a?(URI)
         push_written(value)
         @writer.write(value)
-      when value.instance_of?(Array)
+      elsif value.instance_of?(Array)
         push_written(value)
         start_array(value.size)
         value.each { |elem| write(elem) }
-      when value.instance_of?(Hash)
+      elsif value.instance_of?(Hash)
         push_written(value)
         start_map(value.size)
         value.each_pair { |key, val| write(key); write(val) }
-      when value.instance_of?(Types::PSensitiveType::Sensitive)
+      elsif value.instance_of?(Types::PSensitiveType::Sensitive)
         start_sensitive
         write(value.unwrap)
-      when value.instance_of?(Types::PTypeReferenceType)
+      elsif value.instance_of?(Types::PTypeReferenceType)
         push_written(value)
         @writer.write(value)
-      when value.is_a?(Types::PuppetObject)
+      elsif value.is_a?(Types::PuppetObject)
         value._pcore_type.write(value, self)
       else
         impl_class = value.class

lib/puppet/pops/types/type_calculator.rb

@@ -214,27 +214,26 @@ def type(c)
     raise ArgumentError, 'Argument must be a Module' unless c.is_a? Module
 
     # Can't use a visitor here since we don't have an instance of the class
-    case
-    when c <= Integer
+    if c <= Integer
       type = PIntegerType::DEFAULT
-    when c == Float
+    elsif c == Float
       type = PFloatType::DEFAULT
-    when c == Numeric
+    elsif c == Numeric
       type = PNumericType::DEFAULT
-    when c == String
+    elsif c == String
       type = PStringType::DEFAULT
-    when c == Regexp
+    elsif c == Regexp
       type = PRegexpType::DEFAULT
-    when c == NilClass
+    elsif c == NilClass
       type = PUndefType::DEFAULT
-    when c == FalseClass, c == TrueClass
+    elsif c == FalseClass || c == TrueClass
       type = PBooleanType::DEFAULT
-    when c == Class
+    elsif c == Class
       type = PTypeType::DEFAULT
-    when c == Array
+    elsif c == Array
       # Assume array of any
       type = PArrayType::DEFAULT
-    when c == Hash
+    elsif c == Hash
       # Assume hash of any
       type = PHashType::DEFAULT
     else

lib/puppet/settings.rb

@@ -1306,15 +1306,14 @@ def issue_deprecation_warning(setting, msg = nil)
     name = setting.name
     ref = DEPRECATION_REFS.find { |params, _reference| params.include?(name) }
     ref = ref[1] if ref
-    case
-    when msg
+    if msg
       msg << " #{ref}" if ref
       Puppet.deprecation_warning(msg)
-    when setting.completely_deprecated?
+    elsif setting.completely_deprecated?
       message = _("Setting %{name} is deprecated.") % { name: name }
       message += " #{ref}"
       Puppet.deprecation_warning(message, "setting-#{name}")
-    when setting.allowed_on_commandline?
+    elsif setting.allowed_on_commandline?
       # TRANSLATORS 'puppet.conf' is a file name and should not be translated
       message = _("Setting %{name} is deprecated in puppet.conf.") % { name: name }
       message += " #{ref}"

lib/puppet/settings/duration_setting.rb

@@ -22,10 +22,9 @@ def type
 
   # Convert the value to an integer, parsing numeric string with units if necessary.
   def munge(value)
-    case
-    when value.is_a?(Integer) || value.nil?
+    if value.is_a?(Integer) || value.nil?
       value
-    when (value.is_a?(String) and value =~ FORMAT)
+    elsif (value.is_a?(String) and value =~ FORMAT)
       $1.to_i * UNITMAP[$2 || 's']
     else
       raise Puppet::Settings::ValidationError, _("Invalid duration format '%{value}' for parameter: %{name}") % { value: value.inspect, name: @name }

lib/puppet/settings/priority_setting.rb

@@ -31,12 +31,11 @@ def type
   def munge(value)
     return unless value
 
-    case
-    when value.is_a?(Integer)
+    if value.is_a?(Integer)
       value
-    when (value.is_a?(String) and value =~ /\d+/)
+    elsif (value.is_a?(String) and value =~ /\d+/)
       value.to_i
-    when (value.is_a?(String) and PRIORITY_MAP[value.to_sym])
+    elsif (value.is_a?(String) and PRIORITY_MAP[value.to_sym])
       PRIORITY_MAP[value.to_sym]
     else
       raise Puppet::Settings::ValidationError, _("Invalid priority format '%{value}' for parameter: %{name}") % { value: value.inspect, name: @name }

lib/puppet/settings/ttl_setting.rb

@@ -34,18 +34,17 @@ def print(value)
 
   # Convert the value to Numeric, parsing numeric string with units if necessary.
   def self.munge(value, param_name)
-    case
-    when value.is_a?(Numeric)
+    if value.is_a?(Numeric)
       if value < 0
         raise Puppet::Settings::ValidationError, _("Invalid negative 'time to live' %{value} - did you mean 'unlimited'?") % { value: value.inspect }
       end
 
       value
 
-    when value == 'unlimited'
+    elsif value == 'unlimited'
       Float::INFINITY
 
-    when (value.is_a?(String) and value =~ FORMAT)
+    elsif (value.is_a?(String) and value =~ FORMAT)
       $1.to_i * UNITMAP[$2 || 's']
     else
       raise Puppet::Settings::ValidationError, _("Invalid 'time to live' format '%{value}' for parameter: %{param_name}") % { value: value.inspect, param_name: param_name }