Skip to content

Commit

Permalink
update all packages
Browse files Browse the repository at this point in the history
  • Loading branch information
pnatashap committed Feb 18, 2024
1 parent d6337a9 commit f0910c3
Show file tree
Hide file tree
Showing 38 changed files with 140 additions and 148 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
distribution: 'temurin'
java-version: 11
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -22,5 +22,6 @@ jobs:
- run: mvn install -Pjacoco
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./target/site/jacoco/jacoco.xml
fail_ci_if_error: true
4 changes: 2 additions & 2 deletions .github/workflows/mvn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2022, macos-12]
os: [ubuntu-22.04, windows-2022, macos-12]
java: [11, 17]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-jdk-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pdd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: g4s8/pdd-action@master
- uses: volodya-lombrozo/pdd-action@master
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2012-2022, jcabi.com
Copyright (c) 2012-2024, jcabi.com
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2012-2022, jcabi.com
Copyright (c) 2012-2024, jcabi.com
All rights reserved.
Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -63,12 +63,12 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-aspects</artifactId>
<version>0.24.1</version>
<version>0.25.1</version>
</dependency>
<dependency>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-log</artifactId>
<version>0.23.0</version>
<version>0.24.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Expand All @@ -89,17 +89,17 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>1.12.619</version>
<version>1.12.661</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.619</version>
<version>1.12.661</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.3-jre</version>
<version>33.0.0-jre</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -183,7 +183,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
<plugin>
<groupId>com.qulice</groupId>
<artifactId>qulice-maven-plugin</artifactId>
<version>0.13</version>
<version>0.22.0</version>
<configuration>
<excludes combine.children="append">
<exclude>findbugs:.*</exclude>
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/jcabi/s3/AwsBucket.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2012-2022, jcabi.com
/*
* Copyright (c) 2012-2024, jcabi.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -41,8 +41,6 @@
/**
* Amazon S3 bucket.
*
* @author Yegor Bugayenko (yegor256@gmail.com)
* @version $Id$
* @since 0.1
*/
@EqualsAndHashCode(of = { "regn", "bkt" })
Expand Down Expand Up @@ -110,6 +108,7 @@ public boolean exists() throws IOException {
}

@Override
@SuppressWarnings("PMD.GuardLogStatement")
public void remove(final String key) throws IOException {
try {
final AmazonS3 aws = this.regn.aws();
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/jcabi/s3/AwsListIterator.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2012-2022, jcabi.com
/*
* Copyright (c) 2012-2024, jcabi.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -42,8 +42,6 @@

/**
* Iterator for large lists returned by S3.
* @author Roman Kisilenko (roman.kisilenko@gmail.com)
* @version $Id$
* @since 0.10
*/
class AwsListIterator implements Iterator<String> {
Expand Down Expand Up @@ -76,9 +74,9 @@ class AwsListIterator implements Iterator<String> {

/**
* Constructs AwsListIterator.
* @param pfx Key prefix
* @param rgn Region we're in
* @param bkt Bucket name
* @param pfx Key prefix
*/
AwsListIterator(final Region rgn, final String bkt,
final String pfx) {
Expand Down Expand Up @@ -115,6 +113,7 @@ public final void remove() {
* Loads next portion of data from S3.
* @return A list with next portion of data from S3
*/
@SuppressWarnings("PMD.GuardLogStatement")
private List<String> load() {
try {
final AmazonS3 aws = this.region.aws();
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/com/jcabi/s3/AwsOcket.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2012-2022, jcabi.com
/*
* Copyright (c) 2012-2024, jcabi.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -54,12 +54,11 @@
/**
* Amazon S3 bucket.
*
* @author Yegor Bugayenko (yegor256@gmail.com)
* @version $Id$
* @since 0.1
*/
@EqualsAndHashCode(of = { "bkt", "name" })
@Loggable(Loggable.DEBUG)
@SuppressWarnings("PMD.GuardLogStatement")
final class AwsOcket implements Ocket {

/**
Expand Down Expand Up @@ -134,6 +133,7 @@ public ObjectMetadata meta() throws IOException {
}

@Override
@SuppressWarnings("PMD.GuardLogStatement")
public boolean exists() throws IOException {
try {
final AmazonS3 aws = this.bkt.region().aws();
Expand Down Expand Up @@ -165,6 +165,7 @@ public boolean exists() throws IOException {
}

@Override
@SuppressWarnings("PMD.GuardLogStatement")
public void read(final OutputStream output) throws IOException {
final AmazonS3 aws = this.bkt.region().aws();
try {
Expand Down Expand Up @@ -203,6 +204,7 @@ public void read(final OutputStream output) throws IOException {
}

@Override
@SuppressWarnings("PMD.GuardLogStatement")
public void write(final InputStream input, final ObjectMetadata meta)
throws IOException {
final CountingInputStream cnt = new CountingInputStream(input);
Expand Down
17 changes: 13 additions & 4 deletions src/main/java/com/jcabi/s3/Bucket.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2012-2022, jcabi.com
/*
* Copyright (c) 2012-2024, jcabi.com
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -51,8 +51,6 @@
* );
* }</pre>
*
* @author Yegor Bugayenko (yegor256@gmail.com)
* @version $Id$
* @since 0.1
*/
@SuppressWarnings("PMD.TooManyMethods")
Expand Down Expand Up @@ -124,6 +122,8 @@ void remove(String key)
* ""
* ); // contains "hello.txt" and "f/2.txt"
* </pre>
*
* @since 0.1
*/
@ToString
@EqualsAndHashCode(of = { "origin", "prefix" })
Expand All @@ -133,10 +133,12 @@ final class Prefixed implements Bucket {
* Original encapsulated bucket.
*/
private final transient Bucket origin;

/**
* Prefix.
*/
private final transient String prefix;

/**
* Public ctor.
* @param bucket Original bucket
Expand All @@ -146,26 +148,32 @@ public Prefixed(final Bucket bucket, final String pfx) {
this.origin = bucket;
this.prefix = pfx;
}

@Override
public Region region() {
return this.origin.region();
}

@Override
public String name() {
return this.origin.name();
}

@Override
public Ocket ocket(final String key) {
return this.origin.ocket(this.extend(key));
}

@Override
public boolean exists() throws IOException {
return this.origin.exists();
}

@Override
public void remove(final String key) throws IOException {
this.origin.remove(this.extend(key));
}

@Override
public Iterable<String> list(final String pfx) throws IOException {
return Iterables.filter(
Expand Down Expand Up @@ -200,6 +208,7 @@ public boolean apply(final String input) {
public int compareTo(final Bucket bucket) {
return this.origin.compareTo(bucket);
}

/**
* Extend name with a prefix.
* @param name The name to extend
Expand Down
Loading

0 comments on commit f0910c3

Please sign in to comment.