generator-jhipster 7.7.0 → 7.8.0

package/generators/server/templates/.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

package/generators/server/templates/src/main/java/package/config/KafkaProperties.java.ejs

@@ -1,68 +0,0 @@
-<%#
- Copyright 2013-2022 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-package <%= packageName %>.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Configuration
-@ConfigurationProperties(prefix = "kafka")
-public class KafkaProperties {
-
-    private String bootStrapServers = "localhost:9092";
-
-    private Map<String, String> consumer = new HashMap<>();
-
-    private Map<String, String> producer = new HashMap<>();
-
-    public String getBootStrapServers() {
-        return bootStrapServers;
-    }
-
-    public void setBootStrapServers(String bootStrapServers) {
-        this.bootStrapServers = bootStrapServers;
-    }
-
-    public Map<String, Object> getConsumerProps() {
-        Map<String, Object> properties = new HashMap<>(this.consumer);
-        if (!properties.containsKey("bootstrap.servers")) {
-            properties.put("bootstrap.servers", this.bootStrapServers);
-        }
-        return properties;
-    }
-
-    public void setConsumer(Map<String, String> consumer) {
-        this.consumer = consumer;
-    }
-
-    public Map<String, Object> getProducerProps() {
-        Map<String, Object> properties = new HashMap<>(this.producer);
-        if (!properties.containsKey("bootstrap.servers")) {
-            properties.put("bootstrap.servers", this.bootStrapServers);
-        }
-        return properties;
-    }
-
-    public void setProducer(Map<String, String> producer) {
-        this.producer = producer;
-    }
-}

package/generators/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs

@@ -1,125 +0,0 @@
-<%#
- Copyright 2013-2022 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-package <%= packageName %>;
-
-import static java.nio.file.Files.newDirectoryStream;
-import static java.nio.file.Paths.get;
-import static java.util.Spliterator.SORTED;
-import static java.util.Spliterators.spliteratorUnknownSize;
-import static java.util.stream.StreamSupport.stream;
-
-import tech.jhipster.config.JHipsterConstants;
-
-import com.datastax.oss.driver.api.core.CqlSession;
-import org.cassandraunit.CQLDataLoader;
-import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
-import org.junit.jupiter.api.BeforeAll;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.support.TestPropertySourceUtils;
-import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.time.Duration;
-import java.util.Iterator;
-import java.util.Spliterator;
-
-/**
- * Base class for starting/stopping Cassandra during tests.
- */
-@ActiveProfiles(JHipsterConstants.SPRING_PROFILE_TEST)
-@ContextConfiguration(initializers = AbstractCassandraTest.CassandraPortInitializer.class)
-public class AbstractCassandraTest {
-
-    public static final String CASSANDRA_UNIT_KEYSPACE = "cassandra_unit_keyspace";
-    public static final GenericContainer<?> CASSANDRA_CONTAINER;
-    public static final int CASSANDRA_TEST_PORT = 9042;
-    private static boolean started = false;
-
-    static {
-        CASSANDRA_CONTAINER =
-            new GenericContainer(DockerImageName.parse("<%= DOCKER_CASSANDRA %>")) // TODO replace by CassandraContainer
-                .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(30)))
-                .withExposedPorts(CASSANDRA_TEST_PORT);
-    }
-
-    @BeforeAll
-    public static void startServer() throws IOException, URISyntaxException {
-        if (!started) {
-            startTestContainer();
-
-            CqlSession session = CqlSession.builder()
-                .addContactPoint(new InetSocketAddress(
-                    CASSANDRA_CONTAINER.getContainerIpAddress(),
-                    CASSANDRA_CONTAINER.getMappedPort(CASSANDRA_TEST_PORT)))
-                .withLocalDatacenter("datacenter1")
-                .build();
-
-            createTestKeyspace(session);
-            CQLDataLoader dataLoader = new CQLDataLoader(session);
-            applyScripts(dataLoader, "config/cql/changelog/", "*.cql");
-            started = true;
-        }
-    }
-
-    private static void startTestContainer() {
-        CASSANDRA_CONTAINER.start();
-    }
-
-    private static void createTestKeyspace(CqlSession session) {
-        String createQuery = "CREATE KEYSPACE " + CASSANDRA_UNIT_KEYSPACE + " WITH replication={'class' : 'SimpleStrategy', 'replication_factor':1}";
-        session.execute(createQuery);
-        String useKeyspaceQuery = "USE " + CASSANDRA_UNIT_KEYSPACE;
-        session.execute(useKeyspaceQuery);
-    }
-
-    private static void applyScripts(CQLDataLoader dataLoader, String cqlDir, String pattern) throws IOException, URISyntaxException {
-        URL dirUrl = ClassLoader.getSystemResource(cqlDir);
-        if (dirUrl == null) { // protect for empty directory
-            return;
-        }
-
-        Iterator<Path> pathIterator = newDirectoryStream(get(dirUrl.toURI()), pattern).iterator();
-        Spliterator<Path> pathSpliterator = spliteratorUnknownSize(pathIterator, SORTED);
-        stream(pathSpliterator, false)
-            .map(Path::getFileName)
-            .map(Path::toString)
-            .sorted()
-            .map(file -> cqlDir + file)
-            .map(dataSetLocation -> new ClassPathCQLDataSet(dataSetLocation, false, false, CASSANDRA_UNIT_KEYSPACE))
-            .forEach(dataLoader::load);
-    }
-
-    public static class CassandraPortInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-        @Override
-        public void initialize(ConfigurableApplicationContext applicationContext) {
-            TestPropertySourceUtils.addInlinedPropertiesToEnvironment(applicationContext,
-                "spring.data.cassandra.port=" + AbstractCassandraTest.CASSANDRA_CONTAINER.getMappedPort(AbstractCassandraTest.CASSANDRA_TEST_PORT)
-            );
-        }
-    }
-}

package/generators/server/templates/src/test/java/package/MongoDbTestContainerExtension.java.ejs

@@ -1,37 +0,0 @@
-package <%= packageName %>;
-
-import java.util.Collections;
-
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.utility.DockerImageName;
-
-public class MongoDbTestContainerExtension implements BeforeAllCallback {
-    <%_ /* TODO, the smallest configuration that lead to only one error for webflux-gw-jwt was 0.6 RAM /0.8 SWAP/0.1 nanocore */ _%>
-    private static final ThreadLocal<MongoDBContainer> THREAD_CONTAINER = new ThreadLocal<>();
-    private final long memoryInBytes = Math.round(1024 * 1024 * 1024 * 0.6);
-    private final long memorySwapInBytes = Math.round(1024 * 1024 * 1024 * 0.8);
-    private final long nanoCpu = Math.round(1_000_000_000L * 0.1);
-
-    @Override
-    public void beforeAll(ExtensionContext context) {
-        if (null == THREAD_CONTAINER.get()) {
-            MongoDBContainer mongoDBContainer = new MongoDBContainer(DockerImageName.parse("<%= DOCKER_MONGODB %>"))
-                .withReuse(true)
-                .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
-                .withCommand("--nojournal --wiredTigerCacheSizeGB 0.25 --wiredTigerCollectionBlockCompressor none --slowOpSampleRate 0 --setParameter ttlMonitorEnabled=false --setParameter diagnosticDataCollectionEnabled=false --setParameter logicalSessionRefreshMillis=6000000 --setParameter enableFlowControl=false --setParameter oplogFetcherUsesExhaust=false --setParameter disableResumableRangeDeleter=true --setParameter enableShardedIndexConsistencyCheck=false --setParameter enableFinerGrainedCatalogCacheRefresh=false --setParameter readHedgingMode=off --setParameter loadRoutingTableOnStartup=false --setParameter rangeDeleterBatchDelayMS=2000000 --setParameter skipShardingConfigurationChecks=true --setParameter syncdelay=3600")
-                .withCreateContainerCmdModifier(cmd -> cmd.getHostConfig()
-                    .withMemory(memoryInBytes)
-                    .withMemorySwap(memorySwapInBytes)
-                    .withNanoCPUs(nanoCpu)
-                );
-            mongoDBContainer.start();
-            THREAD_CONTAINER.set(mongoDBContainer);
-        }
-    }
-
-    public static ThreadLocal<?> getThreadContainer() {
-        return THREAD_CONTAINER;
-    }
-}

package/generators/server/templates/src/test/java/package/TestContainersSpringContextCustomizerFactory.java.ejs

@@ -1,24 +0,0 @@
-package <%= packageName %>;
-
-import java.util.List;
-
-import <%= packageName %>.MongoDbTestContainerExtension;
-
-import org.springframework.test.context.ContextConfigurationAttributes;
-import org.springframework.test.context.ContextCustomizer;
-import org.springframework.test.context.ContextCustomizerFactory;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.testcontainers.containers.MongoDBContainer;
-
-public class TestContainersSpringContextCustomizerFactory implements ContextCustomizerFactory {
-    @Override
-    public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
-        return (context, mergedConfig) -> {
-            MongoDBContainer container = (MongoDBContainer)MongoDbTestContainerExtension.getThreadContainer().get();
-            if (container != null) {
-                TestPropertyValues.of("spring.data.mongodb.uri=" + container.getReplicaSetUrl())
-                    .applyTo(context.getEnvironment());
-            }
-        };
-    }
-}