diff --git a/README.md b/README.md index b04f9fe..3dfdd2e 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,13 @@ Generates the standard SPRING 3 layer CRUD architecture starting from JPA entiti ## How to run as gradle plugin: 1. Add the plugin in your build.gradle; +```groovy +plugins { + id "gae.piaz.layer3gen" version "1.9" +} +``` +or you can use gradle [legacy plugin](https://docs.gradle.org/current/userguide/plugins.html#sec:old_plugin_application) for older gradle versions: + ```groovy buildscript { dependencies { @@ -22,13 +29,7 @@ buildscript { // ... apply plugin: 'gae.piaz.layer3gen' ``` -or for gradle version above 2.1 -```groovy -plugins { - 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/; 3. Run the gradle task. @@ -87,12 +88,13 @@ public class BooksService implements CrudService { } @Override - public Page read(Pageable pageable) { - return repository.findAll(pageable); + public Page find(Books entity, Pageable pageable) { + Example example = Example.of(entity); + return repository.findAll(example,pageable); } @Override - public Optional readOne(java.lang.Integer primaryKey) { + public Optional getOne(java.lang.Integer primaryKey) { return repository.findById(primaryKey); } @@ -129,17 +131,19 @@ public class BooksControllerDTO implements CrudController> read( + public ResponseEntity> find( + @RequestBody BooksDTO dto, @RequestParam("page") Integer page, @RequestParam("size") Integer size) { Pageable pageable = PageRequest.of(page,size); - Page pages = service.read(pageable).map(mapper::toDto); + Books entity = mapper.toEntity(dto); + Page pages = service.find(entity, pageable).map(mapper::toDto); return ResponseEntity.ok(pages); } @Override - public ResponseEntity readOne(@PathVariable("id") java.lang.Integer primaryKey) { - Optional entity = service.readOne(primaryKey); + public ResponseEntity getOne(@PathVariable("id") java.lang.Integer primaryKey) { + Optional entity = service.getOne(primaryKey); return entity.map(e -> ResponseEntity.ok(mapper.toDto(e))).orElseGet(() -> ResponseEntity.notFound().build()); } diff --git a/demo-jakarta/build.gradle.kts b/demo-jakarta/build.gradle.kts index 959bc87..fd20366 100644 --- a/demo-jakarta/build.gradle.kts +++ b/demo-jakarta/build.gradle.kts @@ -1,8 +1,4 @@ - buildscript { - dependencies { - classpath("gae.piaz:layer3gen:1.9") - } repositories { mavenCentral() } @@ -11,9 +7,10 @@ buildscript { plugins { java id("org.springframework.boot") version "3.0.0" + id("gae.piaz.layer3gen") version "1.9" } + apply(plugin = "io.spring.dependency-management") -apply(plugin = "gae.piaz.layer3gen") repositories { mavenLocal() diff --git a/demo-jakarta/src/main/resources/3layer-settings.yml b/demo-jakarta/src/main/resources/3layer-settings.yml index 7c888ba..d7df22a 100644 --- a/demo-jakarta/src/main/resources/3layer-settings.yml +++ b/demo-jakarta/src/main/resources/3layer-settings.yml @@ -1,4 +1,4 @@ -projectPath: /home/workspace/demo-jackarta +projectPath: ./ outputDirectory : src/main/java options: dtoLayer : true diff --git a/demo/build.gradle b/demo/build.gradle index a63a15b..7b05791 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,8 +1,5 @@ buildscript { - dependencies { - classpath "gae.piaz:layer3gen:1.9" - } repositories { mavenCentral() } @@ -11,6 +8,7 @@ plugins { id 'org.springframework.boot' version '2.3.4.RELEASE' id 'io.spring.dependency-management' version '1.0.10.RELEASE' id 'java' + id "gae.piaz.layer3gen" version "1.9" } repositories { @@ -37,5 +35,3 @@ dependencies { test { useJUnitPlatform() } - -apply plugin: 'gae.piaz.layer3gen' \ No newline at end of file diff --git a/demo/src/main/resources/3layer-settings.yml b/demo/src/main/resources/3layer-settings.yml index acd2b31..d7df22a 100644 --- a/demo/src/main/resources/3layer-settings.yml +++ b/demo/src/main/resources/3layer-settings.yml @@ -1,4 +1,4 @@ -projectPath: /home/workspace/demo +projectPath: ./ outputDirectory : src/main/java options: dtoLayer : true