From 157959e53734e60368c86e1b8af68eefc8c85530 Mon Sep 17 00:00:00 2001 From: Prominence Date: Wed, 1 Aug 2018 20:40:17 +0300 Subject: [PATCH] 'System' class was removed. --- docs/SNAPSHOT.md | 6 ------ .../api/AuthenticationTokenBasedRequester.java | 3 +++ .../prominence/openweathermap/api/BasicRequester.java | 2 +- .../openweathermap/api/UltravioletIndexRequester.java | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/SNAPSHOT.md b/docs/SNAPSHOT.md index 76110ec..28cbfcf 100644 --- a/docs/SNAPSHOT.md +++ b/docs/SNAPSHOT.md @@ -342,12 +342,6 @@ Date: Tue Jul 31 15:00:00 MSK 2018, Ultraviolet value: 6.230000 | Language.CHINESE_SIMPLIFIED | Chinese Simplified language. | | Language.CHINESE_TRADITIONAL | Chinese Traditional language. | -#### System -| Constant | Description | -|-------------------------------|-----------------------| -|System.OPEN_WEATHER_API_URL | Basic API url. | -|System.OPEN_WEATHER_API_VERSION| Current API version. | - #### Unit | Constant | Description | |----------------------|------------------------------------------------| diff --git a/src/main/java/com/github/prominence/openweathermap/api/AuthenticationTokenBasedRequester.java b/src/main/java/com/github/prominence/openweathermap/api/AuthenticationTokenBasedRequester.java index 5c005ea..161de4b 100644 --- a/src/main/java/com/github/prominence/openweathermap/api/AuthenticationTokenBasedRequester.java +++ b/src/main/java/com/github/prominence/openweathermap/api/AuthenticationTokenBasedRequester.java @@ -24,6 +24,9 @@ package com.github.prominence.openweathermap.api; abstract class AuthenticationTokenBasedRequester { + protected static final String OPEN_WEATHER_API_VERSION = "2.5"; + protected static final String OPEN_WEATHER_API_URL = "http://api.openweathermap.org/data/" + OPEN_WEATHER_API_VERSION + "/"; + protected String authToken; protected AuthenticationTokenBasedRequester(String authToken) { diff --git a/src/main/java/com/github/prominence/openweathermap/api/BasicRequester.java b/src/main/java/com/github/prominence/openweathermap/api/BasicRequester.java index 22a3ca5..6a79da1 100644 --- a/src/main/java/com/github/prominence/openweathermap/api/BasicRequester.java +++ b/src/main/java/com/github/prominence/openweathermap/api/BasicRequester.java @@ -64,7 +64,7 @@ abstract class BasicRequester extends AuthenticationTokenBasedRequester { protected URL buildURL(String requestSpecificParameters) throws MalformedURLException { - StringBuilder urlBuilder = new StringBuilder(System.OPEN_WEATHER_API_URL); + StringBuilder urlBuilder = new StringBuilder(OPEN_WEATHER_API_URL); urlBuilder.append(getRequestType()); urlBuilder.append(requestSpecificParameters); diff --git a/src/main/java/com/github/prominence/openweathermap/api/UltravioletIndexRequester.java b/src/main/java/com/github/prominence/openweathermap/api/UltravioletIndexRequester.java index 82b7ec9..a6b370b 100644 --- a/src/main/java/com/github/prominence/openweathermap/api/UltravioletIndexRequester.java +++ b/src/main/java/com/github/prominence/openweathermap/api/UltravioletIndexRequester.java @@ -99,7 +99,7 @@ public class UltravioletIndexRequester extends AuthenticationTokenBasedRequester private InputStream executeRequest(String requestType, String requestSpecificParameters) throws MalformedURLException, InvalidAuthTokenException, DataNotFoundException { - StringBuilder urlBuilder = new StringBuilder(System.OPEN_WEATHER_API_URL); + StringBuilder urlBuilder = new StringBuilder(OPEN_WEATHER_API_URL); urlBuilder.append(requestType); urlBuilder.append('?'); urlBuilder.append(requestSpecificParameters);