generator-jhipster 8.6.0 → 8.7.1

package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/CustomClaimConverter.java.ejs

@@ -1,129 +0,0 @@
-<%#
- Copyright 2013-2024 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://jhipster.github.io/
- 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 %>.security.oauth2;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import <%= packageName %>.security.SecurityUtils;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.jwt.MappedJwtClaimSetConverter;
-import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
-import org.springframework.security.oauth2.server.resource.web.DefaultBearerTokenResolver;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.StreamSupport;
-
-/**
- * Claim converter to add custom claims by retrieving the user from the userinfo endpoint.
- */
-public class CustomClaimConverter implements Converter<Map<String, Object>, Map<String, Object>> {
-    private final BearerTokenResolver bearerTokenResolver = new DefaultBearerTokenResolver();
-
-    private final MappedJwtClaimSetConverter delegate = MappedJwtClaimSetConverter.withDefaults(Collections.emptyMap());
-
-    private final RestTemplate restTemplate;
-
-    private final ClientRegistration registration;
-
-    // See https://github.com/jhipster/generator-jhipster/issues/18868
-    // We don't use a distributed cache or the user selected cache implementation here on purpose
-    private final Cache<String, ObjectNode> users = Caffeine.newBuilder()
-        .maximumSize(10_000)
-        .expireAfterWrite(Duration.ofHours(1))
-        .recordStats()
-        .build();
-
-    public CustomClaimConverter(ClientRegistration registration, RestTemplate restTemplate) {
-        this.registration = registration;
-        this.restTemplate = restTemplate;
-    }
-
-    public Map<String, Object> convert(Map<String, Object> claims) {
-        Map<String, Object> convertedClaims = this.delegate.convert(claims);
-        // Only look up user information if identity claims are missing
-        if (claims.containsKey("given_name") && claims.containsKey("family_name")) {
-            return convertedClaims;
-        }
-        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
-        if (attributes instanceof ServletRequestAttributes) {
-            // Retrieve and set the token
-            String token = bearerTokenResolver.resolve(((ServletRequestAttributes) attributes).getRequest());
-            HttpHeaders headers = new HttpHeaders();
-            headers.setBearerAuth(token);
-
-            // Retrieve user info from OAuth provider if not already loaded
-            ObjectNode user = users.get(claims.get("sub").toString(), s -> {
-                ResponseEntity<ObjectNode> userInfo = restTemplate.exchange(registration.getProviderDetails().getUserInfoEndpoint().getUri(), HttpMethod.GET, new HttpEntity<String>(headers), ObjectNode.class);
-                return userInfo.getBody();
-            });
-
-            // Add custom claims
-            if (user != null) {
-                convertedClaims.put("preferred_username", user.get("preferred_username").asText());
-                if (user.has("given_name")) {
-                    convertedClaims.put("given_name", user.get("given_name").asText());
-                }
-                if (user.has("family_name")) {
-                    convertedClaims.put("family_name", user.get("family_name").asText());
-                }
-                if (user.has("email")) {
-                    convertedClaims.put("email", user.get("email").asText());
-                }
-                // Allow full name in a name claim - happens with Auth0
-                if (user.has("name")) {
-                    String[] name = user.get("name").asText().split("\\s+");
-                    if (name.length > 0) {
-                        convertedClaims.put("given_name", name[0]);
-                        convertedClaims.put("family_name",
-                            String.join(" ", Arrays.copyOfRange(name, 1, name.length)));
-                    }
-                }
-                if (user.has("groups")) {
-                    List<String> groups = StreamSupport.stream(user.get("groups").spliterator(), false)
-                        .map(JsonNode::asText)
-                        .toList();
-                    convertedClaims.put("groups", groups);
-                }
-                if (user.has(SecurityUtils.CLAIMS_NAMESPACE + "roles")) {
-                    List<String> roles = StreamSupport
-                        .stream(user.get(SecurityUtils.CLAIMS_NAMESPACE + "roles").spliterator(), false)
-                        .map(JsonNode::asText)
-                        .toList();
-                    convertedClaims.put("roles", roles);
-                }
-            }
-        }
-        return convertedClaims;
-    }
-}

package/dist/generators/server/templates/src/main/java/_package_/security/oauth2/JwtGrantedAuthorityConverter.java.ejs

@@ -1,40 +0,0 @@
-<%#
- Copyright 2013-2024 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 %>.security.oauth2;
-
-import <%= packageName %>.security.SecurityUtils;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.oauth2.jwt.Jwt;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-
-@Component
-public class JwtGrantedAuthorityConverter implements Converter<Jwt, Collection<GrantedAuthority>> {
-
-    public JwtGrantedAuthorityConverter() {
-        // Bean extracting authority.
-    }
-
-    @Override
-    public Collection<GrantedAuthority> convert(Jwt jwt) {
-        return SecurityUtils.extractAuthorityFromClaims(jwt.getClaims());
-    }
-}

package/dist/generators/server/templates/src/main/java/_package_/service/EmailAlreadyUsedException.java.ejs

@@ -1,29 +0,0 @@
-<%#
- Copyright 2013-2024 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 %>.service;
-
-public class EmailAlreadyUsedException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public EmailAlreadyUsedException() {
-        super("Email is already in use!");
-    }
-
-}

package/dist/generators/server/templates/src/main/java/_package_/service/InvalidPasswordException.java.ejs

@@ -1,29 +0,0 @@
-<%#
- Copyright 2013-2024 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 %>.service;
-
-public class InvalidPasswordException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public InvalidPasswordException() {
-        super("Incorrect password");
-    }
-
-}

package/dist/generators/server/templates/src/main/java/_package_/service/MailService.java.ejs

@@ -1,168 +0,0 @@
-<%#
- Copyright 2013-2024 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 %>.service;
-
-import <%= user.entityAbsoluteClass %>;
-
-import tech.jhipster.config.JHipsterProperties;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Locale;
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.MimeMessage;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.mail.MailException;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.stereotype.Service;
-import org.thymeleaf.context.Context;
-import org.thymeleaf.spring6.SpringTemplateEngine;
-<%_ if (reactive) { _%>
-import reactor.core.publisher.Mono;
-<%_ } else { _%>
-import org.springframework.scheduling.annotation.Async;
-<%_ } _%>
-<%_
-    const localSendEmailFromTemplateApi = reactive ? 'sendEmailFromTemplate' : 'sendEmailFromTemplateSync';
-_%>
-
-
-/**
- * Service for sending emails asynchronously.
-<%_ if (!reactive) { _%>
- * <p>
- * We use the {@link Async} annotation to send emails asynchronously.
-<%_ } _%>
- */
-@Service
-public class MailService {
-
-    private static final Logger log = LoggerFactory.getLogger(MailService.class);
-
-    private static final String USER = "user";
-
-    private static final String BASE_URL = "baseUrl";
-
-    private final JHipsterProperties jHipsterProperties;
-
-    private final JavaMailSender javaMailSender;
-
-    private final MessageSource messageSource;
-
-    private final SpringTemplateEngine templateEngine;
-
-    public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender,
-            MessageSource messageSource, SpringTemplateEngine templateEngine) {
-
-        this.jHipsterProperties = jHipsterProperties;
-        this.javaMailSender = javaMailSender;
-        this.messageSource = messageSource;
-        this.templateEngine = templateEngine;
-    }
-
-<%_ if (!reactive) { _%>
-    @Async
-<%_ } _%>
-    public void sendEmail(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
-<%_ if (reactive) { _%>
-        Mono.defer(() -> {
-            this.sendEmailSync(to, subject, content, isMultipart, isHtml);
-            return Mono.empty();
-        }).subscribe();
-<%_ } else { _%>
-        this.sendEmailSync(to, subject, content, isMultipart, isHtml);
-<%_ } _%>
-    }
-
-    private void sendEmailSync(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
-        log.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}",
-            isMultipart, isHtml, to, subject, content);
-
-        // Prepare message using a Spring helper
-        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-        try {
-            MimeMessageHelper message = new MimeMessageHelper(mimeMessage, isMultipart, StandardCharsets.UTF_8.name());
-            message.setTo(to);
-            message.setFrom(jHipsterProperties.getMail().getFrom());
-            message.setSubject(subject);
-            message.setText(content, isHtml);
-            javaMailSender.send(mimeMessage);
-            log.debug("Sent email to User '{}'", to);
-        }  catch (MailException | MessagingException e) {
-            log.warn("Email could not be sent to user '{}'", to, e);
-        }
-    }
-
-<%_ if (!reactive) { _%>
-    @Async
-<%_ } _%>
-    public void sendEmailFromTemplate(<%= user.persistClass %> user, String templateName, String titleKey) {
-<%_ if (reactive) { _%>
-        Mono.defer(() -> {
-            this.sendEmailFromTemplateSync(user, templateName, titleKey);
-            return Mono.empty();
-        }).subscribe();
-<%_ } else { _%>
-        this.sendEmailFromTemplateSync(user, templateName, titleKey);
-<%_ } _%>
-    }
-
-    private void sendEmailFromTemplateSync(<%= user.persistClass %> user, String templateName, String titleKey) {
-        if (user.getEmail() == null) {
-            log.debug("Email doesn't exist for user '{}'", user.getLogin());
-            return;
-        }
-        Locale locale = Locale.forLanguageTag(user.getLangKey());
-        Context context = new Context(locale);
-        context.setVariable(USER, user);
-        context.setVariable(BASE_URL, jHipsterProperties.getMail().getBaseUrl());
-        String content = templateEngine.process(templateName, context);
-        String subject = messageSource.getMessage(titleKey, null, locale);
-        this.sendEmailSync(user.getEmail(), subject, content, false, true);
-    }
-<%_ if (!authenticationTypeOauth2) { _%>
-
-<%_ if (!reactive) { _%>
-    @Async
-<%_ } _%>
-    public void sendActivationEmail(<%= user.persistClass %> user) {
-        log.debug("Sending activation email to '{}'", user.getEmail());
-        this.<%- localSendEmailFromTemplateApi %>(user, "mail/activationEmail", "email.activation.title");
-    }
-
-<%_ if (!reactive) { _%>
-    @Async
-<%_ } _%>
-    public void sendCreationEmail(<%= user.persistClass %> user) {
-        log.debug("Sending creation email to '{}'", user.getEmail());
-        this.<%- localSendEmailFromTemplateApi %>(user, "mail/creationEmail", "email.activation.title");
-    }
-
-<%_ if (!reactive) { _%>
-    @Async
-<%_ } _%>
-    public void sendPasswordResetMail(<%= user.persistClass %> user) {
-        log.debug("Sending password reset email to '{}'", user.getEmail());
-        this.<%- localSendEmailFromTemplateApi %>(user, "mail/passwordResetEmail", "email.reset.title");
-    }
-<%_ } _%>
-}

package/dist/generators/server/templates/src/main/java/_package_/service/UsernameAlreadyUsedException.java.ejs

@@ -1,29 +0,0 @@
-<%#
- Copyright 2013-2024 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 %>.service;
-
-public class UsernameAlreadyUsedException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public UsernameAlreadyUsedException() {
-        super("Login name already used!");
-    }
-
-}

package/dist/generators/server/templates/src/main/java/_package_/service/dto/PasswordChangeDTO.java.ejs

@@ -1,57 +0,0 @@
-<%#
- Copyright 2013-2024 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 %>.service.dto;
-
-import java.io.Serializable;
-
-/**
- * A DTO representing a password change required data - current and new password.
- */
-public class PasswordChangeDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String currentPassword;
-    private String newPassword;
-
-    public PasswordChangeDTO() {
-        // Empty constructor needed for Jackson.
-    }
-
-    public PasswordChangeDTO(String currentPassword, String newPassword) {
-        this.currentPassword = currentPassword;
-        this.newPassword = newPassword;
-    }
-
-    public String getCurrentPassword() {
-
-        return currentPassword;
-    }
-
-    public void setCurrentPassword(String currentPassword) {
-        this.currentPassword = currentPassword;
-    }
-
-    public String getNewPassword() {
-        return newPassword;
-    }
-
-    public void setNewPassword(String newPassword) {
-        this.newPassword = newPassword;
-    }
-}

package/dist/generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs

@@ -1,204 +0,0 @@
-<%#
- Copyright 2013-2024 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 %>.service.mapper;
-
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
-import <%= packageName %>.domain.Authority;
-<%_ } _%>
-import <%= user.entityAbsoluteClass %>;
-import <%= packageName %>.service.dto.<%= user.adminUserDto %>;
-import <%= packageName %>.service.dto.<%= user.dtoClass %>;
-
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.mapstruct.BeanMapping;
-import org.mapstruct.Mapping;
-import org.mapstruct.Named;
-
-/**
- * Mapper for the entity {@link <%= user.persistClass %>} and its DTO called {@link <%= user.dtoClass %>}.
- *
- * Normal mappers are generated using MapStruct, this one is hand-coded as MapStruct
- * support is still in beta, and requires a manual step with an IDE.
- */
-@Service
-public class UserMapper {
-
-    public List<<%= user.dtoClass %>> usersToUserDTOs(List<<%= user.persistClass %>> users) {
-        return users.stream()
-            .filter(Objects::nonNull)
-            .map(this::userToUserDTO)
-            .toList();
-    }
-
-    public <%= user.dtoClass %> userToUserDTO(<%= user.persistClass %> user) {
-        return new <%= user.dtoClass %>(user);
-    }
-
-    public List<<%= user.adminUserDto %>> usersToAdminUserDTOs(List<<%= user.persistClass %>> users) {
-        return users.stream()
-            .filter(Objects::nonNull)
-            .map(this::userToAdminUserDTO)
-            .toList();
-    }
-
-    public <%= user.adminUserDto %> userToAdminUserDTO(<%= user.persistClass %> user) {
-        return new <%= user.adminUserDto %>(user);
-    }
-
-    public List<<%= user.persistClass %>> userDTOsToUsers(List<<%= user.adminUserDto %>> userDTOs) {
-        return userDTOs.stream()
-            .filter(Objects::nonNull)
-            .map(this::userDTOToUser)
-            .toList();
-    }
-
-    public <%= user.persistClass %> userDTOToUser(<%= user.adminUserDto %> userDTO) {
-        if (userDTO == null) {
-            return null;
-        } else {
-            <%= user.persistClass %> user = new <%= user.persistClass %>();
-            user.setId(userDTO.getId());
-            user.setLogin(userDTO.getLogin());
-            user.setFirstName(userDTO.getFirstName());
-            user.setLastName(userDTO.getLastName());
-            user.setEmail(userDTO.getEmail());
-<%_ if (!databaseTypeCassandra) { _%>
-            user.setImageUrl(userDTO.getImageUrl());
-<%_ } _%>
-<%_ if (generateSpringAuditor) { _%>
-            user.setCreatedBy(userDTO.getCreatedBy());
-            user.setCreatedDate(userDTO.getCreatedDate());
-            user.setLastModifiedBy(userDTO.getLastModifiedBy());
-            user.setLastModifiedDate(userDTO.getLastModifiedDate());
-<%_ } _%>
-            user.setActivated(userDTO.isActivated());
-            user.setLangKey(userDTO.getLangKey());
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
-            Set<Authority> authorities = this.authoritiesFromStrings(userDTO.getAuthorities());
-            user.setAuthorities(authorities);
-<%_ } else { _%>
-            Set<String> authorities = this.cleanNullStringAuthorities(userDTO.getAuthorities());
-            user.setAuthorities(authorities);
-<%_ } _%>
-            return user;
-        }
-    }
-
-<%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
-
-    private Set<Authority> authoritiesFromStrings(Set<String> authoritiesAsString) {
-        Set<Authority> authorities = new HashSet<>();
-
-        if (authoritiesAsString != null) {
-            authorities = authoritiesAsString.stream().map(string -> {
-                Authority auth = new Authority();
-                auth.setName(string);
-                return auth;
-            }).collect(Collectors.toSet());
-        }
-
-        return authorities;
-    }
-<%_ } else { _%>
-
-    private Set<String> cleanNullStringAuthorities(Set<String> authoritiesAsString) {
-        Set<String> authorities = new HashSet<>();
-
-        if (authoritiesAsString != null) {
-            authorities = authoritiesAsString.stream()
-                .filter(Objects::nonNull)
-                .collect(Collectors.toSet());
-        }
-
-        return authorities;
-    }
-<%_ } _%>
-
-    public <%= user.persistClass %> userFromId(<%= user.primaryKey.type %> id) {
-        if (id == null) {
-            return null;
-        }
-        <%= user.persistClass %> user = new <%= user.persistClass %>();
-        user.setId(id);
-        return user;
-    }
-
-    @Named("id")
-    @BeanMapping(ignoreByDefault = true)
-    @Mapping(target = "id", source = "id")
-    public <%= user.dtoClass %> toDtoId(<%= user.persistClass %> user) {
-        if (user == null) {
-            return null;
-        }
-        <%= user.dtoClass %> userDto = new <%= user.dtoClass %>();
-        userDto.setId(user.getId());
-        return userDto;
-    }
-
-    @Named("idSet")
-    @BeanMapping(ignoreByDefault = true)
-    @Mapping(target = "id", source = "id")
-    public Set<<%= user.dtoClass %>> toDtoIdSet(Set<<%= user.persistClass %>> users) {
-        if ( users == null ) {
-            return Collections.emptySet();
-        }
-
-        Set<<%= user.dtoClass %>> userSet = new HashSet<>();
-        for ( <%= user.persistClass %> userEntity : users ) {
-            userSet.add( this.toDtoId( userEntity ) );
-        }
-
-        return userSet;
-    }
-
-    @Named("login")
-    @BeanMapping(ignoreByDefault = true)
-    @Mapping(target = "id", source = "id")
-    @Mapping(target = "login", source = "login")
-    public <%= user.dtoClass %> toDtoLogin(<%= user.persistClass %> user) {
-        if (user == null) {
-            return null;
-        }
-        <%= user.dtoClass %> userDto = new <%= user.dtoClass %>();
-        userDto.setId(user.getId());
-        userDto.setLogin(user.getLogin());
-        return userDto;
-    }
-
-    @Named("loginSet")
-    @BeanMapping(ignoreByDefault = true)
-    @Mapping(target = "id", source = "id")
-    @Mapping(target = "login", source = "login")
-    public Set<<%= user.dtoClass %>> toDtoLoginSet(Set<<%= user.persistClass %>> users) {
-        if ( users == null ) {
-            return Collections.emptySet();
-        }
-
-        Set<<%= user.dtoClass %>> userSet = new HashSet<>();
-        for ( <%= user.persistClass %> userEntity : users ) {
-            userSet.add( this.toDtoLogin( userEntity ) );
-        }
-
-        return userSet;
-    }
-}