mindol1004/Layer3Gen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes after merge PR. Restored find by example, removed comment, changed read in find method.

Browse Source
This commit is contained in:
Gaetano_Piazzolla
2023-02-26 16:10:19 +01:00
parent a671902f8c
commit 37ace5d851
53 changed files with 171 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@RestController
@RequestMapping("/book/")
@@ -32,16 +32,17 @@ public class BookController implements CrudController<Book,java.lang.Integer>{
}
@Override
public ResponseEntity<Page<Book>> read(
public ResponseEntity<Page<Book>> find(
@RequestBody Book entity,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
return ResponseEntity.ok(service.read(pageable));
return ResponseEntity.ok(service.find(entity,pageable));
}
@Override
public ResponseEntity<Book> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.readOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
public ResponseEntity<Book> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.getOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
}
@Override

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@RestController
@RequestMapping("/book-dto/")
@@ -41,17 +41,19 @@ public class BookControllerDTO implements CrudController<BookDTO,java.lang.Integ
}
@Override
public ResponseEntity<Page<BookDTO>> read(
public ResponseEntity<Page<BookDTO>> find(
@RequestBody BookDTO dto,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
Page<BookDTO> pages = service.read(pageable).map(mapper::toDto);
Book entity = mapper.toEntity(dto);
Page<BookDTO> pages = service.find(entity, pageable).map(mapper::toDto);
return ResponseEntity.ok(pages);
}
@Override
public ResponseEntity<BookDTO> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Book> entity = service.readOne(primaryKey);
public ResponseEntity<BookDTO> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Book> entity = service.getOne(primaryKey);
return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build());
}

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

@@ -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 22, 2023, 1:38:02 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
public interface CrudController<O,P>{
@@ -18,11 +18,11 @@ public interface CrudController<O,P>{
@PutMapping
ResponseEntity<O> update(O object);
@GetMapping("list")
ResponseEntity<Page<O>> read(Integer page, Integer size);
@PostMapping("find")
ResponseEntity<Page<O>> find(O object, Integer page, Integer size);
@GetMapping("{id}")
ResponseEntity<O> readOne(P primaryKey);
ResponseEntity<O> getOne(P primaryKey);
@DeleteMapping
void delete(P primaryKey);

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@RestController
@RequestMapping("/order/")
@@ -32,16 +32,17 @@ public class OrderController implements CrudController<Order,java.lang.Integer>{
}
@Override
public ResponseEntity<Page<Order>> read(
public ResponseEntity<Page<Order>> find(
@RequestBody Order entity,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
return ResponseEntity.ok(service.read(pageable));
return ResponseEntity.ok(service.find(entity,pageable));
}
@Override
public ResponseEntity<Order> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.readOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
public ResponseEntity<Order> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.getOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
}
@Override

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@RestController
@RequestMapping("/order-dto/")
@@ -41,17 +41,19 @@ public class OrderControllerDTO implements CrudController<OrderDTO,java.lang.Int
}
@Override
public ResponseEntity<Page<OrderDTO>> read(
public ResponseEntity<Page<OrderDTO>> find(
@RequestBody OrderDTO dto,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
Page<OrderDTO> pages = service.read(pageable).map(mapper::toDto);
Order entity = mapper.toEntity(dto);
Page<OrderDTO> pages = service.find(entity, pageable).map(mapper::toDto);
return ResponseEntity.ok(pages);
}
@Override
public ResponseEntity<OrderDTO> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Order> entity = service.readOne(primaryKey);
public ResponseEntity<OrderDTO> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Order> entity = service.getOne(primaryKey);
return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build());
}

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@RestController
@RequestMapping("/user/")
@@ -32,16 +32,17 @@ public class UserController implements CrudController<User,java.lang.Integer>{
}
@Override
public ResponseEntity<Page<User>> read(
public ResponseEntity<Page<User>> find(
@RequestBody User entity,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
return ResponseEntity.ok(service.read(pageable));
return ResponseEntity.ok(service.find(entity,pageable));
}
@Override
public ResponseEntity<User> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.readOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
public ResponseEntity<User> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.getOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
}
@Override

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@RestController
@RequestMapping("/user-dto/")
@@ -41,17 +41,19 @@ public class UserControllerDTO implements CrudController<UserDTO,java.lang.Integ
}
@Override
public ResponseEntity<Page<UserDTO>> read(
public ResponseEntity<Page<UserDTO>> find(
@RequestBody UserDTO dto,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
Page<UserDTO> pages = service.read(pageable).map(mapper::toDto);
User entity = mapper.toEntity(dto);
Page<UserDTO> pages = service.find(entity, pageable).map(mapper::toDto);
return ResponseEntity.ok(pages);
}
@Override
public ResponseEntity<UserDTO> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<User> entity = service.readOne(primaryKey);
public ResponseEntity<UserDTO> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<User> entity = service.getOne(primaryKey);
return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build());
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@ import org.springframework.data.domain.Pageable;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:02 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
public interface CrudService<E, P> {
@@ -13,9 +13,9 @@ public interface CrudService<E, P> {
E update(E entity);
Page<E> read(Pageable pageable);
Page<E> find(E entity, Pageable pageable);
Optional<E> readOne(P primaryKey);
Optional<E> getOne(P primaryKey);
void delete(P primaryKey);

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

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

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

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

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@Service
public class BookServiceBean implements BookService {
@@ -31,12 +31,13 @@ public class BookServiceBean implements BookService {
}
@Override
public Page<Book> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<Book> find(Book entity, Pageable pageable) {
Example<Book> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<Book> readOne(java.lang.Integer primaryKey) {
public Optional<Book> getOne(java.lang.Integer primaryKey) {
return repository.findById(primaryKey);
}

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@Service
public class OrderServiceBean implements OrderService {
@@ -31,12 +31,13 @@ public class OrderServiceBean implements OrderService {
}
@Override
public Page<Order> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<Order> find(Order entity, Pageable pageable) {
Example<Order> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<Order> readOne(java.lang.Integer primaryKey) {
public Optional<Order> getOne(java.lang.Integer primaryKey) {
return repository.findById(primaryKey);
}

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 22, 2023, 1:38:03 PM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:20 PM
*/
@Service
public class UserServiceBean implements UserService {
@@ -31,12 +31,13 @@ public class UserServiceBean implements UserService {
}
@Override
public Page<User> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<User> find(User entity, Pageable pageable) {
Example<User> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<User> readOne(java.lang.Integer primaryKey) {
public Optional<User> getOne(java.lang.Integer primaryKey) {
return repository.findById(primaryKey);
}

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

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

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

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

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

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

11
demo/src/main/java/com/example/demo/controller/BookController.java
View File

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@RestController
@RequestMapping("/book/")
@@ -32,16 +32,17 @@ public class BookController implements CrudController<Book,java.lang.Integer>{
}
@Override
public ResponseEntity<Page<Book>> read(
public ResponseEntity<Page<Book>> find(
@RequestBody Book entity,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
return ResponseEntity.ok(service.read(pageable));
return ResponseEntity.ok(service.find(entity,pageable));
}
@Override
public ResponseEntity<Book> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.readOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
public ResponseEntity<Book> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.getOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
}
@Override

12
demo/src/main/java/com/example/demo/controller/BookControllerDTO.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@RestController
@RequestMapping("/book-dto/")
@@ -41,17 +41,19 @@ public class BookControllerDTO implements CrudController<BookDTO,java.lang.Integ
}
@Override
public ResponseEntity<Page<BookDTO>> read(
public ResponseEntity<Page<BookDTO>> find(
@RequestBody BookDTO dto,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
Page<BookDTO> pages = service.read(pageable).map(mapper::toDto);
Book entity = mapper.toEntity(dto);
Page<BookDTO> pages = service.find(entity, pageable).map(mapper::toDto);
return ResponseEntity.ok(pages);
}
@Override
public ResponseEntity<BookDTO> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Book> entity = service.readOne(primaryKey);
public ResponseEntity<BookDTO> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Book> entity = service.getOne(primaryKey);
return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build());
}

8
demo/src/main/java/com/example/demo/controller/CrudController.java
View File

@@ -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 21, 2023, 7:59:17 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:33 PM
*/
public interface CrudController<O,P>{
@@ -18,11 +18,11 @@ public interface CrudController<O,P>{
@PutMapping
ResponseEntity<O> update(O object);
@GetMapping("list")
ResponseEntity<Page<O>> read(Integer page, Integer size);
@PostMapping("find")
ResponseEntity<Page<O>> find(O object, Integer page, Integer size);
@GetMapping("{id}")
ResponseEntity<O> readOne(P primaryKey);
ResponseEntity<O> getOne(P primaryKey);
@DeleteMapping
void delete(P primaryKey);

11
demo/src/main/java/com/example/demo/controller/OrderController.java
View File

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@RestController
@RequestMapping("/order/")
@@ -32,16 +32,17 @@ public class OrderController implements CrudController<Order,java.lang.Integer>{
}
@Override
public ResponseEntity<Page<Order>> read(
public ResponseEntity<Page<Order>> find(
@RequestBody Order entity,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
return ResponseEntity.ok(service.read(pageable));
return ResponseEntity.ok(service.find(entity,pageable));
}
@Override
public ResponseEntity<Order> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.readOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
public ResponseEntity<Order> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.getOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
}
@Override

12
demo/src/main/java/com/example/demo/controller/OrderControllerDTO.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@RestController
@RequestMapping("/order-dto/")
@@ -41,17 +41,19 @@ public class OrderControllerDTO implements CrudController<OrderDTO,java.lang.Int
}
@Override
public ResponseEntity<Page<OrderDTO>> read(
public ResponseEntity<Page<OrderDTO>> find(
@RequestBody OrderDTO dto,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
Page<OrderDTO> pages = service.read(pageable).map(mapper::toDto);
Order entity = mapper.toEntity(dto);
Page<OrderDTO> pages = service.find(entity, pageable).map(mapper::toDto);
return ResponseEntity.ok(pages);
}
@Override
public ResponseEntity<OrderDTO> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Order> entity = service.readOne(primaryKey);
public ResponseEntity<OrderDTO> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<Order> entity = service.getOne(primaryKey);
return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build());
}

11
demo/src/main/java/com/example/demo/controller/UserController.java
View File

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@RestController
@RequestMapping("/user/")
@@ -32,16 +32,17 @@ public class UserController implements CrudController<User,java.lang.Integer>{
}
@Override
public ResponseEntity<Page<User>> read(
public ResponseEntity<Page<User>> find(
@RequestBody User entity,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
return ResponseEntity.ok(service.read(pageable));
return ResponseEntity.ok(service.find(entity,pageable));
}
@Override
public ResponseEntity<User> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.readOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
public ResponseEntity<User> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
return service.getOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
}
@Override

12
demo/src/main/java/com/example/demo/controller/UserControllerDTO.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@RestController
@RequestMapping("/user-dto/")
@@ -41,17 +41,19 @@ public class UserControllerDTO implements CrudController<UserDTO,java.lang.Integ
}
@Override
public ResponseEntity<Page<UserDTO>> read(
public ResponseEntity<Page<UserDTO>> find(
@RequestBody UserDTO dto,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
Page<UserDTO> pages = service.read(pageable).map(mapper::toDto);
User entity = mapper.toEntity(dto);
Page<UserDTO> pages = service.find(entity, pageable).map(mapper::toDto);
return ResponseEntity.ok(pages);
}
@Override
public ResponseEntity<UserDTO> readOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<User> entity = service.readOne(primaryKey);
public ResponseEntity<UserDTO> getOne(@PathVariable("id") java.lang.Integer primaryKey) {
Optional<User> entity = service.getOne(primaryKey);
return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build());
}

2
demo/src/main/java/com/example/demo/controller/dto/BookDTO.java
View File

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

2
demo/src/main/java/com/example/demo/controller/dto/OrderDTO.java
View File

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

2
demo/src/main/java/com/example/demo/controller/dto/UserDTO.java
View File

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

2
demo/src/main/java/com/example/demo/repository/BookRepository.java
View File

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

2
demo/src/main/java/com/example/demo/repository/OrderRepository.java
View File

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

2
demo/src/main/java/com/example/demo/repository/UserRepository.java
View File

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

2
demo/src/main/java/com/example/demo/serviceInterface/BookService.java
View File

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

6
demo/src/main/java/com/example/demo/serviceInterface/CrudService.java
View File

@@ -5,7 +5,7 @@ import org.springframework.data.domain.Pageable;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 7:59:17 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:33 PM
*/
public interface CrudService<E, P> {
@@ -13,9 +13,9 @@ public interface CrudService<E, P> {
E update(E entity);
Page<E> read(Pageable pageable);
Page<E> find(E entity, Pageable pageable);
Optional<E> readOne(P primaryKey);
Optional<E> getOne(P primaryKey);
void delete(P primaryKey);

2
demo/src/main/java/com/example/demo/serviceInterface/OrderService.java
View File

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

2
demo/src/main/java/com/example/demo/serviceInterface/UserService.java
View File

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

9
demo/src/main/java/com/example/demo/serviceInterface/impl/BookServiceBean.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@Service
public class BookServiceBean implements BookService {
@@ -31,12 +31,13 @@ public class BookServiceBean implements BookService {
}
@Override
public Page<Book> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<Book> find(Book entity, Pageable pageable) {
Example<Book> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<Book> readOne(java.lang.Integer primaryKey) {
public Optional<Book> getOne(java.lang.Integer primaryKey) {
return repository.findById(primaryKey);
}

9
demo/src/main/java/com/example/demo/serviceInterface/impl/OrderServiceBean.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@Service
public class OrderServiceBean implements OrderService {
@@ -31,12 +31,13 @@ public class OrderServiceBean implements OrderService {
}
@Override
public Page<Order> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<Order> find(Order entity, Pageable pageable) {
Example<Order> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<Order> readOne(java.lang.Integer primaryKey) {
public Optional<Order> getOne(java.lang.Integer primaryKey) {
return repository.findById(primaryKey);
}

9
demo/src/main/java/com/example/demo/serviceInterface/impl/UserServiceBean.java
View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
import java.util.Optional;
/**
* Generated by Springboot-3layer-Generator at Feb 21, 2023, 6:23:13 AM
* Generated by Springboot-3layer-Generator at Feb 26, 2023, 4:08:34 PM
*/
@Service
public class UserServiceBean implements UserService {
@@ -31,12 +31,13 @@ public class UserServiceBean implements UserService {
}
@Override
public Page<User> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<User> find(User entity, Pageable pageable) {
Example<User> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<User> readOne(java.lang.Integer primaryKey) {
public Optional<User> getOne(java.lang.Integer primaryKey) {
return repository.findById(primaryKey);
}

2
demo/src/main/java/com/example/demo/serviceInterface/mapper/BookMapper.java
View File

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

2
demo/src/main/java/com/example/demo/serviceInterface/mapper/OrderMapper.java
View File

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

2
demo/src/main/java/com/example/demo/serviceInterface/mapper/UserMapper.java
View File

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

6
src/main/java/gae/piaz/layer3gen/CodeGenerator.java
View File

@@ -20,11 +20,7 @@ import java.util.Set;
@Slf4j
public class CodeGenerator {
// Utility class such CodeGenerator that have all method as static should have private constructor
// Code smell : java:S1118
private CodeGenerator() {
throw new IllegalStateException("Utility class");
}
private CodeGenerator() { }
private static CodeGeneratorConfig config;

9
src/main/resources/controller.ftl
View File

@@ -32,16 +32,17 @@ public class ${entityClass}Controller implements CrudController<${entityClass},$
}
@Override
public ResponseEntity<Page<${entityClass}>> read(
public ResponseEntity<Page<${entityClass}>> find(
@RequestBody ${entityClass} entity,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
return ResponseEntity.ok(service.read(pageable));
return ResponseEntity.ok(service.find(entity,pageable));
}
@Override
public ResponseEntity<${entityClass}> readOne(@PathVariable("id") ${primaryKeyClass} primaryKey) {
return service.readOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
public ResponseEntity<${entityClass}> getOne(@PathVariable("id") ${primaryKeyClass} primaryKey) {
return service.getOne(primaryKey).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
}
@Override

10
src/main/resources/controllerdto.ftl
View File

@@ -41,17 +41,19 @@ public class ${entityClass}ControllerDTO implements CrudController<${entityClass
}
@Override
public ResponseEntity<Page<${entityClass}DTO>> read(
public ResponseEntity<Page<${entityClass}DTO>> find(
@RequestBody ${entityClass}DTO dto,
@RequestParam("page") Integer page,
@RequestParam("size") Integer size) {
Pageable pageable = PageRequest.of(page,size);
Page<${entityClass}DTO> pages = service.read(pageable).map(mapper::toDto);
${entityClass} entity = mapper.toEntity(dto);
Page<${entityClass}DTO> pages = service.find(entity, pageable).map(mapper::toDto);
return ResponseEntity.ok(pages);
}
@Override
public ResponseEntity<${entityClass}DTO> readOne(@PathVariable("id") ${primaryKeyClass} primaryKey) {
Optional<${entityClass}> entity = service.readOne(primaryKey);
public ResponseEntity<${entityClass}DTO> getOne(@PathVariable("id") ${primaryKeyClass} primaryKey) {
Optional<${entityClass}> entity = service.getOne(primaryKey);
return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build());
}

6
src/main/resources/crudcontroller.ftl
View File

@@ -18,11 +18,11 @@ public interface CrudController<O,P>{
@PutMapping
ResponseEntity<O> update(O object);
@GetMapping("list")
ResponseEntity<Page<O>> read(Integer page, Integer size);
@PostMapping("find")
ResponseEntity<Page<O>> find(O object, Integer page, Integer size);
@GetMapping("{id}")
ResponseEntity<O> readOne(P primaryKey);
ResponseEntity<O> getOne(P primaryKey);
@DeleteMapping
void delete(P primaryKey);

4
src/main/resources/crudservice.ftl
View File

@@ -13,9 +13,9 @@ public interface CrudService<E, P> {
E update(E entity);
Page<E> read(Pageable pageable);
Page<E> find(E entity, Pageable pageable);
Optional<E> readOne(P primaryKey);
Optional<E> getOne(P primaryKey);
void delete(P primaryKey);

7
src/main/resources/service.ftl
View File

@@ -30,12 +30,13 @@ public class ${entityClass}Service implements CrudService<${entityClass},${prima
}
@Override
public Page<${entityClass}> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<${entityClass}> find(${entityClass} entity, Pageable pageable) {
Example<${entityClass}> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<${entityClass}> readOne(${primaryKeyClass} primaryKey) {
public Optional<${entityClass}> getOne(${primaryKeyClass} primaryKey) {
return repository.findById(primaryKey);
}

7
src/main/resources/serviceBean.ftl
View File

@@ -31,12 +31,13 @@ public class ${entityClass}ServiceBean implements ${entityClass}Service {
}
@Override
public Page<${entityClass}> read(Pageable pageable) {
return repository.findAll(pageable);
public Page<${entityClass}> find(${entityClass} entity, Pageable pageable) {
Example<${entityClass}> example = Example.of(entity);
return repository.findAll(example,pageable);
}
@Override
public Optional<${entityClass}> readOne(${primaryKeyClass} primaryKey) {
public Optional<${entityClass}> getOne(${primaryKeyClass} primaryKey) {
return repository.findById(primaryKey);
}