Change to Okhttp

.gitignore

@@ -37,4 +37,5 @@ esi.json
 /nbactions.xml
 /nb-configuration.xml
 /src/main/java/net/troja/eve/esi/Main.java
-/nbproject/
+/nbproject/
+meta.json

.swagger-codegen-ignore → .openapi-generator-ignore

@@ -42,3 +42,7 @@ LICENSE
 
 # Changed by us
 src/main/java/net/troja/eve/esi/auth/OAuth.java
+src/main/java/net/troja/eve/esi/api/SwaggerApi.java
+src/test/java/net/troja/eve/esi/api/SwaggerApiTest.java
+src/main/java/net/troja/eve/esi/api/WebUiApi.java
+src/test/java/net/troja/eve/esi/api/WebUIApiTest.java

.openapi-generator/VERSION

@@ -0,0 +1 @@
+3.3.4

config.json

@@ -4,7 +4,7 @@
   "invokerPackage":"net.troja.eve.esi",
   "apiPackage":"net.troja.eve.esi.api",
   "modelPackage":"net.troja.eve.esi.model",
-  "library":"jersey2",
+  "library":"okhttp-gson",
   "serializableModel":"true",
   "hideGenerationTimestamp":"true",
   "dateLibrary":"java8"

generate.sh

@@ -4,12 +4,16 @@
 # Get eve swagger file
 #
 rm -f esi.json
-wget -q -O esi.json https://esi.evetech.net/_latest/swagger.json?datasource=tranquility
+wget -O esi.json https://esi.evetech.net/_latest/swagger.json?datasource=tranquility
+wget -O meta.json https://esi.evetech.net/swagger.json
 
 #
 # Remove old model files in case something was removed
 #
+mv src/main/java/net/troja/eve/esi/model/CharacterInfo.java src/main/java/net/troja/eve/esi/CharacterInfo.java
 rm -r src/main/java/net/troja/eve/esi/model
+mv src/main/java/net/troja/eve/esi/api/SsoApi.java src/main/java/net/troja/eve/esi/SsoApi.java
+rm -r src/main/java/net/troja/eve/esi/api
 
 #
 # Get swagger code generator
@@ -29,19 +33,29 @@ rm -r src/main/java/net/troja/eve/esi/model
 # Transform and beautify swagger file
 #
 sed -i -f replace.sed esi.json
+sed -i -f meta_replace.sed meta.json
+./meta_transformation.sh
 ./transformation.sh
 #
 # Generate code
 # Move tests so they are generated new and then moved to a different directory
 #
 test -d src/test/java/net/troja/eve/esi/api.new && rm -r src/test/java/net/troja/eve/esi/api.new
 mv src/test/java/net/troja/eve/esi/api src/test/java/net/troja/eve/esi/api.old
-java -jar swagger-codegen-cli.jar generate \
+java -jar openapi-generator-cli.jar generate \
+  --skip-validate-spec  \
+  -i meta.json \
+  -g java \
+  -c config.json
+java -jar openapi-generator-cli.jar generate \
+  --skip-validate-spec  \
   -i esi.json \
-  -l java \
+  -g java \
   -c config.json
 mv src/test/java/net/troja/eve/esi/api src/test/java/net/troja/eve/esi/api.new
 mv src/test/java/net/troja/eve/esi/api.old src/test/java/net/troja/eve/esi/api
+mv src/main/java/net/troja/eve/esi/CharacterInfo.java src/main/java/net/troja/eve/esi//model/CharacterInfo.java
+mv src/main/java/net/troja/eve/esi/SsoApi.java src/main/java/net/troja/eve/esi/api/SsoApi.java
 
 for I in $(grep "OpenAPI spec version" src/* -r | sed -e 's#:.*##'); do
   sed -i -e '/OpenAPI spec version/d' $I

meta_replace.sed

@@ -0,0 +1,3 @@
+# Objects
+s/get_status_item/EsiStatusResponse/g
+s/get_verify_ok/EsiVerifyResponse/g

meta_transformation.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# evesso securityDefinitions
+echo "Added evesso securityDefinitions"
+jq "(.securityDefinitions.evesso) = {\"authorizationUrl\": \"https://login.eveonline.com/v2/oauth/authorize\",\"flow\": \"implicit\",\"scopes\": {}, \"type\": \"oauth2\"}" meta.json > meta_1.json
+
+# evesso verify
+echo "Added evesso to verify"
+jq "(.paths.\"/verify/\".get.security[0].evesso) = {}" meta_1.json > meta.json
+
+# Clean up
+rm meta_1.json

pom.xml

@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.troja.eve</groupId>
   <artifactId>eve-esi</artifactId>
-  <version>2.4.2-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <version>3.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
   <name>EVE-ESI</name>
   <description>Java Client for the new Eve Swagger Interface (ESI)</description>
   <url>https://github.com/burberius/eve-esi</url>
@@ -39,95 +39,63 @@
     </developer>
   </developers>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <swagger-core-version>1.5.21</swagger-core-version>
-    <jersey-version>2.25.1</jersey-version>
-    <jackson-version>2.9.8</jackson-version>
-    <junit-version>4.12</junit-version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-core-version}</version>
-    </dependency>
-
-    <!-- HTTP client: jersey-client -->
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-client</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-multipart</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-json-jackson</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.security</groupId>
-      <artifactId>oauth2-client</artifactId>
-      <version>${jersey-version}</version>
-    </dependency>
-
-    <!-- JSON processing: jackson -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>${jackson-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson-version}</version>
-    </dependency>
-
-    <!-- Base64 encoding that works in both JVM and Android -->
-    <dependency>
-      <groupId>com.brsanthu</groupId>
-      <artifactId>migbase64</artifactId>
-      <version>2.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.5</version>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>${gson-fire-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.oltu.oauth2</groupId>
+            <artifactId>org.apache.oltu.oauth2.client</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+			<scope>test</scope>
+		</dependency>
+    </dependencies>
+    <properties>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <gson-fire-version>1.8.0</gson-fire-version>
+        <swagger-core-version>1.5.18</swagger-core-version>
+        <okhttp-version>2.7.5</okhttp-version>
+        <gson-version>2.8.1</gson-version>
+        <maven-plugin-version>1.0.0</maven-plugin-version>
+        <junit-version>4.12</junit-version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
   <build>
     <plugins>

src/main/java/net/troja/eve/esi/ApiCallback.java

@@ -0,0 +1,75 @@
+/*
+ * EVE Swagger Interface
+ * An OpenAPI for EVE Online
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package net.troja.eve.esi;
+
+import java.io.IOException;
+
+import java.util.Map;
+import java.util.List;
+
+/**
+ * Callback for asynchronous API call.
+ *
+ * @param <T>
+ *            The return type
+ */
+public interface ApiCallback<T> {
+    /**
+     * This is called when the API call fails.
+     *
+     * @param e
+     *            The exception causing the failure
+     * @param statusCode
+     *            Status code of the response if available, otherwise it would
+     *            be 0
+     * @param responseHeaders
+     *            Headers of the response if available, otherwise it would be
+     *            null
+     */
+    void onFailure(ApiException e, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API call succeeded.
+     *
+     * @param result
+     *            The result deserialized from response
+     * @param statusCode
+     *            Status code of the response
+     * @param responseHeaders
+     *            Headers of the response
+     */
+    void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders);
+
+    /**
+     * This is called when the API upload processing.
+     *
+     * @param bytesWritten
+     *            bytes Written
+     * @param contentLength
+     *            content length of request body
+     * @param done
+     *            write end
+     */
+    void onUploadProgress(long bytesWritten, long contentLength, boolean done);
+
+    /**
+     * This is called when the API downlond processing.
+     *
+     * @param bytesRead
+     *            bytes Read
+     * @param contentLength
+     *            content lenngth of the response
+     * @param done
+     *            Read end
+     */
+    void onDownloadProgress(long bytesRead, long contentLength, boolean done);
+}