Support for PropertiesLauncher

nebhale · nebhale · commit 50e2a4c2621b · 2013-10-29T11:17:34.000Z
Spring Boot has a third kind of launcher, the PropertiesLauncher.
Previously, we did not add a --server.port flag when starting this
kind of launcher.  This change ensures that we do.

[#58809612]
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
     parser (2.0.0)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.8)
+    powerpack (0.0.9)
     rainbow (1.1.4)
     rake (10.1.0)
     redcarpet (3.0.0)
diff --git a/lib/java_buildpack/container/main.rb b/lib/java_buildpack/container/main.rb
@@ -76,7 +76,7 @@ def manifest_class_path
     end
 
     def port
-      main_class =~ /^org\.springframework\.boot\.loader\.[JW]arLauncher$/ ? '--server.port=$PORT' : nil
+      main_class =~ /^org\.springframework\.boot\.loader\.(?:[JW]ar|Properties)Launcher$/ ? '--server.port=$PORT' : nil
     end
 
   end
diff --git a/spec/fixtures/container_main_spring_boot_properties_launcher/META-INF/MANIFEST.MF b/spec/fixtures/container_main_spring_boot_properties_launcher/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+Main-Class: org.springframework.boot.loader.PropertiesLauncher
diff --git a/spec/java_buildpack/container/main_spec.rb b/spec/java_buildpack/container/main_spec.rb
@@ -154,6 +154,17 @@ module JavaBuildpack::Container
       expect(command).to eq('test-java-home/bin/java -cp . org.springframework.boot.loader.WarLauncher --server.port=$PORT')
     end
 
+    it 'should release Spring boot applications with a PropertiesLauncher in the MANIFEST.MF by specifying a port' do
+      command = Main.new(
+          app_dir: 'spec/fixtures/container_main_spring_boot_properties_launcher',
+          java_home: 'test-java-home',
+          java_opts: [],
+          configuration: {}
+      ).release
+
+      expect(command).to eq('test-java-home/bin/java -cp . org.springframework.boot.loader.PropertiesLauncher --server.port=$PORT')
+    end
+
     it 'should release Spring boot applications with a JarLauncher in the configuration by specifying a port' do
       Dir.mktmpdir do |root|
         lib_directory = File.join(root, '.lib')
@@ -194,6 +205,26 @@ module JavaBuildpack::Container
       end
     end
 
+    it 'should release Spring boot applications with a PropertiesLauncher in the configuration by specifying a port' do
+      Dir.mktmpdir do |root|
+        lib_directory = File.join(root, '.lib')
+        Dir.mkdir lib_directory
+
+        command = Main.new(
+            app_dir: root,
+            java_home: 'test-java-home',
+            java_opts: [],
+            lib_directory: lib_directory,
+            configuration: {
+                'java_main_class' => 'org.springframework.boot.loader.PropertiesLauncher',
+                'arguments' => 'some arguments'
+            }
+        ).release
+
+        expect(command).to eq('test-java-home/bin/java -cp . org.springframework.boot.loader.PropertiesLauncher some arguments --server.port=$PORT')
+      end
+    end
+
   end
 
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Main-Class: org.springframework.boot.loader.PropertiesLauncher`