generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/dist/generators/spring-data-cassandra/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_cassandra.ejs

@@ -0,0 +1,50 @@
+<%#
+ Copyright 2013-2023 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.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+import org.springframework.data.annotation.Id;
+    <%_ if (anyFieldIsBlobDerived) { _%>
+import java.nio.ByteBuffer;
+import org.springframework.data.cassandra.core.mapping.Column;
+    <%_ } _%>
+import org.springframework.data.cassandra.core.mapping.Table;
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+// Since spring-data-cassandra 3.4.2, table names needs to be in lowercase
+// See https://github.com/spring-projects/spring-data-cassandra/issues/1293#issuecomment-1192555467
+@Table("<%= entityInstance.toLowerCase() %>")
+<&_ } -&>
+
+<%_ for (const field of fields) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.id) { _%>
+    @Id
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { -%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+    @Column("<%- field.fieldNameAsDatabaseColumn %>_content_type")
+<&_ } -&>
+<%_ } -%>

package/dist/generators/spring-data-cassandra/templates/src/main/java/_package_/config/DatabaseConfiguration.java.ejs

@@ -0,0 +1,72 @@
+<%#
+ Copyright 2013-2023 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 com.datastax.oss.driver.api.core.data.TupleValue;
+import com.datastax.oss.driver.api.core.type.DataTypes;
+import com.datastax.oss.driver.api.core.type.TupleType;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.cassandra.core.convert.CassandraCustomConversions;
+import org.springframework.data.convert.ReadingConverter;
+import org.springframework.data.convert.WritingConverter;
+
+import jakarta.annotation.Nonnull;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+public class DatabaseConfiguration {
+
+    @Bean
+    public CassandraCustomConversions cassandraCustomConversions() {
+        List<Converter<?, ?>> converters = new ArrayList<>();
+        converters.add(new TupleToZonedDateTimeConverter());
+        converters.add(new ZonedDateTimeToTupleConverter());
+        return new CassandraCustomConversions(converters);
+    }
+
+    @ReadingConverter
+    class TupleToZonedDateTimeConverter implements Converter<TupleValue, ZonedDateTime> {
+        @Override
+        public ZonedDateTime convert(TupleValue source) {
+            Instant instant = source.getInstant(0);
+            ZoneId zoneId = ZoneId.of(source.getString(1));
+            return instant.atZone(zoneId);
+        }
+    }
+
+    @WritingConverter
+    class ZonedDateTimeToTupleConverter implements Converter<ZonedDateTime, TupleValue> {
+        private TupleType type = DataTypes.tupleOf(DataTypes.TIMESTAMP, DataTypes.TEXT);
+
+        @Override
+        public TupleValue convert(@Nonnull ZonedDateTime source) {
+            TupleValue tupleValue = type.newValue();
+            tupleValue.setInstant(0, source.toInstant());
+            tupleValue.setString(1, source.getZone().toString());
+            return tupleValue;
+        }
+    }
+
+}

package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/CassandraKeyspaceIT.java.ejs

@@ -0,0 +1,40 @@
+<%#
+ Copyright 2013-2023 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 <%= packageName %>.config.CassandraTestContainer;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.metadata.Metadata;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@IntegrationTest
+public class CassandraKeyspaceIT {
+
+    @Autowired
+    private CqlSession session;
+
+    @Test
+    void shouldListCassandraTestKeyspace() {
+        Metadata metadata = session.getMetadata();
+        assertThat(metadata.getKeyspace(CassandraTestContainer.DEFAULT_KEYSPACE_NAME)).isNotNull();
+    }
+}

package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainer.java.ejs

@@ -0,0 +1,97 @@
+<%#
+ Copyright 2013-2023 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 com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.CqlSessionBuilder;
+import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
+import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.data.cassandra.core.cql.session.init.ResourceKeyspacePopulator;
+import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+
+/**
+ * Base class for starting/stopping Cassandra during tests.
+ */
+public class CassandraTestContainer implements InitializingBean, DisposableBean {
+
+    public static final String DEFAULT_KEYSPACE_NAME = "cassandratestkeyspace";
+
+    private static final Logger log = LoggerFactory.getLogger(CassandraTestContainer.class);
+    private static final Integer DATABASE_REQUEST_TIMEOUT = 20;
+    private static final Integer CONTAINER_STARTUP_TIMEOUT_MINUTES = 10;
+
+    private CassandraContainer<?> cassandraContainer;
+
+    @Override
+    public void destroy() {
+        if (null != cassandraContainer && cassandraContainer.isRunning()) {
+            cassandraContainer.close();
+        }
+    }
+
+    @Override
+    public void afterPropertiesSet() throws IOException {
+        if (null == cassandraContainer) {
+            cassandraContainer = new CassandraContainer<>("<%- dockerContainers.cassandra %>")
+                    .withStartupTimeout(Duration.of(CONTAINER_STARTUP_TIMEOUT_MINUTES, ChronoUnit.MINUTES))
+                    .withLogConsumer(new Slf4jLogConsumer(log))
+                    .withReuse(true);
+        }
+        if (!cassandraContainer.isRunning()) {
+            cassandraContainer.start();
+
+            CqlSession cqlSession = new CqlSessionBuilder().addContactPoint(cassandraContainer.getContactPoint()).withLocalDatacenter(cassandraContainer.getLocalDatacenter()).build();
+            cqlSession.execute("CREATE KEYSPACE " + DEFAULT_KEYSPACE_NAME + " WITH replication={'class' : 'SimpleStrategy', 'replication_factor':1}");
+            cqlSession.close();
+
+            cqlSession = new CqlSessionBuilder()
+                .addContactPoint(cassandraContainer.getContactPoint())
+                .withLocalDatacenter(cassandraContainer.getLocalDatacenter())
+                .withKeyspace(DEFAULT_KEYSPACE_NAME)
+                .withConfigLoader(getConfigLoader())
+                .build();
+
+            new ResourceKeyspacePopulator(new PathMatchingResourcePatternResolver().getResources("config/cql/changelog/*.cql"))
+                .populate(cqlSession);
+
+            cqlSession.close();
+        }
+    }
+
+    public CassandraContainer<?> getCassandraContainer() {
+        return cassandraContainer;
+    }
+
+    private DriverConfigLoader getConfigLoader() {
+        return DriverConfigLoader
+            .programmaticBuilder()
+            .withDuration(DefaultDriverOption.REQUEST_TIMEOUT, Duration.ofSeconds(DATABASE_REQUEST_TIMEOUT))
+            .build();
+    }
+}

package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/CassandraTestContainersSpringContextCustomizerFactory.java.ejs

@@ -0,0 +1,67 @@
+<%#
+ Copyright 2013-2023 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 static <%= packageName %>.config.CassandraTestContainer.DEFAULT_KEYSPACE_NAME;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+
+import org.springframework.test.context.ContextConfigurationAttributes;
+import org.springframework.test.context.ContextCustomizer;
+import org.springframework.test.context.ContextCustomizerFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.testcontainers.containers.CassandraContainer;
+
+public class CassandraTestContainersSpringContextCustomizerFactory implements ContextCustomizerFactory {
+
+    private Logger log = LoggerFactory.getLogger(CassandraTestContainersSpringContextCustomizerFactory.class);
+
+    private static CassandraTestContainer cassandraBean;
+
+    @Override
+    public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
+        return (context, mergedConfig) -> {
+            ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+            TestPropertyValues testValues = TestPropertyValues.empty();
+            EmbeddedCassandra cassandraAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCassandra.class);
+            if (null != cassandraAnnotation) {
+                log.debug("detected the EmbeddedCassandra annotation on class {}", testClass.getName());
+                log.info("Warming up the cassandra database");
+                if (null == cassandraBean) {
+                    cassandraBean = beanFactory.createBean(CassandraTestContainer.class);
+                    beanFactory.registerSingleton(CassandraTestContainer.class.getName(), cassandraBean);
+                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(CassandraTestContainer.class.getName(), cassandraBean);
+                }
+                testValues = testValues.and("spring.cassandra.port=" +  cassandraBean.getCassandraContainer().getMappedPort(CassandraContainer.CQL_PORT))
+                    .and("spring.cassandra.contact-points=" +  cassandraBean.getCassandraContainer().getHost())
+                    .and("spring.cassandra.keyspace-name=" + DEFAULT_KEYSPACE_NAME)
+                    .and("spring.cassandra.local-datacenter=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getAllHosts().iterator().next().getDatacenter())
+                    .and("spring.cassandra.session-name=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getClusterName());
+            }
+            testValues.applyTo(context);
+        };
+    }
+}

package/dist/generators/spring-data-cassandra/templates/src/test/java/_package_/config/EmbeddedCassandra.java.ejs

@@ -0,0 +1,30 @@
+<%#
+ Copyright 2013-2023 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 java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EmbeddedCassandra {
+}

package/dist/generators/spring-data-couchbase/entity-files.mjs

@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
-import { moveToJavaEntityPackageSrcDir } from '../server/support/index.mjs';
+import { SERVER_MAIN_RES_DIR } from '../generator-constants.mjs';
+import { javaMainPackageTemplatesBlock } from '../server/support/index.mjs';
 export const entityFiles = {
     dbChangelog: [
         {
@@ -43,15 +43,13 @@ export const entityFiles = {
     ],
     server: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
-            renameTo: moveToJavaEntityPackageSrcDir,
-            templates: ['domain/_PersistClass_.java.jhi.spring_data_couchbase'],
+            ...javaMainPackageTemplatesBlock('_entityPackage_'),
+            templates: ['domain/_persistClass_.java.jhi.spring_data_couchbase'],
         },
         {
             condition: generator => !generator.embedded,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
-            renameTo: moveToJavaEntityPackageSrcDir,
-            templates: ['repository/_EntityClass_Repository.java'],
+            ...javaMainPackageTemplatesBlock('_entityPackage_'),
+            templates: ['repository/_entityClass_Repository.java'],
         },
     ],
 };

package/dist/generators/spring-data-couchbase/files.mjs

@@ -21,25 +21,25 @@ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir } from '../server/sup
 export const couchbaseFiles = {
     serverJavaConfig: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['repository/JHipsterCouchbaseRepository.java', 'config/DatabaseConfiguration.java'],
         },
         {
             condition: data => data.authenticationTypeSession && !data.reactive && data.generateUserManagement,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['repository/PersistentTokenRepository_couchbase.java'],
         },
         {
             condition: data => data.searchEngineCouchbase,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['repository/CouchbaseSearchRepository.java'],
         },
         {
             condition: data => data.searchEngineCouchbase,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['repository/CouchbaseSearchRepositoryTest.java'],
         },
@@ -63,7 +63,7 @@ export const couchbaseFiles = {
     ],
     serverTestFw: [
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['config/CouchbaseTestContainer.java', 'config/EmbeddedCouchbase.java'],
         },

package/dist/generators/spring-data-couchbase/generator.mjs

@@ -16,17 +16,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.mjs';
 import writeCouchbaseFilesTask, { cleanupCouchbaseFilesTask } from './files.mjs';
 import writeCouchbaseEntityFilesTask, { cleanupCouchbaseEntityFilesTask } from './entity-files.mjs';
 export default class CouchbaseGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints(GENERATOR_SPRING_DATA_COUCHBASE);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+        }
     }
     get writing() {
         return {

package/dist/generators/spring-data-couchbase/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.spring_data_couchbase.ejs

@@ -0,0 +1,210 @@
+<%#
+ Copyright 2013-2023 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.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.staticImportSection) { -&>
+<%_ if (!embedded) { _%>
+import static <%= packageName %>.config.Constants.ID_DELIMITER;
+import static <%= entityAbsoluteClass %>.TYPE_NAME;
+import static org.springframework.data.couchbase.core.mapping.id.GenerationStrategy.UNIQUE;
+<%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.importSection) { -&>
+  <%_ if (!embedded) { _%>
+import org.springframework.data.annotation.Id;
+import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
+import org.springframework.data.couchbase.core.mapping.Document;
+import org.springframework.data.couchbase.repository.Collection;
+import org.springframework.data.annotation.TypeAlias;
+  <%_ } _%>
+import org.springframework.data.couchbase.core.mapping.Field;
+  <%_ if (relationships.length > 0) { _%>
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.stream.Collectors;
+  <%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+  <%_ if (!embedded) { _%>
+@Document
+@TypeAlias(TYPE_NAME)
+@Collection(TYPE_NAME)
+  <%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.classStaticFieldsSection) { -&>
+  <%_ if (!embedded) { _%>
+    public static final String TYPE_NAME = "<%= entityInstance %>";
+  <%_ } _%>
+<&_ } -&>
+
+<%_ for (const field of fields) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.id && !embedded) { _%>
+    @Id
+    <%_ if (field.id && !embedded) { _%>
+    @GeneratedValue(strategy = UNIQUE, delimiter = ID_DELIMITER)
+    <%_ } _%>
+  <%_ } else { _%>
+    @Field
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+    @Field
+<&_ } -&>
+<%_ } -%>
+
+<%_/* for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (relationship.relationshipOneToMany) { _%>
+    <%_ if (!relationship.otherEntity.embedded) { _%>
+    @N1qlJoin(on = "lks.<%= relationship.relationshipFieldName %>=meta(rks).id", fetchType = FetchType.IMMEDIATE)
+    <%_ } _%>
+
+  <%_ } else if (relationship.relationshipManyToOne) { _%>
+    <%_ if (!relationship.otherEntity.embedded) { _%>
+    @N1qlJoin(on = "lks.<%= relationship.relationshipFieldName %>=meta(rks).id", fetchType = FetchType.IMMEDIATE)
+    <%_ } _%>
+  <%_ } else if (relationship.relationshipManyToMany) { _%>
+    @N1qlJoin(on = "lks.<%= relationship.relationshipFieldNamePlural %>=meta(rks).id", fetchType = FetchType.IMMEDIATE)
+  <%_ } else { _%>
+    <%_ if (!relationship.otherEntity.embedded) { _%>
+    @N1qlJoin(on = "lks.<%= relationship.relationshipFieldName %>=meta(rks).id", fetchType = FetchType.IMMEDIATE)
+    <%_ } _%>
+  <%_ } _%>
+
+<&_ } -&>
+<%_ } -%>
+<% Commented out until N1qlJoin support is fixed */%>
+
+<&_ if (fragment.classAdditionalRelationshipsSection) { -&>
+    <%_ for (const relationship of relationships) { _%>
+      <%_ if (!relationship.id && !relationship.otherEntity.embedded) { _%>
+        <%_ if (relationship.collection) { _%>
+    @JsonIgnore
+    @Field("<%= relationship.relationshipFieldNamePlural %>")
+    private Set<String> <%= relationship.relationshipFieldName %>Ids = new HashSet<>();
+        <%_ } else if (relationship.ownerSide) { _%>
+    @JsonIgnore
+    @Field("<%= relationship.relationshipFieldName %>")
+    private <%= relationship.otherEntity.primaryKey.type %> <%= relationship.relationshipFieldName %>Id;
+        <%_ } _%>
+      <%_ } _%>
+    <%_ } _%>
+<&_ } -&>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>CustomSetSection) { -&>
+  <%_ if (relationship.collection) { _%>
+    public void set<%= relationship.relationshipNameCapitalizedPlural %>(Set<<%= relationship.otherEntity.persistClass %>> <%= relationship.otherEntityNamePlural %>) {
+    <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%>
+        if (this.<%= relationship.relationshipFieldNamePlural %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            this.<%= relationship.relationshipFieldNamePlural %>.forEach(i -> i.remove<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
+      <%_ } else { _%>
+            this.<%= relationship.relationshipFieldNamePlural %>.forEach(i -> i.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null));
+      <%_ } _%>
+        }
+        if (<%= relationship.otherEntityNamePlural %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            <%= relationship.otherEntityNamePlural %>.forEach(i -> i.add<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
+      <%_ } else { _%>
+            <%= relationship.otherEntityNamePlural %>.forEach(i -> i.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
+      <%_ } _%>
+        }
+    <%_ } _%>
+        this.<%= relationship.relationshipFieldNamePlural %> = <%= relationship.otherEntityNamePlural %>;
+    <%_ if (!relationship.otherEntity.embedded) { _%>
+        this.<%= relationship.relationshipFieldName %>Ids = <%= relationship.otherEntityNamePlural %>.stream()
+            .map(<%= relationship.otherEntity.persistClass %>::getId)
+            .collect(Collectors.toSet());
+    <%_ } _%>
+    }
+  <%_ } else if (!relationship.otherEntity.embedded) { _%>
+    public void set<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
+    <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%>
+        if (this.<%= relationship.relationshipFieldName %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            this.<%= relationship.relationshipFieldName %>.remove<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+      <%_ } else { _%>
+            this.<%= relationship.relationshipFieldName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
+      <%_ } _%>
+        }
+        if (<%= relationship.otherEntityName %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            <%= relationship.otherEntityName %>.add<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+      <%_ } else { _%>
+            <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+      <%_ } _%>
+        }
+    <%_ } _%>
+        this.<%= relationship.relationshipFieldName %> = <%= relationship.otherEntityName %>;
+        this.<%= relationship.relationshipFieldName %>Id = <%= relationship.otherEntityName %> != null ? <%= relationship.otherEntityName %>.get<%= relationship.otherEntity.primaryKey.nameCapitalized %>() : null;
+    }
+  <%_ } _%>
+<&_ } -&>
+<%_ } _%>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>CustomAddSection) { -&>
+    public <%= persistClass %> add<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
+        this.<%= relationship.relationshipFieldNamePlural %>.add(<%= relationship.otherEntityName %>);
+      <%_ if (!relationship.otherEntity.embedded || embedded && relationship.ownerSide) { _%>
+        <%_ if (!relationship.otherEntity.embedded) { _%>
+        this.<%= relationship.relationshipFieldName %>Ids.add(<%= relationship.otherEntityName %>.get<%= relationship.otherEntity.primaryKey.nameCapitalized %>());
+        <%_ } _%>
+        <%_ if (relationship.otherRelationship) { _%>
+          <%_ if (!relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+          <%_ } else if (relationship.otherRelationship.relationshipNamePlural && !relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().add(this);
+          <%_ } _%>
+        <%_ } _%>
+      <%_ } _%>
+        return this;
+    }
+<&_ } -&>
+<%_ } _%>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>CustomRemoveSection) { -&>
+    public <%= persistClass %> remove<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
+        this.<%= relationship.relationshipFieldNamePlural %>.remove(<%= relationship.otherEntityName %>);
+      <%_ if (!relationship.otherEntity.embedded || (embedded && relationship.ownerSide)) { _%>
+        <%_ if (!relationship.otherEntity.embedded) { _%>
+        this.<%= relationship.relationshipFieldName %>Ids.remove(<%= relationship.otherEntityName %>.get<%= relationship.otherEntity.primaryKey.nameCapitalized %>());
+        <%_ } _%>
+        <%_ if (relationship.otherRelationship) { _%>
+          <%_ if (!relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
+          <%_ } else if (!relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().remove(this);
+          <%_ } _%>
+        <%_ } _%>
+      <%_ } _%>
+        return this;
+    }
+<&_ } -&>
+<%_ } _%>