Change entity nam

Author: ardizioa

src/main/java/com/aardizio/client/RestClientExample.java

@@ -1,6 +1,6 @@
 package com.aardizio.client;
 
-import com.aardizio.model.Hotels;
+import com.aardizio.model.Hotel;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -25,16 +25,16 @@ public class RestClientExample {
  @Qualifier("hotelWebClient")
  private WebClient hotelWebClient;
 
- public Flux<Hotels> send() {
+ public Flux<Hotel> getAllHotels(){
 
- Flux<Hotels> hotels = hotelWebClient.get()
+ Flux<Hotel> hotels = hotelWebClient.get()
  .uri("/hotels")
  .accept(MediaType.APPLICATION_JSON)
  .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON.toString())
  .retrieve()
  .onStatus(HttpStatus::is4xxClientError, RestClientErrorHandler::handle)
  .onStatus(HttpStatus::is5xxServerError, RestClientErrorHandler::handle)
- .bodyToFlux(Hotels.class);
+ .bodyToFlux(Hotel.class);
  return hotels;
  }
 

…main/java/com/aardizio/model/Hotels.java …/main/java/com/aardizio/model/Hotel.javasrc/main/java/com/aardizio/model/Hotels.java renamed to src/main/java/com/aardizio/model/Hotel.java src/main/java/com/aardizio/model/Hotels.java renamed to src/main/java/com/aardizio/model/Hotel.java

@@ -6,8 +6,8 @@
 import com.datastax.driver.mapping.annotations.PartitionKey;
 import com.datastax.driver.mapping.annotations.Table;
 
-@Table(keyspace = "hotel", name = "hotels")
-public class Hotels {
+@Table(keyspace = "hotel", name = "hotel")
+public class Hotel {
 
 @PartitionKey
 private String uuid;

src/main/java/com/aardizio/repository/ReactiveHotelRepository.java

@@ -12,20 +12,20 @@
  * 
  * @author Alessandro Pio Ardizio
  */
-public interface ReactiveHotelRepository extends ReactiveCrudRepository<Hotels, String> {
+public interface ReactiveHotelRepository extends ReactiveCrudRepository<Hotel, String> {
 
  /**
  * Derived query selecting by {@code lastname}.
  *
  * @param lastname
  * @return
  */
- Mono<Hotels> findByUuid(String id);
+ Mono<Hotel> findByUuid(String id);
 
  /**
  * Delete by uuid.
  */
- @Query("DELETE FROM HOTELS WHERE UUID=?0")
- Mono<Hotels> deleteByUuid(String id);
+ @Query("DELETE FROM HOTEL WHERE UUID=?0")
+ Mono<Hotel> deleteByUuid(String id);
 
 }

src/main/java/com/aardizio/resource/HotelController.java

@@ -1,12 +1,10 @@
 package com.aardizio.resource;
 
 import java.io.IOException;
-import java.util.Collection;
 import java.util.List;
 
-import com.aardizio.client.RestClientErrorHandler;
 import com.aardizio.client.RestClientExample;
-import com.aardizio.model.Hotels;
+import com.aardizio.model.Hotel;
 import com.aardizio.repository.ReactiveHotelRepository;
 import com.datastax.driver.core.ConsistencyLevel;
 import com.datastax.driver.core.Statement;
@@ -64,14 +62,14 @@ public class HotelController {
 
 @GetMapping(value = "/clientExample", produces = { MediaType.APPLICATION_JSON_VALUE }, consumes = {
 MediaType.APPLICATION_JSON_VALUE })
-public @ResponseBody Flux<Hotels> clientExample() {
+public @ResponseBody Flux<Hotel> clientExample() {
 log.info("Client example start");
-return hotelRestClient.send();
+return hotelRestClient.getAllHotels();
 }
 
 @DeleteMapping(value = "/hotels/{id}", produces = { MediaType.APPLICATION_JSON_VALUE }, consumes = {
 MediaType.APPLICATION_JSON_VALUE })
-public Mono<Hotels> delete(@PathVariable String id) {
+public Mono<Hotel> delete(@PathVariable String id) {
 
 tracer.currentSpan().tag("hotelid", id);
 log.info("deleting a journal");
@@ -80,7 +78,7 @@ public Mono<Hotels> delete(@PathVariable String id) {
 
 @PostMapping(value = "/hotels", produces = { MediaType.APPLICATION_JSON_VALUE }, consumes = {
 MediaType.APPLICATION_JSON_VALUE })
-public @ResponseBody Mono<Hotels> create(@RequestBody Hotels hotel) {
+public @ResponseBody Mono<Hotel> create(@RequestBody Hotel hotel) {
 tracer.currentSpan().tag("hotelid", hotel.getId());
 log.info("creating a journal 1");
 
@@ -98,7 +96,7 @@ public Mono<Hotels> delete(@PathVariable String id) {
 
 @GetMapping(value = "/hotels/{uuid}", produces = { MediaType.APPLICATION_JSON_VALUE }, consumes = {
 MediaType.APPLICATION_JSON_VALUE })
-public Mono<Hotels> search(@PathVariable String uuid) {
+public Mono<Hotel> search(@PathVariable String uuid) {
 tracer.currentSpan().tag("hotelid", uuid);
 log.info("Search gas");
 return hotelRepo.findByUuid(uuid);
@@ -109,12 +107,12 @@ public Mono<Hotels> search(@PathVariable String uuid) {
  */
 @GetMapping(value = "/hotels", produces = { MediaType.APPLICATION_JSON_VALUE }, consumes = {
 MediaType.APPLICATION_JSON_VALUE })
-public Mono<List<Hotels>> getAllRetryProof() {
+public Mono<List<Hotel>> getAllRetryProof() {
 Statement search = QueryBuilder.select()
- .from("hotels")
+ .from("hotel")
  .setConsistencyLevel(ConsistencyLevel.THREE)
  .setRetryPolicy(DowngradingConsistencyRetryPolicy.INSTANCE);
-return reactiveCassandraTemplate.select(search, Hotels.class).collectList();
+return reactiveCassandraTemplate.select(search, Hotel.class).collectList();
 }
 
 @ExceptionHandler

src/main/resources/schema.cql

@@ -1,4 +1,4 @@
- CREATE TABLE hotel.hotels (
+ CREATE TABLE hotel.hotel (
  uuid text PRIMARY KEY,
  name text,
  phone text,