From 8ce493501e08b25f236dd024daef351d651bf1d1 Mon Sep 17 00:00:00 2001 From: Nemo D'ACREMONT Date: Sat, 9 Nov 2024 18:23:50 +0100 Subject: [PATCH] refactor: change String city to City city --- src/main/java/eirb/pg203/Temperature.java | 6 +++--- src/main/java/eirb/pg203/WeatherAPI.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/eirb/pg203/Temperature.java b/src/main/java/eirb/pg203/Temperature.java index b83cc98..132f69c 100644 --- a/src/main/java/eirb/pg203/Temperature.java +++ b/src/main/java/eirb/pg203/Temperature.java @@ -3,11 +3,11 @@ package eirb.pg203; import java.time.Instant; public class Temperature { - private String city; + private City city; private Instant date; private float temp; - Temperature(float temp, String city, Instant date) { + Temperature(float temp, City city, Instant date) { this.temp = temp; this.city = city; this.date = date; @@ -18,7 +18,7 @@ public class Temperature { * @return city */ public String getCity() { - return city; + return this.city.getCityName(); } /** diff --git a/src/main/java/eirb/pg203/WeatherAPI.java b/src/main/java/eirb/pg203/WeatherAPI.java index bc6e143..a27c677 100644 --- a/src/main/java/eirb/pg203/WeatherAPI.java +++ b/src/main/java/eirb/pg203/WeatherAPI.java @@ -49,7 +49,7 @@ public class WeatherAPI implements WeatherDataAPI{ JSONArray forecast = result.getJSONObject("forecast").getJSONArray("forecastday"); float temp_c = forecast.getJSONObject(day).getJSONObject("day").getFloat("avgtemp_c"); - return new Temperature(temp_c, city, Instant.now()); + return new Temperature(temp_c, new City(city), Instant.now()); } @Override @@ -64,7 +64,7 @@ public class WeatherAPI implements WeatherDataAPI{ for (int day = 0; day < days; ++day) { JSONArray forecast = result.getJSONObject("forecast").getJSONArray("forecastday"); float temp_c = forecast.getJSONObject(day).getJSONObject("day").getFloat("avgtemp_c"); - temperatures.add(new Temperature(temp_c, city, Instant.now())); + temperatures.add(new Temperature(temp_c, new City(city), Instant.now())); } return temperatures; }