Make (Versioned)Coordinates internal and move to mapping package

SgtSilvio · Jul 9, 2024 · 23663af · 23663af
1 parent 48d0e55
commit 23663af
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
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
@@ -3,7 +3,6 @@ package io.github.sgtsilvio.gradle.oci.internal.registry
 import com.github.benmanes.caffeine.cache.AsyncCache
 import com.github.benmanes.caffeine.cache.Caffeine
 import io.github.sgtsilvio.gradle.oci.attributes.*
-import io.github.sgtsilvio.gradle.oci.component.VersionedCoordinates
 import io.github.sgtsilvio.gradle.oci.internal.*
 import io.github.sgtsilvio.gradle.oci.internal.cache.getMono
 import io.github.sgtsilvio.gradle.oci.internal.json.addArray
@@ -12,6 +11,7 @@ import io.github.sgtsilvio.gradle.oci.internal.json.addObject
 import io.github.sgtsilvio.gradle.oci.internal.json.jsonObject
 import io.github.sgtsilvio.gradle.oci.mapping.MappedComponent
 import io.github.sgtsilvio.gradle.oci.mapping.OciImageMappingData
+import io.github.sgtsilvio.gradle.oci.mapping.VersionedCoordinates
 import io.github.sgtsilvio.gradle.oci.mapping.map
 import io.github.sgtsilvio.gradle.oci.metadata.*
 import io.netty.handler.codec.http.HttpHeaderNames

diff --git a/...ilvio/gradle/oci/component/Coordinates.kt → ...tsilvio/gradle/oci/mapping/Coordinates.kt b/...ilvio/gradle/oci/component/Coordinates.kt → ...tsilvio/gradle/oci/mapping/Coordinates.kt
@@ -1,11 +1,11 @@
-package io.github.sgtsilvio.gradle.oci.component
+package io.github.sgtsilvio.gradle.oci.mapping
 
 import java.io.Serializable
 
 /**
  * @author Silvio Giebl
  */
-data class Coordinates(val group: String, val name: String) : Comparable<Coordinates>, Serializable {
+internal data class Coordinates(val group: String, val name: String) : Comparable<Coordinates>, Serializable {
     override fun compareTo(other: Coordinates): Int {
         group.compareTo(other.group).also { if (it != 0) return it }
         return name.compareTo(other.name)
@@ -14,7 +14,7 @@ data class Coordinates(val group: String, val name: String) : Comparable<Coordin
     override fun toString() = "$group:$name"
 }
 
-data class VersionedCoordinates(
+internal data class VersionedCoordinates(
     val coordinates: Coordinates,
     val version: String,
 ) : Comparable<VersionedCoordinates>, Serializable {

diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/MappedComponent.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/MappedComponent.kt
@@ -1,6 +1,5 @@
 package io.github.sgtsilvio.gradle.oci.mapping
 
-import io.github.sgtsilvio.gradle.oci.component.VersionedCoordinates
 import io.github.sgtsilvio.gradle.oci.metadata.OciImageReference
 import java.util.*
 

diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/OciImageMapper.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/OciImageMapper.kt
@@ -1,6 +1,5 @@
 package io.github.sgtsilvio.gradle.oci.mapping
 
-import io.github.sgtsilvio.gradle.oci.component.VersionedCoordinates
 import io.github.sgtsilvio.gradle.oci.metadata.OciImageReference
 import java.util.*
 

diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/OciImageMapping.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/OciImageMapping.kt
@@ -1,12 +1,9 @@
 package io.github.sgtsilvio.gradle.oci.mapping
 
-import io.github.sgtsilvio.gradle.oci.component.Coordinates
-import io.github.sgtsilvio.gradle.oci.component.VersionedCoordinates
 import org.gradle.api.Action
 import org.gradle.api.model.ObjectFactory
 import org.gradle.kotlin.dsl.mapProperty
 import org.gradle.kotlin.dsl.newInstance
-import java.util.*
 import javax.inject.Inject
 
 /**

diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/OciImageMappingData.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/mapping/OciImageMappingData.kt
@@ -1,8 +1,5 @@
 package io.github.sgtsilvio.gradle.oci.mapping
 
-import io.github.sgtsilvio.gradle.oci.component.Coordinates
-import io.github.sgtsilvio.gradle.oci.component.VersionedCoordinates
-
 /**
  * @author Silvio Giebl
  */