Prominence/openweathermap-java-api
1
0
Fork 0
mirror of https://github.com/Prominence/openweathermap-java-api.git synced 2026-01-09 19:46:41 +03:00
Code Issues Projects Releases Wiki Activity

2.1.0 version implementation.

Browse Source
This commit is contained in:
Alexey Zinchenko 2021-04-12 02:00:51 +03:00 committed by GitHub
parent 196f9ec289
commit 4cfa8ab843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
126 changed files with 11406 additions and 1705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -5,11 +5,11 @@ Java API for OpenWeatherMap services.
Free: Free:
* Current weather data * Current weather data
* 5 day / 3-hour forecast * 5 day / 3-hour forecast
* One Call API
### Will be implemented later: ### Will be implemented later:
Free: Free:
* One Call API
* Air pollution * Air pollution
* Geocoding API * Geocoding API
* Weather Stations * Weather Stations
@ -26,14 +26,14 @@ Paid:
<dependency> <dependency>
<groupId>com.github.prominence</groupId> <groupId>com.github.prominence</groupId>
<artifactId>openweathermap-api</artifactId> <artifactId>openweathermap-api</artifactId>
<version>2.0.1</version> <version>2.1.0</version>
</dependency> </dependency>
``` ```
### Gradle coordinates: ### Gradle coordinates:
```groovy ```groovy
compile('com.github.prominence:openweathermap-api:2.0.1') compile('com.github.prominence:openweathermap-api:2.1.0')
``` ```
### Documentation ### Documentation
@ -42,6 +42,7 @@ compile('com.github.prominence:openweathermap-api:2.0.1')
* [OpenWeatherMap Java API - 1.2](docs/Release_1.2.md) * [OpenWeatherMap Java API - 1.2](docs/Release_1.2.md)
* [OpenWeatherMap Java API - 2.0.0](docs/Release_2.0.0.md) * [OpenWeatherMap Java API - 2.0.0](docs/Release_2.0.0.md)
* [OpenWeatherMap Java API - 2.0.1](docs/Release_2.0.1.md) * [OpenWeatherMap Java API - 2.0.1](docs/Release_2.0.1.md)
* [OpenWeatherMap Java API - 2.1.0](docs/Release_2.1.0.md)
* [OpenWeatherMap Java API - SNAPSHOT](docs/SNAPSHOT.md) * [OpenWeatherMap Java API - SNAPSHOT](docs/SNAPSHOT.md)
### License ### License

2
docs/Release_2.0.0.md
View File

@ -79,7 +79,7 @@ final Weather weather = openWeatherClient
final List<Weather> weatherList = openWeatherClient final List<Weather> weatherList = openWeatherClient
.currentWeather() .currentWeather()
.multiple() .multiple()
.byCitiesInCycle(Coordinate.withValues(55.5, 37.5)) .byCitiesInCycle(Coordinate.of(55.5, 37.5))
.language(Language.GERMAN) .language(Language.GERMAN)
.unitSystem(UnitSystem.IMPERIAL) .unitSystem(UnitSystem.IMPERIAL)
.retrieve() .retrieve()

2
docs/Release_2.0.1.md
View File

@ -79,7 +79,7 @@ final Weather weather = openWeatherClient
final List<Weather> weatherList = openWeatherClient final List<Weather> weatherList = openWeatherClient
.currentWeather() .currentWeather()
.multiple() .multiple()
.byCitiesInCycle(Coordinate.withValues(55.5, 37.5)) .byCitiesInCycle(Coordinate.of(55.5, 37.5))
.language(Language.GERMAN) .language(Language.GERMAN)
.unitSystem(UnitSystem.IMPERIAL) .unitSystem(UnitSystem.IMPERIAL)
.retrieve() .retrieve()

484
docs/Release_2.1.0.md Normal file
View File

@ -0,0 +1,484 @@
### Implemented features:
* Current weather data
* 5 day / 3-hour forecast
* One Call API
### Maven coordinates:
```xml
<dependency>
<groupId>com.github.prominence</groupId>
<artifactId>openweathermap-api</artifactId>
<version>2.1.0</version>
</dependency>
```
### Gradle coordinates:
```groovy
compile('com.github.prominence:openweathermap-api:2.1.0')
```
### How to use:
Firstly, you need to create the instance of `OpenWeatherMapClient` class:
```java
OpenWeatherMapClient openWeatherClient = new OpenWeatherMapClient(API_TOKEN);
```
where `API_TOKEN` is your token([you can get it here](https://home.openweathermap.org/api_keys)) as `String`.
Currently, available APIs are:
* `currentWeather()`
* `forecast5Day3HourStep()`
* `oneCall()`
Default(more or less) customization points:
```java
...
// response language
.language(Language.RUSSIAN)
...
// response units of measure
.unitSystem(UnitSystem.IMPERIAL)
...
```
Available output forms:
* `asJava()`
* `asJSON()`
Additional output forms, available for several APIs:
* `asXML()`
* `asHTML()`
_All response forms can be in **sync** and **async** variants._
#### Current weather data
Examples:
```java
final String weatherJson = openWeatherClient
.currentWeather()
.single()
.byCityName("Minsk")
.language(Language.RUSSIAN)
.unitSystem(UnitSystem.IMPERIAL)
.retrieve()
.asJSON();
```
```java
final Weather weather = openWeatherClient
.currentWeather()
.single()
.byCityName("Minsk")
.language(Language.RUSSIAN)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJava();
```
```java
final List<Weather> weatherList = openWeatherClient
.currentWeather()
.multiple()
.byCitiesInCycle(Coordinate.of(55.5, 37.5))
.language(Language.GERMAN)
.unitSystem(UnitSystem.IMPERIAL)
.retrieve()
.asJava();
```
```java
final CompletableFuture<String> weatherXmlFuture = openWeatherClient
.currentWeather()
.single()
.byZipCodeAndCountry("220015", "by")
.language(Language.RUSSIAN)
.unitSystem(UnitSystem.METRIC)
.retrieveAsync()
.asXML();
```
You are able to set preferable options(via chain methods) and execute appropriate request.
`com.github.prominence.openweathermap.api.model.weather.Weather`'s useful public methods(setters are not listed):
| Method | Description |
|---------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `getCalculationTime()` | Returns `LocalDateTime` object with data calculation time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` instance that contains information about temperature. Available fields: `value`, `maxTemperature`, `minTemperature`, `feelsLike` and `unit`. |
| `getAtmosphericPressure()`| Returns `AtmosphericPressure` instance that contains information about atmospheric pressure. Available fields: `value`, `seaLevelValue`, `groundLevelValue` and `unit`. |
| `getHumidity()` | Returns `Humidity` instance that contains humidity percentage information. |
| `getWind()` | Returns `Wind` instance that contains wind information: `speed`, `degrees`, `gust` and `unit`. |
| `getRain()` | Returns `Rain` instance that contains information about rain volume for the last one hour and/or the last 3 hours. Can be absent in case of no data. |
| `getSnow()` | Returns `Snow` instance that contains information about snow volume for the last one hour and/or the last 3 hours. Can be absent in case of no data. |
| `getClouds()` | Returns `Clouds` instance that contains information about cloudiness percentage. |
| `getLocation()` | Returns `Location` object. Available fields: `id`, `name`, `countryCode`, `sunrise` and `sunset` time, `zoneOffset` and `coordinate`. |
| `toString()` | Returns informative string for the whole available weather information. |
`toString()` output example:
```
Location: Minsk(BY), Weather: clear sky, -4.22 ℃, 1020.0 hPa, Clouds: 0%
```
#### 5 day / 3-hour forecast
Examples:
```java
final Forecast forecast = openWeatherClient
.forecast5Day3HourStep()
.byCityName("Minsk")
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.count(15)
.retrieve()
.asJava();
```
```java
final String forecastJson = getClient()
.forecast5Day3HourStep()
.byCityName("New York", "NY", "US")
.language(Language.SPANISH)
.unitSystem(UnitSystem.IMPERIAL)
.count(15)
.retrieve()
.asJSON();
```
```java
CompletableFuture<String> forecastFuture = getClient()
.forecast5Day3HourStep()
.byCityId(350001514)
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.count(15)
.retrieveAsync()
.asXML();
```
```java
final String forecastXml = getClient()
.forecast5Day3HourStep()
.byZipCodeInUSA("10005")
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asXML();
```
You are able to set preferable options(via chain methods) and execute appropriate request.
`com.github.prominence.openweathermap.api.model.forecast.free.Forecast`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
| `getLocation()` | Returns `Location` object. Available fields: `id`, `name`, `countryCode`, `sunrise` and `sunset` time, `zoneOffset`, `coordinate` and `population`. |
| `getWeatherForecasts()` | Returns list of `WeatherForecast` objects with forecast information. |
| `toString()` | Returns informative string for the whole available forecast information. |
`toString()` output example:
```
A forecast for Minsk with 15 timestamps.
```
`com.github.prominence.openweathermap.api.model.forecast.WeatherForecast`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` instance that contains information about temperature. Available fields: `value`, `maxTemperature`, `minTemperature`, `feelsLike` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` instance that contains information about atmospheric pressure. Available fields: `value`, `seaLevelValue`, `groundLevelValue` and `unit`. |
| `getHumidity()` | Returns `Humidity` instance that contains humidity percentage information. |
| `getWind()` | Returns `Wind` instance that contains wind information: `speed`, `degrees` and `unit`. |
| `getRain()` | Returns `Rain` instance that contains information about rain volume for the last 3 hours. Can be absent in case of no data. |
| `getSnow()` | Returns `Snow` instance that contains information about snow volume for the last 3 hours. Can be absent in case of no data. |
| `getClouds()` | Returns `Clouds` instance that contains information about cloudiness percentage. |
| `getForecastTimeISO()` | Returns String with time of data forecasted, ISO, UTC. |
| `getDayTime()` | Returns enumerations representing the part of day(day, night). |
| `toString()` | Returns informative string for the forecast of particular timestamp. |
#### One Call API
Examples:
```java
final CurrentWeatherData currentWeatherData = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJava();
```
```java
final CurrentWeatherData currentWeatherData = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.exclude(OneCallResultOptions.CURRENT, OneCallResultOptions.MINUTELY)
.retrieve()
.asJava();
```
```java
final CompletableFuture<CurrentWeatherData> currentWeatherDataFuture = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieveAsync()
.asJava();
```
```java
final String responseJson = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJSON();
```
```java
final HistoricalWeatherData historicalWeatherData = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJava();
```
```java
final String responseJson = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJSON();
```
```java
final CompletableFuture<HistoricalWeatherData> historicalWeatherDataFuture = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieveAsync()
.asJava();
```
```java
final CompletableFuture<String> responseJsonFuture = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieveAsync()
.asJSON();
```
You are able to set preferable options(via chain methods) and execute appropriate request.
`com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|--------------------------------------------------------------------------------|
| `getCoordinate()` | Returns `Coordinate` object. Available fields: `latitude`, `longitude`. |
| `getTimezone()` | Returns location timezone object. |
| `getTimezoneOffset()` | Returns zone offset. |
| `getCurrent()` | Returns `Current` object with current weather state if available. |
| `getMinutelyList()` | Returns list of `Minutely` objects if available. |
| `getHourlyList()` | Returns list of `Houlry` objects if available. |
| `getDailyList()` | Returns list of `Daily` objects if available. |
| `getAlerts()` | Returns list of `Alert` objects if available. |
`com.github.prominence.openweathermap.api.model.onecall.Current`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|-------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
`com.github.prominence.openweathermap.api.model.onecall.current.Minutely`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|---------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getPrecipitationVolume()` | Returns precipitation volume. |
`com.github.prominence.openweathermap.api.model.onecall.current.Hourly`'s useful public methods(setters are not listed):
| Method | Description |
|-----------------------------------|---------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
`com.github.prominence.openweathermap.api.model.onecall.current.Daily`'s useful public methods(setters are not listed):
| Method | Description |
|-----------------------------------|---------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `DailyTemperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
| `getRain()` | Returns `DailyRain` object. Available fields: `value`. |
| `getSnow()` | Returns `DailySnow` object. Available fields: `value`. |
`com.github.prominence.openweathermap.api.model.onecall.current.Alert`'s useful public methods(setters are not listed):
| Method | Description |
|------------------------------|--------------------------------------------------------|
| `getSenderName()` | Returns alert sender name. |
| `getEventName()` | Returns alert event name. |
| `getStartTime()` | Returns `LocalDateTime` when event should start. |
| `getEndTime()` | Returns `LocalDateTime` when event should end. |
| `getDescription()` | Returns alert description. |
`com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|-------------------------------------------------------------------------------|
| `getCoordinate()` | Returns `Coordinate` object. Available fields: `latitude`, `longitude`. |
| `getTimezone()` | Returns location timezone object. |
| `getTimezoneOffset()` | Returns zone offset. |
| `getHistoricalWeather()` | Returns `HistoricalWeather` object with historical weather state. |
| `getHourlyList()` | Returns list of `HourlyHistorical` objects. |
`com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeather`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|-------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
`com.github.prominence.openweathermap.api.model.onecall.historical.HourlyHistorical`'s useful public methods(setters are not listed):
| Method | Description |
|-----------------------------------|---------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
### Constants and options
#### Language
| Constant | Description |
|-----------------------------------|-------------------------------|
| Language.AFRIKAANS | Afrikaans language. |
| Language.ALBANIAN | ALBANIAN language. |
| Language.ARABIC | Arabic language. |
| Language.AZERBAIJANI | Azerbaijani language. |
| Language.BULGARIAN | Bulgarian language. |
| Language.CATALAN | Catalan language. |
| Language.CZECH | Czech language. |
| Language.DANISH | Danish language. |
| Language.GERMAN | German language. |
| Language.GREEK | Greek language. |
| Language.ENGLISH | English language. |
| Language.BASQUE | Basque language. |
| Language.PERSIAN | Persian (Farsi) language. |
| Language.FINNISH | Finnish language. |
| Language.FRENCH | French language. |
| Language.GALICIAN | Galician language. |
| Language.HEBREW | Hebrew language. |
| Language.HINDI | Hindi language. |
| Language.CROATIAN | Croatian language. |
| Language.HUNGARIAN | Hungarian language. |
| Language.INDONESIAN | Indonesian language. |
| Language.ITALIAN | Italian language. |
| Language.JAPANESE | Japanese language. |
| Language.KOREAN | Korean language. |
| Language.LATVIAN | Latvian language. |
| Language.LITHUANIAN | Lithuanian language. |
| Language.MACEDONIAN | Macedonian language. |
| Language.NORWEGIAN | Norwegian language. |
| Language.DUTCH | Dutch language. |
| Language.POLISH | Polish language. |
| Language.PORTUGUESE | Portuguese language. |
| Language.PORTUGUES_BRAZIL | Português Brasil language. |
| Language.ROMANIAN | Romanian language. |
| Language.RUSSIAN | Russian language. |
| Language.SWEDISH | Swedish language. |
| Language.SLOVAK | Slovak language. |
| Language.SLOVENIAN | Slovenian language. |
| Language.SPANISH | Spanish language. |
| Language.SERBIAN | Serbian language. |
| Language.THAI | Thai language. |
| Language.TURKISH | Turkish language. |
| Language.UKRANIAN | Ukrainian language. |
| Language.VIETNAMESE | Vietnamese language. |
| Language.CHINESE_SIMPLIFIED | Chinese Simplified language. |
| Language.CHINESE_TRADITIONAL | Chinese Traditional language. |
| Language.ZULU | Zulu language. |
#### Unit
| Constant | Description |
|----------------------|------------------------------------------------|
| Unit.METRIC_SYSTEM | Celsius, meter/sec, hPa, mm(rain, snow). |
| Unit.IMPERIAL_SYSTEM | Fahrenheit, miles/hour, hPa, mm(rain, snow). |
| Unit.STANDARD_SYSTEM | Kelvin, meter/sec, hPa, mm(rain, snow). |
### Dependencies
* com.fasterxml.jackson.core:jackson-databind:2.12.2
* org.slf4j:slf4j-api:1.7.30 (*compile*)
* org.junit.jupiter:junit-jupiter-engine:5.7.1 (*test*)
* org.junit.platform:junit-platform-runner:1.7.1 (*test*)

257
docs/SNAPSHOT.md
View File

@ -1,6 +1,7 @@
### Implemented features: ### Implemented features:
* Current weather data * Current weather data
* 5 day / 3-hour forecast * 5 day / 3-hour forecast
* One Call API
### Maven coordinates: ### Maven coordinates:
@ -8,14 +9,14 @@
<dependency> <dependency>
<groupId>com.github.prominence</groupId> <groupId>com.github.prominence</groupId>
<artifactId>openweathermap-api</artifactId> <artifactId>openweathermap-api</artifactId>
<version>2.0.1-SNAPSHOT</version> <version>2.1.0</version>
</dependency> </dependency>
``` ```
### Gradle coordinates: ### Gradle coordinates:
```groovy ```groovy
compile('com.github.prominence:openweathermap-api:2.0.1-SNAPSHOT') compile('com.github.prominence:openweathermap-api:2.1.0')
``` ```
### How to use: ### How to use:
@ -29,6 +30,7 @@ where `API_TOKEN` is your token([you can get it here](https://home.openweatherma
Currently, available APIs are: Currently, available APIs are:
* `currentWeather()` * `currentWeather()`
* `forecast5Day3HourStep()` * `forecast5Day3HourStep()`
* `oneCall()`
Default(more or less) customization points: Default(more or less) customization points:
```java ```java
@ -79,7 +81,7 @@ final Weather weather = openWeatherClient
final List<Weather> weatherList = openWeatherClient final List<Weather> weatherList = openWeatherClient
.currentWeather() .currentWeather()
.multiple() .multiple()
.byCitiesInCycle(Coordinate.withValues(55.5, 37.5)) .byCitiesInCycle(Coordinate.of(55.5, 37.5))
.language(Language.GERMAN) .language(Language.GERMAN)
.unitSystem(UnitSystem.IMPERIAL) .unitSystem(UnitSystem.IMPERIAL)
.retrieve() .retrieve()
@ -103,11 +105,8 @@ You are able to set preferable options(via chain methods) and execute appropriat
| Method | Description | | Method | Description |
|---------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |---------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `getState()` | Returns short weather description. Example: `Clear`. | | `getCalculationTime()` | Returns `LocalDateTime` object with data calculation time. |
| `getDescription()` | Returns weather description. Example: `clear sky`. | | `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getWeatherIconId()` | Returns a weather state ID. Examples: `01d`, `01n`, `11n`, etc. |
| `getWeatherIconUrl()` | Returns a link to weather icon hosted on https://openweathermap.org website. |
| `getCalculatedOn()` | Returns `LocalDateTime` object with data calculation time. |
| `getTemperature()` | Returns `Temperature` instance that contains information about temperature. Available fields: `value`, `maxTemperature`, `minTemperature`, `feelsLike` and `unit`. | | `getTemperature()` | Returns `Temperature` instance that contains information about temperature. Available fields: `value`, `maxTemperature`, `minTemperature`, `feelsLike` and `unit`. |
| `getAtmosphericPressure()`| Returns `AtmosphericPressure` instance that contains information about atmospheric pressure. Available fields: `value`, `seaLevelValue`, `groundLevelValue` and `unit`. | | `getAtmosphericPressure()`| Returns `AtmosphericPressure` instance that contains information about atmospheric pressure. Available fields: `value`, `seaLevelValue`, `groundLevelValue` and `unit`. |
| `getHumidity()` | Returns `Humidity` instance that contains humidity percentage information. | | `getHumidity()` | Returns `Humidity` instance that contains humidity percentage information. |
@ -170,7 +169,7 @@ final String forecastXml = getClient()
You are able to set preferable options(via chain methods) and execute appropriate request. You are able to set preferable options(via chain methods) and execute appropriate request.
`com.github.prominence.openweathermap.api.request.forecast.free.Forecast`'s useful public methods(setters are not listed): `com.github.prominence.openweathermap.api.model.forecast.free.Forecast`'s useful public methods(setters are not listed):
| Method | Description | | Method | Description |
|-------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------| |-------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
@ -187,11 +186,8 @@ A forecast for Minsk with 15 timestamps.
| Method | Description | | Method | Description |
|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `getState()` | Returns short weather description. Example: `Clear`. |
| `getDescription()` | Returns weather description. Example: `clear sky`. |
| `getWeatherIconId()` | Returns a weather state ID. Examples: `01d`, `01n`, `11n`, etc. |
| `getWeatherIconUrl()` | Returns a link to weather icon hosted on https://openweathermap.org website. |
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. | | `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` instance that contains information about temperature. Available fields: `value`, `maxTemperature`, `minTemperature`, `feelsLike` and `unit`. | | `getTemperature()` | Returns `Temperature` instance that contains information about temperature. Available fields: `value`, `maxTemperature`, `minTemperature`, `feelsLike` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` instance that contains information about atmospheric pressure. Available fields: `value`, `seaLevelValue`, `groundLevelValue` and `unit`. | | `getAtmosphericPressure()` | Returns `AtmosphericPressure` instance that contains information about atmospheric pressure. Available fields: `value`, `seaLevelValue`, `groundLevelValue` and `unit`. |
| `getHumidity()` | Returns `Humidity` instance that contains humidity percentage information. | | `getHumidity()` | Returns `Humidity` instance that contains humidity percentage information. |
@ -203,44 +199,276 @@ A forecast for Minsk with 15 timestamps.
| `getDayTime()` | Returns enumerations representing the part of day(day, night). | | `getDayTime()` | Returns enumerations representing the part of day(day, night). |
| `toString()` | Returns informative string for the forecast of particular timestamp. | | `toString()` | Returns informative string for the forecast of particular timestamp. |
#### One Call API
Examples:
```java
final CurrentWeatherData currentWeatherData = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJava();
```
```java
final CurrentWeatherData currentWeatherData = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.exclude(OneCallResultOptions.CURRENT, OneCallResultOptions.MINUTELY)
.retrieve()
.asJava();
```
```java
final CompletableFuture<CurrentWeatherData> currentWeatherDataFuture = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieveAsync()
.asJava();
```
```java
final String responseJson = openWeatherClient
.oneCall()
.current()
.byCoordinate(Coordinate.of(53.54, 27.34))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJSON();
```
```java
final HistoricalWeatherData historicalWeatherData = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJava();
```
```java
final String responseJson = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieve()
.asJSON();
```
```java
final CompletableFuture<HistoricalWeatherData> historicalWeatherDataFuture = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieveAsync()
.asJava();
```
```java
final CompletableFuture<String> responseJsonFuture = openWeatherClient
.oneCall()
.historical()
.byCoordinateAndTimestamp(Coordinate.of(60.99, 30.9), LocalDateTime.now().minusDays(5).toEpochSecond(ZoneOffset.UTC))
.language(Language.ENGLISH)
.unitSystem(UnitSystem.METRIC)
.retrieveAsync()
.asJSON();
```
You are able to set preferable options(via chain methods) and execute appropriate request.
`com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|--------------------------------------------------------------------------------|
| `getCoordinate()` | Returns `Coordinate` object. Available fields: `latitude`, `longitude`. |
| `getTimezone()` | Returns location timezone object. |
| `getTimezoneOffset()` | Returns zone offset. |
| `getCurrent()` | Returns `Current` object with current weather state if available. |
| `getMinutelyList()` | Returns list of `Minutely` objects if available. |
| `getHourlyList()` | Returns list of `Houlry` objects if available. |
| `getDailyList()` | Returns list of `Daily` objects if available. |
| `getAlerts()` | Returns list of `Alert` objects if available. |
`com.github.prominence.openweathermap.api.model.onecall.Current`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|-------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
`com.github.prominence.openweathermap.api.model.onecall.current.Minutely`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|---------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getPrecipitationVolume()` | Returns precipitation volume. |
`com.github.prominence.openweathermap.api.model.onecall.current.Hourly`'s useful public methods(setters are not listed):
| Method | Description |
|-----------------------------------|---------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
`com.github.prominence.openweathermap.api.model.onecall.current.Daily`'s useful public methods(setters are not listed):
| Method | Description |
|-----------------------------------|---------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `DailyTemperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
| `getRain()` | Returns `DailyRain` object. Available fields: `value`. |
| `getSnow()` | Returns `DailySnow` object. Available fields: `value`. |
`com.github.prominence.openweathermap.api.model.onecall.current.Alert`'s useful public methods(setters are not listed):
| Method | Description |
|------------------------------|--------------------------------------------------------|
| `getSenderName()` | Returns alert sender name. |
| `getEventName()` | Returns alert event name. |
| `getStartTime()` | Returns `LocalDateTime` when event should start. |
| `getEndTime()` | Returns `LocalDateTime` when event should end. |
| `getDescription()` | Returns alert description. |
`com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|-------------------------------------------------------------------------------|
| `getCoordinate()` | Returns `Coordinate` object. Available fields: `latitude`, `longitude`. |
| `getTimezone()` | Returns location timezone object. |
| `getTimezoneOffset()` | Returns zone offset. |
| `getHistoricalWeather()` | Returns `HistoricalWeather` object with historical weather state. |
| `getHourlyList()` | Returns list of `HourlyHistorical` objects. |
`com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeather`'s useful public methods(setters are not listed):
| Method | Description |
|-------------------------------|-------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getUvIndex()` | Returns UV index value. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
`com.github.prominence.openweathermap.api.model.onecall.historical.HourlyHistorical`'s useful public methods(setters are not listed):
| Method | Description |
|-----------------------------------|---------------------------------------------------------------------------------------------------|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
| `getVisibilityInMetres()` | Returns visibility in metres. |
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
### Constants and options ### Constants and options
#### Language #### Language
| Constant | Description | | Constant | Description |
|-----------------------------------|-------------------------------| |-----------------------------------|-------------------------------|
| Language.AFRIKAANS | Afrikaans language. |
| Language.ALBANIAN | ALBANIAN language. |
| Language.ARABIC | Arabic language. | | Language.ARABIC | Arabic language. |
| Language.AZERBAIJANI | Azerbaijani language. |
| Language.BULGARIAN | Bulgarian language. | | Language.BULGARIAN | Bulgarian language. |
| Language.CATALAN | Catalan language. | | Language.CATALAN | Catalan language. |
| Language.CZECH | Czech language. | | Language.CZECH | Czech language. |
| Language.DANISH | Danish language. |
| Language.GERMAN | German language. | | Language.GERMAN | German language. |
| Language.GREEK | Greek language. | | Language.GREEK | Greek language. |
| Language.ENGLISH | English language. | | Language.ENGLISH | English language. |
| Language.BASQUE | Basque language. |
| Language.PERSIAN | Persian (Farsi) language. | | Language.PERSIAN | Persian (Farsi) language. |
| Language.FINNISH | Finnish language. | | Language.FINNISH | Finnish language. |
| Language.FRENCH | French language. | | Language.FRENCH | French language. |
| Language.GALICIAN | Galician language. | | Language.GALICIAN | Galician language. |
| Language.HEBREW | Hebrew language. |
| Language.HINDI | Hindi language. |
| Language.CROATIAN | Croatian language. | | Language.CROATIAN | Croatian language. |
| Language.HUNGARIAN | Hungarian language. | | Language.HUNGARIAN | Hungarian language. |
| Language.INDONESIAN | Indonesian language. |
| Language.ITALIAN | Italian language. | | Language.ITALIAN | Italian language. |
| Language.JAPANESE | Japanese language. | | Language.JAPANESE | Japanese language. |
| Language.KOREAN | Korean language. | | Language.KOREAN | Korean language. |
| Language.LATVIAN | Latvian language. | | Language.LATVIAN | Latvian language. |
| Language.LITHUANIAN | Lithuanian language. | | Language.LITHUANIAN | Lithuanian language. |
| Language.MACEDONIAN | Macedonian language. | | Language.MACEDONIAN | Macedonian language. |
| Language.NORWEGIAN | Norwegian language. |
| Language.DUTCH | Dutch language. | | Language.DUTCH | Dutch language. |
| Language.POLISH | Polish language. | | Language.POLISH | Polish language. |
| Language.PORTUGUESE | Portuguese language. | | Language.PORTUGUESE | Portuguese language. |
| Language.PORTUGUES_BRAZIL | Português Brasil language. |
| Language.ROMANIAN | Romanian language. | | Language.ROMANIAN | Romanian language. |
| Language.RUSSIAN | Russian language. | | Language.RUSSIAN | Russian language. |
| Language.SWEDISH | Swedish language. | | Language.SWEDISH | Swedish language. |
| Language.SLOVAK | Slovak language. | | Language.SLOVAK | Slovak language. |
| Language.SLOVENIAN | Slovenian language. | | Language.SLOVENIAN | Slovenian language. |
| Language.SPANISH | Spanish language. | | Language.SPANISH | Spanish language. |
| Language.SERBIAN | Serbian language. |
| Language.THAI | Thai language. |
| Language.TURKISH | Turkish language. | | Language.TURKISH | Turkish language. |
| Language.UKRANIAN | Ukrainian language. | | Language.UKRANIAN | Ukrainian language. |
| Language.VIETNAMESE | Vietnamese language. | | Language.VIETNAMESE | Vietnamese language. |
| Language.CHINESE_SIMPLIFIED | Chinese Simplified language. | | Language.CHINESE_SIMPLIFIED | Chinese Simplified language. |
| Language.CHINESE_TRADITIONAL | Chinese Traditional language. | | Language.CHINESE_TRADITIONAL | Chinese Traditional language. |
| Language.ZULU | Zulu language. |
#### Unit #### Unit
| Constant | Description | | Constant | Description |
@ -252,4 +480,5 @@ A forecast for Minsk with 15 timestamps.
### Dependencies ### Dependencies
* com.fasterxml.jackson.core:jackson-databind:2.12.2 * com.fasterxml.jackson.core:jackson-databind:2.12.2
* org.slf4j:slf4j-api:1.7.30 (*compile*) * org.slf4j:slf4j-api:1.7.30 (*compile*)
* junit:junit:4.13.1 (*test*) * org.junit.jupiter:junit-jupiter-engine:5.7.1 (*test*)
* org.junit.platform:junit-platform-runner:1.7.1 (*test*)

21
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.github.prominence</groupId> <groupId>com.github.prominence</groupId>
<artifactId>openweathermap-api</artifactId> <artifactId>openweathermap-api</artifactId>
<version>2.0.1</version> <version>2.1.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Java OpenWeatherMap API</name> <name>Java OpenWeatherMap API</name>
@ -27,7 +27,7 @@
<licenses> <licenses>
<license> <license>
<name>MIT License</name> <name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url> <url>https://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
@ -150,6 +150,12 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
</plugins> </plugins>
</build> </build>
@ -167,10 +173,15 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>4.13.1</version> <version>5.7.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>1.7.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

14
src/main/java/com/github/prominence/openweathermap/api/OpenWeatherMapClient.java
View File

@ -25,6 +25,8 @@ package com.github.prominence.openweathermap.api;
import com.github.prominence.openweathermap.api.annotation.SubscriptionAvailability; import com.github.prominence.openweathermap.api.annotation.SubscriptionAvailability;
import com.github.prominence.openweathermap.api.request.forecast.free.FiveDayThreeHourStepForecastRequester; import com.github.prominence.openweathermap.api.request.forecast.free.FiveDayThreeHourStepForecastRequester;
import com.github.prominence.openweathermap.api.request.forecast.free.FiveDayThreeHourStepForecastRequesterImpl; import com.github.prominence.openweathermap.api.request.forecast.free.FiveDayThreeHourStepForecastRequesterImpl;
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherRequester;
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherRequesterImpl;
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherRequester; import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherRequester;
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherRequesterImpl; import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherRequesterImpl;
@ -39,7 +41,7 @@ public class OpenWeatherMapClient {
/** /**
* Created OpenWeatherMap client object. * Created OpenWeatherMap client object.
* @param apiKey API key obtained on <a href="https://home.openweathermap.org/api_keys">OpwnWeatherMap site</a>. * @param apiKey API key obtained on <a href="https://home.openweathermap.org/api_keys">OpenWeatherMap site</a>.
*/ */
public OpenWeatherMapClient(String apiKey) { public OpenWeatherMapClient(String apiKey) {
this.apiKey = apiKey; this.apiKey = apiKey;
@ -62,4 +64,14 @@ public class OpenWeatherMapClient {
public FiveDayThreeHourStepForecastRequester forecast5Day3HourStep() { public FiveDayThreeHourStepForecastRequester forecast5Day3HourStep() {
return new FiveDayThreeHourStepForecastRequesterImpl(apiKey); return new FiveDayThreeHourStepForecastRequesterImpl(apiKey);
} }
/**
* One Call <a href="https://openweathermap.org/api/one-call-api">API</a>.
* To get information about current weather, minute forecast for 1 hour, hourly forecast for 48 hours, daily forecast for 7 days and government weather alerts.
* @return requester for retrieving one call weather information.
*/
@SubscriptionAvailability(plans = ALL)
public OneCallWeatherRequester oneCall() {
return new OneCallWeatherRequesterImpl(apiKey);
}
} }

69
src/main/java/com/github/prominence/openweathermap/api/enums/Language.java
View File

@ -27,11 +27,26 @@ package com.github.prominence.openweathermap.api.enums;
* Usually it could be specified to get response with some fields translated into desired language. * Usually it could be specified to get response with some fields translated into desired language.
*/ */
public enum Language { public enum Language {
/**
* Afrikaans language.
*/
AFRIKAANS("af"),
/**
* Albanian language.
*/
ALBANIAN("al"),
/** /**
* Arabic language. * Arabic language.
*/ */
ARABIC("ar"), ARABIC("ar"),
/**
* Azerbaijani language.
*/
AZERBAIJANI("az"),
/** /**
* Bulgarian language. * Bulgarian language.
*/ */
@ -47,6 +62,11 @@ public enum Language {
*/ */
CZECH("cz"), CZECH("cz"),
/**
* Danish language
*/
DANISH("da"),
/** /**
* German language. * German language.
*/ */
@ -62,6 +82,11 @@ public enum Language {
*/ */
ENGLISH("en"), ENGLISH("en"),
/**
* Basque language.
*/
BASQUE("eu"),
/** /**
* Persian language. * Persian language.
*/ */
@ -82,6 +107,16 @@ public enum Language {
*/ */
GALICIAN("gl"), GALICIAN("gl"),
/**
* Hebrew language.
*/
HEBREW("he"),
/**
* Hindi language.
*/
HINDI("hi"),
/** /**
* Croatian language. * Croatian language.
*/ */
@ -92,6 +127,11 @@ public enum Language {
*/ */
HUNGARIAN("hu"), HUNGARIAN("hu"),
/**
* Indonesian language.
*/
INDONESIAN("id"),
/** /**
* Italian language. * Italian language.
*/ */
@ -122,6 +162,11 @@ public enum Language {
*/ */
MACEDONIAN("mk"), MACEDONIAN("mk"),
/**
* Norwegian language.
*/
NORWEGIAN("no"),
/** /**
* Dutch language. * Dutch language.
*/ */
@ -137,6 +182,11 @@ public enum Language {
*/ */
PORTUGUESE("pt"), PORTUGUESE("pt"),
/**
* Português Brasil language.
*/
PORTUGUES_BRAZIL("pt_br"),
/** /**
* Romanian language. * Romanian language.
*/ */
@ -165,7 +215,17 @@ public enum Language {
/** /**
* Spanish language. * Spanish language.
*/ */
SPANISH("en"), SPANISH("es"),
/**
* Serbian language.
*/
SERBIAN("sr"),
/**
* Thai language.
*/
THAI("th"),
/** /**
* Turkish language. * Turkish language.
@ -190,7 +250,12 @@ public enum Language {
/** /**
* Chinese traditional language. * Chinese traditional language.
*/ */
CHINESE_TRADITIONAL("zh_tw"); CHINESE_TRADITIONAL("zh_tw"),
/**
* Zulu language.
*/
ZULU("zu");
private final String value; private final String value;

64
src/main/java/com/github/prominence/openweathermap/api/enums/OneCallResultOptions.java Normal file
View File

@ -0,0 +1,64 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.enums;
/**
* The enum One call result options.
*/
public enum OneCallResultOptions {
/**
* Current one call result options.
*/
CURRENT("current"),
/**
* Minutely one call result options.
*/
MINUTELY("minutely"),
/**
* Hourly one call result options.
*/
HOURLY("hourly"),
/**
* Daily one call result options.
*/
DAILY("daily"),
/**
* Alerts one call result options.
*/
ALERTS("alerts");
private final String value;
OneCallResultOptions(String value) {
this.value = value;
}
/**
* Gets value.
*
* @return the value
*/
public String getValue() {
return value;
}
}

375
src/main/java/com/github/prominence/openweathermap/api/enums/WeatherCondition.java Normal file
View File

@ -0,0 +1,375 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.enums;
import java.util.Arrays;
import java.util.Optional;
/**
* Represents weather condition and related information.
* More details <a href="https://openweathermap.org/weather-conditions#Weather-Condition-Codes-2">here</a>.
*/
public enum WeatherCondition {
// Group 2xx: Thunderstorm
/**
* The thunderstorm with light rain.
*/
THUNDERSTORM_LIGHT_RAIN(200, "Thunderstorm", "thunderstorm with light rain", "11"),
/**
* The thunderstorm with rain.
*/
THUNDERSTORM_RAIN(201, "Thunderstorm", "thunderstorm with rain", "11"),
/**
* The thunderstorm with heavy rain.
*/
THUNDERSTORM_HEAVY_RAIN(202, "Thunderstorm", "thunderstorm with heavy rain", "11"),
/**
* The light thunderstorm.
*/
THUNDERSTORM_LIGHT(210, "Thunderstorm", "light thunderstorm", "11"),
/**
* The thunderstorm.
*/
THUNDERSTORM(211, "Thunderstorm", "thunderstorm", "11"),
/**
* The heavy thunderstorm.
*/
THUNDERSTORM_HEAVY(212, "Thunderstorm", "heavy thunderstorm", "11"),
/**
* The ragged thunderstorm.
*/
THUNDERSTORM_RAGGED(221, "Thunderstorm", "ragged thunderstorm", "11"),
/**
* The thunderstorm with light drizzle.
*/
THUNDERSTORM_LIGHT_DRIZZLE(230, "Thunderstorm", "thunderstorm with light drizzle", "11"),
/**
* The thunderstorm with drizzle.
*/
THUNDERSTORM_DRIZZLE(231, "Thunderstorm", "thunderstorm with drizzle", "11"),
/**
* The thunderstorm with heavy drizzle.
*/
THUNDERSTORM_HEAVY_DRIZZLE(232, "Thunderstorm", "thunderstorm with heavy drizzle", "11"),
// Group 3xx: Drizzle
/**
* The light intensity drizzle.
*/
DRIZZLE_LIGHT(300, "Drizzle", "light intensity drizzle", "09"),
/**
* The drizzle.
*/
DRIZZLE(301, "Drizzle", "drizzle", "09"),
/**
* The heavy intensity drizzle.
*/
DRIZZLE_HEAVY(302, "Drizzle", "heavy intensity drizzle", "09"),
/**
* The light intensity drizzle rain.
*/
DRIZZLE_LIGHT_RAIN(310, "Drizzle", "light intensity drizzle rain", "09"),
/**
* The drizzle rain.
*/
DRIZZLE_RAIN(311, "Drizzle", "drizzle rain", "09"),
/**
* The heavy intensity drizzle rain.
*/
DRIZZLE_HEAVY_RAIN(312, "Drizzle", "heavy intensity drizzle rain", "09"),
/**
* The shower rain and drizzle.
*/
DRIZZLE_SHOWER_RAIN(313, "Drizzle", "shower rain and drizzle", "09"),
/**
* The heavy shower rain and drizzle.
*/
DRIZZLE_HEAVY_SHOWER_RAIN(314, "Drizzle", "heavy shower rain and drizzle", "09"),
/**
* The shower drizzle.
*/
DRIZZLE_SHOWER(321, "Drizzle", "shower drizzle", "09"),
// Group 5xx: Rain
/**
* The light rain.
*/
RAIN_LIGHT(500, "Rain", "light rain", "10"),
/**
* The moderate rain.
*/
RAIN_MODERATE(501, "Rain", "moderate rain", "10"),
/**
* The heavy intensity rain.
*/
RAIN_HEAVY(502, "Rain", "heavy intensity rain", "10"),
/**
* The very heavy rain.
*/
RAIN_VERY_HEAVY(503, "Rain", "very heavy rain", "10"),
/**
* The very heavy rain.
*/
RAIN_EXTREME(504, "Rain", "very heavy rain", "10"),
/**
* The freezing rain.
*/
RAIN_FREEZING(511, "Rain", "freezing rain", "10"),
/**
* The light intensity shower rain.
*/
RAIN_LIGHT_SHOWER(520, "Rain", "light intensity shower rain", "10"),
/**
* The shower rain.
*/
RAIN_SHOWER(521, "Rain", "shower rain", "10"),
/**
* The heavy intensity shower rain.
*/
RAIN_HEAVY_SHOWER(522, "Rain", "heavy intensity shower rain", "10"),
/**
* The ragged shower rain.
*/
RAIN_RAGGED_SHOWER(531, "Rain", "ragged shower rain", "10"),
// Group 6xx: Snow
/**
* The light snow.
*/
SNOW_LIGHT(600, "Snow", "light snow", "13"),
/**
* The snow.
*/
SNOW(601, "Snow", "snow", "13"),
/**
* The heavy snow.
*/
SNOW_HEAVY(602, "Snow", "heavy snow", "13"),
/**
* The sleet.
*/
SNOW_SLEET(611, "Snow", "sleet", "13"),
/**
* The light shower sleet.
*/
SNOW_LIGHT_SHOWER_SLEET(612, "Snow", "light shower sleet", "13"),
/**
* The shower sleet.
*/
SNOW_SHOWER_SLEET(613, "Snow", "shower sleet", "13"),
/**
* The light rain and snow.
*/
SNOW_LIGHT_RAIN_AND_SNOW(615, "Snow", "light rain and snow", "13"),
/**
* The rain and snow.
*/
SNOW_RAIN_AND_SNOW(616, "Snow", "rain and snow", "13"),
/**
* The light shower snow.
*/
SNOW_LIGHT_SHOWER_SNOW(620, "Snow", "light shower snow", "13"),
/**
* The shower snow.
*/
SNOW_SHOWER_SNOW(621, "Snow", "shower snow", "13"),
/**
* The heavy shower snow.
*/
SNOW_HEAVY_SHOWER_SNOW(622, "Snow", "heavy shower snow", "13"),
// Group 7xx: Atmosphere
/**
* The mist.
*/
MIST(701, "Mist", "mist", "50"),
/**
* The smoke.
*/
SMOKE(711, "Smoke", "smoke", "50"),
/**
* The haze.
*/
HAZE(721, "Haze", "haze", "50"),
/**
* The sand/dust whirls.
*/
DUST_WHIRLS(731, "Dust", "sand/dust whirls", "50"),
/**
* The fog.
*/
FOG(741, "Fog", "fog", "50"),
/**
* The sand.
*/
SAND(751, "Sand", "sand", "50"),
/**
* The dust.
*/
DUST(761, "Dust", "dust", "50"),
/**
* The volcanic ash.
*/
ASH(762, "Ash", "volcanic ash", "50"),
/**
* The squall.
*/
SQUALL(771, "Squall", "squalls", "50"),
/**
* The tornado.
*/
TORNADO(781, "Tornado", "tornado", "50"),
// Group 800: Clear
/**
* The clear sky.
*/
CLEAR(800, "Clear", "clear sky", "01"),
// Group 80x: Clouds
/**
* A few clouds: 11-25%.
*/
CLOUDS_FEW(801, "Clouds", "few clouds: 11-25%", "02"),
/**
* A scattered clouds: 25-50%.
*/
CLOUDS_SCATTERED(802, "Clouds", "scattered clouds: 25-50%", "03"),
/**
* A broken clouds: 51-84%.
*/
CLOUDS_BROKEN(803, "Clouds", "broken clouds: 51-84%", "04"),
/**
* An overcast clouds: 85-100%.
*/
CLOUDS_OVERCAST(804, "Clouds", "overcast clouds: 85-100%", "04");
private final int id;
private final String name;
private final String description;
private final String iconId;
private WeatherCondition(int id, String name, String description, String iconId) {
this.id = id;
this.name = name;
this.description = description;
this.iconId = iconId;
}
/**
* Gets id.
*
* @return the id
*/
public int getId() {
return id;
}
/**
* Gets name.
*
* @return the name
*/
public String getName() {
return name;
}
/**
* Gets description.
*
* @return the description
*/
public String getDescription() {
return description;
}
/**
* Gets day icon id.
*
* @return the day icon id
*/
public String getDayIconId() {
return iconId + 'd';
}
/**
* Gets night icon id.
*
* @return the night icon id
*/
public String getNightIconId() {
return iconId + 'n';
}
/**
* Gets day icon url.
*
* @return the day icon url
*/
public String getDayIconUrl() {
return getIconUrl(getDayIconId());
}
/**
* Gets night icon url.
*
* @return the night icon url
*/
public String getNightIconUrl() {
return getIconUrl(getNightIconId());
}
/**
* Gets icon url.
*
* @param iconId the icon id
* @return the icon url
*/
public static String getIconUrl(String iconId) {
return "http://openweathermap.org/img/w/" + iconId + ".png";
}
/**
* Gets {@link WeatherCondition} by id.
*
* @param id the id
* @return the by id
*/
public static WeatherCondition getById(int id) {
final Optional<WeatherCondition> optionalWeatherCondition = Arrays.stream(values()).filter(weatherCondition -> weatherCondition.getId() == id).findFirst();
return optionalWeatherCondition.orElse(null);
}
@Override
public String toString() {
return "Weather condition(" + id + "): " + name + '(' + description + ')';
}
}

18
src/main/java/com/github/prominence/openweathermap/api/model/Coordinate.java
View File

@ -31,9 +31,8 @@ public class Coordinate {
private double latitude; private double latitude;
private double longitude; private double longitude;
private Coordinate(double latitude, double longitude) { private Coordinate() {
this.latitude = latitude;
this.longitude = longitude;
} }
/** /**
@ -42,14 +41,11 @@ public class Coordinate {
* @param longitude longitude * @param longitude longitude
* @return coordinate object. * @return coordinate object.
*/ */
public static Coordinate withValues(double latitude, double longitude) { public static Coordinate of(double latitude, double longitude) {
if (latitude < -90 || latitude > 90) { final Coordinate coordinate = new Coordinate();
throw new IllegalArgumentException("Latitude value must be in the next range: [-90.0; 90.0]."); coordinate.setLatitude(latitude);
} coordinate.setLongitude(longitude);
if (longitude < -180 || longitude > 180) { return coordinate;
throw new IllegalArgumentException("Longitude value must be in the next range: [-180.0; 180.0].");
}
return new Coordinate(latitude, longitude);
} }
/** /**

2
src/main/java/com/github/prominence/openweathermap/api/model/Temperature.java
View File

@ -154,7 +154,7 @@ public class Temperature {
@Override @Override
public String toString() { public String toString() {
StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Temperature: "); stringBuilder.append("Temperature: ");
stringBuilder.append(value); stringBuilder.append(value);
stringBuilder.append(' '); stringBuilder.append(' ');

136
src/main/java/com/github/prominence/openweathermap/api/model/WeatherState.java Normal file
View File

@ -0,0 +1,136 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model;
import com.github.prominence.openweathermap.api.enums.WeatherCondition;
import java.util.Objects;
/**
* The type Weather state.
*/
public class WeatherState {
private final int id;
private final String name;
private final String description;
private String iconId;
private final WeatherCondition weatherConditionEnum;
public WeatherState(Integer id, String name, String description) {
this.id = id;
this.name = name;
this.description = description;
this.weatherConditionEnum = WeatherCondition.getById(id);
}
/**
* Gets id.
*
* @return the id
*/
public int getId() {
return id;
}
/**
* Gets name.
*
* @return the name
*/
public String getName() {
return name;
}
/**
* Gets description.
*
* @return the description
*/
public String getDescription() {
return description;
}
/**
* Gets icon id.
*
* @return the icon id
*/
public String getIconId() {
return iconId;
}
/**
* Sets icon id.
*
* @param iconId the icon id
*/
public void setIconId(String iconId) {
this.iconId = iconId;
}
/**
* Gets weather condition enum.
*
* @return the weather condition enum
*/
public WeatherCondition getWeatherConditionEnum() {
return weatherConditionEnum;
}
/**
* Gets weather icon url.
*
* @return the weather icon url
*/
public String getWeatherIconUrl() {
if (iconId != null) {
return WeatherCondition.getIconUrl(iconId);
}
if (weatherConditionEnum != null) {
// return the default one for the current weather condition
return weatherConditionEnum.getDayIconUrl();
}
return null;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
WeatherState that = (WeatherState) o;
return Objects.equals(id, that.id) &&
Objects.equals(name, that.name) &&
Objects.equals(description, that.description) &&
Objects.equals(iconId, that.iconId);
}
@Override
public int hashCode() {
return Objects.hash(id, name, description, iconId, weatherConditionEnum);
}
@Override
public String toString() {
return "Weather state: " + name + "(" + description + ").";
}
}

30
src/main/java/com/github/prominence/openweathermap/api/model/forecast/Location.java
View File

@ -36,8 +36,8 @@ public class Location {
private String name; private String name;
private String countryCode; private String countryCode;
private LocalDateTime sunrise; private LocalDateTime sunriseTime;
private LocalDateTime sunset; private LocalDateTime sunsetTime;
private ZoneOffset zoneOffset; private ZoneOffset zoneOffset;
private Coordinate coordinate; private Coordinate coordinate;
@ -114,32 +114,32 @@ public class Location {
* Returns location sunrise time. * Returns location sunrise time.
* @return sunrise time * @return sunrise time
*/ */
public LocalDateTime getSunrise() { public LocalDateTime getSunriseTime() {
return sunrise; return sunriseTime;
} }
/** /**
* Sets location sunrise time. * Sets location sunrise time.
* @param sunrise sunrise time * @param sunriseTime sunrise time
*/ */
public void setSunrise(LocalDateTime sunrise) { public void setSunriseTime(LocalDateTime sunriseTime) {
this.sunrise = sunrise; this.sunriseTime = sunriseTime;
} }
/** /**
* Returns location sunset time. * Returns location sunset time.
* @return sunset time * @return sunset time
*/ */
public LocalDateTime getSunset() { public LocalDateTime getSunsetTime() {
return sunset; return sunsetTime;
} }
/** /**
* Sets location sunset time. * Sets location sunset time.
* @param sunset sunset time * @param sunsetTime sunset time
*/ */
public void setSunset(LocalDateTime sunset) { public void setSunsetTime(LocalDateTime sunsetTime) {
this.sunset = sunset; this.sunsetTime = sunsetTime;
} }
/** /**
@ -198,8 +198,8 @@ public class Location {
return id == location.id && return id == location.id &&
Objects.equals(name, location.name) && Objects.equals(name, location.name) &&
Objects.equals(countryCode, location.countryCode) && Objects.equals(countryCode, location.countryCode) &&
Objects.equals(sunrise, location.sunrise) && Objects.equals(sunriseTime, location.sunriseTime) &&
Objects.equals(sunset, location.sunset) && Objects.equals(sunsetTime, location.sunsetTime) &&
Objects.equals(zoneOffset, location.zoneOffset) && Objects.equals(zoneOffset, location.zoneOffset) &&
Objects.equals(coordinate, location.coordinate) && Objects.equals(coordinate, location.coordinate) &&
Objects.equals(population, location.population); Objects.equals(population, location.population);
@ -207,7 +207,7 @@ public class Location {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(id, name, countryCode, sunrise, sunset, zoneOffset, coordinate, population); return Objects.hash(id, name, countryCode, sunriseTime, sunsetTime, zoneOffset, coordinate, population);
} }
@Override @Override

32
src/main/java/com/github/prominence/openweathermap/api/model/forecast/Rain.java
View File

@ -30,41 +30,41 @@ import java.util.Objects;
public class Rain { public class Rain {
private static final String DEFAULT_UNIT = "mm"; private static final String DEFAULT_UNIT = "mm";
private double threeHourRainLevel; private double threeHourLevel;
private Rain(double threeHourRainLevel) { private Rain(double threeHourLevel) {
this.threeHourRainLevel = threeHourRainLevel; this.threeHourLevel = threeHourLevel;
} }
/** /**
* Creates {@link Rain} object with correctness check. * Creates {@link Rain} object with correctness check.
* @param threeHourRainLevel 3-hour rain level value * @param threeHourLevel 3-hour rain level value
* @return rain object. * @return rain object.
*/ */
public static Rain withThreeHourLevelValue(double threeHourRainLevel) { public static Rain withThreeHourLevelValue(double threeHourLevel) {
if (threeHourRainLevel < 0) { if (threeHourLevel < 0) {
throw new IllegalArgumentException("Rain level value cannot be negative."); throw new IllegalArgumentException("Rain level value cannot be negative.");
} }
return new Rain(threeHourRainLevel); return new Rain(threeHourLevel);
} }
/** /**
* Returns 3-hour rain level value. * Returns 3-hour rain level value.
* @return 3-hour rain level value * @return 3-hour rain level value
*/ */
public double getThreeHourRainLevel() { public double getThreeHourLevel() {
return threeHourRainLevel; return threeHourLevel;
} }
/** /**
* Sets 3-hour rain level value with correctness check. * Sets 3-hour rain level value with correctness check.
* @param threeHourRainLevel 3-hour rain level value * @param threeHourLevel 3-hour rain level value
*/ */
public void setThreeHourRainLevel(double threeHourRainLevel) { public void setThreeHourLevel(double threeHourLevel) {
if (threeHourRainLevel < 0) { if (threeHourLevel < 0) {
throw new IllegalArgumentException("Rain level value cannot be negative."); throw new IllegalArgumentException("Rain level value cannot be negative.");
} }
this.threeHourRainLevel = threeHourRainLevel; this.threeHourLevel = threeHourLevel;
} }
/** /**
@ -80,18 +80,18 @@ public class Rain {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
Rain rain = (Rain) o; Rain rain = (Rain) o;
return Double.compare(rain.threeHourRainLevel, threeHourRainLevel) == 0; return Double.compare(rain.threeHourLevel, threeHourLevel) == 0;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(threeHourRainLevel); return Objects.hash(threeHourLevel);
} }
@Override @Override
public String toString() { public String toString() {
return "3-hour rain level: " + return "3-hour rain level: " +
threeHourRainLevel + ' ' + threeHourLevel + ' ' +
getUnit(); getUnit();
} }
} }

32
src/main/java/com/github/prominence/openweathermap/api/model/forecast/Snow.java
View File

@ -30,41 +30,41 @@ import java.util.Objects;
public class Snow { public class Snow {
private static final String DEFAULT_UNIT = "mm"; private static final String DEFAULT_UNIT = "mm";
private double threeHourSnowLevel; private double threeHourLevel;
private Snow(double threeHourSnowLevel) { private Snow(double threeHourLevel) {
this.threeHourSnowLevel = threeHourSnowLevel; this.threeHourLevel = threeHourLevel;
} }
/** /**
* Creates {@link Snow} object with correctness check. * Creates {@link Snow} object with correctness check.
* @param threeHourSnowLevel 3-hour snow level value * @param threeHourLevel 3-hour snow level value
* @return snow object. * @return snow object.
*/ */
public static Snow withThreeHourLevelValue(double threeHourSnowLevel) { public static Snow withThreeHourLevelValue(double threeHourLevel) {
if (threeHourSnowLevel < 0) { if (threeHourLevel < 0) {
throw new IllegalArgumentException("Snow level value cannot be negative."); throw new IllegalArgumentException("Snow level value cannot be negative.");
} }
return new Snow(threeHourSnowLevel); return new Snow(threeHourLevel);
} }
/** /**
* Returns 3-hour snow level value. * Returns 3-hour snow level value.
* @return 3-hour snow level value * @return 3-hour snow level value
*/ */
public double getThreeHourSnowLevel() { public double getThreeHourLevel() {
return threeHourSnowLevel; return threeHourLevel;
} }
/** /**
* Sets 3-hour snow level value with correctness check. * Sets 3-hour snow level value with correctness check.
* @param threeHourSnowLevel 3-hour snow level value * @param threeHourLevel 3-hour snow level value
*/ */
public void setThreeHourSnowLevel(double threeHourSnowLevel) { public void setThreeHourLevel(double threeHourLevel) {
if (threeHourSnowLevel < 0) { if (threeHourLevel < 0) {
throw new IllegalArgumentException("Snow level value cannot be negative."); throw new IllegalArgumentException("Snow level value cannot be negative.");
} }
this.threeHourSnowLevel = threeHourSnowLevel; this.threeHourLevel = threeHourLevel;
} }
/** /**
@ -80,18 +80,18 @@ public class Snow {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
Snow snow = (Snow) o; Snow snow = (Snow) o;
return Double.compare(snow.threeHourSnowLevel, threeHourSnowLevel) == 0; return Double.compare(snow.threeHourLevel, threeHourLevel) == 0;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(threeHourSnowLevel); return Objects.hash(threeHourLevel);
} }
@Override @Override
public String toString() { public String toString() {
return "3-hour snow level: " + return "3-hour snow level: " +
threeHourSnowLevel + ' ' + threeHourLevel + ' ' +
getUnit(); getUnit();
} }
} }

135
src/main/java/com/github/prominence/openweathermap/api/model/forecast/WeatherForecast.java
View File

@ -31,12 +31,9 @@ import java.util.Objects;
* Represents weather forecast information for a particular timestamp. * Represents weather forecast information for a particular timestamp.
*/ */
public class WeatherForecast { public class WeatherForecast {
private String state;
private String description;
private String weatherIconId;
private LocalDateTime forecastTime; private LocalDateTime forecastTime;
private WeatherState weatherState;
private Temperature temperature; private Temperature temperature;
private AtmosphericPressure atmosphericPressure; private AtmosphericPressure atmosphericPressure;
private Humidity humidity; private Humidity humidity;
@ -49,100 +46,6 @@ public class WeatherForecast {
private String forecastTimeISO; private String forecastTimeISO;
private DayTime dayTime; private DayTime dayTime;
private WeatherForecast(String state, String description) {
this.state = state;
this.description = description;
}
/**
* For value weather forecast.
*
* @param state the state
* @param description the description
* @return the weather forecast
*/
public static WeatherForecast forValue(String state, String description) {
if (state == null) {
throw new IllegalArgumentException("State must be set.");
}
if (description == null) {
throw new IllegalArgumentException("Description must be set.");
}
return new WeatherForecast(state, description);
}
/**
* Gets state.
*
* @return the state
*/
public String getState() {
return state;
}
/**
* Sets state.
*
* @param state the state
*/
public void setState(String state) {
if (state == null) {
throw new IllegalArgumentException("State must be not null.");
}
this.state = state;
}
/**
* Gets description.
*
* @return the description
*/
public String getDescription() {
return description;
}
/**
* Sets description.
*
* @param description the description
*/
public void setDescription(String description) {
if (description == null) {
throw new IllegalArgumentException("Description must be not null.");
}
this.description = description;
}
/**
* Gets weather icon ID.
*
* @return the weather icon ID
*/
public String getWeatherIconId() {
return weatherIconId;
}
/**
* Sets weather icon ID.
*
* @param weatherIconId the weather icon ID
*/
public void setWeatherIconId(String weatherIconId) {
this.weatherIconId = weatherIconId;
}
/**
* Gets weather icon url.
*
* @return the weather icon url
*/
public String getWeatherIconUrl() {
if (weatherIconId != null) {
return "https://openweathermap.org/img/w/" + weatherIconId + ".png";
}
return null;
}
/** /**
* Gets forecast time. * Gets forecast time.
* *
@ -161,6 +64,24 @@ public class WeatherForecast {
this.forecastTime = forecastTime; this.forecastTime = forecastTime;
} }
/**
* Gets weather state.
*
* @return the weather state
*/
public WeatherState getWeatherState() {
return weatherState;
}
/**
* Sets weather state.
*
* @param weatherState the weather state
*/
public void setWeatherState(WeatherState weatherState) {
this.weatherState = weatherState;
}
/** /**
* Gets temperature. * Gets temperature.
* *
@ -328,10 +249,8 @@ public class WeatherForecast {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
WeatherForecast that = (WeatherForecast) o; WeatherForecast that = (WeatherForecast) o;
return Objects.equals(state, that.state) && return Objects.equals(forecastTime, that.forecastTime) &&
Objects.equals(description, that.description) && Objects.equals(weatherState, that.weatherState) &&
Objects.equals(weatherIconId, that.weatherIconId) &&
Objects.equals(forecastTime, that.forecastTime) &&
Objects.equals(temperature, that.temperature) && Objects.equals(temperature, that.temperature) &&
Objects.equals(atmosphericPressure, that.atmosphericPressure) && Objects.equals(atmosphericPressure, that.atmosphericPressure) &&
Objects.equals(humidity, that.humidity) && Objects.equals(humidity, that.humidity) &&
@ -345,7 +264,7 @@ public class WeatherForecast {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(state, description, weatherIconId, forecastTime, temperature, atmosphericPressure, humidity, wind, rain, snow, clouds, forecastTimeISO, dayTime); return Objects.hash(forecastTime, weatherState, temperature, atmosphericPressure, humidity, wind, rain, snow, clouds, forecastTimeISO, dayTime);
} }
@Override @Override
@ -353,8 +272,10 @@ public class WeatherForecast {
final StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Timestamp: "); stringBuilder.append("Timestamp: ");
stringBuilder.append(forecastTimeISO); stringBuilder.append(forecastTimeISO);
stringBuilder.append(", Weather: "); if (weatherState != null) {
stringBuilder.append(description); stringBuilder.append(", Weather: ");
stringBuilder.append(weatherState.getDescription());
}
if (temperature != null) { if (temperature != null) {
stringBuilder.append(", "); stringBuilder.append(", ");
stringBuilder.append(temperature.getValue()); stringBuilder.append(temperature.getValue());
@ -373,13 +294,13 @@ public class WeatherForecast {
} }
if (rain != null) { if (rain != null) {
stringBuilder.append(", Rain: "); stringBuilder.append(", Rain: ");
stringBuilder.append(rain.getThreeHourRainLevel()); stringBuilder.append(rain.getThreeHourLevel());
stringBuilder.append(' '); stringBuilder.append(' ');
stringBuilder.append(rain.getUnit()); stringBuilder.append(rain.getUnit());
} }
if (snow != null) { if (snow != null) {
stringBuilder.append(", Snow: "); stringBuilder.append(", Snow: ");
stringBuilder.append(snow.getThreeHourSnowLevel()); stringBuilder.append(snow.getThreeHourLevel());
stringBuilder.append(' '); stringBuilder.append(' ');
stringBuilder.append(snow.getUnit()); stringBuilder.append(snow.getUnit());
} }

98
src/main/java/com/github/prominence/openweathermap/api/model/onecall/AtmosphericPressure.java Normal file
View File

@ -0,0 +1,98 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import java.util.Objects;
/**
* The AtmosphericPressure type represents atmospheric pressure value.
* Its value can only be a double in [0, +∞) range.
*/
public class AtmosphericPressure {
private static final String DEFAULT_UNIT = "hPa";
private double seaLevelValue;
private AtmosphericPressure() {
}
/**
* Static method for {@link AtmosphericPressure} creation with value checking.
* @param seaLevelValue atmospheric pressure value.
* @return instantiated {@link AtmosphericPressure} object.
*/
public static AtmosphericPressure withValue(double seaLevelValue) {
final AtmosphericPressure atmosphericPressure = new AtmosphericPressure();
atmosphericPressure.setSeaLevelValue(seaLevelValue);
return atmosphericPressure;
}
/**
* Gets sea level value.
*
* @return the sea level value.
*/
public Double getSeaLevelValue() {
return seaLevelValue;
}
/**
* Sets sea level value.
*
* @param seaLevelValue the sea level value.
* @throws IllegalArgumentException in case if provided value isn't in allowed range.
*/
public void setSeaLevelValue(double seaLevelValue) {
if (seaLevelValue < 0) {
throw new IllegalArgumentException("Atmospheric pressure value must be in [0, +∞) range.");
}
this.seaLevelValue = seaLevelValue;
}
/**
* Returns pressure unitSystem. Constantly equals to 'hPa'.
*
* @return the pressure unitSystem.
*/
public String getUnit() {
return DEFAULT_UNIT;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AtmosphericPressure that = (AtmosphericPressure) o;
return Double.compare(that.seaLevelValue, seaLevelValue) == 0;
}
@Override
public int hashCode() {
return Objects.hash(seaLevelValue);
}
@Override
public String toString() {
return "Pressure: " + seaLevelValue + ' ' + getUnit();
}
}

320
src/main/java/com/github/prominence/openweathermap/api/model/onecall/Current.java Normal file
View File

@ -0,0 +1,320 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import com.github.prominence.openweathermap.api.model.Clouds;
import com.github.prominence.openweathermap.api.model.Humidity;
import com.github.prominence.openweathermap.api.model.WeatherState;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* The type Current.
*/
public class Current {
protected LocalDateTime forecastTime;
protected LocalDateTime sunriseTime;
protected LocalDateTime sunsetTime;
protected WeatherState weatherState;
protected Temperature temperature;
protected AtmosphericPressure atmosphericPressure;
protected Humidity humidity;
protected Clouds clouds;
protected Double uvIndex;
protected Double visibilityInMetres;
protected Wind wind;
protected Rain rain;
protected Snow snow;
/**
* Gets forecast time.
*
* @return the forecast time
*/
public LocalDateTime getForecastTime() {
return forecastTime;
}
/**
* Sets forecast time.
*
* @param forecastTime the forecast time
*/
public void setForecastTime(LocalDateTime forecastTime) {
this.forecastTime = forecastTime;
}
/**
* Gets sunrise time.
*
* @return the sunrise time
*/
public LocalDateTime getSunriseTime() {
return sunriseTime;
}
/**
* Sets sunrise time.
*
* @param sunriseTime the sunrise time
*/
public void setSunriseTime(LocalDateTime sunriseTime) {
this.sunriseTime = sunriseTime;
}
/**
* Gets sunset time.
*
* @return the sunset time
*/
public LocalDateTime getSunsetTime() {
return sunsetTime;
}
/**
* Sets sunset time.
*
* @param sunsetTime the sunset time
*/
public void setSunsetTime(LocalDateTime sunsetTime) {
this.sunsetTime = sunsetTime;
}
/**
* Gets weather state.
*
* @return the weather state
*/
public WeatherState getWeatherState() {
return weatherState;
}
/**
* Sets weather state.
*
* @param weatherState the weather state
*/
public void setWeatherState(WeatherState weatherState) {
this.weatherState = weatherState;
}
/**
* Gets temperature.
*
* @return the temperature
*/
public Temperature getTemperature() {
return temperature;
}
/**
* Sets temperature.
*
* @param temperature the temperature
*/
public void setTemperature(Temperature temperature) {
this.temperature = temperature;
}
/**
* Gets atmospheric pressure.
*
* @return the atmospheric pressure
*/
public AtmosphericPressure getAtmosphericPressure() {
return atmosphericPressure;
}
/**
* Sets atmospheric pressure.
*
* @param atmosphericPressure the atmospheric pressure
*/
public void setAtmosphericPressure(AtmosphericPressure atmosphericPressure) {
this.atmosphericPressure = atmosphericPressure;
}
/**
* Gets humidity.
*
* @return the humidity
*/
public Humidity getHumidity() {
return humidity;
}
/**
* Sets humidity.
*
* @param humidity the humidity
*/
public void setHumidity(Humidity humidity) {
this.humidity = humidity;
}
/**
* Gets clouds.
*
* @return the clouds
*/
public Clouds getClouds() {
return clouds;
}
/**
* Sets clouds.
*
* @param clouds the clouds
*/
public void setClouds(Clouds clouds) {
this.clouds = clouds;
}
/**
* Gets uv index.
*
* @return the uv index
*/
public Double getUvIndex() {
return uvIndex;
}
/**
* Sets uv index.
*
* @param uvIndex the uv index
*/
public void setUvIndex(Double uvIndex) {
if (uvIndex != null && uvIndex < 0) {
throw new IllegalArgumentException("UV index must not be negative.");
}
this.uvIndex = uvIndex;
}
/**
* Gets visibility in metres.
*
* @return the visibility in metres
*/
public Double getVisibilityInMetres() {
return visibilityInMetres;
}
/**
* Sets visibility in metres.
*
* @param visibilityInMetres the visibility in metres
*/
public void setVisibilityInMetres(Double visibilityInMetres) {
if (visibilityInMetres != null && visibilityInMetres < 0) {
throw new IllegalArgumentException("Visibility must not be negative.");
}
this.visibilityInMetres = visibilityInMetres;
}
/**
* Gets wind.
*
* @return the wind
*/
public Wind getWind() {
return wind;
}
/**
* Sets wind.
*
* @param wind the wind
*/
public void setWind(Wind wind) {
this.wind = wind;
}
/**
* Gets rain.
*
* @return the rain
*/
public Rain getRain() {
return rain;
}
/**
* Sets rain.
*
* @param rain the rain
*/
public void setRain(Rain rain) {
this.rain = rain;
}
/**
* Gets snow.
*
* @return the snow
*/
public Snow getSnow() {
return snow;
}
/**
* Sets snow.
*
* @param snow the snow
*/
public void setSnow(Snow snow) {
this.snow = snow;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Current current = (Current) o;
return Objects.equals(forecastTime, current.forecastTime) &&
Objects.equals(sunriseTime, current.sunriseTime) &&
Objects.equals(sunsetTime, current.sunsetTime) &&
Objects.equals(weatherState, current.weatherState) &&
Objects.equals(temperature, current.temperature) &&
Objects.equals(atmosphericPressure, current.atmosphericPressure) &&
Objects.equals(humidity, current.humidity) &&
Objects.equals(clouds, current.clouds) &&
Objects.equals(uvIndex, current.uvIndex) &&
Objects.equals(visibilityInMetres, current.visibilityInMetres) &&
Objects.equals(wind, current.wind) &&
Objects.equals(rain, current.rain) &&
Objects.equals(snow, current.snow);
}
@Override
public int hashCode() {
return Objects.hash(forecastTime, sunriseTime, sunsetTime, weatherState, temperature, atmosphericPressure, humidity, clouds, uvIndex, visibilityInMetres, wind, rain, snow);
}
@Override
public String toString() {
return "Current weather information forecasted for " + forecastTime + ".";
}
}

99
src/main/java/com/github/prominence/openweathermap/api/model/onecall/Rain.java Normal file
View File

@ -0,0 +1,99 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import java.util.Objects;
/**
* Represents rain information.
*/
public class Rain {
private static final String DEFAULT_UNIT = "mm";
private double oneHourLevel;
private Rain() {
}
/**
* Creates {@link Rain} object with correctness check.
*
* @param oneHourLevel 1-hour rain level value
* @return rain object.
*/
public static Rain withOneHourLevelValue(double oneHourLevel) {
final Rain rain = new Rain();
rain.setOneHourLevel(oneHourLevel);
return rain;
}
/**
* Gets one hour rain level.
*
* @return the one hour rain level
*/
public double getOneHourLevel() {
return oneHourLevel;
}
/**
* Sets one hour rain level.
*
* @param oneHourLevel the one hour rain level
*/
public void setOneHourLevel(double oneHourLevel) {
if (oneHourLevel < 0) {
throw new IllegalArgumentException("Rain level value cannot be negative.");
}
this.oneHourLevel = oneHourLevel;
}
/**
* Gets unit.
*
* @return the unit
*/
public String getUnit() {
return DEFAULT_UNIT;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Rain)) return false;
Rain rain = (Rain) o;
return Objects.equals(oneHourLevel, rain.oneHourLevel);
}
@Override
public int hashCode() {
return Objects.hash(oneHourLevel);
}
@Override
public String toString() {
return "1-hour rain level: " +
oneHourLevel + ' ' +
getUnit();
}
}

99
src/main/java/com/github/prominence/openweathermap/api/model/onecall/Snow.java Normal file
View File

@ -0,0 +1,99 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import java.util.Objects;
/**
* Represents snow information.
*/
public class Snow {
private static final String DEFAULT_UNIT = "mm";
private double oneHourLevel;
private Snow() {
}
/**
* Creates {@link Snow} object with correctness check.
*
* @param oneHourLevel 1-hour snow level value
* @return snow object.
*/
public static Snow withOneHourLevelValue(double oneHourLevel) {
final Snow snow = new Snow();
snow.setOneHourLevel(oneHourLevel);
return snow;
}
/**
* Gets one hour snow level.
*
* @return the one hour snow level
*/
public double getOneHourLevel() {
return oneHourLevel;
}
/**
* Sets one hour snow level.
*
* @param oneHourLevel the one hour snow level
*/
public void setOneHourLevel(double oneHourLevel) {
if (oneHourLevel < 0) {
throw new IllegalArgumentException("Snow level value cannot be negative.");
}
this.oneHourLevel = oneHourLevel;
}
/**
* Gets unit.
*
* @return the unit
*/
public String getUnit() {
return DEFAULT_UNIT;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Snow)) return false;
Snow snow = (Snow) o;
return Objects.equals(oneHourLevel, snow.oneHourLevel);
}
@Override
public int hashCode() {
return Objects.hash(oneHourLevel);
}
@Override
public String toString() {
return "1-hour snow level: " +
oneHourLevel + ' ' +
getUnit();
}
}

143
src/main/java/com/github/prominence/openweathermap/api/model/onecall/Temperature.java Normal file
View File

@ -0,0 +1,143 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import java.util.Objects;
/**
* Represents temperature values and unit.
*/
public class Temperature {
private double value;
private Double feelsLike;
private Double dewPoint;
private String unit;
private Temperature() {
}
/**
* Creates {@link Temperature} object with correctness check.
* @param value temperature value
* @param unit temperature unit
* @return temperature object
*/
public static Temperature withValue(double value, String unit) {
final Temperature temperature = new Temperature();
temperature.setValue(value);
temperature.setUnit(unit);
return temperature;
}
/**
* Returns temperature value.
* @return value
*/
public double getValue() {
return value;
}
/**
* Sets temperature value.
* @param value temperature
*/
public void setValue(double value) {
this.value = value;
}
/**
* Returns 'feels like' temperature value.
* @return 'feels like' temperature value
*/
public Double getFeelsLike() {
return feelsLike;
}
/**
* Sets 'feels like' temperature value.
* @param feelsLike 'feels like' temperature
*/
public void setFeelsLike(Double feelsLike) {
this.feelsLike = feelsLike;
}
public Double getDewPoint() {
return dewPoint;
}
public void setDewPoint(Double dewPoint) {
this.dewPoint = dewPoint;
}
/**
* Returns temperature unit.
* @return unit
*/
public String getUnit() {
return unit;
}
/**
* Sets temperature unit with correctness check.
* @param unit temperature unit
*/
public void setUnit(String unit) {
if (unit == null) {
throw new IllegalArgumentException("Unit must be set.");
}
this.unit = unit;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Temperature)) return false;
Temperature that = (Temperature) o;
return Double.compare(that.value, value) == 0 &&
Objects.equals(feelsLike, that.feelsLike) &&
Objects.equals(dewPoint, that.dewPoint) &&
Objects.equals(unit, that.unit);
}
@Override
public int hashCode() {
return Objects.hash(value, feelsLike, dewPoint, unit);
}
@Override
public String toString() {
final StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Temperature: ");
stringBuilder.append(value);
stringBuilder.append(' ');
stringBuilder.append(unit);
if (feelsLike != null) {
stringBuilder.append(", Feels like: ");
stringBuilder.append(feelsLike);
stringBuilder.append(' ');
stringBuilder.append(unit);
}
return stringBuilder.toString();
}
}

159
src/main/java/com/github/prominence/openweathermap/api/model/onecall/Wind.java Normal file
View File

@ -0,0 +1,159 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import java.util.Objects;
/**
* The type Wind.
*/
public class Wind {
private double speed;
private Double degrees;
private Double gust;
private String unit;
private Wind() {
}
/**
* Creates {@link Wind} object with correctness check.
* @param speed the speed
* @param unit the unitSystem
* @return wind object
*/
public static Wind withValue(double speed, String unit) {
final Wind wind = new Wind();
wind.setSpeed(speed);
wind.setUnit(unit);
return wind;
}
/**
* Gets speed.
*
* @return the speed
*/
public double getSpeed() {
return speed;
}
/**
* Sets speed.
*
* @param speed the speed
*/
public void setSpeed(double speed) {
if (speed < 0) {
throw new IllegalArgumentException("Wind speed value must be in positive or zero.");
}
this.speed = speed;
}
/**
* Gets gust value.
* @return the gust
*/
public Double getGust() {
return gust;
}
/**
* Sets gust value.
* @param gust the gust.
*/
public void setGust(double gust) {
if (gust < 0) {
throw new IllegalArgumentException("Gust value must be positive or zero.");
}
this.gust = gust;
}
/**
* Gets degrees.
*
* @return the degrees
*/
public Double getDegrees() {
return degrees;
}
/**
* Sets degrees.
*
* @param degrees the degrees
*/
public void setDegrees(double degrees) {
if (degrees < 0 || degrees > 360) {
throw new IllegalArgumentException("Wind direction value must be in [0, 360] range.");
}
this.degrees = degrees;
}
/**
* Gets unitSystem.
*
* @return the unitSystem
*/
public String getUnit() {
return unit;
}
/**
* Sets unitSystem.
*
* @param unit the unitSystem
*/
public void setUnit(String unit) {
if (unit == null) {
throw new IllegalArgumentException("Unit must be set.");
}
this.unit = unit;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof Wind)) return false;
Wind wind = (Wind) o;
return Double.compare(wind.speed, speed) == 0 &&
Objects.equals(degrees, wind.degrees) &&
Objects.equals(gust, wind.gust) &&
Objects.equals(unit, wind.unit);
}
@Override
public int hashCode() {
return Objects.hash(speed, degrees, gust, unit);
}
@Override
public String toString() {
String output = "Wind speed: " + speed + " " + unit +
", degrees: " + degrees;
if (gust != null) {
output += ", Gust: " + gust + " " + unit;
}
return output;
}
}

172
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/Alert.java Normal file
View File

@ -0,0 +1,172 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* The type Alert.
*/
public class Alert {
private String senderName;
private String eventName;
private LocalDateTime startTime;
private LocalDateTime endTime;
private String description;
/**
* Instantiates a new Alert.
*/
public Alert() {
}
/**
* Instantiates a new Alert.
*
* @param senderName the sender name
* @param eventName the event name
* @param startTime the start time
* @param endTime the end time
* @param description the description
*/
public Alert(String senderName, String eventName, LocalDateTime startTime, LocalDateTime endTime, String description) {
this.senderName = senderName;
this.eventName = eventName;
this.startTime = startTime;
this.endTime = endTime;
this.description = description;
}
/**
* Gets sender name.
*
* @return the sender name
*/
public String getSenderName() {
return senderName;
}
/**
* Sets sender name.
*
* @param senderName the sender name
*/
public void setSenderName(String senderName) {
this.senderName = senderName;
}
/**
* Gets event name.
*
* @return the event name
*/
public String getEventName() {
return eventName;
}
/**
* Sets event name.
*
* @param eventName the event name
*/
public void setEventName(String eventName) {
this.eventName = eventName;
}
/**
* Gets start time.
*
* @return the start time
*/
public LocalDateTime getStartTime() {
return startTime;
}
/**
* Sets start time.
*
* @param startTime the start time
*/
public void setStartTime(LocalDateTime startTime) {
this.startTime = startTime;
}
/**
* Gets end time.
*
* @return the end time
*/
public LocalDateTime getEndTime() {
return endTime;
}
/**
* Sets end time.
*
* @param endTime the end time
*/
public void setEndTime(LocalDateTime endTime) {
this.endTime = endTime;
}
/**
* Gets description.
*
* @return the description
*/
public String getDescription() {
return description;
}
/**
* Sets description.
*
* @param description the description
*/
public void setDescription(String description) {
this.description = description;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Alert alert = (Alert) o;
return Objects.equals(senderName, alert.senderName) &&
Objects.equals(eventName, alert.eventName) &&
Objects.equals(startTime, alert.startTime) &&
Objects.equals(endTime, alert.endTime) &&
Objects.equals(description, alert.description);
}
@Override
public int hashCode() {
return Objects.hash(senderName, eventName, startTime, endTime, description);
}
@Override
public String toString() {
return senderName + " - " + eventName + "(" + startTime + " - " + endTime + "): " + description;
}
}

215
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/CurrentWeatherData.java Normal file
View File

@ -0,0 +1,215 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import com.github.prominence.openweathermap.api.model.Coordinate;
import com.github.prominence.openweathermap.api.model.onecall.Current;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.List;
import java.util.Objects;
/**
* The type Current weather data.
*/
public class CurrentWeatherData {
private Coordinate coordinate;
private ZoneId timezone;
private ZoneOffset timezoneOffset;
private Current current;
private List<Minutely> minutelyList;
private List<Hourly> hourlyList;
private List<Daily> dailyList;
private List<Alert> alerts;
/**
* Gets coordinate.
*
* @return the coordinate
*/
public Coordinate getCoordinate() {
return coordinate;
}
/**
* Sets coordinate.
*
* @param coordinate the coordinate
*/
public void setCoordinate(Coordinate coordinate) {
this.coordinate = coordinate;
}
/**
* Gets timezone.
*
* @return the timezone
*/
public ZoneId getTimezone() {
return timezone;
}
/**
* Sets timezone.
*
* @param timezone the timezone
*/
public void setTimezone(ZoneId timezone) {
this.timezone = timezone;
}
/**
* Gets timezone offset.
*
* @return the timezone offset
*/
public ZoneOffset getTimezoneOffset() {
return timezoneOffset;
}
/**
* Sets timezone offset.
*
* @param timezoneOffset the timezone offset
*/
public void setTimezoneOffset(ZoneOffset timezoneOffset) {
this.timezoneOffset = timezoneOffset;
}
/**
* Gets current.
*
* @return the current
*/
public Current getCurrent() {
return current;
}
/**
* Sets current.
*
* @param current the current
*/
public void setCurrent(Current current) {
this.current = current;
}
/**
* Gets minutely list.
*
* @return the minutely list
*/
public List<Minutely> getMinutelyList() {
return minutelyList;
}
/**
* Sets minutely list.
*
* @param minutelyList the minutely list
*/
public void setMinutelyList(List<Minutely> minutelyList) {
this.minutelyList = minutelyList;
}
/**
* Gets hourly list.
*
* @return the hourly list
*/
public List<Hourly> getHourlyList() {
return hourlyList;
}
/**
* Sets hourly list.
*
* @param hourlyList the hourly list
*/
public void setHourlyList(List<Hourly> hourlyList) {
this.hourlyList = hourlyList;
}
/**
* Gets daily list.
*
* @return the daily list
*/
public List<Daily> getDailyList() {
return dailyList;
}
/**
* Sets daily list.
*
* @param dailyList the daily list
*/
public void setDailyList(List<Daily> dailyList) {
this.dailyList = dailyList;
}
/**
* Gets alerts.
*
* @return the alerts
*/
public List<Alert> getAlerts() {
return alerts;
}
/**
* Sets alerts.
*
* @param alerts the alerts
*/
public void setAlerts(List<Alert> alerts) {
this.alerts = alerts;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CurrentWeatherData that = (CurrentWeatherData) o;
return Objects.equals(coordinate, that.coordinate) &&
Objects.equals(timezone, that.timezone) &&
Objects.equals(timezoneOffset, that.timezoneOffset) &&
Objects.equals(current, that.current) &&
Objects.equals(minutelyList, that.minutelyList) &&
Objects.equals(hourlyList, that.hourlyList) &&
Objects.equals(dailyList, that.dailyList) &&
Objects.equals(alerts, that.alerts);
}
@Override
public int hashCode() {
return Objects.hash(coordinate, timezone, timezoneOffset, current, minutelyList, hourlyList, dailyList, alerts);
}
@Override
public String toString() {
return "Current weather data for " + coordinate + ".";
}
}

364
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/Daily.java Normal file
View File

@ -0,0 +1,364 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import com.github.prominence.openweathermap.api.model.Clouds;
import com.github.prominence.openweathermap.api.model.Humidity;
import com.github.prominence.openweathermap.api.model.WeatherState;
import com.github.prominence.openweathermap.api.model.onecall.AtmosphericPressure;
import com.github.prominence.openweathermap.api.model.onecall.Wind;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* The type Daily.
*/
public class Daily {
private LocalDateTime forecastTime;
private LocalDateTime sunriseTime;
private LocalDateTime sunsetTime;
private WeatherState weatherState;
private DailyTemperature temperature;
private AtmosphericPressure atmosphericPressure;
private Humidity humidity;
private Wind wind;
private Clouds clouds;
private Double uvIndex;
private Double probabilityOfPrecipitation;
private DailyRain rain;
private DailySnow snow;
/**
* Gets forecast time.
*
* @return the forecast time
*/
public LocalDateTime getForecastTime() {
return forecastTime;
}
/**
* Sets forecast time.
*
* @param forecastTime the forecast time
*/
public void setForecastTime(LocalDateTime forecastTime) {
this.forecastTime = forecastTime;
}
/**
* Gets sunrise time.
*
* @return the sunrise time
*/
public LocalDateTime getSunriseTime() {
return sunriseTime;
}
/**
* Sets sunrise time.
*
* @param sunriseTime the sunrise time
*/
public void setSunriseTime(LocalDateTime sunriseTime) {
this.sunriseTime = sunriseTime;
}
/**
* Gets sunset time.
*
* @return the sunset time
*/
public LocalDateTime getSunsetTime() {
return sunsetTime;
}
/**
* Sets sunset time.
*
* @param sunsetTime the sunset time
*/
public void setSunsetTime(LocalDateTime sunsetTime) {
this.sunsetTime = sunsetTime;
}
/**
* Gets weather state.
*
* @return the weather state
*/
public WeatherState getWeatherState() {
return weatherState;
}
/**
* Sets weather state.
*
* @param weatherState the weather state
*/
public void setWeatherState(WeatherState weatherState) {
this.weatherState = weatherState;
}
/**
* Gets temperature.
*
* @return the temperature
*/
public DailyTemperature getTemperature() {
return temperature;
}
/**
* Sets temperature.
*
* @param temperature the temperature
*/
public void setTemperature(DailyTemperature temperature) {
this.temperature = temperature;
}
/**
* Gets atmospheric pressure.
*
* @return the atmospheric pressure
*/
public AtmosphericPressure getAtmosphericPressure() {
return atmosphericPressure;
}
/**
* Sets atmospheric pressure.
*
* @param atmosphericPressure the atmospheric pressure
*/
public void setAtmosphericPressure(AtmosphericPressure atmosphericPressure) {
this.atmosphericPressure = atmosphericPressure;
}
/**
* Gets humidity.
*
* @return the humidity
*/
public Humidity getHumidity() {
return humidity;
}
/**
* Sets humidity.
*
* @param humidity the humidity
*/
public void setHumidity(Humidity humidity) {
this.humidity = humidity;
}
/**
* Gets wind.
*
* @return the wind
*/
public Wind getWind() {
return wind;
}
/**
* Sets wind.
*
* @param wind the wind
*/
public void setWind(Wind wind) {
this.wind = wind;
}
/**
* Gets clouds.
*
* @return the clouds
*/
public Clouds getClouds() {
return clouds;
}
/**
* Sets clouds.
*
* @param clouds the clouds
*/
public void setClouds(Clouds clouds) {
this.clouds = clouds;
}
/**
* Gets uv index.
*
* @return the uv index
*/
public Double getUvIndex() {
return uvIndex;
}
/**
* Sets uv index.
*
* @param uvIndex the uv index
*/
public void setUvIndex(Double uvIndex) {
if (uvIndex != null && uvIndex < 0) {
throw new IllegalArgumentException("UV index must not be negative.");
}
this.uvIndex = uvIndex;
}
/**
* Gets probability of precipitation.
*
* @return the probability of precipitation
*/
public Double getProbabilityOfPrecipitation() {
return probabilityOfPrecipitation;
}
/**
* Sets probability of precipitation.
*
* @param probabilityOfPrecipitation the probability of precipitation
*/
public void setProbabilityOfPrecipitation(Double probabilityOfPrecipitation) {
if (probabilityOfPrecipitation != null && (probabilityOfPrecipitation < 0 || probabilityOfPrecipitation > 100)) {
throw new IllegalArgumentException("Probability of precipitation value must be in [0, 100] range.");
}
this.probabilityOfPrecipitation = probabilityOfPrecipitation;
}
/**
* Gets rain.
*
* @return the rain
*/
public DailyRain getRain() {
return rain;
}
/**
* Sets rain.
*
* @param rain the rain
*/
public void setRain(DailyRain rain) {
this.rain = rain;
}
/**
* Gets snow.
*
* @return the snow
*/
public DailySnow getSnow() {
return snow;
}
/**
* Sets snow.
*
* @param snow the snow
*/
public void setSnow(DailySnow snow) {
this.snow = snow;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Daily daily = (Daily) o;
return Objects.equals(forecastTime, daily.forecastTime) &&
Objects.equals(sunriseTime, daily.sunriseTime) &&
Objects.equals(sunsetTime, daily.sunsetTime) &&
Objects.equals(weatherState, daily.weatherState) &&
Objects.equals(temperature, daily.temperature) &&
Objects.equals(atmosphericPressure, daily.atmosphericPressure) &&
Objects.equals(humidity, daily.humidity) &&
Objects.equals(wind, daily.wind) &&
Objects.equals(clouds, daily.clouds) &&
Objects.equals(uvIndex, daily.uvIndex) &&
Objects.equals(probabilityOfPrecipitation, daily.probabilityOfPrecipitation) &&
Objects.equals(rain, daily.rain) &&
Objects.equals(snow, daily.snow);
}
@Override
public int hashCode() {
return Objects.hash(forecastTime, sunriseTime, sunsetTime, weatherState, temperature, atmosphericPressure, humidity, wind, clouds, uvIndex, probabilityOfPrecipitation, rain, snow);
}
@Override
public String toString() {
final StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Weather on ");
stringBuilder.append(forecastTime);
stringBuilder.append(".");
if (weatherState != null) {
stringBuilder.append(" Weather: ");
stringBuilder.append(weatherState.getDescription());
stringBuilder.append('.');
}
if (temperature != null) {
stringBuilder.append(" Temperature(day): ");
stringBuilder.append(temperature.getDay());
stringBuilder.append(' ');
stringBuilder.append(temperature.getUnit());
stringBuilder.append('.');
}
if (atmosphericPressure != null) {
stringBuilder.append(" Atmospheric pressure: ");
stringBuilder.append(atmosphericPressure.getSeaLevelValue());
stringBuilder.append(' ');
stringBuilder.append(atmosphericPressure.getUnit());
stringBuilder.append('.');
}
if (clouds != null) {
stringBuilder.append(" Clouds: ");
stringBuilder.append(clouds.toString());
stringBuilder.append('.');
}
if (rain != null) {
stringBuilder.append(" Rain: ");
stringBuilder.append(rain.getValue());
stringBuilder.append(' ');
stringBuilder.append(rain.getUnit());
stringBuilder.append('.');
}
if (snow != null) {
stringBuilder.append(". Snow: ");
stringBuilder.append(snow.getValue());
stringBuilder.append(' ');
stringBuilder.append(snow.getUnit());
stringBuilder.append('.');
}
return stringBuilder.toString();
}
}

99
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/DailyRain.java Normal file
View File

@ -0,0 +1,99 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import java.util.Objects;
/**
* Represents rain information.
*/
public class DailyRain {
private static final String DEFAULT_UNIT = "mm";
private double value;
private DailyRain() {
}
/**
* Creates {@link DailyRain} object with correctness check.
*
* @param value 1-hour rain level value
* @return rain object.
*/
public static DailyRain withValue(double value) {
final DailyRain rain = new DailyRain();
rain.setValue(value);
return rain;
}
/**
* Gets one hour rain level.
*
* @return the one hour rain level
*/
public double getValue() {
return value;
}
/**
* Sets one hour rain level.
*
* @param value the one hour rain level
*/
public void setValue(double value) {
if (value < 0) {
throw new IllegalArgumentException("Rain level value cannot be negative.");
}
this.value = value;
}
/**
* Gets unit.
*
* @return the unit
*/
public String getUnit() {
return DEFAULT_UNIT;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof DailyRain)) return false;
DailyRain rain = (DailyRain) o;
return Objects.equals(value, rain.value);
}
@Override
public int hashCode() {
return Objects.hash(value);
}
@Override
public String toString() {
return "Rain level: " +
value +
getUnit();
}
}

99
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/DailySnow.java Normal file
View File

@ -0,0 +1,99 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import java.util.Objects;
/**
* Represents snow information.
*/
public class DailySnow {
private static final String DEFAULT_UNIT = "mm";
private double value;
private DailySnow() {
}
/**
* Creates {@link DailySnow} object with correctness check.
*
* @param value 1-hour snow level value
* @return snow object.
*/
public static DailySnow withValue(double value) {
final DailySnow snow = new DailySnow();
snow.setValue(value);
return snow;
}
/**
* Gets one hour snow level.
*
* @return the one hour snow level
*/
public double getValue() {
return value;
}
/**
* Sets one hour snow level.
*
* @param value the one hour snow level
*/
public void setValue(double value) {
if (value < 0) {
throw new IllegalArgumentException("Snow level value cannot be negative.");
}
this.value = value;
}
/**
* Gets unit.
*
* @return the unit
*/
public String getUnit() {
return DEFAULT_UNIT;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof DailySnow)) return false;
DailySnow snow = (DailySnow) o;
return Objects.equals(value, snow.value);
}
@Override
public int hashCode() {
return Objects.hash(value);
}
@Override
public String toString() {
return "Snow level: " +
value +
getUnit();
}
}

283
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/DailyTemperature.java Normal file
View File

@ -0,0 +1,283 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import java.util.Objects;
/**
* The type Daily temperature.
*/
public class DailyTemperature {
private Double morning;
private Double morningFeelsLike;
private Double day;
private Double dayFeelsLike;
private Double eve;
private Double eveFeelsLike;
private Double night;
private Double nightFeelsLike;
private Double min;
private Double max;
private Double dewPoint;
private String unit;
/**
* Gets morning temperature.
*
* @return the morning
*/
public Double getMorning() {
return morning;
}
/**
* Sets morning temperature.
*
* @param morning the morning
*/
public void setMorning(Double morning) {
this.morning = morning;
}
/**
* Gets morning feels like temperature.
*
* @return the morning feels like temperature
*/
public Double getMorningFeelsLike() {
return morningFeelsLike;
}
/**
* Sets morning feels like temperature.
*
* @param morningFeelsLike the morning feels like temperature
*/
public void setMorningFeelsLike(Double morningFeelsLike) {
this.morningFeelsLike = morningFeelsLike;
}
/**
* Gets day temperature.
*
* @return the day temperature
*/
public Double getDay() {
return day;
}
/**
* Sets day temperature.
*
* @param day the day temperature
*/
public void setDay(Double day) {
this.day = day;
}
/**
* Gets day feels like temperature.
*
* @return the day feels like temperature
*/
public Double getDayFeelsLike() {
return dayFeelsLike;
}
/**
* Sets day feels like temperature.
*
* @param dayFeelsLike the day feels like temperature
*/
public void setDayFeelsLike(Double dayFeelsLike) {
this.dayFeelsLike = dayFeelsLike;
}
/**
* Gets eve temperature.
*
* @return the eve temperature
*/
public Double getEve() {
return eve;
}
/**
* Sets eve temperature.
*
* @param eve the eve temperature
*/
public void setEve(Double eve) {
this.eve = eve;
}
/**
* Gets eve feels like temperature.
*
* @return the eve feels like temperature
*/
public Double getEveFeelsLike() {
return eveFeelsLike;
}
/**
* Sets eve feels like temperature.
*
* @param eveFeelsLike the eve feels like temperature
*/
public void setEveFeelsLike(Double eveFeelsLike) {
this.eveFeelsLike = eveFeelsLike;
}
/**
* Gets night temperature.
*
* @return the night temperature
*/
public Double getNight() {
return night;
}
/**
* Sets night temperature.
*
* @param night the night temperature
*/
public void setNight(Double night) {
this.night = night;
}
/**
* Gets night feels like temperature.
*
* @return the night feels like temperature
*/
public Double getNightFeelsLike() {
return nightFeelsLike;
}
/**
* Sets night feels like temperature.
*
* @param nightFeelsLike the night feels like temperature
*/
public void setNightFeelsLike(Double nightFeelsLike) {
this.nightFeelsLike = nightFeelsLike;
}
/**
* Gets min temperature.
*
* @return the min temperature
*/
public Double getMin() {
return min;
}
/**
* Sets min temperature.
*
* @param min the min temperature
*/
public void setMin(Double min) {
this.min = min;
}
/**
* Gets max temperature.
*
* @return the max temperature
*/
public Double getMax() {
return max;
}
/**
* Sets max temperature.
*
* @param max the max temperature
*/
public void setMax(Double max) {
this.max = max;
}
/**
* Gets dew point temperature.
*
* @return the dew point temperature
*/
public Double getDewPoint() {
return dewPoint;
}
/**
* Sets dew point temperature.
*
* @param dewPoint the dew point temperature
*/
public void setDewPoint(Double dewPoint) {
this.dewPoint = dewPoint;
}
/**
* Gets unit temperature.
*
* @return the unit temperature
*/
public String getUnit() {
return unit;
}
/**
* Sets unit temperature.
*
* @param unit the unit temperature
*/
public void setUnit(String unit) {
this.unit = unit;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DailyTemperature that = (DailyTemperature) o;
return Objects.equals(that.dewPoint, dewPoint) &&
Objects.equals(morning, that.morning) &&
Objects.equals(morningFeelsLike, that.morningFeelsLike) &&
Objects.equals(day, that.day) &&
Objects.equals(dayFeelsLike, that.dayFeelsLike) &&
Objects.equals(eve, that.eve) &&
Objects.equals(eveFeelsLike, that.eveFeelsLike) &&
Objects.equals(night, that.night) &&
Objects.equals(nightFeelsLike, that.nightFeelsLike) &&
Objects.equals(min, that.min) &&
Objects.equals(max, that.max) &&
Objects.equals(unit, that.unit);
}
@Override
public int hashCode() {
return Objects.hash(morning, morningFeelsLike, day, dayFeelsLike, eve, eveFeelsLike, night, nightFeelsLike, min, max, dewPoint, unit);
}
}

295
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/Hourly.java Normal file
View File

@ -0,0 +1,295 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import com.github.prominence.openweathermap.api.model.Clouds;
import com.github.prominence.openweathermap.api.model.Humidity;
import com.github.prominence.openweathermap.api.model.WeatherState;
import com.github.prominence.openweathermap.api.model.onecall.*;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* The type Hourly.
*/
public class Hourly {
private LocalDateTime forecastTime;
private WeatherState weatherState;
private Temperature temperature;
private AtmosphericPressure atmosphericPressure;
private Humidity humidity;
private Double uvIndex;
private Clouds clouds;
private Double visibilityInMetres;
private Wind wind;
private Double probabilityOfPrecipitation;
private Rain rain;
private Snow snow;
/**
* Gets forecast time.
*
* @return the forecast time
*/
public LocalDateTime getForecastTime() {
return forecastTime;
}
/**
* Sets forecast time.
*
* @param forecastTime the forecast time
*/
public void setForecastTime(LocalDateTime forecastTime) {
this.forecastTime = forecastTime;
}
/**
* Gets weather state.
*
* @return the weather state
*/
public WeatherState getWeatherState() {
return weatherState;
}
/**
* Sets weather state.
*
* @param weatherState the weather state
*/
public void setWeatherState(WeatherState weatherState) {
this.weatherState = weatherState;
}
/**
* Gets temperature.
*
* @return the temperature
*/
public Temperature getTemperature() {
return temperature;
}
/**
* Sets temperature.
*
* @param temperature the temperature
*/
public void setTemperature(Temperature temperature) {
this.temperature = temperature;
}
/**
* Gets atmospheric pressure.
*
* @return the atmospheric pressure
*/
public AtmosphericPressure getAtmosphericPressure() {
return atmosphericPressure;
}
/**
* Sets atmospheric pressure.
*
* @param atmosphericPressure the atmospheric pressure
*/
public void setAtmosphericPressure(AtmosphericPressure atmosphericPressure) {
this.atmosphericPressure = atmosphericPressure;
}
/**
* Gets humidity.
*
* @return the humidity
*/
public Humidity getHumidity() {
return humidity;
}
/**
* Sets humidity.
*
* @param humidity the humidity
*/
public void setHumidity(Humidity humidity) {
this.humidity = humidity;
}
/**
* Gets uv index.
*
* @return the uv index
*/
public Double getUvIndex() {
return uvIndex;
}
/**
* Sets uv index.
*
* @param uvIndex the uv index
*/
public void setUvIndex(Double uvIndex) {
this.uvIndex = uvIndex;
}
/**
* Gets clouds.
*
* @return the clouds
*/
public Clouds getClouds() {
return clouds;
}
/**
* Sets clouds.
*
* @param clouds the clouds
*/
public void setClouds(Clouds clouds) {
this.clouds = clouds;
}
/**
* Gets visibility in metres.
*
* @return the visibility in metres
*/
public Double getVisibilityInMetres() {
return visibilityInMetres;
}
/**
* Sets visibility in metres.
*
* @param visibilityInMetres the visibility in metres
*/
public void setVisibilityInMetres(Double visibilityInMetres) {
this.visibilityInMetres = visibilityInMetres;
}
/**
* Gets wind.
*
* @return the wind
*/
public Wind getWind() {
return wind;
}
/**
* Sets wind.
*
* @param wind the wind
*/
public void setWind(Wind wind) {
this.wind = wind;
}
/**
* Gets probability of precipitation.
*
* @return the probability of precipitation
*/
public Double getProbabilityOfPrecipitation() {
return probabilityOfPrecipitation;
}
/**
* Sets probability of precipitation.
*
* @param probabilityOfPrecipitation the probability of precipitation
*/
public void setProbabilityOfPrecipitation(Double probabilityOfPrecipitation) {
this.probabilityOfPrecipitation = probabilityOfPrecipitation;
}
/**
* Gets rain.
*
* @return the rain
*/
public Rain getRain() {
return rain;
}
/**
* Sets rain.
*
* @param rain the rain
*/
public void setRain(Rain rain) {
this.rain = rain;
}
/**
* Gets snow.
*
* @return the snow
*/
public Snow getSnow() {
return snow;
}
/**
* Sets snow.
*
* @param snow the snow
*/
public void setSnow(Snow snow) {
this.snow = snow;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Hourly hourly = (Hourly) o;
return Objects.equals(forecastTime, hourly.forecastTime) &&
Objects.equals(weatherState, hourly.weatherState) &&
Objects.equals(temperature, hourly.temperature) &&
Objects.equals(atmosphericPressure, hourly.atmosphericPressure) &&
Objects.equals(humidity, hourly.humidity) &&
Objects.equals(uvIndex, hourly.uvIndex) &&
Objects.equals(clouds, hourly.clouds) &&
Objects.equals(visibilityInMetres, hourly.visibilityInMetres) &&
Objects.equals(wind, hourly.wind) &&
Objects.equals(probabilityOfPrecipitation, hourly.probabilityOfPrecipitation) &&
Objects.equals(rain, hourly.rain) &&
Objects.equals(snow, hourly.snow);
}
@Override
public int hashCode() {
return Objects.hash(forecastTime, weatherState, temperature, atmosphericPressure, humidity, uvIndex, clouds, visibilityInMetres, wind, probabilityOfPrecipitation, rain, snow);
}
@Override
public String toString() {
return "Hourly weather information forecasted for " + forecastTime + ".";
}
}

100
src/main/java/com/github/prominence/openweathermap/api/model/onecall/current/Minutely.java Normal file
View File

@ -0,0 +1,100 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.current;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* The type Minutely.
*/
public class Minutely {
private LocalDateTime forecastTime;
private double precipitationVolume;
private Minutely() {
}
/**
* With value minutely.
*
* @param forecastTime the forecast time
* @param precipitationVolume the precipitation volume
* @return the minutely
*/
public static Minutely withValue(LocalDateTime forecastTime, double precipitationVolume) {
final Minutely minutely = new Minutely();
minutely.setForecastTime(forecastTime);
minutely.setPrecipitationVolume(precipitationVolume);
return minutely;
}
/**
* Gets forecast time.
*
* @return the forecast time
*/
public LocalDateTime getForecastTime() {
return forecastTime;
}
private void setForecastTime(LocalDateTime forecastTime) {
Objects.requireNonNull(forecastTime);
this.forecastTime = forecastTime;
}
/**
* Gets precipitation volume.
*
* @return the precipitation volume
*/
public double getPrecipitationVolume() {
return precipitationVolume;
}
private void setPrecipitationVolume(double precipitationVolume) {
if (precipitationVolume < 0) {
throw new IllegalArgumentException("Precipitation volume cannot be negative.");
}
this.precipitationVolume = precipitationVolume;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Minutely minutely = (Minutely) o;
return Double.compare(minutely.precipitationVolume, precipitationVolume) == 0 && Objects.equals(forecastTime, minutely.forecastTime);
}
@Override
public int hashCode() {
return Objects.hash(forecastTime, precipitationVolume);
}
@Override
public String toString() {
return "Time: " + forecastTime + ", precipitation volume: " + precipitationVolume;
}
}

35
src/main/java/com/github/prominence/openweathermap/api/model/onecall/historical/HistoricalWeather.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.historical;
import com.github.prominence.openweathermap.api.model.onecall.*;
/**
* The type Historical weather.
*/
public class HistoricalWeather extends Current {
@Override
public String toString() {
return "Historical weather information forecasted for " + forecastTime + ".";
}
}

154
src/main/java/com/github/prominence/openweathermap/api/model/onecall/historical/HistoricalWeatherData.java Normal file
View File

@ -0,0 +1,154 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.historical;
import com.github.prominence.openweathermap.api.model.Coordinate;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.List;
import java.util.Objects;
/**
* The type Historical weather data.
*/
public class HistoricalWeatherData {
private Coordinate coordinate;
private ZoneId timezone;
private ZoneOffset timezoneOffset;
private HistoricalWeather historicalWeather;
private List<HourlyHistorical> hourlyList;
/**
* Gets coordinate.
*
* @return the coordinate
*/
public Coordinate getCoordinate() {
return coordinate;
}
/**
* Sets coordinate.
*
* @param coordinate the coordinate
*/
public void setCoordinate(Coordinate coordinate) {
this.coordinate = coordinate;
}
/**
* Gets timezone.
*
* @return the timezone
*/
public ZoneId getTimezone() {
return timezone;
}
/**
* Sets timezone.
*
* @param timezone the timezone
*/
public void setTimezone(ZoneId timezone) {
this.timezone = timezone;
}
/**
* Gets timezone offset.
*
* @return the timezone offset
*/
public ZoneOffset getTimezoneOffset() {
return timezoneOffset;
}
/**
* Sets timezone offset.
*
* @param timezoneOffset the timezone offset
*/
public void setTimezoneOffset(ZoneOffset timezoneOffset) {
this.timezoneOffset = timezoneOffset;
}
/**
* Gets historical weather.
*
* @return the historical weather
*/
public HistoricalWeather getHistoricalWeather() {
return historicalWeather;
}
/**
* Sets historical weather.
*
* @param historicalWeather the historical weather
*/
public void setHistoricalWeather(HistoricalWeather historicalWeather) {
this.historicalWeather = historicalWeather;
}
/**
* Gets hourly list.
*
* @return the hourly list
*/
public List<HourlyHistorical> getHourlyList() {
return hourlyList;
}
/**
* Sets hourly list.
*
* @param hourlyList the hourly list
*/
public void setHourlyList(List<HourlyHistorical> hourlyList) {
this.hourlyList = hourlyList;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
HistoricalWeatherData that = (HistoricalWeatherData) o;
return Objects.equals(coordinate, that.coordinate) &&
Objects.equals(timezone, that.timezone) &&
Objects.equals(timezoneOffset, that.timezoneOffset) &&
Objects.equals(historicalWeather, that.historicalWeather) &&
Objects.equals(hourlyList, that.hourlyList);
}
@Override
public int hashCode() {
return Objects.hash(coordinate, timezone, timezoneOffset, historicalWeather, hourlyList);
}
@Override
public String toString() {
return "Historical weather data for " + coordinate + ".";
}
}

255
src/main/java/com/github/prominence/openweathermap/api/model/onecall/historical/HourlyHistorical.java Normal file
View File

@ -0,0 +1,255 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall.historical;
import com.github.prominence.openweathermap.api.model.Clouds;
import com.github.prominence.openweathermap.api.model.Humidity;
import com.github.prominence.openweathermap.api.model.WeatherState;
import com.github.prominence.openweathermap.api.model.onecall.*;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* The type Hourly historical.
*/
public class HourlyHistorical {
private LocalDateTime forecastTime;
private WeatherState weatherState;
private Temperature temperature;
private AtmosphericPressure atmosphericPressure;
private Humidity humidity;
private Clouds clouds;
private Double visibilityInMetres;
private Wind wind;
private Rain rain;
private Snow snow;
/**
* Gets forecast time.
*
* @return the forecast time
*/
public LocalDateTime getForecastTime() {
return forecastTime;
}
/**
* Sets forecast time.
*
* @param forecastTime the forecast time
*/
public void setForecastTime(LocalDateTime forecastTime) {
this.forecastTime = forecastTime;
}
/**
* Gets weather state.
*
* @return the weather state
*/
public WeatherState getWeatherState() {
return weatherState;
}
/**
* Sets weather state.
*
* @param weatherState the weather state
*/
public void setWeatherState(WeatherState weatherState) {
this.weatherState = weatherState;
}
/**
* Gets temperature.
*
* @return the temperature
*/
public Temperature getTemperature() {
return temperature;
}
/**
* Sets temperature.
*
* @param temperature the temperature
*/
public void setTemperature(Temperature temperature) {
this.temperature = temperature;
}
/**
* Gets atmospheric pressure.
*
* @return the atmospheric pressure
*/
public AtmosphericPressure getAtmosphericPressure() {
return atmosphericPressure;
}
/**
* Sets atmospheric pressure.
*
* @param atmosphericPressure the atmospheric pressure
*/
public void setAtmosphericPressure(AtmosphericPressure atmosphericPressure) {
this.atmosphericPressure = atmosphericPressure;
}
/**
* Gets humidity.
*
* @return the humidity
*/
public Humidity getHumidity() {
return humidity;
}
/**
* Sets humidity.
*
* @param humidity the humidity
*/
public void setHumidity(Humidity humidity) {
this.humidity = humidity;
}
/**
* Gets clouds.
*
* @return the clouds
*/
public Clouds getClouds() {
return clouds;
}
/**
* Sets clouds.
*
* @param clouds the clouds
*/
public void setClouds(Clouds clouds) {
this.clouds = clouds;
}
/**
* Gets visibility in metres.
*
* @return the visibility in metres
*/
public Double getVisibilityInMetres() {
return visibilityInMetres;
}
/**
* Sets visibility in metres.
*
* @param visibilityInMetres the visibility in metres
*/
public void setVisibilityInMetres(Double visibilityInMetres) {
this.visibilityInMetres = visibilityInMetres;
}
/**
* Gets wind.
*
* @return the wind
*/
public Wind getWind() {
return wind;
}
/**
* Sets wind.
*
* @param wind the wind
*/
public void setWind(Wind wind) {
this.wind = wind;
}
/**
* Gets rain.
*
* @return the rain
*/
public Rain getRain() {
return rain;
}
/**
* Sets rain.
*
* @param rain the rain
*/
public void setRain(Rain rain) {
this.rain = rain;
}
/**
* Gets snow.
*
* @return the snow
*/
public Snow getSnow() {
return snow;
}
/**
* Sets snow.
*
* @param snow the snow
*/
public void setSnow(Snow snow) {
this.snow = snow;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
HourlyHistorical that = (HourlyHistorical) o;
return Objects.equals(forecastTime, that.forecastTime) &&
Objects.equals(weatherState, that.weatherState) &&
Objects.equals(temperature, that.temperature) &&
Objects.equals(atmosphericPressure, that.atmosphericPressure) &&
Objects.equals(humidity, that.humidity) &&
Objects.equals(clouds, that.clouds) &&
Objects.equals(visibilityInMetres, that.visibilityInMetres) &&
Objects.equals(wind, that.wind) &&
Objects.equals(rain, that.rain) &&
Objects.equals(snow, that.snow);
}
@Override
public int hashCode() {
return Objects.hash(forecastTime, weatherState, temperature, atmosphericPressure, humidity, clouds, visibilityInMetres, wind, rain, snow);
}
@Override
public String toString() {
return "Historical hourly information forecasted for " + forecastTime + ".";
}
}

30
src/main/java/com/github/prominence/openweathermap/api/model/weather/Location.java
View File

@ -36,8 +36,8 @@ public class Location {
private String name; private String name;
private String countryCode; private String countryCode;
private LocalDateTime sunrise; private LocalDateTime sunriseTime;
private LocalDateTime sunset; private LocalDateTime sunsetTime;
private ZoneOffset zoneOffset; private ZoneOffset zoneOffset;
private Coordinate coordinate; private Coordinate coordinate;
@ -112,32 +112,32 @@ public class Location {
* Returns location sunrise time. * Returns location sunrise time.
* @return sunrise time * @return sunrise time
*/ */
public LocalDateTime getSunrise() { public LocalDateTime getSunriseTime() {
return sunrise; return sunriseTime;
} }
/** /**
* Sets location sunrise time. * Sets location sunrise time.
* @param sunrise sunrise time * @param sunriseTime sunrise time
*/ */
public void setSunrise(LocalDateTime sunrise) { public void setSunriseTime(LocalDateTime sunriseTime) {
this.sunrise = sunrise; this.sunriseTime = sunriseTime;
} }
/** /**
* Returns location sunset time. * Returns location sunset time.
* @return sunset time * @return sunset time
*/ */
public LocalDateTime getSunset() { public LocalDateTime getSunsetTime() {
return sunset; return sunsetTime;
} }
/** /**
* Sets location sunset time. * Sets location sunset time.
* @param sunset sunset time * @param sunsetTime sunset time
*/ */
public void setSunset(LocalDateTime sunset) { public void setSunsetTime(LocalDateTime sunsetTime) {
this.sunset = sunset; this.sunsetTime = sunsetTime;
} }
/** /**
@ -180,15 +180,15 @@ public class Location {
return id == location.id && return id == location.id &&
Objects.equals(name, location.name) && Objects.equals(name, location.name) &&
Objects.equals(countryCode, location.countryCode) && Objects.equals(countryCode, location.countryCode) &&
Objects.equals(sunrise, location.sunrise) && Objects.equals(sunriseTime, location.sunriseTime) &&
Objects.equals(sunset, location.sunset) && Objects.equals(sunsetTime, location.sunsetTime) &&
Objects.equals(zoneOffset, location.zoneOffset) && Objects.equals(zoneOffset, location.zoneOffset) &&
Objects.equals(coordinate, location.coordinate); Objects.equals(coordinate, location.coordinate);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(id, name, countryCode, sunrise, sunset, zoneOffset, coordinate); return Objects.hash(id, name, countryCode, sunriseTime, sunsetTime, zoneOffset, coordinate);
} }
@Override @Override

74
src/main/java/com/github/prominence/openweathermap/api/model/weather/Rain.java
View File

@ -30,8 +30,8 @@ import java.util.Objects;
public class Rain { public class Rain {
private static final String DEFAULT_UNIT = "mm"; private static final String DEFAULT_UNIT = "mm";
private Double oneHourRainLevel; private Double oneHourLevel;
private Double threeHourRainLevel; private Double threeHourLevel;
private Rain() { private Rain() {
} }
@ -39,38 +39,38 @@ public class Rain {
/** /**
* Creates {@link Rain} object with correctness check. * Creates {@link Rain} object with correctness check.
* *
* @param oneHourRainLevel 1-hour rain level value * @param oneHourLevel 1-hour rain level value
* @return rain object. * @return rain object.
*/ */
public static Rain withOneHourLevelValue(double oneHourRainLevel) { public static Rain withOneHourLevelValue(double oneHourLevel) {
Rain rain = new Rain(); final Rain rain = new Rain();
rain.setOneHourRainLevel(oneHourRainLevel); rain.setOneHourLevel(oneHourLevel);
return rain; return rain;
} }
/** /**
* Creates {@link Rain} object with correctness check. * Creates {@link Rain} object with correctness check.
* *
* @param threeHourRainLevel 3-hour rain level value * @param threeHourLevel 3-hour rain level value
* @return rain object. * @return rain object.
*/ */
public static Rain withThreeHourLevelValue(double threeHourRainLevel) { public static Rain withThreeHourLevelValue(double threeHourLevel) {
Rain rain = new Rain(); final Rain rain = new Rain();
rain.setThreeHourRainLevel(threeHourRainLevel); rain.setThreeHourLevel(threeHourLevel);
return rain; return rain;
} }
/** /**
* Creates {@link Rain} object with correctness check. * Creates {@link Rain} object with correctness check.
* *
* @param oneHourRainLevel the one hour rain level * @param oneHourLevel the one hour rain level
* @param threeHourRainLevel the three hour rain level * @param threeHourLevel the three hour rain level
* @return the rain * @return the rain
*/ */
public static Rain withValues(double oneHourRainLevel, double threeHourRainLevel) { public static Rain withValues(double oneHourLevel, double threeHourLevel) {
Rain rain = new Rain(); final Rain rain = new Rain();
rain.setOneHourRainLevel(oneHourRainLevel); rain.setOneHourLevel(oneHourLevel);
rain.setThreeHourRainLevel(threeHourRainLevel); rain.setThreeHourLevel(threeHourLevel);
return rain; return rain;
} }
@ -79,20 +79,20 @@ public class Rain {
* *
* @return the one hour rain level * @return the one hour rain level
*/ */
public Double getOneHourRainLevel() { public Double getOneHourLevel() {
return oneHourRainLevel; return oneHourLevel;
} }
/** /**
* Sets one hour rain level. * Sets one hour rain level.
* *
* @param oneHourRainLevel the one hour rain level * @param oneHourLevel the one hour rain level
*/ */
public void setOneHourRainLevel(double oneHourRainLevel) { public void setOneHourLevel(double oneHourLevel) {
if (oneHourRainLevel < 0) { if (oneHourLevel < 0) {
throw new IllegalArgumentException("Rain level value cannot be negative."); throw new IllegalArgumentException("Rain level value cannot be negative.");
} }
this.oneHourRainLevel = oneHourRainLevel; this.oneHourLevel = oneHourLevel;
} }
/** /**
@ -100,20 +100,20 @@ public class Rain {
* *
* @return the three hour rain level * @return the three hour rain level
*/ */
public Double getThreeHourRainLevel() { public Double getThreeHourLevel() {
return threeHourRainLevel; return threeHourLevel;
} }
/** /**
* Sets three hour rain level. * Sets three hour rain level.
* *
* @param threeHourRainLevel the three hour rain level * @param threeHourLevel the three hour rain level
*/ */
public void setThreeHourRainLevel(double threeHourRainLevel) { public void setThreeHourLevel(double threeHourLevel) {
if (threeHourRainLevel < 0) { if (threeHourLevel < 0) {
throw new IllegalArgumentException("Rain level value cannot be negative."); throw new IllegalArgumentException("Rain level value cannot be negative.");
} }
this.threeHourRainLevel = threeHourRainLevel; this.threeHourLevel = threeHourLevel;
} }
/** /**
@ -130,29 +130,29 @@ public class Rain {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof Rain)) return false; if (!(o instanceof Rain)) return false;
Rain rain = (Rain) o; Rain rain = (Rain) o;
return Objects.equals(oneHourRainLevel, rain.oneHourRainLevel) && return Objects.equals(oneHourLevel, rain.oneHourLevel) &&
Objects.equals(threeHourRainLevel, rain.threeHourRainLevel); Objects.equals(threeHourLevel, rain.threeHourLevel);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(oneHourRainLevel, threeHourRainLevel); return Objects.hash(oneHourLevel, threeHourLevel);
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder snowString = new StringBuilder(); final StringBuilder snowString = new StringBuilder();
if (oneHourRainLevel != null) { if (oneHourLevel != null) {
snowString.append("1-hour rain level: "); snowString.append("1-hour rain level: ");
snowString.append(oneHourRainLevel); snowString.append(oneHourLevel);
snowString.append(getUnit()); snowString.append(getUnit());
} }
if (threeHourRainLevel != null) { if (threeHourLevel != null) {
if (oneHourRainLevel != null) { if (oneHourLevel != null) {
snowString.append(", "); snowString.append(", ");
} }
snowString.append("3-hours rain level: "); snowString.append("3-hours rain level: ");
snowString.append(threeHourRainLevel); snowString.append(threeHourLevel);
snowString.append(getUnit()); snowString.append(getUnit());
} }
return snowString.toString(); return snowString.toString();

74
src/main/java/com/github/prominence/openweathermap/api/model/weather/Snow.java
View File

@ -30,8 +30,8 @@ import java.util.Objects;
public class Snow { public class Snow {
private static final String DEFAULT_UNIT = "mm"; private static final String DEFAULT_UNIT = "mm";
private Double oneHourSnowLevel; private Double oneHourLevel;
private Double threeHourSnowLevel; private Double threeHourLevel;
private Snow() { private Snow() {
} }
@ -39,38 +39,38 @@ public class Snow {
/** /**
* Creates {@link Snow} object with correctness check. * Creates {@link Snow} object with correctness check.
* *
* @param oneHourSnowLevel 1-hour snow level value * @param oneHourLevel 1-hour snow level value
* @return snow object. * @return snow object.
*/ */
public static Snow withOneHourLevelValue(double oneHourSnowLevel) { public static Snow withOneHourLevelValue(double oneHourLevel) {
Snow snow = new Snow(); final Snow snow = new Snow();
snow.setOneHourSnowLevel(oneHourSnowLevel); snow.setOneHourLevel(oneHourLevel);
return snow; return snow;
} }
/** /**
* Creates {@link Snow} object with correctness check. * Creates {@link Snow} object with correctness check.
* *
* @param threeHourSnowLevel 3-hour snow level value * @param threeHourLevel 3-hour snow level value
* @return snow object. * @return snow object.
*/ */
public static Snow withThreeHourLevelValue(double threeHourSnowLevel) { public static Snow withThreeHourLevelValue(double threeHourLevel) {
Snow snow = new Snow(); final Snow snow = new Snow();
snow.setThreeHourSnowLevel(threeHourSnowLevel); snow.setThreeHourLevel(threeHourLevel);
return snow; return snow;
} }
/** /**
* Creates {@link Snow} object with correctness check. * Creates {@link Snow} object with correctness check.
* *
* @param oneHourSnowLevel the one hour snow level * @param oneHourLevel the one hour snow level
* @param threeHourSnowLevel the three hour snow level * @param threeHourLevel the three hour snow level
* @return the snow * @return the snow
*/ */
public static Snow withValues(double oneHourSnowLevel, double threeHourSnowLevel) { public static Snow withValues(double oneHourLevel, double threeHourLevel) {
Snow snow = new Snow(); final Snow snow = new Snow();
snow.setOneHourSnowLevel(oneHourSnowLevel); snow.setOneHourLevel(oneHourLevel);
snow.setThreeHourSnowLevel(threeHourSnowLevel); snow.setThreeHourLevel(threeHourLevel);
return snow; return snow;
} }
@ -79,20 +79,20 @@ public class Snow {
* *
* @return the one hour snow level * @return the one hour snow level
*/ */
public Double getOneHourSnowLevel() { public Double getOneHourLevel() {
return oneHourSnowLevel; return oneHourLevel;
} }
/** /**
* Sets one hour snow level. * Sets one hour snow level.
* *
* @param oneHourSnowLevel the one hour snow level * @param oneHourLevel the one hour snow level
*/ */
public void setOneHourSnowLevel(double oneHourSnowLevel) { public void setOneHourLevel(double oneHourLevel) {
if (oneHourSnowLevel < 0) { if (oneHourLevel < 0) {
throw new IllegalArgumentException("Snow level value cannot be negative."); throw new IllegalArgumentException("Snow level value cannot be negative.");
} }
this.oneHourSnowLevel = oneHourSnowLevel; this.oneHourLevel = oneHourLevel;
} }
/** /**
@ -100,20 +100,20 @@ public class Snow {
* *
* @return the three hour snow level * @return the three hour snow level
*/ */
public Double getThreeHourSnowLevel() { public Double getThreeHourLevel() {
return threeHourSnowLevel; return threeHourLevel;
} }
/** /**
* Sets three hour snow level. * Sets three hour snow level.
* *
* @param threeHourSnowLevel the three hour snow level * @param threeHourLevel the three hour snow level
*/ */
public void setThreeHourSnowLevel(double threeHourSnowLevel) { public void setThreeHourLevel(double threeHourLevel) {
if (threeHourSnowLevel < 0) { if (threeHourLevel < 0) {
throw new IllegalArgumentException("Snow level value cannot be negative."); throw new IllegalArgumentException("Snow level value cannot be negative.");
} }
this.threeHourSnowLevel = threeHourSnowLevel; this.threeHourLevel = threeHourLevel;
} }
/** /**
@ -130,29 +130,29 @@ public class Snow {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof Snow)) return false; if (!(o instanceof Snow)) return false;
Snow snow = (Snow) o; Snow snow = (Snow) o;
return Objects.equals(oneHourSnowLevel, snow.oneHourSnowLevel) && return Objects.equals(oneHourLevel, snow.oneHourLevel) &&
Objects.equals(threeHourSnowLevel, snow.threeHourSnowLevel); Objects.equals(threeHourLevel, snow.threeHourLevel);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(oneHourSnowLevel, threeHourSnowLevel); return Objects.hash(oneHourLevel, threeHourLevel);
} }
@Override @Override
public String toString() { public String toString() {
StringBuilder snowString = new StringBuilder(); final StringBuilder snowString = new StringBuilder();
if (oneHourSnowLevel != null) { if (oneHourLevel != null) {
snowString.append("1-hour snow level: "); snowString.append("1-hour snow level: ");
snowString.append(oneHourSnowLevel); snowString.append(oneHourLevel);
snowString.append(getUnit()); snowString.append(getUnit());
} }
if (threeHourSnowLevel != null) { if (threeHourLevel != null) {
if (oneHourSnowLevel != null) { if (oneHourLevel != null) {
snowString.append(", "); snowString.append(", ");
} }
snowString.append("3-hours snow level: "); snowString.append("3-hours snow level: ");
snowString.append(threeHourSnowLevel); snowString.append(threeHourLevel);
snowString.append(getUnit()); snowString.append(getUnit());
} }
return snowString.toString(); return snowString.toString();

151
src/main/java/com/github/prominence/openweathermap/api/model/weather/Weather.java
View File

@ -31,12 +31,9 @@ import java.util.Objects;
* Represents weather information. * Represents weather information.
*/ */
public class Weather { public class Weather {
private String state; private LocalDateTime calculationTime;
private String description;
private String weatherIconId;
private LocalDateTime calculatedOn;
private WeatherState weatherState;
private Temperature temperature; private Temperature temperature;
private AtmosphericPressure atmosphericPressure; private AtmosphericPressure atmosphericPressure;
private Humidity humidity; private Humidity humidity;
@ -48,116 +45,40 @@ public class Weather {
private Location location; private Location location;
private Weather(String state, String description) {
this.state = state;
this.description = description;
}
/**
* For value weather.
*
* @param state the state
* @param description the description
* @return the weather
*/
public static Weather forValue(String state, String description) {
if (state == null) {
throw new IllegalArgumentException("State must be set.");
}
if (description == null) {
throw new IllegalArgumentException("Description must be set.");
}
return new Weather(state, description);
}
/**
* Gets state.
*
* @return the state
*/
public String getState() {
return state;
}
/**
* Sets state.
*
* @param state the state
*/
public void setState(String state) {
if (state == null) {
throw new IllegalArgumentException("State must be set.");
}
this.state = state;
}
/**
* Gets description.
*
* @return the description
*/
public String getDescription() {
return description;
}
/**
* Sets description.
*
* @param description the description
*/
public void setDescription(String description) {
if (description == null) {
throw new IllegalArgumentException("Description must be set.");
}
this.description = description;
}
/**
* Gets weather icon ID.
*
* @return the weather icon ID
*/
public String getWeatherIconId() {
return weatherIconId;
}
/**
* Sets weather icon ID.
*
* @param weatherIconId the weather icon ID
*/
public void setWeatherIconId(String weatherIconId) {
this.weatherIconId = weatherIconId;
}
/**
* Gets weather icon url.
*
* @return the weather icon url
*/
public String getWeatherIconUrl() {
if (weatherIconId != null) {
return "http://openweathermap.org/img/w/" + weatherIconId + ".png";
}
return null;
}
/** /**
* Gets calculated on. * Gets calculated on.
* *
* @return the calculated on * @return the calculated on
*/ */
public LocalDateTime getCalculatedOn() { public LocalDateTime getCalculationTime() {
return calculatedOn; return calculationTime;
} }
/** /**
* Sets calculated on. * Sets calculated on.
* *
* @param calculatedOn the calculated on * @param calculationTime the calculated on
*/ */
public void setCalculatedOn(LocalDateTime calculatedOn) { public void setCalculationTime(LocalDateTime calculationTime) {
this.calculatedOn = calculatedOn; this.calculationTime = calculationTime;
}
/**
* Gets weather state.
*
* @return the weather state
*/
public WeatherState getWeatherState() {
return weatherState;
}
/**
* Sets weather state.
*
* @param weatherState the weather state
*/
public void setWeatherState(WeatherState weatherState) {
this.weatherState = weatherState;
} }
/** /**
@ -309,10 +230,8 @@ public class Weather {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof Weather)) return false; if (!(o instanceof Weather)) return false;
Weather weather = (Weather) o; Weather weather = (Weather) o;
return Objects.equals(state, weather.state) && return Objects.equals(calculationTime, weather.calculationTime) &&
Objects.equals(description, weather.description) && Objects.equals(weatherState, weather.weatherState) &&
Objects.equals(weatherIconId, weather.weatherIconId) &&
Objects.equals(calculatedOn, weather.calculatedOn) &&
Objects.equals(temperature, weather.temperature) && Objects.equals(temperature, weather.temperature) &&
Objects.equals(atmosphericPressure, weather.atmosphericPressure) && Objects.equals(atmosphericPressure, weather.atmosphericPressure) &&
Objects.equals(humidity, weather.humidity) && Objects.equals(humidity, weather.humidity) &&
@ -325,7 +244,7 @@ public class Weather {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(state, description, weatherIconId, calculatedOn, temperature, atmosphericPressure, humidity, wind, rain, snow, clouds, location); return Objects.hash(calculationTime, weatherState, temperature, atmosphericPressure, humidity, wind, rain, snow, clouds, location);
} }
@Override @Override
@ -342,8 +261,10 @@ public class Weather {
stringBuilder.append(')'); stringBuilder.append(')');
} }
} }
stringBuilder.append(", Weather: "); if (weatherState != null) {
stringBuilder.append(description); stringBuilder.append(", Weather: ");
stringBuilder.append(weatherState.getDescription());
}
if (temperature != null) { if (temperature != null) {
stringBuilder.append(", "); stringBuilder.append(", ");
stringBuilder.append(temperature.getValue()); stringBuilder.append(temperature.getValue());
@ -360,15 +281,15 @@ public class Weather {
stringBuilder.append(", "); stringBuilder.append(", ");
stringBuilder.append(clouds.toString()); stringBuilder.append(clouds.toString());
} }
if (rain != null && rain.getOneHourRainLevel() != null) { if (rain != null && rain.getOneHourLevel() != null) {
stringBuilder.append(", Rain: "); stringBuilder.append(", Rain: ");
stringBuilder.append(rain.getOneHourRainLevel()); stringBuilder.append(rain.getOneHourLevel());
stringBuilder.append(' '); stringBuilder.append(' ');
stringBuilder.append(rain.getUnit()); stringBuilder.append(rain.getUnit());
} }
if (snow != null && snow.getOneHourSnowLevel() != null) { if (snow != null && snow.getOneHourLevel() != null) {
stringBuilder.append(", Snow: "); stringBuilder.append(", Snow: ");
stringBuilder.append(snow.getOneHourSnowLevel()); stringBuilder.append(snow.getOneHourLevel());
stringBuilder.append(' '); stringBuilder.append(' ');
stringBuilder.append(snow.getUnit()); stringBuilder.append(snow.getUnit());
} }

1
src/main/java/com/github/prominence/openweathermap/api/request/forecast/free/FiveDayThreeHourStepForecastAsyncRequestTerminatorImpl.java
View File

@ -33,7 +33,6 @@ import java.util.concurrent.CompletableFuture;
* Async request terminator. * Async request terminator.
*/ */
public class FiveDayThreeHourStepForecastAsyncRequestTerminatorImpl implements FiveDayThreeHourStepForecastAsyncRequestTerminator { public class FiveDayThreeHourStepForecastAsyncRequestTerminatorImpl implements FiveDayThreeHourStepForecastAsyncRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

1
src/main/java/com/github/prominence/openweathermap/api/request/forecast/free/FiveDayThreeHourStepForecastRequestCustomizer.java
View File

@ -28,7 +28,6 @@ import com.github.prominence.openweathermap.api.request.RequestCustomizer;
* The forecast request customizer interface. * The forecast request customizer interface.
*/ */
public interface FiveDayThreeHourStepForecastRequestCustomizer extends RequestCustomizer<FiveDayThreeHourStepForecastRequestCustomizer> { public interface FiveDayThreeHourStepForecastRequestCustomizer extends RequestCustomizer<FiveDayThreeHourStepForecastRequestCustomizer> {
/** /**
* Count customizer. * Count customizer.
* *

14
src/main/java/com/github/prominence/openweathermap/api/request/forecast/free/FiveDayThreeHourStepForecastRequestCustomizerImpl.java
View File

@ -30,7 +30,6 @@ import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
* The forecast request customizer. * The forecast request customizer.
*/ */
public class FiveDayThreeHourStepForecastRequestCustomizerImpl implements FiveDayThreeHourStepForecastRequestCustomizer { public class FiveDayThreeHourStepForecastRequestCustomizerImpl implements FiveDayThreeHourStepForecastRequestCustomizer {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private Language language; private Language language;
@ -66,15 +65,20 @@ public class FiveDayThreeHourStepForecastRequestCustomizerImpl implements FiveDa
@Override @Override
public FiveDayThreeHourStepForecastRequestTerminator retrieve() { public FiveDayThreeHourStepForecastRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem); applyCustomization();
urlBuilder.addRequestParameter("cnt", count);
return new FiveDayThreeHourStepForecastRequestTerminatorImpl(urlBuilder, unitSystem); return new FiveDayThreeHourStepForecastRequestTerminatorImpl(urlBuilder, unitSystem);
} }
@Override @Override
public FiveDayThreeHourStepForecastAsyncRequestTerminator retrieveAsync() { public FiveDayThreeHourStepForecastAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem); applyCustomization();
urlBuilder.addRequestParameter("cnt", count);
return new FiveDayThreeHourStepForecastAsyncRequestTerminatorImpl(urlBuilder, unitSystem); return new FiveDayThreeHourStepForecastAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
} }
private void applyCustomization() {
urlBuilder.applyCustomization(language, unitSystem);
if (count >= 0) {
urlBuilder.addRequestParameter("cnt", count);
}
}
} }

1
src/main/java/com/github/prominence/openweathermap/api/request/forecast/free/FiveDayThreeHourStepForecastRequestTerminatorImpl.java
View File

@ -31,7 +31,6 @@ import com.github.prominence.openweathermap.api.utils.RequestUtils;
* The forecast request terminator. * The forecast request terminator.
*/ */
public class FiveDayThreeHourStepForecastRequestTerminatorImpl implements FiveDayThreeHourStepForecastRequestTerminator { public class FiveDayThreeHourStepForecastRequestTerminatorImpl implements FiveDayThreeHourStepForecastRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

1
src/main/java/com/github/prominence/openweathermap/api/request/forecast/free/FiveDayThreeHourStepForecastRequesterImpl.java
View File

@ -29,7 +29,6 @@ import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
* The forecast requester. * The forecast requester.
*/ */
public class FiveDayThreeHourStepForecastRequesterImpl implements FiveDayThreeHourStepForecastRequester { public class FiveDayThreeHourStepForecastRequesterImpl implements FiveDayThreeHourStepForecastRequester {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
/** /**

73
src/main/java/com/github/prominence/openweathermap/api/request/forecast/free/FiveDayThreeHourStepForecastResponseMapper.java
View File

@ -22,6 +22,7 @@
package com.github.prominence.openweathermap.api.request.forecast.free; package com.github.prominence.openweathermap.api.request.forecast.free;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.prominence.openweathermap.api.enums.UnitSystem; import com.github.prominence.openweathermap.api.enums.UnitSystem;
@ -32,7 +33,6 @@ import com.github.prominence.openweathermap.api.model.forecast.Rain;
import com.github.prominence.openweathermap.api.model.forecast.Snow; import com.github.prominence.openweathermap.api.model.forecast.Snow;
import com.github.prominence.openweathermap.api.model.Temperature; import com.github.prominence.openweathermap.api.model.Temperature;
import java.io.IOException;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
@ -87,7 +87,6 @@ import java.util.TimeZone;
* |- city.timezone Shift in seconds from UTC * |- city.timezone Shift in seconds from UTC
*/ */
public class FiveDayThreeHourStepForecastResponseMapper { public class FiveDayThreeHourStepForecastResponseMapper {
private final UnitSystem unitSystem; private final UnitSystem unitSystem;
/** /**
@ -106,12 +105,12 @@ public class FiveDayThreeHourStepForecastResponseMapper {
* @return the forecast * @return the forecast
*/ */
public Forecast mapToForecast(String json) { public Forecast mapToForecast(String json) {
ObjectMapper objectMapper = new ObjectMapper(); final ObjectMapper objectMapper = new ObjectMapper();
Forecast forecast; Forecast forecast;
try { try {
JsonNode root = objectMapper.readTree(json); final JsonNode root = objectMapper.readTree(json);
forecast = mapToForecast(root); forecast = mapToForecast(root);
} catch (IOException e) { } catch (JsonProcessingException e) {
throw new RuntimeException("Cannot parse Forecast response"); throw new RuntimeException("Cannot parse Forecast response");
} }
@ -119,12 +118,12 @@ public class FiveDayThreeHourStepForecastResponseMapper {
} }
private Forecast mapToForecast(JsonNode root) { private Forecast mapToForecast(JsonNode root) {
Forecast forecast = new Forecast(); final Forecast forecast = new Forecast();
forecast.setLocation(parseLocation(root.get("city"))); forecast.setLocation(parseLocation(root.get("city")));
List<WeatherForecast> forecasts = new ArrayList<>(root.get("cnt").asInt()); final List<WeatherForecast> forecasts = new ArrayList<>(root.get("cnt").asInt());
JsonNode forecastListNode = root.get("list"); final JsonNode forecastListNode = root.get("list");
forecastListNode.forEach(forecastNode -> forecasts.add(parseWeatherForecast(forecastNode))); forecastListNode.forEach(forecastNode -> forecasts.add(parseWeatherForecast(forecastNode)));
forecast.setWeatherForecasts(forecasts); forecast.setWeatherForecasts(forecasts);
@ -133,14 +132,14 @@ public class FiveDayThreeHourStepForecastResponseMapper {
} }
private WeatherForecast parseWeatherForecast(JsonNode rootNode) { private WeatherForecast parseWeatherForecast(JsonNode rootNode) {
JsonNode weatherNode = rootNode.get("weather").get(0); final WeatherForecast weatherForecast = new WeatherForecast();
WeatherForecast weatherForecast = WeatherForecast.forValue( final JsonNode weatherArrayNode = rootNode.get("weather");
weatherNode.get("main").asText(), if (weatherArrayNode != null) {
weatherNode.get("description").asText() final JsonNode weatherNode = weatherArrayNode.get(0);
); weatherForecast.setWeatherState(parseWeatherState(weatherNode));
weatherForecast.setWeatherIconId(weatherNode.get("icon").asText()); }
JsonNode mainNode = rootNode.get("main"); final JsonNode mainNode = rootNode.get("main");
weatherForecast.setTemperature(parseTemperature(mainNode)); weatherForecast.setTemperature(parseTemperature(mainNode));
weatherForecast.setAtmosphericPressure(parsePressure(mainNode)); weatherForecast.setAtmosphericPressure(parsePressure(mainNode));
weatherForecast.setHumidity(parseHumidity(mainNode)); weatherForecast.setHumidity(parseHumidity(mainNode));
@ -149,7 +148,7 @@ public class FiveDayThreeHourStepForecastResponseMapper {
weatherForecast.setRain(parseRain(rootNode)); weatherForecast.setRain(parseRain(rootNode));
weatherForecast.setSnow(parseSnow(rootNode)); weatherForecast.setSnow(parseSnow(rootNode));
JsonNode sysNode = rootNode.get("sys"); final JsonNode sysNode = rootNode.get("sys");
if (sysNode != null) { if (sysNode != null) {
weatherForecast.setDayTime("d".equals(sysNode.get("pod").asText()) ? DayTime.DAY : DayTime.NIGHT); weatherForecast.setDayTime("d".equals(sysNode.get("pod").asText()) ? DayTime.DAY : DayTime.NIGHT);
} }
@ -160,9 +159,23 @@ public class FiveDayThreeHourStepForecastResponseMapper {
return weatherForecast; return weatherForecast;
} }
private WeatherState parseWeatherState(JsonNode weatherNode) {
if (weatherNode == null) {
return null;
}
final WeatherState weatherState = new WeatherState(
weatherNode.get("id").asInt(),
weatherNode.get("main").asText(),
weatherNode.get("description").asText()
);
weatherState.setIconId(weatherNode.get("icon").asText());
return weatherState;
}
private Temperature parseTemperature(JsonNode rootNode) { private Temperature parseTemperature(JsonNode rootNode) {
final double tempValue = rootNode.get("temp").asDouble(); final double tempValue = rootNode.get("temp").asDouble();
Temperature temperature = Temperature.withValue(tempValue, unitSystem.getTemperatureUnit()); final Temperature temperature = Temperature.withValue(tempValue, unitSystem.getTemperatureUnit());
final JsonNode tempMaxNode = rootNode.get("temp_max"); final JsonNode tempMaxNode = rootNode.get("temp_max");
if (tempMaxNode != null) { if (tempMaxNode != null) {
@ -172,7 +185,7 @@ public class FiveDayThreeHourStepForecastResponseMapper {
if (tempMinNode != null) { if (tempMinNode != null) {
temperature.setMinTemperature(tempMinNode.asDouble()); temperature.setMinTemperature(tempMinNode.asDouble());
} }
final JsonNode tempFeelsLike = rootNode.get("fells_like"); final JsonNode tempFeelsLike = rootNode.get("feels_like");
if (tempFeelsLike != null) { if (tempFeelsLike != null) {
temperature.setFeelsLike(tempFeelsLike.asDouble()); temperature.setFeelsLike(tempFeelsLike.asDouble());
} }
@ -181,7 +194,7 @@ public class FiveDayThreeHourStepForecastResponseMapper {
} }
private AtmosphericPressure parsePressure(JsonNode rootNode) { private AtmosphericPressure parsePressure(JsonNode rootNode) {
AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(rootNode.get("pressure").asDouble()); final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(rootNode.get("pressure").asDouble());
final JsonNode seaLevelNode = rootNode.get("sea_level"); final JsonNode seaLevelNode = rootNode.get("sea_level");
final JsonNode groundLevelNode = rootNode.get("grnd_level"); final JsonNode groundLevelNode = rootNode.get("grnd_level");
@ -203,7 +216,7 @@ public class FiveDayThreeHourStepForecastResponseMapper {
final JsonNode windNode = root.get("wind"); final JsonNode windNode = root.get("wind");
double speed = windNode.get("speed").asDouble(); double speed = windNode.get("speed").asDouble();
Wind wind = Wind.withValue(speed, unitSystem.getWindUnit()); final Wind wind = Wind.withValue(speed, unitSystem.getWindUnit());
final JsonNode degNode = windNode.get("deg"); final JsonNode degNode = windNode.get("deg");
if (degNode != null) { if (degNode != null) {
wind.setDegrees(degNode.asDouble()); wind.setDegrees(degNode.asDouble());
@ -228,26 +241,24 @@ public class FiveDayThreeHourStepForecastResponseMapper {
if (snowNode != null) { if (snowNode != null) {
final JsonNode threeHourNode = snowNode.get("3h"); final JsonNode threeHourNode = snowNode.get("3h");
if (threeHourNode != null) { if (threeHourNode != null) {
Rain.withThreeHourLevelValue(threeHourNode.asDouble()); return Snow.withThreeHourLevelValue(threeHourNode.asDouble());
} }
} }
return null; return null;
} }
private Clouds parseClouds(JsonNode rootNode) { private Clouds parseClouds(JsonNode rootNode) {
Clouds clouds = null;
final JsonNode cloudsNode = rootNode.get("clouds"); final JsonNode cloudsNode = rootNode.get("clouds");
final JsonNode allValueNode = cloudsNode.get("all"); final JsonNode allValueNode = cloudsNode.get("all");
if (allValueNode != null) { if (allValueNode != null) {
clouds = Clouds.withValue((byte) allValueNode.asInt()); return Clouds.withValue((byte) allValueNode.asInt());
} }
return clouds; return null;
} }
private Location parseLocation(JsonNode rootNode) { private Location parseLocation(JsonNode rootNode) {
Location location = Location.withValues(rootNode.get("id").asInt(), rootNode.get("name").asText()); final Location location = Location.withValues(rootNode.get("id").asInt(), rootNode.get("name").asText());
final JsonNode timezoneNode = rootNode.get("timezone"); final JsonNode timezoneNode = rootNode.get("timezone");
if (timezoneNode != null) { if (timezoneNode != null) {
@ -262,10 +273,10 @@ public class FiveDayThreeHourStepForecastResponseMapper {
final JsonNode sunriseNode = rootNode.get("sunrise"); final JsonNode sunriseNode = rootNode.get("sunrise");
final JsonNode sunsetNode = rootNode.get("sunset"); final JsonNode sunsetNode = rootNode.get("sunset");
if (sunriseNode != null) { if (sunriseNode != null) {
location.setSunrise(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunriseNode.asLong()), TimeZone.getDefault().toZoneId())); location.setSunriseTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunriseNode.asLong()), TimeZone.getDefault().toZoneId()));
} }
if (sunsetNode != null) { if (sunsetNode != null) {
location.setSunset(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunsetNode.asLong()), TimeZone.getDefault().toZoneId())); location.setSunsetTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunsetNode.asLong()), TimeZone.getDefault().toZoneId()));
} }
final JsonNode coordNode = rootNode.get("coord"); final JsonNode coordNode = rootNode.get("coord");
@ -282,10 +293,10 @@ public class FiveDayThreeHourStepForecastResponseMapper {
} }
private Coordinate parseCoordinate(JsonNode rootNode) { private Coordinate parseCoordinate(JsonNode rootNode) {
JsonNode latitudeNode = rootNode.get("lat"); final JsonNode latitudeNode = rootNode.get("lat");
JsonNode longitudeNode = rootNode.get("lon"); final JsonNode longitudeNode = rootNode.get("lon");
if (latitudeNode != null && longitudeNode != null) { if (latitudeNode != null && longitudeNode != null) {
return Coordinate.withValues(latitudeNode.asDouble(), longitudeNode.asDouble()); return Coordinate.of(latitudeNode.asDouble(), longitudeNode.asDouble());
} }
return null; return null;
} }

45
src/main/java/com/github/prominence/openweathermap/api/request/onecall/OneCallWeatherRequester.java Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall;
import com.github.prominence.openweathermap.api.request.onecall.current.OneCallCurrentWeatherRequester;
import com.github.prominence.openweathermap.api.request.onecall.historical.OneCallHistoricalWeatherRequester;
/**
* The interface One call weather requester.
*/
public interface OneCallWeatherRequester {
/**
* Current one call current weather requester.
*
* @return the one call current weather requester
*/
OneCallCurrentWeatherRequester current();
/**
* Historical one call historical weather requester.
*
* @return the one call historical weather requester
*/
OneCallHistoricalWeatherRequester historical();
}

55
src/main/java/com/github/prominence/openweathermap/api/request/onecall/OneCallWeatherRequesterImpl.java Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
import com.github.prominence.openweathermap.api.request.onecall.current.OneCallCurrentWeatherRequester;
import com.github.prominence.openweathermap.api.request.onecall.current.OneCallCurrentWeatherRequesterImpl;
import com.github.prominence.openweathermap.api.request.onecall.historical.OneCallHistoricalWeatherRequester;
import com.github.prominence.openweathermap.api.request.onecall.historical.OneCallHistoricalWeatherRequesterImpl;
/**
* The type One call weather requester.
*/
public class OneCallWeatherRequesterImpl implements OneCallWeatherRequester {
private final RequestUrlBuilder urlBuilder;
/**
* Instantiates a new One call weather requester.
*
* @param apiKey the api key
*/
public OneCallWeatherRequesterImpl(String apiKey) {
urlBuilder = new RequestUrlBuilder(apiKey);
}
@Override
public OneCallCurrentWeatherRequester current() {
return new OneCallCurrentWeatherRequesterImpl(urlBuilder);
}
@Override
public OneCallHistoricalWeatherRequester historical() {
return new OneCallHistoricalWeatherRequesterImpl(urlBuilder);
}
}

430
src/main/java/com/github/prominence/openweathermap/api/request/onecall/OneCallWeatherResponseMapper.java Normal file
View File

@ -0,0 +1,430 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.model.Clouds;
import com.github.prominence.openweathermap.api.model.Coordinate;
import com.github.prominence.openweathermap.api.model.Humidity;
import com.github.prominence.openweathermap.api.model.WeatherState;
import com.github.prominence.openweathermap.api.model.onecall.*;
import com.github.prominence.openweathermap.api.model.onecall.current.*;
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeather;
import com.github.prominence.openweathermap.api.model.onecall.historical.HourlyHistorical;
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.List;
import java.util.TimeZone;
/**
* Object mapper for OneCall API response.
*/
public class OneCallWeatherResponseMapper {
private final UnitSystem unitSystem;
/**
* Instantiates a new forecast response mapper.
*
* @param unitSystem the unit system
*/
public OneCallWeatherResponseMapper(UnitSystem unitSystem) {
this.unitSystem = unitSystem;
}
/**
* Maps current weather data response into java object.
*
* @param json the json string
* @return the current data object
*/
public CurrentWeatherData mapToCurrent(String json) {
final ObjectMapper objectMapper = new ObjectMapper();
CurrentWeatherData currentData;
try {
final JsonNode root = objectMapper.readTree(json);
currentData = mapToCurrent(root);
} catch (JsonProcessingException e) {
throw new RuntimeException("Cannot parse Forecast response");
}
return currentData;
}
/**
* Maps current weather data response into java object.
*
* @param json the json string
* @return the current data object
*/
public HistoricalWeatherData mapToHistorical(String json) {
final ObjectMapper objectMapper = new ObjectMapper();
HistoricalWeatherData historicalData;
try {
final JsonNode root = objectMapper.readTree(json);
historicalData = mapToHistorical(root);
} catch (JsonProcessingException e) {
throw new RuntimeException("Cannot parse Forecast response");
}
return historicalData;
}
private CurrentWeatherData mapToCurrent(JsonNode rootNode) {
final CurrentWeatherData currentData = new CurrentWeatherData();
currentData.setCoordinate(Coordinate.of(rootNode.get("lat").asDouble(), rootNode.get("lon").asDouble()));
currentData.setTimezone(ZoneId.of(rootNode.get("timezone").asText()));
currentData.setTimezoneOffset(ZoneOffset.ofTotalSeconds(rootNode.get("timezone_offset").asInt()));
currentData.setCurrent(parseCurrent(rootNode.get("current")));
currentData.setMinutelyList(parseMinutelyList(rootNode.get("minutely")));
currentData.setHourlyList(parseHourlyList(rootNode.get("hourly")));
currentData.setDailyList(parseDailyList(rootNode.get("daily")));
currentData.setAlerts(parseAlerts(rootNode.get("alerts")));
return currentData;
}
private Current parseCurrent(JsonNode currentNode) {
if (currentNode == null) {
return null;
}
final Current current = new Current();
current.setForecastTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(currentNode.get("dt").asInt()), TimeZone.getDefault().toZoneId()));
current.setSunriseTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(currentNode.get("sunrise").asInt()), TimeZone.getDefault().toZoneId()));
current.setSunsetTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(currentNode.get("sunset").asInt()), TimeZone.getDefault().toZoneId()));
current.setWeatherState(parseWeatherState(currentNode.get("weather").get(0)));
current.setTemperature(parseTemperature(currentNode));
current.setAtmosphericPressure(parsePressure(currentNode));
current.setHumidity(parseHumidity(currentNode));
current.setClouds(parseClouds(currentNode));
current.setUvIndex(currentNode.get("uvi").asDouble());
final JsonNode visibilityNode = currentNode.get("visibility");
if (visibilityNode != null) {
current.setVisibilityInMetres(visibilityNode.asDouble());
}
current.setWind(parseWind(currentNode));
current.setRain(parseRain(currentNode));
current.setSnow(parseSnow(currentNode));
return current;
}
private List<Minutely> parseMinutelyList(JsonNode minutelyListNode) {
if (minutelyListNode == null) {
return null;
}
final List<Minutely> minutelyList = new ArrayList<>();
for (final JsonNode minutelyNode : minutelyListNode) {
minutelyList.add(Minutely.withValue(
LocalDateTime.ofInstant(Instant.ofEpochSecond(minutelyNode.get("dt").asInt()), TimeZone.getDefault().toZoneId()),
minutelyNode.get("precipitation").asDouble()
));
}
return minutelyList;
}
private List<Hourly> parseHourlyList(JsonNode hourlyListNode) {
if (hourlyListNode == null) {
return null;
}
final List<Hourly> hourlyList = new ArrayList<>();
for (final JsonNode hourlyNode : hourlyListNode) {
final Hourly hourly = new Hourly();
hourly.setForecastTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(hourlyNode.get("dt").asInt()), TimeZone.getDefault().toZoneId()));
hourly.setWeatherState(parseWeatherState(hourlyNode.get("weather").get(0)));
hourly.setTemperature(parseTemperature(hourlyNode));
hourly.setAtmosphericPressure(parsePressure(hourlyNode));
hourly.setHumidity(parseHumidity(hourlyNode));
hourly.setClouds(parseClouds(hourlyNode));
final JsonNode uviNode = hourlyNode.get("uvi");
if (uviNode != null) {
hourly.setUvIndex(uviNode.asDouble());
}
final JsonNode visibilityNode = hourlyNode.get("visibility");
if (visibilityNode != null) {
hourly.setVisibilityInMetres(visibilityNode.asDouble());
}
hourly.setWind(parseWind(hourlyNode));
final JsonNode popNode = hourlyNode.get("pop");
if (popNode != null) {
hourly.setProbabilityOfPrecipitation(popNode.asDouble());
}
hourly.setRain(parseRain(hourlyNode));
hourly.setSnow(parseSnow(hourlyNode));
hourlyList.add(hourly);
}
return hourlyList;
}
private List<Daily> parseDailyList(JsonNode dailyListNode) {
if (dailyListNode == null) {
return null;
}
final List<Daily> dailyList = new ArrayList<>();
for (final JsonNode dailyNode : dailyListNode) {
final Daily daily = new Daily();
daily.setForecastTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(dailyNode.get("dt").asInt()), TimeZone.getDefault().toZoneId()));
daily.setSunriseTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(dailyNode.get("sunrise").asInt()), TimeZone.getDefault().toZoneId()));
daily.setSunsetTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(dailyNode.get("sunset").asInt()), TimeZone.getDefault().toZoneId()));
daily.setWeatherState(parseWeatherState(dailyNode.get("weather").get(0)));
daily.setTemperature(parseDailyTemperature(dailyNode));
daily.setAtmosphericPressure(parsePressure(dailyNode));
daily.setHumidity(parseHumidity(dailyNode));
daily.setWind(parseWind(dailyNode));
daily.setClouds(parseClouds(dailyNode));
daily.setUvIndex(dailyNode.get("uvi").asDouble());
daily.setProbabilityOfPrecipitation(dailyNode.get("pop").asDouble());
daily.setRain(parseDailyRain(dailyNode));
daily.setSnow(parseDailySnow(dailyNode));
dailyList.add(daily);
}
return dailyList;
}
private List<Alert> parseAlerts(JsonNode alertsNode) {
if (alertsNode == null) {
return null;
}
final List<Alert> alerts = new ArrayList<>();
for (final JsonNode alertNode : alertsNode) {
Alert alert = new Alert();
alert.setSenderName(alertNode.get("sender_name").asText());
alert.setEventName(alertNode.get("event").asText());
alert.setStartTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(alertNode.get("start").asInt()), TimeZone.getDefault().toZoneId()));
alert.setEndTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(alertNode.get("end").asInt()), TimeZone.getDefault().toZoneId()));
alert.setDescription(alertNode.get("description").asText());
alerts.add(alert);
}
return alerts;
}
private HistoricalWeatherData mapToHistorical(JsonNode rootNode) {
final HistoricalWeatherData historicalData = new HistoricalWeatherData();
historicalData.setCoordinate(Coordinate.of(rootNode.get("lat").asDouble(), rootNode.get("lon").asDouble()));
historicalData.setTimezone(ZoneId.of(rootNode.get("timezone").asText()));
historicalData.setTimezoneOffset(ZoneOffset.ofTotalSeconds(rootNode.get("timezone_offset").asInt()));
historicalData.setHistoricalWeather(parseHistoricalWeather(rootNode.get("current")));
historicalData.setHourlyList(parseHourlyHistoricalList(rootNode.get("hourly")));
return historicalData;
}
private HistoricalWeather parseHistoricalWeather(JsonNode currentNode) {
if (currentNode == null) {
return null;
}
final HistoricalWeather historicalWeather = new HistoricalWeather();
historicalWeather.setForecastTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(currentNode.get("dt").asInt()), TimeZone.getDefault().toZoneId()));
historicalWeather.setSunriseTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(currentNode.get("sunrise").asInt()), TimeZone.getDefault().toZoneId()));
historicalWeather.setSunsetTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(currentNode.get("sunset").asInt()), TimeZone.getDefault().toZoneId()));
final JsonNode weatherListNode = currentNode.get("weather");
if (weatherListNode != null) {
historicalWeather.setWeatherState(parseWeatherState(weatherListNode.get(0)));
}
historicalWeather.setTemperature(parseTemperature(currentNode));
historicalWeather.setAtmosphericPressure(parsePressure(currentNode));
historicalWeather.setHumidity(parseHumidity(currentNode));
historicalWeather.setClouds(parseClouds(currentNode));
historicalWeather.setUvIndex(currentNode.get("uvi").asDouble());
final JsonNode visibilityMode = currentNode.get("visibility");
if (visibilityMode != null) {
historicalWeather.setVisibilityInMetres(visibilityMode.asDouble());
}
historicalWeather.setWind(parseWind(currentNode));
historicalWeather.setRain(parseRain(currentNode));
historicalWeather.setSnow(parseSnow(currentNode));
return historicalWeather;
}
private List<HourlyHistorical> parseHourlyHistoricalList(JsonNode hourlyListNode) {
if (hourlyListNode == null) {
return null;
}
final List<HourlyHistorical> hourlyList = new ArrayList<>();
for (final JsonNode hourlyNode : hourlyListNode) {
final HourlyHistorical hourly = new HourlyHistorical();
hourly.setForecastTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(hourlyNode.get("dt").asInt()), TimeZone.getDefault().toZoneId()));
hourly.setWeatherState(parseWeatherState(hourlyNode.get("weather").get(0)));
hourly.setTemperature(parseTemperature(hourlyNode));
hourly.setAtmosphericPressure(parsePressure(hourlyNode));
hourly.setHumidity(parseHumidity(hourlyNode));
hourly.setClouds(parseClouds(hourlyNode));
final JsonNode visibilityNode = hourlyNode.get("visibility");
if (visibilityNode != null) {
hourly.setVisibilityInMetres(visibilityNode.asDouble());
}
hourly.setWind(parseWind(hourlyNode));
hourly.setRain(parseRain(hourlyNode));
hourly.setSnow(parseSnow(hourlyNode));
hourlyList.add(hourly);
}
return hourlyList;
}
private WeatherState parseWeatherState(JsonNode weatherNode) {
if (weatherNode == null) {
return null;
}
final WeatherState weatherState = new WeatherState(
weatherNode.get("id").asInt(),
weatherNode.get("main").asText(),
weatherNode.get("description").asText()
);
weatherState.setIconId(weatherNode.get("icon").asText());
return weatherState;
}
private Temperature parseTemperature(JsonNode rootNode) {
final double tempValue = rootNode.get("temp").asDouble();
final Temperature temperature = Temperature.withValue(tempValue, unitSystem.getTemperatureUnit());
final JsonNode tempFeelsLike = rootNode.get("feels_like");
if (tempFeelsLike != null) {
temperature.setFeelsLike(tempFeelsLike.asDouble());
}
final JsonNode dewPoint = rootNode.get("dew_point");
if (dewPoint != null) {
temperature.setDewPoint(dewPoint.asDouble());
}
return temperature;
}
private DailyTemperature parseDailyTemperature(JsonNode dailyNode) {
final DailyTemperature temperature = new DailyTemperature();
final JsonNode tempNode = dailyNode.get("temp");
temperature.setMorning(tempNode.get("morn").asDouble());
temperature.setDay(tempNode.get("day").asDouble());
temperature.setEve(tempNode.get("eve").asDouble());
temperature.setNight(tempNode.get("night").asDouble());
temperature.setMin(tempNode.get("min").asDouble());
temperature.setMax(tempNode.get("max").asDouble());
final JsonNode feelsLikeNode = dailyNode.get("feels_like");
temperature.setMorningFeelsLike(feelsLikeNode.get("morn").asDouble());
temperature.setDayFeelsLike(feelsLikeNode.get("day").asDouble());
temperature.setEveFeelsLike(feelsLikeNode.get("eve").asDouble());
temperature.setNightFeelsLike(feelsLikeNode.get("night").asDouble());
return temperature;
}
private AtmosphericPressure parsePressure(JsonNode rootNode) {
return AtmosphericPressure.withValue(rootNode.get("pressure").asDouble());
}
private Humidity parseHumidity(JsonNode rootNode) {
return Humidity.withValue((byte) (rootNode.get("humidity").asInt()));
}
private Wind parseWind(JsonNode rootNode) {
final JsonNode windSpeedNode = rootNode.get("wind_speed");
if (windSpeedNode == null) {
return null;
}
final Wind wind = Wind.withValue(windSpeedNode.asDouble(), unitSystem.getWindUnit());
final JsonNode degNode = rootNode.get("wind_deg");
if (degNode != null) {
wind.setDegrees(degNode.asDouble());
}
final JsonNode gustNode = rootNode.get("wind_gust");
if (gustNode != null) {
wind.setGust(gustNode.asDouble());
}
return wind;
}
private Rain parseRain(JsonNode root) {
final JsonNode rainNode = root.get("rain");
if (rainNode != null) {
final JsonNode oneHourNode = rainNode.get("1h");
if (oneHourNode != null) {
return Rain.withOneHourLevelValue(oneHourNode.asDouble());
}
}
return null;
}
private DailyRain parseDailyRain(JsonNode dailyNode) {
final JsonNode valueNode = dailyNode.get("rain");
if (valueNode != null) {
return DailyRain.withValue(valueNode.asDouble());
}
return null;
}
private Snow parseSnow(JsonNode root) {
final JsonNode snowNode = root.get("snow");
if (snowNode != null) {
final JsonNode OneHourNode = snowNode.get("1h");
if (OneHourNode != null) {
Rain.withOneHourLevelValue(OneHourNode.asDouble());
}
}
return null;
}
private DailySnow parseDailySnow(JsonNode dailyNode) {
final JsonNode valueNode = dailyNode.get("snow");
if (valueNode != null) {
return DailySnow.withValue(valueNode.asDouble());
}
return null;
}
private Clouds parseClouds(JsonNode rootNode) {
final JsonNode cloudsNode = rootNode.get("clouds");
if (cloudsNode != null) {
return Clouds.withValue((byte) cloudsNode.asInt());
}
return null;
}
}

32
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherAsyncRequestTerminator.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData;
import com.github.prominence.openweathermap.api.request.AsyncRequestTerminator;
/**
* The interface One call current weather async request terminator.
*/
public interface OneCallCurrentWeatherAsyncRequestTerminator extends AsyncRequestTerminator<CurrentWeatherData, String> {
}

64
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherAsyncRequestTerminatorImpl.java Normal file
View File

@ -0,0 +1,64 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
import com.github.prominence.openweathermap.api.utils.RequestUtils;
import java.util.concurrent.CompletableFuture;
/**
* The type One call current weather async request terminator.
*/
public class OneCallCurrentWeatherAsyncRequestTerminatorImpl implements OneCallCurrentWeatherAsyncRequestTerminator {
private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem;
/**
* Instantiates a new One call current weather async request terminator.
*
* @param urlBuilder the url builder
* @param unitSystem the unit system
*/
OneCallCurrentWeatherAsyncRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
this.urlBuilder = urlBuilder;
this.unitSystem = unitSystem;
}
@Override
public CompletableFuture<CurrentWeatherData> asJava() {
return CompletableFuture.supplyAsync(() -> new OneCallWeatherResponseMapper(unitSystem).mapToCurrent(getRawResponse()));
}
@Override
public CompletableFuture<String> asJSON() {
return CompletableFuture.supplyAsync(this::getRawResponse);
}
private String getRawResponse() {
return RequestUtils.getResponse(urlBuilder.buildUrl());
}
}

53
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherRequestCustomizer.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.enums.OneCallResultOptions;
import com.github.prominence.openweathermap.api.request.RequestCustomizer;
/**
* The interface One call current weather request customizer.
*/
public interface OneCallCurrentWeatherRequestCustomizer extends RequestCustomizer<OneCallCurrentWeatherRequestCustomizer> {
/**
* Exclude one call current weather request customizer.
*
* @param excludeOptions the exclude options
* @return the one call current weather request customizer
*/
OneCallCurrentWeatherRequestCustomizer exclude(OneCallResultOptions... excludeOptions);
/**
* Retrieve one call current weather request terminator.
*
* @return the one call current weather request terminator
*/
OneCallCurrentWeatherRequestTerminator retrieve();
/**
* Retrieve async one call current weather async request terminator.
*
* @return the one call current weather async request terminator
*/
OneCallCurrentWeatherAsyncRequestTerminator retrieveAsync();
}

88
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherRequestCustomizerImpl.java Normal file
View File

@ -0,0 +1,88 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.enums.Language;
import com.github.prominence.openweathermap.api.enums.OneCallResultOptions;
import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* The type One call current weather request customizer.
*/
public class OneCallCurrentWeatherRequestCustomizerImpl implements OneCallCurrentWeatherRequestCustomizer {
private final RequestUrlBuilder urlBuilder;
private Language language;
private UnitSystem unitSystem = UnitSystem.STANDARD;
private OneCallResultOptions[] excludeOptions;
/**
* Instantiates a new One call current weather request customizer.
*
* @param urlBuilder the url builder
*/
OneCallCurrentWeatherRequestCustomizerImpl(RequestUrlBuilder urlBuilder) {
this.urlBuilder = urlBuilder;
}
@Override
public OneCallCurrentWeatherRequestCustomizer language(Language language) {
this.language = language;
return this;
}
@Override
public OneCallCurrentWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
this.unitSystem = unitSystem;
return this;
}
@Override
public OneCallCurrentWeatherRequestCustomizer exclude(OneCallResultOptions... excludeOptions) {
this.excludeOptions = excludeOptions;
return this;
}
@Override
public OneCallCurrentWeatherRequestTerminator retrieve() {
applyCustomization();
return new OneCallCurrentWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public OneCallCurrentWeatherAsyncRequestTerminator retrieveAsync() {
applyCustomization();
return new OneCallCurrentWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
private void applyCustomization() {
urlBuilder.applyCustomization(language, unitSystem);
if (excludeOptions != null) {
urlBuilder.addRequestParameter("exclude", Stream.of(excludeOptions).map(OneCallResultOptions::getValue).collect(Collectors.joining(",")));
}
}
}

33
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherRequestTerminator.java Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData;
import com.github.prominence.openweathermap.api.request.RequestTerminator;
/**
* The interface One call current weather request terminator.
*/
public interface OneCallCurrentWeatherRequestTerminator extends RequestTerminator<CurrentWeatherData, String> {
}

62
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherRequestTerminatorImpl.java Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
import com.github.prominence.openweathermap.api.utils.RequestUtils;
/**
* The type One call current weather request terminator.
*/
public class OneCallCurrentWeatherRequestTerminatorImpl implements OneCallCurrentWeatherRequestTerminator {
private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem;
/**
* Instantiates a new One call current weather request terminator.
*
* @param urlBuilder the url builder
* @param unitSystem the unit system
*/
OneCallCurrentWeatherRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
this.urlBuilder = urlBuilder;
this.unitSystem = unitSystem;
}
@Override
public CurrentWeatherData asJava() {
return new OneCallWeatherResponseMapper(unitSystem).mapToCurrent(getRawResponse());
}
@Override
public String asJSON() {
return getRawResponse();
}
private String getRawResponse() {
return RequestUtils.getResponse(urlBuilder.buildUrl());
}
}

38
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherRequester.java Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.model.Coordinate;
/**
* The interface One call current weather requester.
*/
public interface OneCallCurrentWeatherRequester {
/**
* By coordinate one call current weather request customizer.
*
* @param coordinate the coordinate
* @return the one call current weather request customizer
*/
OneCallCurrentWeatherRequestCustomizer byCoordinate(Coordinate coordinate);
}

50
src/main/java/com/github/prominence/openweathermap/api/request/onecall/current/OneCallCurrentWeatherRequesterImpl.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.current;
import com.github.prominence.openweathermap.api.model.Coordinate;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
/**
* The type One call current weather requester.
*/
public class OneCallCurrentWeatherRequesterImpl implements OneCallCurrentWeatherRequester {
private final RequestUrlBuilder urlBuilder;
/**
* Instantiates a new One call current weather requester.
*
* @param urlBuilder the url builder
*/
public OneCallCurrentWeatherRequesterImpl(RequestUrlBuilder urlBuilder) {
this.urlBuilder = urlBuilder;
urlBuilder.append("onecall");
}
@Override
public OneCallCurrentWeatherRequestCustomizer byCoordinate(Coordinate coordinate) {
urlBuilder.addRequestParameter("lat", String.valueOf(coordinate.getLatitude()));
urlBuilder.addRequestParameter("lon", String.valueOf(coordinate.getLongitude()));
return new OneCallCurrentWeatherRequestCustomizerImpl(urlBuilder);
}
}

32
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherAsyncRequestTerminator.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData;
import com.github.prominence.openweathermap.api.request.AsyncRequestTerminator;
/**
* The interface One call historical weather async request terminator.
*/
public interface OneCallHistoricalWeatherAsyncRequestTerminator extends AsyncRequestTerminator<HistoricalWeatherData, String> {
}

64
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherAsyncRequestTerminatorImpl.java Normal file
View File

@ -0,0 +1,64 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
import com.github.prominence.openweathermap.api.utils.RequestUtils;
import java.util.concurrent.CompletableFuture;
/**
* The type One call historical weather async request terminator.
*/
public class OneCallHistoricalWeatherAsyncRequestTerminatorImpl implements OneCallHistoricalWeatherAsyncRequestTerminator {
private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem;
/**
* Instantiates a new One call historical weather async request terminator.
*
* @param urlBuilder the url builder
* @param unitSystem the unit system
*/
public OneCallHistoricalWeatherAsyncRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
this.urlBuilder = urlBuilder;
this.unitSystem = unitSystem;
}
@Override
public CompletableFuture<HistoricalWeatherData> asJava() {
return CompletableFuture.supplyAsync(() -> new OneCallWeatherResponseMapper(unitSystem).mapToHistorical(getRawResponse()));
}
@Override
public CompletableFuture<String> asJSON() {
return CompletableFuture.supplyAsync(this::getRawResponse);
}
private String getRawResponse() {
return RequestUtils.getResponse(urlBuilder.buildUrl());
}
}

44
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherRequestCustomizer.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.request.RequestCustomizer;
/**
* The interface One call historical weather request customizer.
*/
public interface OneCallHistoricalWeatherRequestCustomizer extends RequestCustomizer<OneCallHistoricalWeatherRequestCustomizer> {
/**
* Retrieve one call historical weather request terminator.
*
* @return the one call historical weather request terminator
*/
OneCallHistoricalWeatherRequestTerminator retrieve();
/**
* Retrieve async one call historical weather async request terminator.
*
* @return the one call historical weather async request terminator
*/
OneCallHistoricalWeatherAsyncRequestTerminator retrieveAsync();
}

70
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherRequestCustomizerImpl.java Normal file
View File

@ -0,0 +1,70 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.enums.Language;
import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
/**
* The type One call historical weather request customizer.
*/
public class OneCallHistoricalWeatherRequestCustomizerImpl implements OneCallHistoricalWeatherRequestCustomizer {
private final RequestUrlBuilder urlBuilder;
private Language language;
private UnitSystem unitSystem = UnitSystem.STANDARD;
/**
* Instantiates a new One call historical weather request customizer.
*
* @param urlBuilder the url builder
*/
public OneCallHistoricalWeatherRequestCustomizerImpl(RequestUrlBuilder urlBuilder) {
this.urlBuilder = urlBuilder;
}
@Override
public OneCallHistoricalWeatherRequestCustomizer language(Language language) {
this.language = language;
return this;
}
@Override
public OneCallHistoricalWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
this.unitSystem = unitSystem;
return this;
}
@Override
public OneCallHistoricalWeatherRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem);
return new OneCallHistoricalWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public OneCallHistoricalWeatherAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem);
return new OneCallHistoricalWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
}

32
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherRequestTerminator.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData;
import com.github.prominence.openweathermap.api.request.RequestTerminator;
/**
* The interface One call historical weather request terminator.
*/
public interface OneCallHistoricalWeatherRequestTerminator extends RequestTerminator<HistoricalWeatherData, String> {
}

62
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherRequestTerminatorImpl.java Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
import com.github.prominence.openweathermap.api.utils.RequestUtils;
/**
* The type One call historical weather request terminator.
*/
public class OneCallHistoricalWeatherRequestTerminatorImpl implements OneCallHistoricalWeatherRequestTerminator {
private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem;
/**
* Instantiates a new One call historical weather request terminator.
*
* @param urlBuilder the url builder
* @param unitSystem the unit system
*/
public OneCallHistoricalWeatherRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
this.urlBuilder = urlBuilder;
this.unitSystem = unitSystem;
}
@Override
public HistoricalWeatherData asJava() {
return new OneCallWeatherResponseMapper(unitSystem).mapToHistorical(getRawResponse());
}
@Override
public String asJSON() {
return getRawResponse();
}
private String getRawResponse() {
return RequestUtils.getResponse(urlBuilder.buildUrl());
}
}

39
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherRequester.java Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.model.Coordinate;
/**
* The interface One call historical weather requester.
*/
public interface OneCallHistoricalWeatherRequester {
/**
* By coordinate and timestamp one call historical weather request customizer.
*
* @param coordinate the coordinate
* @param unixTime the unix time
* @return the one call historical weather request customizer
*/
OneCallHistoricalWeatherRequestCustomizer byCoordinateAndTimestamp(Coordinate coordinate, long unixTime);
}

51
src/main/java/com/github/prominence/openweathermap/api/request/onecall/historical/OneCallHistoricalWeatherRequesterImpl.java Normal file
View File

@ -0,0 +1,51 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.request.onecall.historical;
import com.github.prominence.openweathermap.api.model.Coordinate;
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
/**
* The type One call historical weather requester.
*/
public class OneCallHistoricalWeatherRequesterImpl implements OneCallHistoricalWeatherRequester {
private final RequestUrlBuilder urlBuilder;
/**
* Instantiates a new One call historical weather requester.
*
* @param urlBuilder the url builder
*/
public OneCallHistoricalWeatherRequesterImpl(RequestUrlBuilder urlBuilder) {
this.urlBuilder = urlBuilder;
urlBuilder.append("onecall/timemachine");
}
@Override
public OneCallHistoricalWeatherRequestCustomizer byCoordinateAndTimestamp(Coordinate coordinate, long unixTime) {
urlBuilder.addRequestParameter("lat", coordinate.getLatitude());
urlBuilder.addRequestParameter("lon", coordinate.getLongitude());
urlBuilder.addRequestParameter("dt", unixTime);
return new OneCallHistoricalWeatherRequestCustomizerImpl(urlBuilder);
}
}

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/CurrentWeatherRequesterImpl.java
View File

@ -32,7 +32,6 @@ import com.github.prominence.openweathermap.api.request.weather.single.SingleLoc
* The type Current weather requester. * The type Current weather requester.
*/ */
public class CurrentWeatherRequesterImpl implements CurrentWeatherRequester { public class CurrentWeatherRequesterImpl implements CurrentWeatherRequester {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
/** /**

78
src/main/java/com/github/prominence/openweathermap/api/request/weather/CurrentWeatherResponseMapper.java
View File

@ -22,13 +22,13 @@
package com.github.prominence.openweathermap.api.request.weather; package com.github.prominence.openweathermap.api.request.weather;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.prominence.openweathermap.api.model.weather.*; import com.github.prominence.openweathermap.api.model.weather.*;
import com.github.prominence.openweathermap.api.enums.UnitSystem; import com.github.prominence.openweathermap.api.enums.UnitSystem;
import com.github.prominence.openweathermap.api.model.*; import com.github.prominence.openweathermap.api.model.*;
import java.io.IOException;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
@ -83,7 +83,6 @@ import java.util.TimeZone;
* --- cod Internal parameter * --- cod Internal parameter
*/ */
public class CurrentWeatherResponseMapper { public class CurrentWeatherResponseMapper {
private final UnitSystem unitSystem; private final UnitSystem unitSystem;
/** /**
@ -102,12 +101,12 @@ public class CurrentWeatherResponseMapper {
* @return the weather object * @return the weather object
*/ */
public Weather getSingle(String json) { public Weather getSingle(String json) {
ObjectMapper objectMapper = new ObjectMapper(); final ObjectMapper objectMapper = new ObjectMapper();
Weather weather; Weather weather;
try { try {
JsonNode root = objectMapper.readTree(json); final JsonNode root = objectMapper.readTree(json);
weather = getSingle(root); weather = getSingle(root);
} catch (IOException e) { } catch (JsonProcessingException e) {
throw new RuntimeException("Cannot parse Weather response"); throw new RuntimeException("Cannot parse Weather response");
} }
@ -115,10 +114,11 @@ public class CurrentWeatherResponseMapper {
} }
private Weather getSingle(JsonNode rootNode) { private Weather getSingle(JsonNode rootNode) {
JsonNode weatherState = rootNode.get("weather").get(0); final JsonNode weatherArrayNode = rootNode.get("weather");
Weather weather = Weather.forValue(weatherState.get("main").asText(), weatherState.get("description").asText()); final JsonNode weatherNode = weatherArrayNode != null ? weatherArrayNode.get(0) : null;
weather.setWeatherIconId(weatherState.get("icon").asText()); final Weather weather = new Weather();
weather.setWeatherState(parseWeatherState(weatherNode));
weather.setTemperature(parseTemperature(rootNode)); weather.setTemperature(parseTemperature(rootNode));
weather.setAtmosphericPressure(parsePressure(rootNode)); weather.setAtmosphericPressure(parsePressure(rootNode));
weather.setHumidity(parseHumidity(rootNode)); weather.setHumidity(parseHumidity(rootNode));
@ -130,7 +130,7 @@ public class CurrentWeatherResponseMapper {
final JsonNode dtNode = rootNode.get("dt"); final JsonNode dtNode = rootNode.get("dt");
if (dtNode != null) { if (dtNode != null) {
weather.setCalculatedOn(LocalDateTime.ofInstant(Instant.ofEpochSecond(dtNode.asInt()), TimeZone.getDefault().toZoneId())); weather.setCalculationTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(dtNode.asInt()), TimeZone.getDefault().toZoneId()));
} }
return weather; return weather;
@ -143,25 +143,37 @@ public class CurrentWeatherResponseMapper {
* @return the list of weathers * @return the list of weathers
*/ */
public List<Weather> getList(String json) { public List<Weather> getList(String json) {
ObjectMapper objectMapper = new ObjectMapper(); final ObjectMapper objectMapper = new ObjectMapper();
List<Weather> weatherList = new ArrayList<>(); final List<Weather> weatherList = new ArrayList<>();
try { try {
final JsonNode root = objectMapper.readTree(json); final JsonNode root = objectMapper.readTree(json);
final JsonNode listNode = root.get("list"); final JsonNode listNode = root.get("list");
listNode.forEach(jsonNode -> weatherList.add(getSingle(jsonNode))); listNode.forEach(jsonNode -> weatherList.add(getSingle(jsonNode)));
} catch (IOException e) { } catch (JsonProcessingException e) {
throw new RuntimeException("Cannot parse Weather response"); throw new RuntimeException("Cannot parse Weather response");
} }
return weatherList; return weatherList;
} }
private Temperature parseTemperature(JsonNode rootNode) { private WeatherState parseWeatherState(JsonNode weatherNode) {
Temperature temperature; if (weatherNode == null) {
final JsonNode mainNode = rootNode.get("main"); return null;
}
final WeatherState weatherState = new WeatherState(
weatherNode.get("id").asInt(),
weatherNode.get("main").asText(),
weatherNode.get("description").asText()
);
weatherState.setIconId(weatherNode.get("icon").asText());
return weatherState;
}
private Temperature parseTemperature(JsonNode rootNode) {
final JsonNode mainNode = rootNode.get("main");
final double tempValue = mainNode.get("temp").asDouble(); final double tempValue = mainNode.get("temp").asDouble();
temperature = Temperature.withValue(tempValue, unitSystem.getTemperatureUnit()); final Temperature temperature = Temperature.withValue(tempValue, unitSystem.getTemperatureUnit());
final JsonNode feelsLikeNode = mainNode.get("feels_like"); final JsonNode feelsLikeNode = mainNode.get("feels_like");
if (feelsLikeNode != null) { if (feelsLikeNode != null) {
@ -181,7 +193,7 @@ public class CurrentWeatherResponseMapper {
private AtmosphericPressure parsePressure(JsonNode rootNode) { private AtmosphericPressure parsePressure(JsonNode rootNode) {
final JsonNode mainNode = rootNode.get("main"); final JsonNode mainNode = rootNode.get("main");
AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(mainNode.get("pressure").asDouble()); final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(mainNode.get("pressure").asDouble());
final JsonNode seaLevelNode = mainNode.get("sea_level"); final JsonNode seaLevelNode = mainNode.get("sea_level");
final JsonNode groundLevelNode = mainNode.get("grnd_level"); final JsonNode groundLevelNode = mainNode.get("grnd_level");
@ -205,7 +217,7 @@ public class CurrentWeatherResponseMapper {
final JsonNode windNode = rootNode.get("wind"); final JsonNode windNode = rootNode.get("wind");
double speed = windNode.get("speed").asDouble(); double speed = windNode.get("speed").asDouble();
Wind wind = Wind.withValue(speed, unitSystem.getWindUnit()); final Wind wind = Wind.withValue(speed, unitSystem.getWindUnit());
final JsonNode degNode = windNode.get("deg"); final JsonNode degNode = windNode.get("deg");
if (degNode != null) { if (degNode != null) {
@ -224,11 +236,11 @@ public class CurrentWeatherResponseMapper {
if (rainNode != null) { if (rainNode != null) {
final JsonNode oneHourNode = rainNode.get("1h"); final JsonNode oneHourNode = rainNode.get("1h");
final JsonNode threeHourNode = rainNode.get("3h"); final JsonNode threeHourNode = rainNode.get("3h");
if (oneHourNode != null && oneHourNode.isDouble() && threeHourNode != null && threeHourNode.isDouble()) { if (oneHourNode != null && threeHourNode != null) {
return Rain.withValues(oneHourNode.asDouble(), threeHourNode.asDouble()); return Rain.withValues(oneHourNode.asDouble(), threeHourNode.asDouble());
} else if (oneHourNode != null && oneHourNode.isDouble()) { } else if (oneHourNode != null) {
return Rain.withOneHourLevelValue(oneHourNode.asDouble()); return Rain.withOneHourLevelValue(oneHourNode.asDouble());
} else if (threeHourNode != null && threeHourNode.isDouble()) { } else if (threeHourNode != null) {
return Rain.withThreeHourLevelValue(threeHourNode.asDouble()); return Rain.withThreeHourLevelValue(threeHourNode.asDouble());
} }
} }
@ -240,11 +252,11 @@ public class CurrentWeatherResponseMapper {
if (snowNode != null) { if (snowNode != null) {
final JsonNode oneHourNode = snowNode.get("1h"); final JsonNode oneHourNode = snowNode.get("1h");
final JsonNode threeHourNode = snowNode.get("3h"); final JsonNode threeHourNode = snowNode.get("3h");
if (oneHourNode != null && oneHourNode.isDouble() && threeHourNode != null && threeHourNode.isDouble()) { if (oneHourNode != null && threeHourNode != null) {
return Snow.withValues(oneHourNode.asDouble(), threeHourNode.asDouble()); return Snow.withValues(oneHourNode.asDouble(), threeHourNode.asDouble());
} else if (oneHourNode != null && oneHourNode.isDouble()) { } else if (oneHourNode != null) {
return Snow.withOneHourLevelValue(oneHourNode.asDouble()); return Snow.withOneHourLevelValue(oneHourNode.asDouble());
} else if (threeHourNode != null && threeHourNode.isDouble()) { } else if (threeHourNode != null) {
return Snow.withThreeHourLevelValue(threeHourNode.asDouble()); return Snow.withThreeHourLevelValue(threeHourNode.asDouble());
} }
} }
@ -252,19 +264,17 @@ public class CurrentWeatherResponseMapper {
} }
private Clouds parseClouds(JsonNode rootNode) { private Clouds parseClouds(JsonNode rootNode) {
Clouds clouds = null;
final JsonNode cloudsNode = rootNode.get("clouds"); final JsonNode cloudsNode = rootNode.get("clouds");
final JsonNode allValueNode = cloudsNode.get("all"); final JsonNode allValueNode = cloudsNode.get("all");
if (allValueNode != null) { if (allValueNode != null) {
clouds = Clouds.withValue((byte) allValueNode.asInt()); return Clouds.withValue((byte) allValueNode.asInt());
} }
return clouds; return null;
} }
private Location parseLocation(JsonNode rootNode) { private Location parseLocation(JsonNode rootNode) {
Location location = Location.withValues(rootNode.get("id").asInt(), rootNode.get("name").asText()); final Location location = Location.withValues(rootNode.get("id").asInt(), rootNode.get("name").asText());
final JsonNode timezoneNode = rootNode.get("timezone"); final JsonNode timezoneNode = rootNode.get("timezone");
if (timezoneNode != null) { if (timezoneNode != null) {
@ -281,10 +291,10 @@ public class CurrentWeatherResponseMapper {
final JsonNode sunriseNode = sysNode.get("sunrise"); final JsonNode sunriseNode = sysNode.get("sunrise");
final JsonNode sunsetNode = sysNode.get("sunset"); final JsonNode sunsetNode = sysNode.get("sunset");
if (sunriseNode != null) { if (sunriseNode != null) {
location.setSunrise(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunriseNode.asInt()), TimeZone.getDefault().toZoneId())); location.setSunriseTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunriseNode.asInt()), TimeZone.getDefault().toZoneId()));
} }
if (sunsetNode != null) { if (sunsetNode != null) {
location.setSunset(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunsetNode.asInt()), TimeZone.getDefault().toZoneId())); location.setSunsetTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(sunsetNode.asInt()), TimeZone.getDefault().toZoneId()));
} }
} }
@ -297,10 +307,10 @@ public class CurrentWeatherResponseMapper {
} }
private Coordinate parseCoordinate(JsonNode rootNode) { private Coordinate parseCoordinate(JsonNode rootNode) {
JsonNode latitudeNode = rootNode.get("lat"); final JsonNode latitudeNode = rootNode.get("lat");
JsonNode longitudeNode = rootNode.get("lon"); final JsonNode longitudeNode = rootNode.get("lon");
if (latitudeNode != null && longitudeNode != null) { if (latitudeNode != null && longitudeNode != null) {
return Coordinate.withValues(latitudeNode.asDouble(), longitudeNode.asDouble()); return Coordinate.of(latitudeNode.asDouble(), longitudeNode.asDouble());
} }
return null; return null;
} }

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleLocationsCurrentWeatherRequesterImpl.java
View File

@ -30,7 +30,6 @@ import com.github.prominence.openweathermap.api.model.CoordinateRectangle;
* The type Multiple locations current weather requester. * The type Multiple locations current weather requester.
*/ */
public class MultipleLocationsCurrentWeatherRequesterImpl implements MultipleLocationsCurrentWeatherRequester { public class MultipleLocationsCurrentWeatherRequesterImpl implements MultipleLocationsCurrentWeatherRequester {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
/** /**

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminatorImpl.java
View File

@ -35,7 +35,6 @@ import java.util.concurrent.CompletableFuture;
* The type Multiple result current weather async request terminator. * The type Multiple result current weather async request terminator.
*/ */
public class MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminatorImpl implements MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator { public class MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminatorImpl implements MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer.java
View File

@ -28,7 +28,6 @@ import com.github.prominence.openweathermap.api.request.RequestCustomizer;
* The interface Multiple result current weather request customizer. * The interface Multiple result current weather request customizer.
*/ */
public interface MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer extends RequestCustomizer<MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer> { public interface MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer extends RequestCustomizer<MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer> {
/** /**
* Retrieve multiple result current weather request terminator. * Retrieve multiple result current weather request terminator.
* *

25
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl.java
View File

@ -30,7 +30,6 @@ import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
* The type Multiple result current weather request customizer. * The type Multiple result current weather request customizer.
*/ */
public class MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl implements MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer { public class MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl implements MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private Language language; private Language language;
@ -45,18 +44,6 @@ public class MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl imp
this.urlBuilder = urlBuilder; this.urlBuilder = urlBuilder;
} }
@Override
public MultipleResultCitiesInCircleCurrentWeatherRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCitiesInCircleCurrentWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override @Override
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer language(Language language) { public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer language(Language language) {
this.language = language; this.language = language;
@ -68,4 +55,16 @@ public class MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl imp
this.unitSystem = unitSystem; this.unitSystem = unitSystem;
return this; return this;
} }
@Override
public MultipleResultCitiesInCircleCurrentWeatherRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCitiesInCircleCurrentWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
} }

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCitiesInCircleCurrentWeatherRequestTerminatorImpl.java
View File

@ -34,7 +34,6 @@ import java.util.List;
* The type Multiple result current weather request terminator. * The type Multiple result current weather request terminator.
*/ */
public class MultipleResultCitiesInCircleCurrentWeatherRequestTerminatorImpl implements MultipleResultCitiesInCircleCurrentWeatherRequestTerminator { public class MultipleResultCitiesInCircleCurrentWeatherRequestTerminatorImpl implements MultipleResultCitiesInCircleCurrentWeatherRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCurrentWeatherAsyncRequestTerminatorImpl.java
View File

@ -35,7 +35,6 @@ import java.util.concurrent.CompletableFuture;
* The type Multiple result current weather async request terminator. * The type Multiple result current weather async request terminator.
*/ */
public class MultipleResultCurrentWeatherAsyncRequestTerminatorImpl implements MultipleResultCurrentWeatherAsyncRequestTerminator { public class MultipleResultCurrentWeatherAsyncRequestTerminatorImpl implements MultipleResultCurrentWeatherAsyncRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCurrentWeatherRequestCustomizer.java
View File

@ -28,7 +28,6 @@ import com.github.prominence.openweathermap.api.request.RequestCustomizer;
* The interface Multiple result current weather request customizer. * The interface Multiple result current weather request customizer.
*/ */
public interface MultipleResultCurrentWeatherRequestCustomizer extends RequestCustomizer<MultipleResultCurrentWeatherRequestCustomizer> { public interface MultipleResultCurrentWeatherRequestCustomizer extends RequestCustomizer<MultipleResultCurrentWeatherRequestCustomizer> {
/** /**
* Retrieve multiple result current weather request terminator. * Retrieve multiple result current weather request terminator.
* *

25
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCurrentWeatherRequestCustomizerImpl.java
View File

@ -30,7 +30,6 @@ import com.github.prominence.openweathermap.api.enums.UnitSystem;
* The type Multiple result current weather request customizer. * The type Multiple result current weather request customizer.
*/ */
public class MultipleResultCurrentWeatherRequestCustomizerImpl implements MultipleResultCurrentWeatherRequestCustomizer { public class MultipleResultCurrentWeatherRequestCustomizerImpl implements MultipleResultCurrentWeatherRequestCustomizer {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private Language language; private Language language;
@ -45,18 +44,6 @@ public class MultipleResultCurrentWeatherRequestCustomizerImpl implements Multip
this.urlBuilder = urlBuilder; this.urlBuilder = urlBuilder;
} }
@Override
public MultipleResultCurrentWeatherRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCurrentWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public MultipleResultCurrentWeatherAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCurrentWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override @Override
public MultipleResultCurrentWeatherRequestCustomizer language(Language language) { public MultipleResultCurrentWeatherRequestCustomizer language(Language language) {
this.language = language; this.language = language;
@ -68,4 +55,16 @@ public class MultipleResultCurrentWeatherRequestCustomizerImpl implements Multip
this.unitSystem = unitSystem; this.unitSystem = unitSystem;
return this; return this;
} }
@Override
public MultipleResultCurrentWeatherRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCurrentWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public MultipleResultCurrentWeatherAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem);
return new MultipleResultCurrentWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
} }

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/multiple/MultipleResultCurrentWeatherRequestTerminatorImpl.java
View File

@ -34,7 +34,6 @@ import java.util.List;
* The type Multiple result current weather request terminator. * The type Multiple result current weather request terminator.
*/ */
public class MultipleResultCurrentWeatherRequestTerminatorImpl implements MultipleResultCurrentWeatherRequestTerminator { public class MultipleResultCurrentWeatherRequestTerminatorImpl implements MultipleResultCurrentWeatherRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/single/SingleLocationCurrentWeatherRequesterImpl.java
View File

@ -29,7 +29,6 @@ import com.github.prominence.openweathermap.api.model.Coordinate;
* The type Single location current weather requester. * The type Single location current weather requester.
*/ */
public class SingleLocationCurrentWeatherRequesterImpl implements SingleLocationCurrentWeatherRequester { public class SingleLocationCurrentWeatherRequesterImpl implements SingleLocationCurrentWeatherRequester {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
/** /**

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/single/SingleResultCurrentWeatherAsyncRequestTerminatorImpl.java
View File

@ -34,7 +34,6 @@ import java.util.concurrent.CompletableFuture;
* The type Single result current weather async request terminator. * The type Single result current weather async request terminator.
*/ */
public class SingleResultCurrentWeatherAsyncRequestTerminatorImpl implements SingleResultCurrentWeatherAsyncRequestTerminator { public class SingleResultCurrentWeatherAsyncRequestTerminatorImpl implements SingleResultCurrentWeatherAsyncRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/single/SingleResultCurrentWeatherRequestCustomizer.java
View File

@ -28,7 +28,6 @@ import com.github.prominence.openweathermap.api.request.RequestCustomizer;
* The current weather request customizer interface. * The current weather request customizer interface.
*/ */
public interface SingleResultCurrentWeatherRequestCustomizer extends RequestCustomizer<SingleResultCurrentWeatherRequestCustomizer> { public interface SingleResultCurrentWeatherRequestCustomizer extends RequestCustomizer<SingleResultCurrentWeatherRequestCustomizer> {
/** /**
* Retrieve current weather request terminator. * Retrieve current weather request terminator.
* *

25
src/main/java/com/github/prominence/openweathermap/api/request/weather/single/SingleResultCurrentWeatherRequestCustomizerImpl.java
View File

@ -30,7 +30,6 @@ import com.github.prominence.openweathermap.api.enums.UnitSystem;
* The type Single result current weather request customizer. * The type Single result current weather request customizer.
*/ */
public class SingleResultCurrentWeatherRequestCustomizerImpl implements SingleResultCurrentWeatherRequestCustomizer { public class SingleResultCurrentWeatherRequestCustomizerImpl implements SingleResultCurrentWeatherRequestCustomizer {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private Language language; private Language language;
@ -45,18 +44,6 @@ public class SingleResultCurrentWeatherRequestCustomizerImpl implements SingleRe
this.urlBuilder = urlBuilder; this.urlBuilder = urlBuilder;
} }
@Override
public SingleResultCurrentWeatherRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem);
return new SingleResultCurrentWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public SingleResultCurrentWeatherAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem);
return new SingleResultCurrentWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override @Override
public SingleResultCurrentWeatherRequestCustomizer language(Language language) { public SingleResultCurrentWeatherRequestCustomizer language(Language language) {
this.language = language; this.language = language;
@ -68,4 +55,16 @@ public class SingleResultCurrentWeatherRequestCustomizerImpl implements SingleRe
this.unitSystem = unitSystem; this.unitSystem = unitSystem;
return this; return this;
} }
@Override
public SingleResultCurrentWeatherRequestTerminator retrieve() {
urlBuilder.applyCustomization(language, unitSystem);
return new SingleResultCurrentWeatherRequestTerminatorImpl(urlBuilder, unitSystem);
}
@Override
public SingleResultCurrentWeatherAsyncRequestTerminator retrieveAsync() {
urlBuilder.applyCustomization(language, unitSystem);
return new SingleResultCurrentWeatherAsyncRequestTerminatorImpl(urlBuilder, unitSystem);
}
} }

1
src/main/java/com/github/prominence/openweathermap/api/request/weather/single/SingleResultCurrentWeatherRequestTerminatorImpl.java
View File

@ -32,7 +32,6 @@ import com.github.prominence.openweathermap.api.utils.RequestUtils;
* The type Single result current weather request terminator. * The type Single result current weather request terminator.
*/ */
public class SingleResultCurrentWeatherRequestTerminatorImpl implements SingleResultCurrentWeatherRequestTerminator { public class SingleResultCurrentWeatherRequestTerminatorImpl implements SingleResultCurrentWeatherRequestTerminator {
private final RequestUrlBuilder urlBuilder; private final RequestUrlBuilder urlBuilder;
private final UnitSystem unitSystem; private final UnitSystem unitSystem;

11
src/test/java/com/github/prominence/openweathermap/api/ApiTest.java
View File

@ -22,19 +22,18 @@
package com.github.prominence.openweathermap.api; package com.github.prominence.openweathermap.api;
import org.junit.BeforeClass; import org.junit.jupiter.api.BeforeAll;
public class ApiTest { public class ApiTest {
private static OpenWeatherMapClient client;
private static OpenWeatherMapClient manager; @BeforeAll
@BeforeClass
public static void retrieveApiKey() { public static void retrieveApiKey() {
String apiKey = System.getenv("OPENWEATHER_API_KEY"); String apiKey = System.getenv("OPENWEATHER_API_KEY");
manager = new OpenWeatherMapClient(apiKey); client = new OpenWeatherMapClient(apiKey);
} }
protected static OpenWeatherMapClient getClient() { protected static OpenWeatherMapClient getClient() {
return manager; return client;
} }
} }

105
src/test/java/com/github/prominence/openweathermap/api/enums/WeatherConditionUnitTest.java Normal file
View File

@ -0,0 +1,105 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.enums;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class WeatherConditionUnitTest {
@Test
public void getId() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotEquals(0, weatherCondition.getId());
}
@Test
public void getName() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(weatherCondition.getName());
assertNotEquals("", weatherCondition.getName());
}
@Test
public void getDescription() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(weatherCondition.getDescription());
assertNotEquals("", weatherCondition.getDescription());
}
@Test
public void getDayIconId() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(weatherCondition.getDayIconId());
assertNotEquals("", weatherCondition.getDayIconId());
}
@Test
public void getNightIconId() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(weatherCondition.getNightIconId());
assertNotEquals("", weatherCondition.getNightIconId());
}
@Test
public void getDayIconUrl() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(weatherCondition.getDayIconUrl());
assertNotEquals("", weatherCondition.getDayIconUrl());
}
@Test
public void getNightIconUrl() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(weatherCondition.getNightIconUrl());
assertNotEquals("", weatherCondition.getNightIconUrl());
}
@Test
public void getIconUrl() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(WeatherCondition.getIconUrl(weatherCondition.getNightIconId()));
assertNotEquals("", WeatherCondition.getIconUrl(weatherCondition.getNightIconId()));
}
@Test
public void getById() {
assertEquals(WeatherCondition.ASH, WeatherCondition.getById(WeatherCondition.ASH.getId()));
}
@Test
public void testToString() {
final WeatherCondition weatherCondition = WeatherCondition.ASH;
assertNotNull(weatherCondition.toString());
assertNotEquals("", weatherCondition.toString());
}
}

90
src/test/java/com/github/prominence/openweathermap/api/model/AtmosphericPressureUnitTest.java
View File

@ -20,42 +20,21 @@
* SOFTWARE. * SOFTWARE.
*/ */
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model; package com.github.prominence.openweathermap.api.model;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class AtmosphericPressureUnitTest { public class AtmosphericPressureUnitTest {
@Test @Test
public void whenCreatePressureWithArgs_thenValueIsSet() { public void whenCreatePressureWithArgs_thenValueIsSet() {
AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(100); AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(100);
Assert.assertEquals(100, atmosphericPressure.getValue(), 0.00001); assertEquals(100, atmosphericPressure.getValue(), 0.00001);
Assert.assertEquals(0, AtmosphericPressure.withValue(0).getValue(), 0.00001); assertEquals(0, AtmosphericPressure.withValue(0).getValue(), 0.00001);
Assert.assertEquals(100, AtmosphericPressure.withValue(100).getValue(), 0.00001); assertEquals(100, AtmosphericPressure.withValue(100).getValue(), 0.00001);
Assert.assertEquals(55, AtmosphericPressure.withValue(55).getValue(), 0.00001); assertEquals(55, AtmosphericPressure.withValue(55).getValue(), 0.00001);
} }
@Test @Test
@ -63,9 +42,9 @@ public class AtmosphericPressureUnitTest {
AtmosphericPressure one = AtmosphericPressure.withValue(22); AtmosphericPressure one = AtmosphericPressure.withValue(22);
AtmosphericPressure two = AtmosphericPressure.withValue(22); AtmosphericPressure two = AtmosphericPressure.withValue(22);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
Assert.assertTrue(one.equals(one)); assertEquals(one, one);
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(one.hashCode(), two.hashCode());
one.setSeaLevelValue(333); one.setSeaLevelValue(333);
one.setGroundLevelValue(555); one.setGroundLevelValue(555);
@ -73,9 +52,9 @@ public class AtmosphericPressureUnitTest {
two.setSeaLevelValue(333); two.setSeaLevelValue(333);
two.setGroundLevelValue(555); two.setGroundLevelValue(555);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
Assert.assertTrue(two.equals(one)); assertEquals(two, one);
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
@ -83,23 +62,23 @@ public class AtmosphericPressureUnitTest {
AtmosphericPressure one = AtmosphericPressure.withValue(5); AtmosphericPressure one = AtmosphericPressure.withValue(5);
AtmosphericPressure two = AtmosphericPressure.withValue(88); AtmosphericPressure two = AtmosphericPressure.withValue(88);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
Assert.assertFalse(two.equals(one)); assertNotEquals(two, one);
Assert.assertFalse(one.equals(new Object())); assertNotEquals(one, new Object());
Assert.assertNotEquals(one.hashCode(), two.hashCode()); assertNotEquals(one.hashCode(), two.hashCode());
one = AtmosphericPressure.withValue(44); one = AtmosphericPressure.withValue(44);
one.setSeaLevelValue(44); one.setSeaLevelValue(44);
two = AtmosphericPressure.withValue(44); two = AtmosphericPressure.withValue(44);
two.setGroundLevelValue(22); two.setGroundLevelValue(22);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
Assert.assertFalse(two.equals(one)); assertNotEquals(two, one);
two.setSeaLevelValue(44); two.setSeaLevelValue(44);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
Assert.assertFalse(two.equals(one)); assertNotEquals(two, one);
} }
@Test @Test
@ -110,39 +89,42 @@ public class AtmosphericPressureUnitTest {
atmosphericPressure.setValue(100); atmosphericPressure.setValue(100);
atmosphericPressure.setGroundLevelValue(222); atmosphericPressure.setGroundLevelValue(222);
Assert.assertEquals(222, atmosphericPressure.getGroundLevelValue(), 0.00001); assertEquals(222, atmosphericPressure.getGroundLevelValue(), 0.00001);
atmosphericPressure.setSeaLevelValue(4232); atmosphericPressure.setSeaLevelValue(4232);
Assert.assertEquals(4232, atmosphericPressure.getSeaLevelValue(), 0.00001); assertEquals(4232, atmosphericPressure.getSeaLevelValue(), 0.00001);
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final String pressureString = AtmosphericPressure.withValue(44).toString(); final String pressureString = AtmosphericPressure.withValue(44).toString();
Assert.assertNotNull(pressureString); assertNotNull(pressureString);
Assert.assertNotEquals("", pressureString); assertNotEquals("", pressureString);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreatePressureByConstructorWithInvalidDataNegative_thenThrowAnException() { public void whenCreatePressureByConstructorWithInvalidDataNegative_thenThrowAnException() {
AtmosphericPressure.withValue(-33); assertThrows(IllegalArgumentException.class, () -> AtmosphericPressure.withValue(-33));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreatePressureAndSetInvalidDataNegative_thenThrowAnException() { public void whenCreatePressureAndSetInvalidDataNegative_thenThrowAnException() {
AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(88); AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(88);
atmosphericPressure.setValue(-89);
assertThrows(IllegalArgumentException.class, () -> atmosphericPressure.setValue(-89));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidSeaLevelPressure_thenThrowAnException() { public void whenSetInvalidSeaLevelPressure_thenThrowAnException() {
AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(88); AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(88);
atmosphericPressure.setSeaLevelValue(-89);
assertThrows(IllegalArgumentException.class, () -> atmosphericPressure.setSeaLevelValue(-89));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidGroundLevelPressure_thenThrowAnException() { public void whenSetInvalidGroundLevelPressure_thenThrowAnException() {
AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(88); AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(88);
atmosphericPressure.setGroundLevelValue(-223);
assertThrows(IllegalArgumentException.class, () -> atmosphericPressure.setGroundLevelValue(-223));
} }
} }

77
src/test/java/com/github/prominence/openweathermap/api/model/CloudsUnitTest.java
View File

@ -20,75 +20,56 @@
* SOFTWARE. * SOFTWARE.
*/ */
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model; package com.github.prominence.openweathermap.api.model;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class CloudsUnitTest { public class CloudsUnitTest {
@Test @Test
public void whenCreateCloudsWithValidArgs_thenValueIsSet() { public void whenCreateCloudsWithValidArgs_thenValueIsSet() {
Clouds clouds = Clouds.withValue((byte) 100); Clouds clouds = Clouds.withValue((byte) 100);
Assert.assertEquals(100, clouds.getValue()); assertEquals(100, clouds.getValue());
Assert.assertEquals(0, Clouds.withValue((byte) 0).getValue()); assertEquals(0, Clouds.withValue((byte) 0).getValue());
Assert.assertEquals(100, Clouds.withValue((byte) 100).getValue()); assertEquals(100, Clouds.withValue((byte) 100).getValue());
Assert.assertEquals(55, Clouds.withValue((byte) 55).getValue()); assertEquals(55, Clouds.withValue((byte) 55).getValue());
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCloudsByConstructorWithInvalidDataAboveHundred_thenThrowAnException() { public void whenCreateCloudsByConstructorWithInvalidDataAboveHundred_thenThrowAnException() {
Clouds.withValue((byte) 110); assertThrows(IllegalArgumentException.class, () -> Clouds.withValue((byte) 110));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCloudsByConstructorWithInvalidDataNegative_thenThrowAnException() { public void whenCreateCloudsByConstructorWithInvalidDataNegative_thenThrowAnException() {
Clouds.withValue((byte) -33); assertThrows(IllegalArgumentException.class, () -> Clouds.withValue((byte) -33));
} }
@Test @Test
public void whenSetValidValues_thenAllIsFine() { public void whenSetValidValues_thenAllIsFine() {
Clouds clouds = Clouds.withValue((byte) 14); Clouds clouds = Clouds.withValue((byte) 14);
clouds.setValue((byte) 0); clouds.setValue((byte) 0);
Assert.assertEquals(0, clouds.getValue()); assertEquals(0, clouds.getValue());
clouds.setValue((byte) 15); clouds.setValue((byte) 15);
Assert.assertEquals(15, clouds.getValue()); assertEquals(15, clouds.getValue());
clouds.setValue((byte) 100); clouds.setValue((byte) 100);
Assert.assertEquals(100, clouds.getValue()); assertEquals(100, clouds.getValue());
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCloudsAndSetInvalidDataAboveHundred_thenThrowAnException() { public void whenCreateCloudsAndSetInvalidDataAboveHundred_thenThrowAnException() {
Clouds clouds = Clouds.withValue((byte) 12); Clouds clouds = Clouds.withValue((byte) 12);
clouds.setValue((byte) 112);
assertThrows(IllegalArgumentException.class, () -> clouds.setValue((byte) 112));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCloudsAndSetInvalidDataNegative_thenThrowAnException() { public void whenCreateCloudsAndSetInvalidDataNegative_thenThrowAnException() {
Clouds clouds = Clouds.withValue((byte) 88); Clouds clouds = Clouds.withValue((byte) 88);
clouds.setValue((byte) -89);
assertThrows(IllegalArgumentException.class, () -> clouds.setValue((byte) -89));
} }
@Test @Test
@ -96,9 +77,9 @@ public class CloudsUnitTest {
Clouds one = Clouds.withValue((byte) 22); Clouds one = Clouds.withValue((byte) 22);
Clouds two = Clouds.withValue((byte) 22); Clouds two = Clouds.withValue((byte) 22);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
Assert.assertTrue(one.equals(one)); assertEquals(one, one);
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
@ -106,16 +87,16 @@ public class CloudsUnitTest {
Clouds one = Clouds.withValue((byte) 5); Clouds one = Clouds.withValue((byte) 5);
Clouds two = Clouds.withValue((byte) 88); Clouds two = Clouds.withValue((byte) 88);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
Assert.assertFalse(two.equals(one)); assertNotEquals(two, one);
Assert.assertFalse(one.equals(new Object())); assertNotEquals(one, new Object());
Assert.assertNotEquals(one.hashCode(), two.hashCode()); assertNotEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final String cloudsString = Clouds.withValue((byte) 44).toString(); final String cloudsString = Clouds.withValue((byte) 44).toString();
Assert.assertNotNull(cloudsString); assertNotNull(cloudsString);
Assert.assertNotEquals("", cloudsString); assertNotEquals("", cloudsString);
} }
} }

159
src/test/java/com/github/prominence/openweathermap/api/model/CoordinateRectangleUnitTest.java
View File

@ -22,8 +22,9 @@
package com.github.prominence.openweathermap.api.model; package com.github.prominence.openweathermap.api.model;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class CoordinateRectangleUnitTest { public class CoordinateRectangleUnitTest {
@Test @Test
@ -31,102 +32,160 @@ public class CoordinateRectangleUnitTest {
CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2); CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLatitudeBottomBelowMinus90_thenThrowAnException() { public void whenCreateObjectWithLatitudeBottomBelowMinus90_thenThrowAnException() {
CoordinateRectangle.withValues(44.5, -91.2, 54.4, 22.2); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(44.5, -91.2, 54.4, 22.2));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLatitudeBottomAbove90_thenThrowAnException() { public void whenCreateObjectWithLatitudeBottomAbove90_thenThrowAnException() {
CoordinateRectangle.withValues(44.5, 91.2, 54.4, 22.2); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(44.5, 91.2, 54.4, 22.2));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLatitudeTopBelowMinus90_thenThrowAnException() { public void whenCreateObjectWithLatitudeTopBelowMinus90_thenThrowAnException() {
CoordinateRectangle.withValues(44.5, 22.4, 54.4, -92.3); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(44.5, 22.4, 54.4, -92.3));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLatitudeTopAbove90_thenThrowAnException() { public void whenCreateObjectWithLatitudeTopAbove90_thenThrowAnException() {
CoordinateRectangle.withValues(44.5, 22.5, 54.4, 94.887); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(44.5, 22.5, 54.4, 94.887));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLongitudeLeftBelowMinus180_thenThrowAnException() { public void whenCreateObjectWithLongitudeLeftBelowMinus180_thenThrowAnException() {
CoordinateRectangle.withValues(-944.5, 22.4, 54.4, 22.2); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(-944.5, 22.4, 54.4, 22.2));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLongitudeLeftAbove180_thenThrowAnException() { public void whenCreateObjectWithLongitudeLeftAbove180_thenThrowAnException() {
CoordinateRectangle.withValues(544.5, 22.4, 54.4, 22.2); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(544.5, 22.4, 54.4, 22.2));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLongitudeRightBelowMinus180_thenThrowAnException() { public void whenCreateObjectWithLongitudeRightBelowMinus180_thenThrowAnException() {
CoordinateRectangle.withValues(44.5, 22.4, -254.4, 22.2); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(44.5, 22.4, -254.4, 22.2));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithLongitudeRightAbove180_thenThrowAnException() { public void whenCreateObjectWithLongitudeRightAbove180_thenThrowAnException() {
CoordinateRectangle.withValues(44.5, 22.4, 354.4, 22.2); assertThrows(IllegalArgumentException.class, () -> CoordinateRectangle.withValues(44.5, 22.4, 354.4, 22.2));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectUsingBuilderWithInvalidLatitudeBottom_thenFail() { public void whenCreateObjectUsingBuilderWithInvalidLatitudeBottom_thenFail() {
new CoordinateRectangle.Builder() assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLatitudeBottom(-1000); .setLatitudeBottom(-1000));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectUsingBuilderWithInvalidLatitudeBottom2_thenFail() {
assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLatitudeBottom(1000));
}
@Test
public void whenCreateObjectUsingBuilderWithInvalidLatitudeTop_thenFail() { public void whenCreateObjectUsingBuilderWithInvalidLatitudeTop_thenFail() {
new CoordinateRectangle.Builder() assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLatitudeTop(-1000); .setLatitudeTop(-1000));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectUsingBuilderWithInvalidLatitudeTop2_thenFail() {
assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLatitudeTop(1000));
}
@Test
public void whenCreateObjectUsingBuilderWithInvalidLongitudeLeft_thenFail() { public void whenCreateObjectUsingBuilderWithInvalidLongitudeLeft_thenFail() {
new CoordinateRectangle.Builder() assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeLeft(-1000); .setLongitudeLeft(-1000));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectUsingBuilderWithInvalidLongitudeLeft2_thenFail() {
assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeLeft(1000));
}
@Test
public void whenCreateObjectUsingBuilderWithInvalidLongitudeRight_thenFail() { public void whenCreateObjectUsingBuilderWithInvalidLongitudeRight_thenFail() {
new CoordinateRectangle.Builder() assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeRight(-1000); .setLongitudeRight(-1000));
} }
@Test(expected = IllegalStateException.class) @Test
public void whenCreateObjectUsingBuilderWithInvalidLongitudeRight2_thenFail() {
assertThrows(IllegalArgumentException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeRight(1000));
}
@Test
public void whenCreateObjectUsingBuilderWithoutAllPropertiesSet_thenFail() { public void whenCreateObjectUsingBuilderWithoutAllPropertiesSet_thenFail() {
new CoordinateRectangle.Builder() assertThrows(IllegalStateException.class, () -> new CoordinateRectangle.Builder()
.build());
}
@Test
public void whenCreateObjectUsingBuilderWithoutAllPropertiesSet1_thenFail() {
assertThrows(IllegalStateException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeLeft(10)
.build());
}
@Test
public void whenCreateObjectUsingBuilderWithoutAllPropertiesSet2_thenFail() {
assertThrows(IllegalStateException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeRight(10) .setLongitudeRight(10)
.build(); .setLatitudeBottom(10)
.build());
}
@Test
public void whenCreateObjectUsingBuilderWithoutAllPropertiesSet3_thenFail() {
assertThrows(IllegalStateException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeLeft(10)
.setLatitudeBottom(10)
.setLongitudeRight(10)
.build());
}
@Test
public void whenCreateObjectUsingBuilderWithoutAllPropertiesSet4_thenFail() {
assertThrows(IllegalStateException.class, () -> new CoordinateRectangle.Builder()
.setLongitudeLeft(10)
.setLatitudeTop(10)
.setLatitudeBottom(10)
.build());
} }
@Test @Test
public void whenCreateObjectUsingBuilderWithCorrectUsage_thenOk() { public void whenCreateObjectUsingBuilderWithCorrectUsage_thenOk() {
new CoordinateRectangle.Builder() final CoordinateRectangle rectangle = new CoordinateRectangle.Builder()
.setLongitudeRight(10) .setLongitudeRight(10)
.setLongitudeLeft(10) .setLongitudeLeft(10)
.setLatitudeTop(10) .setLatitudeTop(10)
.setLatitudeBottom(10) .setLatitudeBottom(10)
.build(); .build();
assertNotNull(rectangle);
} }
@Test @Test
public void whenGetAllParameters_thenAllIsFine() { public void whenGetAllParameters_thenAllIsFine() {
final CoordinateRectangle rectangle = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2); final CoordinateRectangle rectangle = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2);
Assert.assertEquals(44.5, rectangle.getLongitudeLeft(), 0.00001); assertEquals(44.5, rectangle.getLongitudeLeft(), 0.00001);
Assert.assertEquals(22.4, rectangle.getLatitudeBottom(), 0.00001); assertEquals(22.4, rectangle.getLatitudeBottom(), 0.00001);
Assert.assertEquals(54.4, rectangle.getLongitudeRight(), 0.00001); assertEquals(54.4, rectangle.getLongitudeRight(), 0.00001);
Assert.assertEquals(22.2, rectangle.getLatitudeTop(), 0.00001); assertEquals(22.2, rectangle.getLatitudeTop(), 0.00001);
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final CoordinateRectangle rectangle = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2); final CoordinateRectangle rectangle = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2);
Assert.assertNotNull(rectangle.toString()); assertNotNull(rectangle.toString());
Assert.assertNotEquals("", rectangle.toString()); assertNotEquals("", rectangle.toString());
} }
@Test @Test
@ -134,12 +193,12 @@ public class CoordinateRectangleUnitTest {
final CoordinateRectangle first = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2); final CoordinateRectangle first = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2);
final CoordinateRectangle second = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2); final CoordinateRectangle second = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
final CoordinateRectangle third = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 23.566); final CoordinateRectangle third = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 23.566);
Assert.assertNotEquals(first.hashCode(), third.hashCode()); assertNotEquals(first.hashCode(), third.hashCode());
Assert.assertNotEquals(second.hashCode(), third.hashCode()); assertNotEquals(second.hashCode(), third.hashCode());
} }
@Test @Test
@ -147,24 +206,24 @@ public class CoordinateRectangleUnitTest {
CoordinateRectangle first = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2); CoordinateRectangle first = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2);
CoordinateRectangle second = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2); CoordinateRectangle second = CoordinateRectangle.withValues(44.5, 22.4, 54.4, 22.2);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
Assert.assertTrue(first.equals(first)); assertEquals(first, first);
Assert.assertFalse(first.equals(new Object())); assertNotEquals(first, new Object());
first = CoordinateRectangle.withValues(49.5, 22.4, 54.4, 22.2); first = CoordinateRectangle.withValues(49.5, 22.4, 54.4, 22.2);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
first = CoordinateRectangle.withValues(44.5, 29.4, 54.4, 22.2); first = CoordinateRectangle.withValues(44.5, 29.4, 54.4, 22.2);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
first = CoordinateRectangle.withValues(44.5, 22.4, 24.4, 22.2); first = CoordinateRectangle.withValues(44.5, 22.4, 24.4, 22.2);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
first = CoordinateRectangle.withValues(44.5, 22.4, 54.4, -2.2); first = CoordinateRectangle.withValues(44.5, 22.4, 54.4, -2.2);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
} }
} }

110
src/test/java/com/github/prominence/openweathermap/api/model/CoordinateUnitTest.java
View File

@ -22,148 +22,150 @@
package com.github.prominence.openweathermap.api.model; package com.github.prominence.openweathermap.api.model;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class CoordinateUnitTest { public class CoordinateUnitTest {
@Test @Test
public void whenCreateCoordinateWithValidValues_thenObjectCreated() { public void whenCreateCoordinateWithValidValues_thenObjectCreated() {
Coordinate.withValues(44, 53); Coordinate.of(44, 53);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCoordinateWithInvalidLatitudeBelowMinus90_thenThrowAnException() { public void whenCreateCoordinateWithInvalidLatitudeBelowMinus90_thenThrowAnException() {
Coordinate.withValues(-333, 44); assertThrows(IllegalArgumentException.class, () -> Coordinate.of(-333, 44));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCoordinateWithInvalidLatitudeAbove90_thenThrowAnException() { public void whenCreateCoordinateWithInvalidLatitudeAbove90_thenThrowAnException() {
Coordinate.withValues(223, 44); assertThrows(IllegalArgumentException.class, () -> Coordinate.of(223, 44));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCoordinateWithInvalidLongitudeBelowMinus180_thenThrowAnException() { public void whenCreateCoordinateWithInvalidLongitudeBelowMinus180_thenThrowAnException() {
Coordinate.withValues(33, -999); assertThrows(IllegalArgumentException.class, () -> Coordinate.of(33, -999));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateCoordinateWithInvalidLongitudeAbove180_thenThrowAnException() { public void whenCreateCoordinateWithInvalidLongitudeAbove180_thenThrowAnException() {
Coordinate.withValues(33, 999); assertThrows(IllegalArgumentException.class, () -> Coordinate.of(33, 999));
} }
@Test @Test
public void whenSetValidCoordinates_thenAllIsFine() { public void whenSetValidCoordinates_thenAllIsFine() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
coordinate.setLatitude(-90); coordinate.setLatitude(-90);
Assert.assertEquals(-90, coordinate.getLatitude(), 0.00001); assertEquals(-90, coordinate.getLatitude(), 0.00001);
coordinate.setLatitude(90); coordinate.setLatitude(90);
Assert.assertEquals(90, coordinate.getLatitude(), 0.00001); assertEquals(90, coordinate.getLatitude(), 0.00001);
coordinate.setLatitude(44); coordinate.setLatitude(44);
Assert.assertEquals(44, coordinate.getLatitude(), 0.00001); assertEquals(44, coordinate.getLatitude(), 0.00001);
coordinate.setLongitude(-180); coordinate.setLongitude(-180);
Assert.assertEquals(-180, coordinate.getLongitude(), 0.00001); assertEquals(-180, coordinate.getLongitude(), 0.00001);
coordinate.setLongitude(180); coordinate.setLongitude(180);
Assert.assertEquals(180, coordinate.getLongitude(), 0.00001); assertEquals(180, coordinate.getLongitude(), 0.00001);
coordinate.setLongitude(130); coordinate.setLongitude(130);
Assert.assertEquals(130, coordinate.getLongitude(), 0.00001); assertEquals(130, coordinate.getLongitude(), 0.00001);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidLatitudeBelowMinus90_thenThrowAnException() { public void whenSetInvalidLatitudeBelowMinus90_thenThrowAnException() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
coordinate.setLatitude(-91); assertThrows(IllegalArgumentException.class, () -> coordinate.setLatitude(-91));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidLatitudeAbove90_thenThrowAnException() { public void whenSetInvalidLatitudeAbove90_thenThrowAnException() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
coordinate.setLatitude(92); assertThrows(IllegalArgumentException.class, () -> coordinate.setLatitude(92));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidLongitudeBelowMinus180_thenThrowAnException() { public void whenSetInvalidLongitudeBelowMinus180_thenThrowAnException() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
coordinate.setLongitude(-194); assertThrows(IllegalArgumentException.class, () -> coordinate.setLongitude(-194));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidLongitudeAbove180_thenThrowAnException() { public void whenSetInvalidLongitudeAbove180_thenThrowAnException() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
coordinate.setLongitude(444); assertThrows(IllegalArgumentException.class, () -> coordinate.setLongitude(444));
} }
@Test @Test
public void whenGetLatitude_thenAllIsFine() { public void whenGetLatitude_thenAllIsFine() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
Assert.assertEquals(0, coordinate.getLatitude(), 0.00001); assertEquals(0, coordinate.getLatitude(), 0.00001);
coordinate.setLatitude(45); coordinate.setLatitude(45);
Assert.assertEquals(45, coordinate.getLatitude(), 0.00001); assertEquals(45, coordinate.getLatitude(), 0.00001);
} }
@Test @Test
public void whenGetLongitude_thenAllIsFine() { public void whenGetLongitude_thenAllIsFine() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
Assert.assertEquals(0, coordinate.getLongitude(), 0.00001); assertEquals(0, coordinate.getLongitude(), 0.00001);
coordinate.setLongitude(33); coordinate.setLongitude(33);
Assert.assertEquals(33, coordinate.getLongitude(), 0.00001); assertEquals(33, coordinate.getLongitude(), 0.00001);
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final Coordinate coordinate = Coordinate.withValues(0, 0); final Coordinate coordinate = Coordinate.of(0, 0);
Assert.assertNotNull(coordinate.toString()); assertNotNull(coordinate.toString());
Assert.assertNotEquals("", coordinate.toString()); assertNotEquals("", coordinate.toString());
} }
@Test @Test
public void whenCallHashCode_thenAllIsFine() { public void whenCallHashCode_thenAllIsFine() {
final Coordinate first = Coordinate.withValues(22, 66); final Coordinate first = Coordinate.of(22, 66);
final Coordinate second = Coordinate.withValues(22, 44); final Coordinate second = Coordinate.of(22, 44);
Assert.assertNotEquals(first.hashCode(), second.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
second.setLongitude(66); second.setLongitude(66);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
second.setLatitude(89); second.setLatitude(89);
Assert.assertNotEquals(first.hashCode(), second.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
first.setLatitude(89); first.setLatitude(89);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
} }
@Test @Test
public void whenCheckEquality_thenAllIsFine() { public void whenCheckEquality_thenAllIsFine() {
final Coordinate first = Coordinate.withValues(11, 99); final Coordinate first = Coordinate.of(11, 99);
final Coordinate second = Coordinate.withValues(11, 99); final Coordinate second = Coordinate.of(11, 99);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
Assert.assertTrue(first.equals(first)); assertEquals(first, first);
Assert.assertFalse(first.equals(new Object())); assertNotEquals(first, new Object());
first.setLatitude(34); first.setLatitude(34);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
second.setLatitude(34); second.setLatitude(34);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
second.setLongitude(74); second.setLongitude(74);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
first.setLongitude(74); first.setLongitude(74);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
} }
} }

9
src/test/java/com/github/prominence/openweathermap/api/model/DayTimeUnitTest.java
View File

@ -22,13 +22,14 @@
package com.github.prominence.openweathermap.api.model; package com.github.prominence.openweathermap.api.model;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class DayTimeUnitTest { public class DayTimeUnitTest {
@Test @Test
public void whenGetValue_thenValueIsPresentAndValid() { public void whenGetValue_thenValueIsPresentAndValid() {
Assert.assertEquals("d", DayTime.DAY.getValue()); assertEquals("d", DayTime.DAY.getValue());
Assert.assertEquals("n", DayTime.NIGHT.getValue()); assertEquals("n", DayTime.NIGHT.getValue());
} }
} }

53
src/test/java/com/github/prominence/openweathermap/api/model/HumidityUnitTest.java
View File

@ -22,51 +22,52 @@
package com.github.prominence.openweathermap.api.model; package com.github.prominence.openweathermap.api.model;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class HumidityUnitTest { public class HumidityUnitTest {
@Test @Test
public void whenCreateHumidityWithArgs_thenValueIsSet() { public void whenCreateHumidityWithArgs_thenValueIsSet() {
Humidity humidity = Humidity.withValue((byte) 100); Humidity humidity = Humidity.withValue((byte) 100);
Assert.assertEquals(100, humidity.getValue()); assertEquals(100, humidity.getValue());
Assert.assertEquals(0, Humidity.withValue((byte) 0).getValue()); assertEquals(0, Humidity.withValue((byte) 0).getValue());
Assert.assertEquals(55, Humidity.withValue((byte) 55).getValue()); assertEquals(55, Humidity.withValue((byte) 55).getValue());
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateHumidityByConstructorWithInvalidDataAboveHundred_thenThrowAnException() { public void whenCreateHumidityByConstructorWithInvalidDataAboveHundred_thenThrowAnException() {
Humidity.withValue((byte) 112); assertThrows(IllegalArgumentException.class, () -> Humidity.withValue((byte) 112));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateHumidityByConstructorWithInvalidDataNegative_thenThrowAnException() { public void whenCreateHumidityByConstructorWithInvalidDataNegative_thenThrowAnException() {
Humidity.withValue((byte) -33); assertThrows(IllegalArgumentException.class, () -> Humidity.withValue((byte) -33));
} }
@Test @Test
public void whenSetValidValues_thenAllIsFine() { public void whenSetValidValues_thenAllIsFine() {
Humidity humidity = Humidity.withValue((byte) 14); Humidity humidity = Humidity.withValue((byte) 14);
Assert.assertEquals(14, humidity.getValue()); assertEquals(14, humidity.getValue());
humidity.setValue((byte) 0); humidity.setValue((byte) 0);
Assert.assertEquals(0, humidity.getValue()); assertEquals(0, humidity.getValue());
humidity.setValue((byte) 15); humidity.setValue((byte) 15);
Assert.assertEquals(15, humidity.getValue()); assertEquals(15, humidity.getValue());
humidity.setValue((byte) 100); humidity.setValue((byte) 100);
Assert.assertEquals(100, humidity.getValue()); assertEquals(100, humidity.getValue());
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateHumidityAndSetInvalidDataAboveHundred_thenThrowAnException() { public void whenCreateHumidityAndSetInvalidDataAboveHundred_thenThrowAnException() {
Humidity humidity = Humidity.withValue((byte) 12); Humidity humidity = Humidity.withValue((byte) 12);
humidity.setValue((byte) 112); assertThrows(IllegalArgumentException.class, () -> humidity.setValue((byte) 112));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateHumidityAndSetInvalidDataNegative_thenThrowAnException() { public void whenCreateHumidityAndSetInvalidDataNegative_thenThrowAnException() {
Humidity humidity = Humidity.withValue((byte) 88); Humidity humidity = Humidity.withValue((byte) 88);
humidity.setValue((byte) -89); assertThrows(IllegalArgumentException.class, () -> humidity.setValue((byte) -89));
} }
@Test @Test
@ -74,9 +75,9 @@ public class HumidityUnitTest {
Humidity one = Humidity.withValue((byte) 22); Humidity one = Humidity.withValue((byte) 22);
Humidity two = Humidity.withValue((byte) 22); Humidity two = Humidity.withValue((byte) 22);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
Assert.assertTrue(one.equals(one)); assertEquals(one, one);
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
@ -84,16 +85,16 @@ public class HumidityUnitTest {
Humidity one = Humidity.withValue((byte) 5); Humidity one = Humidity.withValue((byte) 5);
Humidity two = Humidity.withValue((byte) 88); Humidity two = Humidity.withValue((byte) 88);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
Assert.assertFalse(two.equals(one)); assertNotEquals(two, one);
Assert.assertFalse(one.equals(new Object())); assertNotEquals(one, new Object());
Assert.assertNotEquals(one.hashCode(), two.hashCode()); assertNotEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final String humidityString = Humidity.withValue((byte) 44).toString(); final String humidityString = Humidity.withValue((byte) 44).toString();
Assert.assertNotNull(humidityString); assertNotNull(humidityString);
Assert.assertNotEquals("", humidityString); assertNotEquals("", humidityString);
} }
} }

71
src/test/java/com/github/prominence/openweathermap/api/model/TemperatureUnitTest.java
View File

@ -22,8 +22,9 @@
package com.github.prominence.openweathermap.api.model; package com.github.prominence.openweathermap.api.model;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class TemperatureUnitTest { public class TemperatureUnitTest {
@Test @Test
@ -31,9 +32,9 @@ public class TemperatureUnitTest {
Temperature.withValue(22.2, "K"); Temperature.withValue(22.2, "K");
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithEmptyUnit_thenThrowAnException() { public void whenCreateObjectWithEmptyUnit_thenThrowAnException() {
Temperature.withValue(22.2, null); assertThrows(IllegalArgumentException.class, () -> Temperature.withValue(22.2, null));
} }
@Test @Test
@ -41,7 +42,7 @@ public class TemperatureUnitTest {
final Temperature temperature = Temperature.withValue(22.2, "K"); final Temperature temperature = Temperature.withValue(22.2, "K");
temperature.setValue(55.44); temperature.setValue(55.44);
Assert.assertEquals(55.44, temperature.getValue(), 0.00001); assertEquals(55.44, temperature.getValue(), 0.00001);
} }
@Test @Test
@ -49,11 +50,11 @@ public class TemperatureUnitTest {
final Temperature temperature = Temperature.withValue(22.2, "K"); final Temperature temperature = Temperature.withValue(22.2, "K");
temperature.setMaxTemperature(44.4); temperature.setMaxTemperature(44.4);
Assert.assertEquals(44.4, temperature.getMaxTemperature(), 0.00001); assertEquals(44.4, temperature.getMaxTemperature(), 0.00001);
temperature.setMaxTemperature(null); temperature.setMaxTemperature(null);
Assert.assertNull(temperature.getMaxTemperature()); assertNull(temperature.getMaxTemperature());
} }
@Test @Test
@ -61,11 +62,11 @@ public class TemperatureUnitTest {
final Temperature temperature = Temperature.withValue(22.2, "K"); final Temperature temperature = Temperature.withValue(22.2, "K");
temperature.setMinTemperature(33.2); temperature.setMinTemperature(33.2);
Assert.assertEquals(33.2, temperature.getMinTemperature(), 0.00001); assertEquals(33.2, temperature.getMinTemperature(), 0.00001);
temperature.setMinTemperature(null); temperature.setMinTemperature(null);
Assert.assertNull(temperature.getMinTemperature()); assertNull(temperature.getMinTemperature());
} }
@Test @Test
@ -73,11 +74,11 @@ public class TemperatureUnitTest {
final Temperature temperature = Temperature.withValue(22.2, "K"); final Temperature temperature = Temperature.withValue(22.2, "K");
temperature.setFeelsLike(22.3); temperature.setFeelsLike(22.3);
Assert.assertEquals(22.3, temperature.getFeelsLike(), 0.00001); assertEquals(22.3, temperature.getFeelsLike(), 0.00001);
temperature.setFeelsLike(null); temperature.setFeelsLike(null);
Assert.assertNull(temperature.getFeelsLike()); assertNull(temperature.getFeelsLike());
} }
@Test @Test
@ -85,37 +86,37 @@ public class TemperatureUnitTest {
final Temperature temperature = Temperature.withValue(22.2, "K"); final Temperature temperature = Temperature.withValue(22.2, "K");
temperature.setUnit("test"); temperature.setUnit("test");
Assert.assertTrue("test".equals(temperature.getUnit())); assertEquals("test", temperature.getUnit());
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetNullUnit_thenThrowAnException() { public void whenSetNullUnit_thenThrowAnException() {
final Temperature temperature = Temperature.withValue(22.2, "K"); final Temperature temperature = Temperature.withValue(22.2, "K");
temperature.setUnit(null); assertThrows(IllegalArgumentException.class, () -> temperature.setUnit(null));
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final Temperature temperature = Temperature.withValue(22.2, "K"); final Temperature temperature = Temperature.withValue(22.2, "K");
Assert.assertNotNull(temperature.toString()); assertNotNull(temperature.toString());
Assert.assertNotEquals("", temperature.toString()); assertNotEquals("", temperature.toString());
temperature.setMinTemperature(11.2); temperature.setMinTemperature(11.2);
Assert.assertNotNull(temperature.toString()); assertNotNull(temperature.toString());
Assert.assertNotEquals("", temperature.toString()); assertNotEquals("", temperature.toString());
temperature.setMaxTemperature(44.3); temperature.setMaxTemperature(44.3);
Assert.assertNotNull(temperature.toString()); assertNotNull(temperature.toString());
Assert.assertNotEquals("", temperature.toString()); assertNotEquals("", temperature.toString());
temperature.setFeelsLike(22.4); temperature.setFeelsLike(22.4);
Assert.assertNotNull(temperature.toString()); assertNotNull(temperature.toString());
Assert.assertNotEquals("", temperature.toString()); assertNotEquals("", temperature.toString());
} }
@Test @Test
@ -123,7 +124,7 @@ public class TemperatureUnitTest {
final Temperature one = Temperature.withValue(22.2, "K"); final Temperature one = Temperature.withValue(22.2, "K");
final Temperature two = Temperature.withValue(22.2, "K"); final Temperature two = Temperature.withValue(22.2, "K");
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
@ -131,44 +132,44 @@ public class TemperatureUnitTest {
final Temperature one = Temperature.withValue(22.2, "K"); final Temperature one = Temperature.withValue(22.2, "K");
final Temperature two = Temperature.withValue(21.2, "K"); final Temperature two = Temperature.withValue(21.2, "K");
Assert.assertTrue(one.equals(one)); assertEquals(one, one);
Assert.assertFalse(one.equals(new Object())); assertNotEquals(one, new Object());
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
one.setValue(21.2); one.setValue(21.2);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setMaxTemperature(33.56); one.setMaxTemperature(33.56);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setMaxTemperature(33.56); two.setMaxTemperature(33.56);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setMinTemperature(11.54); one.setMinTemperature(11.54);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setMinTemperature(11.54); two.setMinTemperature(11.54);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
two.setUnit("U"); two.setUnit("U");
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
one.setUnit("U"); one.setUnit("U");
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setFeelsLike(22.3); one.setFeelsLike(22.3);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setFeelsLike(22.3); two.setFeelsLike(22.3);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
} }
} }

126
src/test/java/com/github/prominence/openweathermap/api/model/WeatherStateUnitTest.java Normal file
View File

@ -0,0 +1,126 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model;
import com.github.prominence.openweathermap.api.enums.WeatherCondition;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class WeatherStateUnitTest {
@Test
public void getId() {
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
assertEquals(800, weatherState.getId());
}
@Test
public void getName() {
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
assertEquals("Clear", weatherState.getName());
}
@Test
public void getDescription() {
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
assertEquals("clear sky", weatherState.getDescription());
}
@Test
public void getIconId() {
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
weatherState.setIconId("04d");
assertEquals("04d", weatherState.getIconId());
}
@Test
public void getWeatherConditionEnum() {
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
assertEquals(WeatherCondition.CLEAR, weatherState.getWeatherConditionEnum());
}
@Test
public void getWeatherIconUrl() {
WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
String weatherIconUrl = weatherState.getWeatherIconUrl();
assertNotNull(weatherIconUrl);
assertNotEquals("", weatherIconUrl);
weatherState.setIconId("04n");
weatherIconUrl = weatherState.getWeatherIconUrl();
assertNotNull(weatherIconUrl);
assertNotEquals("", weatherIconUrl);
weatherState = new WeatherState(0, "Unknown", "unknown");
weatherIconUrl = weatherState.getWeatherIconUrl();
assertNull(weatherIconUrl);
}
@Test
public void testEquals() {
final WeatherState first = new WeatherState(800, "Clear", "clear sky");
final WeatherState second = new WeatherState(800, "Clear", "clear sky");
assertEquals(first, first);
assertNotEquals(first, null);
assertNotEquals(first, new Object());
assertEquals(first, second);
assertNotEquals(new WeatherState(800, "Clear", "clear sky"), new WeatherState(801, "Clear", "clear sky"));
assertNotEquals(new WeatherState(800, "Clear", "clear sky"), new WeatherState(800, "Clear1", "clear sky"));
assertNotEquals(new WeatherState(800, "Clear", "clear sky"), new WeatherState(800, "Clear", "clear sky1"));
first.setIconId("50d");
assertNotEquals(first, second);
}
@Test
public void testHashCode() {
final WeatherState first = new WeatherState(800, "Clear", "clear sky");
final WeatherState second = new WeatherState(800, "Clear", "clear sky");
final WeatherState third = new WeatherState(0, "Unknown", "unknown");
assertEquals(first.hashCode(), second.hashCode());
assertNotEquals(first.hashCode(), third.hashCode());
assertNotEquals(second.hashCode(), third.hashCode());
}
@Test
public void testToString() {
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
assertNotNull(weatherState.toString());
assertNotEquals("", weatherState.toString());
}
}

27
src/test/java/com/github/prominence/openweathermap/api/model/forecast/ForecastUnitTest.java
View File

@ -22,18 +22,19 @@
package com.github.prominence.openweathermap.api.model.forecast; package com.github.prominence.openweathermap.api.model.forecast;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import java.util.ArrayList; import java.util.ArrayList;
import static org.junit.jupiter.api.Assertions.*;
public class ForecastUnitTest { public class ForecastUnitTest {
@Test @Test
public void whenLocationIsSet_thenAllIsOk() { public void whenLocationIsSet_thenAllIsOk() {
final Forecast forecast = new Forecast(); final Forecast forecast = new Forecast();
forecast.setLocation(Location.withValues(2, "asd")); forecast.setLocation(Location.withValues(2, "asd"));
Assert.assertNotNull(forecast.getLocation()); assertNotNull(forecast.getLocation());
} }
@Test @Test
@ -41,7 +42,7 @@ public class ForecastUnitTest {
final Forecast forecast = new Forecast(); final Forecast forecast = new Forecast();
forecast.setWeatherForecasts(new ArrayList<>()); forecast.setWeatherForecasts(new ArrayList<>());
Assert.assertNotNull(forecast.getWeatherForecasts()); assertNotNull(forecast.getWeatherForecasts());
} }
@Test @Test
@ -49,11 +50,11 @@ public class ForecastUnitTest {
final Forecast one = new Forecast(); final Forecast one = new Forecast();
final Forecast two = new Forecast(); final Forecast two = new Forecast();
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(one.hashCode(), two.hashCode());
one.setLocation(Location.withValues(22, "444")); one.setLocation(Location.withValues(22, "444"));
Assert.assertNotEquals(one.hashCode(), two.hashCode()); assertNotEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
@ -61,21 +62,21 @@ public class ForecastUnitTest {
final Forecast one = new Forecast(); final Forecast one = new Forecast();
final Forecast two = new Forecast(); final Forecast two = new Forecast();
Assert.assertTrue(one.equals(one)); assertEquals(one, one);
Assert.assertFalse(one.equals(null)); assertNotEquals(one, null);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
Assert.assertFalse(one.equals(new Object())); assertNotEquals(one, new Object());
one.setLocation(Location.withValues(22, "234")); one.setLocation(Location.withValues(22, "234"));
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setLocation(one.getLocation()); two.setLocation(one.getLocation());
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setWeatherForecasts(new ArrayList<>()); one.setWeatherForecasts(new ArrayList<>());
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
} }
} }

97
src/test/java/com/github/prominence/openweathermap/api/model/forecast/LocationUnitTest.java
View File

@ -23,21 +23,22 @@
package com.github.prominence.openweathermap.api.model.forecast; package com.github.prominence.openweathermap.api.model.forecast;
import com.github.prominence.openweathermap.api.model.Coordinate; import com.github.prominence.openweathermap.api.model.Coordinate;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import static org.junit.jupiter.api.Assertions.*;
public class LocationUnitTest { public class LocationUnitTest {
@Test @Test
public void whenCreateObjectWithValidArgs_thenObjectIsCreated() { public void whenCreateObjectWithValidArgs_thenObjectIsCreated() {
Location.withValues(33, "test"); Location.withValues(33, "test");
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateObjectWithoutName_thenThrowAnException() { public void whenCreateObjectWithoutName_thenThrowAnException() {
Location.withValues(33, null); assertThrows(IllegalArgumentException.class, () -> Location.withValues(33, null));
} }
@Test @Test
@ -45,7 +46,7 @@ public class LocationUnitTest {
final Location location = Location.withValues(33, "test"); final Location location = Location.withValues(33, "test");
location.setId(55); location.setId(55);
Assert.assertEquals(55, location.getId()); assertEquals(55, location.getId());
} }
@Test @Test
@ -53,7 +54,7 @@ public class LocationUnitTest {
final Location location = Location.withValues(33, "test"); final Location location = Location.withValues(33, "test");
location.setName("city"); location.setName("city");
Assert.assertEquals("city", location.getName()); assertEquals("city", location.getName());
} }
@Test @Test
@ -61,25 +62,25 @@ public class LocationUnitTest {
final Location location = Location.withValues(33, "test"); final Location location = Location.withValues(33, "test");
location.setCountryCode("by"); location.setCountryCode("by");
Assert.assertEquals("by", location.getCountryCode()); assertEquals("by", location.getCountryCode());
} }
@Test @Test
public void whenSetSunrise_thenValueIsSet() { public void whenSetSunrise_thenValueIsSet() {
final Location location = Location.withValues(33, "test"); final Location location = Location.withValues(33, "test");
final LocalDateTime now = LocalDateTime.now(); final LocalDateTime now = LocalDateTime.now();
location.setSunrise(now); location.setSunriseTime(now);
Assert.assertEquals(now, location.getSunrise()); assertEquals(now, location.getSunriseTime());
} }
@Test @Test
public void whenSetSunset_thenValueIsSet() { public void whenSetSunset_thenValueIsSet() {
final Location location = Location.withValues(33, "test"); final Location location = Location.withValues(33, "test");
final LocalDateTime now = LocalDateTime.now(); final LocalDateTime now = LocalDateTime.now();
location.setSunset(now); location.setSunsetTime(now);
Assert.assertEquals(now, location.getSunset()); assertEquals(now, location.getSunsetTime());
} }
@Test @Test
@ -88,16 +89,16 @@ public class LocationUnitTest {
final ZoneOffset offset = ZoneOffset.UTC; final ZoneOffset offset = ZoneOffset.UTC;
location.setZoneOffset(offset); location.setZoneOffset(offset);
Assert.assertEquals(offset, location.getZoneOffset()); assertEquals(offset, location.getZoneOffset());
} }
@Test @Test
public void whenSetCoordinate_thenValueIsSet() { public void whenSetCoordinate_thenValueIsSet() {
final Location location = Location.withValues(33, "test"); final Location location = Location.withValues(33, "test");
final Coordinate coordinate = Coordinate.withValues(33.2, 64.2); final Coordinate coordinate = Coordinate.of(33.2, 64.2);
location.setCoordinate(coordinate); location.setCoordinate(coordinate);
Assert.assertEquals(coordinate, location.getCoordinate()); assertEquals(coordinate, location.getCoordinate());
} }
@Test @Test
@ -105,27 +106,27 @@ public class LocationUnitTest {
final Location location = Location.withValues(33, "test"); final Location location = Location.withValues(33, "test");
location.setPopulation(3444L); location.setPopulation(3444L);
Assert.assertEquals(3444L, location.getPopulation().longValue()); assertEquals(3444L, location.getPopulation().longValue());
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final Location location = Location.withValues(44, "test"); final Location location = Location.withValues(44, "test");
Assert.assertNotEquals("", location.toString()); assertNotEquals("", location.toString());
location.setCoordinate(Coordinate.withValues(33.2, 56.3)); location.setCoordinate(Coordinate.of(33.2, 56.3));
Assert.assertNotEquals("", location.toString()); assertNotEquals("", location.toString());
location.setCountryCode("TN"); location.setCountryCode("TN");
Assert.assertNotEquals("", location.toString()); assertNotEquals("", location.toString());
Assert.assertNotNull(location.toString()); assertNotNull(location.toString());
location.setPopulation(34343L); location.setPopulation(34343L);
Assert.assertNotEquals("", location.toString()); assertNotEquals("", location.toString());
Assert.assertNotNull(location.toString()); assertNotNull(location.toString());
} }
@Test @Test
@ -133,11 +134,11 @@ public class LocationUnitTest {
final Location one = Location.withValues(44, "test"); final Location one = Location.withValues(44, "test");
final Location two = Location.withValues(44, "test"); final Location two = Location.withValues(44, "test");
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(one.hashCode(), two.hashCode());
two.setName("112"); two.setName("112");
Assert.assertNotEquals(one.hashCode(), two.hashCode()); assertNotEquals(one.hashCode(), two.hashCode());
} }
@Test @Test
@ -145,77 +146,77 @@ public class LocationUnitTest {
final Location one = Location.withValues(44, "test"); final Location one = Location.withValues(44, "test");
final Location two = Location.withValues(44, "test"); final Location two = Location.withValues(44, "test");
Assert.assertTrue(one.equals(one)); assertEquals(one, one);
Assert.assertFalse(one.equals(new Object())); assertNotEquals(one, new Object());
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
two.setId(23); two.setId(23);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
one.setId(23); one.setId(23);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setName("23"); one.setName("23");
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setName("23"); two.setName("23");
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setCountryCode("11"); one.setCountryCode("11");
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setCountryCode("11"); two.setCountryCode("11");
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
final LocalDateTime now = LocalDateTime.now(); final LocalDateTime now = LocalDateTime.now();
one.setSunrise(now); one.setSunriseTime(now);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setSunrise(now); two.setSunriseTime(now);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setSunset(now); one.setSunsetTime(now);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setSunset(now); two.setSunsetTime(now);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setZoneOffset(ZoneOffset.UTC); one.setZoneOffset(ZoneOffset.UTC);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setZoneOffset(ZoneOffset.UTC); two.setZoneOffset(ZoneOffset.UTC);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
final Coordinate coordinate = Coordinate.withValues(33.5, -22.4); final Coordinate coordinate = Coordinate.of(33.5, -22.4);
one.setCoordinate(coordinate); one.setCoordinate(coordinate);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setCoordinate(coordinate); two.setCoordinate(coordinate);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
one.setPopulation(20000L); one.setPopulation(20000L);
Assert.assertFalse(one.equals(two)); assertNotEquals(one, two);
two.setPopulation(20000L); two.setPopulation(20000L);
Assert.assertTrue(one.equals(two)); assertEquals(one, two);
} }
} }

47
src/test/java/com/github/prominence/openweathermap/api/model/forecast/RainUnitTest.java
View File

@ -22,8 +22,9 @@
package com.github.prominence.openweathermap.api.model.forecast; package com.github.prominence.openweathermap.api.model.forecast;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class RainUnitTest { public class RainUnitTest {
@Test @Test
@ -32,34 +33,34 @@ public class RainUnitTest {
Rain.withThreeHourLevelValue(0); Rain.withThreeHourLevelValue(0);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateWithInvalidData_thenFail() { public void whenCreateWithInvalidData_thenFail() {
Rain.withThreeHourLevelValue(-20); assertThrows(IllegalArgumentException.class, () -> Rain.withThreeHourLevelValue(-20));
} }
@Test @Test
public void whenSetValues_thenTheyAreSet() { public void whenSetValues_thenTheyAreSet() {
final Rain rain = Rain.withThreeHourLevelValue(0); final Rain rain = Rain.withThreeHourLevelValue(0);
Assert.assertEquals(0, rain.getThreeHourRainLevel(), 0.00001); assertEquals(0, rain.getThreeHourLevel(), 0.00001);
rain.setThreeHourRainLevel(55.5); rain.setThreeHourLevel(55.5);
Assert.assertEquals(55.5, rain.getThreeHourRainLevel(), 0.00001); assertEquals(55.5, rain.getThreeHourLevel(), 0.00001);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidValue_thenFail() { public void whenSetInvalidValue_thenFail() {
final Rain rain = Rain.withThreeHourLevelValue(0); final Rain rain = Rain.withThreeHourLevelValue(0);
rain.setThreeHourRainLevel(-20); assertThrows(IllegalArgumentException.class, () -> rain.setThreeHourLevel(-20));
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final Rain rain = Rain.withThreeHourLevelValue(33.5); final Rain rain = Rain.withThreeHourLevelValue(33.5);
Assert.assertNotNull(rain.toString()); assertNotNull(rain.toString());
Assert.assertNotEquals("", rain.toString()); assertNotEquals("", rain.toString());
} }
@Test @Test
@ -67,15 +68,15 @@ public class RainUnitTest {
final Rain first = Rain.withThreeHourLevelValue(0); final Rain first = Rain.withThreeHourLevelValue(0);
final Rain second = Rain.withThreeHourLevelValue(0); final Rain second = Rain.withThreeHourLevelValue(0);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
second.setThreeHourRainLevel(11.0); second.setThreeHourLevel(11.0);
Assert.assertNotEquals(first.hashCode(), second.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
first.setThreeHourRainLevel(11.0); first.setThreeHourLevel(11.0);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
} }
@Test @Test
@ -83,16 +84,16 @@ public class RainUnitTest {
final Rain first = Rain.withThreeHourLevelValue(0); final Rain first = Rain.withThreeHourLevelValue(0);
final Rain second = Rain.withThreeHourLevelValue(0); final Rain second = Rain.withThreeHourLevelValue(0);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
Assert.assertTrue(first.equals(first)); assertEquals(first, first);
Assert.assertFalse(first.equals(new Object())); assertNotEquals(first, new Object());
second.setThreeHourRainLevel(66.7); second.setThreeHourLevel(66.7);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
first.setThreeHourRainLevel(66.7); first.setThreeHourLevel(66.7);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
} }
} }

47
src/test/java/com/github/prominence/openweathermap/api/model/forecast/SnowUnitTest.java
View File

@ -22,8 +22,9 @@
package com.github.prominence.openweathermap.api.model.forecast; package com.github.prominence.openweathermap.api.model.forecast;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class SnowUnitTest { public class SnowUnitTest {
@Test @Test
@ -31,34 +32,34 @@ public class SnowUnitTest {
Snow.withThreeHourLevelValue(2222.3); Snow.withThreeHourLevelValue(2222.3);
Snow.withThreeHourLevelValue(0); Snow.withThreeHourLevelValue(0);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateWithInvalidData_thenFail() { public void whenCreateWithInvalidData_thenFail() {
Snow.withThreeHourLevelValue(-20); assertThrows(IllegalArgumentException.class, () -> Snow.withThreeHourLevelValue(-20));
} }
@Test @Test
public void whenSetValues_thenTheyAreSet() { public void whenSetValues_thenTheyAreSet() {
final Snow snow = Snow.withThreeHourLevelValue(0); final Snow snow = Snow.withThreeHourLevelValue(0);
Assert.assertEquals(0, snow.getThreeHourSnowLevel(), 0.00001); assertEquals(0, snow.getThreeHourLevel(), 0.00001);
snow.setThreeHourSnowLevel(55.5); snow.setThreeHourLevel(55.5);
Assert.assertEquals(55.5, snow.getThreeHourSnowLevel(), 0.00001); assertEquals(55.5, snow.getThreeHourLevel(), 0.00001);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidValue_thenFail() { public void whenSetInvalidValue_thenFail() {
final Snow snow = Snow.withThreeHourLevelValue(0); final Snow snow = Snow.withThreeHourLevelValue(0);
snow.setThreeHourSnowLevel(-20); assertThrows(IllegalArgumentException.class, () -> snow.setThreeHourLevel(-20));
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final Snow snow = Snow.withThreeHourLevelValue(33.5); final Snow snow = Snow.withThreeHourLevelValue(33.5);
Assert.assertNotNull(snow.toString()); assertNotNull(snow.toString());
Assert.assertNotEquals("", snow.toString()); assertNotEquals("", snow.toString());
} }
@Test @Test
@ -66,15 +67,15 @@ public class SnowUnitTest {
final Snow first = Snow.withThreeHourLevelValue(0); final Snow first = Snow.withThreeHourLevelValue(0);
final Snow second = Snow.withThreeHourLevelValue(0); final Snow second = Snow.withThreeHourLevelValue(0);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
second.setThreeHourSnowLevel(11.0); second.setThreeHourLevel(11.0);
Assert.assertNotEquals(first.hashCode(), second.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
first.setThreeHourSnowLevel(11.0); first.setThreeHourLevel(11.0);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
} }
@Test @Test
@ -82,16 +83,16 @@ public class SnowUnitTest {
final Snow first = Snow.withThreeHourLevelValue(0); final Snow first = Snow.withThreeHourLevelValue(0);
final Snow second = Snow.withThreeHourLevelValue(0); final Snow second = Snow.withThreeHourLevelValue(0);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
Assert.assertTrue(first.equals(first)); assertEquals(first, first);
Assert.assertFalse(first.equals(new Object())); assertNotEquals(first, new Object());
second.setThreeHourSnowLevel(66.7); second.setThreeHourLevel(66.7);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
first.setThreeHourSnowLevel(66.7); first.setThreeHourLevel(66.7);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
} }
} }

286
src/test/java/com/github/prominence/openweathermap/api/model/forecast/WeatherForecastUnitTest.java
View File

@ -23,343 +23,287 @@
package com.github.prominence.openweathermap.api.model.forecast; package com.github.prominence.openweathermap.api.model.forecast;
import com.github.prominence.openweathermap.api.model.*; import com.github.prominence.openweathermap.api.model.*;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static org.junit.jupiter.api.Assertions.*;
public class WeatherForecastUnitTest { public class WeatherForecastUnitTest {
@Test
public void whenCreateObjectWithValidArgs_thenObjectIsCreated() {
WeatherForecast.forValue("state", "desc");
}
@Test(expected = IllegalArgumentException.class)
public void whenCreateObjectWithoutState_thenThrowAnException() {
WeatherForecast.forValue(null, "desc");
}
@Test(expected = IllegalArgumentException.class)
public void whenCreateObjectWithoutDescription_thenThrowAnException() {
WeatherForecast.forValue("state", null);
}
@Test
public void whenSetState_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc");
weatherForecast.setState("test");
Assert.assertEquals("test", weatherForecast.getState());
}
@Test(expected = IllegalArgumentException.class)
public void whenSetNullState_thenThrowAnException() {
final WeatherForecast weather = WeatherForecast.forValue("state", "desc");
weather.setState(null);
}
@Test
public void whenSetDescription_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc");
weatherForecast.setDescription("test");
Assert.assertEquals("test", weatherForecast.getDescription());
}
@Test(expected = IllegalArgumentException.class)
public void whenSetNullDescription_thenThrowAnException() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc");
weatherForecast.setDescription(null);
}
@Test
public void whenSetIconId_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc");
Assert.assertNull(weatherForecast.getWeatherIconId());
Assert.assertNull(weatherForecast.getWeatherIconUrl());
weatherForecast.setWeatherIconId("02n");
Assert.assertEquals("02n", weatherForecast.getWeatherIconId());
Assert.assertNotNull(weatherForecast.getWeatherIconUrl());
}
@Test @Test
public void whenSetForecastTime_thenValueIsSet() { public void whenSetForecastTime_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final LocalDateTime now = LocalDateTime.now(); final LocalDateTime now = LocalDateTime.now();
weatherForecast.setForecastTime(now); weatherForecast.setForecastTime(now);
Assert.assertEquals(now, weatherForecast.getForecastTime()); assertEquals(now, weatherForecast.getForecastTime());
} }
@Test @Test
public void whenSetTemperature_thenValueIsSet() { public void whenSetTemperature_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final Temperature temperature = Temperature.withValue(22.3, "a"); final Temperature temperature = Temperature.withValue(22.3, "a");
weatherForecast.setTemperature(temperature); weatherForecast.setTemperature(temperature);
Assert.assertEquals(temperature, weatherForecast.getTemperature()); assertEquals(temperature, weatherForecast.getTemperature());
} }
@Test @Test
public void whenSetPressure_thenValueIsSet() { public void whenSetPressure_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(33.2); final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(33.2);
weatherForecast.setAtmosphericPressure(atmosphericPressure); weatherForecast.setAtmosphericPressure(atmosphericPressure);
Assert.assertEquals(atmosphericPressure, weatherForecast.getAtmosphericPressure()); assertEquals(atmosphericPressure, weatherForecast.getAtmosphericPressure());
} }
@Test @Test
public void whenSetHumidity_thenValueIsSet() { public void whenSetHumidity_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final Humidity humidity = Humidity.withValue((byte) 44); final Humidity humidity = Humidity.withValue((byte) 44);
weatherForecast.setHumidity(humidity); weatherForecast.setHumidity(humidity);
Assert.assertEquals(humidity, weatherForecast.getHumidity()); assertEquals(humidity, weatherForecast.getHumidity());
} }
@Test @Test
public void whenSetWind_thenValueIsSet() { public void whenSetWind_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final Wind wind = Wind.withValue(22.2, "a"); final Wind wind = Wind.withValue(22.2, "a");
weatherForecast.setWind(wind); weatherForecast.setWind(wind);
Assert.assertEquals(wind, weatherForecast.getWind()); assertEquals(wind, weatherForecast.getWind());
} }
@Test @Test
public void whenSetRain_thenValueIsSet() { public void whenSetRain_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final Rain rain = Rain.withThreeHourLevelValue(0); final Rain rain = Rain.withThreeHourLevelValue(0);
weatherForecast.setRain(rain); weatherForecast.setRain(rain);
Assert.assertEquals(rain, weatherForecast.getRain()); assertEquals(rain, weatherForecast.getRain());
} }
@Test @Test
public void whenSetSnow_thenValueIsSet() { public void whenSetSnow_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final Snow snow = Snow.withThreeHourLevelValue(0); final Snow snow = Snow.withThreeHourLevelValue(0);
weatherForecast.setSnow(snow); weatherForecast.setSnow(snow);
Assert.assertEquals(snow, weatherForecast.getSnow()); assertEquals(snow, weatherForecast.getSnow());
} }
@Test @Test
public void whenSetClouds_thenValueIsSet() { public void whenSetClouds_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final Clouds clouds = Clouds.withValue((byte) 33); final Clouds clouds = Clouds.withValue((byte) 33);
weatherForecast.setClouds(clouds); weatherForecast.setClouds(clouds);
Assert.assertEquals(clouds, weatherForecast.getClouds()); assertEquals(clouds, weatherForecast.getClouds());
} }
@Test @Test
public void whenSetForecastTimeISO_thenValueIsSet() { public void whenSetForecastTimeISO_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
Assert.assertNull(weatherForecast.getForecastTimeISO()); assertNull(weatherForecast.getForecastTimeISO());
weatherForecast.setForecastTimeISO("1994-2-3"); weatherForecast.setForecastTimeISO("1994-2-3");
Assert.assertEquals("1994-2-3", weatherForecast.getForecastTimeISO()); assertEquals("1994-2-3", weatherForecast.getForecastTimeISO());
} }
@Test @Test
public void whenSetDayTime_thenValueIsSet() { public void whenSetDayTime_thenValueIsSet() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
Assert.assertNull(weatherForecast.getDayTime()); assertNull(weatherForecast.getDayTime());
weatherForecast.setDayTime(DayTime.DAY); weatherForecast.setDayTime(DayTime.DAY);
Assert.assertEquals(DayTime.DAY, weatherForecast.getDayTime()); assertEquals(DayTime.DAY, weatherForecast.getDayTime());
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final WeatherForecast weatherForecast = WeatherForecast.forValue("state", "desc"); final WeatherForecast weatherForecast = new WeatherForecast();
final Location location = Location.withValues(12312, "asd"); final Location location = Location.withValues(12312, "asd");
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
final Temperature temperature = Temperature.withValue(33.2, "asd"); final Temperature temperature = Temperature.withValue(33.2, "asd");
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(44.4); final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(44.4);
final Clouds clouds = Clouds.withValue((byte) 55); final Clouds clouds = Clouds.withValue((byte) 55);
final Rain rain = Rain.withThreeHourLevelValue(33.2); final Rain rain = Rain.withThreeHourLevelValue(33.2);
final Snow snow = Snow.withThreeHourLevelValue(33.1); final Snow snow = Snow.withThreeHourLevelValue(33.1);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setWeatherState(weatherState);
assertNotEquals("", weatherForecast.toString());
assertNotNull(weatherForecast.toString());
location.setCountryCode("3d"); location.setCountryCode("3d");
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setTemperature(temperature); weatherForecast.setTemperature(temperature);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setAtmosphericPressure(atmosphericPressure); weatherForecast.setAtmosphericPressure(atmosphericPressure);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setClouds(clouds); weatherForecast.setClouds(clouds);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setRain(rain); weatherForecast.setRain(rain);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setSnow(snow); weatherForecast.setSnow(snow);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setRain(null); weatherForecast.setRain(null);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setSnow(null); weatherForecast.setSnow(null);
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setRain(Rain.withThreeHourLevelValue(0)); weatherForecast.setRain(Rain.withThreeHourLevelValue(0));
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
weatherForecast.setSnow(Snow.withThreeHourLevelValue(0)); weatherForecast.setSnow(Snow.withThreeHourLevelValue(0));
Assert.assertNotEquals("", weatherForecast.toString()); assertNotEquals("", weatherForecast.toString());
Assert.assertNotNull(weatherForecast.toString()); assertNotNull(weatherForecast.toString());
} }
@Test @Test
public void whenCallHashCode_thenAllIsFine() { public void whenCallHashCode_thenAllIsFine() {
final WeatherForecast one = WeatherForecast.forValue("state", "desc"); final WeatherForecast first = new WeatherForecast();
final WeatherForecast two = WeatherForecast.forValue("state", "desc"); final WeatherForecast second = new WeatherForecast();
Assert.assertEquals(one.hashCode(), two.hashCode()); assertEquals(first.hashCode(), second.hashCode());
two.setDescription("112"); second.setDayTime(DayTime.NIGHT);
Assert.assertNotEquals(one.hashCode(), two.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
} }
@Test @Test
public void whenCheckEquality_thenAllIsFine() { public void whenCheckEquality_thenAllIsFine() {
final WeatherForecast one = WeatherForecast.forValue("state", "desc"); final WeatherForecast first = new WeatherForecast();
final WeatherForecast two = WeatherForecast.forValue("state1", "desc1"); final WeatherForecast second = new WeatherForecast();
Assert.assertTrue(one.equals(one)); assertEquals(first, first);
Assert.assertFalse(one.equals(null)); assertNotEquals(first, null);
Assert.assertFalse(one.equals(new Object())); assertNotEquals(first, new Object());
Assert.assertFalse(one.equals(two)); assertEquals(first, second);
two.setState("state");
Assert.assertFalse(one.equals(two));
two.setDescription("desc");
Assert.assertTrue(one.equals(two));
one.setWeatherIconId("1");
Assert.assertFalse(one.equals(two));
two.setWeatherIconId("1");
Assert.assertTrue(one.equals(two));
final LocalDateTime now = LocalDateTime.now(); final LocalDateTime now = LocalDateTime.now();
one.setForecastTime(now); first.setForecastTime(now);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setForecastTime(now); second.setForecastTime(now);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
final Temperature temperature = Temperature.withValue(33.2, "as"); final Temperature temperature = Temperature.withValue(33.2, "as");
one.setTemperature(temperature); first.setTemperature(temperature);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setTemperature(temperature); second.setTemperature(temperature);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
first.setWeatherState(weatherState);
assertNotEquals(first, second);
second.setWeatherState(weatherState);
assertEquals(first, second);
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(33.33); final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(33.33);
one.setAtmosphericPressure(atmosphericPressure); first.setAtmosphericPressure(atmosphericPressure);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setAtmosphericPressure(atmosphericPressure); second.setAtmosphericPressure(atmosphericPressure);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
final Humidity humidity = Humidity.withValue((byte) 33); final Humidity humidity = Humidity.withValue((byte) 33);
one.setHumidity(humidity); first.setHumidity(humidity);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setHumidity(humidity); second.setHumidity(humidity);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
final Wind wind = Wind.withValue(33.6, "asd"); final Wind wind = Wind.withValue(33.6, "asd");
one.setWind(wind); first.setWind(wind);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setWind(wind); second.setWind(wind);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
final Rain rain = Rain.withThreeHourLevelValue(0); final Rain rain = Rain.withThreeHourLevelValue(0);
one.setRain(rain); first.setRain(rain);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setRain(rain); second.setRain(rain);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
final Snow snow = Snow.withThreeHourLevelValue(0); final Snow snow = Snow.withThreeHourLevelValue(0);
one.setSnow(snow); first.setSnow(snow);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setSnow(snow); second.setSnow(snow);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
final Clouds clouds = Clouds.withValue((byte) 33); final Clouds clouds = Clouds.withValue((byte) 33);
one.setClouds(clouds); first.setClouds(clouds);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setClouds(clouds); second.setClouds(clouds);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
one.setForecastTimeISO("test"); first.setForecastTimeISO("test");
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setForecastTimeISO("test"); second.setForecastTimeISO("test");
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
one.setDayTime(DayTime.NIGHT); first.setDayTime(DayTime.NIGHT);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
two.setDayTime(DayTime.DAY); second.setDayTime(DayTime.DAY);
Assert.assertFalse(one.equals(two)); assertNotEquals(first, second);
one.setDayTime(DayTime.DAY); first.setDayTime(DayTime.DAY);
Assert.assertTrue(one.equals(two)); assertEquals(first, second);
} }
} }

89
src/test/java/com/github/prominence/openweathermap/api/model/forecast/WindUnitTest.java
View File

@ -22,108 +22,109 @@
package com.github.prominence.openweathermap.api.model.forecast; package com.github.prominence.openweathermap.api.model.forecast;
import org.junit.Assert; import org.junit.jupiter.api.Test;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
public class WindUnitTest { public class WindUnitTest {
@Test @Test
public void whenCreateWindWithValidArgs_thenValueIsSet() { public void whenCreateWindWithValidArgs_thenValueIsSet() {
Assert.assertEquals(44.0, Wind.withValue(44, "ms").getSpeed(), 0.00001); assertEquals(44.0, Wind.withValue(44, "ms").getSpeed(), 0.00001);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateWindWithInvalidSpeedArg_thenThrowAnException() { public void whenCreateWindWithInvalidSpeedArg_thenThrowAnException() {
Wind.withValue(-21, "a"); assertThrows(IllegalArgumentException.class, () -> Wind.withValue(-21, "a"));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenCreateWindWithInvalidUnitArg_thenThrowAnException() { public void whenCreateWindWithInvalidUnitArg_thenThrowAnException() {
Wind.withValue(342, null); assertThrows(IllegalArgumentException.class, () -> Wind.withValue(342, null));
} }
@Test @Test
public void whenSetValidSpeed_thenValueIsSet() { public void whenSetValidSpeed_thenValueIsSet() {
final Wind wind = Wind.withValue(33, "as"); final Wind wind = Wind.withValue(33, "as");
Assert.assertEquals(33, wind.getSpeed(), 0.00001); assertEquals(33, wind.getSpeed(), 0.00001);
wind.setSpeed(0); wind.setSpeed(0);
Assert.assertEquals(0, wind.getSpeed(), 0.00001); assertEquals(0, wind.getSpeed(), 0.00001);
wind.setSpeed(3656); wind.setSpeed(3656);
Assert.assertEquals(3656, wind.getSpeed(), 0.00001); assertEquals(3656, wind.getSpeed(), 0.00001);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidSpeedBelow0_thenThrowAnException() { public void whenSetInvalidSpeedBelow0_thenThrowAnException() {
final Wind wind = Wind.withValue(33, "as"); final Wind wind = Wind.withValue(33, "as");
Assert.assertEquals(33, wind.getSpeed(), 0.00001); assertEquals(33, wind.getSpeed(), 0.00001);
wind.setSpeed(-22); assertThrows(IllegalArgumentException.class, () -> wind.setSpeed(-22));
} }
@Test @Test
public void whenSetValidDegrees_thenValueIsSet() { public void whenSetValidDegrees_thenValueIsSet() {
final Wind wind = Wind.withValue(33, "as"); final Wind wind = Wind.withValue(33, "as");
Assert.assertNull(wind.getDegrees()); assertNull(wind.getDegrees());
wind.setDegrees(22); wind.setDegrees(22);
Assert.assertEquals(22, wind.getDegrees(), 0.00001); assertEquals(22, wind.getDegrees(), 0.00001);
wind.setDegrees(0); wind.setDegrees(0);
Assert.assertEquals(0, wind.getDegrees(), 0.00001); assertEquals(0, wind.getDegrees(), 0.00001);
wind.setDegrees(360); wind.setDegrees(360);
Assert.assertEquals(360, wind.getDegrees(), 0.00001); assertEquals(360, wind.getDegrees(), 0.00001);
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidDegreesBelow0_thenThrowAnException() { public void whenSetInvalidDegreesBelow0_thenThrowAnException() {
final Wind wind = Wind.withValue(33, "as"); final Wind wind = Wind.withValue(33, "as");
wind.setDegrees(-32); assertThrows(IllegalArgumentException.class, () -> wind.setDegrees(-32));
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetInvalidDegreesAbove360_thenThrowAnException() { public void whenSetInvalidDegreesAbove360_thenThrowAnException() {
final Wind wind = Wind.withValue(33, "as"); final Wind wind = Wind.withValue(33, "as");
wind.setDegrees(378); assertThrows(IllegalArgumentException.class, () -> wind.setDegrees(378));
} }
@Test @Test
public void whenSetNonNullUnit_thenValueIsSet() { public void whenSetNonNullUnit_thenValueIsSet() {
final Wind wind = Wind.withValue(33, "as"); final Wind wind = Wind.withValue(33, "as");
Assert.assertEquals(wind.getUnit(), "as"); assertEquals(wind.getUnit(), "as");
wind.setUnit("myUnit"); wind.setUnit("myUnit");
Assert.assertEquals(wind.getUnit(), "myUnit"); assertEquals(wind.getUnit(), "myUnit");
} }
@Test(expected = IllegalArgumentException.class) @Test
public void whenSetNullUnit_thenThrowAnException() { public void whenSetNullUnit_thenThrowAnException() {
final Wind wind = Wind.withValue(33, "as"); final Wind wind = Wind.withValue(33, "as");
wind.setUnit(null); assertThrows(IllegalArgumentException.class, () -> wind.setUnit(null));
} }
@Test @Test
public void whenCallToString_thenAllIsFine() { public void whenCallToString_thenAllIsFine() {
final Wind wind = Wind.withValue(302, "a"); final Wind wind = Wind.withValue(302, "a");
Assert.assertNotNull(wind.toString()); assertNotNull(wind.toString());
wind.setDegrees(22); wind.setDegrees(22);
Assert.assertNotNull(wind.toString()); assertNotNull(wind.toString());
Assert.assertNotEquals("", wind.toString()); assertNotEquals("", wind.toString());
} }
@Test @Test
@ -131,49 +132,55 @@ public class WindUnitTest {
final Wind first = Wind.withValue(22, "a"); final Wind first = Wind.withValue(22, "a");
final Wind second = Wind.withValue(22, "b"); final Wind second = Wind.withValue(22, "b");
Assert.assertNotEquals(first.hashCode(), second.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
second.setUnit("a"); second.setUnit("a");
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
second.setSpeed(33); second.setSpeed(33);
Assert.assertNotEquals(first.hashCode(), second.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
first.setSpeed(333); first.setSpeed(333);
Assert.assertNotEquals(first.hashCode(), second.hashCode()); assertNotEquals(first.hashCode(), second.hashCode());
first.setSpeed(33); first.setSpeed(33);
Assert.assertEquals(first.hashCode(), second.hashCode()); assertEquals(first.hashCode(), second.hashCode());
} }
@Test @Test
public void whenCheckEquality_thenAllIsFine() { public void whenCheckEquality_thenAllIsFine() {
final Wind first = Wind.withValue(11, "a"); final Wind first = Wind.withValue(11, "a");
final Wind second = Wind.withValue(11, "a"); final Wind second = Wind.withValue(12, "a");
Assert.assertTrue(first.equals(second)); assertNotEquals(first, second);
Assert.assertTrue(first.equals(first)); first.setSpeed(12);
Assert.assertFalse(first.equals(new Object()));
assertEquals(first, second);
assertEquals(first, first);
assertNotEquals(first, new Object());
first.setDegrees(34); first.setDegrees(34);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
second.setDegrees(34); second.setDegrees(34);
Assert.assertTrue(first.equals(second)); assertEquals(first, second);
second.setUnit("v"); second.setUnit("v");
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
first.setUnit("v"); first.setUnit("v");
assertEquals(first, second);
first.setSpeed(second.getSpeed() + 4); first.setSpeed(second.getSpeed() + 4);
Assert.assertFalse(first.equals(second)); assertNotEquals(first, second);
} }
} }

85
src/test/java/com/github/prominence/openweathermap/api/model/onecall/AtmosphericPressureUnitTest.java Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class AtmosphericPressureUnitTest {
@Test
public void withInvalidValue_negative() {
assertThrows(IllegalArgumentException.class, () -> AtmosphericPressure.withValue(-20.0));
}
@Test
public void getSeaLevelValue() {
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(22.2);
assertEquals(22.2, atmosphericPressure.getSeaLevelValue(), 0.00001);
}
@Test
public void getUnit() {
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(22.2);
assertNotNull(atmosphericPressure.getUnit());
assertNotEquals("", atmosphericPressure.getUnit());
}
@Test
public void testEquals() {
final AtmosphericPressure first = AtmosphericPressure.withValue(600);
final AtmosphericPressure second = AtmosphericPressure.withValue(600);
assertEquals(first, first);
assertNotEquals(first, null);
assertNotEquals(first, new Object());
assertEquals(first, second);
first.setSeaLevelValue(200);
assertNotEquals(first, second);
}
@Test
public void testHashCode() {
final AtmosphericPressure first = AtmosphericPressure.withValue(600);
final AtmosphericPressure second = AtmosphericPressure.withValue(600);
assertEquals(first.hashCode(), second.hashCode());
first.setSeaLevelValue(200);
assertNotEquals(first.hashCode(), second.hashCode());
}
@Test
public void testToString() {
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(22.2);
assertNotNull(atmosphericPressure.toString());
assertNotEquals("", atmosphericPressure.toString());
}
}

335
src/test/java/com/github/prominence/openweathermap/api/model/onecall/CurrentUnitTest.java Normal file
View File

@ -0,0 +1,335 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import com.github.prominence.openweathermap.api.model.Clouds;
import com.github.prominence.openweathermap.api.model.Humidity;
import com.github.prominence.openweathermap.api.model.WeatherState;
import org.junit.jupiter.api.Test;
import java.time.LocalDateTime;
import static org.junit.jupiter.api.Assertions.*;
public class CurrentUnitTest {
@Test
public void getForecastTime() {
final Current current = new Current();
final LocalDateTime now = LocalDateTime.now();
current.setForecastTime(now);
assertEquals(now, current.getForecastTime());
}
@Test
public void getSunriseTime() {
final Current current = new Current();
final LocalDateTime now = LocalDateTime.now();
current.setSunriseTime(now);
assertEquals(now, current.getSunriseTime());
}
@Test
public void getSunsetTime() {
final Current current = new Current();
final LocalDateTime now = LocalDateTime.now();
current.setSunsetTime(now);
assertEquals(now, current.getSunsetTime());
}
@Test
public void getWeatherState() {
final Current current = new Current();
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
current.setWeatherState(weatherState);
assertEquals(weatherState, current.getWeatherState());
}
@Test
public void getTemperature() {
final Current current = new Current();
final Temperature temperature = Temperature.withValue(10, "K");
current.setTemperature(temperature);
assertEquals(temperature, current.getTemperature());
}
@Test
public void getAtmosphericPressure() {
final Current current = new Current();
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(22.3);
current.setAtmosphericPressure(atmosphericPressure);
assertEquals(atmosphericPressure, current.getAtmosphericPressure());
}
@Test
public void getHumidity() {
final Current current = new Current();
final Humidity humidity = Humidity.withValue((byte) 10);
current.setHumidity(humidity);
assertEquals(humidity, current.getHumidity());
}
@Test
public void getWind() {
final Current current = new Current();
final Wind wind = Wind.withValue(13.2, "m/s");
current.setWind(wind);
assertEquals(wind, current.getWind());
}
@Test
public void getClouds() {
final Current current = new Current();
final Clouds clouds = Clouds.withValue((byte) 25);
current.setClouds(clouds);
assertEquals(clouds, current.getClouds());
}
@Test
public void getUvIndex() {
final Current current = new Current();
final double uvIndex = 22.4;
current.setUvIndex(uvIndex);
assertEquals(uvIndex, current.getUvIndex(), 0.00001);
current.setUvIndex(null);
assertNull(current.getUvIndex());
}
@Test
public void getIllegalUvIndexValue() {
final Current current = new Current();
assertThrows(IllegalArgumentException.class, () -> current.setUvIndex(-1.2));
}
@Test
public void getProbabilityOfPrecipitation() {
final Current current = new Current();
final double vim = 120;
current.setVisibilityInMetres(vim);
assertEquals(vim, current.getVisibilityInMetres(), 0.00001);
current.setVisibilityInMetres(null);
assertNull(current.getVisibilityInMetres());
}
@Test
public void getIllegalProbabilityOfPrecipitationValue_negative() {
final Current current = new Current();
assertThrows(IllegalArgumentException.class, () -> current.setVisibilityInMetres(-20.0));
}
@Test
public void getRain() {
final Current current = new Current();
final Rain rain = Rain.withOneHourLevelValue(20.2);
current.setRain(rain);
assertEquals(rain, current.getRain());
}
@Test
public void getSnow() {
final Current current = new Current();
final Snow snow = Snow.withOneHourLevelValue(25.0);
current.setSnow(snow);
assertEquals(snow, current.getSnow());
}
@Test
public void getEquals() {
final LocalDateTime now = LocalDateTime.now();
final Current first = new Current();
assertEquals(first, first);
assertNotEquals(first, null);
assertNotEquals(first, new Object());
final Current second = new Current();
assertEquals(first, second);
first.setForecastTime(now);
assertNotEquals(first, second);
second.setForecastTime(now);
assertEquals(first, second);
first.setSunriseTime(now);
assertNotEquals(first, second);
second.setSunriseTime(now);
assertEquals(first, second);
first.setSunsetTime(now);
assertNotEquals(first, second);
second.setSunsetTime(now);
assertEquals(first, second);
final WeatherState weatherState = new WeatherState(800, "Clear", "clear sky");
first.setWeatherState(weatherState);
assertNotEquals(first, second);
second.setWeatherState(weatherState);
assertEquals(first, second);
final Temperature temperature = Temperature.withValue(10, "K");
first.setTemperature(temperature);
assertNotEquals(first, second);
second.setTemperature(temperature);
assertEquals(first, second);
final AtmosphericPressure atmosphericPressure = AtmosphericPressure.withValue(22.3);
first.setAtmosphericPressure(atmosphericPressure);
assertNotEquals(first, second);
second.setAtmosphericPressure(atmosphericPressure);
assertEquals(first, second);
final Humidity humidity = Humidity.withValue((byte) 10);
first.setHumidity(humidity);
assertNotEquals(first, second);
second.setHumidity(humidity);
assertEquals(first, second);
final Wind wind = Wind.withValue(13.2, "m/s");
first.setWind(wind);
assertNotEquals(first, second);
second.setWind(wind);
assertEquals(first, second);
final Clouds clouds = Clouds.withValue((byte) 25);
first.setClouds(clouds);
assertNotEquals(first, second);
second.setClouds(clouds);
assertEquals(first, second);
final double uvIndex = 22.4;
first.setUvIndex(uvIndex);
assertNotEquals(first, second);
second.setUvIndex(uvIndex);
assertEquals(first, second);
final double vim = 250;
first.setVisibilityInMetres(vim);
assertNotEquals(first, second);
second.setVisibilityInMetres(vim);
assertEquals(first, second);
final Rain rain = Rain.withOneHourLevelValue(20.2);
first.setRain(rain);
assertNotEquals(first, second);
second.setRain(rain);
assertEquals(first, second);
final Snow snow = Snow.withOneHourLevelValue(25.0);
first.setSnow(snow);
assertNotEquals(first, second);
second.setSnow(snow);
assertEquals(first, second);
}
@Test
public void getHashCode() {
final Current first = new Current();
final Current second = new Current();
assertEquals(first.hashCode(), second.hashCode());
first.setForecastTime(LocalDateTime.now());
assertNotEquals(first.hashCode(), second.hashCode());
}
@Test
public void getToString() {
final LocalDateTime now = LocalDateTime.now();
final Current current = new Current();
current.setForecastTime(now);
assertNotNull(current.toString());
assertNotEquals("", current.toString());
}
}

85
src/test/java/com/github/prominence/openweathermap/api/model/onecall/RainUnitTest.java Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class RainUnitTest {
@Test
public void withInvalidValue_negative() {
assertThrows(IllegalArgumentException.class, () -> Rain.withOneHourLevelValue(-20.0));
}
@Test
public void getOneHourRainLevel() {
final Rain rain = Rain.withOneHourLevelValue(220.0);
assertEquals(220.0, rain.getOneHourLevel(), 0.00001);
}
@Test
public void getUnit() {
final Rain rain = Rain.withOneHourLevelValue(220.0);
assertNotNull(rain.getUnit());
assertNotEquals("", rain.getUnit());
}
@Test
public void testEquals() {
final Rain first = Rain.withOneHourLevelValue(600);
final Rain second = Rain.withOneHourLevelValue(600);
assertEquals(first, first);
assertNotEquals(first, null);
assertNotEquals(first, new Object());
assertEquals(first, second);
first.setOneHourLevel(200);
assertNotEquals(first, second);
}
@Test
public void testHashCode() {
final Rain first = Rain.withOneHourLevelValue(600);
final Rain second = Rain.withOneHourLevelValue(600);
assertEquals(first.hashCode(), second.hashCode());
first.setOneHourLevel(200);
assertNotEquals(first.hashCode(), second.hashCode());
}
@Test
public void testToString() {
final Rain rain = Rain.withOneHourLevelValue(22.2);
assertNotNull(rain.toString());
assertNotEquals("", rain.toString());
}
}

85
src/test/java/com/github/prominence/openweathermap/api/model/onecall/SnowUnitTest.java Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class SnowUnitTest {
@Test
public void withInvalidValue_negative() {
assertThrows(IllegalArgumentException.class, () -> Snow.withOneHourLevelValue(-20.0));
}
@Test
public void getOneHourRainLevel() {
final Snow snow = Snow.withOneHourLevelValue(220.0);
assertEquals(220.0, snow.getOneHourLevel(), 0.00001);
}
@Test
public void getUnit() {
final Snow snow = Snow.withOneHourLevelValue(220.0);
assertNotNull(snow.getUnit());
assertNotEquals("", snow.getUnit());
}
@Test
public void testEquals() {
final Snow first = Snow.withOneHourLevelValue(600);
final Snow second = Snow.withOneHourLevelValue(600);
assertEquals(first, first);
assertNotEquals(first, null);
assertNotEquals(first, new Object());
assertEquals(first, second);
first.setOneHourLevel(200);
assertNotEquals(first, second);
}
@Test
public void testHashCode() {
final Snow first = Snow.withOneHourLevelValue(600);
final Snow second = Snow.withOneHourLevelValue(600);
assertEquals(first.hashCode(), second.hashCode());
first.setOneHourLevel(200);
assertNotEquals(first.hashCode(), second.hashCode());
}
@Test
public void testToString() {
final Snow snow = Snow.withOneHourLevelValue(22.2);
assertNotNull(snow.toString());
assertNotEquals("", snow.toString());
}
}

129
src/test/java/com/github/prominence/openweathermap/api/model/onecall/TemperatureUnitTest.java Normal file
View File

@ -0,0 +1,129 @@
/*
* Copyright (c) 2021 Alexey Zinchenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.github.prominence.openweathermap.api.model.onecall;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class TemperatureUnitTest {
@Test
public void withInvalidValue_noUnit() {
assertThrows(IllegalArgumentException.class, () -> Temperature.withValue(-20, null));
}
@Test
public void getValue() {
final Temperature temperature = Temperature.withValue(20, "K");
assertEquals(20, temperature.getValue(), 0.00001);
}
@Test
public void getFeelsLike() {
final Temperature temperature = Temperature.withValue(20, "K");
temperature.setFeelsLike(18.0);
assertEquals(18.0, temperature.getFeelsLike(), 0.00001);
}
@Test
public void getDewPoint() {
final Temperature temperature = Temperature.withValue(20, "K");
temperature.setDewPoint(5.0);
assertEquals(5.0, temperature.getDewPoint(), 0.00001);
}
@Test
public void getUnit() {
final Temperature temperature = Temperature.withValue(20, "K");
assertEquals("K", temperature.getUnit());
}
@Test
public void testEquals() {
final Temperature first = Temperature.withValue(30, "L");
final Temperature second = Temperature.withValue(30, "K");
assertEquals(first, first);
assertNotEquals(first, null);
assertNotEquals(first, new Object());
assertNotEquals(first, second);
first.setUnit("K");
assertEquals(first, second);
first.setFeelsLike(25.0);
assertNotEquals(first, second);
second.setFeelsLike(25.0);
assertEquals(first, second);
first.setDewPoint(10.0);
assertNotEquals(first, second);
second.setDewPoint(10.0);
assertEquals(first, second);
first.setValue(27.0);
assertNotEquals(first, second);
second.setValue(27.0);
assertEquals(first, second);
}
@Test
public void testHashCode() {
final Temperature first = Temperature.withValue(600, "K");
final Temperature second = Temperature.withValue(600, "K");
assertEquals(first.hashCode(), second.hashCode());
first.setFeelsLike(599d);
assertNotEquals(first.hashCode(), second.hashCode());
}
@Test
public void testToString() {
final Temperature temperature = Temperature.withValue(20, "K");
assertNotNull(temperature.toString());
assertNotEquals("", temperature.toString());
temperature.setFeelsLike(22.4);
assertNotNull(temperature.toString());
assertNotEquals("", temperature.toString());
}
}

Some files were not shown because too many files have changed in this diff Show More