move java-commons to a separate module

qase-tms · Sep 2, 2024 · c88d3bb · c88d3bb
1 parent e1ef991
commit c88d3bb
Show file tree

Hide file tree

Showing 97 changed files with 363 additions and 330 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,6 +9,7 @@
     <packaging>pom</packaging>
     <version>4.0.0</version>
     <modules>
+        <module>qase-java-commons</module>
         <module>qase-api-client</module>
         <module>qase-testng-reporter</module>
         <module>qase-junit4-reporter</module>

diff --git a/qase-api-client/pom.xml b/qase-api-client/pom.xml
@@ -51,6 +51,11 @@
             <artifactId>logging-interceptor</artifactId>
             <version>4.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+        </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
@@ -61,39 +66,6 @@
             <artifactId>owner-java8</artifactId>
             <version>1.0.12</version>
         </dependency>
-        <dependency>
-            <groupId>com.konghq</groupId>
-            <artifactId>unirest-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>

diff --git a/qase-api-client/src/main/java/io/qase/client/ApiCallback.java b/qase-api-client/src/main/java/io/qase/client/ApiCallback.java
@@ -13,7 +13,6 @@
 
 package io.qase.client;
 
-import io.qase.api.exceptions.QaseException;
 
 import java.util.List;
 import java.util.Map;

diff --git a/qase-api-client/src/main/java/io/qase/client/ApiClient.java b/qase-api-client/src/main/java/io/qase/client/ApiClient.java
diff --git a/...io/qase/api/exceptions/QaseException.java → ...in/java/io/qase/client/QaseException.java b/...io/qase/api/exceptions/QaseException.java → ...in/java/io/qase/client/QaseException.java
@@ -11,7 +11,7 @@
  */
 
 
-package io.qase.api.exceptions;
+package io.qase.client;
 
 import java.util.List;
 import java.util.Map;

diff --git a/qase-api-client/src/main/java/io/qase/client/api/AttachmentsApi.java b/qase-api-client/src/main/java/io/qase/client/api/AttachmentsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.AttachmentListResponse;
 import io.qase.client.model.AttachmentResponse;

diff --git a/qase-api-client/src/main/java/io/qase/client/api/CasesApi.java b/qase-api-client/src/main/java/io/qase/client/api/CasesApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/CustomFieldsApi.java b/qase-api-client/src/main/java/io/qase/client/api/CustomFieldsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/DefectsApi.java b/qase-api-client/src/main/java/io/qase/client/api/DefectsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/EnvironmentsApi.java b/qase-api-client/src/main/java/io/qase/client/api/EnvironmentsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/MilestonesApi.java b/qase-api-client/src/main/java/io/qase/client/api/MilestonesApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/PlansApi.java b/qase-api-client/src/main/java/io/qase/client/api/PlansApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/ProjectsApi.java b/qase-api-client/src/main/java/io/qase/client/api/ProjectsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/ResultsApi.java b/qase-api-client/src/main/java/io/qase/client/api/ResultsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/RunsApi.java b/qase-api-client/src/main/java/io/qase/client/api/RunsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/SearchApi.java b/qase-api-client/src/main/java/io/qase/client/api/SearchApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.SearchResponse;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/SharedStepsApi.java b/qase-api-client/src/main/java/io/qase/client/api/SharedStepsApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/api/SuitesApi.java b/qase-api-client/src/main/java/io/qase/client/api/SuitesApi.java
@@ -14,7 +14,6 @@
 package io.qase.client.api;
 
 import com.google.gson.reflect.TypeToken;
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.*;
 import io.qase.client.model.*;
 

diff --git a/qase-api-client/src/main/java/io/qase/client/auth/ApiKeyAuth.java b/qase-api-client/src/main/java/io/qase/client/auth/ApiKeyAuth.java
@@ -13,7 +13,6 @@
 
 package io.qase.client.auth;
 
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.Pair;
 
 import java.net.URI;
@@ -22,59 +21,59 @@
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2022-11-04T01:02:11.281898+03:00[Europe/Moscow]")
 public class ApiKeyAuth implements Authentication {
-  private final String location;
-  private final String paramName;
+    private final String location;
+    private final String paramName;
 
-  private String apiKey;
-  private String apiKeyPrefix;
+    private String apiKey;
+    private String apiKeyPrefix;
 
-  public ApiKeyAuth(String location, String paramName) {
-    this.location = location;
-    this.paramName = paramName;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getParamName() {
-    return paramName;
-  }
+    public ApiKeyAuth(String location, String paramName) {
+        this.location = location;
+        this.paramName = paramName;
+    }
 
-  public String getApiKey() {
-    return apiKey;
-  }
+    public String getLocation() {
+        return location;
+    }
 
-  public void setApiKey(String apiKey) {
-    this.apiKey = apiKey;
-  }
+    public String getParamName() {
+        return paramName;
+    }
 
-  public String getApiKeyPrefix() {
-    return apiKeyPrefix;
-  }
+    public String getApiKey() {
+        return apiKey;
+    }
 
-  public void setApiKeyPrefix(String apiKeyPrefix) {
-    this.apiKeyPrefix = apiKeyPrefix;
-  }
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
 
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
-                           String payload, String method, URI uri) throws QaseException {
-    if (apiKey == null) {
-      return;
+    public String getApiKeyPrefix() {
+        return apiKeyPrefix;
     }
-    String value;
-    if (apiKeyPrefix != null) {
-      value = apiKeyPrefix + " " + apiKey;
-    } else {
-      value = apiKey;
+
+    public void setApiKeyPrefix(String apiKeyPrefix) {
+        this.apiKeyPrefix = apiKeyPrefix;
     }
-    if ("query".equals(location)) {
-      queryParams.add(new Pair(paramName, value));
-    } else if ("header".equals(location)) {
-      headerParams.put(paramName, value);
-    } else if ("cookie".equals(location)) {
-      cookieParams.put(paramName, value);
+
+    @Override
+    public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
+                              String payload, String method, URI uri) {
+        if (apiKey == null) {
+            return;
+        }
+        String value;
+        if (apiKeyPrefix != null) {
+            value = apiKeyPrefix + " " + apiKey;
+        } else {
+            value = apiKey;
+        }
+        if ("query".equals(location)) {
+            queryParams.add(new Pair(paramName, value));
+        } else if ("header".equals(location)) {
+            headerParams.put(paramName, value);
+        } else if ("cookie".equals(location)) {
+            cookieParams.put(paramName, value);
+        }
     }
-  }
 }
diff --git a/qase-api-client/src/main/java/io/qase/client/auth/Authentication.java b/qase-api-client/src/main/java/io/qase/client/auth/Authentication.java
@@ -13,8 +13,8 @@
 
 package io.qase.client.auth;
 
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.Pair;
+import io.qase.client.QaseException;
 
 import java.net.URI;
 import java.util.List;

diff --git a/qase-api-client/src/main/java/io/qase/client/auth/HttpBasicAuth.java b/qase-api-client/src/main/java/io/qase/client/auth/HttpBasicAuth.java
@@ -13,7 +13,6 @@
 
 package io.qase.client.auth;
 
-import io.qase.api.exceptions.QaseException;
 import io.qase.client.Pair;
 import okhttp3.Credentials;
 
@@ -43,7 +42,7 @@ public void setPassword(String password) {
 
     @Override
     public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
-                              String payload, String method, URI uri) throws QaseException {
+                              String payload, String method, URI uri) {
         if (username == null && password == null) {
             return;
         }