feat: dynamically add ap4k annotations if module is present

snowdrop · Mar 14, 2019 · 98c6476 · 98c6476
1 parent 8a64308
commit 98c6476
Show file tree

Hide file tree

Showing 9 changed files with 119 additions and 59 deletions.
diff --git a/pkg/scaffold/types.go b/pkg/scaffold/types.go
@@ -27,6 +27,15 @@ type Project struct {
 	UrlService string `yaml:"urlservice"           json:"urlservice"`
 }
 
+func (p *Project) HasAp4k() bool {
+	for _, mod := range p.Modules {
+		if "ap4k" == mod.Name {
+			return true
+		}
+	}
+	return false
+}
+
 type Config struct {
 	Templates       []Template      `yaml:"templates"    json:"templates"`
 	Boms            []Bom           `yaml:"bomversions"  json:"bomversions"`

diff --git a/pkg/template/assets_vfsdata.go b/pkg/template/assets_vfsdata.go
diff --git a/pkg/template/tmpl/client/src/main/java/dummy/Application.java b/pkg/template/tmpl/client/src/main/java/dummy/Application.java
@@ -15,13 +15,19 @@
  */
 package {{.PackageName}};
 
+{{$hasAp4k := .HasAp4k }}
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;{{if $hasAp4k}}
+import io.ap4k.kubernetes.annotation.KubernetesApplication;
+import io.ap4k.openshift.annotation.OpenshiftApplication;
+{{end}}
 
 /**
  * Entry point to the application.
  */
-@SpringBootApplication
+@SpringBootApplication{{if $hasAp4k}}
+@KubernetesApplication
+@OpenshiftApplication{{end}}
 public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

diff --git a/pkg/template/tmpl/crud/1.5/src/main/java/dummy/CrudApplication.java b/pkg/template/tmpl/crud/1.5/src/main/java/dummy/CrudApplication.java
@@ -16,10 +16,17 @@
 
 package {{.PackageName}};
 
+{{$hasAp4k := .HasAp4k}}
+
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;{{if $hasAp4k}}
+import io.ap4k.kubernetes.annotation.KubernetesApplication;
+import io.ap4k.openshift.annotation.OpenshiftApplication;
+{{end}}
 
-@SpringBootApplication
+@SpringBootApplication{{if $hasAp4k}}
+@KubernetesApplication
+@OpenshiftApplication{{end}}
 public class CrudApplication {
 
     public static void main(String[] args) {

diff --git a/pkg/template/tmpl/crud/2.1/src/main/java/dummy/CrudApplication.java b/pkg/template/tmpl/crud/2.1/src/main/java/dummy/CrudApplication.java
@@ -16,10 +16,17 @@
 
 package {{.PackageName}};
 
+{{$hasAp4k := .HasAp4k}}
+
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;{{if $hasAp4k}}
+import io.ap4k.kubernetes.annotation.KubernetesApplication;
+import io.ap4k.openshift.annotation.OpenshiftApplication;
+{{end}}
 
-@SpringBootApplication
+@SpringBootApplication{{if $hasAp4k}}
+@KubernetesApplication
+@OpenshiftApplication{{end}}
 public class CrudApplication {
 
     public static void main(String[] args) {

diff --git a/pkg/template/tmpl/custom/src/main/java/dummy/DemoApplication.java b/pkg/template/tmpl/custom/src/main/java/dummy/DemoApplication.java
@@ -1,9 +1,16 @@
 package {{.PackageName}};
 
+{{$hasAp4k := .HasAp4k}}
+
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;{{if $hasAp4k}}
+import io.ap4k.kubernetes.annotation.KubernetesApplication;
+import io.ap4k.openshift.annotation.OpenshiftApplication;
+{{end}}
 
-@SpringBootApplication
+@SpringBootApplication{{if $hasAp4k}}
+@KubernetesApplication
+@OpenshiftApplication{{end}}
 public class DemoApplication {
 
     public static void main(String[] args) {

diff --git a/pkg/template/tmpl/jsp/src/main/java/dummy/MvcApplication.java b/pkg/template/tmpl/jsp/src/main/java/dummy/MvcApplication.java
@@ -1,11 +1,19 @@
 package {{.PackageName}};
 
+{{$hasAp4k := .HasAp4k}}
+
+{{if $hasAp4k}}
+import io.ap4k.kubernetes.annotation.KubernetesApplication;
+import io.ap4k.openshift.annotation.OpenshiftApplication;
+{{end}}
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
 
-@SpringBootApplication
+@SpringBootApplication{{if $hasAp4k}}
+@KubernetesApplication
+@OpenshiftApplication{{end}}
 public class MvcApplication extends SpringBootServletInitializer {
 
 	@Override

diff --git a/pkg/template/tmpl/rest/1.5/src/main/java/dummy/RestApplication.java b/pkg/template/tmpl/rest/1.5/src/main/java/dummy/RestApplication.java
@@ -15,12 +15,20 @@
  */
 package {{.PackageName}};
 
+{{$hasAp4k := .HasAp4k}}
+
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+{{if $hasAp4k}}
+import io.ap4k.kubernetes.annotation.KubernetesApplication;
+import io.ap4k.openshift.annotation.OpenshiftApplication;
+{{end}}
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
-@SpringBootApplication
+@SpringBootApplication{{if $hasAp4k}}
+@KubernetesApplication
+@OpenshiftApplication{{end}}
 public class RestApplication {
 
     public static void main(String[] args) {

diff --git a/pkg/template/tmpl/rest/2.1/src/main/java/dummy/RestApplication.java b/pkg/template/tmpl/rest/2.1/src/main/java/dummy/RestApplication.java
@@ -15,12 +15,20 @@
  */
 package {{.PackageName}};
 
+{{$hasAp4k := .HasAp4k}}
+
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+{{if $hasAp4k}}
+import io.ap4k.kubernetes.annotation.KubernetesApplication;
+import io.ap4k.openshift.annotation.OpenshiftApplication;
+{{end}}
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 
-@SpringBootApplication
+@SpringBootApplication{{if $hasAp4k}}
+@KubernetesApplication
+@OpenshiftApplication{{end}}
 public class RestApplication {
 
     public static void main(String[] args) {