lombok and log4j2 implemented, refactoring and readme updated

Author: cemserit

README.md

@@ -14,4 +14,8 @@ git clone https://github.com/cemserit/spring-data-examples.git
 ### Run Redis 
 ```
 ./gradlew :spring-data-redis:bootRun
+```
+### Swagger UI
+```
+http://localhost:8080/swagger-ui.html
 ```

build.gradle

@@ -1,7 +1,8 @@
 buildscript {
     ext {
-        springBootVersion = '2.0.1.RELEASE'
+        springBootVersion = '2.0.4.RELEASE'
         swaggerVersion = '2.9.2'
+        lombokVersion = '1.18.2'
     }
     repositories {
         mavenCentral()
@@ -29,8 +30,17 @@ subprojects {
 
     sourceCompatibility = 1.8
 
+    configurations {
+        all {
+            exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging'
+        }
+    }
+
     dependencies {
+        compile 'org.springframework.boot:spring-boot-starter-log4j2'
+
         compile "io.springfox:springfox-swagger2:${swaggerVersion}"
         compile "io.springfox:springfox-swagger-ui:${swaggerVersion}"
+        compileOnly group: 'org.projectlombok', name: 'lombok', version: "${lombokVersion}"
     }
 }

core-library/src/main/java/com/cemserit/core/constant/ControllerConstant.java

@@ -1,8 +1,5 @@
 package com.cemserit.core.constant;
 
-/**
- * Created by cemserit on 21.08.2018.
- */
 public final class ControllerConstant {
     public static final String MESSAGE_KEY = "message";
     public static final String ERROR_KEY = "error";
@@ -22,4 +19,7 @@ public final class ControllerConstant {
     public static final String PERSON_EMAIL_CANNOT_NULL_EMPTY_ERROR = "person_email_cannot_null_empty";
     public static final String PERSON_EMAIL_CANNOT_NULL_EMPTY_ERROR_DESCRIPTION = "Person email cannot be null or empty!";
 
+    public static final String PERSON_UUID_CANNOT_NULL_ERROR = "person_uuid_cannot_null";
+    public static final String PERSON_UUID_CANNOT_NULL_ERROR_DESCRIPTION = "Person uuid cannot be null!";
+
 }

core-library/src/main/java/com/cemserit/core/controller/AbstractController.java

@@ -9,6 +9,7 @@
 
 import static com.cemserit.core.constant.ControllerConstant.*;
 
+@SuppressWarnings("unchecked")
 public abstract class AbstractController {
 
     protected ResponseEntity<Object> createResponse(final String message, final HttpStatus httpStatus) {

spring-data-cassandra/README.md

@@ -16,6 +16,10 @@ for more details [cassandra.apache.org](http://cassandra.apache.org) <br>
 ```
 sudo docker run --name dev-cassandra -p 7000:7000 -p 7001:7001 -p 9160:9160 -p 9042:9042 -d cassandra:3.11.2
 ```
+##### Cassandra cqlsh
+```
+docker exec -it __CONTAINER_ID__ cqlsh
+```
 ## Examples
 ### Save person
 ```
@@ -54,20 +58,15 @@ curl -X GET \
 ### Get person (find by age)
 ```
 curl -X GET \
-  http://localhost:8080/persons/custom_param?age=27
+  http://localhost:8080/persons?age=27
 ```
 ### Get person (find by email and age)
 ```
 curl -X GET \
-  http://localhost:8080/persons/custom_params[email protected]&age=27
+  http://localhost:8080/[email protected]&age=27
 ```
 ### Delete person
 ```
 curl -X DELETE \
   http://localhost:8080/persons/8781d82d-08bc-4148-b00f-4ad7750b4934
-```
-### Delete all person
-```
-curl -X DELETE \
-  http://localhost:8080/persons
 ```

spring-data-cassandra/src/main/java/com/cemserit/cassandra/configuration/CasssandraConfig.java

@@ -5,7 +5,7 @@
 import org.springframework.data.cassandra.config.AbstractCassandraConfiguration;
 import org.springframework.data.cassandra.config.SchemaAction;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 @Configuration
@@ -28,7 +28,7 @@ protected List<String> getStartupScripts() {
                         + "AND replication = { 'replication_factor' : %s, 'class' : '%s' };",
                 keyspaceName, durableWrites, replicationFactor, replicationClass);
 
-        return Arrays.asList(script);
+        return Collections.singletonList(script);
     }
 
     @Override

spring-data-cassandra/src/main/java/com/cemserit/cassandra/controller/PersonController.java

@@ -2,75 +2,117 @@
 
 import com.cemserit.cassandra.model.Person;
 import com.cemserit.cassandra.service.PersonService;
+import com.cemserit.core.constant.ControllerConstant;
+import com.cemserit.core.controller.AbstractController;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Collections;
+import java.util.Optional;
 import java.util.UUID;
 
+import static com.cemserit.core.constant.ControllerConstant.*;
+
 @RestController
 @RequestMapping(value = "/persons", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-@Api(value = "Person Controller Api", tags = {"person Controller"})
-public class PersonController {
+@Api(value = "Person Controller Api", tags = {"Person Controller"})
+public class PersonController extends AbstractController {
 
     @Autowired
     private PersonService personService;
 
     @GetMapping("/{uuid}")
     public ResponseEntity<Object> getPerson(@PathVariable UUID uuid) {
-        return new ResponseEntity<>(personService.getPerson(uuid), HttpStatus.OK);
+        Optional<Person> personOptional = personService.getPerson(uuid);
+
+        if (!personOptional.isPresent())
+            return createErrorResponse(PERSON_NOT_FOUND_ERROR,
+                    ControllerConstant.PERSON_NOT_FOUND_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
+
+        return createResponse(personOptional.get(), HttpStatus.OK);
     }
 
-    @GetMapping("/custom_param")
-    public ResponseEntity<Object> getPersons(@RequestParam("age") int age) {
-        return new ResponseEntity<>(personService.getPerson(age), HttpStatus.OK);
+    @GetMapping(params = "age")
+    public ResponseEntity<Object> getPersonsByAge(@RequestParam("age") int age) {
+        return createResponse(personService.getPerson(age), HttpStatus.OK);
     }
 
-    @GetMapping("/custom_params")
-    public ResponseEntity<Object> getPerson(@RequestParam("email") String email,
-                                            @RequestParam("age") int age) {
-        return new ResponseEntity<>(personService.getPerson(email, age), HttpStatus.OK);
+    @GetMapping(params = {"email", "age"})
+    public ResponseEntity<Object> getPersonsByEmailAndAge(@RequestParam("email") String email,
+                                                          @RequestParam("age") int age) {
+        return createResponse(personService.getPerson(email, age), HttpStatus.OK);
     }
 
     @GetMapping
     public ResponseEntity<Object> getPersons() {
-        return new ResponseEntity<>(personService.getPersons(), HttpStatus.OK);
+        return createResponse(personService.getPersons(), HttpStatus.OK);
     }
 
     @PostMapping
     public ResponseEntity<Object> savePerson(@RequestBody Person person) {
-        personService.savePerson(person);
-        String message = "Person[" + person.getName() + "] saved";
 
-        return new ResponseEntity<>(Collections.singletonMap("message", message), HttpStatus.OK);
+        if (person == null)
+            return createErrorResponse(PERSON_CANNOT_NULL_ERROR,
+                    ControllerConstant.PERSON_ALREADY_EXITS_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
+
+        if (person.getUuid() == null)
+            return createErrorResponse(PERSON_UUID_CANNOT_NULL_ERROR,
+                    ControllerConstant.PERSON_UUID_CANNOT_NULL_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
+
+        Optional<Person> personOptional = personService.getPerson(person.getUuid());
+
+        if (personOptional.isPresent())
+            return createErrorResponse(PERSON_ALREADY_EXITS_ERROR,
+                    ControllerConstant.PERSON_ALREADY_EXITS_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
+
+        personService.savePerson(person);
+        return createResponse(person, HttpStatus.OK);
     }
 
     @PutMapping("/{uuid}")
     public ResponseEntity<Object> updatePerson(@RequestBody Person person,
                                                @PathVariable UUID uuid) {
-        boolean result = personService.updatePerson(uuid, person);
-        String message = result ? "Person[" + person.getName() + "] updated" :
-                "Person[" + person.getName() + "] cannot be found";
+        if (uuid == null)
+            return createErrorResponse(PERSON_UUID_CANNOT_NULL_ERROR,
+                    ControllerConstant.PERSON_UUID_CANNOT_NULL_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
+
+        Optional<Person> personOptional = personService.getPerson(uuid);
 
-        return new ResponseEntity<>(Collections.singletonMap("message", message), HttpStatus.OK);
+        if (!personOptional.isPresent())
+            return createErrorResponse(PERSON_NOT_FOUND_ERROR,
+                    ControllerConstant.PERSON_NOT_FOUND_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
+
+        person.setUuid(uuid);
+        personService.savePerson(person);
+        return createResponse(person, HttpStatus.OK);
     }
 
     @DeleteMapping("/{uuid}")
     public ResponseEntity<Object> deletePerson(@PathVariable UUID uuid) {
-        boolean result = personService.deletePerson(uuid);
-        String message = result ? "Person[" + uuid + "] deleted" : "Person[" + uuid + "] cannot be found";
 
-        return new ResponseEntity<>(Collections.singletonMap("message", message), HttpStatus.OK);
-    }
+        if (uuid == null)
+            return createErrorResponse(PERSON_UUID_CANNOT_NULL_ERROR,
+                    ControllerConstant.PERSON_UUID_CANNOT_NULL_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
 
-    @DeleteMapping
-    public ResponseEntity<Object> deleteAllPerson() {
-        personService.deletePersons();
-        return new ResponseEntity<>(Collections.singletonMap("message", "Persons deleted"), HttpStatus.OK);
-    }
+        Optional<Person> personOptional = personService.getPerson(uuid);
 
+        if (!personOptional.isPresent())
+            return createErrorResponse(PERSON_NOT_FOUND_ERROR,
+                    ControllerConstant.PERSON_NOT_FOUND_ERROR_DESCRIPTION,
+                    HttpStatus.BAD_REQUEST);
+
+        personService.deletePerson(uuid);
+        String message = String.format("Person[%s] deleted.", personOptional.get().getName());
+        return createResponse(message, HttpStatus.OK);
+    }
 }

spring-data-cassandra/src/main/java/com/cemserit/cassandra/model/Person.java

@@ -1,6 +1,10 @@
 package com.cemserit.cassandra.model;
 
 import com.datastax.driver.core.DataType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.springframework.data.cassandra.core.cql.PrimaryKeyType;
 import org.springframework.data.cassandra.core.mapping.CassandraType;
 import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn;
@@ -9,6 +13,10 @@
 import java.util.UUID;
 
 @Table("person")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class Person {
 
     @CassandraType(type = DataType.Name.UUID)
@@ -17,56 +25,4 @@ public class Person {
     private String email;
     private String name;
     private int age;
-
-    public Person() {
-    }
-
-    public Person(UUID uuid, String email, String name, int age) {
-        this.uuid = uuid;
-        this.email = email;
-        this.name = name;
-        this.age = age;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    @Override
-    public String toString() {
-        return "Person{" +
-                "uuid=" + uuid +
-                ", email='" + email + '\'' +
-                ", name='" + name + '\'' +
-                ", age=" + age +
-                '}';
-    }
 }

spring-data-cassandra/src/main/java/com/cemserit/cassandra/repository/PersonRepository.java

@@ -5,9 +5,9 @@
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.stream.Stream;
 
 public interface PersonRepository extends CrudRepository<Person, UUID> {
 
@@ -18,9 +18,9 @@ public interface PersonRepository extends CrudRepository<Person, UUID> {
     Optional<Person> findByUuid(UUID uuid);
 
     @Query(allowFiltering = true)
-    Optional<Person> findByEmailAndAge(String email, int age);
+    List<Person> findByEmailAndAge(String email, int age);
 
     // Custom query
     @Query("SELECT * FROM PERSON WHERE age=:age ALLOW FILTERING")
-    Stream<Person> findByAgeStream(@Param("age") int age);
+    List<Person> findByAge(@Param("age") int age);
 }