From 83b7ce780a1c444c99d0528b86cf45da5a6af661 Mon Sep 17 00:00:00 2001
From: Martin Eyben <martin.eyben@enseirb-matmeca.fr>
Date: Tue, 12 Nov 2024 12:19:32 +0100
Subject: [PATCH] fix: conflict

---
 src/main/java/eirb/pg203/Temperature.java    |  3 +++
 src/main/java/eirb/pg203/WeatherAPI.java     |  3 +++
 src/main/java/eirb/pg203/WeatherDisplay.java | 14 +++++++++++++-
 src/test/java/eirb/pg203/SampleTest.java     |  4 ----
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eirb/pg203/Temperature.java b/src/main/java/eirb/pg203/Temperature.java
index 132f69c..e37efe1 100644
--- a/src/main/java/eirb/pg203/Temperature.java
+++ b/src/main/java/eirb/pg203/Temperature.java
@@ -2,6 +2,9 @@ package eirb.pg203;
 
 import java.time.Instant;
 
+/**
+ * Representation of a temperature in a city at a specific date
+ */
 public class Temperature {
     private City city;
     private Instant date;
diff --git a/src/main/java/eirb/pg203/WeatherAPI.java b/src/main/java/eirb/pg203/WeatherAPI.java
index 0424acf..5f76aae 100644
--- a/src/main/java/eirb/pg203/WeatherAPI.java
+++ b/src/main/java/eirb/pg203/WeatherAPI.java
@@ -12,6 +12,9 @@ import java.net.URL;
 import java.time.Instant;
 import java.util.ArrayList;
 
+/**
+ * WeatherAPI implementation
+ */
 public class WeatherAPI implements WeatherDataAPI{
     private final String weatherAPIKey;
 		private static final String forecastBaseURL = "https://api.weatherapi.com/v1/forecast.json";
diff --git a/src/main/java/eirb/pg203/WeatherDisplay.java b/src/main/java/eirb/pg203/WeatherDisplay.java
index 802fc54..d6adc3d 100644
--- a/src/main/java/eirb/pg203/WeatherDisplay.java
+++ b/src/main/java/eirb/pg203/WeatherDisplay.java
@@ -1,7 +1,19 @@
 package eirb.pg203;
 
+/**
+ * How to display weather information, make the API calls based on the collection of WheatherDataAPI
+ */
 public interface WeatherDisplay {
+    /**
+     * Display information for number of days
+     * @param days number of days to display
+     * @param city localisation of the temperature to fetch
+     */
     void display(int days, String city);
-    
+
+    /**
+     * Add API to use when fetch
+     * @param w API to add
+     */
     void addAPI(WeatherDataAPI w);
 }
diff --git a/src/test/java/eirb/pg203/SampleTest.java b/src/test/java/eirb/pg203/SampleTest.java
index 704830b..ea913e4 100644
--- a/src/test/java/eirb/pg203/SampleTest.java
+++ b/src/test/java/eirb/pg203/SampleTest.java
@@ -8,8 +8,4 @@ import java.io.IOException;
 
 public class SampleTest {
 
-    @Test
-    public void testFetchChuckNorrisJoke() throws IOException {
-    }
-
 }