Minor fixes after testing

README.md

@@ -26,7 +26,7 @@ or for gradle version above 2.1
 
 ```groovy
 plugins {
-    id "gae.piaz.layer3gen" version "1.8"
+    id "gae.piaz.layer3gen" version "1.9"
 }
 ```
 2. Create a file named _3layer-settings.yml_ (you willl find an example below) in the directory src/main/resources/;
@@ -38,8 +38,8 @@ gradlew clean build layer3gen
 
 ## 3layer-settings.yml configuration template:
 ```yml
-projectPath: /home/tano/workspace_autogenerate/springboot-3layer-generator/demo
+projectPath: /home/yourproject/demo
-# projectPath: c://workspace_private/springboot-3layer-generator/demo
+# projectPath: c://workspace/demo
 classesDirectory: build/classes/java/main
 outputDirectory : src/main/java
 options:

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'gae.piaz'
-version = '1.8'
+version = '1.9'
 
 repositories {
 	mavenCentral()

conf/3layer-settings.yml

@@ -1,9 +1,10 @@
-projectPath: /home/tano/workspace_autogenerate/springboot-3layer-generator/demo
+projectPath: /home/workspace/demo
 classesDirectory: build/classes/java/main
 outputDirectory : src/main/java
 options:
   dtoLayer : true
   serviceInterface: true
+  entityControllers: true
 
 inputPackages:
   jpaEntities : com.example.demo.model

demo-jakarta/build.gradle.kts

@@ -1,7 +1,7 @@
 
 buildscript {
     dependencies {
-        classpath("gae.piaz:layer3gen:1.8")
+        classpath("gae.piaz:layer3gen:1.9")
     }
     repositories {
         mavenCentral()

demo-jakarta/src/main/java/com/example/demo/controller/BookController.java

@@ -1,7 +1,7 @@
 package com.example.demo.controller;
 
 import com.example.demo.model.Book;
-import com.example.demo.serviceInterface.BookService;
+import com.example.demo.service.BookService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/book/")

demo-jakarta/src/main/java/com/example/demo/controller/BookControllerDTO.java

@@ -2,8 +2,8 @@ package com.example.demo.controller;
 
 import com.example.demo.model.Book;
 import com.example.demo.controller.dto.BookDTO;
-import com.example.demo.serviceInterface.BookService;
+import com.example.demo.service.BookService;
-import com.example.demo.serviceInterface.mapper.BookMapper;
+import com.example.demo.service.mapper.BookMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/book-dto/")

demo-jakarta/src/main/java/com/example/demo/controller/CrudController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 public interface CrudController<O,P>{
 

demo-jakarta/src/main/java/com/example/demo/controller/OrderController.java

@@ -1,7 +1,7 @@
 package com.example.demo.controller;
 
 import com.example.demo.model.Order;
-import com.example.demo.serviceInterface.OrderService;
+import com.example.demo.service.OrderService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/order/")

demo-jakarta/src/main/java/com/example/demo/controller/OrderControllerDTO.java

@@ -2,8 +2,8 @@ package com.example.demo.controller;
 
 import com.example.demo.model.Order;
 import com.example.demo.controller.dto.OrderDTO;
-import com.example.demo.serviceInterface.OrderService;
+import com.example.demo.service.OrderService;
-import com.example.demo.serviceInterface.mapper.OrderMapper;
+import com.example.demo.service.mapper.OrderMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/order-dto/")

demo-jakarta/src/main/java/com/example/demo/controller/UserController.java

@@ -1,7 +1,7 @@
 package com.example.demo.controller;
 
 import com.example.demo.model.User;
-import com.example.demo.serviceInterface.UserService;
+import com.example.demo.service.UserService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/user/")

demo-jakarta/src/main/java/com/example/demo/controller/UserControllerDTO.java

@@ -2,8 +2,8 @@ package com.example.demo.controller;
 
 import com.example.demo.model.User;
 import com.example.demo.controller.dto.UserDTO;
-import com.example.demo.serviceInterface.UserService;
+import com.example.demo.service.UserService;
-import com.example.demo.serviceInterface.mapper.UserMapper;
+import com.example.demo.service.mapper.UserMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/user-dto/")

demo-jakarta/src/main/java/com/example/demo/controller/dto/BookDTO.java

@@ -3,7 +3,7 @@ package com.example.demo.controller.dto;
 import lombok.Data;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Data
 public class BookDTO {

demo-jakarta/src/main/java/com/example/demo/controller/dto/OrderDTO.java

@@ -3,7 +3,7 @@ package com.example.demo.controller.dto;
 import lombok.Data;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Data
 public class OrderDTO {

demo-jakarta/src/main/java/com/example/demo/controller/dto/UserDTO.java

@@ -3,7 +3,7 @@ package com.example.demo.controller.dto;
 import lombok.Data;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Data
 public class UserDTO {

demo-jakarta/src/main/java/com/example/demo/repository/BookRepository.java

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Repository
 public interface BookRepository extends JpaRepository<Book, java.lang.Integer> {

demo-jakarta/src/main/java/com/example/demo/repository/OrderRepository.java

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Repository
 public interface OrderRepository extends JpaRepository<Order, java.lang.Integer> {

demo-jakarta/src/main/java/com/example/demo/repository/UserRepository.java

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Repository
 public interface UserRepository extends JpaRepository<User, java.lang.Integer> {

demo-jakarta/src/main/java/com/example/demo/service/BookService.java

@@ -0,0 +1,10 @@
+package com.example.demo.service;
+
+import com.example.demo.model.Book;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface BookService extends CrudService<Book,java.lang.Integer> {
+
+}

demo-jakarta/src/main/java/com/example/demo/service/CrudService.java

@@ -0,0 +1,22 @@
+package com.example.demo.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface CrudService<E, P> {
+
+    E create(E entity);
+
+    E update(E entity);
+
+    Page<E> find(E entity, Pageable pageable);
+
+    Optional<E> getOne(P primaryKey);
+
+    void delete(P primaryKey);
+
+}

demo-jakarta/src/main/java/com/example/demo/service/OrderService.java

@@ -0,0 +1,10 @@
+package com.example.demo.service;
+
+import com.example.demo.model.Order;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface OrderService extends CrudService<Order,java.lang.Integer> {
+
+}

demo-jakarta/src/main/java/com/example/demo/service/UserService.java

@@ -0,0 +1,10 @@
+package com.example.demo.service;
+
+import com.example.demo.model.User;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface UserService extends CrudService<User,java.lang.Integer> {
+
+}

demo-jakarta/src/main/java/com/example/demo/service/impl/BookServiceBean.java

@@ -0,0 +1,48 @@
+package com.example.demo.service.impl;
+
+import com.example.demo.model.Book;
+import com.example.demo.repository.BookRepository;
+import com.example.demo.service.BookService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Service
+public class BookServiceBean implements BookService {
+
+    @Autowired
+    private BookRepository repository;
+
+    @Override
+    public Book create(Book entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Book update(Book entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Page<Book> find(Book entity, Pageable pageable) {
+        Example<Book> example = Example.of(entity);
+        return repository.findAll(example,pageable);
+    }
+
+    @Override
+    public Optional<Book> getOne(java.lang.Integer primaryKey) {
+        return repository.findById(primaryKey);
+    }
+
+    @Override
+    public void delete(java.lang.Integer primaryKey) {
+        repository.deleteById(primaryKey);
+    }
+}

demo-jakarta/src/main/java/com/example/demo/service/impl/OrderServiceBean.java

@@ -0,0 +1,48 @@
+package com.example.demo.service.impl;
+
+import com.example.demo.model.Order;
+import com.example.demo.repository.OrderRepository;
+import com.example.demo.service.OrderService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Service
+public class OrderServiceBean implements OrderService {
+
+    @Autowired
+    private OrderRepository repository;
+
+    @Override
+    public Order create(Order entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Order update(Order entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Page<Order> find(Order entity, Pageable pageable) {
+        Example<Order> example = Example.of(entity);
+        return repository.findAll(example,pageable);
+    }
+
+    @Override
+    public Optional<Order> getOne(java.lang.Integer primaryKey) {
+        return repository.findById(primaryKey);
+    }
+
+    @Override
+    public void delete(java.lang.Integer primaryKey) {
+        repository.deleteById(primaryKey);
+    }
+}

demo-jakarta/src/main/java/com/example/demo/service/impl/UserServiceBean.java

@@ -0,0 +1,48 @@
+package com.example.demo.service.impl;
+
+import com.example.demo.model.User;
+import com.example.demo.repository.UserRepository;
+import com.example.demo.service.UserService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Service
+public class UserServiceBean implements UserService {
+
+    @Autowired
+    private UserRepository repository;
+
+    @Override
+    public User create(User entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public User update(User entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Page<User> find(User entity, Pageable pageable) {
+        Example<User> example = Example.of(entity);
+        return repository.findAll(example,pageable);
+    }
+
+    @Override
+    public Optional<User> getOne(java.lang.Integer primaryKey) {
+        return repository.findById(primaryKey);
+    }
+
+    @Override
+    public void delete(java.lang.Integer primaryKey) {
+        repository.deleteById(primaryKey);
+    }
+}

demo-jakarta/src/main/java/com/example/demo/service/mapper/BookMapper.java

@@ -0,0 +1,17 @@
+package com.example.demo.service.mapper;
+
+import com.example.demo.model.Book;
+import com.example.demo.controller.dto.BookDTO;
+import org.mapstruct.Mapper;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Mapper(componentModel = "spring")
+public interface BookMapper {
+
+    Book toEntity(BookDTO dto);
+
+    BookDTO toDto(Book entity);
+
+}

demo-jakarta/src/main/java/com/example/demo/service/mapper/OrderMapper.java

@@ -0,0 +1,17 @@
+package com.example.demo.service.mapper;
+
+import com.example.demo.model.Order;
+import com.example.demo.controller.dto.OrderDTO;
+import org.mapstruct.Mapper;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Mapper(componentModel = "spring")
+public interface OrderMapper {
+
+    Order toEntity(OrderDTO dto);
+
+    OrderDTO toDto(Order entity);
+
+}

demo-jakarta/src/main/java/com/example/demo/service/mapper/UserMapper.java

@@ -0,0 +1,17 @@
+package com.example.demo.service.mapper;
+
+import com.example.demo.model.User;
+import com.example.demo.controller.dto.UserDTO;
+import org.mapstruct.Mapper;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Mapper(componentModel = "spring")
+public interface UserMapper {
+
+    User toEntity(UserDTO dto);
+
+    UserDTO toDto(User entity);
+
+}

demo-jakarta/src/main/java/com/example/demo/serviceInterface/BookService.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceInterface;
 import com.example.demo.model.Book;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 public interface BookService extends CrudService<Book,java.lang.Integer> {
 

demo-jakarta/src/main/java/com/example/demo/serviceInterface/CrudService.java

@@ -5,7 +5,7 @@ import org.springframework.data.domain.Pageable;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 public interface CrudService<E, P> {
 

demo-jakarta/src/main/java/com/example/demo/serviceInterface/OrderService.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceInterface;
 import com.example.demo.model.Order;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 public interface OrderService extends CrudService<Order,java.lang.Integer> {
 

demo-jakarta/src/main/java/com/example/demo/serviceInterface/UserService.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceInterface;
 import com.example.demo.model.User;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 public interface UserService extends CrudService<User,java.lang.Integer> {
 

demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 @Service
 public class BookServiceBean implements BookService {

demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 @Service
 public class OrderServiceBean implements OrderService {

demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 @Service
 public class UserServiceBean implements UserService {

demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java

@@ -5,7 +5,7 @@ import com.example.demo.controller.dto.BookDTO;
 import org.mapstruct.Mapper;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 @Mapper(componentModel = "spring")
 public interface BookMapper {

demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java

@@ -5,7 +5,7 @@ import com.example.demo.controller.dto.OrderDTO;
 import org.mapstruct.Mapper;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 @Mapper(componentModel = "spring")
 public interface OrderMapper {

demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java

@@ -5,7 +5,7 @@ import com.example.demo.controller.dto.UserDTO;
 import org.mapstruct.Mapper;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:11:11 PM
 */
 @Mapper(componentModel = "spring")
 public interface UserMapper {

demo-jakarta/src/main/resources/3layer-settings.yml

@@ -1,8 +1,9 @@
-projectPath: /Users/Gaetano_Piazzolla/Workspaces/workspace_private/Layer3Gen/demo-jakarta
+projectPath: /home/workspace/demo-jackarta
 outputDirectory : src/main/java
 options:
   dtoLayer : true
   serviceInterface: true
+  entityControllers: true
 
 inputPackages:
   jpaEntities : com.example.demo.model

demo/build.gradle

@@ -1,7 +1,7 @@
 
 buildscript {
 	dependencies {
-		classpath "gae.piaz:layer3gen:1.8"
+		classpath "gae.piaz:layer3gen:1.9"
 	}
 	repositories {
 		mavenCentral()

demo/src/main/java/com/example/demo/controller/BookController.java

@@ -1,7 +1,7 @@
 package com.example.demo.controller;
 
 import com.example.demo.model.Book;
-import com.example.demo.serviceInterface.BookService;
+import com.example.demo.service.BookService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/book/")

demo/src/main/java/com/example/demo/controller/BookControllerDTO.java

@@ -2,8 +2,8 @@ package com.example.demo.controller;
 
 import com.example.demo.model.Book;
 import com.example.demo.controller.dto.BookDTO;
-import com.example.demo.serviceInterface.BookService;
+import com.example.demo.service.BookService;
-import com.example.demo.serviceInterface.mapper.BookMapper;
+import com.example.demo.service.mapper.BookMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/book-dto/")

demo/src/main/java/com/example/demo/controller/CrudController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:33 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 public interface CrudController<O,P>{
 

demo/src/main/java/com/example/demo/controller/OrderController.java

@@ -1,7 +1,7 @@
 package com.example.demo.controller;
 
 import com.example.demo.model.Order;
-import com.example.demo.serviceInterface.OrderService;
+import com.example.demo.service.OrderService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/order/")

demo/src/main/java/com/example/demo/controller/OrderControllerDTO.java

@@ -2,8 +2,8 @@ package com.example.demo.controller;
 
 import com.example.demo.model.Order;
 import com.example.demo.controller.dto.OrderDTO;
-import com.example.demo.serviceInterface.OrderService;
+import com.example.demo.service.OrderService;
-import com.example.demo.serviceInterface.mapper.OrderMapper;
+import com.example.demo.service.mapper.OrderMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/order-dto/")

demo/src/main/java/com/example/demo/controller/UserController.java

@@ -1,7 +1,7 @@
 package com.example.demo.controller;
 
 import com.example.demo.model.User;
-import com.example.demo.serviceInterface.UserService;
+import com.example.demo.service.UserService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/user/")

demo/src/main/java/com/example/demo/controller/UserControllerDTO.java

@@ -2,8 +2,8 @@ package com.example.demo.controller;
 
 import com.example.demo.model.User;
 import com.example.demo.controller.dto.UserDTO;
-import com.example.demo.serviceInterface.UserService;
+import com.example.demo.service.UserService;
-import com.example.demo.serviceInterface.mapper.UserMapper;
+import com.example.demo.service.mapper.UserMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @RestController
 @RequestMapping("/user-dto/")

demo/src/main/java/com/example/demo/controller/dto/BookDTO.java

@@ -3,7 +3,7 @@ package com.example.demo.controller.dto;
 import lombok.Data;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Data
 public class BookDTO {

demo/src/main/java/com/example/demo/controller/dto/OrderDTO.java

@@ -3,7 +3,7 @@ package com.example.demo.controller.dto;
 import lombok.Data;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Data
 public class OrderDTO {

demo/src/main/java/com/example/demo/controller/dto/UserDTO.java

@@ -3,7 +3,7 @@ package com.example.demo.controller.dto;
 import lombok.Data;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Data
 public class UserDTO {

demo/src/main/java/com/example/demo/repository/BookRepository.java

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Repository
 public interface BookRepository extends JpaRepository<Book, java.lang.Integer> {

demo/src/main/java/com/example/demo/repository/OrderRepository.java

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Repository
 public interface OrderRepository extends JpaRepository<Order, java.lang.Integer> {

demo/src/main/java/com/example/demo/repository/UserRepository.java

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
 */
 @Repository
 public interface UserRepository extends JpaRepository<User, java.lang.Integer> {

demo/src/main/java/com/example/demo/service/BookService.java

@@ -0,0 +1,10 @@
+package com.example.demo.service;
+
+import com.example.demo.model.Book;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface BookService extends CrudService<Book,java.lang.Integer> {
+
+}

demo/src/main/java/com/example/demo/service/CrudService.java

@@ -0,0 +1,22 @@
+package com.example.demo.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface CrudService<E, P> {
+
+    E create(E entity);
+
+    E update(E entity);
+
+    Page<E> find(E entity, Pageable pageable);
+
+    Optional<E> getOne(P primaryKey);
+
+    void delete(P primaryKey);
+
+}

demo/src/main/java/com/example/demo/service/OrderService.java

@@ -0,0 +1,10 @@
+package com.example.demo.service;
+
+import com.example.demo.model.Order;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface OrderService extends CrudService<Order,java.lang.Integer> {
+
+}

demo/src/main/java/com/example/demo/service/UserService.java

@@ -0,0 +1,10 @@
+package com.example.demo.service;
+
+import com.example.demo.model.User;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+public interface UserService extends CrudService<User,java.lang.Integer> {
+
+}

demo/src/main/java/com/example/demo/service/impl/BookServiceBean.java

@@ -0,0 +1,48 @@
+package com.example.demo.service.impl;
+
+import com.example.demo.model.Book;
+import com.example.demo.repository.BookRepository;
+import com.example.demo.service.BookService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Service
+public class BookServiceBean implements BookService {
+
+    @Autowired
+    private BookRepository repository;
+
+    @Override
+    public Book create(Book entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Book update(Book entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Page<Book> find(Book entity, Pageable pageable) {
+        Example<Book> example = Example.of(entity);
+        return repository.findAll(example,pageable);
+    }
+
+    @Override
+    public Optional<Book> getOne(java.lang.Integer primaryKey) {
+        return repository.findById(primaryKey);
+    }
+
+    @Override
+    public void delete(java.lang.Integer primaryKey) {
+        repository.deleteById(primaryKey);
+    }
+}

demo/src/main/java/com/example/demo/service/impl/OrderServiceBean.java

@@ -0,0 +1,48 @@
+package com.example.demo.service.impl;
+
+import com.example.demo.model.Order;
+import com.example.demo.repository.OrderRepository;
+import com.example.demo.service.OrderService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Service
+public class OrderServiceBean implements OrderService {
+
+    @Autowired
+    private OrderRepository repository;
+
+    @Override
+    public Order create(Order entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Order update(Order entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Page<Order> find(Order entity, Pageable pageable) {
+        Example<Order> example = Example.of(entity);
+        return repository.findAll(example,pageable);
+    }
+
+    @Override
+    public Optional<Order> getOne(java.lang.Integer primaryKey) {
+        return repository.findById(primaryKey);
+    }
+
+    @Override
+    public void delete(java.lang.Integer primaryKey) {
+        repository.deleteById(primaryKey);
+    }
+}

demo/src/main/java/com/example/demo/service/impl/UserServiceBean.java

@@ -0,0 +1,48 @@
+package com.example.demo.service.impl;
+
+import com.example.demo.model.User;
+import com.example.demo.repository.UserRepository;
+import com.example.demo.service.UserService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import java.util.Optional;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Service
+public class UserServiceBean implements UserService {
+
+    @Autowired
+    private UserRepository repository;
+
+    @Override
+    public User create(User entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public User update(User entity) {
+        return repository.save(entity);
+    }
+
+    @Override
+    public Page<User> find(User entity, Pageable pageable) {
+        Example<User> example = Example.of(entity);
+        return repository.findAll(example,pageable);
+    }
+
+    @Override
+    public Optional<User> getOne(java.lang.Integer primaryKey) {
+        return repository.findById(primaryKey);
+    }
+
+    @Override
+    public void delete(java.lang.Integer primaryKey) {
+        repository.deleteById(primaryKey);
+    }
+}

demo/src/main/java/com/example/demo/service/mapper/BookMapper.java

@@ -0,0 +1,17 @@
+package com.example.demo.service.mapper;
+
+import com.example.demo.model.Book;
+import com.example.demo.controller.dto.BookDTO;
+import org.mapstruct.Mapper;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Mapper(componentModel = "spring")
+public interface BookMapper {
+
+    Book toEntity(BookDTO dto);
+
+    BookDTO toDto(Book entity);
+
+}

demo/src/main/java/com/example/demo/service/mapper/OrderMapper.java

@@ -0,0 +1,17 @@
+package com.example.demo.service.mapper;
+
+import com.example.demo.model.Order;
+import com.example.demo.controller.dto.OrderDTO;
+import org.mapstruct.Mapper;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Mapper(componentModel = "spring")
+public interface OrderMapper {
+
+    Order toEntity(OrderDTO dto);
+
+    OrderDTO toDto(Order entity);
+
+}

demo/src/main/java/com/example/demo/service/mapper/UserMapper.java

@@ -0,0 +1,17 @@
+package com.example.demo.service.mapper;
+
+import com.example.demo.model.User;
+import com.example.demo.controller.dto.UserDTO;
+import org.mapstruct.Mapper;
+
+/**
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:26:01 PM
+*/
+@Mapper(componentModel = "spring")
+public interface UserMapper {
+
+    User toEntity(UserDTO dto);
+
+    UserDTO toDto(User entity);
+
+}

demo/src/main/java/com/example/demo/serviceInterface/BookService.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceInterface;
 import com.example.demo.model.Book;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 public interface BookService extends CrudService<Book,java.lang.Integer> {
 

demo/src/main/java/com/example/demo/serviceInterface/CrudService.java

@@ -5,7 +5,7 @@ import org.springframework.data.domain.Pageable;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:33 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:29 PM
 */
 public interface CrudService<E, P> {
 

demo/src/main/java/com/example/demo/serviceInterface/OrderService.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceInterface;
 import com.example.demo.model.Order;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 public interface OrderService extends CrudService<Order,java.lang.Integer> {
 

demo/src/main/java/com/example/demo/serviceInterface/UserService.java

@@ -3,7 +3,7 @@ package com.example.demo.serviceInterface;
 import com.example.demo.model.User;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 public interface UserService extends CrudService<User,java.lang.Integer> {
 

demo/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 @Service
 public class BookServiceBean implements BookService {

demo/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 @Service
 public class OrderServiceBean implements OrderService {

demo/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
 import java.util.Optional;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 @Service
 public class UserServiceBean implements UserService {

demo/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java

@@ -5,7 +5,7 @@ import com.example.demo.controller.dto.BookDTO;
 import org.mapstruct.Mapper;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 @Mapper(componentModel = "spring")
 public interface BookMapper {

demo/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java

@@ -5,7 +5,7 @@ import com.example.demo.controller.dto.OrderDTO;
 import org.mapstruct.Mapper;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 @Mapper(componentModel = "spring")
 public interface OrderMapper {

demo/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java

@@ -5,7 +5,7 @@ import com.example.demo.controller.dto.UserDTO;
 import org.mapstruct.Mapper;
 
 /**
-* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
+* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:20:30 PM
 */
 @Mapper(componentModel = "spring")
 public interface UserMapper {

demo/src/main/resources/3layer-settings.yml

@@ -1,8 +1,9 @@
-projectPath: /Users/Gaetano_Piazzolla/Workspaces/workspace_private/Layer3Gen/demo
+projectPath: /home/workspace/demo
 outputDirectory : src/main/java
 options:
   dtoLayer : true
   serviceInterface: true
+  entityControllers: true
 
 inputPackages:
   jpaEntities : com.example.demo.model

src/test/resources/3layer-settings-jakarta.yml

@@ -11,5 +11,5 @@ inputPackages:
 
 outputPackages:
   repositories: com.example.demo.repository
-  services: com.example.demo.serviceInterface
+  services: com.example.demo.service
   controllers: com.example.demo.controller

src/test/resources/3layer-settings.yml

@@ -11,5 +11,5 @@ inputPackages:
 
 outputPackages:
   repositories : com.example.demo.repository
-  services: com.example.demo.serviceInterface
+  services: com.example.demo.service
   controllers: com.example.demo.controller