Move OciMultiArchImageMetadata out of nested

SgtSilvio · Jul 16, 2024 · 6bf94a2 · 6bf94a2
1 parent 5fec199
commit 6bf94a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciImageMetadataRegistry.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciImageMetadataRegistry.kt
@@ -13,12 +13,6 @@ import java.util.*
  */
 internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
 
-    class OciMultiArchImageMetadata(
-        val platformToMetadata: Map<Platform, OciMetadata>,
-        val digest: OciDigest,
-        val size: Int,
-    )
-
     fun pullMultiArchImageMetadata(
         registry: String,
         imageReference: OciImageReference,
@@ -363,3 +357,9 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
         }
     }
 }
+
+internal class OciMultiArchImageMetadata(
+    val platformToMetadata: Map<Platform, OciMetadata>,
+    val digest: OciDigest,
+    val size: Int,
+)
diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciRepositoryHandler.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciRepositoryHandler.kt
@@ -52,7 +52,7 @@ internal class OciRepositoryHandler(
     private val credentials: Credentials?,
 ) : BiFunction<HttpServerRequest, HttpServerResponse, Publisher<Void>> {
 
-    private val imageMetadataCache: AsyncCache<ImageMetadataCacheKey, OciImageMetadataRegistry.OciMultiArchImageMetadata> =
+    private val imageMetadataCache: AsyncCache<ImageMetadataCacheKey, OciMultiArchImageMetadata> =
         Caffeine.newBuilder().maximumSize(100).expireAfterAccess(1, TimeUnit.MINUTES).buildAsync()
 
     private data class ImageMetadataCacheKey(
@@ -284,7 +284,7 @@ internal class OciRepositoryHandler(
         registryUri: URI,
         imageReference: OciImageReference,
         credentials: Credentials?,
-    ): Mono<OciImageMetadataRegistry.OciMultiArchImageMetadata> {
+    ): Mono<OciMultiArchImageMetadata> {
         return imageMetadataCache.getMono(
             ImageMetadataCacheKey(registryUri.toString(), imageReference, null, -1, credentials?.hashed())
         ) { key ->
@@ -303,7 +303,7 @@ internal class OciRepositoryHandler(
         digest: OciDigest,
         size: Int,
         credentials: Credentials?,
-    ): Mono<OciImageMetadataRegistry.OciMultiArchImageMetadata> {
+    ): Mono<OciMultiArchImageMetadata> {
         return imageMetadataCache.getMono(
             ImageMetadataCacheKey(registryUri.toString(), imageReference, digest, size, credentials?.hashed())
         ) { (registry, imageReference) ->