chore(dependencies): Reverting Spring Boot 2.2 upgrade (#648)

* chore(dependencies): Reverting Spring Boot 2.2 upgrade

Revert "chore(dependencies): Upgrade Spring Boot to 2.2.1 (#637)"
This reverts commit e2b1d7b

* chore(deps): Bump orca to v7.74.0.

Co-authored-by: Matt Duftler <duftler@google.com>

gradle.properties

@@ -1,8 +1,8 @@
 #Mon Jun 17 22:31:26 UTC 2019
-orcaVersion=7.56.1
+orcaVersion=7.74.0
 kotlinVersion=1.3.20
 enablePublishing=false
 spinnakerGradleVersion=7.0.1
 mathCommonsVersion=3.6.1
-keikoVersion=2.10.1
+keikoVersion=3.2.0
 org.gradle.parallel=true

kayenta-blobs/src/main/java/com/netflix/kayenta/blobs/storage/BlobsStorageService.java

@@ -80,7 +80,7 @@ public <T> T loadObject(String accountName, ObjectType objectType, String object
     }
 
     try {
-      return deserialize(blobItem, (TypeReference<T>) objectType.getTypeReference());
+      return deserialize(blobItem, objectType.getTypeReference());
     } catch (IOException | StorageException e) {
       throw new IllegalStateException("Unable to deserialize object (key: " + objectKey + ")", e);
     }
@@ -401,7 +401,7 @@ private String daoRoot(AzureNamedAccountCredentials credentials, String daoTypeN
     return credentials.getRootFolder() + '/' + daoTypeName;
   }
 
-  private <T> T deserialize(CloudBlockBlob blob, TypeReference<T> typeReference)
+  private <T> T deserialize(CloudBlockBlob blob, TypeReference typeReference)
       throws IOException, StorageException {
     String json = downloadText(blob);
     return kayentaObjectMapper.readValue(json, typeReference);

kayenta-core/src/main/java/com/netflix/kayenta/storage/ObjectType.java

@@ -41,7 +41,7 @@ public enum ObjectType {
       "standalone_canary_archive",
       "standalone_canary_archive.json");
 
-  @Getter final TypeReference<?> typeReference;
+  @Getter final TypeReference typeReference;
 
   @Getter final String group;
 

kayenta-gcs/src/main/java/com/netflix/kayenta/gcs/storage/GcsStorageService.java

@@ -139,7 +139,8 @@ public <T> T loadObject(String accountName, ObjectType objectType, String object
 
     try {
       StorageObject storageObject = storage.objects().get(bucketName, item.getName()).execute();
-      return deserialize(storage, storageObject, (TypeReference<T>) objectType.getTypeReference());
+
+      return deserialize(storage, storageObject, objectType.getTypeReference());
     } catch (IOException e) {
       if (e instanceof HttpResponseException) {
         HttpResponseException hre = (HttpResponseException) e;
@@ -188,7 +189,7 @@ private StorageObject resolveSingularItem(
     }
   }
 
-  private <T> T deserialize(Storage storage, StorageObject object, TypeReference<T> typeReference)
+  private <T> T deserialize(Storage storage, StorageObject object, TypeReference typeReference)
       throws IOException {
     ByteArrayOutputStream output = new java.io.ByteArrayOutputStream();
     Storage.Objects.Get getter = storage.objects().get(object.getBucket(), object.getName());

kayenta-objectstore-configbin/src/main/java/com/netflix/kayenta/configbin/storage/ConfigBinStorageService.java

@@ -98,7 +98,7 @@ public <T> T loadObject(String accountName, ObjectType objectType, String object
     }
 
     try {
-      return kayentaObjectMapper.readValue(json, (TypeReference<T>) objectType.getTypeReference());
+      return kayentaObjectMapper.readValue(json, objectType.getTypeReference());
     } catch (Throwable e) {
       log.error("Read failed on path {}: {}", objectKey, e);
       throw new IllegalStateException(e);
@@ -350,7 +350,7 @@ private Map<String, Object> metadataFor(ConfigBinNamedAccountCredentials credent
 
     CanaryConfig config;
     try {
-      config = kayentaObjectMapper.readValue(json, CanaryConfig.class);
+      config = kayentaObjectMapper.readValue(json, ObjectType.CANARY_CONFIG.getTypeReference());
     } catch (Throwable e) {
       log.error("Read failed on path {}: {}", id, e);
       throw new IllegalStateException(e);

kayenta-s3/src/main/java/com/netflix/kayenta/s3/storage/S3StorageService.java

@@ -127,7 +127,7 @@ public <T> T loadObject(String accountName, ObjectType objectType, String object
     try {
       S3Object s3Object = amazonS3.getObject(bucket, path);
 
-      return deserialize(s3Object, (TypeReference<T>) objectType.getTypeReference());
+      return deserialize(s3Object, objectType.getTypeReference());
     } catch (AmazonS3Exception e) {
       log.error("Failed to load {} {}: {}", objectType.getGroup(), objectKey, e.getStatusCode());
       if (e.getStatusCode() == 404) {
@@ -164,7 +164,7 @@ private String resolveSingularPath(
     }
   }
 
-  private <T> T deserialize(S3Object s3Object, TypeReference<T> typeReference) throws IOException {
+  private <T> T deserialize(S3Object s3Object, TypeReference typeReference) throws IOException {
     return objectMapper.readValue(s3Object.getObjectContent(), typeReference);
   }