From ca5055e225e3dc382799065f03e6bd6abb70cbe1 Mon Sep 17 00:00:00 2001 From: Gaetano_Piazzolla Date: Sun, 26 Feb 2023 16:22:34 +0100 Subject: [PATCH] Minor fixes after testing --- README.md | 6 +-- build.gradle | 2 +- conf/3layer-settings.yml | 3 +- demo-jakarta/build.gradle.kts | 2 +- .../demo/controller/BookController.java | 4 +- .../demo/controller/BookControllerDTO.java | 6 +-- .../demo/controller/CrudController.java | 2 +- .../demo/controller/OrderController.java | 4 +- .../demo/controller/OrderControllerDTO.java | 6 +-- .../demo/controller/UserController.java | 4 +- .../demo/controller/UserControllerDTO.java | 6 +-- .../example/demo/controller/dto/BookDTO.java | 2 +- .../example/demo/controller/dto/OrderDTO.java | 2 +- .../example/demo/controller/dto/UserDTO.java | 2 +- .../demo/repository/BookRepository.java | 2 +- .../demo/repository/OrderRepository.java | 2 +- .../demo/repository/UserRepository.java | 2 +- .../com/example/demo/service/BookService.java | 10 ++++ .../com/example/demo/service/CrudService.java | 22 +++++++++ .../example/demo/service/OrderService.java | 10 ++++ .../com/example/demo/service/UserService.java | 10 ++++ .../demo/service/impl/BookServiceBean.java | 48 +++++++++++++++++++ .../demo/service/impl/OrderServiceBean.java | 48 +++++++++++++++++++ .../demo/service/impl/UserServiceBean.java | 48 +++++++++++++++++++ .../demo/service/mapper/BookMapper.java | 17 +++++++ .../demo/service/mapper/OrderMapper.java | 17 +++++++ .../demo/service/mapper/UserMapper.java | 17 +++++++ .../demo/serviceInterface/BookService.java | 2 +- .../demo/serviceInterface/CrudService.java | 2 +- .../demo/serviceInterface/OrderService.java | 2 +- .../demo/serviceInterface/UserService.java | 2 +- .../impl/BookServiceBean.java | 2 +- .../impl/OrderServiceBean.java | 2 +- .../impl/UserServiceBean.java | 2 +- .../serviceInterface/mapper/BookMapper.java | 2 +- .../serviceInterface/mapper/OrderMapper.java | 2 +- .../serviceInterface/mapper/UserMapper.java | 2 +- .../src/main/resources/3layer-settings.yml | 3 +- demo/build.gradle | 2 +- .../demo/controller/BookController.java | 4 +- .../demo/controller/BookControllerDTO.java | 6 +-- .../demo/controller/CrudController.java | 2 +- .../demo/controller/OrderController.java | 4 +- .../demo/controller/OrderControllerDTO.java | 6 +-- .../demo/controller/UserController.java | 4 +- .../demo/controller/UserControllerDTO.java | 6 +-- .../example/demo/controller/dto/BookDTO.java | 2 +- .../example/demo/controller/dto/OrderDTO.java | 2 +- .../example/demo/controller/dto/UserDTO.java | 2 +- .../demo/repository/BookRepository.java | 2 +- .../demo/repository/OrderRepository.java | 2 +- .../demo/repository/UserRepository.java | 2 +- .../com/example/demo/service/BookService.java | 10 ++++ .../com/example/demo/service/CrudService.java | 22 +++++++++ .../example/demo/service/OrderService.java | 10 ++++ .../com/example/demo/service/UserService.java | 10 ++++ .../demo/service/impl/BookServiceBean.java | 48 +++++++++++++++++++ .../demo/service/impl/OrderServiceBean.java | 48 +++++++++++++++++++ .../demo/service/impl/UserServiceBean.java | 48 +++++++++++++++++++ .../demo/service/mapper/BookMapper.java | 17 +++++++ .../demo/service/mapper/OrderMapper.java | 17 +++++++ .../demo/service/mapper/UserMapper.java | 17 +++++++ .../demo/serviceInterface/BookService.java | 2 +- .../demo/serviceInterface/CrudService.java | 2 +- .../demo/serviceInterface/OrderService.java | 2 +- .../demo/serviceInterface/UserService.java | 2 +- .../impl/BookServiceBean.java | 2 +- .../impl/OrderServiceBean.java | 2 +- .../impl/UserServiceBean.java | 2 +- .../serviceInterface/mapper/BookMapper.java | 2 +- .../serviceInterface/mapper/OrderMapper.java | 2 +- .../serviceInterface/mapper/UserMapper.java | 2 +- demo/src/main/resources/3layer-settings.yml | 3 +- .../resources/3layer-settings-jakarta.yml | 2 +- src/test/resources/3layer-settings.yml | 2 +- 75 files changed, 572 insertions(+), 75 deletions(-) create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/BookService.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/CrudService.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/OrderService.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/UserService.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/impl/BookServiceBean.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/impl/OrderServiceBean.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/impl/UserServiceBean.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/mapper/BookMapper.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/mapper/OrderMapper.java create mode 100644 demo-jakarta/src/main/java/com/example/demo/service/mapper/UserMapper.java create mode 100644 demo/src/main/java/com/example/demo/service/BookService.java create mode 100644 demo/src/main/java/com/example/demo/service/CrudService.java create mode 100644 demo/src/main/java/com/example/demo/service/OrderService.java create mode 100644 demo/src/main/java/com/example/demo/service/UserService.java create mode 100644 demo/src/main/java/com/example/demo/service/impl/BookServiceBean.java create mode 100644 demo/src/main/java/com/example/demo/service/impl/OrderServiceBean.java create mode 100644 demo/src/main/java/com/example/demo/service/impl/UserServiceBean.java create mode 100644 demo/src/main/java/com/example/demo/service/mapper/BookMapper.java create mode 100644 demo/src/main/java/com/example/demo/service/mapper/OrderMapper.java create mode 100644 demo/src/main/java/com/example/demo/service/mapper/UserMapper.java diff --git a/README.md b/README.md index 1424433..b04f9fe 100644 --- a/README.md +++ b/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: c://workspace_private/springboot-3layer-generator/demo +projectPath: /home/yourproject/demo +# projectPath: c://workspace/demo classesDirectory: build/classes/java/main outputDirectory : src/main/java options: diff --git a/build.gradle b/build.gradle index f988e06..aac2d92 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { } group = 'gae.piaz' -version = '1.8' +version = '1.9' repositories { mavenCentral() diff --git a/conf/3layer-settings.yml b/conf/3layer-settings.yml index 42a9a81..46cf7c1 100644 --- a/conf/3layer-settings.yml +++ b/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 diff --git a/demo-jakarta/build.gradle.kts b/demo-jakarta/build.gradle.kts index d6fcbe0..959bc87 100644 --- a/demo-jakarta/build.gradle.kts +++ b/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() diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/BookController.java b/demo-jakarta/src/main/java/com/example/demo/controller/BookController.java index 375bde4..a4f4198 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/BookController.java +++ b/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/") diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/BookControllerDTO.java b/demo-jakarta/src/main/java/com/example/demo/controller/BookControllerDTO.java index 15087c7..ec80adb 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/BookControllerDTO.java +++ b/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.serviceInterface.mapper.BookMapper; +import com.example.demo.service.BookService; +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/") diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/CrudController.java b/demo-jakarta/src/main/java/com/example/demo/controller/CrudController.java index 3d8af6d..bc1c602 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/CrudController.java +++ b/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{ diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/OrderController.java b/demo-jakarta/src/main/java/com/example/demo/controller/OrderController.java index 552fa12..3622a75 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/OrderController.java +++ b/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/") diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/OrderControllerDTO.java b/demo-jakarta/src/main/java/com/example/demo/controller/OrderControllerDTO.java index 1e9025b..6c8eaac 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/OrderControllerDTO.java +++ b/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.serviceInterface.mapper.OrderMapper; +import com.example.demo.service.OrderService; +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/") diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/UserController.java b/demo-jakarta/src/main/java/com/example/demo/controller/UserController.java index a079ad6..172be6e 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/UserController.java +++ b/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/") diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/UserControllerDTO.java b/demo-jakarta/src/main/java/com/example/demo/controller/UserControllerDTO.java index 7c2349b..1451c40 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/UserControllerDTO.java +++ b/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.serviceInterface.mapper.UserMapper; +import com.example.demo.service.UserService; +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/") diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/dto/BookDTO.java b/demo-jakarta/src/main/java/com/example/demo/controller/dto/BookDTO.java index 8910e01..7c1925c 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/dto/BookDTO.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/dto/OrderDTO.java b/demo-jakarta/src/main/java/com/example/demo/controller/dto/OrderDTO.java index 3629c76..1c6864f 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/dto/OrderDTO.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/controller/dto/UserDTO.java b/demo-jakarta/src/main/java/com/example/demo/controller/dto/UserDTO.java index 645cda5..0eb13cb 100644 --- a/demo-jakarta/src/main/java/com/example/demo/controller/dto/UserDTO.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/repository/BookRepository.java b/demo-jakarta/src/main/java/com/example/demo/repository/BookRepository.java index adccbf9..4a926b6 100644 --- a/demo-jakarta/src/main/java/com/example/demo/repository/BookRepository.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/repository/OrderRepository.java b/demo-jakarta/src/main/java/com/example/demo/repository/OrderRepository.java index 0352a69..9b53d8a 100644 --- a/demo-jakarta/src/main/java/com/example/demo/repository/OrderRepository.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/repository/UserRepository.java b/demo-jakarta/src/main/java/com/example/demo/repository/UserRepository.java index d90e8f8..4f87556 100644 --- a/demo-jakarta/src/main/java/com/example/demo/repository/UserRepository.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/service/BookService.java b/demo-jakarta/src/main/java/com/example/demo/service/BookService.java new file mode 100644 index 0000000..e15213e --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/CrudService.java b/demo-jakarta/src/main/java/com/example/demo/service/CrudService.java new file mode 100644 index 0000000..07612ce --- /dev/null +++ b/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 create(E entity); + + E update(E entity); + + Page find(E entity, Pageable pageable); + + Optional getOne(P primaryKey); + + void delete(P primaryKey); + +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/OrderService.java b/demo-jakarta/src/main/java/com/example/demo/service/OrderService.java new file mode 100644 index 0000000..949ea62 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/UserService.java b/demo-jakarta/src/main/java/com/example/demo/service/UserService.java new file mode 100644 index 0000000..9ba8270 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/impl/BookServiceBean.java b/demo-jakarta/src/main/java/com/example/demo/service/impl/BookServiceBean.java new file mode 100644 index 0000000..b563591 --- /dev/null +++ b/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 find(Book entity, Pageable pageable) { + Example example = Example.of(entity); + return repository.findAll(example,pageable); + } + + @Override + public Optional getOne(java.lang.Integer primaryKey) { + return repository.findById(primaryKey); + } + + @Override + public void delete(java.lang.Integer primaryKey) { + repository.deleteById(primaryKey); + } +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/impl/OrderServiceBean.java b/demo-jakarta/src/main/java/com/example/demo/service/impl/OrderServiceBean.java new file mode 100644 index 0000000..35c2307 --- /dev/null +++ b/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 find(Order entity, Pageable pageable) { + Example example = Example.of(entity); + return repository.findAll(example,pageable); + } + + @Override + public Optional getOne(java.lang.Integer primaryKey) { + return repository.findById(primaryKey); + } + + @Override + public void delete(java.lang.Integer primaryKey) { + repository.deleteById(primaryKey); + } +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/impl/UserServiceBean.java b/demo-jakarta/src/main/java/com/example/demo/service/impl/UserServiceBean.java new file mode 100644 index 0000000..7ab6c65 --- /dev/null +++ b/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 find(User entity, Pageable pageable) { + Example example = Example.of(entity); + return repository.findAll(example,pageable); + } + + @Override + public Optional getOne(java.lang.Integer primaryKey) { + return repository.findById(primaryKey); + } + + @Override + public void delete(java.lang.Integer primaryKey) { + repository.deleteById(primaryKey); + } +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/mapper/BookMapper.java b/demo-jakarta/src/main/java/com/example/demo/service/mapper/BookMapper.java new file mode 100644 index 0000000..9ffeb16 --- /dev/null +++ b/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); + +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/mapper/OrderMapper.java b/demo-jakarta/src/main/java/com/example/demo/service/mapper/OrderMapper.java new file mode 100644 index 0000000..ef4d2bb --- /dev/null +++ b/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); + +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/service/mapper/UserMapper.java b/demo-jakarta/src/main/java/com/example/demo/service/mapper/UserMapper.java new file mode 100644 index 0000000..60a6876 --- /dev/null +++ b/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); + +} \ No newline at end of file diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/BookService.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/BookService.java index 38f6e1c..8228387 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/BookService.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/CrudService.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/CrudService.java index b9d5bff..448caa6 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/CrudService.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/OrderService.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/OrderService.java index 92e2a43..6ab9bda 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/OrderService.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/UserService.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/UserService.java index 8bb4542..bac84aa 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/UserService.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java index a0955b2..45df11c 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java index 7798863..36fc62b 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java index 92b8ef2..91be439 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java index 5d5fdaf..da3e52b 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java index 972ad53..80c33f8 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java +++ b/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 { diff --git a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java b/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java index 248f926..9e29ee6 100644 --- a/demo-jakarta/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java +++ b/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 { diff --git a/demo-jakarta/src/main/resources/3layer-settings.yml b/demo-jakarta/src/main/resources/3layer-settings.yml index 1606808..7c888ba 100644 --- a/demo-jakarta/src/main/resources/3layer-settings.yml +++ b/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 diff --git a/demo/build.gradle b/demo/build.gradle index 055fd24..a63a15b 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,7 +1,7 @@ buildscript { dependencies { - classpath "gae.piaz:layer3gen:1.8" + classpath "gae.piaz:layer3gen:1.9" } repositories { mavenCentral() diff --git a/demo/src/main/java/com/example/demo/controller/BookController.java b/demo/src/main/java/com/example/demo/controller/BookController.java index 701b6c3..a4f4198 100644 --- a/demo/src/main/java/com/example/demo/controller/BookController.java +++ b/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/") diff --git a/demo/src/main/java/com/example/demo/controller/BookControllerDTO.java b/demo/src/main/java/com/example/demo/controller/BookControllerDTO.java index 499498d..ec80adb 100644 --- a/demo/src/main/java/com/example/demo/controller/BookControllerDTO.java +++ b/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.serviceInterface.mapper.BookMapper; +import com.example.demo.service.BookService; +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/") diff --git a/demo/src/main/java/com/example/demo/controller/CrudController.java b/demo/src/main/java/com/example/demo/controller/CrudController.java index f13057b..bc1c602 100644 --- a/demo/src/main/java/com/example/demo/controller/CrudController.java +++ b/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{ diff --git a/demo/src/main/java/com/example/demo/controller/OrderController.java b/demo/src/main/java/com/example/demo/controller/OrderController.java index bd2d87f..3622a75 100644 --- a/demo/src/main/java/com/example/demo/controller/OrderController.java +++ b/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/") diff --git a/demo/src/main/java/com/example/demo/controller/OrderControllerDTO.java b/demo/src/main/java/com/example/demo/controller/OrderControllerDTO.java index fbcef34..6c8eaac 100644 --- a/demo/src/main/java/com/example/demo/controller/OrderControllerDTO.java +++ b/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.serviceInterface.mapper.OrderMapper; +import com.example.demo.service.OrderService; +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/") diff --git a/demo/src/main/java/com/example/demo/controller/UserController.java b/demo/src/main/java/com/example/demo/controller/UserController.java index 7faaa3f..172be6e 100644 --- a/demo/src/main/java/com/example/demo/controller/UserController.java +++ b/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/") diff --git a/demo/src/main/java/com/example/demo/controller/UserControllerDTO.java b/demo/src/main/java/com/example/demo/controller/UserControllerDTO.java index 235e015..1451c40 100644 --- a/demo/src/main/java/com/example/demo/controller/UserControllerDTO.java +++ b/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.serviceInterface.mapper.UserMapper; +import com.example.demo.service.UserService; +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/") diff --git a/demo/src/main/java/com/example/demo/controller/dto/BookDTO.java b/demo/src/main/java/com/example/demo/controller/dto/BookDTO.java index c7057f0..7c1925c 100644 --- a/demo/src/main/java/com/example/demo/controller/dto/BookDTO.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/controller/dto/OrderDTO.java b/demo/src/main/java/com/example/demo/controller/dto/OrderDTO.java index bff11ac..1c6864f 100644 --- a/demo/src/main/java/com/example/demo/controller/dto/OrderDTO.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/controller/dto/UserDTO.java b/demo/src/main/java/com/example/demo/controller/dto/UserDTO.java index b7273d4..0eb13cb 100644 --- a/demo/src/main/java/com/example/demo/controller/dto/UserDTO.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/repository/BookRepository.java b/demo/src/main/java/com/example/demo/repository/BookRepository.java index fbb7c3c..4a926b6 100644 --- a/demo/src/main/java/com/example/demo/repository/BookRepository.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/repository/OrderRepository.java b/demo/src/main/java/com/example/demo/repository/OrderRepository.java index 317e921..9b53d8a 100644 --- a/demo/src/main/java/com/example/demo/repository/OrderRepository.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/repository/UserRepository.java b/demo/src/main/java/com/example/demo/repository/UserRepository.java index 4852041..4f87556 100644 --- a/demo/src/main/java/com/example/demo/repository/UserRepository.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/service/BookService.java b/demo/src/main/java/com/example/demo/service/BookService.java new file mode 100644 index 0000000..e15213e --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/CrudService.java b/demo/src/main/java/com/example/demo/service/CrudService.java new file mode 100644 index 0000000..07612ce --- /dev/null +++ b/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 create(E entity); + + E update(E entity); + + Page find(E entity, Pageable pageable); + + Optional getOne(P primaryKey); + + void delete(P primaryKey); + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/OrderService.java b/demo/src/main/java/com/example/demo/service/OrderService.java new file mode 100644 index 0000000..949ea62 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/UserService.java b/demo/src/main/java/com/example/demo/service/UserService.java new file mode 100644 index 0000000..9ba8270 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/impl/BookServiceBean.java b/demo/src/main/java/com/example/demo/service/impl/BookServiceBean.java new file mode 100644 index 0000000..b563591 --- /dev/null +++ b/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 find(Book entity, Pageable pageable) { + Example example = Example.of(entity); + return repository.findAll(example,pageable); + } + + @Override + public Optional getOne(java.lang.Integer primaryKey) { + return repository.findById(primaryKey); + } + + @Override + public void delete(java.lang.Integer primaryKey) { + repository.deleteById(primaryKey); + } +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/impl/OrderServiceBean.java b/demo/src/main/java/com/example/demo/service/impl/OrderServiceBean.java new file mode 100644 index 0000000..35c2307 --- /dev/null +++ b/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 find(Order entity, Pageable pageable) { + Example example = Example.of(entity); + return repository.findAll(example,pageable); + } + + @Override + public Optional getOne(java.lang.Integer primaryKey) { + return repository.findById(primaryKey); + } + + @Override + public void delete(java.lang.Integer primaryKey) { + repository.deleteById(primaryKey); + } +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/impl/UserServiceBean.java b/demo/src/main/java/com/example/demo/service/impl/UserServiceBean.java new file mode 100644 index 0000000..7ab6c65 --- /dev/null +++ b/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 find(User entity, Pageable pageable) { + Example example = Example.of(entity); + return repository.findAll(example,pageable); + } + + @Override + public Optional getOne(java.lang.Integer primaryKey) { + return repository.findById(primaryKey); + } + + @Override + public void delete(java.lang.Integer primaryKey) { + repository.deleteById(primaryKey); + } +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/mapper/BookMapper.java b/demo/src/main/java/com/example/demo/service/mapper/BookMapper.java new file mode 100644 index 0000000..9ffeb16 --- /dev/null +++ b/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); + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/mapper/OrderMapper.java b/demo/src/main/java/com/example/demo/service/mapper/OrderMapper.java new file mode 100644 index 0000000..ef4d2bb --- /dev/null +++ b/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); + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/service/mapper/UserMapper.java b/demo/src/main/java/com/example/demo/service/mapper/UserMapper.java new file mode 100644 index 0000000..60a6876 --- /dev/null +++ b/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); + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/serviceInterface/BookService.java b/demo/src/main/java/com/example/demo/serviceInterface/BookService.java index 5796f52..2cfbc59 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/BookService.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/CrudService.java b/demo/src/main/java/com/example/demo/serviceInterface/CrudService.java index aa2f57b..2537333 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/CrudService.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/OrderService.java b/demo/src/main/java/com/example/demo/serviceInterface/OrderService.java index ed49ec9..a6454db 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/OrderService.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/UserService.java b/demo/src/main/java/com/example/demo/serviceInterface/UserService.java index b87c6ba..cb6afeb 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/UserService.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java b/demo/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java index f2a30a1..bb90891 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java b/demo/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java index 113dd41..f5ef9bd 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java b/demo/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java index f2a744c..66bf242 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java b/demo/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java index 4d2829b..8c8e83a 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java b/demo/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java index bff2e3a..69fecdf 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java +++ b/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 { diff --git a/demo/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java b/demo/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java index 25bb72f..5fb713f 100644 --- a/demo/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java +++ b/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 { diff --git a/demo/src/main/resources/3layer-settings.yml b/demo/src/main/resources/3layer-settings.yml index df3bbec..acd2b31 100644 --- a/demo/src/main/resources/3layer-settings.yml +++ b/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 diff --git a/src/test/resources/3layer-settings-jakarta.yml b/src/test/resources/3layer-settings-jakarta.yml index 6b9fb4c..8881d94 100644 --- a/src/test/resources/3layer-settings-jakarta.yml +++ b/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 \ No newline at end of file diff --git a/src/test/resources/3layer-settings.yml b/src/test/resources/3layer-settings.yml index 6a3bf86..b6b9522 100644 --- a/src/test/resources/3layer-settings.yml +++ b/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 \ No newline at end of file