Merge pull request #17548 from jhipster/skip_ci-technical_structure_test

replace generated `Archtest` by `TechnicalStructureTest`

generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs

@@ -77,9 +77,8 @@ import <%= otherEntity.entityAbsolutePackage %>.repository.rowmapper.<%= otherEn
 import <%= otherEntity.entityAbsolutePackage %>.repository.<%= otherEntity.entityClass %>SqlHelper;
   <%_ } _%>
 <%_ }); _%>
-import <%= packageName %>.service.EntityManager;
-<%_ if (fieldsContainOwnerManyToMany) { _%>
-import <%= packageName %>.service.EntityManager.LinkTable;
+<%_ if (packageName !== entityAbsolutePackage) { _%>
+import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
 
 import reactor.core.publisher.Flux;
@@ -106,7 +105,7 @@ class <%= entityClass %>RepositoryInternalImpl extends SimpleR2dbcRepository<<%=
 <%_ relationships.forEach(function(rel) {
   if (rel.shouldWriteJoinTable) {
 _%>
-    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new LinkTable("<%= rel.joinTable.name %>", "<%= getColumnName(name) %>_id", "<%= getColumnName(rel.relationshipName) %>_id");
+    private final static EntityManager.LinkTable <%= rel.relationshipName %>Link = new EntityManager.LinkTable("<%= rel.joinTable.name %>", "<%= getColumnName(name) %>_id", "<%= getColumnName(rel.relationshipName) %>_id");
 <%_ }
 }); _%>
 

generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs

@@ -39,7 +39,9 @@ import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ Object.keys(uniqueEnums).forEach(function(element) { _%>
 import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
-import <%= packageName %>.repository.ColumnConverter;
+<%_ if (packageName !== entityAbsolutePackage) { _%>
+import <%= packageName %>.repository.rowmapper.ColumnConverter;
+<%_ } _%>
 
 import io.r2dbc.spi.Row;
 

generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs

@@ -84,7 +84,7 @@ import <%= entityAbsolutePackage %>.repository.UserRepository;
 <%_ } _%>
 import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
 <%_ if (databaseTypeSql && reactive) { _%>
-import <%= packageName %>.service.EntityManager;
+import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
 <%_ if (isUsingMapsId && (!dtoMapstruct && serviceNo)) { _%>
 import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCapitalized %>Repository;

generators/server/__snapshots__/generator.spec.mjs.snap

@@ -304,7 +304,7 @@ Object {
       "path": "src/test/java/",
       "templates": Array [
         Object {
-          "file": "package/ArchTest.java",
+          "file": "package/TechnicalStructureTest.java",
           "renameTo": [Function],
         },
       ],
@@ -679,11 +679,11 @@ Object {
       "path": "src/main/java/",
       "templates": Array [
         Object {
-          "file": "package/repository/ColumnConverter.java",
+          "file": "package/repository/rowmapper/ColumnConverter.java",
           "renameTo": [Function],
         },
         Object {
-          "file": "package/service/EntityManager.java",
+          "file": "package/repository/EntityManager.java",
           "renameTo": [Function],
         },
       ],

generators/server/files.js

@@ -787,8 +787,8 @@ const baseServerFiles = {
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
-          file: 'package/ArchTest.java',
-          renameTo: generator => `${generator.testDir}ArchTest.java`,
+          file: 'package/TechnicalStructureTest.java',
+          renameTo: generator => `${generator.testDir}TechnicalStructureTest.java`,
         },
       ],
     },
@@ -933,12 +933,12 @@ const baseServerFiles = {
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/repository/ColumnConverter.java',
-          renameTo: generator => `${generator.javaDir}repository/ColumnConverter.java`,
+          file: 'package/repository/rowmapper/ColumnConverter.java',
+          renameTo: generator => `${generator.javaDir}repository/rowmapper/ColumnConverter.java`,
         },
         {
-          file: 'package/service/EntityManager.java',
-          renameTo: generator => `${generator.javaDir}service/EntityManager.java`,
+          file: 'package/repository/EntityManager.java',
+          renameTo: generator => `${generator.javaDir}repository/EntityManager.java`,
         },
       ],
     },

generators/server/index.js

@@ -464,6 +464,8 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         if (!this.databaseTypeSql) return undefined;
         if (this.reactive && this.isJhipsterVersionLessThan('7.5.1')) {
           this.removeFile(`${this.mainJavaPackageDir}service/ColumnConverter.java`);
+          this.removeFile(`${this.mainJavaPackageDir}service/EntityManager.java`);
+          this.removeFile(`${this.testJavaPackageDir}ArchTest.java`);
         }
       },
       cleanupServer() {

generators/server/templates/src/main/java/package/service/EntityManager.java.ejs → generators/server/templates/src/main/java/package/repository/EntityManager.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.service;
+package <%= packageName %>.repository;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,7 +44,7 @@ import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.core.sql.Table;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 import org.springframework.r2dbc.core.Parameter;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
 import reactor.core.publisher.Flux;
@@ -54,7 +54,7 @@ import reactor.core.publisher.Mono;
  * Helper class to create SQL selects based on the entity, paging parameters and criteria.
  *
  */
-@Service
+@Component
 public class EntityManager {
     public final static String ENTITY_ALIAS = "e";
     public final static String ALIAS_PREFIX = "e_";

generators/server/templates/src/main/java/package/repository/ColumnConverter.java.ejs → generators/server/templates/src/main/java/package/repository/rowmapper/ColumnConverter.java.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= packageName %>.repository.rowmapper;
 
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.r2dbc.convert.R2dbcConverter;

generators/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.java.ejs

@@ -25,7 +25,6 @@ import java.util.function.BiFunction;
 import org.springframework.stereotype.Service;
 
 import <%= packageName %>.domain.<%= asEntity('User') %>;
-import <%= packageName %>.repository.ColumnConverter;
 
 import io.r2dbc.spi.Row;
 

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

@@ -0,0 +1,60 @@
+<%#
+ 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 com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.lang.ArchRule;
+
+import static com.tngtech.archunit.base.DescribedPredicate.alwaysTrue;
+import static com.tngtech.archunit.core.domain.JavaClass.Predicates.belongToAnyOf;
+import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
+
+@AnalyzeClasses(packagesOf = <%= mainClass %>.class, importOptions = DoNotIncludeTests.class)
+class TechnicalStructureTest {
+
+    @ArchTest
+    static final ArchRule respectsTechnicalArchitectureLayers = layeredArchitecture()
+        .layer("Config").definedBy("..config..")
+<%_ if (applicationTypeMicroservice) { _%>
+        .layer("Client").definedBy("..client..")
+<%_ } _%>
+        .layer("Web").definedBy("..web..")
+        .layer("Service").definedBy("..service..")
+        .layer("Security").definedBy("..security..")
+        .layer("Persistence").definedBy("..repository..")
+        .layer("Domain").definedBy("..domain..")
+
+<%_ if (messageBrokerKafka) { _%>
+        .whereLayer("Config").mayOnlyBeAccessedByLayers("Web")
+<%_ } else { _%>
+        .whereLayer("Config").mayNotBeAccessedByAnyLayer()
+<%_ } _%>
+<%_ if (applicationTypeMicroservice) { _%>
+        .whereLayer("Client").mayNotBeAccessedByAnyLayer()
+<%_ } _%>
+        .whereLayer("Web").mayOnlyBeAccessedByLayers("Config")
+        .whereLayer("Service").mayOnlyBeAccessedByLayers("Web", "Config")
+        .whereLayer("Security").mayOnlyBeAccessedByLayers(<% if (applicationTypeMicroservice) { %>"Client", <% } %>"Web", "Service", "Config")
+        .whereLayer("Persistence").mayOnlyBeAccessedByLayers("Service", "Security", "Web", "Config")
+        .whereLayer("Domain").mayOnlyBeAccessedByLayers("Persistence", "Service", "Security", "Web", "Config")
+
+        .ignoreDependency(belongToAnyOf(<%= mainClass %>.class), alwaysTrue());
+}

generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs

@@ -35,7 +35,7 @@ import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
 <%_ if (databaseTypeSql && reactive) { _%>
-import <%= packageName %>.service.EntityManager;
+import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs

@@ -40,7 +40,7 @@ import <%= packageName %>.security.AuthoritiesConstants;
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
 import <%= packageName %>.service.dto.<%= asDto('User') %>;
 <%_ if (databaseTypeSql && reactive) { _%>
-import <%= packageName %>.service.EntityManager;
+import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
 import <%= packageName %>.service.mapper.UserMapper;
 <%_ if (!authenticationTypeOauth2) { _%>

test/__snapshots__/app-client-custom-path.spec.js.snap

@@ -1223,10 +1223,10 @@ Object {
   "src/main/webapp2/swagger-ui/index.html": Object {
     "stateCleared": "modified",
   },
-  "src/test/java/com/mycompany/myapp/ArchTest.java": Object {
+  "src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
     "stateCleared": "modified",
   },
-  "src/test/java/com/mycompany/myapp/IntegrationTest.java": Object {
+  "src/test/java/com/mycompany/myapp/TechnicalStructureTest.java": Object {
     "stateCleared": "modified",
   },
   "src/test/java/com/mycompany/myapp/config/NoOpMailConfiguration.java": Object {