diff --git a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/artifacts/GcsStorageService.java b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/artifacts/GcsStorageService.java index 78d76094da8..b8075a69087 100644 --- a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/artifacts/GcsStorageService.java +++ b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/artifacts/GcsStorageService.java @@ -20,7 +20,7 @@ import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.storage.Storage; import com.google.api.services.storage.StorageScopes; import com.google.api.services.storage.model.Objects; @@ -56,7 +56,7 @@ public static class Factory { public Factory(String applicationName) throws IOException, GeneralSecurityException { applicationName_ = applicationName; transport_ = GoogleNetHttpTransport.newTrustedTransport(); - jsonFactory_ = JacksonFactory.getDefaultInstance(); + jsonFactory_ = GsonFactory.getDefaultInstance(); } public Factory(String applicationName, HttpTransport transport, JsonFactory jsonFactory) { diff --git a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/security/AppengineCredentials.java b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/security/AppengineCredentials.java index 3bb1a36a35d..accc70eee11 100644 --- a/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/security/AppengineCredentials.java +++ b/clouddriver-appengine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/security/AppengineCredentials.java @@ -19,7 +19,7 @@ import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.appengine.v1.Appengine; import com.google.auth.http.HttpCredentialsAdapter; import com.google.auth.oauth2.GoogleCredentials; @@ -35,7 +35,7 @@ public AppengineCredentials(String project) { public Appengine getAppengine(String applicationName) { HttpTransport httpTransport = buildHttpTransport(); - JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); + JsonFactory jsonFactory = GsonFactory.getDefaultInstance(); GoogleCredentials credentials = getCredentials(); HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials); diff --git a/clouddriver-artifacts/src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java b/clouddriver-artifacts/src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java index d7b804ec0ba..9c938110be3 100644 --- a/clouddriver-artifacts/src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java +++ b/clouddriver-artifacts/src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java @@ -22,7 +22,7 @@ import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.storage.Storage; import com.google.api.services.storage.StorageScopes; import com.google.auth.http.HttpCredentialsAdapter; @@ -52,7 +52,7 @@ public class GcsArtifactCredentials implements ArtifactCredentials { GcsArtifactCredentials(String applicationName, GcsArtifactAccount account) throws IOException, GeneralSecurityException { HttpTransport transport = GoogleNetHttpTransport.newTrustedTransport(); - JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); + JsonFactory jsonFactory = GsonFactory.getDefaultInstance(); Optional credentialsPath = account.getJsonPath(); GoogleCredentials credentials; diff --git a/clouddriver-cloudrun/src/main/java/com/netflix/spinnaker/clouddriver/cloudrun/security/CloudrunCredentials.java b/clouddriver-cloudrun/src/main/java/com/netflix/spinnaker/clouddriver/cloudrun/security/CloudrunCredentials.java index 60b1f53d35f..4854ef221b2 100644 --- a/clouddriver-cloudrun/src/main/java/com/netflix/spinnaker/clouddriver/cloudrun/security/CloudrunCredentials.java +++ b/clouddriver-cloudrun/src/main/java/com/netflix/spinnaker/clouddriver/cloudrun/security/CloudrunCredentials.java @@ -19,7 +19,7 @@ import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.run.v1.CloudRun; import com.google.auth.http.HttpCredentialsAdapter; import com.google.auth.oauth2.GoogleCredentials; @@ -35,7 +35,7 @@ public CloudrunCredentials(String project) { public CloudRun getCloudrun(String applicationName) { HttpTransport httpTransport = buildHttpTransport(); - JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); + JsonFactory jsonFactory = GsonFactory.getDefaultInstance(); GoogleCredentials credentials = getCredentials().createScoped("https://www.googleapis.com/auth/cloud-platform"); HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(credentials); diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy index 326935f6109..ac01d1fe2f4 100644 --- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy +++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy @@ -24,7 +24,7 @@ import com.google.api.client.http.GenericUrl import com.google.api.client.http.HttpHeaders import com.google.api.client.http.HttpResponse import com.google.api.client.json.JsonObjectParser -import com.google.api.client.json.jackson2.JacksonFactory +import com.google.api.client.json.gson.GsonFactory import com.google.api.services.compute.Compute import com.google.api.services.compute.model.* import com.netflix.spinnaker.cats.cache.Cache @@ -142,7 +142,7 @@ class GCEUtil { { return compute.getRequestFactory() .buildGetRequest(new GenericUrl(reference)) - .setParser(new JsonObjectParser(JacksonFactory.getDefaultInstance())) + .setParser(new JsonObjectParser(GsonFactory.getDefaultInstance())) .execute() }, "gce/image", diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/security/GoogleCredentials.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/security/GoogleCredentials.groovy index a3e25d16338..02a4cc02c7a 100644 --- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/security/GoogleCredentials.groovy +++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/security/GoogleCredentials.groovy @@ -18,7 +18,7 @@ package com.netflix.spinnaker.clouddriver.google.security import com.google.api.client.http.HttpTransport import com.google.api.client.json.JsonFactory -import com.google.api.client.json.jackson2.JacksonFactory +import com.google.api.client.json.gson.GsonFactory import com.google.api.services.compute.Compute import com.netflix.spinnaker.clouddriver.google.ComputeVersion import com.netflix.spinnaker.clouddriver.googlecommon.security.GoogleCommonCredentials @@ -33,7 +33,7 @@ public class GoogleCredentials extends GoogleCommonCredentials { Compute getCompute(String applicationName) { HttpTransport httpTransport = buildHttpTransport() - JsonFactory jsonFactory = JacksonFactory.getDefaultInstance() + JsonFactory jsonFactory = GsonFactory.getDefaultInstance() def credentials = getCredentials() def reqInit = setHttpTimeout(credentials) diff --git a/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupController.java b/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupController.java index 8ee2679e55e..76ef4fd37c6 100644 --- a/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupController.java +++ b/clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/controllers/GoogleNamedImageLookupController.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.compute.model.Image; import com.google.common.annotations.VisibleForTesting; import com.netflix.spinnaker.cats.cache.Cache; @@ -55,7 +55,7 @@ public class GoogleNamedImageLookupController { private final Cache cacheView; - private final JacksonFactory jsonMapper = new JacksonFactory(); + private final GsonFactory jsonMapper = new GsonFactory(); private final ObjectMapper objectMapper = new ObjectMapper().configure(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS, true); diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchComputeRequestImplTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchComputeRequestImplTest.java index 77e7d13d714..5a59b33a1ad 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchComputeRequestImplTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchComputeRequestImplTest.java @@ -26,7 +26,7 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.http.LowLevelHttpRequest; import com.google.api.client.http.LowLevelHttpResponse; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.api.services.compute.Compute; import com.google.api.services.compute.Compute.Images.Get; @@ -341,9 +341,7 @@ private interface ResponseSupplier { private static Compute computeWithResponses(ResponseSupplier... responses) { return new Compute( - responses(responses), - JacksonFactory.getDefaultInstance(), - /* httpRequestInitializer= */ null); + responses(responses), GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); } private static HttpTransport responses(ResponseSupplier... responses) { diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchPaginatedComputeRequestImplTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchPaginatedComputeRequestImplTest.java index 2874c4646e8..c0513b59ea0 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchPaginatedComputeRequestImplTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/BatchPaginatedComputeRequestImplTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.mock; import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.compute.Compute; import com.google.api.services.compute.model.Image; import com.google.api.services.compute.model.ImageList; @@ -96,7 +96,7 @@ void exception() { pageToken -> FakeGoogleComputeRequest.createWithException( GoogleJsonResponseExceptionFactoryTesting.newMock( - JacksonFactory.getDefaultInstance(), 500, "bad news"), + GsonFactory.getDefaultInstance(), 500, "bad news"), mock(Compute.Images.List.class)), ImageList::getNextPageToken, ImageList::getItems)); diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/GetFirstBatchComputeRequestTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/GetFirstBatchComputeRequestTest.java index b5a826cd20d..0dee0cbc684 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/GetFirstBatchComputeRequestTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/GetFirstBatchComputeRequestTest.java @@ -21,7 +21,7 @@ import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting; import com.google.api.client.http.HttpResponseException; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.compute.Compute; import com.google.api.services.compute.model.Image; import java.io.IOException; @@ -69,7 +69,7 @@ void notFound() throws IOException { GetFirstBatchComputeRequest.create(new FakeBatchComputeRequest<>()); HttpResponseException notFoundException = GoogleJsonResponseExceptionFactoryTesting.newMock( - JacksonFactory.getDefaultInstance(), 404, "not found"); + GsonFactory.getDefaultInstance(), 404, "not found"); batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException)); batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException)); batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException)); @@ -87,10 +87,10 @@ void error() throws IOException { GetFirstBatchComputeRequest.create(new FakeBatchComputeRequest<>()); HttpResponseException notFoundException = GoogleJsonResponseExceptionFactoryTesting.newMock( - JacksonFactory.getDefaultInstance(), 404, "not found"); + GsonFactory.getDefaultInstance(), 404, "not found"); HttpResponseException actualError = GoogleJsonResponseExceptionFactoryTesting.newMock( - JacksonFactory.getDefaultInstance(), 500, "bad news"); + GsonFactory.getDefaultInstance(), 500, "bad news"); batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException)); batchRequest.queue(FakeGoogleComputeRequest.createWithException(notFoundException)); batchRequest.queue(FakeGoogleComputeRequest.createWithException(actualError)); diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ImagesTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ImagesTest.java index c55e49396ab..d852bebc2cf 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ImagesTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ImagesTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException; import com.google.api.client.http.HttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.api.services.compute.Compute; import com.google.api.services.compute.model.Image; @@ -130,7 +130,7 @@ private static Images createImages(HttpTransport transport) { private static Images createImages(HttpTransport transport, Registry registry) { Compute compute = new Compute( - transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); + transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); GoogleNamedAccountCredentials credentials = new GoogleNamedAccountCredentials.Builder() .name("plumpy") diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/InstanceTemplatesTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/InstanceTemplatesTest.java index 482bc6ffc66..1f1550737ec 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/InstanceTemplatesTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/InstanceTemplatesTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException; import com.google.api.client.http.HttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.testing.http.MockHttpTransport; import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.api.services.compute.Compute; @@ -198,7 +198,7 @@ private static InstanceTemplates createInstanceTemplates( HttpTransport transport, Registry registry) { Compute compute = new Compute( - transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); + transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); GoogleNamedAccountCredentials credentials = new GoogleNamedAccountCredentials.Builder() .name("spin-user") diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/RegionGoogleServerGroupManagersTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/RegionGoogleServerGroupManagersTest.java index 35bc592c985..cb81a9e0657 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/RegionGoogleServerGroupManagersTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/RegionGoogleServerGroupManagersTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException; import com.google.api.client.http.HttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.testing.http.MockHttpTransport; import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.api.services.compute.Compute; @@ -246,7 +246,7 @@ private static RegionGoogleServerGroupManagers createManagers( HttpTransport transport, Registry registry) { Compute compute = new Compute( - transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); + transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); GoogleNamedAccountCredentials credentials = new GoogleNamedAccountCredentials.Builder() .name("spin-user") diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ZoneGoogleServerGroupManagersTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ZoneGoogleServerGroupManagersTest.java index e227997dc29..0b4ccc72b38 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ZoneGoogleServerGroupManagersTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/compute/ZoneGoogleServerGroupManagersTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException; import com.google.api.client.http.HttpTransport; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.testing.http.MockHttpTransport; import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.api.services.compute.Compute; @@ -246,7 +246,7 @@ private static ZoneGoogleServerGroupManagers createManagers( HttpTransport transport, Registry registry) { Compute compute = new Compute( - transport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); + transport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); GoogleNamedAccountCredentials credentials = new GoogleNamedAccountCredentials.Builder() .name("spin-user") diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtilSpec.groovy b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtilSpec.groovy index a01dc151139..d5b87bccc3e 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtilSpec.groovy +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtilSpec.groovy @@ -22,7 +22,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy import com.google.api.client.http.HttpRequest import com.google.api.client.http.HttpRequestFactory import com.google.api.client.http.HttpResponse - import com.google.api.client.json.jackson2.JacksonFactory + import com.google.api.client.json.gson.GsonFactory import com.google.api.services.compute.Compute import com.google.api.services.compute.model.* import com.netflix.spectator.api.DefaultRegistry @@ -88,7 +88,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy def executorMock = Mock(GoogleExecutorTraits) def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def compute = new Compute.Builder( @@ -124,7 +124,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy def executorMock = Mock(GoogleExecutorTraits) def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def compute = new Compute.Builder( @@ -157,7 +157,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy def executorMock = Mock(GoogleExecutorTraits) def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def compute = new Compute.Builder( diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/CreateGoogleInstanceAtomicOperationUnitSpec.groovy b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/CreateGoogleInstanceAtomicOperationUnitSpec.groovy index 6284abd6276..a521e67f875 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/CreateGoogleInstanceAtomicOperationUnitSpec.groovy +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/CreateGoogleInstanceAtomicOperationUnitSpec.groovy @@ -20,7 +20,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleCredential import com.google.api.client.googleapis.batch.BatchRequest import com.google.api.client.googleapis.batch.json.JsonBatchCallback import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport -import com.google.api.client.json.jackson2.JacksonFactory +import com.google.api.client.json.gson.GsonFactory import com.google.api.services.compute.Compute import com.google.api.services.compute.model.Image import com.google.api.services.compute.model.ImageList @@ -69,7 +69,7 @@ class CreateGoogleInstanceAtomicOperationUnitSpec extends Specification implemen def instancesInsertMock = Mock(Compute.Instances.Insert) def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def images = new Compute.Builder( @@ -167,7 +167,7 @@ class CreateGoogleInstanceAtomicOperationUnitSpec extends Specification implemen def listMock = new MockFor(Compute.Images.List) def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def images = new Compute.Builder( diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/StatefullyUpdateBootImageAtomicOperationTest.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/StatefullyUpdateBootImageAtomicOperationTest.java index cda062072cb..a6db9786b00 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/StatefullyUpdateBootImageAtomicOperationTest.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/StatefullyUpdateBootImageAtomicOperationTest.java @@ -26,7 +26,7 @@ import com.google.api.client.googleapis.testing.json.GoogleJsonResponseExceptionFactoryTesting; import com.google.api.client.http.HttpStatusCodes; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.compute.Compute; import com.google.api.services.compute.Compute.InstanceTemplates.Delete; import com.google.api.services.compute.Compute.InstanceTemplates.Insert; @@ -239,9 +239,7 @@ private static FakeGoogleComputeRequest status404() throws IOException { return FakeGoogleComputeRequest.createWithException( GoogleJsonResponseExceptionFactoryTesting.newMock( - JacksonFactory.getDefaultInstance(), - HttpStatusCodes.STATUS_CODE_NOT_FOUND, - "not found")); + GsonFactory.getDefaultInstance(), HttpStatusCodes.STATUS_CODE_NOT_FOUND, "not found")); } private static InstanceTemplate baseInstanceTemplate() { diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/UpsertGoogleImageTagsAtomicOperationUnitSpec.groovy b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/UpsertGoogleImageTagsAtomicOperationUnitSpec.groovy index 4a3358fe04e..3dc131282cf 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/UpsertGoogleImageTagsAtomicOperationUnitSpec.groovy +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/UpsertGoogleImageTagsAtomicOperationUnitSpec.groovy @@ -19,7 +19,7 @@ package com.netflix.spinnaker.clouddriver.google.deploy.ops import com.google.api.client.googleapis.auth.oauth2.GoogleCredential import com.google.api.client.googleapis.batch.json.JsonBatchCallback import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport -import com.google.api.client.json.jackson2.JacksonFactory +import com.google.api.client.json.gson.GsonFactory import com.google.api.services.compute.Compute import com.google.api.services.compute.model.Image import com.google.api.services.compute.model.ImageList @@ -63,7 +63,7 @@ class UpsertGoogleImageTagsAtomicOperationUnitSpec extends Specification impleme def globalSetLabelsRequest def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def images = new Compute.Builder( @@ -133,7 +133,7 @@ class UpsertGoogleImageTagsAtomicOperationUnitSpec extends Specification impleme def globalSetLabelsRequest def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def images = new Compute.Builder( @@ -199,7 +199,7 @@ class UpsertGoogleImageTagsAtomicOperationUnitSpec extends Specification impleme def listMock = new MockFor(Compute.Images.List) def httpTransport = GoogleNetHttpTransport.newTrustedTransport() - def jsonFactory = JacksonFactory.defaultInstance + def jsonFactory = GsonFactory.defaultInstance def httpRequestInitializer = new GoogleCredential.Builder().setTransport(httpTransport).setJsonFactory(jsonFactory).build() def images = new Compute.Builder( diff --git a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/StubComputeFactory.java b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/StubComputeFactory.java index e61166f14bc..3cb1fdae1d2 100644 --- a/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/StubComputeFactory.java +++ b/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/StubComputeFactory.java @@ -28,7 +28,7 @@ import com.google.api.client.http.LowLevelHttpRequest; import com.google.api.client.json.GenericJson; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.testing.http.MockLowLevelHttpRequest; import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.api.services.compute.Compute; @@ -58,7 +58,7 @@ // providing simpler methods like setInstances() and using it more like a stub seems easier. final class StubComputeFactory { - private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance(); + private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance(); private static final String COMPUTE_PATH_PREFIX = "/compute/[-.a-zA-Z0-9]+"; @@ -173,7 +173,7 @@ Compute create() { .addGetResponse(AGGREGATED_AUTOSCALERS_PATTERN, this::autoscalerAggregatedList) .addGetResponse(GET_PROJECT_PATTERN, this::project); return new Compute( - httpTransport, JacksonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); + httpTransport, GsonFactory.getDefaultInstance(), /* httpRequestInitializer= */ null); } private MockLowLevelHttpResponse getInstanceGroupManager(MockLowLevelHttpRequest request) { diff --git a/gradle.properties b/gradle.properties index 22d3e74c150..5df4f808bf4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -korkVersion=7.239.0 +korkVersion=7.240.0 fiatVersion=1.50.0 org.gradle.parallel=true spinnakerGradleVersion=8.32.1