commit modif

address-microservice/src/main/java/fr/natan/addressmicroservice/entity/Address.java

@@ -1,10 +1,5 @@
 package fr.natan.addressmicroservice.entity;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -19,7 +14,7 @@ public class Address {
     private String streetName;
     private String pb;
     private String city;
-    private String residenceCountry;
+    private String country;
 
     public Address() {
     }
@@ -31,7 +26,7 @@ public class Address {
         this.streetName = streetName;
         this.pb = pb;
         this.city = city;
-        this.residenceCountry = residenceCountry;
+        this.country = residenceCountry;
     }
 
     public Long getAddressID() {
@@ -74,11 +69,11 @@ public class Address {
         this.city = city;
     }
 
-    public String getResidenceCountry() {
-        return residenceCountry;
+    public String getCountry() {
+        return country;
     }
 
-    public void setResidenceCountry(String residenceCountry) {
-        this.residenceCountry = residenceCountry;
+    public void setCountry(String country) {
+        this.country = country;
     }
 }

address-microservice/src/main/java/fr/natan/addressmicroservice/service/service/AddressService.java

@@ -24,7 +24,7 @@ public class AddressService  implements AddressContract {
         address.setStreetName(address.getStreetName().strip());
         address.setPb(address.getPb().strip());
         address.setCity(address.getCity().strip());
-        address.setResidenceCountry(address.getResidenceCountry().strip());
+        address.setCountry(address.getCountry().strip());
         return address;
     }
 
@@ -34,7 +34,7 @@ public class AddressService  implements AddressContract {
                 || address.getStreetName().isEmpty()
                 || address.getPb().isEmpty()
                 || address.getCity().isEmpty()
-                || address.getResidenceCountry().isEmpty()
+                || address.getCountry().isEmpty()
         ){
             isInvalid=true;
         }