Ensure that private class methods are private

Previously, a number of class methods were incorrectly scoped by using
the instance `private` method.  As pointed out in the issue, this
doesn't actually hide them.  This change uses the class-reopen style
to actually scope them.

[#59657214]

Author: nebhale

.idea/dictionaries/bhale.xml

@@ -30,7 +30,7 @@ The main class used when dealing with a repository is [`JavaBuildpack::Repositor
 # @param [Block, nil] version_validator an optional version validation block
 # @return [JavaBuildpack::Util::TokenizedVersion] the chosen version of the file
 # @return [String] the URI of the chosen version of the file
-def self.find_item(configuration, &version_validator)
+def find_item(configuration, &version_validator)
 ```
 
 Usage of the class might look like the following:

.idea/inspectionProfiles/Project_Default.xml

@@ -1,10 +1,8 @@
 # Security
-In addition to security considerations associated with containers, frameworks, and JREs the
-following points pertain to the security of the buildpack itself.
+In addition to security considerations associated with containers, frameworks, and JREs the following points pertain to the security of the buildpack itself.
 
 ## Buildpack Forks
-If you fork the Java buildpack, it is important to keep the fork up to date with the
-original repository. This will ensure that your fork runs with any security fixes that may be necessary.
+If you fork the Java buildpack, it is important to keep the fork up to date with the original repository. This will ensure that your fork runs with any security fixes that may be necessary.
 
 ## Security and Logs
 See [Sensitive Information in Logs][].

.idea/inspectionProfiles/profiles_settings.xml

@@ -33,27 +33,6 @@ module JavaBuildpack
   # Encapsulates the detection, compile, and release functionality for Java application
   class Buildpack
 
-    # Main entry to the buildpack.  Initializes the buildpack and all of its dependencies and yields a new instance
-    # to any given block.  Any exceptions thrown as part of the buildpack setup or execution are handled
-    #
-    # @param [String] app_dir the path of the application directory
-    # @param [String] message an error message with an insert for the reason for failure
-    # @yield [Buildpack] the buildpack to work with
-    # @return [Object] the return value from the given block
-    def self.with_buildpack(app_dir, message)
-      app_dir     = Pathname.new(File.expand_path(app_dir))
-      Logging::LoggerFactory.setup app_dir
-      application = Component::Application.new(app_dir)
-
-      yield new(app_dir, application) if block_given?
-    rescue => e
-      logger = Logging::LoggerFactory.get_logger Buildpack
-
-      logger.error { message % e.inspect }
-      logger.debug { "Exception #{e.inspect} backtrace:\n#{e.backtrace.join("\n")}" }
-      abort e.message
-    end
-
     # Iterates over all of the components to detect if this buildpack can be used to run an application
     #
     # @return [Array<String>] An array of strings that identify the components and versions that will be used to run
@@ -187,6 +166,31 @@ def tag_detection(type, components, unique)
       tags
     end
 
+    class << self
+
+      # Main entry to the buildpack.  Initializes the buildpack and all of its dependencies and yields a new instance
+      # to any given block.  Any exceptions thrown as part of the buildpack setup or execution are handled
+      #
+      # @param [String] app_dir the path of the application directory
+      # @param [String] message an error message with an insert for the reason for failure
+      # @yield [Buildpack] the buildpack to work with
+      # @return [Object] the return value from the given block
+      def with_buildpack(app_dir, message)
+        app_dir = Pathname.new(File.expand_path(app_dir))
+        Logging::LoggerFactory.setup app_dir
+        application = Component::Application.new(app_dir)
+
+        yield new(app_dir, application) if block_given?
+      rescue => e
+        logger = Logging::LoggerFactory.get_logger Buildpack
+
+        logger.error { message % e.inspect }
+        logger.debug { "Exception #{e.inspect} backtrace:\n#{e.backtrace.join("\n")}" }
+        abort e.message
+      end
+
+    end
+
   end
 
 end

docs/extending-repositories.md

@@ -44,7 +44,7 @@ class MemoryBucket
     # @param [MemoryRange, nil] range a user-specified range for the memory bucket or nil if the user did not specify a
     #                            range
     def initialize(name, weighting, range)
-      @name      = MemoryBucket.validate_name name
+      @name      = validate_name name
       @weighting = validate_weighting weighting
       @range     = range ? validate_memory_range(range) : nil
       logger     = JavaBuildpack::Logging::LoggerFactory.get_logger MemoryBucket
@@ -55,13 +55,13 @@ def initialize(name, weighting, range)
 
     private
 
-    def self.validate_name(name)
+    def validate_name(name)
       fail "Invalid MemoryBucket name '#{name}'" if name.nil? || name.to_s.size == 0
       name
     end
 
     def validate_weighting(weighting)
-      fail diagnose_weighting(weighting, 'not numeric') unless MemoryBucket.is_numeric weighting
+      fail diagnose_weighting(weighting, 'not numeric') unless is_numeric weighting
       fail diagnose_weighting(weighting, 'negative') if weighting < 0
       weighting
     end
@@ -70,7 +70,7 @@ def diagnose_weighting(weighting, reason)
       "Invalid weighting '#{@weighting}' for #{identify} : #{reason}"
     end
 
-    def self.is_numeric(w)
+    def is_numeric(w)
       Float(w) rescue false
     end
 

docs/security.md

@@ -22,15 +22,21 @@ module JavaBuildpack::Jre
   # A utility for handling Java memory settings.
   class MemoryLimit
 
-    # Returns the application's memory limit.
-    #
-    # @return [MemorySize, nil] the application's memory limit or nil if no memory limit has been provided
-    def self.memory_limit
-      memory_limit = ENV['MEMORY_LIMIT']
-      return nil unless memory_limit
-      memory_limit_size = MemorySize.new(memory_limit)
-      fail "Invalid negative $MEMORY_LIMIT #{memory_limit}" if memory_limit_size < 0
-      memory_limit_size
+    private_class_method :new
+
+    class << self
+
+      # Returns the application's memory limit.
+      #
+      # @return [MemorySize, nil] the application's memory limit or nil if no memory limit has been provided
+      def memory_limit
+        memory_limit = ENV['MEMORY_LIMIT']
+        return nil unless memory_limit
+        memory_limit_size = MemorySize.new(memory_limit)
+        fail "Invalid negative $MEMORY_LIMIT #{memory_limit}" if memory_limit_size < 0
+        memory_limit_size
+      end
+
     end
 
   end

lib/java_buildpack/buildpack.rb

@@ -36,12 +36,12 @@ class MemoryRange
     def initialize(value, ceiling = nil)
       if value.is_a? String
         fail "Invalid combination of parameter types #{value.class} and #{ceiling.class}" unless ceiling.nil?
-        lower_bound, upper_bound = MemoryRange.get_bounds(value)
+        lower_bound, upper_bound = get_bounds(value)
         @floor = create_memory_size lower_bound
         @ceiling = upper_bound ? create_memory_size(upper_bound) : nil
       else
-        MemoryRange.validate_memory_size value
-        MemoryRange.validate_memory_size ceiling unless ceiling.nil?
+        validate_memory_size value
+        validate_memory_size ceiling unless ceiling.nil?
         @floor = value
         @ceiling = ceiling
       end
@@ -113,7 +113,7 @@ def to_s
 
     RANGE_SEPARATOR = '..'
 
-    def self.get_bounds(range)
+    def get_bounds(range)
       if range.index(RANGE_SEPARATOR)
         lower_bound, upper_bound = range.split(RANGE_SEPARATOR)
         lower_bound = '0' if lower_bound.nil? || lower_bound == ''
@@ -127,7 +127,7 @@ def create_memory_size(size)
       MemorySize.new(size)
     end
 
-    def self.validate_memory_size(size)
+    def validate_memory_size(size)
       fail "Invalid MemorySize parameter of type #{size.class}" unless size.is_a? MemorySize
     end
 

lib/java_buildpack/jre/memory/memory_bucket.rb

@@ -32,7 +32,7 @@ def initialize(size)
         fail "Invalid memory size '#{size}'" if !size || size.length < 2
         unit = size[-1]
         v = size[0..-2]
-        fail "Invalid memory size '#{size}'" unless MemorySize.is_integer v
+        fail "Invalid memory size '#{size}'" unless is_integer v
         v = size.to_i
 
         # Store the number of bytes.
@@ -101,7 +101,7 @@ def +(other)
     # @return [MemorySize] the result
     def *(other)
       fail "Cannot multiply a Memory size by an instance of #{other.class}" unless other.is_a? Numeric
-      MemorySize.from_numeric((@bytes * other).round)
+      from_numeric((@bytes * other).round)
     end
 
     # Subtract a memory size from this memory size.
@@ -121,7 +121,7 @@ def -(other)
     # @return [MemorySize, Numeric] the result
     def /(other)
       return @bytes / other.bytes.to_f if other.is_a? MemorySize
-      return MemorySize.from_numeric((@bytes / other.to_f).round) if other.is_a? Numeric
+      return from_numeric((@bytes / other.to_f).round) if other.is_a? Numeric
       fail "Cannot divide a MemorySize by an instance of #{other.class}"
     end
 
@@ -137,24 +137,24 @@ def /(other)
 
     def memory_size_operation(other)
       fail "Invalid parameter: instance of #{other.class} is not a MemorySize" unless other.is_a? MemorySize
-      MemorySize.from_numeric(yield @bytes, other.bytes)
+      from_numeric(yield @bytes, other.bytes)
     end
 
-    def self.is_integer(v)
+    def is_integer(v)
       f = Float(v)
       f && f.floor == f
     rescue
       false
     end
 
-    def self.from_numeric(n)
+    def from_numeric(n)
       MemorySize.new("#{n.to_s}B")
     end
 
     public
 
     # Zero byte memory size
-    ZERO = from_numeric 0
+    ZERO = MemorySize.new('0B')
 
   end