From 112cbb0312ee6f493938e2364e93dfc1db7748e7 Mon Sep 17 00:00:00 2001 From: Ashutosh Kumar Singh Date: Thu, 9 Nov 2017 03:13:43 +0530 Subject: [PATCH] 2.5.1.0: Removed the old code in Java --- .../aksingh/owmjapis/AbstractResponse.java | 94 ------------------- .../aksingh/owmjapis/CurrentWeatherTest.java | 63 ------------- .../aksingh/owmjapis/DailyForecastTest.java | 74 --------------- .../aksingh/owmjapis/HourlyForecastTest.java | 74 --------------- 4 files changed, 305 deletions(-) delete mode 100644 src/main/java/net/aksingh/owmjapis/AbstractResponse.java delete mode 100644 src/test/java/net/aksingh/owmjapis/CurrentWeatherTest.java delete mode 100644 src/test/java/net/aksingh/owmjapis/DailyForecastTest.java delete mode 100644 src/test/java/net/aksingh/owmjapis/HourlyForecastTest.java diff --git a/src/main/java/net/aksingh/owmjapis/AbstractResponse.java b/src/main/java/net/aksingh/owmjapis/AbstractResponse.java deleted file mode 100644 index 8132e5b..0000000 --- a/src/main/java/net/aksingh/owmjapis/AbstractResponse.java +++ /dev/null @@ -1,94 +0,0 @@ -/************************************************************************************************** - * Copyright (c) 2013-2017 Ashutosh Kumar Singh * - * * - * 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 net.aksingh.owmjapis; - -import org.json.JSONObject; - -import java.io.Serializable; - -/** - *

- * Provides default behaviours and implementations for the response from OpenWeatherMap.org - *

- * - * @author Ashutosh Kumar Singh - * @version 2014/12/28 - * @since 2.5.0.3 - */ -abstract class AbstractResponse implements Serializable { - /* - JSON Keys - */ - private static final String JSON_RESPONSE_CODE = "code"; - - /* - Instance variables - */ - private final int responseCode; - private final String rawResponse; - - /* - Constructors - */ - AbstractResponse() { - this.rawResponse = null; - this.responseCode = Integer.MIN_VALUE; - } - - AbstractResponse(JSONObject jsonObj) { - this.rawResponse = (jsonObj != null) ? jsonObj.toString() : null; - this.responseCode = (jsonObj != null) ? jsonObj.optInt(JSON_RESPONSE_CODE, Integer.MIN_VALUE) : Integer.MIN_VALUE; - } - - /** - * @return true if response is valid (downloaded and parsed correctly), otherwise false. - */ - public boolean isValid() { - return this.responseCode == 200; - } - - /** - * @return true if response code is available, otherwise false. - */ - public boolean hasResponseCode() { - return this.responseCode != Integer.MIN_VALUE; - } - - /** - * @return true if raw response is available, otherwise false. - */ - public boolean hasRawResponse() { - return this.rawResponse != null; - } - - /** - * @return Response code if available, otherwise Integer.MIN_VALUE. - */ - public int getResponseCode() { - return this.responseCode; - } - - /** - * @return Raw response if available, otherwise null. - */ - public String getRawResponse() { - return this.rawResponse; - } -} diff --git a/src/test/java/net/aksingh/owmjapis/CurrentWeatherTest.java b/src/test/java/net/aksingh/owmjapis/CurrentWeatherTest.java deleted file mode 100644 index ac97202..0000000 --- a/src/test/java/net/aksingh/owmjapis/CurrentWeatherTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************************************** - * Copyright (c) 2013-2017 Ashutosh Kumar Singh * - * * - * 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 net.aksingh.owmjapis; - -import java.io.IOException; - -/** - *

- * Tests the CurrentWeather's functionality. - *

- * - * @author Ashutosh Kumar Singh - * @version 2014/12/26 - * @since 2.5.0.3 - */ -public class CurrentWeatherTest { - - public static void main(String[] args) throws IOException { - OpenWeatherMap owm = new OpenWeatherMap(""); - CurrentWeather cw = owm.currentWeatherByCityName("London, UK"); - - if (!cw.isValid()) { - System.out.println("Reponse is inValid!"); - } else { - System.out.println("Reponse is Valid!"); - System.out.println(); - - if (cw.hasBaseStation()) { - System.out.println("Base station: " + cw.getBaseStation()); - } - if (cw.hasDateTime()) { - System.out.println("Date time: " + cw.getDateTime()); - } - System.out.println(); - - - if (cw.hasCityCode()) { - System.out.println("City code: " + cw.getCityCode()); - } - if (cw.hasCityName()) { - System.out.println("City name: " + cw.getCityName()); - } - System.out.println(); - } - } -} diff --git a/src/test/java/net/aksingh/owmjapis/DailyForecastTest.java b/src/test/java/net/aksingh/owmjapis/DailyForecastTest.java deleted file mode 100644 index a9ec419..0000000 --- a/src/test/java/net/aksingh/owmjapis/DailyForecastTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************************************** - * Copyright (c) 2013-2017 Ashutosh Kumar Singh * - * * - * 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 net.aksingh.owmjapis; - -import java.io.IOException; - -/** - *

- * Tests the HourlyForecast's functionality. - *

- * - * @author Ashutosh Kumar Singh - * @version 2015/01/22 - * @since 2.5.0.3 - */ -public class DailyForecastTest { - - public static void main(String[] args) throws IOException { - OpenWeatherMap owm = new OpenWeatherMap(""); - DailyForecast df = owm.dailyForecastByCityName("London, UK", Byte.parseByte("5")); - - if (!df.isValid()) { - System.out.println("Reponse is inValid!"); - } else { - System.out.println("Reponse is Valid!"); - System.out.println(); - - if (df.hasCityInstance()) { - DailyForecast.City city = df.getCityInstance(); - if (city.hasCityName()) { - if (city.hasCityCode()) { - System.out.println("City code: " + city.getCityCode()); - } - if (city.hasCityName()) { - System.out.println("City name: " + city.getCityName()); - } - System.out.println(); - } - } - - System.out.println("Total forecast instances: " + df.getForecastCount()); - System.out.println(); - - for (int i = 0; i < df.getForecastCount(); i++) { - DailyForecast.Forecast forecast = df.getForecastInstance(i); - - System.out.println("*** Data instance number " + (i + 1) + " ***"); - - if (forecast.hasDateTime()) { - System.out.println(forecast.getDateTime()); - } - - System.out.println(); - } - } - } -} diff --git a/src/test/java/net/aksingh/owmjapis/HourlyForecastTest.java b/src/test/java/net/aksingh/owmjapis/HourlyForecastTest.java deleted file mode 100644 index e682e70..0000000 --- a/src/test/java/net/aksingh/owmjapis/HourlyForecastTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************************************** - * Copyright (c) 2013-2017 Ashutosh Kumar Singh * - * * - * 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 net.aksingh.owmjapis; - -import java.io.IOException; - -/** - *

- * Tests the HourlyForecast's functionality. - *

- * - * @author Ashutosh Kumar Singh - * @version 2015/01/22 - * @since 2.5.0.3 - */ -public class HourlyForecastTest { - - public static void main(String[] args) throws IOException { - OpenWeatherMap owm = new OpenWeatherMap(""); - HourlyForecast hf = owm.hourlyForecastByCityName("London, UK"); - - if (!hf.isValid()) { - System.out.println("Reponse is inValid!"); - } else { - System.out.println("Reponse is Valid!"); - System.out.println(); - - if (hf.hasCityInstance()) { - HourlyForecast.City city = hf.getCityInstance(); - if (city.hasCityName()) { - if (city.hasCityCode()) { - System.out.println("City code: " + city.getCityCode()); - } - if (city.hasCityName()) { - System.out.println("City name: " + city.getCityName()); - } - System.out.println(); - } - } - - System.out.println("Total forecast instances: " + hf.getForecastCount()); - System.out.println(); - - for (int i = 0; i < hf.getForecastCount(); i++) { - HourlyForecast.Forecast forecast = hf.getForecastInstance(i); - - System.out.println("*** Data instance number " + (i + 1) + " ***"); - - if (forecast.hasDateTime()) { - System.out.println(forecast.getDateTime()); - } - - System.out.println(); - } - } - } -}