Merge pull request #1 from VEuPathDB/v0.4.0-dev

v0.3.0 - Targeted object listing.
VEuPathDB · May 9, 2022 · 453e395 · 453e395
2 parents 41bd42f + 4118c7d
commit 453e395
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "org.veupathdb.lib.s3"
-version = "0.2.0+s34k-0.3.0"
+version = "0.3.0+s34k-0.4.0"
 
 repositories {
   mavenLocal()
@@ -21,7 +21,8 @@ repositories {
       username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_USERNAME")
       password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
     }
-  }}
+  }
+}
 
 java {
   sourceCompatibility = JavaVersion.VERSION_1_8
@@ -35,7 +36,7 @@ dependencies {
   implementation(kotlin("stdlib"))
   implementation("org.slf4j:slf4j-api:1.7.36")
 
-  api("org.veupathdb.lib.s3:s34k:0.3.0") { isChanging = true }
+  api("org.veupathdb.lib.s3:s34k:0.4.0")
 
   testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
   testImplementation(kotlin("test"))

diff --git a/src/main/kotlin/org/veupathdb/lib/s3/s34k/core/objects/AbstractObjectContainer.kt b/src/main/kotlin/org/veupathdb/lib/s3/s34k/core/objects/AbstractObjectContainer.kt
@@ -56,10 +56,17 @@ abstract class AbstractObjectContainer : ObjectContainer {
 
 
   override fun listAll() =
-    listAll(BasicObjectListParams())
+    listAll(BasicObjectListAllParams())
 
-  override fun listAll(action: ObjectListParams.() -> Unit) =
-    listAll(BasicObjectListParams().also(action))
+  override fun listAll(action: ObjectListAllParams.() -> Unit) =
+    listAll(BasicObjectListAllParams().also(action))
+
+
+  override fun list(prefix: String?) =
+    list(BasicObjectListParams(prefix))
+
+  override fun list(action: ObjectListParams.() -> Unit) =
+    list(BasicObjectListParams().also(action))
 
 
   override fun open(path: String) =

diff --git a/src/main/kotlin/org/veupathdb/lib/s3/s34k/core/params/object/BasicObjectListAllParams.kt b/src/main/kotlin/org/veupathdb/lib/s3/s34k/core/params/object/BasicObjectListAllParams.kt
@@ -0,0 +1,10 @@
+package org.veupathdb.lib.s3.s34k.core.params.`object`
+
+import org.veupathdb.lib.s3.s34k.core.params.BasicRegionRequestParams
+import org.veupathdb.lib.s3.s34k.objects.ObjectList
+import org.veupathdb.lib.s3.s34k.params.`object`.ObjectListAllParams
+
+open class BasicObjectListAllParams(
+  region: String? = null,
+  override var callback: ((objects: ObjectList) -> Unit)? = null
+) : ObjectListAllParams, BasicRegionRequestParams(region)
diff --git a/src/main/kotlin/org/veupathdb/lib/s3/s34k/core/params/object/BasicObjectListParams.kt b/src/main/kotlin/org/veupathdb/lib/s3/s34k/core/params/object/BasicObjectListParams.kt
@@ -4,7 +4,8 @@ import org.veupathdb.lib.s3.s34k.core.params.BasicRegionRequestParams
 import org.veupathdb.lib.s3.s34k.objects.ObjectList
 import org.veupathdb.lib.s3.s34k.params.`object`.ObjectListParams
 
-open class BasicObjectListParams(
+class BasicObjectListParams(
+  override var prefix: String? = null,
+  override var callback: ((ObjectList) -> Unit)? = null,
   region: String? = null,
-  override var callback: ((objects: ObjectList) -> Unit)? = null
 ) : ObjectListParams, BasicRegionRequestParams(region)