generator-jhipster 7.8.0 → 7.9.1

package/utils/liquibase.js

@@ -19,7 +19,7 @@
 
 const _ = require('lodash');
 
-const { MYSQL, MARIADB, POSTGRESQL } = require('../jdl/jhipster/database-types');
+const { MYSQL, MARIADB } = require('../jdl/jhipster/database-types');
 const { CommonDBTypes, RelationalOnlyDBTypes, BlobTypes } = require('../jdl/jhipster/field-types');
 
 const { STRING, INTEGER, LONG, BIG_DECIMAL, FLOAT, DOUBLE, UUID, BOOLEAN, LOCAL_DATE, ZONED_DATE_TIME, INSTANT, DURATION } = CommonDBTypes;
@@ -129,12 +129,8 @@ function parseLiquibaseColumnType(entity, field) {
   }
 
   if (fieldType === BYTES && field.fieldTypeBlobContent !== TEXT) {
-    const { prodDatabaseType } = entity;
-    if (prodDatabaseType === MYSQL || prodDatabaseType === POSTGRESQL || prodDatabaseType === MARIADB) {
-      return 'longblob';
-    }
-
-    return 'blob';
+    // eslint-disable-next-line no-template-curly-in-string
+    return '${blobType}';
   }
 
   if (field.fieldTypeBlobContent === TEXT) {
@@ -169,7 +165,8 @@ function parseLiquibaseLoadColumnType(entity, field) {
     return columnType;
   }
 
-  if (columnType === 'blob' || columnType === 'longblob') {
+  // eslint-disable-next-line no-template-curly-in-string
+  if (columnType === '${blobType}') {
     return 'blob';
   }
 

package/utils/relationship.js

@@ -21,7 +21,7 @@ const _ = require('lodash');
 const pluralize = require('pluralize');
 const { isReservedTableName } = require('../jdl/jhipster/reserved-keywords');
 const { stringify } = require('.');
-const { NEO4J } = require('../jdl/jhipster/database-types');
+const { NEO4J, NO: DATABASE_NO } = require('../jdl/jhipster/database-types');
 const { MapperTypes } = require('../jdl/jhipster/entity-options');
 const { REQUIRED } = require('../jdl/jhipster/validations');
 
@@ -121,7 +121,8 @@ function prepareRelationshipForTemplates(entityWithConfig, relationship, generat
       });
     } else if (
       !ignoreMissingRequiredRelationship &&
-      generator.jhipsterConfig.databaseType !== NEO4J &&
+      entityWithConfig.databaseType !== NEO4J &&
+      entityWithConfig.databaseType !== DATABASE_NO &&
       (relationship.relationshipType === 'one-to-many' || relationship.ownerSide === false)
     ) {
       throw new Error(`Error at entity ${entityName}: could not find the other side of the relationship ${stringify(relationship)}`);

package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-route.spec.tsx.ejs

@@ -1,33 +0,0 @@
-import React from 'react';
-import { Router } from 'react-router-dom';
-import { createMemoryHistory } from 'history';
-import { render } from '@testing-library/react';
-
-import ErrorBoundaryRoute from './error-boundary-route';
-
-const ErrorComp = () => {
-  throw new Error('test');
-};
-
-describe('error-boundary-route component', () => {
-  beforeEach(() => {
-    // ignore console and jsdom errors
-    jest.spyOn((window as any)._virtualConsole, 'emit').mockImplementation(() => false);
-    jest.spyOn((window as any).console, 'error').mockImplementation(() => false);
-  });
-
-  // All tests will go here
-  it('Should throw error when no component is provided', () => {
-    expect(() => render(<ErrorBoundaryRoute />)).toThrow(Error);
-  });
-
-  it('Should render fallback component when an uncaught error is thrown from component', () => {
-    const history = createMemoryHistory();
-    const { container } = render(
-      <Router history={history}>
-        <ErrorBoundaryRoute component={ErrorComp} path="/" />
-      </Router>
-    );
-    expect(container.innerHTML).toEqual('<div><h2 class="error">An unexpected error has occurred.</h2></div>');
-  });
-});

package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-route.tsx.ejs

@@ -1,17 +0,0 @@
-import React from 'react';
-import { Route, RouteProps } from 'react-router-dom';
-import ErrorBoundary from 'app/shared/error/error-boundary';
-
-export const ErrorBoundaryRoute = ({ component: Component, ...rest }: RouteProps) => {
-  const encloseInErrorBoundary = props => (
-    <ErrorBoundary>
-      <Component {...props} />
-    </ErrorBoundary>
-  );
-
-  if (!Component) throw new Error(`A component needs to be specified for path ${(rest as any).path}`);
-
-  return <Route {...rest} render={encloseInErrorBoundary} />;
-};
-
-export default ErrorBoundaryRoute;

package/generators/cypress/templates/cypress-audits.json.ejs

@@ -1,32 +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.
--%>
-{
-    "baseUrl": "http://localhost:<%= serverPort %>/",
-    "testFiles": "**/*.audits.ts",
-    "supportFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/support/index.ts",
-    "video": false,
-    "integrationFolder": "<%= CLIENT_TEST_SRC_DIR %>cypress/integration",
-    "fixturesFolder": "<%= CLIENT_TEST_SRC_DIR %>cypress/fixtures",
-    "pluginsFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/plugins/index.ts",
-    "screenshotsFolder": "<%= BUILD_DIR %>cypress/screenshots",
-    "chromeWebSecurity": <% if(authenticationTypeOauth2) { %>false<% } else { %>true<% } %>,
-    "viewportWidth": 1200,
-    "viewportHeight": 720,
-    "retries": 2
-  }

package/generators/cypress/templates/cypress.json.ejs

@@ -1,46 +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.
--%>
-{
-  "baseUrl": "http://localhost:<%= gatewayServerPort || serverPort %>/",
-  "testFiles": "**/*.spec.ts",
-  "supportFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/support/index.ts",
-  "video": false,
-  "integrationFolder": "<%= CLIENT_TEST_SRC_DIR %>cypress/integration",
-  "fixturesFolder": "<%= CLIENT_TEST_SRC_DIR %>cypress/fixtures",
-  "pluginsFile": "<%= CLIENT_TEST_SRC_DIR %>cypress/plugins/index.ts",
-  "screenshotsFolder": "<%= BUILD_DIR %>cypress/screenshots",
-  "chromeWebSecurity": <% if(authenticationTypeOauth2) { %>false<% } else { %>true<% } %>,
-<%_ if (clientFrameworkReact) { _%>
-  "scrollBehavior": "center",
-<%_ } _%>
-  "viewportWidth": 1200,
-  "viewportHeight": 720,
-  "retries": 2,
-<%_ if (authenticationTypeJwt) { _%>
-  "env": {
-    "authenticationUrl": "/api/authenticate",
-    "jwtStorageName": "<%= jhiPrefixDashed %>-authenticationToken"
-  },
-<%_ } else if (authenticationTypeSession) { _%>
-  "env": {
-    "authenticationUrl": "/api/authentication"
-  },
-<%_ } _%>
-  "experimentalSessionSupport": true,
-}

package/generators/docker-compose/templates/realm-config/jhipster-users-0.json.ejs

@@ -1,61 +0,0 @@
-{
-  "realm": "jhipster",
-  "users": [
-    {
-      "id": "4c973896-5761-41fc-8217-07c5d13a004b",
-      "createdTimestamp": 1505479415590,
-      "username": "admin",
-      "enabled": true,
-      "totp": false,
-      "emailVerified": true,
-      "firstName": "Admin",
-      "lastName": "Administrator",
-      "email": "admin@localhost",
-      "credentials": [
-        {
-          "id": "b860462b-9b02-48ba-9523-d3a8926a917b",
-          "type": "password",
-          "createdDate": 1505479429154,
-          "secretData": "{\"value\":\"4pf9K2jWSCcHC+CwsZP/qidN5pSmDUe6AX6wBerSGdBVKkExay8MWKx+EKmaaObZW6FVsD8vdW/ZsyUFD9gJ1Q==\",\"salt\":\"1/qNkZ5kr77jOMOBPBogGw==\"}",
-          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
-        }
-      ],
-      "disableableCredentialTypes": [],
-      "requiredActions": [],
-      "realmRoles": ["offline_access", "uma_authorization"],
-      "clientRoles": {
-        "account": ["view-profile", "manage-account"]
-      },
-      "notBefore": 0,
-      "groups": ["/Admins", "/Users"]
-    },
-    {
-      "id": "c4af4e2f-b432-4c3b-8405-cca86cd5b97b",
-      "createdTimestamp": 1505479373742,
-      "username": "user",
-      "enabled": true,
-      "totp": false,
-      "emailVerified": true,
-      "firstName": "",
-      "lastName": "User",
-      "email": "user@localhost",
-      "credentials": [
-        {
-          "id": "7821832b-1e82-45a2-b8d3-f1a6ad909e64",
-          "type": "password",
-          "createdDate": 1505479392766,
-          "secretData": "{\"value\":\"MbKsMgWPnZyImih8s4SaoCSCq+XIY/c6S9F93sXEidHF1TjPWxCqMkec0+o3860CMLXHt3az61cIJOWI0FW9aw==\",\"salt\":\"fmpBI1r8R1u75hDLMUlwBw==\"}",
-          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
-        }
-      ],
-      "disableableCredentialTypes": [],
-      "requiredActions": [],
-      "realmRoles": ["offline_access", "uma_authorization"],
-      "clientRoles": {
-        "account": ["view-profile", "manage-account"]
-      },
-      "notBefore": 0,
-      "groups": ["/Users"]
-    }
-  ]
-}

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs

@@ -1,81 +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.
--%>
-    <%= entityInstancePlural %>?: I<%= entityAngularName %>[];
-    isLoading = false;
-<%_ if (searchEngine) { _%>
-    currentSearch: string;
-<%_ } _%>
-
-    constructor(
-        protected <%= entityInstance %>Service: <%= entityAngularName %>Service,
-<%_ if (fieldsContainBlob) { _%>
-        protected dataUtils: DataUtils,
-<%_ } _%>
-<%_ if (!readOnly) { _%>
-        protected modalService: NgbModal,
-<%_ } _%>
-<%_ if (searchEngine) { _%>
-        protected activatedRoute: ActivatedRoute,
-<%_ } _%>
-    ) {
-<%_ if (searchEngine) { _%>
-        this.currentSearch = this.activatedRoute.snapshot.queryParams['search'] ?? '';
-<%_ } _%>
-    }
-
-    loadAll(): void {
-        this.isLoading = true;
-<%_ if (searchEngine) { _%>
-        if (this.currentSearch) {
-            this.<%= entityInstance %>Service.search({
-                query: this.currentSearch,
-                }).subscribe({
-                    next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
-                        this.isLoading = false;
-                        this.<%= entityInstancePlural %> = res.body ?? [];
-                    },
-                    error: () => {
-                        this.isLoading = false;
-                    }
-                });
-            return;
-        }
-<%_ } _%>
-
-        this.<%= entityInstance %>Service.query().subscribe({
-            next: (res: HttpResponse<I<%= entityAngularName %>[]>) => {
-                this.isLoading = false;
-                this.<%= entityInstancePlural %> = res.body ?? [];
-            },
-            error: () => {
-                this.isLoading = false;
-            }
-        });
-    }
-
-<%_ if (searchEngine) { _%>
-    search(query: string): void {
-        this.currentSearch = query;
-        this.loadAll();
-    }
-<%_ } _%>
-
-    ngOnInit(): void {
-        this.loadAll();
-    }

package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs

@@ -1,56 +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
-
-      http://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 org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.couchbase.*;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class CouchbaseTestContainerExtension implements BeforeAllCallback {
-
-    private static AtomicBoolean started = new AtomicBoolean(false);
-
-    private static CouchbaseContainer couchbase;
-
-    private String getBucketName() {
-        return "testBucket";
-    }
-
-    @Override
-    public void beforeAll(ExtensionContext extensionContext) throws Exception {
-        if (!started.get()) {
-            DockerImageName dockerImage = DockerImageName.parse("<%= DOCKER_COUCHBASE %>")
-                .asCompatibleSubstituteFor("couchbase/server");
-            couchbase = new CouchbaseContainer(dockerImage)
-                .withBucket(new BucketDefinition(getBucketName()).withQuota(100))
-                .withServiceQuota(CouchbaseService.SEARCH, 1024)
-                .withCredentials("user", "secret");
-            couchbase.start();
-            System.setProperty("spring.couchbase.connection-string", couchbase.getConnectionString());
-            System.setProperty("spring.couchbase.username", couchbase.getUsername());
-            System.setProperty("spring.couchbase.password", couchbase.getPassword());
-            System.setProperty("jhipster.database.couchbase.bucket-name", getBucketName());
-            System.setProperty("jhipster.database.couchbase.scope-name", "testScope");
-            started.set(true);
-        }
-    }
-}

package/generators/server/templates/src/main/docker/config/realm-config/jhipster-users-0.json.ejs

@@ -1,61 +0,0 @@
-{
-  "realm": "jhipster",
-  "users": [
-    {
-      "id": "4c973896-5761-41fc-8217-07c5d13a004b",
-      "createdTimestamp": 1505479415590,
-      "username": "admin",
-      "enabled": true,
-      "totp": false,
-      "emailVerified": true,
-      "firstName": "Admin",
-      "lastName": "Administrator",
-      "email": "admin@localhost",
-      "credentials": [
-        {
-          "id": "b860462b-9b02-48ba-9523-d3a8926a917b",
-          "type": "password",
-          "createdDate": 1505479429154,
-          "secretData": "{\"value\":\"4pf9K2jWSCcHC+CwsZP/qidN5pSmDUe6AX6wBerSGdBVKkExay8MWKx+EKmaaObZW6FVsD8vdW/ZsyUFD9gJ1Q==\",\"salt\":\"1/qNkZ5kr77jOMOBPBogGw==\"}",
-          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
-        }
-      ],
-      "disableableCredentialTypes": [],
-      "requiredActions": [],
-      "realmRoles": ["offline_access", "uma_authorization"],
-      "clientRoles": {
-        "account": ["view-profile", "manage-account"]
-      },
-      "notBefore": 0,
-      "groups": ["/Admins", "/Users"]
-    },
-    {
-      "id": "c4af4e2f-b432-4c3b-8405-cca86cd5b97b",
-      "createdTimestamp": 1505479373742,
-      "username": "user",
-      "enabled": true,
-      "totp": false,
-      "emailVerified": true,
-      "firstName": "",
-      "lastName": "User",
-      "email": "user@localhost",
-      "credentials": [
-        {
-          "id": "7821832b-1e82-45a2-b8d3-f1a6ad909e64",
-          "type": "password",
-          "createdDate": 1505479392766,
-          "secretData": "{\"value\":\"MbKsMgWPnZyImih8s4SaoCSCq+XIY/c6S9F93sXEidHF1TjPWxCqMkec0+o3860CMLXHt3az61cIJOWI0FW9aw==\",\"salt\":\"fmpBI1r8R1u75hDLMUlwBw==\"}",
-          "credentialData": "{\"hashIterations\":27500,\"algorithm\":\"pbkdf2-sha256\"}"
-        }
-      ],
-      "disableableCredentialTypes": [],
-      "requiredActions": [],
-      "realmRoles": ["offline_access", "uma_authorization"],
-      "clientRoles": {
-        "account": ["view-profile", "manage-account"]
-      },
-      "notBefore": 0,
-      "groups": ["/Users"]
-    }
-  ]
-}

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

@@ -1,44 +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 org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.containers.Neo4jContainer;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class AbstractNeo4jIT implements BeforeAllCallback {
-
-    private static AtomicBoolean started = new AtomicBoolean(false);
-
-    private static Neo4jContainer neo4jContainer = new Neo4jContainer(DockerImageName.parse("<%= DOCKER_NEO4J %>")).withoutAuthentication();
-
-    public void beforeAll(ExtensionContext extensionContext) {
-        if (!started.get()) {
-            neo4jContainer.start();
-            System.setProperty(
-                "spring.neo4j.uri",
-                neo4jContainer.getBoltUrl()
-            );
-            started.set(true);
-        }
-    }
-}

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

@@ -1,79 +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 org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.utility.DockerImageName;
-<%_ if (prodDatabaseTypeMysql) { _%>
-import org.testcontainers.containers.MySQLContainer;
-<%_ } else if (prodDatabaseTypeMariadb) { _%>
-import org.testcontainers.containers.MariaDBContainer;
-<%_ } else if (prodDatabaseTypePostgres) { _%>
-import org.testcontainers.containers.PostgreSQLContainer;
-<%_ } else if (prodDatabaseTypeMssql) { _%>
-import org.testcontainers.containers.MSSQLServerContainer;
-<%_ } _%>
-import java.util.Collections;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class ReactiveSqlTestContainerExtension implements BeforeAllCallback {
-
-    private static AtomicBoolean started = new AtomicBoolean(false);
-
-<%_ if (prodDatabaseTypeMysql) { _%>
-    private static MySQLContainer<?> container = new MySQLContainer<>(DockerImageName.parse("<%= DOCKER_MYSQL %>"))
-            .withDatabaseName("<%= baseName %>")
-            .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"));
-<%_ } else if (prodDatabaseTypeMariadb) { _%>
-    private static MariaDBContainer<?> container = new MariaDBContainer<>(DockerImageName.parse("<%= DOCKER_MARIADB %>"))
-            .withDatabaseName("<%= baseName %>")
-            .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"));
-<%_ } else if (prodDatabaseTypePostgres) { _%>
-    private static PostgreSQLContainer<?> container = new PostgreSQLContainer<>(DockerImageName.parse("<%= DOCKER_POSTGRESQL %>"))
-            .withDatabaseName("<%= baseName %>")
-            .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"));
-<%_ } else if (prodDatabaseTypeMssql) { _%>
-    private static MSSQLServerContainer<?> container =  new MSSQLServerContainer<>(DockerImageName.parse("<%= DOCKER_MSSQL %>"))
-            .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"));
-<%_ } _%>
-
-    @Override
-    public void beforeAll(ExtensionContext extensionContext) throws Exception {
-    if (!started.get() && useTestcontainers()) {
-            container.start();
-            System.setProperty("spring.r2dbc.url", container.getJdbcUrl().replace("jdbc", "r2dbc"));
-            System.setProperty("spring.r2dbc.username", container.getUsername());
-            System.setProperty("spring.r2dbc.password", container.getPassword());
-            System.setProperty("spring.liquibase.url", container.getJdbcUrl());
-            System.setProperty("spring.liquibase.user", container.getUsername());
-            System.setProperty("spring.liquibase.password", container.getPassword());
-            started.set(true);
-        }
-    }
-
-    private boolean useTestcontainers() {
-
-        String systemProperties = StringUtils.defaultIfBlank(System.getProperty("spring.profiles.active"), "");
-        String environmentVariables = StringUtils.defaultIfBlank(System.getenv("SPRING_PROFILES_ACTIVE"), "");
-
-        return systemProperties.contains("testcontainers") || environmentVariables.contains("testcontainers");
-    }
-}

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

@@ -1,44 +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 org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.containers.GenericContainer;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class RedisTestContainerExtension implements BeforeAllCallback {
-
-    private static AtomicBoolean started = new AtomicBoolean(false);
-
-    private static GenericContainer redis = new GenericContainer("<%= DOCKER_REDIS %>").withExposedPorts(6379);
-
-    @Override
-    public void beforeAll(ExtensionContext extensionContext) throws Exception {
-        if (!started.get()) {
-            redis.start();
-            System.setProperty(
-                "jhipster.cache.redis.server",
-                "redis://" + redis.getContainerIpAddress() + ":" + redis.getMappedPort(6379)
-            );
-            started.set(true);
-        }
-    }
-}

package/generators/server/templates/src/test/resources/testcontainers/mariadb/my.cnf

@@ -1,2 +0,0 @@
-[mysqld]
-character-set-server = utf8mb4