improving service

Author: juan-medina

src/main/java/org/learning/by/example/reactive/microservices/model/SunriseSunsetResult.java

@@ -4,26 +4,42 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public final class SunriseSunsetResult {
-    public final Results results;
-    public final String status;
+    private final Results results;
+    private final String status;
 
     @JsonCreator
     public SunriseSunsetResult(@JsonProperty("results") Results results, @JsonProperty("status") String status){
         this.results = results;
         this.status = status;
     }
 
+    public Results getResults() {
+        return results;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
     public static final class Results {
-        public final String sunrise;
-        public final String sunset;
-        public final String solar_noon;
-        public final String day_length;
-        public final String civil_twilight_begin;
-        public final String civil_twilight_end;
-        public final String nautical_twilight_begin;
-        public final String nautical_twilight_end;
-        public final String astronomical_twilight_begin;
-        public final String astronomical_twilight_end;
+        public String getSunrise() {
+            return sunrise;
+        }
+
+        public String getSunset() {
+            return sunset;
+        }
+
+        final String sunrise;
+        final String sunset;
+        final String solar_noon;
+        final String day_length;
+        final String civil_twilight_begin;
+        final String civil_twilight_end;
+        final String nautical_twilight_begin;
+        final String nautical_twilight_end;
+        final String astronomical_twilight_begin;
+        final String astronomical_twilight_end;
 
         @JsonCreator
         public Results(@JsonProperty("sunrise") String sunrise, @JsonProperty("sunset") String sunset, @JsonProperty("solar_noon") String solar_noon, @JsonProperty("day_length") String day_length, @JsonProperty("civil_twilight_begin") String civil_twilight_begin, @JsonProperty("civil_twilight_end") String civil_twilight_end, @JsonProperty("nautical_twilight_begin") String nautical_twilight_begin, @JsonProperty("nautical_twilight_end") String nautical_twilight_end, @JsonProperty("astronomical_twilight_begin") String astronomical_twilight_begin, @JsonProperty("astronomical_twilight_end") String astronomical_twilight_end){

src/main/java/org/learning/by/example/reactive/microservices/services/SunriseSunsetServiceImpl.java

@@ -13,8 +13,8 @@ public class SunriseSunsetServiceImpl implements SunriseSunsetService{
     private static final String BEGIN_PARAMETERS="?";
     private static final String NEXT_PARAMETER="&";
     private static final String EQUALS="=";
-    private static final String LATITUDE_PARAMETER="lat";
-    private static final String LONGITUDE_PARAMETER="lng";
+    private static final String LATITUDE_PARAMETER="lat"+EQUALS;
+    private static final String LONGITUDE_PARAMETER="lng"+EQUALS;
 
     WebClient webClient;
     private final String endPoint;
@@ -34,11 +34,10 @@ public Mono<SunriseSunset> fromLocation(Mono<Location> location) {
     }
 
     Mono<String> buildUrl(final Mono<Location> locationMono) {
-        return locationMono.flatMap(location -> Mono.just(endPoint
-                .concat(BEGIN_PARAMETERS)
-                .concat(LATITUDE_PARAMETER).concat(EQUALS).concat(Double.toString(location.getLatitude()))
+        return locationMono.flatMap(location -> Mono.just(endPoint.concat(BEGIN_PARAMETERS)
+                .concat(LATITUDE_PARAMETER).concat(Double.toString(location.getLatitude()))
                 .concat(NEXT_PARAMETER)
-                .concat(LONGITUDE_PARAMETER).concat(EQUALS).concat(Double.toString(location.getLongitude()))
+                .concat(LONGITUDE_PARAMETER).concat(Double.toString(location.getLongitude()))
         ));
     }
 
@@ -53,6 +52,7 @@ Mono<SunriseSunsetResult> get(final Mono<String> monoUrl) {
 
     Mono<SunriseSunset> createResult(final Mono<SunriseSunsetResult> sunriseSunsetResultMono){
         return sunriseSunsetResultMono.flatMap(sunriseSunsetResult ->
-                Mono.just(new SunriseSunset(sunriseSunsetResult.results.sunrise, sunriseSunsetResult.results.sunset)));
+                Mono.just(new SunriseSunset(sunriseSunsetResult.getResults().getSunrise(),
+                        sunriseSunsetResult.getResults().getSunset())));
     }
 }

src/test/java/org/learning/by/example/reactive/microservices/services/SunriseSunsetServiceImplTests.java

@@ -5,12 +5,15 @@
 import org.learning.by.example.reactive.microservices.model.Location;
 import org.learning.by.example.reactive.microservices.model.SunriseSunset;
 import org.learning.by.example.reactive.microservices.test.categories.UnitTest;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import reactor.core.publisher.Mono;
 
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.text.IsEmptyString.isEmptyOrNullString;
 
 @UnitTest
 @DisplayName("SunriseSunsetServiceImplTests Unit Tests")
@@ -20,6 +23,11 @@ class SunriseSunsetServiceImplTests {
     private static final double GOOGLE_LNG = -122.0856086;
     private static final Location GOOGLE_LOCATION = new Location(GOOGLE_LAT, GOOGLE_LNG);
     private static final Mono<Location> GOOGLE_LOCATION_MONO = Mono.just(GOOGLE_LOCATION);
+    private static final String GOOGLE_LOCATION_IN_PARAMS = "?lat="+Double.toString(GOOGLE_LAT)+"&lng="+Double.toString(GOOGLE_LNG);
+
+    @Value("${SunriseSunsetServiceImpl.endPoint}")
+    private
+    String endPoint;
 
     @SpyBean(SunriseSunsetService.class)
     private SunriseSunsetServiceImpl sunriseSunsetService;
@@ -34,6 +42,15 @@ void fromLocationTest() {
         SunriseSunset result = GOOGLE_LOCATION_MONO.transform(sunriseSunsetService::fromLocation).block();
 
         assertThat(result, is(notNullValue()));
+        assertThat(result.getSunrise(), not(isEmptyOrNullString()));
+        assertThat(result.getSunset(), not(isEmptyOrNullString()));
     }
 
+    @Test
+    void buildUrlTest() {
+        String url = GOOGLE_LOCATION_MONO.transform(sunriseSunsetService::buildUrl).block();
+
+        assertThat(url, is(notNullValue()));
+        assertThat(url, is(endPoint.concat(GOOGLE_LOCATION_IN_PARAMS)));
+    }
 }