Merge branch 'main' into mdwairi/add-sdk-exemplar

Author: mohnoor94

.github/workflows/build-and-test.yaml

@@ -0,0 +1,22 @@
+name: Build and Test
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Build and Test
+        run: ./gradlew clean build

.github/workflows/manual-release.yml

@@ -0,0 +1,50 @@
+name: Manual Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      module:
+        description: 'Select the module to release'
+        required: true
+        type: choice
+        options:
+          - expediagroup-sdk-core
+          - expediagroup-sdk-graphql
+          - expediagroup-sdk-rest
+          - expediagroup-sdk-transport-okhttp
+          - expediagroup-sdk-openapi-plugin
+
+permissions:
+  contents: write
+
+jobs:
+  get-version-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Build and Test
+        run: ./gradlew clean build
+
+      - name: Publish ${{ inputs.module }}
+        env:
+          GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
+          GPG_SECRET: ${{ secrets.GPG_PRIVATE_KEY }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        run: |
+          echo "Publishing ${{ inputs.module }}
+          ./gradlew :${{ inputs.module }}:publishToSonatype closeAndReleaseSonatypeStagingRepository
+
+      - name: Publish Summary
+        run: |
+          echo "✅ Successfully published ${{ inputs.module }} to Maven Central" >> $GITHUB_STEP_SUMMARY

.github/workflows/publish.yml

@@ -29,6 +29,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     testImplementation 'io.mockk:mockk:1.14.5'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'

.github/workflows/release-please.yml

@@ -1,6 +1,4 @@
 ARTIFACT_NAME=expediagroup-sdk-core
 DESCRIPTION=Core library supporting various EG SDKs
 
-# x-release-please-start-version
-VERSION=1.0.0
-# x-release-please-end
+VERSION=0.0.10-alpha

.release-please-manifest.json

@@ -27,6 +27,7 @@ dependencies {
     testImplementation platform('org.junit:junit-bom:5.13.3')
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
     testImplementation 'io.mockk:mockk:1.14.5'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
@@ -76,7 +77,7 @@ kover {
                     bound {
                         aggregationForGroup = AggregationType.COVERED_PERCENTAGE
                         coverageUnits = CoverageUnit.BRANCH
-                        minValue = 92
+                        minValue = 83
                     }
                 }
             }

expediagroup-sdk-core/build.gradle

@@ -1,6 +1,4 @@
 ARTIFACT_NAME=expediagroup-sdk-graphql
 DESCRIPTION=Extension package for GraphQL APIs support
 
-# x-release-please-start-version
-VERSION=1.0.0
-# x-release-please-end
+VERSION=0.0.8-alpha

expediagroup-sdk-core/gradle.properties

@@ -20,9 +20,11 @@ import com.apollographql.apollo.api.ApolloResponse
 import com.apollographql.apollo.api.Error
 import com.apollographql.apollo.api.Operation
 import com.apollographql.apollo.api.composeJsonRequest
+import com.apollographql.apollo.api.http.HttpHeader
 import com.apollographql.apollo.api.json.buildJsonString
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseResponse
+import com.apollographql.apollo.exception.ApolloHttpException
 import com.expediagroup.sdk.core.http.CommonMediaTypes
 import com.expediagroup.sdk.core.http.Method
 import com.expediagroup.sdk.core.http.Request
@@ -52,6 +54,18 @@ fun <D : Operation.Data> Operation<D>.toSDKRequest(url: String): Request {
 }
 
 fun <D : Operation.Data> Response.toApolloResponse(operation: Operation<D>): ApolloResponse<D> {
+    if (status.code != 200) {
+        return ApolloResponse.Builder(operation, request.id)
+            .exception(
+                ApolloHttpException(
+                    statusCode = status.code,
+                    headers = headers.entries().map { HttpHeader(it.key, it.value.toString()) },
+                    message = "Received non 200 response from the GraphQL server",
+                    body = this.body?.source()?.buffer
+                )
+            ).build()
+    }
+
     val apolloResponse =
         this.body?.let {
             val jsonReader = it.source().buffer.jsonReader()