From 67bd302007dd1152c70e4be2e317ddf6201d2cb5 Mon Sep 17 00:00:00 2001 From: musketyr Date: Tue, 12 Dec 2023 09:06:20 +0100 Subject: [PATCH] removed default empty string that causes validation errors --- .../amazon/awssdk/s3/SimpleStorageServiceConfiguration.java | 2 +- .../micronaut/aws/kinesis/KinesisConfiguration.groovy | 2 +- .../micronaut/aws/s3/SimpleStorageServiceConfiguration.groovy | 3 +-- .../micronaut/aws/s3/SimpleStorageServiceMinioSpec.groovy | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/subprojects/micronaut-amazon-awssdk-s3/src/main/java/com/agorapulse/micronaut/amazon/awssdk/s3/SimpleStorageServiceConfiguration.java b/subprojects/micronaut-amazon-awssdk-s3/src/main/java/com/agorapulse/micronaut/amazon/awssdk/s3/SimpleStorageServiceConfiguration.java index ffa0e2f8d..21adf1fd1 100644 --- a/subprojects/micronaut-amazon-awssdk-s3/src/main/java/com/agorapulse/micronaut/amazon/awssdk/s3/SimpleStorageServiceConfiguration.java +++ b/subprojects/micronaut-amazon-awssdk-s3/src/main/java/com/agorapulse/micronaut/amazon/awssdk/s3/SimpleStorageServiceConfiguration.java @@ -68,7 +68,7 @@ public void setPathStyleAccessEnabled(Boolean forcePathStyle) { } @Size(min = 1) - private String bucket = ""; + private String bucket; private Boolean forcePathStyle; } diff --git a/subprojects/micronaut-aws-sdk-kinesis/src/main/groovy/com/agorapulse/micronaut/aws/kinesis/KinesisConfiguration.groovy b/subprojects/micronaut-aws-sdk-kinesis/src/main/groovy/com/agorapulse/micronaut/aws/kinesis/KinesisConfiguration.groovy index 86cfa5d20..aaf7e3259 100644 --- a/subprojects/micronaut-aws-sdk-kinesis/src/main/groovy/com/agorapulse/micronaut/aws/kinesis/KinesisConfiguration.groovy +++ b/subprojects/micronaut-aws-sdk-kinesis/src/main/groovy/com/agorapulse/micronaut/aws/kinesis/KinesisConfiguration.groovy @@ -29,7 +29,7 @@ import jakarta.validation.constraints.Size @SuppressWarnings('AbstractClassWithoutAbstractMethod') abstract class KinesisConfiguration extends DefaultRegionAndEndpointConfiguration { - @Size(min = 1) String stream = '' + @Size(min = 1) String stream String consumerFilterKey = '' diff --git a/subprojects/micronaut-aws-sdk-s3/src/main/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceConfiguration.groovy b/subprojects/micronaut-aws-sdk-s3/src/main/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceConfiguration.groovy index 7010f3863..3144c1a68 100644 --- a/subprojects/micronaut-aws-sdk-s3/src/main/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceConfiguration.groovy +++ b/subprojects/micronaut-aws-sdk-s3/src/main/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceConfiguration.groovy @@ -19,7 +19,6 @@ package com.agorapulse.micronaut.aws.s3 import com.agorapulse.micronaut.aws.DefaultRegionAndEndpointConfiguration import groovy.transform.CompileStatic - import jakarta.validation.constraints.Size /** @@ -29,7 +28,7 @@ import jakarta.validation.constraints.Size @SuppressWarnings('AbstractClassWithoutAbstractMethod') abstract class SimpleStorageServiceConfiguration extends DefaultRegionAndEndpointConfiguration { - @Size(min = 1) String bucket = '' + @Size(min = 1) String bucket Boolean pathStyleAccessEnabled } diff --git a/subprojects/micronaut-aws-sdk-s3/src/test/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceMinioSpec.groovy b/subprojects/micronaut-aws-sdk-s3/src/test/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceMinioSpec.groovy index 9488be095..3be14ec34 100644 --- a/subprojects/micronaut-aws-sdk-s3/src/test/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceMinioSpec.groovy +++ b/subprojects/micronaut-aws-sdk-s3/src/test/groovy/com/agorapulse/micronaut/aws/s3/SimpleStorageServiceMinioSpec.groovy @@ -28,6 +28,7 @@ import java.time.Duration * Tests for SimpleStorageService based on Testcontainers with Minio server. */ @Property(name = 'aws.s3.path-style-access-enabled', value = 'true') +@Property(name = 'aws.s3.bucket', value = MY_BUCKET) class SimpleStorageServiceMinioSpec extends SimpleStorageServiceSpec implements TestPropertyProvider { private static final int MINIO_PORT = 9000