Do not sort JAVA_OPTS

nebhale · nebhale · commit f22cf310e432 · 2014-03-28T10:24:55.000Z
Previously, the gremlins in my head drove me to sort the JAVA_OPTS before they were used during the startup of an application. As indicated in cloudfoundry#41, not only wasn't this needed, it actually prevented certain use-cases. This change removes the sorting of the JAVA_OPTS and updates the associated tests (the much larger bit of work). [#67684882][resolves cloudfoundry#41]
diff --git a/lib/java_buildpack/component/java_opts.rb b/lib/java_buildpack/component/java_opts.rb
@@ -71,7 +71,7 @@ def add_option(key, value)
       #
       # @return [String] the contents as an environment variable
       def as_env_var
-        "JAVA_OPTS=\"#{sort.join(' ')}\""
+        "JAVA_OPTS=\"#{join(' ')}\""
       end
 
       private
diff --git a/lib/java_buildpack/container/java_main.rb b/lib/java_buildpack/container/java_main.rb
@@ -44,7 +44,7 @@ def release
         [
           "#{@droplet.java_home.root}/bin/java",
           @droplet.additional_libraries.as_classpath,
-          @droplet.java_opts.sort.join(' '),
+          @droplet.java_opts.join(' '),
           main_class,
           arguments,
           port
diff --git a/spec/java_buildpack/component/java_opts_spec.rb b/spec/java_buildpack/component/java_opts_spec.rb
@@ -57,7 +57,7 @@
     opts.add_option 'test-key-2', 'test-value-2'
     opts.add_system_property 'test-key-1', 'test-value-1'
 
-    expect(opts.as_env_var).to eq('JAVA_OPTS="-Dtest-key-1=test-value-1 test-key-2=test-value-2"')
+    expect(opts.as_env_var).to eq('JAVA_OPTS="test-key-2=test-value-2 -Dtest-key-1=test-value-1"')
   end
 
 end
diff --git a/spec/java_buildpack/container/groovy_spec.rb b/spec/java_buildpack/container/groovy_spec.rb
@@ -107,7 +107,7 @@
   end
 
   def java_opts_str
-    "\"#{java_opts.sort.join(' ')}\""
+    "\"#{java_opts.join(' ')}\""
   end
 
 end
diff --git a/spec/java_buildpack/container/java_main_spec.rb b/spec/java_buildpack/container/java_main_spec.rb
@@ -140,7 +140,7 @@
   end
 
   def java_opts_str
-    java_opts.sort.join(' ')
+    java_opts.join(' ')
   end
 
 end
diff --git a/spec/java_buildpack/container/ratpack_spec.rb b/spec/java_buildpack/container/ratpack_spec.rb
@@ -60,7 +60,7 @@
   it 'should return command',
      app_fixture: 'container_ratpack_staged' do
 
-    expect(component.release).to eq("#{java_home.as_env_var} JAVA_OPTS=\"-Dratpack.port=$PORT test-opt-1 test-opt-2\" " \
+    expect(component.release).to eq("#{java_home.as_env_var} JAVA_OPTS=\"test-opt-2 test-opt-1 -Dratpack.port=$PORT\" " \
                                       '$PWD/bin/application')
   end
 
diff --git a/spec/java_buildpack/container/spring_boot_cli_spec.rb b/spec/java_buildpack/container/spring_boot_cli_spec.rb
@@ -112,7 +112,7 @@
   end
 
   def java_opts_str
-    "\"#{java_opts.sort.join(' ')}\""
+    "\"#{java_opts.join(' ')}\""
   end
 
 end
diff --git a/spec/java_buildpack/container/tomcat_spec.rb b/spec/java_buildpack/container/tomcat_spec.rb
@@ -78,7 +78,7 @@
 
   it 'should return command' do
 
-    expect(component.command).to eq("#{java_home.as_env_var} JAVA_OPTS=\"-Dhttp.port=$PORT test-opt-1 test-opt-2\" " \
+    expect(component.command).to eq("#{java_home.as_env_var} JAVA_OPTS=\"test-opt-2 test-opt-1 -Dhttp.port=$PORT\" " \
                                       '$PWD/.java-buildpack/tomcat/bin/catalina.sh run')
   end
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ def add_option(key, value)`
`71`	`71`	`#`
`72`	`72`	`# @return [String] the contents as an environment variable`
`73`	`73`	`def as_env_var`
`74`		`- "JAVA_OPTS=\"#{sort.join(' ')}\""`
	`74`	`+ "JAVA_OPTS=\"#{join(' ')}\""`
`75`	`75`	`end`
`76`	`76`
`77`	`77`	`private`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ def release`
`44`	`44`	`[`
`45`	`45`	`"#{@droplet.java_home.root}/bin/java",`
`46`	`46`	`@droplet.additional_libraries.as_classpath,`
`47`		`- @droplet.java_opts.sort.join(' '),`
	`47`	`+ @droplet.java_opts.join(' '),`
`48`	`48`	`main_class,`
`49`	`49`	`arguments,`
`50`	`50`	`port`