Merge pull request #21 from xSAVIKx/release/v1.4.0

Release/v1.4.0

.bin/gitconfig.sh

@@ -1,5 +1,22 @@
 #!/usr/bin/env bash
 
+#
+# Copyright 2021, Yurii Serhiichuk
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
 # Set colors
 GREEN='\033[1;32m'
 CYAN='\033[1;36m'
@@ -39,4 +56,4 @@ git config --local include.path "${GITCONFIG_PATH}"
 printf "${GREEN}.gitconfig path was successfully set to '${GITCONFIG_PATH}'.${NC}"
 echo
 printf "${GREEN}----${NC}"
-echo
+echo

.gitattributes

@@ -3,6 +3,7 @@
 * text=auto
 
 *.bat           text eol=crlf
+*.sh            text eol=lf
 
 #
 # The above will handle all files NOT found below

.github/workflows/ci.yaml

@@ -0,0 +1,77 @@
+name: CI
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Test on Java ${{ matrix.java }} and ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8, 11, 15 ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
+          java-package: 'jdk'
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OPENWEATHERMAP_API_KEY: ${{ secrets.OPENWEATHERMAP_API_KEY }}
+      - uses: codecov/codecov-action@v1
+  deploy:
+    name: Deploy packages
+    runs-on: ubuntu-20.04
+    needs: [ build ]
+    if: contains('
+      refs/heads/development
+      refs/heads/master
+      ', github.ref)
+      && github.event_name == 'push'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'zulu'
+          java-package: 'jdk'
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Publish to GitHub Packages
+        run: ./gradlew publish --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OPENWEATHERMAP_API_KEY: ${{ secrets.OPENWEATHERMAP_API_KEY }}

.gitignore

@@ -128,4 +128,6 @@ $RECYCLE.BIN/
 
 # betamax ignores
 littleproxy_cert
-*.jks
+*.jks
+
+gradle.properties

LICENSE

@@ -178,15 +178,15 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 Yuri Sergiichuk
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,7 +1,9 @@
-openweathermap-java-api [![Build Status][ci-shield]][ci-link] [![Download][bintray-shield]][bintray-link] [![codecov][codecov-shield]][codecov-link]
+openweathermap-java-api
+[![Build Status][ci-badge]][ci-link]
+[![codecov][codecov-badge]][codecov-link]
 =====
 
-To use the OpenweatherMap API, you need to obtain an API key.  Sign up [here][openweathermap-signup].
+To use the OpenweatherMap API, you need to obtain an API key. Sign up [here][openweathermap-signup].
 
 
 [openweathermap-signup]: http://home.openweathermap.org/users/sign_up
@@ -71,17 +73,17 @@ CATALAN("ca");
 - Metric
 - Imperial
 
-More information about weather parameters and unit can be found [here](http://openweathermap.org/weather-data).
+More information about weather parameters and unit can be
+found [here](http://openweathermap.org/weather-data).
 
 ## Examples
 
 Take a look at [examples module](./api-examples)
 
-[ci-shield]: https://travis-ci.org/xSAVIKx/openweathermap-java-api.svg?branch=development
-[ci-link]: https://travis-ci.org/xSAVIKx/openweathermap-java-api
+[ci-badge]: https://github.com/xSAVIKx/openweathermap-java-api/actions/workflows/ci.yaml/badge.svg
 
-[bintray-shield]: https://api.bintray.com/packages/xsavikx/openweathermap-java-api/api-core/images/download.svg
-[bintray-link]: https://bintray.com/xsavikx/openweathermap-java-api/api-core/_latestVersion
+[ci-link]: https://github.com/xSAVIKx/openweathermap-java-api/actions/workflows/ci.yaml
+
+[codecov-badge]: https://codecov.io/gh/xSAVIKx/openweathermap-java-api/branch/development/graph/badge.svg
 
-[codecov-shield]: https://codecov.io/gh/xSAVIKx/openweathermap-java-api/branch/development/graph/badge.svg
 [codecov-link]: https://codecov.io/gh/xSAVIKx/openweathermap-java-api

api-common/build.gradle

@@ -1,5 +1,22 @@
+/*
+ * Copyright 2021, Yurii Serhiichuk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 dependencies {
-    compile deps.gson
+    api deps.gson
 }
 
 appendPomDescription('Java API to access openweathermap.org API common elements')

api-common/src/main/java/org/openweathermap/api/common/Coordinate.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2021, Yurii Serhiichuk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package org.openweathermap.api.common;
 
 import com.google.gson.annotations.SerializedName;

api-core/build.gradle

@@ -1,10 +1,27 @@
+/*
+ * Copyright 2021, Yurii Serhiichuk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 dependencies {
-    compile project(':api-query')
-    compile project(':api-common')
-    compile project(':api-model')
+    api project(':api-query')
+    api project(':api-common')
+    api project(':api-model')
 
-    compile deps.gson
-    compile deps.common
+    api deps.gson
+    implementation deps.common
 }
 
 appendPomDescription('Java API to access openweathermap.org API')

api-core/src/main/java/org/openweathermap/api/AbstractDataWeatherClient.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2021, Yurii Serhiichuk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package org.openweathermap.api;
 
 import com.google.gson.*;
@@ -53,7 +70,7 @@ public CurrentWeather getCurrentWeather(CurrentWeatherOneLocationQuery query) {
     @Override
     public List<CurrentWeather> getCurrentWeather(CurrentWeatherMultipleLocationsQuery query) {
         String data = getWeatherData(query);
-        JsonObject jsonObject = jsonParser().parse(data).getAsJsonObject();
+        JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
         JsonArray list = jsonObject.getAsJsonArray("list");
         List<CurrentWeather> result = gson().fromJson(list, CurrentWeather.TYPE_LIST);
         return result;
@@ -97,18 +114,6 @@ protected static Gson gson() {
         return GsonHolder.INSTANCE.value;
     }
 
-    protected static JsonParser jsonParser() {
-        return JsonParserHolder.INSTANCE.value;
-    }
-
-    private enum JsonParserHolder {
-        INSTANCE;
-
-        @SuppressWarnings({"NonSerializableFieldInSerializableClass", "ImmutableEnumChecker"})
-        private final JsonParser value = new JsonParser();
-
-    }
-
     private enum GsonHolder {
         INSTANCE;
         @SuppressWarnings({"NonSerializableFieldInSerializableClass", "ImmutableEnumChecker"})

api-core/src/main/java/org/openweathermap/api/DataWeatherClient.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2021, Yurii Serhiichuk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package org.openweathermap.api;
 
 import org.openweathermap.api.model.currentweather.CurrentWeather;

api-core/src/main/java/org/openweathermap/api/UrlConnectionDataWeatherClient.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright 2021, Yurii Serhiichuk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package org.openweathermap.api;
 
 import org.openweathermap.api.query.Query;