fix: cleanups

Mohammad-Dwairi · Mohammad-Dwairi · commit 7d017a54474d · 2025-03-26T15:35:32.000+03:00
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -1,15 +1,9 @@
-plugins {
-    id("java")
-}
-
 group = project.property("GROUP_ID") as String
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    implementation(project(":xap-sdk"))
+    api(project(":xap-sdk"))
+
+    implementation("com.expediagroup:expediagroup-sdk-transport-okhttp:0.0.4-alpha")
 
     implementation("org.apache.logging.log4j:log4j-api:2.24.3")
     implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
diff --git a/examples/src/main/java/com/expediagroup/sdk/xap/examples/scenarios/XapScenario.java b/examples/src/main/java/com/expediagroup/sdk/xap/examples/scenarios/XapScenario.java
@@ -1,5 +1,6 @@
 package com.expediagroup.sdk.xap.examples.scenarios;
 
+import com.expediagroup.sdk.core.auth.basic.BasicCredentials;
 import com.expediagroup.sdk.xap.client.XapClient;
 
 /**
@@ -19,10 +20,15 @@ public interface XapScenario {
     default XapClient createClient() {
         String key = System.getProperty("com.expediagroup.xapjavasdk.apikey");
         String secret = System.getProperty("com.expediagroup.xapjavasdk.apisecret");
+
+        BasicCredentials credentials = new BasicCredentials(key, secret);
+
+        // Or enable OAuth by passing OAuthCredentials instead:
+        // OAuthCredentials credentials = new OAuthCredentials("api-key", "api-secret");
+
         return XapClient
-                .builder()
-                .key(key)
-                .secret(secret)
-                .build();
+            .builder()
+            .credentials(credentials)
+            .build();
     }
 }
diff --git a/examples/src/main/java/com/expediagroup/sdk/xap/examples/scenarios/lodging/VrboScenario.java b/examples/src/main/java/com/expediagroup/sdk/xap/examples/scenarios/lodging/VrboScenario.java
@@ -1,5 +1,7 @@
 package com.expediagroup.sdk.xap.examples.scenarios.lodging;
 
+import com.expediagroup.sdk.core.auth.basic.BasicCredentials;
+import com.expediagroup.sdk.core.auth.oauth.OAuthCredentials;
 import com.expediagroup.sdk.xap.client.XapClient;
 import com.expediagroup.sdk.xap.examples.scenarios.XapScenario;
 
@@ -18,11 +20,16 @@ public interface VrboScenario extends XapScenario {
     default XapClient createClient() {
         String key = System.getProperty("com.expediagroup.xapjavasdk.vrbokey");
         String secret = System.getProperty("com.expediagroup.xapjavasdk.vrbosecret");
+
+        BasicCredentials credentials = new BasicCredentials(key, secret);
+
+        // Or enable OAuth by passing OAuthCredentials instead:
+        // OAuthCredentials credentials = new OAuthCredentials("api-key", "api-secret");
+
         return XapClient
-                .builder()
-                .key(key)
-                .secret(secret)
-                .build();
+            .builder()
+            .credentials(credentials)
+            .build();
     }
 
 }
diff --git a/xap-sdk/build.gradle.kts b/xap-sdk/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 
 dependencies {
     api("com.expediagroup:expediagroup-sdk-rest:0.0.4-alpha-SNAPSHOT")
-    implementation("com.expediagroup:expediagroup-sdk-transport-okhttp:0.0.4-alpha")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")
     runtimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2")
diff --git a/xap-sdk/gradle.properties b/xap-sdk/gradle.properties
@@ -1,4 +1,4 @@
 ARTIFACT_NAME=xap-sdk
 DESCRIPTION=The Expedia API Platform (XAP) SDK
 
-VERSION=2.0.1-alpha-SNAPSHOT
+VERSION=2.0.0-beta
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/client/AsyncXapClient.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/client/AsyncXapClient.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.client
 
 import com.expediagroup.sdk.rest.AsyncRestClient
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/client/XapClient.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/client/XapClient.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.client
 
 import com.expediagroup.sdk.rest.RestClient
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/configuration/Constant.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/configuration/Constant.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.configuration
 
 internal object Constant {
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/configuration/XapClientConfiguration.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/configuration/XapClientConfiguration.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.configuration
 
 import com.expediagroup.sdk.core.auth.common.Credentials
@@ -35,6 +51,12 @@ abstract class ClientBuilder<T : RestClient> {
     private var credentials: Credentials? = null
     private var transport: Transport? = null
 
+    /**
+     * Sets the credentials used to authenticate with the API.
+     *
+     * @param credentials
+     * @return The builder instance.
+     */
     fun credentials(credentials: Credentials) = apply { this.credentials = credentials }
 
     /**
@@ -56,7 +78,7 @@ abstract class ClientBuilder<T : RestClient> {
      * Builds the configuration for the XAP client.
      *
      * @return The built [XapClientConfiguration] instance.
-     * @throws IllegalArgumentException If the key or secret is not provided.
+     * @throws IllegalArgumentException If the credentials type is unsupported
      */
     protected fun buildConfig(): XapClientConfiguration {
         require(credentials != null) {
@@ -79,6 +101,12 @@ abstract class AsyncClientBuilder<T : AsyncRestClient> {
     private var credentials: Credentials? = null
     private var asyncTransport: AsyncTransport? = null
 
+    /**
+     * Sets the credentials used to authenticate with the API.
+     *
+     * @param credentials
+     * @return The builder instance.
+     */
     fun credentials(credentials: Credentials) = apply { this.credentials = credentials }
 
     /**
@@ -100,7 +128,7 @@ abstract class AsyncClientBuilder<T : AsyncRestClient> {
      * Builds the configuration for the asynchronous XAP client.
      *
      * @return The built [AsyncXapClientConfiguration] instance.
-     * @throws IllegalArgumentException If the key or secret is not provided.
+     * @throws IllegalArgumentException If the credentials type is unsupported
      */
     protected fun buildConfig(): AsyncXapClientConfiguration {
         require(credentials != null) {
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/configuration/XapJacksonObjectMapper.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/configuration/XapJacksonObjectMapper.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.configuration
 
 import com.fasterxml.jackson.databind.DeserializationFeature
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/core/ApiKeyHeaderStep.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/core/ApiKeyHeaderStep.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.core
 
 import com.expediagroup.sdk.core.http.Request
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/core/AsyncRequestExecutor.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/core/AsyncRequestExecutor.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.core
 
 import com.expediagroup.sdk.core.auth.basic.BasicAuthManager
@@ -6,6 +22,7 @@ import com.expediagroup.sdk.core.auth.oauth.OAuthAsyncManager
 import com.expediagroup.sdk.core.auth.oauth.OAuthCredentials
 import com.expediagroup.sdk.core.exception.client.ExpediaGroupConfigurationException
 import com.expediagroup.sdk.core.logging.LoggerDecorator
+import com.expediagroup.sdk.core.logging.masking.MaskHeaders
 import com.expediagroup.sdk.core.pipeline.ExecutionPipeline
 import com.expediagroup.sdk.core.pipeline.RequestPipelineStep
 import com.expediagroup.sdk.core.pipeline.ResponsePipelineStep
@@ -27,6 +44,9 @@ import org.slf4j.LoggerFactory
 class AsyncRequestExecutor(
     private val configuration: AsyncXapClientConfiguration,
 ) : AbstractAsyncRequestExecutor(configuration.asyncTransport) {
+
+    private val headersMask = MaskHeaders(listOf("authorization"))
+
     override val executionPipeline =
         ExecutionPipeline(
             requestPipeline = getRequestPipeline(),
@@ -40,7 +60,10 @@ class AsyncRequestExecutor(
                     RequestHeadersStep(),
                     ApiKeyHeaderStep(configuration.credentials.username),
                     BasicAuthStep(BasicAuthManager(configuration.credentials)),
-                    RequestLoggingStep(logger),
+                    RequestLoggingStep(
+                        logger = logger,
+                        maskHeaders = headersMask
+                    ),
                 )
 
             is OAuthCredentials ->
@@ -54,7 +77,10 @@ class AsyncRequestExecutor(
                             authUrl = AUTH_ENDPOINT,
                         ),
                     ),
-                    RequestLoggingStep(logger),
+                    RequestLoggingStep(
+                        logger = logger,
+                        maskHeaders = headersMask
+                    ),
                 )
 
             else -> throw ExpediaGroupConfigurationException("Unsupported credentials type: ${configuration.credentials.javaClass.name}")
diff --git a/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/core/RequestExecutor.kt b/xap-sdk/src/main/kotlin/com/expediagroup/sdk/xap/core/RequestExecutor.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2025 Expedia, Inc.
+ *
+ * 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 com.expediagroup.sdk.xap.core
 
 import com.expediagroup.sdk.core.auth.basic.BasicAuthManager
@@ -6,6 +22,7 @@ import com.expediagroup.sdk.core.auth.oauth.OAuthCredentials
 import com.expediagroup.sdk.core.auth.oauth.OAuthManager
 import com.expediagroup.sdk.core.exception.client.ExpediaGroupConfigurationException
 import com.expediagroup.sdk.core.logging.LoggerDecorator
+import com.expediagroup.sdk.core.logging.masking.MaskHeaders
 import com.expediagroup.sdk.core.pipeline.ExecutionPipeline
 import com.expediagroup.sdk.core.pipeline.RequestPipelineStep
 import com.expediagroup.sdk.core.pipeline.ResponsePipelineStep
@@ -27,6 +44,9 @@ import org.slf4j.LoggerFactory
 class RequestExecutor(
     private val configuration: XapClientConfiguration,
 ) : AbstractRequestExecutor(configuration.transport) {
+
+    private val headersMask = MaskHeaders(listOf("authorization"))
+
     override val executionPipeline =
         ExecutionPipeline(
             requestPipeline = getRequestPipeline(),
@@ -40,7 +60,10 @@ class RequestExecutor(
                     RequestHeadersStep(),
                     ApiKeyHeaderStep(configuration.credentials.username),
                     BasicAuthStep(BasicAuthManager(configuration.credentials)),
-                    RequestLoggingStep(logger),
+                    RequestLoggingStep(
+                        logger = logger,
+                        maskHeaders = headersMask
+                    ),
                 )
 
             is OAuthCredentials ->
@@ -54,7 +77,10 @@ class RequestExecutor(
                             authUrl = AUTH_ENDPOINT,
                         ),
                     ),
-                    RequestLoggingStep(logger),
+                    RequestLoggingStep(
+                        logger = logger,
+                        maskHeaders = headersMask
+                    ),
                 )
 
             else -> throw ExpediaGroupConfigurationException("Unsupported credentials type: ${configuration.credentials.javaClass.name}")
diff --git a/xap-sdk/src/main/resources/simplelogger.properties b/xap-sdk/src/main/resources/simplelogger.properties
