Merge branch 'main' into simhuang/add-hotel-id-search-examples

Author: Simon-Wong-hjz

.github/workflows/generate-and-publish-sdk-sources.yaml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   generate-and-publish-sources:
-    uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-full-workflow.yaml@v20241013
+    uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-full-workflow.yaml@v20241126
     secrets: inherit
     with:
       name: xap

.github/workflows/integration-test.yaml

@@ -0,0 +1,65 @@
+name: Integration Test
+
+on:
+  workflow_call:
+    inputs:
+      jdk:
+        description: 'JDK version to use'
+        required: true
+        type: string
+      distribution:
+        description: 'JDK distribution to use'
+        required: false
+        type: string
+        default: 'corretto'
+      branch:
+        description: 'Branch to build SDK and run integration tests from'
+        required: true
+        type: string
+
+jobs:
+  integration-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          repository: 'ExpediaGroup/xap-java-sdk'
+          ref: ${{ inputs.branch }}
+          path: sdk-repo
+
+      - name: Parse SDK version
+        id: parse-sdk-version
+        working-directory: sdk-repo/code
+        shell: python -u {0}
+        run: |
+          import os
+          import xml.etree.ElementTree as ET
+
+          tree = ET.parse("pom.xml")
+          root = tree.getroot()
+          version = root.find("{*}version").text
+
+          with open(os.getenv("GITHUB_OUTPUT"), "a") as GITHUB_OUTPUT:
+            print(f"version={version}", file=GITHUB_OUTPUT)
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ inputs.jdk }}
+          distribution: ${{ inputs.distribution }}
+
+      - name: Install SDK
+        working-directory: sdk-repo/code
+        run: |
+          mvn clean install
+
+      - name: Run Integration Tests
+        working-directory: sdk-repo/integrations
+        run: |
+          mvn verify \
+            -Dcom.expediagroup.xapjavasdk.apikey="${{ secrets.API_KEY }}" \
+            -Dcom.expediagroup.xapjavasdk.apisecret="${{ secrets.API_SECRET }}" \
+            -Dcom.expediagroup.xapjavasdk.vrbokey="${{ secrets.VRBO_KEY }}" \
+            -Dcom.expediagroup.xapjavasdk.vrbosecret="${{ secrets.VRBO_SECRET }}" \
+            -Dxap-java-sdk.sdk.version="${{ steps.parse-sdk-version.outputs.version }}"

.github/workflows/pr-auto-approve.yaml

@@ -0,0 +1,16 @@
+name: Auto First Approval for Bot PRs
+on: pull_request
+
+jobs:
+  auto-first-approve:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
+    if: github.actor == 'dependabot[bot]' || github.actor == 'renovate[bot]'
+    steps:
+      - name: Provide first approval
+        uses: hmarr/auto-approve-action@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          review-message: "Renovate and Dependabot PRs are automatically approved. Still requires human review."

.github/workflows/release-sdk.yaml

@@ -22,7 +22,7 @@ jobs:
       jdk: ${{ matrix.jdk }}
 
   release-sdk:
-    uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-release-sdk.yaml@v20241013
+    uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-release-sdk.yaml@v20241126
     needs: [ run-examples ]
     secrets: inherit
     with:

README.md

@@ -16,6 +16,9 @@ and less on the technical details of the API.
 
 You can find code examples for multiple use cases in the [examples](examples) directory.
 
+### Integration Tests
+Integration tests are placed in the [integrations](integrations) directory.
+
 ---
 
 ## Support

code/LICENSE-HEADER.txt

@@ -0,0 +1,13 @@
+Copyright (C) 2022 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.

code/README.md

@@ -0,0 +1,14 @@
+# Welcome to the xap-sdk SDK!
+
+## Usage
+```xml
+<dependency>
+    <groupId>com.expediagroup</groupId>
+    <artifactId>xap-sdk</artifactId>
+    <version>1.0.0</version>
+</dependency>
+```
+
+## License
+
+This project is licensed under the Apache License v2.0 - see the [LICENSE](LICENSE) for details.