From 548bf29140873f907a858986ae9518bbe1fba536 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 27 May 2024 10:53:34 +0100 Subject: [PATCH] avoid using package private Akka S3Exception class --- .../core/database/s3/S3AttachmentStore.scala | 2 +- .../core/database/s3/S3Exception.scala | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3Exception.scala diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStore.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStore.scala index 10c65ea967a..8311a54c0f8 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStore.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3AttachmentStore.scala @@ -26,7 +26,7 @@ import akka.http.scaladsl.model.{ContentType, HttpRequest, HttpResponse, Uri} import akka.http.scaladsl.unmarshalling.Unmarshal import akka.stream.alpakka.s3.headers.CannedAcl import akka.stream.alpakka.s3.scaladsl.S3 -import akka.stream.alpakka.s3.{S3Attributes, S3Exception, S3Headers, S3Settings} +import akka.stream.alpakka.s3.{S3Attributes, S3Headers, S3Settings} import akka.stream.scaladsl.{Sink, Source} import akka.util.ByteString import com.typesafe.config.Config diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3Exception.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3Exception.scala new file mode 100644 index 00000000000..5a0f2ec9df3 --- /dev/null +++ b/common/scala/src/main/scala/org/apache/openwhisk/core/database/s3/S3Exception.scala @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.openwhisk.core.database.s3 + +class S3Exception(msg: String) extends Exception(msg) \ No newline at end of file