Skip to content

Commit

Permalink
Merge branch '32-attach-utm-parameters-to-all-requests-2' into 'master'
Browse files Browse the repository at this point in the history 
Resolve "Attach Utm Parameters to all requests"

Closes #32

See merge request pace/mobile/android/pace-cloud-sdk!32
  • Loading branch information
Martin Dinh committed Jan 21, 2021
2 parents 6905c6c + 00e1fbf commit 5bd67a7
Show file tree
Hide file tree
Showing 40 changed files with 108 additions and 497 deletions.
1 change: 1 addition & 0 deletions library/src/main/java/cloud/pace/sdk/PACECloudSDK.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ object PACECloudSDK : CloudSDKKoinComponent {

private val sharedPreferencesModel: SharedPreferencesModel by inject()
internal lateinit var configuration: Configuration
var additionalQueryParams: Map<String, String> = mapOf()

/**
* Sets up [PACECloudSDK] with the passed [configuration].
Expand Down
14 changes: 2 additions & 12 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface DeduplicatePoiService {

Expand All @@ -28,20 +29,9 @@ interface DeduplicatePoiService {
): Call<Void>
}


private val service: DeduplicatePoiService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
14 changes: 2 additions & 12 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface MovePoiAtPositionService {

Expand All @@ -28,20 +29,9 @@ interface MovePoiAtPositionService {
): Call<Void>
}


private val service: MovePoiAtPositionService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
16 changes: 2 additions & 14 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface CheckForPaceAppService {

Expand All @@ -38,22 +39,9 @@ Please note that calling this API is very cheap and can be done regularly.
): Call<LocationBasedAppsWithRefs>
}


private val service: CheckForPaceAppService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("Accept", "application/vnd.api+json")
.header("Content-Type", "application/vnd.api+json")
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
14 changes: 2 additions & 12 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface CreateAppService {

Expand All @@ -29,20 +30,9 @@ interface CreateAppService {
): Call<LocationBasedApp>
}


private val service: CreateAppService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
14 changes: 2 additions & 12 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface DeleteAppService {

Expand All @@ -30,20 +31,9 @@ interface DeleteAppService {
): Call<Void>
}


private val service: DeleteAppService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
16 changes: 2 additions & 14 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface GetAppService {

Expand All @@ -32,22 +33,9 @@ In case the query returns a `404` (`Not Found`) the app was deleted and should b
): Call<LocationBasedApp>
}


private val service: GetAppService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("Accept", "application/vnd.api+json")
.header("Content-Type", "application/vnd.api+json")
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
16 changes: 2 additions & 14 deletions ...src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface GetAppPOIsRelationshipsService {

Expand All @@ -30,22 +31,9 @@ interface GetAppPOIsRelationshipsService {
): Call<List<AppPOIsRelationships>>
}


private val service: GetAppPOIsRelationshipsService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("Accept", "application/vnd.api+json")
.header("Content-Type", "application/vnd.api+json")
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
14 changes: 2 additions & 12 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface GetAppRedirectService {

Expand All @@ -29,20 +30,9 @@ interface GetAppRedirectService {
): Call<Void>
}


private val service: GetAppRedirectService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor(null, null)).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
16 changes: 2 additions & 14 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface GetAppsService {

Expand All @@ -35,22 +36,9 @@ interface GetAppsService {
): Call<LocationBasedApps>
}


private val service: GetAppsService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("Accept", "application/vnd.api+json")
.header("Content-Type", "application/vnd.api+json")
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
16 changes: 2 additions & 14 deletions library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface UpdateAppService {

Expand All @@ -30,22 +31,9 @@ interface UpdateAppService {
): Call<LocationBasedApp>
}


private val service: UpdateAppService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("Accept", "application/vnd.api+json")
.header("Content-Type", "application/vnd.api+json")
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
16 changes: 2 additions & 14 deletions .../main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface UpdateAppPOIsRelationshipsService {

Expand All @@ -30,22 +31,9 @@ interface UpdateAppPOIsRelationshipsService {
): Call<List<AppPOIsRelationships>>
}


private val service: UpdateAppPOIsRelationshipsService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("Accept", "application/vnd.api+json")
.header("Content-Type", "application/vnd.api+json")
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.api+json", "application/vnd.api+json")).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
16 changes: 2 additions & 14 deletions ...y/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import retrofit2.http.*
import java.util.*
import cloud.pace.sdk.api.API.toIso8601
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import cloud.pace.sdk.poikit.utils.InterceptorUtils

interface GetDuplicatesKMLService {

Expand All @@ -30,22 +31,9 @@ interface GetDuplicatesKMLService {
): Call<Void>
}


private val service: GetDuplicatesKMLService by lazy {
Retrofit.Builder()
.client(OkHttpClient.Builder().addInterceptor {
val builder = it.request()
.newBuilder()
.header("Accept", "application/vnd.google-earth.kml+xml")
.header("Content-Type", "application/vnd.google-earth.kml+xml")
.header("API-Key", API.apiKey)

API.additionalHeaders.forEach { header ->
builder.header(header.key, header.value)
}

it.proceed(builder.build())
}.build())
.client(OkHttpClient.Builder().addInterceptor(InterceptorUtils.getInterceptor("application/vnd.google-earth.kml+xml", "application/vnd.google-earth.kml+xml")).build())
.baseUrl(API.baseUrl)
.addConverterFactory(
JsonApiConverterFactory.create(
Expand Down
Loading

0 comments on commit 5bd67a7

Please sign in to comment.