feat: cleanup old core package (#110)

ExpediaGroup · Dec 1, 2024 · cedb0a9 · cedb0a9
1 parent e237320
commit cedb0a9
Show file tree

Hide file tree

Showing 117 changed files with 168 additions and 3,100 deletions.
diff --git a/code/build.gradle b/code/build.gradle
@@ -34,20 +34,14 @@ dependencies {
     implementation 'com.apollographql.adapters:apollo-adapters-core:0.0.4'
 
     /* Apollo Java */
-    implementation("com.apollographql.java:client:0.0.2")
+    implementation 'com.apollographql.java:client:0.0.2'
 
     /* EG SDK Core */
-    implementation("org.apache.tika:tika-core:2.9.2")
-    implementation("com.google.api-client:google-api-client:2.7.0")
-    implementation("com.ebay.ejmask:ejmask-api:1.0.3")
-    implementation("com.ebay.ejmask:ejmask-extensions:1.0.3")
-    implementation 'org.slf4j:slf4j-simple:2.0.13'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1'
-    implementation 'org.jetbrains.kotlinx:atomicfu-jvm:0.24.0'
+    implementation 'com.ebay.ejmask:ejmask-api:1.0.3'
+    implementation 'com.ebay.ejmask:ejmask-extensions:1.0.3'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.18.1'
-    implementation 'javax.validation:validation-api:2.0.1.Final'
-    implementation 'org.hibernate.validator:hibernate-validator:6.2.5.Final'
-    implementation 'jakarta.validation:jakarta.validation-api:2.0.2'
+    implementation 'org.slf4j:slf4j-api:2.0.16'
 }
 
 apply from: "tasks-gradle/apollo.gradle"

diff --git a/code/src/main/kotlin/com/expediagroup/sdk/core/apache/util/ApacheHttpTransportUtil.kt b/code/src/main/kotlin/com/expediagroup/sdk/core/apache/util/ApacheHttpTransportUtil.kt
diff --git a/...bearer/BearerAuthenticationInterceptor.kt → ...bearer/BearerAuthenticationInterceptor.kt b/...bearer/BearerAuthenticationInterceptor.kt → ...bearer/BearerAuthenticationInterceptor.kt
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package com.expediagroup.sdk.core2.authentication.bearer
+package com.expediagroup.sdk.core.authentication.bearer
 
+import com.expediagroup.sdk.core.authentication.common.Credentials
+import com.expediagroup.sdk.core.client.Transport
+import com.expediagroup.sdk.core.http.Request
+import com.expediagroup.sdk.core.http.Response
+import com.expediagroup.sdk.core.interceptor.Interceptor
 import com.expediagroup.sdk.core.model.exception.service.ExpediaGroupAuthException
-import com.expediagroup.sdk.core2.authentication.common.Credentials
-import com.expediagroup.sdk.core2.client.Transport
-import com.expediagroup.sdk.core2.http.Request
-import com.expediagroup.sdk.core2.http.Response
-import com.expediagroup.sdk.core2.interceptor.Interceptor
 import java.io.IOException
-import kotlin.jvm.Throws
 
 /**
  * An interceptor that handles bearer token-based authentication for HTTP requests.

diff --git a/...ion/bearer/BearerAuthenticationManager.kt → ...ion/bearer/BearerAuthenticationManager.kt b/...ion/bearer/BearerAuthenticationManager.kt → ...ion/bearer/BearerAuthenticationManager.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.expediagroup.sdk.core2.authentication.bearer
+package com.expediagroup.sdk.core.authentication.bearer
 
+import com.expediagroup.sdk.core.authentication.common.AuthenticationManager
+import com.expediagroup.sdk.core.authentication.common.Credentials
+import com.expediagroup.sdk.core.client.Transport
 import com.expediagroup.sdk.core.extension.getOrThrow
-import com.expediagroup.sdk.core.http.HttpStatus
+import com.expediagroup.sdk.core.http.ContentType
+import com.expediagroup.sdk.core.http.Request
+import com.expediagroup.sdk.core.http.RequestBody
+import com.expediagroup.sdk.core.http.Response
+import com.expediagroup.sdk.core.http.Status
 import com.expediagroup.sdk.core.model.exception.client.ExpediaGroupResponseParsingException
 import com.expediagroup.sdk.core.model.exception.service.ExpediaGroupAuthException
-import com.expediagroup.sdk.core2.authentication.common.AuthenticationManager
-import com.expediagroup.sdk.core2.authentication.common.Credentials
-import com.expediagroup.sdk.core2.client.Transport
-import com.expediagroup.sdk.core2.http.ContentType
-import com.expediagroup.sdk.core2.http.RequestBody
-import com.expediagroup.sdk.core2.http.Request
-import com.expediagroup.sdk.core2.http.Response
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
@@ -95,7 +95,7 @@ class BearerAuthenticationManager(
 
     private fun parseAuthenticationResponse(response: Response): TokenResponse {
         val responseBody = response.body.getOrThrow {
-            ExpediaGroupAuthException(HttpStatus.INTERNAL_SERVER_ERROR, "Authentication response body is empty")
+            ExpediaGroupAuthException(Status.INTERNAL_SERVER_ERROR, "Authentication response body is empty")
         }
 
         val responseString = responseBody.source().use {

diff --git a/...thentication/bearer/BearerTokenStorage.kt → ...thentication/bearer/BearerTokenStorage.kt b/...thentication/bearer/BearerTokenStorage.kt → ...thentication/bearer/BearerTokenStorage.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.expediagroup.sdk.core2.authentication.bearer
+package com.expediagroup.sdk.core.authentication.bearer
 
 import java.time.Clock
 import java.time.Instant

diff --git a/...e2/authentication/bearer/TokenResponse.kt → ...re/authentication/bearer/TokenResponse.kt b/...e2/authentication/bearer/TokenResponse.kt → ...re/authentication/bearer/TokenResponse.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.expediagroup.sdk.core2.authentication.bearer
+package com.expediagroup.sdk.core.authentication.bearer
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty

diff --git a/...ntication/common/AuthenticationManager.kt → ...ntication/common/AuthenticationManager.kt b/...ntication/common/AuthenticationManager.kt → ...ntication/common/AuthenticationManager.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.expediagroup.sdk.core2.authentication.common
+package com.expediagroup.sdk.core.authentication.common
 
 import com.expediagroup.sdk.core.model.exception.client.ExpediaGroupResponseParsingException
 import com.expediagroup.sdk.core.model.exception.service.ExpediaGroupAuthException

diff --git a/...ore2/authentication/common/Credentials.kt → ...core/authentication/common/Credentials.kt b/...ore2/authentication/common/Credentials.kt → ...core/authentication/common/Credentials.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.expediagroup.sdk.core2.authentication.common
+package com.expediagroup.sdk.core.authentication.common
 
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets.ISO_8859_1

diff --git a/...iagroup/sdk/core/authentication/extension/OAuth2CredentialsWithRefreshBuilderExtension.kt b/...iagroup/sdk/core/authentication/extension/OAuth2CredentialsWithRefreshBuilderExtension.kt
diff --git a/...c/main/kotlin/com/expediagroup/sdk/core/authentication/strategy/AuthenticationStrategy.kt b/...c/main/kotlin/com/expediagroup/sdk/core/authentication/strategy/AuthenticationStrategy.kt
diff --git a/...n/com/expediagroup/sdk/core/authentication/strategy/BearerAuthenticationHandlerFactory.kt b/...n/com/expediagroup/sdk/core/authentication/strategy/BearerAuthenticationHandlerFactory.kt