From a925d8a54f2bb2b2bd946d08ae4cbeb3df878e49 Mon Sep 17 00:00:00 2001 From: Yegor Bugayenko Date: Fri, 10 Nov 2023 06:08:11 +0300 Subject: [PATCH] #405 more tests fixed --- s3auth-hosts/pom.xml | 2 +- s3auth-hosts/src/main/aspect/.gitkeep | 0 s3auth-hosts/src/main/aspect/README.txt | 1 - .../src/main/java/com/s3auth/hosts/DefaultHost.java | 10 ++++++++++ .../test/java/com/s3auth/hosts/DefaultDynamoTest.java | 2 +- .../test/java/com/s3auth/hosts/DefaultHostITCase.java | 1 + s3auth-relay/pom.xml | 5 +++++ 7 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 s3auth-hosts/src/main/aspect/.gitkeep delete mode 100644 s3auth-hosts/src/main/aspect/README.txt diff --git a/s3auth-hosts/pom.xml b/s3auth-hosts/pom.xml index bc778d3e..b36cd228 100644 --- a/s3auth-hosts/pom.xml +++ b/s3auth-hosts/pom.xml @@ -175,7 +175,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE. com.jcabi jcabi-dynamo - 0.22.3 + 0.22.4 com.google.guava diff --git a/s3auth-hosts/src/main/aspect/.gitkeep b/s3auth-hosts/src/main/aspect/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/s3auth-hosts/src/main/aspect/README.txt b/s3auth-hosts/src/main/aspect/README.txt deleted file mode 100644 index 01519476..00000000 --- a/s3auth-hosts/src/main/aspect/README.txt +++ /dev/null @@ -1 +0,0 @@ -This directory is an indicator of AspectJ weaving \ No newline at end of file diff --git a/s3auth-hosts/src/main/java/com/s3auth/hosts/DefaultHost.java b/s3auth-hosts/src/main/java/com/s3auth/hosts/DefaultHost.java index 6dfe70ae..7ec59278 100644 --- a/s3auth-hosts/src/main/java/com/s3auth/hosts/DefaultHost.java +++ b/s3auth-hosts/src/main/java/com/s3auth/hosts/DefaultHost.java @@ -165,6 +165,16 @@ public void close() { public Resource fetch(@NotNull final URI uri, @NotNull final Range range, @NotNull final Version version) throws IOException { + if (this.bucket.key().isEmpty()) { + throw new IllegalStateException( + "The key of the bucket is empty" + ); + } + if (this.bucket.secret().isEmpty()) { + throw new IllegalStateException( + "The secret of the bucket is empty" + ); + } Resource resource = null; final Collection errors = new LinkedList<>(); final DomainStatsData data = new H2DomainStatsData(); diff --git a/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultDynamoTest.java b/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultDynamoTest.java index 703994c5..4d0118f3 100644 --- a/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultDynamoTest.java +++ b/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultDynamoTest.java @@ -105,7 +105,7 @@ private MkRegion mockRegion( ) ); final Table tbl = region.table(table); - for (int num = 0; num < 20; ++num) { + for (int num = 0; num < 3; ++num) { tbl.put(this.item()); } return region; diff --git a/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultHostITCase.java b/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultHostITCase.java index a22ce964..beb03bf6 100644 --- a/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultHostITCase.java +++ b/s3auth-hosts/src/test/java/com/s3auth/hosts/DefaultHostITCase.java @@ -55,6 +55,7 @@ void fetchesRealObjectFromAmazonBucket() throws Exception { final String key = System.getProperty("failsafe.aws.key"); final String secret = System.getProperty("failsafe.aws.secret"); Assume.assumeThat(key, Matchers.notNullValue()); + Assume.assumeThat(key.isEmpty(), Matchers.is(false)); final Host host = new DefaultHost( new DefaultBucket( new DomainMocker().init() diff --git a/s3auth-relay/pom.xml b/s3auth-relay/pom.xml index 33cfdd51..b20fa4ff 100644 --- a/s3auth-relay/pom.xml +++ b/s3auth-relay/pom.xml @@ -117,6 +117,11 @@ OF THE POSSIBILITY OF SUCH DAMAGE. 1.19.4 runtime + + org.glassfish.jersey.core + jersey-common + 3.1.2 + com.sun.jersey jersey-client