Add zipkin(alfresco-zipkin-[repo|share]), share-war dependencies

docker-compose.yml

@@ -7,4 +7,4 @@ services:
     - 8080
     environment:
     - SERVICE_8080_NAME=start
-    - SERVICE_8080_TAGS=proxy-http
+    - SERVICE_8080_TAGS=proxy-http

src/main/java/eu/xenit/alfred/initializr/generator/buildsystem/RepositoryConstants.java

@@ -0,0 +1,24 @@
+package eu.xenit.alfred.initializr.generator.buildsystem;
+
+import io.spring.initializr.generator.buildsystem.MavenRepository;
+
+public class RepositoryConstants {
+
+    public static class MavenRepositories {
+        public static final MavenRepository SONATYPE_SNAPSHOT = new MavenRepository(
+                "sonatype-snaphost",
+                "Sonatype Snapshot Repository",
+                "https://oss.sonatype.org/content/repositories/snapshots/",
+                true);
+        public static final MavenRepository SONATYPE_RELEASE = new MavenRepository(
+                "sonatype-release",
+                "Sonatype Release Repository",
+                "https://oss.sonatype.org/service/local/staging/deploy/maven2/");
+        public static final MavenRepository JCENTER_RELEASE = new MavenRepository(
+                "jcenter-release",
+                "JCenter Release Repository",
+                "https://jcenter.bintray.com/");
+
+    }
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/share/ShareProjectGenerationConfiguration.java

@@ -0,0 +1,46 @@
+package eu.xenit.alfred.initializr.generator.extensions.share;
+
+
+import eu.xenit.alfred.initializr.generator.build.BuildCustomizer;
+import eu.xenit.alfred.initializr.generator.build.gradle.root.RootGradleBuild;
+import eu.xenit.alfred.initializr.generator.condition.ConditionalOnRequestedFacet;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeGradlePluginConfigurationCustomizer;
+import eu.xenit.alfred.initializr.generator.extensions.zipkin.share.AlfrescoZipkinShareDockerComposeYmlContributor;
+import eu.xenit.alfred.initializr.generator.sdk.alfred.AlfredSdk.Configurations;
+import io.spring.initializr.generator.buildsystem.Dependency;
+import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
+import io.spring.initializr.generator.buildsystem.gradle.GradleDependency;
+import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
+import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
+import io.spring.initializr.generator.version.VersionReference;
+import io.spring.initializr.metadata.support.MetadataBuildItemResolver;
+import org.springframework.context.annotation.Bean;
+
+@ProjectGenerationConfiguration
+@ConditionalOnRequestedFacet("share-war")
+public class ShareProjectGenerationConfiguration {
+
+    private final MetadataBuildItemResolver resolver;
+
+    public ShareProjectGenerationConfiguration(MetadataBuildItemResolver resolver) {
+        this.resolver = resolver;
+    }
+
+    @Bean
+    @ConditionalOnBuildSystem(GradleBuildSystem.ID)
+    public BuildCustomizer<RootGradleBuild> addShareWar(MetadataBuildItemResolver resolver) {
+        return (build) -> {
+            Dependency alfrescoZipkinShareAmp = GradleDependency.from(this.getShareDependency())
+                    .type("war")
+                    .version(VersionReference.ofProperty("alfresco-version"))
+                    .configuration(Configurations.BASE_SHARE_WAR)
+                    .build();
+            build.dependencies().add("share-war", alfrescoZipkinShareAmp);
+        };
+    }
+
+    private Dependency getShareDependency() {
+        return resolver.resolveDependency("share-war");
+    }
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/ZipkinDockerComposeCustomizer.java

@@ -0,0 +1,21 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin;
+
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeCustomizer;
+import eu.xenit.alfred.initializr.model.docker.ComposeServices;
+import eu.xenit.alfred.initializr.model.docker.DockerComposeModel;
+
+public class ZipkinDockerComposeCustomizer implements DockerComposeCustomizer {
+
+    @Override
+    public void customize(DockerCompose compose) {
+        DockerComposeModel zipkinModel = compose.file("zipkin");
+        ComposeServices services = zipkinModel.getServices();
+        services.service("zipkin")
+                .image("openzipkin/zipkin")
+                .ports("9411:9411");
+    }
+
+
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/ZipkinDockerComposeYmlContributor.java

@@ -0,0 +1,18 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin;
+
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeLocationStrategy;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlContributor;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlWriterDelegate;
+import io.spring.initializr.generator.io.IndentingWriterFactory;
+
+public class ZipkinDockerComposeYmlContributor extends DockerComposeYmlContributor {
+
+    ZipkinDockerComposeYmlContributor(DockerCompose compose,
+            DockerComposeYmlWriterDelegate writer,
+            IndentingWriterFactory indentingWriterFactory,
+            DockerComposeLocationStrategy locationStrategy) {
+        super(compose, "zipkin", writer, indentingWriterFactory, locationStrategy);
+    }
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/ZipkinProjectGenerationConfiguration.java

@@ -0,0 +1,45 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin;
+
+
+import eu.xenit.alfred.initializr.generator.condition.ConditionalOnRequestedFacet;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeGradlePluginConfigurationCustomizer;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeLocationStrategy;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlWriterDelegate;
+import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
+import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
+import io.spring.initializr.generator.io.IndentingWriterFactory;
+import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
+import io.spring.initializr.metadata.support.MetadataBuildItemResolver;
+import org.springframework.context.annotation.Bean;
+
+@ProjectGenerationConfiguration
+@ConditionalOnRequestedFacet("zipkin")
+public class ZipkinProjectGenerationConfiguration {
+    private final MetadataBuildItemResolver resolver;
+
+    public ZipkinProjectGenerationConfiguration(MetadataBuildItemResolver resolver) {
+        this.resolver = resolver;
+    }
+
+    @Bean
+    public ZipkinDockerComposeCustomizer zipkinDockerComposeCustomizer() {
+        return new ZipkinDockerComposeCustomizer();
+    }
+
+    @Bean
+    public ZipkinDockerComposeYmlContributor ZipkinDockerComposeYmlContributor(DockerCompose compose,
+            DockerComposeYmlWriterDelegate writer,
+            IndentingWriterFactory indentingWriterFactory,
+            DockerComposeLocationStrategy locationStrategy) {
+        return new ZipkinDockerComposeYmlContributor(compose, writer, indentingWriterFactory, locationStrategy);
+    }
+
+    @Bean
+    @ConditionalOnBuildSystem(GradleBuildSystem.ID)
+    DockerComposeGradlePluginConfigurationCustomizer configureZipkinDockerComposeGradlePlugin(
+            ZipkinDockerComposeYmlContributor composeYml) {
+        return (configuration) -> configuration.getUseComposeFiles().add(composeYml.composeFilename());
+    }
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/repo/AlfrescoZipkinRepoDockerComposeCustomizer.java

@@ -0,0 +1,27 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin.repo;
+
+import static eu.xenit.alfred.initializr.model.docker.ComposeEnvironment.env;
+
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeCustomizer;
+import eu.xenit.alfred.initializr.model.docker.ComposeServices;
+import eu.xenit.alfred.initializr.model.docker.DockerComposeModel;
+
+public class AlfrescoZipkinRepoDockerComposeCustomizer implements DockerComposeCustomizer {
+
+    @Override
+    public void customize(DockerCompose compose) {
+        DockerComposeModel zipkinModel = compose.file("alfresco-zipkin-repo");
+        ComposeServices services = zipkinModel.getServices();
+
+        services.service("alfresco")
+                .environment(
+                        env("DB_DRIVER","com.p6spy.engine.spy.P6SpyDriver"),
+                        env("DB_URL","jdbc:p6spy:postgresql://database:5432/alfresco"),
+                        env("GLOBAL_zipkin.collector","http://zipkin:9411/api/v2/spans")
+                );
+    }
+
+
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/repo/AlfrescoZipkinRepoDockerComposeYmlContributor.java

@@ -0,0 +1,18 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin.repo;
+
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeLocationStrategy;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlContributor;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlWriterDelegate;
+import io.spring.initializr.generator.io.IndentingWriterFactory;
+
+public class AlfrescoZipkinRepoDockerComposeYmlContributor extends DockerComposeYmlContributor {
+
+    AlfrescoZipkinRepoDockerComposeYmlContributor(DockerCompose compose,
+            DockerComposeYmlWriterDelegate writer,
+            IndentingWriterFactory indentingWriterFactory,
+            DockerComposeLocationStrategy locationStrategy) {
+        super(compose, "alfresco-zipkin-repo", writer, indentingWriterFactory, locationStrategy);
+    }
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/repo/AlfrescoZipkinRepoProjectGenerationConfiguration.java

@@ -0,0 +1,79 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin.repo;
+
+
+import static eu.xenit.alfred.initializr.generator.buildsystem.RepositoryConstants.MavenRepositories.SONATYPE_SNAPSHOT;
+import static org.springframework.util.StringUtils.quote;
+
+import eu.xenit.alfred.initializr.generator.build.BuildCustomizer;
+import eu.xenit.alfred.initializr.generator.build.gradle.root.RootGradleBuild;
+import eu.xenit.alfred.initializr.generator.condition.ConditionalOnRequestedFacet;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeGradlePluginConfigurationCustomizer;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeLocationStrategy;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlWriterDelegate;
+import eu.xenit.alfred.initializr.generator.extensions.zipkin.ZipkinDockerComposeYmlContributor;
+import eu.xenit.alfred.initializr.generator.sdk.alfred.AlfredSdk.Configurations;
+import io.spring.initializr.generator.buildsystem.Dependency;
+import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
+import io.spring.initializr.generator.buildsystem.gradle.GradleDependency;
+import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
+import io.spring.initializr.generator.io.IndentingWriterFactory;
+import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
+import io.spring.initializr.generator.version.VersionReference;
+import io.spring.initializr.metadata.support.MetadataBuildItemResolver;
+import org.springframework.context.annotation.Bean;
+
+@ProjectGenerationConfiguration
+@ConditionalOnRequestedFacet("alfresco-zipkin-repo")
+public class AlfrescoZipkinRepoProjectGenerationConfiguration {
+
+    private final MetadataBuildItemResolver resolver;
+
+    public AlfrescoZipkinRepoProjectGenerationConfiguration(MetadataBuildItemResolver resolver) {
+        this.resolver = resolver;
+    }
+
+    @Bean
+    public AlfrescoZipkinRepoDockerComposeCustomizer alfrescoZipkinRepoDockerComposeCustomizer() {
+        return new AlfrescoZipkinRepoDockerComposeCustomizer();
+    }
+
+    @Bean
+    public AlfrescoZipkinRepoDockerComposeYmlContributor alfrescoZipkinRepoDockerComposeYmlContributor(DockerCompose compose,
+            DockerComposeYmlWriterDelegate writer,
+            IndentingWriterFactory indentingWriterFactory,
+            DockerComposeLocationStrategy locationStrategy) {
+        return new AlfrescoZipkinRepoDockerComposeYmlContributor(compose, writer, indentingWriterFactory, locationStrategy);
+    }
+
+    @Bean
+    @ConditionalOnBuildSystem(GradleBuildSystem.ID)
+    public BuildCustomizer<RootGradleBuild> addAlfrescoZipkinRepoAmp(MetadataBuildItemResolver resolver) {
+        return (build) -> {
+
+            String alfrescoZipkinVersion = this.getAlfrescoZipkinRepoDependency().getVersion().getValue();
+            build.ext("alfrescoZipkinRepoVersion", quote(alfrescoZipkinVersion));
+
+            Dependency alfrescoZipkinRepoAmp = GradleDependency.from(this.getAlfrescoZipkinRepoDependency())
+                    .type("amp")
+                    .version(VersionReference.ofProperty("alfresco-zipkin-repo-version"))
+                    .configuration(Configurations.ALFRESCO_AMP)
+                    .build();
+            build.dependencies().add("alfresco-zipkin-repo", alfrescoZipkinRepoAmp);
+            build.repositories().add(SONATYPE_SNAPSHOT);
+        };
+    }
+
+    @Bean
+    @ConditionalOnBuildSystem(GradleBuildSystem.ID)
+    DockerComposeGradlePluginConfigurationCustomizer configureAlfrescoZipkinRepoDockerComposeGradlePlugin(
+            AlfrescoZipkinRepoDockerComposeYmlContributor composeYml) {
+        return (configuration) -> configuration.getUseComposeFiles().add(composeYml.composeFilename());
+    }
+
+
+    private Dependency getAlfrescoZipkinRepoDependency() {
+        return resolver.resolveDependency("alfresco-zipkin-repo");
+    }
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/share/AlfrescoZipkinShareDockerComposeCustomizer.java

@@ -0,0 +1,25 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin.share;
+
+import static eu.xenit.alfred.initializr.model.docker.ComposeEnvironment.env;
+
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeCustomizer;
+import eu.xenit.alfred.initializr.model.docker.ComposeServices;
+import eu.xenit.alfred.initializr.model.docker.DockerComposeModel;
+
+public class AlfrescoZipkinShareDockerComposeCustomizer implements DockerComposeCustomizer {
+
+    @Override
+    public void customize(DockerCompose compose) {
+        //TODO enable this once repository and share are split in different services
+//        DockerComposeModel zipkinModel = compose.file("alfresco-zipkin-share");
+//        ComposeServices services = zipkinModel.getServices();
+//        services.service("share")
+//                .environment(
+//                        env("JAVA_OPTS=-Dzipkin.collector=http://zipkin:9411/api/v2/spans")
+//                );
+    }
+
+
+
+}

src/main/java/eu/xenit/alfred/initializr/generator/extensions/zipkin/share/AlfrescoZipkinShareDockerComposeYmlContributor.java

@@ -0,0 +1,18 @@
+package eu.xenit.alfred.initializr.generator.extensions.zipkin.share;
+
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerCompose;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeLocationStrategy;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlContributor;
+import eu.xenit.alfred.initializr.generator.docker.compose.DockerComposeYmlWriterDelegate;
+import io.spring.initializr.generator.io.IndentingWriterFactory;
+
+public class AlfrescoZipkinShareDockerComposeYmlContributor extends DockerComposeYmlContributor {
+
+    AlfrescoZipkinShareDockerComposeYmlContributor(DockerCompose compose,
+            DockerComposeYmlWriterDelegate writer,
+            IndentingWriterFactory indentingWriterFactory,
+            DockerComposeLocationStrategy locationStrategy) {
+        super(compose, "alfresco-zipkin-share", writer, indentingWriterFactory, locationStrategy);
+    }
+
+}