mirror of
https://github.com/Prominence/openweathermap-java-api.git
synced 2026-07-03 19:26:43 +03:00
Compare commits
17 Commits
2.1.0
..
13b20fc7e9
| Author | SHA1 | Date | |
|---|---|---|---|
 Prominence
|
13b20fc7e9 | ||
 Prominence
|
2a531dd683 | ||
 dependabot-preview[bot]
|
1e1054903e | ||
|
dependabot-preview[bot]
|
ff5b6c7a33 | ||
|
dependabot-preview[bot]
|
db1cf858d8 | ||
|
dependabot-preview[bot]
|
c2cc110dab | ||
|
dependabot-preview[bot]
|
d4c2472254 | ||
|
dependabot-preview[bot]
|
380e3e458b | ||
|
dependabot-preview[bot]
|
246c07db97 | ||
|
dependabot-preview[bot]
|
f19a627313 | ||
|
dependabot-preview[bot]
|
6438c323ff | ||
|
dependabot-preview[bot]
|
1cbff68338 | ||
|
Prominence
|
1e08f4f8ae | ||
|
Prominence
|
bfa15fd9fe | ||
 Alexey Zinchenko
|
3c8b00eae1 | ||
|
Prominence
|
f2c672b864 | ||
|
Alexey Zinchenko
|
e594ffb7ad |
@@ -0,0 +1,9 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: maven
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
time: "03:00"
|
||||||
|
open-pull-requests-limit: 10
|
||||||
|
target-branch: dev
|
||||||
@@ -13,10 +13,10 @@ name: "CodeQL"
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [ dev ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ master ]
|
branches: [ dev ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '27 20 * * 1'
|
- cron: '27 20 * * 1'
|
||||||
|
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ Free:
|
|||||||
* Current weather data
|
* Current weather data
|
||||||
* 5 day / 3-hour forecast
|
* 5 day / 3-hour forecast
|
||||||
* One Call API
|
* One Call API
|
||||||
|
* Air pollution
|
||||||
|
|
||||||
### Will be implemented later:
|
### Will be implemented later:
|
||||||
|
|
||||||
Free:
|
Free:
|
||||||
* Air pollution
|
|
||||||
* Geocoding API
|
* Geocoding API
|
||||||
* Weather Stations
|
* Weather Stations
|
||||||
* Weather Triggers
|
* Weather Triggers
|
||||||
@@ -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.1.0</version>
|
<version>2.2.0-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
```
|
```
|
||||||
|
|
||||||
### Gradle coordinates:
|
### Gradle coordinates:
|
||||||
|
|
||||||
```groovy
|
```groovy
|
||||||
compile('com.github.prominence:openweathermap-api:2.1.0')
|
compile('com.github.prominence:openweathermap-api:2.2.0-SNAPSHOT')
|
||||||
```
|
```
|
||||||
|
|
||||||
### Documentation
|
### Documentation
|
||||||
@@ -43,14 +43,16 @@ compile('com.github.prominence:openweathermap-api:2.1.0')
|
|||||||
* [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 - 2.1.0](docs/Release_2.1.0.md)
|
||||||
|
* [OpenWeatherMap Java API - 2.1.1](docs/Release_2.1.1.md)
|
||||||
|
* [OpenWeatherMap Java API - 2.2.0](docs/Release_2.2.0.md)
|
||||||
* [OpenWeatherMap Java API - SNAPSHOT](docs/SNAPSHOT.md)
|
* [OpenWeatherMap Java API - SNAPSHOT](docs/SNAPSHOT.md)
|
||||||
|
|
||||||
### License
|
### License
|
||||||
MIT
|
MIT
|
||||||
|
|
||||||
[ci-shield]: https://travis-ci.org/Prominence/openweathermap-java-api.svg?branch=master
|
[ci-shield]: https://travis-ci.org/Prominence/openweathermap-java-api.svg?branch=dev
|
||||||
[ci-link]: https://travis-ci.org/Prominence/openweathermap-java-api
|
[ci-link]: https://travis-ci.org/Prominence/openweathermap-java-api
|
||||||
|
|
||||||
|
|
||||||
[codecov-shield]: https://codecov.io/gh/Prominence/openweathermap-java-api/branch/master/graph/badge.svg
|
[codecov-shield]: https://codecov.io/gh/Prominence/openweathermap-java-api/branch/dev/graph/badge.svg
|
||||||
[codecov-link]: https://codecov.io/gh/Prominence/openweathermap-java-api
|
[codecov-link]: https://codecov.io/gh/Prominence/openweathermap-java-api
|
||||||
|
|||||||
@@ -0,0 +1,486 @@
|
|||||||
|
### 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.1</version>
|
||||||
|
</dependency>
|
||||||
|
```
|
||||||
|
|
||||||
|
### Gradle coordinates:
|
||||||
|
|
||||||
|
```groovy
|
||||||
|
compile('com.github.prominence:openweathermap-api:2.1.1')
|
||||||
|
```
|
||||||
|
|
||||||
|
### 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). |
|
||||||
|
| `getProbabilityOfPrecipitationPercentage()` | Returns probability of precipitation 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). |
|
||||||
|
| `getProbabilityOfPrecipitationPercentage()` | Returns probability of precipitation 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*)
|
||||||
@@ -0,0 +1,538 @@
|
|||||||
|
### Implemented features:
|
||||||
|
* Current weather data
|
||||||
|
* 5 day / 3-hour forecast
|
||||||
|
* One Call API
|
||||||
|
* Air Pollution
|
||||||
|
|
||||||
|
### Maven coordinates:
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.prominence</groupId>
|
||||||
|
<artifactId>openweathermap-api</artifactId>
|
||||||
|
<version>2.2.0</version>
|
||||||
|
</dependency>
|
||||||
|
```
|
||||||
|
|
||||||
|
### Gradle coordinates:
|
||||||
|
|
||||||
|
```groovy
|
||||||
|
compile('com.github.prominence:openweathermap-api:2.2.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()`
|
||||||
|
* `airPollution()`
|
||||||
|
|
||||||
|
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). |
|
||||||
|
| `getProbabilityOfPrecipitationPercentage()` | Returns probability of precipitation 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). |
|
||||||
|
| `getProbabilityOfPrecipitationPercentage()` | Returns probability of precipitation 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`. |
|
||||||
|
|
||||||
|
#### Air Pollution API
|
||||||
|
Examples:
|
||||||
|
```java
|
||||||
|
final AirPollutionDetails airPollutionDetails = openWeatherClient
|
||||||
|
.airPollution()
|
||||||
|
.current()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieve()
|
||||||
|
.asJava();
|
||||||
|
```
|
||||||
|
|
||||||
|
```java
|
||||||
|
final AirPollutionDetails airPollutionDetails = openWeatherClient
|
||||||
|
.airPollution()
|
||||||
|
.historical()
|
||||||
|
.byCoordinateAndPeriod(Coordinate.of(53.54, 27.34), 1606223802, 1606482999)
|
||||||
|
.retrieve()
|
||||||
|
.asJava();
|
||||||
|
```
|
||||||
|
|
||||||
|
`com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails`'s useful public methods(setters are not listed):
|
||||||
|
|
||||||
|
| Method | Description |
|
||||||
|
|-------------------------------|---------------------------------------------------------------------------|
|
||||||
|
| `getCoordinate()` | Returns `Coordinate` object. Available fields: `latitude`, `longitude`. |
|
||||||
|
| `getAirPollutionRecords()` | Returns list of `AirPollutionRecord` objects. |
|
||||||
|
|
||||||
|
`com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionRecord`'s useful public methods(setters are not listed):
|
||||||
|
|
||||||
|
| Method | Description |
|
||||||
|
|-------------------------------|---------------------------------------------------------------------------|
|
||||||
|
| `getForecastTime()` | Returns `LocalDateTime` object with air pollution forecast time. |
|
||||||
|
| `getAirQualityIndex()` | Returns `AirQualityIndex` object. |
|
||||||
|
| `getCO()` | Returns carbon monoxide concentration value in μg/m^3.s. |
|
||||||
|
| `getCarbonMonoxide()` | An alias for `getCO()` method. |
|
||||||
|
| `getNO()` | Returns nitrogen monoxide concentration value in μg/m^3. |
|
||||||
|
| `getNitrogenMonoxide()` | An alias for `getNO()` method. |
|
||||||
|
| `getNO2()` | Returns nitrogen dioxide concentration value in μg/m^3. |
|
||||||
|
| `getNitrogenDioxide()` | An alias for `getNO2()` method. |
|
||||||
|
| `getO3()` | Returns ozone concentration value in μg/m^3. |
|
||||||
|
| `getOzone()` | An alias for `getO3()` method. |
|
||||||
|
| `getSO2()` | Returns sulphur dioxide concentration value in μg/m^3. |
|
||||||
|
| `getSulphurDioxide()` | An alias for `getSO2()` method. |
|
||||||
|
| `getPM2_5()` | Returns fine particles matter concentration value in μg/m^3. |
|
||||||
|
| `getFineParticlesMatter()` | An alias for `getPM2_5()` method. |
|
||||||
|
| `getPM10()` | Returns coarse particulate matter concentration value in μg/m^3. |
|
||||||
|
| `getCoarseParticulateMatter()`| An alias for `getPM10()` method. |
|
||||||
|
| `getNH3()` | Returns ammonia concentration value in μg/m^3. |
|
||||||
|
| `getAmmonia()` | An alias for `getNH3()` method. |
|
||||||
|
|
||||||
|
### 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*)
|
||||||
+85
-31
@@ -2,6 +2,7 @@
|
|||||||
* Current weather data
|
* Current weather data
|
||||||
* 5 day / 3-hour forecast
|
* 5 day / 3-hour forecast
|
||||||
* One Call API
|
* One Call API
|
||||||
|
* Air Pollution
|
||||||
|
|
||||||
### Maven coordinates:
|
### Maven coordinates:
|
||||||
|
|
||||||
@@ -9,14 +10,14 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.prominence</groupId>
|
<groupId>com.github.prominence</groupId>
|
||||||
<artifactId>openweathermap-api</artifactId>
|
<artifactId>openweathermap-api</artifactId>
|
||||||
<version>2.1.0</version>
|
<version>2.2.0-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
```
|
```
|
||||||
|
|
||||||
### Gradle coordinates:
|
### Gradle coordinates:
|
||||||
|
|
||||||
```groovy
|
```groovy
|
||||||
compile('com.github.prominence:openweathermap-api:2.1.0')
|
compile('com.github.prominence:openweathermap-api:2.2.0-SNAPSHOT')
|
||||||
```
|
```
|
||||||
|
|
||||||
### How to use:
|
### How to use:
|
||||||
@@ -31,6 +32,7 @@ Currently, available APIs are:
|
|||||||
* `currentWeather()`
|
* `currentWeather()`
|
||||||
* `forecast5Day3HourStep()`
|
* `forecast5Day3HourStep()`
|
||||||
* `oneCall()`
|
* `oneCall()`
|
||||||
|
* `airPollution()`
|
||||||
|
|
||||||
Default(more or less) customization points:
|
Default(more or less) customization points:
|
||||||
```java
|
```java
|
||||||
@@ -332,38 +334,40 @@ You are able to set preferable options(via chain methods) and execute appropriat
|
|||||||
|
|
||||||
`com.github.prominence.openweathermap.api.model.onecall.current.Hourly`'s useful public methods(setters are not listed):
|
`com.github.prominence.openweathermap.api.model.onecall.current.Hourly`'s useful public methods(setters are not listed):
|
||||||
|
|
||||||
| Method | Description |
|
| Method | Description |
|
||||||
|-----------------------------------|---------------------------------------------------------------------------------------------------|
|
|-----------------------------------------------|---------------------------------------------------------------------------------------------------|
|
||||||
| `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. |
|
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
|
||||||
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
|
| `getTemperature()` | Returns `Temperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
|
||||||
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
|
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
|
||||||
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
|
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
|
||||||
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
|
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
|
||||||
| `getUvIndex()` | Returns UV index value. |
|
| `getUvIndex()` | Returns UV index value. |
|
||||||
| `getVisibilityInMetres()` | Returns visibility in metres. |
|
| `getVisibilityInMetres()` | Returns visibility in metres. |
|
||||||
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
|
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
|
||||||
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
|
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
|
||||||
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
|
| `getProbabilityOfPrecipitationPercentage()` | Returns probability of precipitation percentage. |
|
||||||
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` 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.Daily`'s useful public methods(setters are not listed):
|
`com.github.prominence.openweathermap.api.model.onecall.current.Daily`'s useful public methods(setters are not listed):
|
||||||
|
|
||||||
| Method | Description |
|
| Method | Description |
|
||||||
|-----------------------------------|---------------------------------------------------------------------------------------------------|
|
|-----------------------------------------------|---------------------------------------------------------------------------------------------------|
|
||||||
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
|
| `getForecastTime()` | Returns `LocalDateTime` object with weather forecast time. |
|
||||||
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
|
| `getSunriseTime()` | Returns `LocalDateTime` object with sunrise time. |
|
||||||
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
|
| `getSunsetTime()` | Returns `LocalDateTime` object with sunset time. |
|
||||||
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
|
| `getWeatherState()` | Returns `WeatherState` object with basic weather state information. |
|
||||||
| `getTemperature()` | Returns `DailyTemperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
|
| `getTemperature()` | Returns `DailyTemperature` object. Available fields: `value`, `feelsLike`, `dewPoint` and `unit`. |
|
||||||
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
|
| `getAtmosphericPressure()` | Returns `AtmosphericPressure` object. Available fields: `seaLevelValue`. |
|
||||||
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
|
| `getHumidity()` | Returns `Humidity` object. Available fields: `value` and `unit`. |
|
||||||
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
|
| `getWind()` | Returns `Wind` object. Available fields: `speed`, `degrees`, `gust` and `unit`. |
|
||||||
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
|
| `getClouds()` | Returns `Clouds` object. Available fields: `value` and `unit`. |
|
||||||
| `getUvIndex()` | Returns UV index value. |
|
| `getUvIndex()` | Returns UV index value. |
|
||||||
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
|
| `getProbabilityOfPrecipitation()` | Returns probability of precipitation(not percentage). |
|
||||||
| `getRain()` | Returns `DailyRain` object. Available fields: `value`. |
|
| `getProbabilityOfPrecipitationPercentage()` | Returns probability of precipitation percentage. |
|
||||||
| `getSnow()` | Returns `DailySnow` object. Available fields: `value`. |
|
| `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):
|
`com.github.prominence.openweathermap.api.model.onecall.current.Alert`'s useful public methods(setters are not listed):
|
||||||
|
|
||||||
@@ -418,6 +422,56 @@ You are able to set preferable options(via chain methods) and execute appropriat
|
|||||||
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
|
| `getRain()` | Returns `Rain` object. Available fields: `oneHourLevel` and `unit`. |
|
||||||
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
|
| `getSnow()` | Returns `Snow` object. Available fields: `oneHourLevel` and `unit`. |
|
||||||
|
|
||||||
|
#### Air Pollution API
|
||||||
|
Examples:
|
||||||
|
```java
|
||||||
|
final AirPollutionDetails airPollutionDetails = openWeatherClient
|
||||||
|
.airPollution()
|
||||||
|
.current()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieve()
|
||||||
|
.asJava();
|
||||||
|
```
|
||||||
|
|
||||||
|
```java
|
||||||
|
final AirPollutionDetails airPollutionDetails = openWeatherClient
|
||||||
|
.airPollution()
|
||||||
|
.historical()
|
||||||
|
.byCoordinateAndPeriod(Coordinate.of(53.54, 27.34), 1606223802, 1606482999)
|
||||||
|
.retrieve()
|
||||||
|
.asJava();
|
||||||
|
```
|
||||||
|
|
||||||
|
`com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails`'s useful public methods(setters are not listed):
|
||||||
|
|
||||||
|
| Method | Description |
|
||||||
|
|-------------------------------|---------------------------------------------------------------------------|
|
||||||
|
| `getCoordinate()` | Returns `Coordinate` object. Available fields: `latitude`, `longitude`. |
|
||||||
|
| `getAirPollutionRecords()` | Returns list of `AirPollutionRecord` objects. |
|
||||||
|
|
||||||
|
`com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionRecord`'s useful public methods(setters are not listed):
|
||||||
|
|
||||||
|
| Method | Description |
|
||||||
|
|-------------------------------|---------------------------------------------------------------------------|
|
||||||
|
| `getForecastTime()` | Returns `LocalDateTime` object with air pollution forecast time. |
|
||||||
|
| `getAirQualityIndex()` | Returns `AirQualityIndex` object. |
|
||||||
|
| `getCO()` | Returns carbon monoxide concentration value in μg/m^3.s. |
|
||||||
|
| `getCarbonMonoxide()` | An alias for `getCO()` method. |
|
||||||
|
| `getNO()` | Returns nitrogen monoxide concentration value in μg/m^3. |
|
||||||
|
| `getNitrogenMonoxide()` | An alias for `getNO()` method. |
|
||||||
|
| `getNO2()` | Returns nitrogen dioxide concentration value in μg/m^3. |
|
||||||
|
| `getNitrogenDioxide()` | An alias for `getNO2()` method. |
|
||||||
|
| `getO3()` | Returns ozone concentration value in μg/m^3. |
|
||||||
|
| `getOzone()` | An alias for `getO3()` method. |
|
||||||
|
| `getSO2()` | Returns sulphur dioxide concentration value in μg/m^3. |
|
||||||
|
| `getSulphurDioxide()` | An alias for `getSO2()` method. |
|
||||||
|
| `getPM2_5()` | Returns fine particles matter concentration value in μg/m^3. |
|
||||||
|
| `getFineParticlesMatter()` | An alias for `getPM2_5()` method. |
|
||||||
|
| `getPM10()` | Returns coarse particulate matter concentration value in μg/m^3. |
|
||||||
|
| `getCoarseParticulateMatter()`| An alias for `getPM10()` method. |
|
||||||
|
| `getNH3()` | Returns ammonia concentration value in μg/m^3. |
|
||||||
|
| `getAmmonia()` | An alias for `getNH3()` method. |
|
||||||
|
|
||||||
### Constants and options
|
### Constants and options
|
||||||
|
|
||||||
#### Language
|
#### Language
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>com.github.prominence</groupId>
|
<groupId>com.github.prominence</groupId>
|
||||||
<artifactId>openweathermap-api</artifactId>
|
<artifactId>openweathermap-api</artifactId>
|
||||||
<version>2.1.0</version>
|
<version>2.2.0-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Java OpenWeatherMap API</name>
|
<name>Java OpenWeatherMap API</name>
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>3.2.0</version>
|
<version>3.3.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>8</source>
|
<source>8</source>
|
||||||
</configuration>
|
</configuration>
|
||||||
@@ -120,7 +120,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-gpg-plugin</artifactId>
|
<artifactId>maven-gpg-plugin</artifactId>
|
||||||
<version>1.6</version>
|
<version>3.0.1</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>sign-artifacts</id>
|
<id>sign-artifacts</id>
|
||||||
@@ -134,7 +134,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.jacoco</groupId>
|
<groupId>org.jacoco</groupId>
|
||||||
<artifactId>jacoco-maven-plugin</artifactId>
|
<artifactId>jacoco-maven-plugin</artifactId>
|
||||||
<version>0.8.6</version>
|
<version>0.8.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<goals>
|
<goals>
|
||||||
@@ -163,25 +163,25 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-databind</artifactId>
|
<artifactId>jackson-databind</artifactId>
|
||||||
<version>2.12.2</version>
|
<version>2.12.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>1.7.30</version>
|
<version>1.7.32</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter-engine</artifactId>
|
<artifactId>junit-jupiter-engine</artifactId>
|
||||||
<version>5.7.1</version>
|
<version>5.7.2</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.platform</groupId>
|
<groupId>org.junit.platform</groupId>
|
||||||
<artifactId>junit-platform-runner</artifactId>
|
<artifactId>junit-platform-runner</artifactId>
|
||||||
<version>1.7.1</version>
|
<version>1.7.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
@@ -23,14 +23,17 @@
|
|||||||
package com.github.prominence.openweathermap.api;
|
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.conf.TimeoutSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequester;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequesterImpl;
|
||||||
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.OneCallWeatherRequester;
|
||||||
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherRequesterImpl;
|
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 static com.github.prominence.openweathermap.api.enums.SubscriptionPlan.*;
|
import static com.github.prominence.openweathermap.api.enums.SubscriptionPlan.ALL;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The main public API client to communicate with OpenWeatherMap services.
|
* The main public API client to communicate with OpenWeatherMap services.
|
||||||
@@ -38,6 +41,7 @@ import static com.github.prominence.openweathermap.api.enums.SubscriptionPlan.*;
|
|||||||
*/
|
*/
|
||||||
public class OpenWeatherMapClient {
|
public class OpenWeatherMapClient {
|
||||||
private final String apiKey;
|
private final String apiKey;
|
||||||
|
private final TimeoutSettings timeoutSettings = new TimeoutSettings();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created OpenWeatherMap client object.
|
* Created OpenWeatherMap client object.
|
||||||
@@ -47,13 +51,21 @@ public class OpenWeatherMapClient {
|
|||||||
this.apiKey = apiKey;
|
this.apiKey = apiKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setConnectionTimeout(int connectionTimeout) {
|
||||||
|
timeoutSettings.setConnectionTimeout(connectionTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setReadTimeout(int readTimeout) {
|
||||||
|
timeoutSettings.setReadTimeout(readTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Current Weather <a href="https://openweathermap.org/current">API</a>.
|
* Current Weather <a href="https://openweathermap.org/current">API</a>.
|
||||||
* @return requester for retrieving current weather information.
|
* @return requester for retrieving current weather information.
|
||||||
*/
|
*/
|
||||||
@SubscriptionAvailability(plans = ALL)
|
@SubscriptionAvailability(plans = ALL)
|
||||||
public CurrentWeatherRequester currentWeather() {
|
public CurrentWeatherRequester currentWeather() {
|
||||||
return new CurrentWeatherRequesterImpl(apiKey);
|
return new CurrentWeatherRequester(new RequestSettings(apiKey, timeoutSettings));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -74,4 +86,14 @@ public class OpenWeatherMapClient {
|
|||||||
public OneCallWeatherRequester oneCall() {
|
public OneCallWeatherRequester oneCall() {
|
||||||
return new OneCallWeatherRequesterImpl(apiKey);
|
return new OneCallWeatherRequesterImpl(apiKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Air Pollution <a href="https://openweathermap.org/api/air-pollution">API</a>.
|
||||||
|
* Air Pollution API provides current, forecast and historical air pollution data for any coordinates on the globe.
|
||||||
|
* @return requester for air pollution information retrieval.
|
||||||
|
*/
|
||||||
|
@SubscriptionAvailability(plans = ALL)
|
||||||
|
public AirPollutionRequester airPollution() {
|
||||||
|
return new AirPollutionRequesterImpl(apiKey);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022 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.conf;
|
||||||
|
|
||||||
|
public class TimeoutSettings {
|
||||||
|
private Integer connectionTimeout;
|
||||||
|
private Integer readTimeout;
|
||||||
|
|
||||||
|
public TimeoutSettings() {
|
||||||
|
this(2000, 2000);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TimeoutSettings(Integer connectionTimeout, Integer readTimeout) {
|
||||||
|
this.connectionTimeout = connectionTimeout;
|
||||||
|
this.readTimeout = readTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TimeoutSettings(TimeoutSettings from) {
|
||||||
|
this.connectionTimeout = from.connectionTimeout;
|
||||||
|
this.readTimeout = from.readTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getConnectionTimeout() {
|
||||||
|
return connectionTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setConnectionTimeout(Integer connectionTimeout) {
|
||||||
|
this.connectionTimeout = connectionTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getReadTimeout() {
|
||||||
|
return readTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setReadTimeout(Integer readTimeout) {
|
||||||
|
this.readTimeout = readTimeout;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The enum Air quality index.
|
||||||
|
*/
|
||||||
|
public enum AirQualityIndex {
|
||||||
|
/**
|
||||||
|
* Good air quality index.
|
||||||
|
*/
|
||||||
|
GOOD(1),
|
||||||
|
/**
|
||||||
|
* Fair air quality index.
|
||||||
|
*/
|
||||||
|
FAIR(2),
|
||||||
|
/**
|
||||||
|
* Moderate air quality index.
|
||||||
|
*/
|
||||||
|
MODERATE(3),
|
||||||
|
/**
|
||||||
|
* Poor air quality index.
|
||||||
|
*/
|
||||||
|
POOR(4),
|
||||||
|
/**
|
||||||
|
* Very poor air quality index.
|
||||||
|
*/
|
||||||
|
VERY_POOR(5);
|
||||||
|
|
||||||
|
private final int value;
|
||||||
|
|
||||||
|
AirQualityIndex(int index) {
|
||||||
|
this.value = index;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets value.
|
||||||
|
*
|
||||||
|
* @return the value
|
||||||
|
*/
|
||||||
|
public int getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets by index.
|
||||||
|
*
|
||||||
|
* @param index the index
|
||||||
|
* @return the by index
|
||||||
|
*/
|
||||||
|
public static AirQualityIndex getByIndex(int index) {
|
||||||
|
final Optional<AirQualityIndex> optionalAirQualityIndex = Arrays.stream(values()).filter(airQualityIndex -> airQualityIndex.getValue() == index).findFirst();
|
||||||
|
return optionalAirQualityIndex.orElse(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022 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;
|
||||||
|
|
||||||
|
public enum ResponseType {
|
||||||
|
HTML("html"),
|
||||||
|
XML("xml");
|
||||||
|
|
||||||
|
private final String value;
|
||||||
|
|
||||||
|
ResponseType(String value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns language's value.
|
||||||
|
* @return value.
|
||||||
|
*/
|
||||||
|
public String getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
+102
@@ -0,0 +1,102 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022 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.mapper;
|
||||||
|
|
||||||
|
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.AirQualityIndex;
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails;
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionRecord;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.TimeZone;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Air pollution response mapper.
|
||||||
|
*/
|
||||||
|
public class AirPollutionResponseMapper {
|
||||||
|
/**
|
||||||
|
* Map to air pollution air pollution.
|
||||||
|
*
|
||||||
|
* @param json the json
|
||||||
|
* @return the air pollution
|
||||||
|
*/
|
||||||
|
public AirPollutionDetails mapToAirPollution(String json) {
|
||||||
|
final ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
AirPollutionDetails airPollutionDetails;
|
||||||
|
try {
|
||||||
|
final JsonNode root = objectMapper.readTree(json);
|
||||||
|
airPollutionDetails = mapToAirPollution(root);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new RuntimeException("Cannot parse Air Pollution response");
|
||||||
|
}
|
||||||
|
|
||||||
|
return airPollutionDetails;
|
||||||
|
}
|
||||||
|
|
||||||
|
private AirPollutionDetails mapToAirPollution(JsonNode rootNode) {
|
||||||
|
final AirPollutionDetails airPollutionDetails = new AirPollutionDetails();
|
||||||
|
airPollutionDetails.setCoordinate(parseCoordinate(rootNode.get("coord")));
|
||||||
|
|
||||||
|
final List<AirPollutionRecord> sampleList = new ArrayList<>();
|
||||||
|
final JsonNode sampleListNode = rootNode.get("list");
|
||||||
|
sampleListNode.forEach(sampleNode -> {
|
||||||
|
sampleList.add(parseAirPollutionSample(sampleNode));
|
||||||
|
});
|
||||||
|
airPollutionDetails.setAirPollutionRecords(sampleList);
|
||||||
|
|
||||||
|
return airPollutionDetails;
|
||||||
|
}
|
||||||
|
|
||||||
|
private AirPollutionRecord parseAirPollutionSample(JsonNode sampleNode) {
|
||||||
|
AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
airPollutionRecord.setForecastTime(LocalDateTime.ofInstant(Instant.ofEpochSecond(sampleNode.get("dt").asInt()), TimeZone.getDefault().toZoneId()));
|
||||||
|
airPollutionRecord.setAirQualityIndex(AirQualityIndex.getByIndex(sampleNode.get("main").get("aqi").asInt()));
|
||||||
|
|
||||||
|
final JsonNode componentsNode = sampleNode.get("components");
|
||||||
|
airPollutionRecord.setCO(componentsNode.get("co").asDouble());
|
||||||
|
airPollutionRecord.setNO(componentsNode.get("no").asDouble());
|
||||||
|
airPollutionRecord.setNO2(componentsNode.get("no2").asDouble());
|
||||||
|
airPollutionRecord.setO3(componentsNode.get("o3").asDouble());
|
||||||
|
airPollutionRecord.setSO2(componentsNode.get("so2").asDouble());
|
||||||
|
airPollutionRecord.setPM2_5(componentsNode.get("pm2_5").asDouble());
|
||||||
|
airPollutionRecord.setPM10(componentsNode.get("pm10").asDouble());
|
||||||
|
airPollutionRecord.setNH3(componentsNode.get("nh3").asDouble());
|
||||||
|
|
||||||
|
return airPollutionRecord;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Coordinate parseCoordinate(JsonNode rootNode) {
|
||||||
|
final JsonNode latitudeNode = rootNode.get("lat");
|
||||||
|
final JsonNode longitudeNode = rootNode.get("lon");
|
||||||
|
if (latitudeNode != null && longitudeNode != null) {
|
||||||
|
return Coordinate.of(latitudeNode.asDouble(), longitudeNode.asDouble());
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2021 Alexey Zinchenko
|
* Copyright (c) 2022 Alexey Zinchenko
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
* SOFTWARE.
|
* SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather;
|
package com.github.prominence.openweathermap.api.mapper;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2021 Alexey Zinchenko
|
* Copyright (c) 2022 Alexey Zinchenko
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
* SOFTWARE.
|
* SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.forecast.free;
|
package com.github.prominence.openweathermap.api.mapper;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
+4
-4
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2021 Alexey Zinchenko
|
* Copyright (c) 2022 Alexey Zinchenko
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
* SOFTWARE.
|
* SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.onecall;
|
package com.github.prominence.openweathermap.api.mapper;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
@@ -72,7 +72,7 @@ public class OneCallWeatherResponseMapper {
|
|||||||
final JsonNode root = objectMapper.readTree(json);
|
final JsonNode root = objectMapper.readTree(json);
|
||||||
currentData = mapToCurrent(root);
|
currentData = mapToCurrent(root);
|
||||||
} catch (JsonProcessingException e) {
|
} catch (JsonProcessingException e) {
|
||||||
throw new RuntimeException("Cannot parse Forecast response");
|
throw new RuntimeException("Cannot parse OneCall response");
|
||||||
}
|
}
|
||||||
|
|
||||||
return currentData;
|
return currentData;
|
||||||
@@ -91,7 +91,7 @@ public class OneCallWeatherResponseMapper {
|
|||||||
final JsonNode root = objectMapper.readTree(json);
|
final JsonNode root = objectMapper.readTree(json);
|
||||||
historicalData = mapToHistorical(root);
|
historicalData = mapToHistorical(root);
|
||||||
} catch (JsonProcessingException e) {
|
} catch (JsonProcessingException e) {
|
||||||
throw new RuntimeException("Cannot parse Forecast response");
|
throw new RuntimeException("Cannot parse OneCall response");
|
||||||
}
|
}
|
||||||
|
|
||||||
return historicalData;
|
return historicalData;
|
||||||
+87
@@ -0,0 +1,87 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Air pollution.
|
||||||
|
*/
|
||||||
|
public class AirPollutionDetails {
|
||||||
|
private Coordinate coordinate;
|
||||||
|
private List<AirPollutionRecord> airPollutionRecords;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 air pollution details.
|
||||||
|
*
|
||||||
|
* @return the air pollution details
|
||||||
|
*/
|
||||||
|
public List<AirPollutionRecord> getAirPollutionRecords() {
|
||||||
|
return airPollutionRecords;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets air pollution details.
|
||||||
|
*
|
||||||
|
* @param airPollutionRecords the air pollution details
|
||||||
|
*/
|
||||||
|
public void setAirPollutionRecords(List<AirPollutionRecord> airPollutionRecords) {
|
||||||
|
this.airPollutionRecords = airPollutionRecords;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
AirPollutionDetails that = (AirPollutionDetails) o;
|
||||||
|
return Objects.equals(coordinate, that.coordinate) && Objects.equals(airPollutionRecords, that.airPollutionRecords);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(coordinate, airPollutionRecords);
|
||||||
|
}
|
||||||
|
}
|
||||||
+376
@@ -0,0 +1,376 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.enums.AirQualityIndex;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Air pollution record.
|
||||||
|
*/
|
||||||
|
public class AirPollutionRecord {
|
||||||
|
private LocalDateTime forecastTime;
|
||||||
|
private AirQualityIndex airQualityIndex;
|
||||||
|
|
||||||
|
private Double CO;
|
||||||
|
private Double NO;
|
||||||
|
private Double NO2;
|
||||||
|
private Double O3;
|
||||||
|
private Double SO2;
|
||||||
|
private Double PM2_5;
|
||||||
|
private Double PM10;
|
||||||
|
private Double NH3;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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 air quality index.
|
||||||
|
*
|
||||||
|
* @return the air quality index
|
||||||
|
*/
|
||||||
|
public AirQualityIndex getAirQualityIndex() {
|
||||||
|
return airQualityIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets air quality index.
|
||||||
|
*
|
||||||
|
* @param airQualityIndex the air quality index
|
||||||
|
*/
|
||||||
|
public void setAirQualityIndex(AirQualityIndex airQualityIndex) {
|
||||||
|
this.airQualityIndex = airQualityIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets carbon monoxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the carbon monoxide value
|
||||||
|
*/
|
||||||
|
public Double getCO() {
|
||||||
|
return CO;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets carbon monoxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the carbon monoxide value
|
||||||
|
*/
|
||||||
|
public Double getCarbonMonoxide() {
|
||||||
|
return getCO();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets carbon monoxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param CO the carbon monoxide value
|
||||||
|
*/
|
||||||
|
public void setCO(Double CO) {
|
||||||
|
this.CO = CO;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets nitrogen monoxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the nitrogen monoxide value
|
||||||
|
*/
|
||||||
|
public Double getNO() {
|
||||||
|
return NO;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets nitrogen monoxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the nitrogen monoxide value
|
||||||
|
*/
|
||||||
|
public Double getNitrogenMonoxide() {
|
||||||
|
return getNO();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets nitrogen monoxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param NO the nitrogen monoxide value
|
||||||
|
*/
|
||||||
|
public void setNO(Double NO) {
|
||||||
|
this.NO = NO;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets nitrogen dioxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the nitrogen dioxide value
|
||||||
|
*/
|
||||||
|
public Double getNO2() {
|
||||||
|
return NO2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets nitrogen dioxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the nitrogen dioxide value
|
||||||
|
*/
|
||||||
|
public Double getNitrogenDioxide() {
|
||||||
|
return getNO2();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets nitrogen dioxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param NO2 the nitrogen dioxide value
|
||||||
|
*/
|
||||||
|
public void setNO2(Double NO2) {
|
||||||
|
this.NO2 = NO2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets ozone concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the ozone value
|
||||||
|
*/
|
||||||
|
public Double getO3() {
|
||||||
|
return O3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets ozone concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the ozone value
|
||||||
|
*/
|
||||||
|
public Double getOzone() {
|
||||||
|
return getO3();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets ozone concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param o3 the ozone value
|
||||||
|
*/
|
||||||
|
public void setO3(Double o3) {
|
||||||
|
O3 = o3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets sulphur dioxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the sulphur dioxide value
|
||||||
|
*/
|
||||||
|
public Double getSO2() {
|
||||||
|
return SO2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets sulphur dioxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the sulphur dioxide value
|
||||||
|
*/
|
||||||
|
public Double getSulphurDioxide() {
|
||||||
|
return getSO2();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets sulphur dioxide concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param SO2 the sulphur dioxide value
|
||||||
|
*/
|
||||||
|
public void setSO2(Double SO2) {
|
||||||
|
this.SO2 = SO2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets fine particles matter concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the fine particles matter value
|
||||||
|
*/
|
||||||
|
public Double getPM2_5() {
|
||||||
|
return PM2_5;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets fine particles matter concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the fine particles matter value
|
||||||
|
*/
|
||||||
|
public Double getFineParticlesMatter() {
|
||||||
|
return getPM2_5();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets fine particles matter concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param PM2_5 the fine particles matter value
|
||||||
|
*/
|
||||||
|
public void setPM2_5(Double PM2_5) {
|
||||||
|
this.PM2_5 = PM2_5;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets coarse particulate matter concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the coarse particulate matter value
|
||||||
|
*/
|
||||||
|
public Double getPM10() {
|
||||||
|
return PM10;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets coarse particulate matter concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the coarse particulate matter value
|
||||||
|
*/
|
||||||
|
public Double getCoarseParticulateMatter() {
|
||||||
|
return getPM10();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets coarse particulate matter concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param PM10 the coarse particulate matter value
|
||||||
|
*/
|
||||||
|
public void setPM10(Double PM10) {
|
||||||
|
this.PM10 = PM10;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets ammonia concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the ammonia value
|
||||||
|
*/
|
||||||
|
public Double getNH3() {
|
||||||
|
return NH3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets ammonia concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @return the ammonia value
|
||||||
|
*/
|
||||||
|
public Double getAmmonia() {
|
||||||
|
return getNH3();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets ammonia concentration value in μg/m^3.
|
||||||
|
*
|
||||||
|
* @param NH3 the ammonia value
|
||||||
|
*/
|
||||||
|
public void setNH3(Double NH3) {
|
||||||
|
this.NH3 = NH3;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
AirPollutionRecord that = (AirPollutionRecord) o;
|
||||||
|
return Objects.equals(forecastTime, that.forecastTime) && airQualityIndex == that.airQualityIndex && Objects.equals(CO, that.CO) && Objects.equals(NO, that.NO) && Objects.equals(NO2, that.NO2) && Objects.equals(O3, that.O3) && Objects.equals(SO2, that.SO2) && Objects.equals(PM2_5, that.PM2_5) && Objects.equals(PM10, that.PM10) && Objects.equals(NH3, that.NH3);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(forecastTime, airQualityIndex, CO, NO, NO2, O3, SO2, PM2_5, PM10, NH3);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
final StringBuilder stringBuilder = new StringBuilder()
|
||||||
|
.append("Air Pollution Record for ")
|
||||||
|
.append(forecastTime)
|
||||||
|
.append(", AQI=")
|
||||||
|
.append(airQualityIndex.name())
|
||||||
|
.append(".");
|
||||||
|
final boolean anyConcentrationAvailable = Stream.of(CO, NO, NO2, O3, SO2, PM2_5, PM10, NH3).anyMatch(Objects::nonNull);
|
||||||
|
if (anyConcentrationAvailable) {
|
||||||
|
stringBuilder.append(" Concentrations:");
|
||||||
|
if (CO != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" CO(Carbon monoxide) = ")
|
||||||
|
.append(CO)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
if (NO != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" NO(Nitrogen monoxide) = ")
|
||||||
|
.append(NO)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
if (NO2 != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" NO2(Nitrogen dioxide) = ")
|
||||||
|
.append(NO2)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
if (O3 != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" O3(Ozone) = ")
|
||||||
|
.append(O3)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
if (SO2 != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" SO2(Sulphur dioxide) = ")
|
||||||
|
.append(SO2)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
if (PM2_5 != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" PM2.5(Fine particles matter) = ")
|
||||||
|
.append(PM2_5)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
if (PM10 != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" PM10(Coarse particulate matter) = ")
|
||||||
|
.append(PM10)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
if (NH3 != null) {
|
||||||
|
stringBuilder
|
||||||
|
.append(" NH3(Ammonia) = ")
|
||||||
|
.append(NH3)
|
||||||
|
.append(" μg/m^3;");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return stringBuilder.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
+13
@@ -254,6 +254,19 @@ public class Daily {
|
|||||||
this.probabilityOfPrecipitation = probabilityOfPrecipitation;
|
this.probabilityOfPrecipitation = probabilityOfPrecipitation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets probability of precipitation percentage.
|
||||||
|
*
|
||||||
|
* @return the probability of precipitation percentage
|
||||||
|
*/
|
||||||
|
public Byte getProbabilityOfPrecipitationPercentage() {
|
||||||
|
if (probabilityOfPrecipitation != null) {
|
||||||
|
return (byte)(probabilityOfPrecipitation * 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets rain.
|
* Gets rain.
|
||||||
*
|
*
|
||||||
|
|||||||
+16
@@ -225,9 +225,25 @@ public class Hourly {
|
|||||||
* @param probabilityOfPrecipitation the probability of precipitation
|
* @param probabilityOfPrecipitation the probability of precipitation
|
||||||
*/
|
*/
|
||||||
public void setProbabilityOfPrecipitation(Double probabilityOfPrecipitation) {
|
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;
|
this.probabilityOfPrecipitation = probabilityOfPrecipitation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets probability of precipitation percentage.
|
||||||
|
*
|
||||||
|
* @return the probability of precipitation percentage
|
||||||
|
*/
|
||||||
|
public Byte getProbabilityOfPrecipitationPercentage() {
|
||||||
|
if (probabilityOfPrecipitation != null) {
|
||||||
|
return (byte)(probabilityOfPrecipitation * 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets rain.
|
* Gets rain.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022 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;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.conf.TimeoutSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.enums.Language;
|
||||||
|
import com.github.prominence.openweathermap.api.enums.ResponseType;
|
||||||
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class RequestSettings {
|
||||||
|
|
||||||
|
private static final String LANG_PARAM = "lang";
|
||||||
|
private static final String UNITS_PARAM = "units";
|
||||||
|
private static final String MODE_PARAM = "mode";
|
||||||
|
private static final String API_KEY_PARAM_NAME = "appid";
|
||||||
|
|
||||||
|
private final TimeoutSettings timeoutSettings;
|
||||||
|
|
||||||
|
private final Map<String, String> requestParameters = new HashMap<>(8);
|
||||||
|
|
||||||
|
private final StringBuilder urlAppenderBuilder = new StringBuilder("");
|
||||||
|
|
||||||
|
private Language language = Language.ENGLISH;
|
||||||
|
private UnitSystem unitSystem = UnitSystem.STANDARD;
|
||||||
|
|
||||||
|
public RequestSettings(String apiKey, TimeoutSettings timeoutSettings) {
|
||||||
|
this.putRequestParameter(API_KEY_PARAM_NAME, apiKey);
|
||||||
|
// make a copy
|
||||||
|
this.timeoutSettings = new TimeoutSettings(timeoutSettings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TimeoutSettings getTimeoutSettings() {
|
||||||
|
return timeoutSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UnitSystem getUnitSystem() {
|
||||||
|
return unitSystem;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUnitSystem(UnitSystem unitSystem) {
|
||||||
|
this.putRequestParameter(UNITS_PARAM, unitSystem.getValue());
|
||||||
|
this.unitSystem = unitSystem;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Language getLanguage() {
|
||||||
|
return language;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLanguage(Language language) {
|
||||||
|
this.putRequestParameter(LANG_PARAM, language.getValue());
|
||||||
|
this.language = language;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setResponseType(ResponseType responseType) {
|
||||||
|
this.putRequestParameter(MODE_PARAM, responseType.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void putRequestParameter(String key, String value) {
|
||||||
|
this.requestParameters.put(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, String> getRequestParameters() {
|
||||||
|
return requestParameters;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void appendToURL(String appendix) {
|
||||||
|
urlAppenderBuilder.append(appendix);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringBuilder getUrlAppender() {
|
||||||
|
return urlAppenderBuilder;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,6 +32,7 @@ import java.util.stream.Collectors;
|
|||||||
/**
|
/**
|
||||||
* The type Request url builder.
|
* The type Request url builder.
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public class RequestUrlBuilder {
|
public class RequestUrlBuilder {
|
||||||
|
|
||||||
private static final String API_KEY_PARAM_NAME = "appid";
|
private static final String API_KEY_PARAM_NAME = "appid";
|
||||||
|
|||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails;
|
||||||
|
import com.github.prominence.openweathermap.api.request.AsyncRequestTerminator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface Current air pollution async request terminator.
|
||||||
|
*/
|
||||||
|
public interface AirPollutionAsyncRequestTerminator extends AsyncRequestTerminator<AirPollutionDetails, String> {
|
||||||
|
}
|
||||||
+62
@@ -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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.AirPollutionResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Air pollution async request terminator.
|
||||||
|
*/
|
||||||
|
public class AirPollutionAsyncRequestTerminatorImpl implements AirPollutionAsyncRequestTerminator {
|
||||||
|
private final RequestUrlBuilder urlBuilder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Air pollution async request terminator.
|
||||||
|
*
|
||||||
|
* @param urlBuilder the url builder
|
||||||
|
*/
|
||||||
|
public AirPollutionAsyncRequestTerminatorImpl(RequestUrlBuilder urlBuilder) {
|
||||||
|
this.urlBuilder = urlBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<AirPollutionDetails> asJava() {
|
||||||
|
return CompletableFuture.supplyAsync(() -> new AirPollutionResponseMapper().mapToAirPollution(getRawResponse()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<String> asJSON() {
|
||||||
|
return CompletableFuture.supplyAsync(this::getRawResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
||||||
|
}
|
||||||
|
}
|
||||||
+44
@@ -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.air.pollution;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface Current air pollution request customizer.
|
||||||
|
*/
|
||||||
|
public interface AirPollutionRequestCustomizer {
|
||||||
|
/**
|
||||||
|
* Retrieve current air pollution request terminator.
|
||||||
|
*
|
||||||
|
* @return the current air pollution request terminator
|
||||||
|
*/
|
||||||
|
AirPollutionRequestTerminator retrieve();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve async current air pollution async request terminator.
|
||||||
|
*
|
||||||
|
* @return the current air pollution async request terminator
|
||||||
|
*/
|
||||||
|
AirPollutionAsyncRequestTerminator retrieveAsync();
|
||||||
|
}
|
||||||
+45
@@ -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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
|
||||||
|
public class AirPollutionRequestCustomizerImpl implements AirPollutionRequestCustomizer {
|
||||||
|
private final RequestUrlBuilder urlBuilder;
|
||||||
|
|
||||||
|
public AirPollutionRequestCustomizerImpl(RequestUrlBuilder urlBuilder) {
|
||||||
|
this.urlBuilder = urlBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AirPollutionRequestTerminator retrieve() {
|
||||||
|
return new AirPollutionRequestTerminatorImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AirPollutionAsyncRequestTerminator retrieveAsync() {
|
||||||
|
return new AirPollutionAsyncRequestTerminatorImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
}
|
||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestTerminator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface Current air pollution request terminator.
|
||||||
|
*/
|
||||||
|
public interface AirPollutionRequestTerminator extends RequestTerminator<AirPollutionDetails, String> {
|
||||||
|
}
|
||||||
+60
@@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.AirPollutionResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Air pollution request terminator.
|
||||||
|
*/
|
||||||
|
public class AirPollutionRequestTerminatorImpl implements AirPollutionRequestTerminator {
|
||||||
|
private final RequestUrlBuilder urlBuilder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Air pollution request terminator.
|
||||||
|
*
|
||||||
|
* @param urlBuilder the url builder
|
||||||
|
*/
|
||||||
|
public AirPollutionRequestTerminatorImpl(RequestUrlBuilder urlBuilder) {
|
||||||
|
this.urlBuilder = urlBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AirPollutionDetails asJava() {
|
||||||
|
return new AirPollutionResponseMapper().mapToAirPollution(getRawResponse());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String asJSON() {
|
||||||
|
return getRawResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
||||||
|
}
|
||||||
|
}
|
||||||
+53
@@ -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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.current.CurrentAirPollutionRequester;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.forecast.ForecastAirPollutionRequester;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.historical.HistoricalAirPollutionRequester;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface Air pollution requester.
|
||||||
|
*/
|
||||||
|
public interface AirPollutionRequester {
|
||||||
|
/**
|
||||||
|
* Current current air pollution requester.
|
||||||
|
*
|
||||||
|
* @return the current air pollution requester
|
||||||
|
*/
|
||||||
|
CurrentAirPollutionRequester current();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Forecast forecast air pollution requester.
|
||||||
|
*
|
||||||
|
* @return the forecast air pollution requester
|
||||||
|
*/
|
||||||
|
ForecastAirPollutionRequester forecast();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Historical historical air pollution requester.
|
||||||
|
*
|
||||||
|
* @return the historical air pollution requester
|
||||||
|
*/
|
||||||
|
HistoricalAirPollutionRequester historical();
|
||||||
|
}
|
||||||
+68
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.conf.TimeoutSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.current.CurrentAirPollutionRequester;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.current.CurrentAirPollutionRequesterImpl;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.forecast.ForecastAirPollutionRequester;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.forecast.ForecastAirPollutionRequesterImpl;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.historical.HistoricalAirPollutionRequester;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.historical.HistoricalAirPollutionRequesterImpl;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Air pollution requester.
|
||||||
|
*/
|
||||||
|
public class AirPollutionRequesterImpl implements AirPollutionRequester {
|
||||||
|
private final RequestUrlBuilder urlBuilder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Air pollution requester.
|
||||||
|
*
|
||||||
|
* @param apiKey the api key
|
||||||
|
*/
|
||||||
|
public AirPollutionRequesterImpl(String apiKey) {
|
||||||
|
urlBuilder = new RequestUrlBuilder(apiKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CurrentAirPollutionRequester current() {
|
||||||
|
urlBuilder.append("air_pollution");
|
||||||
|
return new CurrentAirPollutionRequesterImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ForecastAirPollutionRequester forecast() {
|
||||||
|
urlBuilder.append("air_pollution/forecast");
|
||||||
|
return new ForecastAirPollutionRequesterImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HistoricalAirPollutionRequester historical() {
|
||||||
|
urlBuilder.append("air_pollution/history");
|
||||||
|
return new HistoricalAirPollutionRequesterImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
}
|
||||||
+39
@@ -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.air.pollution.current;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface Current air pollution requester.
|
||||||
|
*/
|
||||||
|
public interface CurrentAirPollutionRequester {
|
||||||
|
/**
|
||||||
|
* By coordinate current air pollution request customizer.
|
||||||
|
*
|
||||||
|
* @param coordinate the coordinate
|
||||||
|
* @return the current air pollution request customizer
|
||||||
|
*/
|
||||||
|
AirPollutionRequestCustomizer byCoordinate(Coordinate coordinate);
|
||||||
|
}
|
||||||
+53
@@ -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.air.pollution.current;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizer;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizerImpl;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Current air pollution requester.
|
||||||
|
*/
|
||||||
|
public class CurrentAirPollutionRequesterImpl implements CurrentAirPollutionRequester {
|
||||||
|
private final RequestUrlBuilder urlBuilder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Current air pollution requester.
|
||||||
|
*
|
||||||
|
* @param urlBuilder the url builder
|
||||||
|
*/
|
||||||
|
public CurrentAirPollutionRequesterImpl(RequestUrlBuilder urlBuilder) {
|
||||||
|
this.urlBuilder = urlBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AirPollutionRequestCustomizer byCoordinate(Coordinate coordinate) {
|
||||||
|
urlBuilder.addRequestParameter("lat", String.valueOf(coordinate.getLatitude()));
|
||||||
|
urlBuilder.addRequestParameter("lon", String.valueOf(coordinate.getLongitude()));
|
||||||
|
return new AirPollutionRequestCustomizerImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
}
|
||||||
+41
@@ -0,0 +1,41 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution.forecast;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface Forecast air pollution requester.
|
||||||
|
*/
|
||||||
|
public interface ForecastAirPollutionRequester {
|
||||||
|
/**
|
||||||
|
* By coordinate forecast air pollution request customizer.
|
||||||
|
*
|
||||||
|
* @param coordinate the coordinate
|
||||||
|
* @return the forecast air pollution request customizer
|
||||||
|
*/
|
||||||
|
AirPollutionRequestCustomizer byCoordinate(Coordinate coordinate);
|
||||||
|
}
|
||||||
+53
@@ -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.air.pollution.forecast;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizer;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizerImpl;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Forecast air pollution requester.
|
||||||
|
*/
|
||||||
|
public class ForecastAirPollutionRequesterImpl implements ForecastAirPollutionRequester {
|
||||||
|
private final RequestUrlBuilder urlBuilder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Forecast air pollution requester.
|
||||||
|
*
|
||||||
|
* @param urlBuilder the url builder
|
||||||
|
*/
|
||||||
|
public ForecastAirPollutionRequesterImpl(RequestUrlBuilder urlBuilder) {
|
||||||
|
this.urlBuilder = urlBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AirPollutionRequestCustomizer byCoordinate(Coordinate coordinate) {
|
||||||
|
urlBuilder.addRequestParameter("lat", String.valueOf(coordinate.getLatitude()));
|
||||||
|
urlBuilder.addRequestParameter("lon", String.valueOf(coordinate.getLongitude()));
|
||||||
|
return new AirPollutionRequestCustomizerImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
}
|
||||||
+43
@@ -0,0 +1,43 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution.historical;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The interface Historical air pollution requester.
|
||||||
|
*/
|
||||||
|
public interface HistoricalAirPollutionRequester {
|
||||||
|
/**
|
||||||
|
* By coordinate historical air pollution request customizer.
|
||||||
|
*
|
||||||
|
* @param coordinate the coordinate
|
||||||
|
* @param startUnixTime the start unix time
|
||||||
|
* @param endUnixTime the end unix time
|
||||||
|
* @return the historical air pollution request customizer
|
||||||
|
*/
|
||||||
|
AirPollutionRequestCustomizer byCoordinateAndPeriod(Coordinate coordinate, long startUnixTime, long endUnixTime);
|
||||||
|
}
|
||||||
+55
@@ -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.air.pollution.historical;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizer;
|
||||||
|
import com.github.prominence.openweathermap.api.request.air.pollution.AirPollutionRequestCustomizerImpl;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The type Historical air pollution requester.
|
||||||
|
*/
|
||||||
|
public class HistoricalAirPollutionRequesterImpl implements HistoricalAirPollutionRequester {
|
||||||
|
private final RequestUrlBuilder urlBuilder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Historical air pollution requester.
|
||||||
|
*
|
||||||
|
* @param urlBuilder the url builder
|
||||||
|
*/
|
||||||
|
public HistoricalAirPollutionRequesterImpl(RequestUrlBuilder urlBuilder) {
|
||||||
|
this.urlBuilder = urlBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AirPollutionRequestCustomizer byCoordinateAndPeriod(Coordinate coordinate, long startUnixTime, long endUnixTime) {
|
||||||
|
urlBuilder.addRequestParameter("lat", String.valueOf(coordinate.getLatitude()));
|
||||||
|
urlBuilder.addRequestParameter("lon", String.valueOf(coordinate.getLongitude()));
|
||||||
|
urlBuilder.addRequestParameter("start", String.valueOf(startUnixTime));
|
||||||
|
urlBuilder.addRequestParameter("end", String.valueOf(endUnixTime));
|
||||||
|
return new AirPollutionRequestCustomizerImpl(urlBuilder);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -23,6 +23,7 @@
|
|||||||
package com.github.prominence.openweathermap.api.request.forecast.free;
|
package com.github.prominence.openweathermap.api.request.forecast.free;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.FiveDayThreeHourStepForecastResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.model.forecast.Forecast;
|
import com.github.prominence.openweathermap.api.model.forecast.Forecast;
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|||||||
+1
@@ -23,6 +23,7 @@
|
|||||||
package com.github.prominence.openweathermap.api.request.forecast.free;
|
package com.github.prominence.openweathermap.api.request.forecast.free;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.FiveDayThreeHourStepForecastResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.model.forecast.Forecast;
|
import com.github.prominence.openweathermap.api.model.forecast.Forecast;
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|||||||
+1
@@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.forecast.free;
|
package com.github.prominence.openweathermap.api.request.forecast.free;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.conf.TimeoutSettings;
|
||||||
import com.github.prominence.openweathermap.api.model.Coordinate;
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
|
||||||
|
|||||||
+1
@@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.onecall;
|
package com.github.prominence.openweathermap.api.request.onecall;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.conf.TimeoutSettings;
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
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.OneCallCurrentWeatherRequester;
|
||||||
import com.github.prominence.openweathermap.api.request.onecall.current.OneCallCurrentWeatherRequesterImpl;
|
import com.github.prominence.openweathermap.api.request.onecall.current.OneCallCurrentWeatherRequesterImpl;
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ package com.github.prominence.openweathermap.api.request.onecall.current;
|
|||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
import com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData;
|
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.RequestUrlBuilder;
|
||||||
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
|
import com.github.prominence.openweathermap.api.mapper.OneCallWeatherResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ package com.github.prominence.openweathermap.api.request.onecall.current;
|
|||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
import com.github.prominence.openweathermap.api.model.onecall.current.CurrentWeatherData;
|
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.RequestUrlBuilder;
|
||||||
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
|
import com.github.prominence.openweathermap.api.mapper.OneCallWeatherResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ package com.github.prominence.openweathermap.api.request.onecall.historical;
|
|||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData;
|
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.RequestUrlBuilder;
|
||||||
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
|
import com.github.prominence.openweathermap.api.mapper.OneCallWeatherResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ package com.github.prominence.openweathermap.api.request.onecall.historical;
|
|||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
import com.github.prominence.openweathermap.api.model.onecall.historical.HistoricalWeatherData;
|
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.RequestUrlBuilder;
|
||||||
import com.github.prominence.openweathermap.api.request.onecall.OneCallWeatherResponseMapper;
|
import com.github.prominence.openweathermap.api.mapper.OneCallWeatherResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+16
-11
@@ -22,25 +22,30 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather;
|
package com.github.prominence.openweathermap.api.request.weather;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
import com.github.prominence.openweathermap.api.request.weather.multiple.MultipleLocationsCurrentWeatherRequester;
|
import com.github.prominence.openweathermap.api.request.weather.multiple.MultipleLocationsCurrentWeatherRequester;
|
||||||
import com.github.prominence.openweathermap.api.request.weather.single.SingleLocationCurrentWeatherRequester;
|
import com.github.prominence.openweathermap.api.request.weather.single.SingleLocationCurrentWeatherRequester;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An interface for <a href="https://openweathermap.org/current">API</a> methods.
|
* The type Current weather requester.
|
||||||
*/
|
*/
|
||||||
public interface CurrentWeatherRequester {
|
public class CurrentWeatherRequester {
|
||||||
|
private final RequestSettings requestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Single location current weather requester.
|
* Instantiates a new Current weather requester.
|
||||||
*
|
*
|
||||||
* @return the single location current weather requester
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
SingleLocationCurrentWeatherRequester single();
|
public CurrentWeatherRequester(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
public SingleLocationCurrentWeatherRequester single() {
|
||||||
* Multiple locations current weather requester.
|
return new SingleLocationCurrentWeatherRequester(requestSettings);
|
||||||
*
|
}
|
||||||
* @return the multiple locations current weather requester
|
|
||||||
*/
|
public MultipleLocationsCurrentWeatherRequester multiple() {
|
||||||
MultipleLocationsCurrentWeatherRequester multiple();
|
return new MultipleLocationsCurrentWeatherRequester(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-53
@@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.multiple.MultipleLocationsCurrentWeatherRequesterImpl;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.multiple.MultipleLocationsCurrentWeatherRequester;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.single.SingleLocationCurrentWeatherRequesterImpl;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.single.SingleLocationCurrentWeatherRequester;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Current weather requester.
|
|
||||||
*/
|
|
||||||
public class CurrentWeatherRequesterImpl implements CurrentWeatherRequester {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Current weather requester.
|
|
||||||
*
|
|
||||||
* @param apiKey the api key
|
|
||||||
*/
|
|
||||||
public CurrentWeatherRequesterImpl(String apiKey) {
|
|
||||||
urlBuilder = new RequestUrlBuilder(apiKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SingleLocationCurrentWeatherRequester single() {
|
|
||||||
return new SingleLocationCurrentWeatherRequesterImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
public MultipleLocationsCurrentWeatherRequester multiple() {
|
|
||||||
return new MultipleLocationsCurrentWeatherRequesterImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+31
-22
@@ -24,36 +24,45 @@ package com.github.prominence.openweathermap.api.request.weather.multiple;
|
|||||||
|
|
||||||
import com.github.prominence.openweathermap.api.model.Coordinate;
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
import com.github.prominence.openweathermap.api.model.CoordinateRectangle;
|
import com.github.prominence.openweathermap.api.model.CoordinateRectangle;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Multiple locations current weather requester.
|
* The type Multiple locations current weather requester.
|
||||||
*/
|
*/
|
||||||
public interface MultipleLocationsCurrentWeatherRequester {
|
public class MultipleLocationsCurrentWeatherRequester {
|
||||||
|
private final RequestSettings requestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* By rectangle multiple result current weather request customizer.
|
* Instantiates a new Multiple locations current weather requester.
|
||||||
*
|
*
|
||||||
* @param rectangle the rectangle
|
* @param requestSettings request settings object.
|
||||||
* @param zoom the zoom
|
|
||||||
* @return the multiple result current weather request customizer
|
|
||||||
*/
|
*/
|
||||||
MultipleResultCurrentWeatherRequestCustomizer byRectangle(CoordinateRectangle rectangle, int zoom);
|
public MultipleLocationsCurrentWeatherRequester(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
public MultipleResultCurrentWeatherRequestCustomizer byRectangle(CoordinateRectangle rectangle, int zoom) {
|
||||||
* By cities in cycle multiple result current weather request customizer.
|
String coordinates = rectangle.getFormattedRequestString() + "," + zoom;
|
||||||
*
|
requestSettings.appendToURL("box/city");
|
||||||
* @param point the point
|
requestSettings.putRequestParameter("bbox", coordinates);
|
||||||
* @return the multiple result cities in circle current weather request customizer
|
|
||||||
*/
|
|
||||||
MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer byCitiesInCycle(Coordinate point);
|
|
||||||
|
|
||||||
/**
|
return new MultipleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
* By cities in cycle multiple result current weather request customizer.
|
}
|
||||||
*
|
|
||||||
* @param point the point
|
|
||||||
* @param citiesCount the cities count
|
|
||||||
* @return the multiple result cities in circle current weather request customizer
|
|
||||||
*/
|
|
||||||
MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer byCitiesInCycle(Coordinate point, int citiesCount);
|
|
||||||
|
|
||||||
|
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer byCitiesInCycle(Coordinate point, int citiesCount) {
|
||||||
|
requestSettings.appendToURL("find");
|
||||||
|
requestSettings.putRequestParameter("lat", Double.toString(point.getLatitude()));
|
||||||
|
requestSettings.putRequestParameter("lon", Double.toString(point.getLongitude()));
|
||||||
|
requestSettings.putRequestParameter("cnt", Integer.toString(citiesCount));
|
||||||
|
|
||||||
|
return new MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer byCitiesInCycle(Coordinate point) {
|
||||||
|
requestSettings.appendToURL("find");
|
||||||
|
requestSettings.putRequestParameter("lat", Double.toString(point.getLatitude()));
|
||||||
|
requestSettings.putRequestParameter("lon", Double.toString(point.getLongitude()));
|
||||||
|
|
||||||
|
return new MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-71
@@ -1,71 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.multiple;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.model.Coordinate;
|
|
||||||
import com.github.prominence.openweathermap.api.model.CoordinateRectangle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Multiple locations current weather requester.
|
|
||||||
*/
|
|
||||||
public class MultipleLocationsCurrentWeatherRequesterImpl implements MultipleLocationsCurrentWeatherRequester {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Multiple locations current weather requester.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
*/
|
|
||||||
public MultipleLocationsCurrentWeatherRequesterImpl(RequestUrlBuilder urlBuilder) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MultipleResultCurrentWeatherRequestCustomizer byRectangle(CoordinateRectangle rectangle, int zoom) {
|
|
||||||
String coordinates = rectangle.getFormattedRequestString() + "," + zoom;
|
|
||||||
urlBuilder.append("box/city");
|
|
||||||
urlBuilder.addRequestParameter("bbox", coordinates);
|
|
||||||
|
|
||||||
return new MultipleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer byCitiesInCycle(Coordinate point, int citiesCount) {
|
|
||||||
urlBuilder.append("find");
|
|
||||||
urlBuilder.addRequestParameter("lat", Double.toString(point.getLatitude()));
|
|
||||||
urlBuilder.addRequestParameter("lon", Double.toString(point.getLongitude()));
|
|
||||||
urlBuilder.addRequestParameter("cnt", Integer.toString(citiesCount));
|
|
||||||
|
|
||||||
return new MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer byCitiesInCycle(Coordinate point) {
|
|
||||||
urlBuilder.append("find");
|
|
||||||
urlBuilder.addRequestParameter("lat", Double.toString(point.getLatitude()));
|
|
||||||
urlBuilder.addRequestParameter("lon", Double.toString(point.getLongitude()));
|
|
||||||
|
|
||||||
return new MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+30
-6
@@ -22,20 +22,44 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.enums.ResponseType;
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
||||||
import com.github.prominence.openweathermap.api.request.AsyncRequestTerminator;
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.CurrentWeatherResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Multiple result current weather async request terminator.
|
* The type Multiple result current weather async request terminator.
|
||||||
*/
|
*/
|
||||||
public interface MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator extends AsyncRequestTerminator<List<Weather>, String> {
|
public class MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator {
|
||||||
|
private final RequestSettings requestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* XML response format.
|
* Instantiates a new Multiple result current weather async request terminator.
|
||||||
*
|
*
|
||||||
* @return the completable future
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
CompletableFuture<String> asXML();
|
MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<List<Weather>> asJava() {
|
||||||
|
return CompletableFuture.supplyAsync(() -> new CurrentWeatherResponseMapper(requestSettings.getUnitSystem()).getList(getRawResponse()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<String> asJSON() {
|
||||||
|
return CompletableFuture.supplyAsync(this::getRawResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<String> asXML() {
|
||||||
|
requestSettings.setResponseType(ResponseType.XML);
|
||||||
|
return CompletableFuture.supplyAsync(this::getRawResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-71
@@ -1,71 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.multiple;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherResponseMapper;
|
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Multiple result current weather async request terminator.
|
|
||||||
*/
|
|
||||||
public class MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminatorImpl implements MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
private final UnitSystem unitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Multiple result current weather async request terminator.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
* @param unitSystem the unit system
|
|
||||||
*/
|
|
||||||
MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<List<Weather>> asJava() {
|
|
||||||
return CompletableFuture.supplyAsync(() -> new CurrentWeatherResponseMapper(unitSystem).getList(getRawResponse()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<String> asJSON() {
|
|
||||||
return CompletableFuture.supplyAsync(this::getRawResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<String> asXML() {
|
|
||||||
urlBuilder.addRequestParameter("mode", "xml");
|
|
||||||
return CompletableFuture.supplyAsync(this::getRawResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getRawResponse() {
|
|
||||||
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+30
-13
@@ -22,23 +22,40 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestCustomizer;
|
import com.github.prominence.openweathermap.api.enums.Language;
|
||||||
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Multiple result current weather request customizer.
|
* The type Multiple result current weather request customizer.
|
||||||
*/
|
*/
|
||||||
public interface MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer extends RequestCustomizer<MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer> {
|
public class MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer {
|
||||||
/**
|
private final RequestSettings requestSettings;
|
||||||
* Retrieve multiple result current weather request terminator.
|
|
||||||
*
|
|
||||||
* @return the multiple result current weather request terminator
|
|
||||||
*/
|
|
||||||
MultipleResultCitiesInCircleCurrentWeatherRequestTerminator retrieve();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve async multiple result current weather async request terminator.
|
* Instantiates a new Multiple result current weather request customizer.
|
||||||
*
|
*
|
||||||
* @return the multiple result current weather async request terminator
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator retrieveAsync();
|
MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer(RequestSettings requestSettings) {
|
||||||
}
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer language(Language language) {
|
||||||
|
requestSettings.setLanguage(language);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
|
||||||
|
requestSettings.setUnitSystem(unitSystem);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCitiesInCircleCurrentWeatherRequestTerminator retrieve() {
|
||||||
|
return new MultipleResultCitiesInCircleCurrentWeatherRequestTerminator(requestSettings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator retrieveAsync() {
|
||||||
|
return new MultipleResultCitiesInCircleCurrentWeatherAsyncRequestTerminator(requestSettings);
|
||||||
|
}
|
||||||
|
}
|
||||||
-70
@@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.multiple;
|
|
||||||
|
|
||||||
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 Multiple result current weather request customizer.
|
|
||||||
*/
|
|
||||||
public class MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl implements MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
|
|
||||||
private Language language;
|
|
||||||
private UnitSystem unitSystem = UnitSystem.STANDARD;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Multiple result current weather request customizer.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
*/
|
|
||||||
MultipleResultCitiesInCircleCurrentWeatherRequestCustomizerImpl(RequestUrlBuilder urlBuilder) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer language(Language language) {
|
|
||||||
this.language = language;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MultipleResultCitiesInCircleCurrentWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+30
-6
@@ -22,19 +22,43 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.enums.ResponseType;
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
||||||
import com.github.prominence.openweathermap.api.request.RequestTerminator;
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.CurrentWeatherResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Multiple result current weather request terminator.
|
* The type Multiple result current weather request terminator.
|
||||||
*/
|
*/
|
||||||
public interface MultipleResultCitiesInCircleCurrentWeatherRequestTerminator extends RequestTerminator<List<Weather>, String> {
|
public class MultipleResultCitiesInCircleCurrentWeatherRequestTerminator {
|
||||||
|
private final RequestSettings requestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* XML response format.
|
* Instantiates a new Multiple result current weather request terminator.
|
||||||
*
|
*
|
||||||
* @return the XML string
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
String asXML();
|
MultipleResultCitiesInCircleCurrentWeatherRequestTerminator(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Weather> asJava() {
|
||||||
|
return new CurrentWeatherResponseMapper(requestSettings.getUnitSystem()).getList(getRawResponse());
|
||||||
|
}
|
||||||
|
|
||||||
|
public String asJSON() {
|
||||||
|
return getRawResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String asXML() {
|
||||||
|
requestSettings.setResponseType(ResponseType.XML);
|
||||||
|
return getRawResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-70
@@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.multiple;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherResponseMapper;
|
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Multiple result current weather request terminator.
|
|
||||||
*/
|
|
||||||
public class MultipleResultCitiesInCircleCurrentWeatherRequestTerminatorImpl implements MultipleResultCitiesInCircleCurrentWeatherRequestTerminator {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
private final UnitSystem unitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Multiple result current weather request terminator.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
* @param unitSystem the unit system
|
|
||||||
*/
|
|
||||||
MultipleResultCitiesInCircleCurrentWeatherRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<Weather> asJava() {
|
|
||||||
return new CurrentWeatherResponseMapper(unitSystem).getList(getRawResponse());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String asJSON() {
|
|
||||||
return getRawResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String asXML() {
|
|
||||||
urlBuilder.addRequestParameter("mode", "xml");
|
|
||||||
return getRawResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getRawResponse() {
|
|
||||||
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+28
-3
@@ -23,12 +23,37 @@
|
|||||||
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
||||||
import com.github.prominence.openweathermap.api.request.AsyncRequestTerminator;
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.CurrentWeatherResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Multiple result current weather async request terminator.
|
* The type Multiple result current weather async request terminator.
|
||||||
*/
|
*/
|
||||||
public interface MultipleResultCurrentWeatherAsyncRequestTerminator extends AsyncRequestTerminator<List<Weather>, String> {
|
public class MultipleResultCurrentWeatherAsyncRequestTerminator {
|
||||||
|
private final RequestSettings requestSettings;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Multiple result current weather async request terminator.
|
||||||
|
*
|
||||||
|
* @param requestSettings request settings object.
|
||||||
|
*/
|
||||||
|
MultipleResultCurrentWeatherAsyncRequestTerminator(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<List<Weather>> asJava() {
|
||||||
|
return CompletableFuture.supplyAsync(() -> new CurrentWeatherResponseMapper(requestSettings.getUnitSystem()).getList(getRawResponse()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<String> asJSON() {
|
||||||
|
return CompletableFuture.supplyAsync(this::getRawResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-65
@@ -1,65 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.multiple;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherResponseMapper;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Multiple result current weather async request terminator.
|
|
||||||
*/
|
|
||||||
public class MultipleResultCurrentWeatherAsyncRequestTerminatorImpl implements MultipleResultCurrentWeatherAsyncRequestTerminator {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
private final UnitSystem unitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Multiple result current weather async request terminator.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
* @param unitSystem the unit system
|
|
||||||
*/
|
|
||||||
MultipleResultCurrentWeatherAsyncRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<List<Weather>> asJava() {
|
|
||||||
return CompletableFuture.supplyAsync(() -> new CurrentWeatherResponseMapper(unitSystem).getList(getRawResponse()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<String> asJSON() {
|
|
||||||
return CompletableFuture.supplyAsync(this::getRawResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getRawResponse() {
|
|
||||||
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+32
-13
@@ -22,23 +22,42 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestCustomizer;
|
import com.github.prominence.openweathermap.api.conf.TimeoutSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
||||||
|
import com.github.prominence.openweathermap.api.enums.Language;
|
||||||
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Multiple result current weather request customizer.
|
* The type Multiple result current weather request customizer.
|
||||||
*/
|
*/
|
||||||
public interface MultipleResultCurrentWeatherRequestCustomizer extends RequestCustomizer<MultipleResultCurrentWeatherRequestCustomizer> {
|
public class MultipleResultCurrentWeatherRequestCustomizer {
|
||||||
/**
|
private final RequestSettings requestSettings;
|
||||||
* Retrieve multiple result current weather request terminator.
|
|
||||||
*
|
|
||||||
* @return the multiple result current weather request terminator
|
|
||||||
*/
|
|
||||||
MultipleResultCurrentWeatherRequestTerminator retrieve();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve async multiple result current weather async request terminator.
|
* Instantiates a new Multiple result current weather request customizer.
|
||||||
*
|
*
|
||||||
* @return the multiple result current weather async request terminator
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
MultipleResultCurrentWeatherAsyncRequestTerminator retrieveAsync();
|
MultipleResultCurrentWeatherRequestCustomizer(RequestSettings requestSettings) {
|
||||||
}
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCurrentWeatherRequestCustomizer language(Language language) {
|
||||||
|
requestSettings.setLanguage(language);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCurrentWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
|
||||||
|
requestSettings.setUnitSystem(unitSystem);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCurrentWeatherRequestTerminator retrieve() {
|
||||||
|
return new MultipleResultCurrentWeatherRequestTerminator(requestSettings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MultipleResultCurrentWeatherAsyncRequestTerminator retrieveAsync() {
|
||||||
|
return new MultipleResultCurrentWeatherAsyncRequestTerminator(requestSettings);
|
||||||
|
}
|
||||||
|
}
|
||||||
-70
@@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.multiple;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.Language;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Multiple result current weather request customizer.
|
|
||||||
*/
|
|
||||||
public class MultipleResultCurrentWeatherRequestCustomizerImpl implements MultipleResultCurrentWeatherRequestCustomizer {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
|
|
||||||
private Language language;
|
|
||||||
private UnitSystem unitSystem = UnitSystem.STANDARD;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Multiple result current weather request customizer.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
*/
|
|
||||||
MultipleResultCurrentWeatherRequestCustomizerImpl(RequestUrlBuilder urlBuilder) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MultipleResultCurrentWeatherRequestCustomizer language(Language language) {
|
|
||||||
this.language = language;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MultipleResultCurrentWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+27
-3
@@ -23,12 +23,36 @@
|
|||||||
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
package com.github.prominence.openweathermap.api.request.weather.multiple;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
||||||
import com.github.prominence.openweathermap.api.request.RequestTerminator;
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.CurrentWeatherResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Multiple result current weather request terminator.
|
* The type Multiple result current weather request terminator.
|
||||||
*/
|
*/
|
||||||
public interface MultipleResultCurrentWeatherRequestTerminator extends RequestTerminator<List<Weather>, String> {
|
public class MultipleResultCurrentWeatherRequestTerminator {
|
||||||
|
private final RequestSettings requestSettings;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Multiple result current weather request terminator.
|
||||||
|
*
|
||||||
|
* @param requestSettings request settings object.
|
||||||
|
*/
|
||||||
|
MultipleResultCurrentWeatherRequestTerminator(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Weather> asJava() {
|
||||||
|
return new CurrentWeatherResponseMapper(requestSettings.getUnitSystem()).getList(getRawResponse());
|
||||||
|
}
|
||||||
|
|
||||||
|
public String asJSON() {
|
||||||
|
return getRawResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-64
@@ -1,64 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.multiple;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherResponseMapper;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Multiple result current weather request terminator.
|
|
||||||
*/
|
|
||||||
public class MultipleResultCurrentWeatherRequestTerminatorImpl implements MultipleResultCurrentWeatherRequestTerminator {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
private final UnitSystem unitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Multiple result current weather request terminator.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
* @param unitSystem the unit system
|
|
||||||
*/
|
|
||||||
MultipleResultCurrentWeatherRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<Weather> asJava() {
|
|
||||||
return new CurrentWeatherResponseMapper(unitSystem).getList(getRawResponse());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String asJSON() {
|
|
||||||
return getRawResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getRawResponse() {
|
|
||||||
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+40
-52
@@ -23,69 +23,57 @@
|
|||||||
package com.github.prominence.openweathermap.api.request.weather.single;
|
package com.github.prominence.openweathermap.api.request.weather.single;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.model.Coordinate;
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface Single location current weather requester.
|
* The type Single location current weather requester.
|
||||||
*/
|
*/
|
||||||
public interface SingleLocationCurrentWeatherRequester {
|
public class SingleLocationCurrentWeatherRequester {
|
||||||
|
private final RequestSettings requestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* By city name current weather request customizer.
|
* Instantiates a new Single location current weather requester.
|
||||||
*
|
*
|
||||||
* @param cityName the city name
|
* @param requestSettings request settings object.
|
||||||
* @return the single result current weather request customizer
|
|
||||||
*/
|
*/
|
||||||
SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName);
|
public SingleLocationCurrentWeatherRequester(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
this.requestSettings.appendToURL("weather");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
public SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName) {
|
||||||
* By city name current weather request customizer.
|
requestSettings.putRequestParameter("q", cityName);
|
||||||
*
|
return new SingleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
* @param cityName the city name
|
}
|
||||||
* @param countryCode the country code
|
|
||||||
* @return the single result current weather request customizer
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName, String countryCode);
|
|
||||||
|
|
||||||
/**
|
public SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName, String countryCode) {
|
||||||
* By city name current weather request customizer.
|
requestSettings.putRequestParameter("q", cityName + "," + countryCode);
|
||||||
*
|
return new SingleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
* @param cityName the city name
|
}
|
||||||
* @param stateCode the state code
|
|
||||||
* @param countryCode the country code
|
|
||||||
* @return the single result current weather request customizer
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName, String stateCode, String countryCode);
|
|
||||||
|
|
||||||
/**
|
public SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName, String stateCode, String countryCode) {
|
||||||
* By city id current weather request customizer.
|
requestSettings.putRequestParameter("q", cityName + "," + stateCode + "," + countryCode);
|
||||||
*
|
return new SingleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
* @param cityId the city id
|
}
|
||||||
* @return the single result current weather request customizer
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestCustomizer byCityId(long cityId);
|
|
||||||
|
|
||||||
/**
|
public SingleResultCurrentWeatherRequestCustomizer byCityId(long cityId) {
|
||||||
* By coordinate current weather request customizer.
|
requestSettings.putRequestParameter("id", String.valueOf(cityId));
|
||||||
*
|
return new SingleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
* @param coordinate the coordinate
|
}
|
||||||
* @return the single result current weather request customizer
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestCustomizer byCoordinate(Coordinate coordinate);
|
|
||||||
|
|
||||||
/**
|
public SingleResultCurrentWeatherRequestCustomizer byCoordinate(Coordinate coordinate) {
|
||||||
* By zip code and country current weather request customizer.
|
requestSettings.putRequestParameter("lat", String.valueOf(coordinate.getLatitude()));
|
||||||
*
|
requestSettings.putRequestParameter("lon", String.valueOf(coordinate.getLongitude()));
|
||||||
* @param zipCode the zip code
|
return new SingleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
* @param countryCode the country code
|
}
|
||||||
* @return the single result current weather request customizer
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestCustomizer byZipCodeAndCountry(String zipCode, String countryCode);
|
|
||||||
|
|
||||||
/**
|
public SingleResultCurrentWeatherRequestCustomizer byZipCodeAndCountry(String zipCode, String countryCode) {
|
||||||
* By zip code in usa current weather request customizer.
|
requestSettings.putRequestParameter("zip", zipCode + "," + countryCode);
|
||||||
*
|
return new SingleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
* @param zipCode the zip code
|
}
|
||||||
* @return the single result current weather request customizer
|
|
||||||
*/
|
public SingleResultCurrentWeatherRequestCustomizer byZipCodeInUSA(String zipCode) {
|
||||||
SingleResultCurrentWeatherRequestCustomizer byZipCodeInUSA(String zipCode);
|
requestSettings.putRequestParameter("zip", zipCode);
|
||||||
|
return new SingleResultCurrentWeatherRequestCustomizer(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-81
@@ -1,81 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.single;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.model.Coordinate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Single location current weather requester.
|
|
||||||
*/
|
|
||||||
public class SingleLocationCurrentWeatherRequesterImpl implements SingleLocationCurrentWeatherRequester {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Single location current weather requester.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
*/
|
|
||||||
public SingleLocationCurrentWeatherRequesterImpl(RequestUrlBuilder urlBuilder) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
urlBuilder.append("weather");
|
|
||||||
}
|
|
||||||
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName) {
|
|
||||||
urlBuilder.addRequestParameter("q", cityName);
|
|
||||||
return new SingleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName, String countryCode) {
|
|
||||||
urlBuilder.addRequestParameter("q", cityName + "," + countryCode);
|
|
||||||
return new SingleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer byCityName(String cityName, String stateCode, String countryCode) {
|
|
||||||
urlBuilder.addRequestParameter("q", cityName + "," + stateCode + "," + countryCode);
|
|
||||||
return new SingleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer byCityId(long cityId) {
|
|
||||||
urlBuilder.addRequestParameter("id", cityId);
|
|
||||||
return new SingleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer byCoordinate(Coordinate coordinate) {
|
|
||||||
urlBuilder.addRequestParameter("lat", String.valueOf(coordinate.getLatitude()));
|
|
||||||
urlBuilder.addRequestParameter("lon", String.valueOf(coordinate.getLongitude()));
|
|
||||||
return new SingleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer byZipCodeAndCountry(String zipCode, String countryCode) {
|
|
||||||
urlBuilder.addRequestParameter("zip", zipCode + "," + countryCode);
|
|
||||||
return new SingleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer byZipCodeInUSA(String zipCode) {
|
|
||||||
urlBuilder.addRequestParameter("zip", zipCode);
|
|
||||||
return new SingleResultCurrentWeatherRequestCustomizerImpl(urlBuilder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+34
-12
@@ -22,26 +22,48 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather.single;
|
package com.github.prominence.openweathermap.api.request.weather.single;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.enums.ResponseType;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.CurrentWeatherResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
||||||
import com.github.prominence.openweathermap.api.request.AsyncRequestTerminator;
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The current weather async request terminator interface.
|
* The type Single result current weather async request terminator.
|
||||||
*/
|
*/
|
||||||
public interface SingleResultCurrentWeatherAsyncRequestTerminator extends AsyncRequestTerminator<Weather, String> {
|
public class SingleResultCurrentWeatherAsyncRequestTerminator {
|
||||||
/**
|
private final RequestSettings requestSettings;
|
||||||
* XML response format.
|
|
||||||
*
|
|
||||||
* @return the completable future
|
|
||||||
*/
|
|
||||||
CompletableFuture<String> asXML();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HTML response format.
|
* Instantiates a new Single result current weather async request terminator.
|
||||||
*
|
*
|
||||||
* @return the completable future
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
CompletableFuture<String> asHTML();
|
SingleResultCurrentWeatherAsyncRequestTerminator(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<Weather> asJava() {
|
||||||
|
return CompletableFuture.supplyAsync(() -> new CurrentWeatherResponseMapper(requestSettings.getUnitSystem()).getSingle(getRawResponse()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<String> asJSON() {
|
||||||
|
return CompletableFuture.supplyAsync(this::getRawResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<String> asXML() {
|
||||||
|
requestSettings.setResponseType(ResponseType.XML);
|
||||||
|
return CompletableFuture.supplyAsync(this::getRawResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<String> asHTML() {
|
||||||
|
requestSettings.setResponseType(ResponseType.HTML);
|
||||||
|
return CompletableFuture.supplyAsync(this::getRawResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-76
@@ -1,76 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.single;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherResponseMapper;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Single result current weather async request terminator.
|
|
||||||
*/
|
|
||||||
public class SingleResultCurrentWeatherAsyncRequestTerminatorImpl implements SingleResultCurrentWeatherAsyncRequestTerminator {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
private final UnitSystem unitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Single result current weather async request terminator.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
* @param unitSystem the unit system
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherAsyncRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<Weather> asJava() {
|
|
||||||
return CompletableFuture.supplyAsync(() -> new CurrentWeatherResponseMapper(unitSystem).getSingle(getRawResponse()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<String> asJSON() {
|
|
||||||
return CompletableFuture.supplyAsync(this::getRawResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<String> asXML() {
|
|
||||||
urlBuilder.addRequestParameter("mode", "xml");
|
|
||||||
return CompletableFuture.supplyAsync(this::getRawResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CompletableFuture<String> asHTML() {
|
|
||||||
urlBuilder.addRequestParameter("mode", "html");
|
|
||||||
return CompletableFuture.supplyAsync(this::getRawResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getRawResponse() {
|
|
||||||
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+29
-13
@@ -22,24 +22,40 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather.single;
|
package com.github.prominence.openweathermap.api.request.weather.single;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestCustomizer;
|
import com.github.prominence.openweathermap.api.enums.Language;
|
||||||
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The current weather request customizer interface.
|
* The type Single result current weather request customizer.
|
||||||
*/
|
*/
|
||||||
public interface SingleResultCurrentWeatherRequestCustomizer extends RequestCustomizer<SingleResultCurrentWeatherRequestCustomizer> {
|
public class SingleResultCurrentWeatherRequestCustomizer {
|
||||||
/**
|
private final RequestSettings requestSettings;
|
||||||
* Retrieve current weather request terminator.
|
|
||||||
*
|
|
||||||
* @return the single result current weather request terminator
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestTerminator retrieve();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve current weather async request terminator.
|
* Instantiates a new Single result current weather request customizer.
|
||||||
*
|
*
|
||||||
* @return the single result current weather async request terminator
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
SingleResultCurrentWeatherAsyncRequestTerminator retrieveAsync();
|
SingleResultCurrentWeatherRequestCustomizer(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
public SingleResultCurrentWeatherRequestCustomizer language(Language language) {
|
||||||
|
requestSettings.setLanguage(language);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SingleResultCurrentWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
|
||||||
|
requestSettings.setUnitSystem(unitSystem);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SingleResultCurrentWeatherRequestTerminator retrieve() {
|
||||||
|
return new SingleResultCurrentWeatherRequestTerminator(requestSettings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SingleResultCurrentWeatherAsyncRequestTerminator retrieveAsync() {
|
||||||
|
return new SingleResultCurrentWeatherAsyncRequestTerminator(requestSettings);
|
||||||
|
}
|
||||||
|
}
|
||||||
-70
@@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.single;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.Language;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Single result current weather request customizer.
|
|
||||||
*/
|
|
||||||
public class SingleResultCurrentWeatherRequestCustomizerImpl implements SingleResultCurrentWeatherRequestCustomizer {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
|
|
||||||
private Language language;
|
|
||||||
private UnitSystem unitSystem = UnitSystem.STANDARD;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Single result current weather request customizer.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestCustomizerImpl(RequestUrlBuilder urlBuilder) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer language(Language language) {
|
|
||||||
this.language = language;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public SingleResultCurrentWeatherRequestCustomizer unitSystem(UnitSystem unitSystem) {
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+34
-12
@@ -22,24 +22,46 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.request.weather.single;
|
package com.github.prominence.openweathermap.api.request.weather.single;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.enums.ResponseType;
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
||||||
import com.github.prominence.openweathermap.api.request.RequestTerminator;
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.CurrentWeatherResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The current weather request terminator interface.
|
* The type Single result current weather request terminator.
|
||||||
*/
|
*/
|
||||||
public interface SingleResultCurrentWeatherRequestTerminator extends RequestTerminator<Weather, String> {
|
public class SingleResultCurrentWeatherRequestTerminator {
|
||||||
/**
|
private final RequestSettings requestSettings;
|
||||||
* XML response format.
|
|
||||||
*
|
|
||||||
* @return the XML string
|
|
||||||
*/
|
|
||||||
String asXML();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HTML response format.
|
* Instantiates a new Single result current weather request terminator.
|
||||||
*
|
*
|
||||||
* @return the HTML string
|
* @param requestSettings request settings object.
|
||||||
*/
|
*/
|
||||||
String asHTML();
|
SingleResultCurrentWeatherRequestTerminator(RequestSettings requestSettings) {
|
||||||
|
this.requestSettings = requestSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Weather asJava() {
|
||||||
|
return new CurrentWeatherResponseMapper(requestSettings.getUnitSystem()).getSingle(asJSON());
|
||||||
|
}
|
||||||
|
|
||||||
|
public String asJSON() {
|
||||||
|
return getRawResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String asXML() {
|
||||||
|
requestSettings.setResponseType(ResponseType.XML);
|
||||||
|
return getRawResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String asHTML() {
|
||||||
|
requestSettings.setResponseType(ResponseType.HTML);
|
||||||
|
return getRawResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getRawResponse() {
|
||||||
|
return RequestUtils.getResponse(requestSettings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-74
@@ -1,74 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.weather.single;
|
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.request.RequestUrlBuilder;
|
|
||||||
import com.github.prominence.openweathermap.api.request.weather.CurrentWeatherResponseMapper;
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
|
||||||
import com.github.prominence.openweathermap.api.utils.RequestUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The type Single result current weather request terminator.
|
|
||||||
*/
|
|
||||||
public class SingleResultCurrentWeatherRequestTerminatorImpl implements SingleResultCurrentWeatherRequestTerminator {
|
|
||||||
private final RequestUrlBuilder urlBuilder;
|
|
||||||
private final UnitSystem unitSystem;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instantiates a new Single result current weather request terminator.
|
|
||||||
*
|
|
||||||
* @param urlBuilder the url builder
|
|
||||||
* @param unitSystem the unit system
|
|
||||||
*/
|
|
||||||
SingleResultCurrentWeatherRequestTerminatorImpl(RequestUrlBuilder urlBuilder, UnitSystem unitSystem) {
|
|
||||||
this.urlBuilder = urlBuilder;
|
|
||||||
this.unitSystem = unitSystem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Weather asJava() {
|
|
||||||
return new CurrentWeatherResponseMapper(unitSystem).getSingle(asJSON());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String asJSON() {
|
|
||||||
return getRawResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String asXML() {
|
|
||||||
urlBuilder.addRequestParameter("mode", "xml");
|
|
||||||
return getRawResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String asHTML() {
|
|
||||||
urlBuilder.addRequestParameter("mode", "html");
|
|
||||||
return getRawResponse();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getRawResponse() {
|
|
||||||
return RequestUtils.getResponse(urlBuilder.buildUrl());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -22,8 +22,10 @@
|
|||||||
|
|
||||||
package com.github.prominence.openweathermap.api.utils;
|
package com.github.prominence.openweathermap.api.utils;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.conf.TimeoutSettings;
|
||||||
import com.github.prominence.openweathermap.api.exception.NoDataFoundException;
|
import com.github.prominence.openweathermap.api.exception.NoDataFoundException;
|
||||||
import com.github.prominence.openweathermap.api.exception.InvalidAuthTokenException;
|
import com.github.prominence.openweathermap.api.exception.InvalidAuthTokenException;
|
||||||
|
import com.github.prominence.openweathermap.api.request.RequestSettings;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
@@ -35,17 +37,32 @@ import java.net.HttpURLConnection;
|
|||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility class for API calls execution.
|
* Utility class for API calls execution.
|
||||||
*/
|
*/
|
||||||
public final class RequestUtils {
|
public final class RequestUtils {
|
||||||
|
|
||||||
|
private static final String OWM_URL_BASE = "http://api.openweathermap.org/data/2.5/";
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(RequestUtils.class);
|
private static final Logger logger = LoggerFactory.getLogger(RequestUtils.class);
|
||||||
|
|
||||||
private RequestUtils() {
|
private RequestUtils() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getResponse(RequestSettings requestSettings) {
|
||||||
|
StringBuilder requestUrlBuilder = new StringBuilder(OWM_URL_BASE);
|
||||||
|
requestUrlBuilder.append(requestSettings.getUrlAppender());
|
||||||
|
requestUrlBuilder.append('?');
|
||||||
|
String parameters = requestSettings.getRequestParameters().entrySet().stream()
|
||||||
|
.map(entry -> entry.getKey() + "=" + entry.getValue())
|
||||||
|
.collect(Collectors.joining("&"));
|
||||||
|
requestUrlBuilder.append(parameters);
|
||||||
|
|
||||||
|
return getResponse(requestUrlBuilder.toString(), requestSettings.getTimeoutSettings());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes call to provided API url and retrieves response in <code>String</code> representation.
|
* Executes call to provided API url and retrieves response in <code>String</code> representation.
|
||||||
*
|
*
|
||||||
@@ -54,6 +71,18 @@ public final class RequestUtils {
|
|||||||
* @throws IllegalArgumentException in case if provided parameter isn't a valid url for {@link URL} instance.
|
* @throws IllegalArgumentException in case if provided parameter isn't a valid url for {@link URL} instance.
|
||||||
*/
|
*/
|
||||||
public static String getResponse(String url) {
|
public static String getResponse(String url) {
|
||||||
|
return getResponse(url, new TimeoutSettings());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Executes call to provided API url and retrieves response in <code>String</code> representation.
|
||||||
|
*
|
||||||
|
* @param url the url to make API request.
|
||||||
|
* @param timeoutSettings an object with timeout settings.
|
||||||
|
* @return response from the request in <code>String</code> representation.
|
||||||
|
* @throws IllegalArgumentException in case if provided parameter isn't a valid url for {@link URL} instance.
|
||||||
|
*/
|
||||||
|
public static String getResponse(String url, TimeoutSettings timeoutSettings) {
|
||||||
URL requestUrl;
|
URL requestUrl;
|
||||||
try {
|
try {
|
||||||
requestUrl = new URL(url);
|
requestUrl = new URL(url);
|
||||||
@@ -62,7 +91,7 @@ public final class RequestUtils {
|
|||||||
throw new IllegalArgumentException(ex);
|
throw new IllegalArgumentException(ex);
|
||||||
}
|
}
|
||||||
logger.debug("Executing OpenWeatherMap API request: " + url);
|
logger.debug("Executing OpenWeatherMap API request: " + url);
|
||||||
final InputStream requestInputStream = executeRequest(requestUrl);
|
final InputStream requestInputStream = executeRequest(requestUrl, timeoutSettings);
|
||||||
|
|
||||||
return convertInputStreamToString(requestInputStream);
|
return convertInputStreamToString(requestInputStream);
|
||||||
}
|
}
|
||||||
@@ -75,11 +104,20 @@ public final class RequestUtils {
|
|||||||
* @throws InvalidAuthTokenException in case if authentication token wasn't set or requested functionality is not permitted for its subscription plan.
|
* @throws InvalidAuthTokenException in case if authentication token wasn't set or requested functionality is not permitted for its subscription plan.
|
||||||
* @throws NoDataFoundException in case if there is no any data for requested location(s) or request is invalid.
|
* @throws NoDataFoundException in case if there is no any data for requested location(s) or request is invalid.
|
||||||
*/
|
*/
|
||||||
private static InputStream executeRequest(URL requestUrl) {
|
private static InputStream executeRequest(URL requestUrl, TimeoutSettings timeoutSettings) {
|
||||||
InputStream resultStream;
|
InputStream resultStream;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
HttpURLConnection connection = (HttpURLConnection) requestUrl.openConnection();
|
HttpURLConnection connection = (HttpURLConnection) requestUrl.openConnection();
|
||||||
|
|
||||||
|
if (timeoutSettings.getConnectionTimeout() != null) {
|
||||||
|
connection.setConnectTimeout(timeoutSettings.getConnectionTimeout());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (timeoutSettings.getReadTimeout() != null) {
|
||||||
|
connection.setReadTimeout(timeoutSettings.getReadTimeout());
|
||||||
|
}
|
||||||
|
|
||||||
connection.setRequestMethod("GET");
|
connection.setRequestMethod("GET");
|
||||||
|
|
||||||
switch (connection.getResponseCode()) {
|
switch (connection.getResponseCode()) {
|
||||||
|
|||||||
+97
@@ -0,0 +1,97 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
public class AirPollutionDetailsUnitTest {
|
||||||
|
@Test
|
||||||
|
public void getCoordinate() {
|
||||||
|
final AirPollutionDetails airPollutionDetails = new AirPollutionDetails();
|
||||||
|
final Coordinate coordinate = Coordinate.of(22.3, 44.2);
|
||||||
|
airPollutionDetails.setCoordinate(coordinate);
|
||||||
|
|
||||||
|
assertEquals(coordinate, airPollutionDetails.getCoordinate());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAirPollutionSamples() {
|
||||||
|
final AirPollutionDetails airPollutionDetails = new AirPollutionDetails();
|
||||||
|
final List<AirPollutionRecord> airPollutionRecords = new ArrayList<>();
|
||||||
|
airPollutionDetails.setAirPollutionRecords(airPollutionRecords);
|
||||||
|
|
||||||
|
assertEquals(airPollutionRecords, airPollutionDetails.getAirPollutionRecords());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEquals() {
|
||||||
|
final AirPollutionDetails first = new AirPollutionDetails();
|
||||||
|
final AirPollutionDetails second = new AirPollutionDetails();
|
||||||
|
final Coordinate coordinate = Coordinate.of(22.3, 44.2);
|
||||||
|
final List<AirPollutionRecord> airPollutionRecords = new ArrayList<>();
|
||||||
|
|
||||||
|
assertEquals(first, first);
|
||||||
|
assertNotEquals(first, null);
|
||||||
|
assertEquals(first, second);
|
||||||
|
assertNotEquals(first, new Object());
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setCoordinate(coordinate);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setCoordinate(coordinate);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setAirPollutionRecords(airPollutionRecords);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setAirPollutionRecords(airPollutionRecords);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testHashCode() {
|
||||||
|
final AirPollutionDetails first = new AirPollutionDetails();
|
||||||
|
final AirPollutionDetails second = new AirPollutionDetails();
|
||||||
|
final Coordinate coordinate = Coordinate.of(22.3, 44.2);
|
||||||
|
|
||||||
|
assertEquals(first.hashCode(), second.hashCode());
|
||||||
|
|
||||||
|
first.setCoordinate(coordinate);
|
||||||
|
|
||||||
|
assertNotEquals(first.hashCode(), second.hashCode());
|
||||||
|
}
|
||||||
|
}
|
||||||
+280
@@ -0,0 +1,280 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.enums.AirQualityIndex;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
public class AirPollutionRecordUnitTest {
|
||||||
|
@Test
|
||||||
|
public void getForecastTime() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final LocalDateTime now = LocalDateTime.now();
|
||||||
|
airPollutionRecord.setForecastTime(now);
|
||||||
|
|
||||||
|
assertEquals(now, airPollutionRecord.getForecastTime());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAirQualityIndex() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
airPollutionRecord.setAirQualityIndex(AirQualityIndex.FAIR);
|
||||||
|
|
||||||
|
assertEquals(AirQualityIndex.FAIR, airPollutionRecord.getAirQualityIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getCarbonMonoxide() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setCO(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getCarbonMonoxide(), 0.00001);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getNitrogenMonoxide() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setNO(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getNitrogenMonoxide(), 0.00001);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getNitrogenDioxide() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setNO2(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getNitrogenDioxide(), 0.00001);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getOzone() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setO3(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getOzone(), 0.00001);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getSulphurDioxide() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setSO2(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getSulphurDioxide(), 0.00001);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getFineParticlesMatter() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setPM2_5(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getFineParticlesMatter(), 0.00001);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getCoarseParticulateMatter() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setPM10(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getCoarseParticulateMatter(), 0.00001);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAmmonia() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final double value = 0.55;
|
||||||
|
airPollutionRecord.setNH3(value);
|
||||||
|
|
||||||
|
assertEquals(value, airPollutionRecord.getAmmonia());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testEquals() {
|
||||||
|
final AirPollutionRecord first = new AirPollutionRecord();
|
||||||
|
final AirPollutionRecord second = new AirPollutionRecord();
|
||||||
|
final LocalDateTime now = LocalDateTime.now();
|
||||||
|
final AirQualityIndex aqi = AirQualityIndex.GOOD;
|
||||||
|
final double value = 0.55;
|
||||||
|
|
||||||
|
assertEquals(first, first);
|
||||||
|
assertNotEquals(first, null);
|
||||||
|
assertEquals(first, second);
|
||||||
|
assertNotEquals(first, new Object());
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setForecastTime(now);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setForecastTime(now);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setAirQualityIndex(aqi);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setAirQualityIndex(aqi);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setCO(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setCO(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setNO(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setNO(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setNO2(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setNO2(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setO3(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setO3(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setSO2(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setSO2(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setPM2_5(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setPM2_5(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setPM10(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setPM10(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
|
||||||
|
first.setNH3(value);
|
||||||
|
|
||||||
|
assertNotEquals(first, second);
|
||||||
|
|
||||||
|
second.setNH3(value);
|
||||||
|
|
||||||
|
assertEquals(first, second);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testHashCode() {
|
||||||
|
final AirPollutionRecord first = new AirPollutionRecord();
|
||||||
|
final AirPollutionRecord second = new AirPollutionRecord();
|
||||||
|
|
||||||
|
assertEquals(first.hashCode(), second.hashCode());
|
||||||
|
|
||||||
|
first.setSO2(33.2);
|
||||||
|
|
||||||
|
assertNotEquals(first.hashCode(), second.hashCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testToString() {
|
||||||
|
final AirPollutionRecord airPollutionRecord = new AirPollutionRecord();
|
||||||
|
final LocalDateTime now = LocalDateTime.now();
|
||||||
|
final AirQualityIndex aqi = AirQualityIndex.GOOD;
|
||||||
|
final double value = 0.55;
|
||||||
|
|
||||||
|
airPollutionRecord.setForecastTime(now);
|
||||||
|
airPollutionRecord.setAirQualityIndex(aqi);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setCO(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setNO(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setNO2(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setO3(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setSO2(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setPM2_5(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setPM10(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setNH3(value);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
|
||||||
|
airPollutionRecord.setCO(null);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionRecord.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-1
@@ -141,14 +141,16 @@ public class DailyUnitTest {
|
|||||||
@Test
|
@Test
|
||||||
public void getProbabilityOfPrecipitation() {
|
public void getProbabilityOfPrecipitation() {
|
||||||
final Daily daily = new Daily();
|
final Daily daily = new Daily();
|
||||||
final double pop = 70.5;
|
final double pop = 0.84;
|
||||||
daily.setProbabilityOfPrecipitation(pop);
|
daily.setProbabilityOfPrecipitation(pop);
|
||||||
|
|
||||||
assertEquals(pop, daily.getProbabilityOfPrecipitation(), 0.00001);
|
assertEquals(pop, daily.getProbabilityOfPrecipitation(), 0.00001);
|
||||||
|
assertEquals((byte) 84, daily.getProbabilityOfPrecipitationPercentage());
|
||||||
|
|
||||||
daily.setProbabilityOfPrecipitation(null);
|
daily.setProbabilityOfPrecipitation(null);
|
||||||
|
|
||||||
assertNull(daily.getProbabilityOfPrecipitation());
|
assertNull(daily.getProbabilityOfPrecipitation());
|
||||||
|
assertNull(daily.getProbabilityOfPrecipitationPercentage());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
+21
-1
@@ -117,10 +117,30 @@ public class HourlyUnitTest {
|
|||||||
@Test
|
@Test
|
||||||
public void getProbabilityOfPrecipitation() {
|
public void getProbabilityOfPrecipitation() {
|
||||||
final Hourly hourly = new Hourly();
|
final Hourly hourly = new Hourly();
|
||||||
final double pop = 42.0;
|
final double pop = 0.84;
|
||||||
hourly.setProbabilityOfPrecipitation(pop);
|
hourly.setProbabilityOfPrecipitation(pop);
|
||||||
|
|
||||||
assertEquals(pop, hourly.getProbabilityOfPrecipitation(), 0.00001);
|
assertEquals(pop, hourly.getProbabilityOfPrecipitation(), 0.00001);
|
||||||
|
assertEquals((byte) 84, hourly.getProbabilityOfPrecipitationPercentage());
|
||||||
|
|
||||||
|
hourly.setProbabilityOfPrecipitation(null);
|
||||||
|
|
||||||
|
assertNull(hourly.getProbabilityOfPrecipitation());
|
||||||
|
assertNull(hourly.getProbabilityOfPrecipitationPercentage());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getIllegalProbabilityOfPrecipitationValue_negative() {
|
||||||
|
final Hourly daily = new Hourly();
|
||||||
|
|
||||||
|
assertThrows(IllegalArgumentException.class, () -> daily.setProbabilityOfPrecipitation(-20.0));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getIllegalProbabilityOfPrecipitationValue_tooBig() {
|
||||||
|
final Hourly daily = new Hourly();
|
||||||
|
|
||||||
|
assertThrows(IllegalArgumentException.class, () -> daily.setProbabilityOfPrecipitation(120.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
+208
@@ -0,0 +1,208 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.ApiTest;
|
||||||
|
import com.github.prominence.openweathermap.api.model.Coordinate;
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
|
|
||||||
|
public class AirPollutionIntegrationTest extends ApiTest {
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveCurrentAirPollutionResponseAsJava_thenOk() {
|
||||||
|
final AirPollutionDetails airPollutionDetails = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.current()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieve()
|
||||||
|
.asJava();
|
||||||
|
|
||||||
|
assertNotNull(airPollutionDetails);
|
||||||
|
airPollutionDetails.getAirPollutionRecords().forEach(airPollutionRecord -> {
|
||||||
|
assertNotNull(airPollutionRecord);
|
||||||
|
System.out.println(airPollutionRecord);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveCurrentAirPollutionResponseAsJSON_thenOk() {
|
||||||
|
final String jsonString = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.current()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieve()
|
||||||
|
.asJSON();
|
||||||
|
|
||||||
|
assertNotNull(jsonString);
|
||||||
|
System.out.println(jsonString);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveCurrentAirPollutionAsyncResponseAsJava_thenOk() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<AirPollutionDetails> pollutionDetailsFuture = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.current()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJava();
|
||||||
|
|
||||||
|
assertNotNull(pollutionDetailsFuture);
|
||||||
|
assertNotNull(pollutionDetailsFuture.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveCurrentAirPollutionAsyncResponseAsJSON_thenOk() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<String> jsonStringFuture = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.current()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJSON();
|
||||||
|
|
||||||
|
assertNotNull(jsonStringFuture);
|
||||||
|
final String jsonString = jsonStringFuture.get();
|
||||||
|
assertNotNull(jsonString);
|
||||||
|
System.out.println(jsonString);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveForecastAirPollutionResponseAsJava_thenOk() {
|
||||||
|
final AirPollutionDetails airPollutionDetails = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.forecast()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieve()
|
||||||
|
.asJava();
|
||||||
|
|
||||||
|
assertNotNull(airPollutionDetails);
|
||||||
|
airPollutionDetails.getAirPollutionRecords().forEach(airPollutionRecord -> {
|
||||||
|
assertNotNull(airPollutionRecord);
|
||||||
|
System.out.println(airPollutionRecord);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveForecastAirPollutionResponseAsJSON_thenOk() {
|
||||||
|
final String jsonString = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.forecast()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieve()
|
||||||
|
.asJSON();
|
||||||
|
|
||||||
|
assertNotNull(jsonString);
|
||||||
|
System.out.println(jsonString);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveForecastAirPollutionAsyncResponseAsJava_thenOk() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<AirPollutionDetails> pollutionDetailsFuture = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.forecast()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJava();
|
||||||
|
|
||||||
|
assertNotNull(pollutionDetailsFuture);
|
||||||
|
assertNotNull(pollutionDetailsFuture.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveForecastAirPollutionAsyncResponseAsJSON_thenOk() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<String> jsonStringFuture = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.forecast()
|
||||||
|
.byCoordinate(Coordinate.of(53.54, 27.34))
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJSON();
|
||||||
|
|
||||||
|
assertNotNull(jsonStringFuture);
|
||||||
|
final String jsonString = jsonStringFuture.get();
|
||||||
|
assertNotNull(jsonString);
|
||||||
|
System.out.println(jsonString);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveHistoricalAirPollutionResponseAsJava_thenOk() {
|
||||||
|
final AirPollutionDetails airPollutionDetails = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.historical()
|
||||||
|
.byCoordinateAndPeriod(Coordinate.of(53.54, 27.34), 1606223802, 1606482999)
|
||||||
|
.retrieve()
|
||||||
|
.asJava();
|
||||||
|
|
||||||
|
assertNotNull(airPollutionDetails);
|
||||||
|
airPollutionDetails.getAirPollutionRecords().forEach(airPollutionRecord -> {
|
||||||
|
assertNotNull(airPollutionRecord);
|
||||||
|
System.out.println(airPollutionRecord);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveHistoricalAirPollutionResponseAsJSON_thenOk() {
|
||||||
|
final String jsonString = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.historical()
|
||||||
|
.byCoordinateAndPeriod(Coordinate.of(53.54, 27.34), 1606223802, 1606482999)
|
||||||
|
.retrieve()
|
||||||
|
.asJSON();
|
||||||
|
|
||||||
|
assertNotNull(jsonString);
|
||||||
|
System.out.println(jsonString);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveHistoricalAirPollutionAsyncResponseAsJava_thenOk() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<AirPollutionDetails> pollutionDetailsFuture = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.historical()
|
||||||
|
.byCoordinateAndPeriod(Coordinate.of(53.54, 27.34), 1606223802, 1606482999)
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJava();
|
||||||
|
|
||||||
|
assertNotNull(pollutionDetailsFuture);
|
||||||
|
assertNotNull(pollutionDetailsFuture.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenRetrieveHistoricalAirPollutionAsyncResponseAsJSON_thenOk() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<String> jsonStringFuture = getClient()
|
||||||
|
.airPollution()
|
||||||
|
.historical()
|
||||||
|
.byCoordinateAndPeriod(Coordinate.of(53.54, 27.34), 1606223802, 1606482999)
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJSON();
|
||||||
|
|
||||||
|
assertNotNull(jsonStringFuture);
|
||||||
|
final String jsonString = jsonStringFuture.get();
|
||||||
|
assertNotNull(jsonString);
|
||||||
|
System.out.println(jsonString);
|
||||||
|
}
|
||||||
|
}
|
||||||
+58
@@ -0,0 +1,58 @@
|
|||||||
|
/*
|
||||||
|
*
|
||||||
|
* * 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.air.pollution;
|
||||||
|
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.AirPollutionResponseMapper;
|
||||||
|
import com.github.prominence.openweathermap.api.model.air.pollution.AirPollutionDetails;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
|
||||||
|
public class AirPollutionResponseMapperUnitTest {
|
||||||
|
@Test
|
||||||
|
public void mapToAirPollution_withInvalidJSON() {
|
||||||
|
final String jsonString = "{\"coord\":{lon\":27.34,\"lat\":53.54},\"list\":[{\"main\":{\"aqi\":1},\"components\":{\"co\":243.66,\"no\":0,\"no2\":4.07,\"o3\":62.23,\"so2\":1.77,\"pm2_5\":3.87,\"pm10\":4.58,\"nh3\":2.41},\"dt\":1618610400}]}";
|
||||||
|
assertThrows(RuntimeException.class, () -> new AirPollutionResponseMapper().mapToAirPollution(jsonString));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void mapToAirPollution_withCoordinatesVariation() {
|
||||||
|
String jsonResponse = "{\"coord\":{},\"list\":[{\"main\":{\"aqi\":1},\"components\":{\"co\":243.66,\"no\":0,\"no2\":4.07,\"o3\":62.23,\"so2\":1.77,\"pm2_5\":3.87,\"pm10\":4.58,\"nh3\":2.41},\"dt\":1618610400}]}";
|
||||||
|
AirPollutionDetails airPollutionDetails = new AirPollutionResponseMapper().mapToAirPollution(jsonResponse);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionDetails);
|
||||||
|
|
||||||
|
jsonResponse = "{\"coord\":{\"lon\":27.34},\"list\":[{\"main\":{\"aqi\":1},\"components\":{\"co\":243.66,\"no\":0,\"no2\":4.07,\"o3\":62.23,\"so2\":1.77,\"pm2_5\":3.87,\"pm10\":4.58,\"nh3\":2.41},\"dt\":1618610400}]}";
|
||||||
|
airPollutionDetails = new AirPollutionResponseMapper().mapToAirPollution(jsonResponse);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionDetails);
|
||||||
|
|
||||||
|
jsonResponse = "{\"coord\":{\"lat\":53.54},\"list\":[{\"main\":{\"aqi\":1},\"components\":{\"co\":243.66,\"no\":0,\"no2\":4.07,\"o3\":62.23,\"so2\":1.77,\"pm2_5\":3.87,\"pm10\":4.58,\"nh3\":2.41},\"dt\":1618610400}]}";
|
||||||
|
airPollutionDetails = new AirPollutionResponseMapper().mapToAirPollution(jsonResponse);
|
||||||
|
|
||||||
|
assertNotNull(airPollutionDetails);
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
@@ -23,6 +23,7 @@
|
|||||||
package com.github.prominence.openweathermap.api.request.forecast.free;
|
package com.github.prominence.openweathermap.api.request.forecast.free;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.FiveDayThreeHourStepForecastResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.model.forecast.Forecast;
|
import com.github.prominence.openweathermap.api.model.forecast.Forecast;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
|||||||
+1
-11
File diff suppressed because one or more lines are too long
+1
@@ -23,6 +23,7 @@
|
|||||||
package com.github.prominence.openweathermap.api.request.weather;
|
package com.github.prominence.openweathermap.api.request.weather;
|
||||||
|
|
||||||
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
import com.github.prominence.openweathermap.api.enums.UnitSystem;
|
||||||
|
import com.github.prominence.openweathermap.api.mapper.CurrentWeatherResponseMapper;
|
||||||
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
import com.github.prominence.openweathermap.api.model.weather.Weather;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
|||||||
+43
@@ -86,6 +86,34 @@ public class MultipleResultCurrentWeatherIntegrationTest extends ApiTest {
|
|||||||
assertTrue(weatherJson.startsWith("{"));
|
assertTrue(weatherJson.startsWith("{"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenGetMultipleCurrentWeatherByCoordinateRectangleAsyncRequestAsJava_thenReturnNotNull() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<List<Weather>> weatherListFuture = getClient()
|
||||||
|
.currentWeather()
|
||||||
|
.multiple()
|
||||||
|
.byRectangle(CoordinateRectangle.withValues(12, 32, 15, 37), 10)
|
||||||
|
.language(Language.ROMANIAN)
|
||||||
|
.unitSystem(UnitSystem.METRIC)
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJava();
|
||||||
|
|
||||||
|
assertNotNull(weatherListFuture.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenGetMultipleCurrentWeatherByCoordinateRectangleAsyncRequestAsJSON_thenReturnNotNull() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<String> weatherJsonFuture = getClient()
|
||||||
|
.currentWeather()
|
||||||
|
.multiple()
|
||||||
|
.byRectangle(CoordinateRectangle.withValues(12, 32, 15, 37), 10)
|
||||||
|
.language(Language.ROMANIAN)
|
||||||
|
.unitSystem(UnitSystem.METRIC)
|
||||||
|
.retrieveAsync()
|
||||||
|
.asJSON();
|
||||||
|
|
||||||
|
assertTrue(weatherJsonFuture.get().startsWith("{"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenGetMultipleCurrentWeatherByCitiesInCycleRequestAsJava_thenReturnNotNull() {
|
public void whenGetMultipleCurrentWeatherByCitiesInCycleRequestAsJava_thenReturnNotNull() {
|
||||||
final List<Weather> weatherList = getClient()
|
final List<Weather> weatherList = getClient()
|
||||||
@@ -225,6 +253,21 @@ public class MultipleResultCurrentWeatherIntegrationTest extends ApiTest {
|
|||||||
System.out.println(weatherFuture.get());
|
System.out.println(weatherFuture.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void whenGetMultipleCurrentWeatherByCoordinateAsyncRequestAsXML_thenReturnNotNull() throws ExecutionException, InterruptedException {
|
||||||
|
final CompletableFuture<String> weatherXMLFuture = getClient()
|
||||||
|
.currentWeather()
|
||||||
|
.multiple()
|
||||||
|
.byCitiesInCycle(Coordinate.of(55.5, 37.5), 10)
|
||||||
|
.language(Language.GERMAN)
|
||||||
|
.unitSystem(UnitSystem.IMPERIAL)
|
||||||
|
.retrieveAsync()
|
||||||
|
.asXML();
|
||||||
|
|
||||||
|
assertNotNull(weatherXMLFuture);
|
||||||
|
System.out.println(weatherXMLFuture.get());
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenRequestCurrentWeatherWithInvalidApiKey_thenThrowAnException() {
|
public void whenRequestCurrentWeatherWithInvalidApiKey_thenThrowAnException() {
|
||||||
OpenWeatherMapClient client = new OpenWeatherMapClient("invalidKey");
|
OpenWeatherMapClient client = new OpenWeatherMapClient("invalidKey");
|
||||||
|
|||||||
Reference in New Issue
Block a user