Merge pull request #58 from stachu540/v3

merge to dev

Author: stachu540

.codacy.yml

@@ -1,6 +1,14 @@
+.gradle/
+build/
+logs/
+
 .idea
 *.iml
 out/
-.gradle
-build/
-logs/
+
+lombok.config
+
+*.txt
+
+all/src/
+BOM/src/

.github/ISSUES_TEMPLATE.md

@@ -1,6 +1,7 @@
 language: java
 jdk:
   - oraclejdk8
+  - oraclejdk11
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -15,8 +16,23 @@ before_install:
 script:
   - ./gradlew test
 
-deploy:
-  - provider: script
-    script: ./gradlew bintrayUpload
-    on:
-      tags: true
+
+jobs:
+  include:
+    - stage: deploy
+      jdk: openjdk11
+      install: skip
+      script: chmod +x ./javadoc.sh && ./javadoc.sh
+      if: tag IS present
+      deploy:
+        provider: pages
+        local-dir: ./javadoc
+        api_key: $GITHUB_OAUTH_TOKEN
+        skip_cleanup: true
+        committer-from-gh: true
+        verbose: true
+    - stage: deploy
+      jdk: openjdk8
+      install: skip
+      script: ./gradlew bintrayUpload -x test
+      if: tag IS present

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,9 @@
-[![Build Status](https://travis-ci.org/stachu540/HiRezAPI.svg)](https://travis-ci.org/stachu540/HiRezAPI)
+[![Build Status](https://travis-ci.com/stachu540/HiRezAPI.svg)](https://travis-ci.com/stachu540/HiRezAPI)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ee16a92996a3425d87403780aa18f316)](https://www.codacy.com/app/stachu540/HiRezAPI?utm_source=github.com&utm_medium=referral&utm_content=stachu540/HiRezAPI&utm_campaign=Badge_Grade)
-[![Download](https://api.bintray.com/packages/stachu540/Java/HiRezAPI/images/download.svg) ](https://bintray.com/stachu540/Java/HiRezAPI/_latestVersion)
+[![Download](https://api.bintray.com/packages/stachu540/Java/HiRezAPI/images/download.svg)](https://bintray.com/stachu540/Java/HiRezAPI/_latestVersion)
+
 ##### Javadocs
-| Package | Javadoc |
-|---|---|
-| Common | [![Javadocs](http://javadoc.io/badge/com.github.stachu540/HiRezApi-common.svg)](http://javadoc.io/doc/com.github.stachu540/HiRezApi-common) |
-| Smite | [![Javadocs](http://javadoc.io/badge/com.github.stachu540/HiRezApi-smite.svg)](http://javadoc.io/doc/com.github.stachu540/HiRezApi-smite) |
-| Paladins | [![Javadocs](http://javadoc.io/badge/com.github.stachu540/HiRezApi-paladins.svg)](http://javadoc.io/doc/com.github.stachu540/HiRezApi-paladins) |
-| Core | [![Javadocs](http://javadoc.io/badge/com.github.stachu540/HiRezApi-core.svg)](http://javadoc.io/doc/com.github.stachu540/HiRezApi-core) |
+Soon :tm:
 
 # HiRezAPI
 Java-Based API Wrapper for Hi-Rez Studios games. Currently supports:
@@ -16,7 +12,7 @@ Java-Based API Wrapper for Hi-Rez Studios games. Currently supports:
 
 ## Features
 
-All features will be on [Project](https://github.com/stachu540/HiRezAPI/projects/4) tab
+All features will be on [Project](https://github.com/stachu540/HiRezAPI/projects/5) tab
 
 ## Getting Started
 
@@ -31,37 +27,41 @@ Add to `pom.xml` build.
 <repositories>
     <repository>
         <id>jcenter</id>
-        <url>https://jcenter.bintray.com</url>
+        <url>https://jitpack.io</url>
     </repository>
 </repositories>
 
 <dependencies>
     <dependency>
           <groupId>com.github.stachu540</groupId>
           <!--for all games-->
-          <artifactId>HiRezAPI-core</artifactId> 
+          <artifactId>HiRezAPI-all</artifactId> 
           <!--for paladins-->
           <!--<artifactId>HiRezAPI-paladins</artifactId>-->
           <!--for smite-->
           <!--<artifactId>HiRezAPI-smite</artifactId>-->
-          <version>2.1.0</version>
+          <!--for realm royale-->
+          <!--<artifactId>HiRezAPI-realm</artifactId>-->
+          <version>v3</version>
      </dependency>
 </dependencies>
 ```
 #### Gradle
 Add to `build.gradle` build.
 ```groovy
 repositories {
-  jcenter()
+  maven { url "https://jitpack.io" }
 }
 
 dependencies {
-    // for all games
-  compile "com.github.stachu540:HiRezAPI-core:2.1.0"
-    // for paladins
-//  compile "com.github.stachu540:HiRezAPI-paladins:2.1.0"
-    // for smite
-//  compile "com.github.stachu540:HiRezAPI-smite:2.1.0"
+// for all games
+  compile "com.github.stachu540:HiRezAPI-all:v3"
+// for paladins
+//  compile "com.github.stachu540:HiRezAPI-paladins:v3"
+// for smite
+//  compile "com.github.stachu540:HiRezAPI-smite:v3"
+// for realm royale
+//  compile "com.github.stachu540:HiRezAPI-realm:v3"
 }
 ```
 

.gitignore

@@ -0,0 +1,32 @@
+def projectList = [
+        project(":api"),
+        project(":smite"),
+        project(":paladins"),
+        project(":realm")
+]
+
+dependencies {
+    projectList.each {
+        compile it
+    }
+}
+
+sourceJar.enabled = false
+
+javadoc {
+    failOnError = false
+    title = "${rootProject.name} ${rootProject.version} API"
+    options {
+        windowTitle = "${rootProject.name} ${rootProject.version}"
+        author = true
+        encoding = "UTF-8"
+        quiet()
+    }
+
+    projectList.each {
+        source += it.javadoc.source
+        classpath += it.javadoc.classpath
+        excludes += it.javadoc.excludes
+        includes += it.javadoc.includes
+    }
+}

.travis.yml

@@ -0,0 +1,37 @@
+plugins {
+    id "io.freefair.lombok"
+    id "com.gorylenko.gradle-git-properties"
+}
+
+dependencies {
+    compile enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.9.8")
+    compile "com.fasterxml.jackson.core:jackson-annotations:2.9.8"
+
+    compile "com.fasterxml.jackson.core:jackson-databind"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8"
+    
+    compile "io.reactivex.rxjava2:rxjava:2.2.8"
+    compile "io.reactivex.rxjava2:rxandroid:2.1.1"
+
+    compile "com.squareup.okhttp3:okhttp:3.14.0"
+    compile "com.squareup.okhttp3:logging-interceptor:3.14.0"
+    
+    testCompile "com.google.guava:guava:27.1-android"
+    testCompile "com.squareup.okhttp3:mockwebserver:3.14.0"
+}
+
+gitProperties {
+    failOnNoGitDirectory = false
+    keys = [
+            "git.branch",
+            "git.commit.id",
+            "git.commit.id.abbrev",
+            "git.commit.id.describe"
+    ]
+    dateFormatTimeZone = "GMT"
+    customProperty "application.name", rootProject.name
+    customProperty "application.version", rootProject.version
+    customProperty "application.url", "https://github.com/stachu540/hirezapi"
+    customProperty "application.description", rootProject.description
+}

README.md

@@ -0,0 +1,10 @@
+package hirez.api;
+
+import hirez.api.object.Game;
+import hirez.api.object.Platform;
+
+public interface BaseEndpoint {
+    Game getGame();
+    Platform getPlatform();
+    String getBaseUrl();
+}

all/build.gradle

@@ -0,0 +1,85 @@
+package hirez.api;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.time.ZoneOffset;
+import java.util.Date;
+import java.util.TimeZone;
+
+@Getter
+@AllArgsConstructor
+public class Configuration {
+    private final String devId;
+    private final String authKey;
+    private final BaseEndpoint baseEndpoint;
+    private final SessionStorage sessionStorage;
+    private final String userAgent;
+    private final Language language;
+
+    public Configuration(ConfigurationBuilder cb) {
+        this(cb.getDevId(), cb.getAuthKey(), cb.getBaseEndpoint(), cb.getSessionStorage(), cb.getUserAgent(), cb.getLanguage());
+    }
+
+    public String createUrl(String method, String... args) {
+        StringBuilder sb = new StringBuilder(baseEndpoint.getBaseUrl())
+                .append("/").append(method).append("json");
+
+        String timestamp = doTimestamp();
+
+        if (!method.equals("ping")) {
+            sb.append("/").append(devId);
+            sb.append("/").append(doSignature(method, timestamp));
+            if (!method.equals("createsession") && sessionStorage.isPresent()) {
+                sb.append("/").append(sessionStorage.get());
+            } else {
+                throw new HiRezException("Require generate session for: " + method);
+            }
+            sb.append("/").append(timestamp);
+            if (args.length > 0) {
+                sb.append("/").append(String.join("/", args));
+            }
+        }
+        return sb.toString();
+    }
+
+
+    private String doTimestamp() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        sdf.setTimeZone(TimeZone.getTimeZone(ZoneOffset.UTC));
+        return sdf.format(new Date());
+    }
+
+    private String doSignature(String method, String timestamp) {
+        String templateSignature = new StringBuilder(devId)
+                .append(method)
+                .append(authKey)
+                .append(timestamp)
+                .toString();
+        StringBuilder signatureBuilder = new StringBuilder();
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(templateSignature.getBytes());
+            byte[] bytes = md.digest();
+
+            for (byte bit : bytes) {
+                String hex = Integer.toHexString(0xff & bit);
+                if (hex.length() == 1) {
+                    signatureBuilder.append("0");
+                }
+                signatureBuilder.append(hex);
+            }
+        } catch (NoSuchAlgorithmException ignore) {
+        }
+
+        return signatureBuilder.toString();
+    }
+
+    public ConfigurationBuilder newBuilder() {
+        return new ConfigurationBuilder(this);
+    }
+}