Merge pull request #43 from jbonofre/42
[42] Change application type handling in spring-boot application manager
diff --git a/services/minho-spring-boot/src/main/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerService.java b/services/minho-spring-boot/src/main/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerService.java
index 41b7db2..74a43dc 100644
--- a/services/minho-spring-boot/src/main/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerService.java
+++ b/services/minho-spring-boot/src/main/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerService.java
@@ -61,7 +61,7 @@
// TODO add shutdown hook
}
- private List<Application> getApplications(Config config) {
+ protected List<Application> getApplications(Config config) {
List<Application> applications = new LinkedList<>();
if (config != null) {
config.getApplications().forEach(application -> {
@@ -69,7 +69,7 @@
if (canHandle(application.getUrl())) {
applications.add(application);
}
- } else if (application.getType().equals(name())) {
+ } else if (application.getType().equals("spring-boot")) {
applications.add(application);
}
});
diff --git a/services/minho-spring-boot/src/test/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerServiceTest.java b/services/minho-spring-boot/src/test/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerServiceTest.java
index f6dcdbc..664502a 100644
--- a/services/minho-spring-boot/src/test/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerServiceTest.java
+++ b/services/minho-spring-boot/src/test/java/org/apache/karaf/minho/springboot/SpringBootApplicationManagerServiceTest.java
@@ -18,14 +18,34 @@
package org.apache.karaf.minho.springboot;
import org.apache.karaf.minho.boot.Minho;
+import org.apache.karaf.minho.boot.config.Application;
+import org.apache.karaf.minho.boot.service.ConfigService;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
public class SpringBootApplicationManagerServiceTest {
@Test
- public void simpleTest() throws Exception {
- // TODO add spring boot sample app
- Minho.builder().build().start();
+ public void simpleTypeCheck() throws Exception {
+ ConfigService configService = new ConfigService();
+ List<Application> applications = new ArrayList<>();
+ Application application = new Application();
+ application.setType("spring-boot");
+ application.setName("my-test-app");
+ application.setUrl("mvn:foo/bar/1.0");
+ applications.add(application);
+ configService.setApplications(applications);
+
+ SpringBootApplicationManagerService service = new SpringBootApplicationManagerService();
+
+ List<Application> loaded = service.getApplications(configService);
+
+ Assertions.assertEquals(1, loaded.size());
+ Assertions.assertEquals("my-test-app", loaded.get(0).getName());
}
}
