diff --git a/sbt-gcs-plugin/.scalafmt.conf b/sbt-gcs-plugin/.scalafmt.conf index 0185637..804e68e 100644 --- a/sbt-gcs-plugin/.scalafmt.conf +++ b/sbt-gcs-plugin/.scalafmt.conf @@ -2,7 +2,10 @@ version = 3.8.1 preset = default lineEndings = unix maxColumn = 120 -docstrings = JavaDoc + +runner { + dialect = scala212 +} align { preset = more @@ -11,9 +14,6 @@ align { arrowEnumeratorGenerator = true } -newlines { - alwaysBeforeTopLevelStatements = true -} continuationIndent { defnSite = 4 } @@ -32,5 +32,4 @@ trailingCommas = never verticalMultiline { atDefnSite = false - newlineBeforeImplicitKW = true } diff --git a/sbt-gcs-plugin/src/main/scala/org/latestbit/sbt/gcs/artifactregistry/GcsArtifactRegistryUrlConnection.scala b/sbt-gcs-plugin/src/main/scala/org/latestbit/sbt/gcs/artifactregistry/GcsArtifactRegistryUrlConnection.scala index fa51ec7..877118e 100644 --- a/sbt-gcs-plugin/src/main/scala/org/latestbit/sbt/gcs/artifactregistry/GcsArtifactRegistryUrlConnection.scala +++ b/sbt-gcs-plugin/src/main/scala/org/latestbit/sbt/gcs/artifactregistry/GcsArtifactRegistryUrlConnection.scala @@ -24,9 +24,8 @@ import com.google.api.client.http.{ } import sbt.Logger -import java.io.{ ByteArrayOutputStream, InputStream, OutputStream } -import java.net.{ HttpURLConnection, URL } -import scala.util.Try +import java.io.{ByteArrayOutputStream, InputStream, OutputStream} +import java.net.{HttpURLConnection, URL} import scala.jdk.CollectionConverters.* import scala.util.control.NonFatal @@ -42,20 +41,10 @@ class GcsArtifactRegistryUrlConnection( googleHttpRequestFactory: HttpRequestFac // when the connection has already been opened the call is ignored. if (!connected) { connectedWithHeaders = new HttpHeaders() - try { - super.getRequestProperties.asScala.foreach { case ( header, headerValues ) => - connectedWithHeaders.set( header, headerValues ) - } - logger.debug( s"Checking artifact at url: ${url}." ) - val httpRequest = - googleHttpRequestFactory.buildHeadRequest( genericUrl ) - connected = httpRequest.execute().isSuccessStatusCode - } catch { - case ex: HttpResponseException => { - responseCode = ex.getStatusCode - responseMessage = ex.getStatusMessage - } + super.getRequestProperties.asScala.foreach { case ( header, headerValues ) => + connectedWithHeaders.set( header, headerValues ) } + connected = true } } @@ -66,25 +55,21 @@ class GcsArtifactRegistryUrlConnection( googleHttpRequestFactory: HttpRequestFac if (!connected) { connect() } - if (responseCode < 400) { - try { - logger.info( s"Receiving an artifact from url: ${url}." ) - val httpRequest = googleHttpRequestFactory.buildGetRequest( genericUrl ) + try { + logger.debug( s"Receiving an artifact from url: ${url}." ) + val httpRequest = googleHttpRequestFactory.buildGetRequest( genericUrl ) - val httpResponse = appendHeadersBeforeConnect( httpRequest ).execute() + val httpResponse = appendHeadersBeforeConnect( httpRequest ).execute() - val inputStream = httpResponse.getContent - inputStreamIsReady = Some( inputStream ) - inputStream - } catch { - case ex: HttpResponseException => { - responseCode = ex.getStatusCode - responseMessage = ex.getStatusMessage - null - } + val inputStream = httpResponse.getContent + inputStreamIsReady = Some( inputStream ) + inputStream + } catch { + case ex: HttpResponseException => { + responseCode = ex.getStatusCode + responseMessage = ex.getStatusMessage + null } - } else { - null } } }