From cca223dbce84277137c476e6754d93d8fb7019b1 Mon Sep 17 00:00:00 2001 From: Mark Vulfson Date: Mon, 10 Aug 2020 14:30:45 -0700 Subject: [PATCH] fix(exceptions): Use kork's NotFoundException (#922) Follow up from https://github.com/spinnaker/kork/pull/737 where I added a generic 400 response exception handler for UserException. But `front50` needs to return an actual 404 (since callers, e.g. `orca` expect and handle it). Kork already has a generic 404 handler for NotFoundException --- .../front50/model/AzureStorageService.java | 2 +- .../front50/ApplicationPermissionsService.java | 2 +- .../front50/ServiceAccountsService.java | 2 +- .../front50/exception/NotFoundException.java | 16 ---------------- .../netflix/spinnaker/front50/model/ItemDAO.java | 2 +- .../spinnaker/front50/model/StorageService.java | 2 +- .../front50/model/StorageServiceSupport.java | 2 +- .../model/application/ApplicationDAO.java | 2 +- .../model/application/ApplicationService.java | 2 +- .../model/application/DefaultApplicationDAO.java | 2 +- .../notification/DefaultNotificationDAO.java | 2 +- .../model/pipeline/DefaultPipelineDAO.java | 2 +- .../pipeline/DefaultPipelineStrategyDAO.java | 2 +- .../front50/model/plugins/PluginInfoService.java | 2 +- .../plugins/PluginVersionPinningService.java | 2 +- .../front50/model/project/DefaultProjectDAO.java | 2 +- .../front50/model/project/ProjectDAO.java | 2 +- .../front50/ServiceAccountsServiceSpec.groovy | 2 +- .../application/ApplicationServiceSpec.groovy | 2 +- .../model/plugins/PluginInfoServiceSpec.groovy | 2 +- .../PluginVersionPinningServiceSpec.groovy | 2 +- .../spinnaker/front50/model/GcsStorageService.kt | 2 +- .../front50/model/TestGcsStorageService.kt | 2 +- .../front50/model/OracleStorageService.java | 2 +- .../front50/redis/RedisApplicationDAO.groovy | 2 +- .../front50/redis/RedisPipelineDAO.groovy | 2 +- .../redis/RedisPipelineStrategyDAO.groovy | 2 +- .../front50/redis/RedisPipelineTemplateDAO.java | 2 +- .../front50/redis/RedisProjectDAO.groovy | 2 +- .../front50/redis/RedisApplicationDAOSpec.groovy | 2 +- .../front50/redis/RedisPipelineDAOSpec.groovy | 2 +- .../redis/RedisPipelineStrategyDAOSpec.groovy | 2 +- .../front50/redis/RedisProjectDAOSpec.groovy | 2 +- .../front50/model/S3StorageService.java | 2 +- .../front50/model/CompositeStorageService.kt | 2 +- .../spinnaker/front50/model/SqlStorageService.kt | 2 +- .../model/CompositeStorageServiceTests.kt | 2 +- .../front50/model/SqlStorageServiceTests.kt | 2 +- .../front50/model/SwiftStorageService.java | 2 +- .../front50/controllers/DeliveryController.java | 2 +- .../controllers/NotificationController.java | 2 +- .../front50/controllers/PipelineController.java | 2 +- .../controllers/PipelineTemplateController.java | 2 +- .../controllers/ReorderPipelinesController.java | 2 +- .../front50/controllers/SnapshotsController.java | 2 +- .../V2PipelineTemplateController.java | 2 +- .../controllers/v2/ApplicationsController.java | 2 +- .../controllers/v2/EntityTagsController.java | 2 +- .../controllers/v2/ProjectsController.java | 2 +- .../v2/ApplicationsControllerTck.groovy | 2 +- .../controllers/v2/ProjectsControllerTck.groovy | 2 +- 51 files changed, 50 insertions(+), 66 deletions(-) delete mode 100644 front50-core/src/main/java/com/netflix/spinnaker/front50/exception/NotFoundException.java diff --git a/front50-azure/src/main/java/com/netflix/spinnaker/front50/model/AzureStorageService.java b/front50-azure/src/main/java/com/netflix/spinnaker/front50/model/AzureStorageService.java index 211343710..cac40cc18 100644 --- a/front50-azure/src/main/java/com/netflix/spinnaker/front50/model/AzureStorageService.java +++ b/front50-azure/src/main/java/com/netflix/spinnaker/front50/model/AzureStorageService.java @@ -24,7 +24,7 @@ import com.microsoft.azure.storage.ResultSegment; import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.*; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import com.netflix.spinnaker.security.AuthenticatedRequest; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/ApplicationPermissionsService.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/ApplicationPermissionsService.java index dbeec3bd9..2042af89a 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/ApplicationPermissionsService.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/ApplicationPermissionsService.java @@ -21,11 +21,11 @@ import com.netflix.spinnaker.front50.config.FiatConfigurationProperties; import com.netflix.spinnaker.front50.events.ApplicationPermissionEventListener; import com.netflix.spinnaker.front50.events.ApplicationPermissionEventListener.Type; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.application.Application.Permission; import com.netflix.spinnaker.front50.model.application.ApplicationDAO; import com.netflix.spinnaker.front50.model.application.ApplicationPermissionDAO; import com.netflix.spinnaker.kork.exceptions.SystemException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collection; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/ServiceAccountsService.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/ServiceAccountsService.java index ace44ffed..5af0c58e6 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/ServiceAccountsService.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/ServiceAccountsService.java @@ -21,9 +21,9 @@ import com.netflix.spinnaker.fiat.shared.FiatService; import com.netflix.spinnaker.front50.config.FiatConfigurationProperties; import com.netflix.spinnaker.front50.config.annotations.ConditionalOnAnyProviderExceptRedisIsEnabled; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.serviceaccount.ServiceAccount; import com.netflix.spinnaker.front50.model.serviceaccount.ServiceAccountDAO; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/exception/NotFoundException.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/exception/NotFoundException.java deleted file mode 100644 index cd0877238..000000000 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/exception/NotFoundException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.netflix.spinnaker.front50.exception; - -import com.netflix.spinnaker.kork.exceptions.UserException; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -@ResponseStatus(value = HttpStatus.NOT_FOUND) -public class NotFoundException extends UserException { - public NotFoundException(String message) { - super(message); - } - - public NotFoundException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/ItemDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/ItemDAO.java index 46eb2e5e9..55d8f780d 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/ItemDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/ItemDAO.java @@ -1,6 +1,6 @@ package com.netflix.spinnaker.front50.model; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.time.Duration; import java.util.Collection; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageService.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageService.java index dee198070..d2d2f9515 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageService.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageService.java @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.model; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.time.Duration; import java.util.Collection; import java.util.List; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageServiceSupport.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageServiceSupport.java index 7f311a159..445c60e33 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageServiceSupport.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/StorageServiceSupport.java @@ -21,7 +21,7 @@ import com.netflix.spectator.api.Counter; import com.netflix.spectator.api.Registry; import com.netflix.spectator.api.Timer; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import com.netflix.spinnaker.security.AuthenticatedRequest; import com.netflix.spinnaker.security.User; import io.github.resilience4j.circuitbreaker.CircuitBreaker; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationDAO.java index 38c47dde2..823d9e9d4 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationDAO.java @@ -18,9 +18,9 @@ import com.google.common.base.Strings; import com.netflix.spinnaker.front50.UntypedUtils; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.ItemDAO; import com.netflix.spinnaker.front50.model.SearchUtils; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.*; import java.util.stream.Collectors; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationService.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationService.java index 8b88d1a89..fa32b9a5f 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationService.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/ApplicationService.java @@ -22,7 +22,6 @@ import com.netflix.spinnaker.front50.ServiceAccountsService; import com.netflix.spinnaker.front50.events.ApplicationEventListener; import com.netflix.spinnaker.front50.events.ApplicationEventListener.ApplicationModelEvent; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exception.ValidationException; import com.netflix.spinnaker.front50.model.notification.HierarchicalLevel; import com.netflix.spinnaker.front50.model.notification.NotificationDAO; @@ -33,6 +32,7 @@ import com.netflix.spinnaker.front50.validator.ApplicationValidationErrors; import com.netflix.spinnaker.front50.validator.ApplicationValidator; import com.netflix.spinnaker.kork.annotations.NonnullByDefault; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.*; import java.util.stream.Collectors; import javax.annotation.Nullable; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/DefaultApplicationDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/DefaultApplicationDAO.java index 911e21090..7b204240c 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/DefaultApplicationDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/application/DefaultApplicationDAO.java @@ -17,11 +17,11 @@ package com.netflix.spinnaker.front50.model.application; import com.netflix.spectator.api.Registry; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.ObjectKeyLoader; import com.netflix.spinnaker.front50.model.ObjectType; import com.netflix.spinnaker.front50.model.StorageService; import com.netflix.spinnaker.front50.model.StorageServiceSupport; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; import java.util.Collection; import java.util.Map; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/notification/DefaultNotificationDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/notification/DefaultNotificationDAO.java index d42ebf54b..2416eb4da 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/notification/DefaultNotificationDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/notification/DefaultNotificationDAO.java @@ -17,11 +17,11 @@ package com.netflix.spinnaker.front50.model.notification; import com.netflix.spectator.api.Registry; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.ObjectKeyLoader; import com.netflix.spinnaker.front50.model.ObjectType; import com.netflix.spinnaker.front50.model.StorageService; import com.netflix.spinnaker.front50.model.StorageServiceSupport; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; import rx.Scheduler; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineDAO.java index 2a170ac13..e7060605b 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineDAO.java @@ -17,11 +17,11 @@ package com.netflix.spinnaker.front50.model.pipeline; import com.netflix.spectator.api.Registry; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.ObjectKeyLoader; import com.netflix.spinnaker.front50.model.ObjectType; import com.netflix.spinnaker.front50.model.StorageService; import com.netflix.spinnaker.front50.model.StorageServiceSupport; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; import java.util.Collection; import java.util.UUID; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineStrategyDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineStrategyDAO.java index d6fa87afd..57bf9fde7 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineStrategyDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/pipeline/DefaultPipelineStrategyDAO.java @@ -17,11 +17,11 @@ package com.netflix.spinnaker.front50.model.pipeline; import com.netflix.spectator.api.Registry; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.ObjectKeyLoader; import com.netflix.spinnaker.front50.model.ObjectType; import com.netflix.spinnaker.front50.model.StorageService; import com.netflix.spinnaker.front50.model.StorageServiceSupport; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; import java.util.Collection; import java.util.UUID; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginInfoService.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginInfoService.java index 917677854..28f3159a3 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginInfoService.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginInfoService.java @@ -17,12 +17,12 @@ import com.netflix.spinnaker.front50.config.annotations.ConditionalOnAnyProviderExceptRedisIsEnabled; import com.netflix.spinnaker.front50.echo.EchoService; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.plugins.PluginBinaryStorageService; import com.netflix.spinnaker.front50.validator.GenericValidationErrors; import com.netflix.spinnaker.front50.validator.PluginInfoValidator; import com.netflix.spinnaker.kork.exceptions.UserException; import com.netflix.spinnaker.kork.web.exceptions.InvalidRequestException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import com.netflix.spinnaker.security.AuthenticatedRequest; import java.time.Instant; import java.util.ArrayList; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningService.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningService.java index 34fedaacc..a1fd9e51b 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningService.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningService.java @@ -17,7 +17,7 @@ import static java.lang.String.format; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.HashMap; import java.util.Map; import org.slf4j.Logger; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/DefaultProjectDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/DefaultProjectDAO.java index 5c2572c36..fce7a3fdc 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/DefaultProjectDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/DefaultProjectDAO.java @@ -17,11 +17,11 @@ package com.netflix.spinnaker.front50.model.project; import com.netflix.spectator.api.Registry; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.ObjectKeyLoader; import com.netflix.spinnaker.front50.model.ObjectType; import com.netflix.spinnaker.front50.model.StorageService; import com.netflix.spinnaker.front50.model.StorageServiceSupport; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry; import java.util.UUID; import rx.Scheduler; diff --git a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/ProjectDAO.java b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/ProjectDAO.java index 6db2a27b1..5c2848f1c 100644 --- a/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/ProjectDAO.java +++ b/front50-core/src/main/java/com/netflix/spinnaker/front50/model/project/ProjectDAO.java @@ -1,7 +1,7 @@ package com.netflix.spinnaker.front50.model.project; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.ItemDAO; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.Collection; public interface ProjectDAO extends ItemDAO { diff --git a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/ServiceAccountsServiceSpec.groovy b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/ServiceAccountsServiceSpec.groovy index 1101e50c4..c5346d584 100644 --- a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/ServiceAccountsServiceSpec.groovy +++ b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/ServiceAccountsServiceSpec.groovy @@ -20,7 +20,7 @@ import com.netflix.spinnaker.fiat.shared.FiatClientConfigurationProperties import com.netflix.spinnaker.fiat.shared.FiatPermissionEvaluator import com.netflix.spinnaker.fiat.shared.FiatService import com.netflix.spinnaker.front50.config.FiatConfigurationProperties -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.serviceaccount.ServiceAccount import com.netflix.spinnaker.front50.model.serviceaccount.ServiceAccountDAO import org.springframework.security.core.Authentication diff --git a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/application/ApplicationServiceSpec.groovy b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/application/ApplicationServiceSpec.groovy index b1abbf343..baa6b619f 100644 --- a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/application/ApplicationServiceSpec.groovy +++ b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/application/ApplicationServiceSpec.groovy @@ -19,7 +19,7 @@ package com.netflix.spinnaker.front50.model.application import com.netflix.spinnaker.front50.ServiceAccountsService import com.netflix.spinnaker.front50.events.ApplicationEventListener -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.exception.ValidationException import com.netflix.spinnaker.front50.model.notification.HierarchicalLevel import com.netflix.spinnaker.front50.model.notification.NotificationDAO diff --git a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginInfoServiceSpec.groovy b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginInfoServiceSpec.groovy index 9c2607eca..888e460bb 100644 --- a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginInfoServiceSpec.groovy +++ b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginInfoServiceSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.model.plugins import com.netflix.spinnaker.front50.echo.EchoService -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.plugins.remote.RemoteExtension import com.netflix.spinnaker.front50.model.plugins.remote.stage.StageRemoteExtensionConfig import com.netflix.spinnaker.front50.plugins.PluginBinaryStorageService diff --git a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningServiceSpec.groovy b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningServiceSpec.groovy index ad77d1857..343ac8af5 100644 --- a/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningServiceSpec.groovy +++ b/front50-core/src/test/groovy/com/netflix/spinnaker/front50/model/plugins/PluginVersionPinningServiceSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.model.plugins -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import spock.lang.Specification import spock.lang.Subject diff --git a/front50-gcs/src/main/kotlin/com/netflix/spinnaker/front50/model/GcsStorageService.kt b/front50-gcs/src/main/kotlin/com/netflix/spinnaker/front50/model/GcsStorageService.kt index b254c7021..7ccf24a08 100644 --- a/front50-gcs/src/main/kotlin/com/netflix/spinnaker/front50/model/GcsStorageService.kt +++ b/front50-gcs/src/main/kotlin/com/netflix/spinnaker/front50/model/GcsStorageService.kt @@ -29,7 +29,7 @@ import com.google.cloud.storage.Storage.BucketGetOption import com.google.cloud.storage.StorageException import com.google.common.collect.ImmutableMap import com.google.common.util.concurrent.Futures -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import java.io.IOException import java.time.Duration import java.util.concurrent.ExecutorService diff --git a/front50-gcs/src/test/kotlin/com/netflix/spinnaker/front50/model/TestGcsStorageService.kt b/front50-gcs/src/test/kotlin/com/netflix/spinnaker/front50/model/TestGcsStorageService.kt index 197480d2a..d6f4ff7c2 100644 --- a/front50-gcs/src/test/kotlin/com/netflix/spinnaker/front50/model/TestGcsStorageService.kt +++ b/front50-gcs/src/test/kotlin/com/netflix/spinnaker/front50/model/TestGcsStorageService.kt @@ -25,12 +25,12 @@ import com.google.cloud.storage.BucketInfo import com.google.cloud.storage.Storage import com.google.cloud.storage.StorageOptions import com.google.common.util.concurrent.MoreExecutors -import com.netflix.spinnaker.front50.exception.NotFoundException import com.netflix.spinnaker.front50.model.GcsStorageService import com.netflix.spinnaker.front50.model.ObjectType import com.netflix.spinnaker.front50.model.application.Application import com.netflix.spinnaker.front50.model.delivery.Delivery import com.netflix.spinnaker.front50.model.pipeline.Pipeline +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import io.mockk.every import io.mockk.mockk import io.mockk.slot diff --git a/front50-oracle/src/main/java/com/netflix/spinnaker/front50/model/OracleStorageService.java b/front50-oracle/src/main/java/com/netflix/spinnaker/front50/model/OracleStorageService.java index b5002a607..f74ca96c2 100644 --- a/front50-oracle/src/main/java/com/netflix/spinnaker/front50/model/OracleStorageService.java +++ b/front50-oracle/src/main/java/com/netflix/spinnaker/front50/model/OracleStorageService.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; import com.google.common.base.Supplier; import com.netflix.spinnaker.front50.config.OracleProperties; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import com.oracle.bmc.auth.AuthenticationDetailsProvider; import com.oracle.bmc.auth.SimpleAuthenticationDetailsProvider; import com.oracle.bmc.auth.SimplePrivateKeySupplier; diff --git a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAO.groovy b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAO.groovy index 94cc0c005..23d986726 100644 --- a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAO.groovy +++ b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAO.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.application.Application import com.netflix.spinnaker.front50.model.application.ApplicationDAO import org.springframework.data.redis.core.Cursor diff --git a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAO.groovy b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAO.groovy index bd72798a8..fb49c8727 100644 --- a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAO.groovy +++ b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAO.groovy @@ -15,7 +15,7 @@ */ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.pipeline.Pipeline import com.netflix.spinnaker.front50.model.pipeline.PipelineDAO import org.springframework.data.redis.core.Cursor diff --git a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAO.groovy b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAO.groovy index fe7cc3bbd..b68aa8536 100644 --- a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAO.groovy +++ b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAO.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.pipeline.Pipeline import com.netflix.spinnaker.front50.model.pipeline.PipelineStrategyDAO import org.springframework.data.redis.core.Cursor diff --git a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineTemplateDAO.java b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineTemplateDAO.java index 1cb3a24ac..1fad6a8d9 100644 --- a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineTemplateDAO.java +++ b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineTemplateDAO.java @@ -16,9 +16,9 @@ package com.netflix.spinnaker.front50.redis; import com.google.common.collect.Lists; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplate; import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplateDAO; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.io.IOException; import java.util.Collection; import java.util.Map; diff --git a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAO.groovy b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAO.groovy index 1899c7901..db7c1543b 100644 --- a/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAO.groovy +++ b/front50-redis/src/main/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAO.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.project.Project import com.netflix.spinnaker.front50.model.project.ProjectDAO import org.springframework.data.redis.core.Cursor diff --git a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAOSpec.groovy b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAOSpec.groovy index dfa70bab2..1eaabaafe 100644 --- a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAOSpec.groovy +++ b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisApplicationDAOSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.application.Application import com.netflix.spinnaker.front50.redis.config.EmbeddedRedisConfig import org.springframework.beans.factory.annotation.Autowired diff --git a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAOSpec.groovy b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAOSpec.groovy index a7f035052..1992550ea 100644 --- a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAOSpec.groovy +++ b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineDAOSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.pipeline.Pipeline import com.netflix.spinnaker.front50.pipeline.PipelineDAOSpec import com.netflix.spinnaker.front50.redis.config.EmbeddedRedisConfig diff --git a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAOSpec.groovy b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAOSpec.groovy index 024b1aa68..0a79603cb 100644 --- a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAOSpec.groovy +++ b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisPipelineStrategyDAOSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.pipeline.Pipeline import com.netflix.spinnaker.front50.redis.config.EmbeddedRedisConfig import org.springframework.beans.factory.annotation.Autowired diff --git a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAOSpec.groovy b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAOSpec.groovy index 7e7fb7623..1294878a7 100644 --- a/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAOSpec.groovy +++ b/front50-redis/src/test/groovy/com/netflix/spinnaker/front50/redis/RedisProjectDAOSpec.groovy @@ -16,7 +16,7 @@ package com.netflix.spinnaker.front50.redis -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.project.Project import com.netflix.spinnaker.front50.redis.config.EmbeddedRedisConfig import org.springframework.beans.factory.annotation.Autowired diff --git a/front50-s3/src/main/java/com/netflix/spinnaker/front50/model/S3StorageService.java b/front50-s3/src/main/java/com/netflix/spinnaker/front50/model/S3StorageService.java index 4d570a9ed..78129765d 100644 --- a/front50-s3/src/main/java/com/netflix/spinnaker/front50/model/S3StorageService.java +++ b/front50-s3/src/main/java/com/netflix/spinnaker/front50/model/S3StorageService.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.io.ByteArrayInputStream; import java.io.IOException; import java.time.Duration; diff --git a/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageService.kt b/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageService.kt index eba984f6f..5ba44df0c 100644 --- a/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageService.kt +++ b/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageService.kt @@ -17,8 +17,8 @@ package com.netflix.spinnaker.front50.model import com.netflix.spectator.api.Registry -import com.netflix.spinnaker.front50.exception.NotFoundException import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import org.slf4j.LoggerFactory import org.springframework.scheduling.annotation.Scheduled diff --git a/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt b/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt index 06cc49d53..fe208f007 100644 --- a/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt +++ b/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt @@ -18,7 +18,6 @@ package com.netflix.spinnaker.front50.model import com.fasterxml.jackson.databind.ObjectMapper import com.netflix.spectator.api.Registry -import com.netflix.spinnaker.front50.exception.NotFoundException import com.netflix.spinnaker.front50.model.ObjectType.APPLICATION import com.netflix.spinnaker.front50.model.ObjectType.APPLICATION_PERMISSION import com.netflix.spinnaker.front50.model.ObjectType.DELIVERY @@ -41,6 +40,7 @@ import com.netflix.spinnaker.front50.model.sql.transactional import com.netflix.spinnaker.front50.model.sql.withRetry import com.netflix.spinnaker.kork.sql.config.SqlRetryProperties import com.netflix.spinnaker.kork.sql.routing.withPool +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.security.AuthenticatedRequest import java.time.Clock import kotlin.system.measureTimeMillis diff --git a/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageServiceTests.kt b/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageServiceTests.kt index fd2ab9c44..d2fb9dd09 100644 --- a/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageServiceTests.kt +++ b/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageServiceTests.kt @@ -17,10 +17,10 @@ package com.netflix.spinnaker.front50.model import com.netflix.spectator.api.NoopRegistry -import com.netflix.spinnaker.front50.exception.NotFoundException import com.netflix.spinnaker.front50.model.application.Application import com.netflix.spinnaker.front50.model.tag.EntityTags import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import dev.minutest.junit.JUnit5Minutests import dev.minutest.rootContext import io.mockk.Called diff --git a/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/SqlStorageServiceTests.kt b/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/SqlStorageServiceTests.kt index 4e5758dad..57cefb285 100644 --- a/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/SqlStorageServiceTests.kt +++ b/front50-sql/src/test/kotlin/com/netflix/spinnaker/front50/model/SqlStorageServiceTests.kt @@ -18,11 +18,11 @@ package com.netflix.spinnaker.front50.model import com.fasterxml.jackson.databind.ObjectMapper import com.netflix.spectator.api.NoopRegistry -import com.netflix.spinnaker.front50.exception.NotFoundException import com.netflix.spinnaker.front50.model.application.Application import com.netflix.spinnaker.front50.model.pipeline.Pipeline import com.netflix.spinnaker.front50.model.tag.EntityTags import com.netflix.spinnaker.kork.sql.config.SqlRetryProperties +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import dev.minutest.ContextBuilder import dev.minutest.junit.JUnit5Minutests import dev.minutest.rootContext diff --git a/front50-swift/src/main/java/com/netflix/spinnaker/front50/model/SwiftStorageService.java b/front50-swift/src/main/java/com/netflix/spinnaker/front50/model/SwiftStorageService.java index 9aae8af39..2400190bf 100644 --- a/front50-swift/src/main/java/com/netflix/spinnaker/front50/model/SwiftStorageService.java +++ b/front50-swift/src/main/java/com/netflix/spinnaker/front50/model/SwiftStorageService.java @@ -19,7 +19,7 @@ import static net.logstash.logback.argument.StructuredArguments.value; import com.fasterxml.jackson.databind.ObjectMapper; -import com.netflix.spinnaker.front50.exception.NotFoundException; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/DeliveryController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/DeliveryController.java index 81a5c14e5..ed04c40e1 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/DeliveryController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/DeliveryController.java @@ -1,9 +1,9 @@ package com.netflix.spinnaker.front50.controllers; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exceptions.InvalidRequestException; import com.netflix.spinnaker.front50.model.delivery.Delivery; import com.netflix.spinnaker.front50.model.delivery.DeliveryRepository; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.swagger.annotations.ApiOperation; import java.util.Collection; import org.springframework.beans.factory.annotation.Autowired; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/NotificationController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/NotificationController.java index affc66c6d..55b015b13 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/NotificationController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/NotificationController.java @@ -4,10 +4,10 @@ import com.google.common.base.Strings; import com.netflix.spinnaker.front50.UntypedUtils; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.notification.HierarchicalLevel; import com.netflix.spinnaker.front50.model.notification.Notification; import com.netflix.spinnaker.front50.model.notification.NotificationDAO; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineController.java index 105d053b3..99df47dcf 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineController.java @@ -23,7 +23,6 @@ import com.google.common.base.Strings; import com.netflix.spinnaker.front50.ServiceAccountsService; import com.netflix.spinnaker.front50.exception.BadRequestException; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exceptions.DuplicateEntityException; import com.netflix.spinnaker.front50.exceptions.InvalidEntityException; import com.netflix.spinnaker.front50.exceptions.InvalidRequestException; @@ -34,6 +33,7 @@ import com.netflix.spinnaker.front50.model.pipeline.V2TemplateConfiguration; import com.netflix.spinnaker.front50.validator.GenericValidationErrors; import com.netflix.spinnaker.front50.validator.PipelineValidator; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import com.netflix.spinnaker.kork.web.exceptions.ValidationException; import java.util.ArrayList; import java.util.Collection; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineTemplateController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineTemplateController.java index 0a270a61f..106144d62 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineTemplateController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineTemplateController.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.netflix.spinnaker.front50.exception.BadRequestException; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exceptions.DuplicateEntityException; import com.netflix.spinnaker.front50.exceptions.InvalidRequestException; import com.netflix.spinnaker.front50.model.pipeline.Pipeline; @@ -29,6 +28,7 @@ import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplate; import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplateDAO; import com.netflix.spinnaker.front50.model.pipeline.TemplateConfiguration; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/ReorderPipelinesController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/ReorderPipelinesController.java index 2079da851..3a303f774 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/ReorderPipelinesController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/ReorderPipelinesController.java @@ -16,10 +16,10 @@ package com.netflix.spinnaker.front50.controllers; import com.netflix.spinnaker.fiat.shared.FiatPermissionEvaluator; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exceptions.InvalidRequestException; import com.netflix.spinnaker.front50.model.ItemDAO; import com.netflix.spinnaker.front50.model.pipeline.*; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/SnapshotsController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/SnapshotsController.java index 36c0beb21..d6917938b 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/SnapshotsController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/SnapshotsController.java @@ -17,10 +17,10 @@ import com.google.common.base.Strings; import com.netflix.spinnaker.front50.config.annotations.ConditionalOnAnyProviderExceptRedisIsEnabled; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exceptions.InvalidEntityException; import com.netflix.spinnaker.front50.model.snapshot.Snapshot; import com.netflix.spinnaker.front50.model.snapshot.SnapshotDAO; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.Collection; import java.util.Objects; import org.springframework.security.access.prepost.PostAuthorize; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/V2PipelineTemplateController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/V2PipelineTemplateController.java index cd555bba6..0bb87c1ad 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/V2PipelineTemplateController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/V2PipelineTemplateController.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; import com.netflix.spinnaker.front50.exception.BadRequestException; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exceptions.DuplicateEntityException; import com.netflix.spinnaker.front50.exceptions.InvalidRequestException; import com.netflix.spinnaker.front50.model.pipeline.Pipeline; @@ -32,6 +31,7 @@ import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplate; import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplateDAO; import com.netflix.spinnaker.front50.model.pipeline.TemplateConfiguration; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ApplicationsController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ApplicationsController.java index 25d5f8ebc..1b2556e96 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ApplicationsController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ApplicationsController.java @@ -7,12 +7,12 @@ import com.netflix.spinnaker.front50.config.FiatConfigurationProperties; import com.netflix.spinnaker.front50.controllers.exception.InvalidApplicationRequestException; import com.netflix.spinnaker.front50.exception.ApplicationAlreadyExistsException; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exception.ValidationException; import com.netflix.spinnaker.front50.model.application.Application; import com.netflix.spinnaker.front50.model.application.ApplicationDAO; import com.netflix.spinnaker.front50.model.application.ApplicationPermissionDAO; import com.netflix.spinnaker.front50.model.application.ApplicationService; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.*; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/EntityTagsController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/EntityTagsController.java index 0e6919919..8cd08634f 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/EntityTagsController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/EntityTagsController.java @@ -4,9 +4,9 @@ import com.google.common.base.Strings; import com.netflix.spinnaker.front50.exception.BadRequestException; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.model.tag.EntityTags; import com.netflix.spinnaker.front50.model.tag.EntityTagsDAO; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ProjectsController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ProjectsController.java index 9ddc8157d..2f484a662 100644 --- a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ProjectsController.java +++ b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/v2/ProjectsController.java @@ -20,11 +20,11 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.netflix.spinnaker.front50.UntypedUtils; -import com.netflix.spinnaker.front50.exception.NotFoundException; import com.netflix.spinnaker.front50.exceptions.InvalidRequestException; import com.netflix.spinnaker.front50.model.SearchUtils; import com.netflix.spinnaker.front50.model.project.Project; import com.netflix.spinnaker.front50.model.project.ProjectDAO; +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.*; diff --git a/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ApplicationsControllerTck.groovy b/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ApplicationsControllerTck.groovy index 387a3c813..947c2816f 100644 --- a/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ApplicationsControllerTck.groovy +++ b/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ApplicationsControllerTck.groovy @@ -22,7 +22,7 @@ import com.amazonaws.services.s3.AmazonS3Client import com.fasterxml.jackson.databind.ObjectMapper import com.netflix.spectator.api.NoopRegistry import com.netflix.spinnaker.fiat.shared.FiatService -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.DefaultObjectKeyLoader import com.netflix.spinnaker.front50.model.S3StorageService import com.netflix.spinnaker.front50.model.application.Application diff --git a/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ProjectsControllerTck.groovy b/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ProjectsControllerTck.groovy index 27f81b3eb..3d83a5ccc 100644 --- a/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ProjectsControllerTck.groovy +++ b/front50-web/src/test/groovy/com/netflix/spinnaker/front50/controllers/v2/ProjectsControllerTck.groovy @@ -22,7 +22,7 @@ import com.amazonaws.services.s3.AmazonS3Client import com.fasterxml.jackson.databind.ObjectMapper import com.netflix.spectator.api.NoopRegistry import com.netflix.spinnaker.front50.controllers.SimpleExceptionHandlerExceptionResolver -import com.netflix.spinnaker.front50.exception.NotFoundException +import com.netflix.spinnaker.kork.web.exceptions.NotFoundException import com.netflix.spinnaker.front50.model.DefaultObjectKeyLoader import com.netflix.spinnaker.front50.model.S3StorageService import com.netflix.spinnaker.front50.model.StorageService