From ee9d88744a205a8e13687f7462607e67ea1cdbf6 Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Sun, 8 May 2022 18:48:21 -0400 Subject: [PATCH 1/5] updates --- build.gradle.kts | 7 ++++--- .../s34k/core/objects/AbstractObjectContainer.kt | 14 +++++++++++--- .../core/params/object/BasicObjectListAllParams.kt | 10 ++++++++++ .../core/params/object/BasicObjectListParams.kt | 6 ++++-- 4 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 src/main/kotlin/org/veupathdb/lib/s3/s34k/core/params/object/BasicObjectListAllParams.kt diff --git a/build.gradle.kts b/build.gradle.kts index 4551168..d25216f 100644 --- 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-SNAPSHOT" 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-SNAPSHOT") { isChanging = true } 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 index d563d14..d88db0a 100644 --- 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 @@ -6,6 +6,7 @@ import org.veupathdb.lib.s3.s34k.core.params.`object`.directory.BasicDirectoryDe import org.veupathdb.lib.s3.s34k.core.params.`object`.multi.BasicMultiObjectDeleteParams import org.veupathdb.lib.s3.s34k.core.params.`object`.touch.BasicObjectTouchParams import org.veupathdb.lib.s3.s34k.objects.ObjectContainer +import org.veupathdb.lib.s3.s34k.objects.ObjectList import org.veupathdb.lib.s3.s34k.params.DeleteParams import org.veupathdb.lib.s3.s34k.params.`object`.* import org.veupathdb.lib.s3.s34k.params.`object`.directory.DirectoryDeleteParams @@ -56,10 +57,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?, recursive: Boolean) = + list(BasicObjectListParams(prefix, recursive)) + + 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 new file mode 100644 index 0000000..6001f9a --- /dev/null +++ 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) \ No newline at end of file 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 index 8c73287..34fe40e 100644 --- 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,9 @@ 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 recursive: Boolean = false, + override var callback: ((ObjectList) -> Unit)? = null, region: String? = null, - override var callback: ((objects: ObjectList) -> Unit)? = null ) : ObjectListParams, BasicRegionRequestParams(region) \ No newline at end of file From c34078e593fc7535a3821ba0a07bb4f7c7e4e408 Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Sun, 8 May 2022 19:29:08 -0400 Subject: [PATCH 2/5] updates --- build.gradle.kts | 2 +- .../lib/s3/s34k/core/objects/AbstractObjectContainer.kt | 4 ++-- .../lib/s3/s34k/core/params/object/BasicObjectListParams.kt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d25216f..9322e5c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "org.veupathdb.lib.s3" -version = "0.3.0-SNAPSHOT" +version = "0.4.0-SNAPSHOT" repositories { mavenLocal() 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 index d88db0a..573b6ea 100644 --- 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 @@ -63,8 +63,8 @@ abstract class AbstractObjectContainer : ObjectContainer { listAll(BasicObjectListAllParams().also(action)) - override fun list(prefix: String?, recursive: Boolean) = - list(BasicObjectListParams(prefix, recursive)) + override fun list(prefix: String?) = + list(BasicObjectListParams(prefix)) override fun list(action: ObjectListParams.() -> Unit) = list(BasicObjectListParams().also(action)) 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 index 34fe40e..d05a96c 100644 --- 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 @@ -6,7 +6,6 @@ import org.veupathdb.lib.s3.s34k.params.`object`.ObjectListParams class BasicObjectListParams( override var prefix: String? = null, - override var recursive: Boolean = false, override var callback: ((ObjectList) -> Unit)? = null, region: String? = null, ) : ObjectListParams, BasicRegionRequestParams(region) \ No newline at end of file From 5126cf1029d904033ed5a14e33cb914bd8e23baf Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Mon, 9 May 2022 09:23:31 -0400 Subject: [PATCH 3/5] cleanup import --- .../lib/s3/s34k/core/objects/AbstractObjectContainer.kt | 1 - 1 file changed, 1 deletion(-) 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 index 573b6ea..a7520ca 100644 --- 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 @@ -6,7 +6,6 @@ import org.veupathdb.lib.s3.s34k.core.params.`object`.directory.BasicDirectoryDe import org.veupathdb.lib.s3.s34k.core.params.`object`.multi.BasicMultiObjectDeleteParams import org.veupathdb.lib.s3.s34k.core.params.`object`.touch.BasicObjectTouchParams import org.veupathdb.lib.s3.s34k.objects.ObjectContainer -import org.veupathdb.lib.s3.s34k.objects.ObjectList import org.veupathdb.lib.s3.s34k.params.DeleteParams import org.veupathdb.lib.s3.s34k.params.`object`.* import org.veupathdb.lib.s3.s34k.params.`object`.directory.DirectoryDeleteParams From a14539a498bc01d67da8fe18c1a5a50fad5b52c9 Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Mon, 9 May 2022 09:29:28 -0400 Subject: [PATCH 4/5] update version --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9322e5c..1d7e4e2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "org.veupathdb.lib.s3" -version = "0.4.0-SNAPSHOT" +version = "v0.3.0+s34k-0.4.0" repositories { mavenLocal() @@ -36,7 +36,7 @@ dependencies { implementation(kotlin("stdlib")) implementation("org.slf4j:slf4j-api:1.7.36") - api("org.veupathdb.lib.s3:s34k:0.4.0-SNAPSHOT") { isChanging = true } + api("org.veupathdb.lib.s3:s34k:0.4.0") testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") testImplementation(kotlin("test")) From 4118c7d27f28a546183fb92daa8190cd61ebd48b Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Mon, 9 May 2022 09:31:51 -0400 Subject: [PATCH 5/5] correct version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1d7e4e2..c4ad8f5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "org.veupathdb.lib.s3" -version = "v0.3.0+s34k-0.4.0" +version = "0.3.0+s34k-0.4.0" repositories { mavenLocal()