Skip to content

Commit 744a6a6

Browse files
committed
modify for consist with maven 3.9.9
1 parent c828034 commit 744a6a6

File tree

5 files changed

+23
-18
lines changed

5 files changed

+23
-18
lines changed

AliyunOSSStorageWagon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>cloud-storage-maven</artifactId>
77
<groupId>com.qlangtech.maven.cloud</groupId>
8-
<version>4.0.0</version>
8+
<version>4.1.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>

AliyunOSSStorageWagon/src/main/java/com/gkatzioura/maven/cloud/oss/OSSStorageWagon.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.apache.maven.wagon.PathUtils;
66
import org.apache.maven.wagon.ResourceDoesNotExistException;
77
import org.apache.maven.wagon.TransferFailedException;
8+
import org.apache.maven.wagon.WagonConstants;
89
import org.apache.maven.wagon.authentication.AuthenticationException;
910
import org.apache.maven.wagon.authentication.AuthenticationInfo;
1011
import org.apache.maven.wagon.authorization.AuthorizationException;
@@ -46,7 +47,7 @@ public void get(String resourceName, File destination) throws TransferFailedExce
4647
Resource resource = new Resource(resourceName);
4748
transferListenerContainer.fireTransferInitiated(resource, TransferEvent.REQUEST_GET);
4849
transferListenerContainer.fireTransferStarted(resource, TransferEvent.REQUEST_GET, destination);
49-
50+
resource.setContentLength(WagonConstants.UNKNOWN_LENGTH);
5051
final TransferProgress transferProgress = new TransferProgressImpl(resource, TransferEvent.REQUEST_GET, transferListenerContainer);
5152

5253
try {

CloudStorageCore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>cloud-storage-maven</artifactId>
55
<groupId>com.qlangtech.maven.cloud</groupId>
6-
<version>4.0.0</version>
6+
<version>4.1.0</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

CloudStorageCore/src/main/java/com/gkatzioura/maven/cloud/listener/TransferListenerContainerImpl.java

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public TransferListenerContainerImpl(Wagon wagon) {
3636

3737
@Override
3838
public void addTransferListener(TransferListener transferListener) {
39-
if(transferListener==null) {
39+
if (transferListener == null) {
4040
throw new NullPointerException();
4141
}
42-
if(!transferListeners.contains(transferListener)) {
42+
if (!transferListeners.contains(transferListener)) {
4343
transferListeners.add(transferListener);
4444
}
4545
}
@@ -56,32 +56,36 @@ public boolean hasTransferListener(TransferListener transferListener) {
5656

5757
@Override
5858
public void fireTransferInitiated(Resource resource, int requestType) {
59-
TransferEvent transferEvent = new TransferEvent(this.wagon,resource,TransferEvent.TRANSFER_INITIATED,requestType);
60-
transferListeners.forEach(tl->tl.transferInitiated(transferEvent));
59+
TransferEvent transferEvent = new TransferEvent(this.wagon, resource, TransferEvent.TRANSFER_INITIATED, requestType);
60+
transferListeners.forEach(tl -> tl.transferInitiated(transferEvent));
6161
}
6262

6363
@Override
6464
public void fireTransferStarted(Resource resource, int requestType, File localFile) {
65-
resource.setContentLength(localFile.length());
65+
if (localFile.exists()) {
66+
resource.setContentLength(localFile.length());
67+
}
6668
resource.setLastModified(localFile.lastModified());
67-
TransferEvent transferEvent = new TransferEvent(this.wagon,resource,TransferEvent.TRANSFER_STARTED,requestType);
69+
TransferEvent transferEvent = new TransferEvent(this.wagon, resource, TransferEvent.TRANSFER_STARTED, requestType);
6870
transferEvent.setLocalFile(localFile);
69-
transferListeners.forEach(tl->tl.transferStarted(transferEvent));
71+
transferListeners.forEach(tl -> tl.transferStarted(transferEvent));
7072
}
7173

7274
@Override
7375
public void fireTransferProgress(Resource resource, int requestType, byte[] buffer, int length) {
7476
TransferEvent transferEvent = new TransferEvent(this.wagon, resource, TransferEvent.TRANSFER_PROGRESS, requestType);
75-
transferListeners.forEach(tl->tl.transferProgress(transferEvent,buffer,length));
77+
transferListeners.forEach(tl -> tl.transferProgress(transferEvent, buffer, length));
7678
}
7779

78-
@Override public void fireTransferCompleted(Resource resource, int requestType) {
80+
@Override
81+
public void fireTransferCompleted(Resource resource, int requestType) {
7982
TransferEvent transferEvent = new TransferEvent(this.wagon, resource, TransferEvent.TRANSFER_COMPLETED, requestType);
80-
transferListeners.forEach(tl->tl.transferCompleted(transferEvent));
83+
transferListeners.forEach(tl -> tl.transferCompleted(transferEvent));
8184
}
8285

83-
@Override public void fireTransferError(Resource resource, int requestType, Exception exception) {
86+
@Override
87+
public void fireTransferError(Resource resource, int requestType, Exception exception) {
8488
TransferEvent transferEvent = new TransferEvent(this.wagon, resource, exception, requestType);
85-
transferListeners.forEach(tl->tl.transferError(transferEvent));
89+
transferListeners.forEach(tl -> tl.transferError(transferEvent));
8690
}
8791
}

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- <groupId>com.gkatzioura.maven.cloud</groupId>-->
66
<artifactId>cloud-storage-maven</artifactId>
77
<packaging>pom</packaging>
8-
<version>4.0.0</version>
8+
<version>4.1.0</version>
99

1010
<name>Cloud Storage</name>
1111
<description>The CloudStorage project enables you to use the storage options of cloud provides (Google Cloud) storage as maven repositories.</description>
@@ -43,11 +43,11 @@
4343
</scm>
4444

4545
<properties>
46-
<wagon.version>3.0.0</wagon.version>
46+
<wagon.version>3.5.3</wagon.version>
4747
<logback.version>1.2.3</logback.version>
4848
<commons-io.version>2.6</commons-io.version>
4949
<junit.version>4.12</junit.version>
50-
<maven.plugin.api.version>3.0</maven.plugin.api.version>
50+
<maven.plugin.api.version>3.3.9</maven.plugin.api.version>
5151
<maven.plugin.annotations.version>3.4</maven.plugin.annotations.version>
5252
<releasesRepository>https://oss.sonatype.org/service/local/staging/deploy/maven2/</releasesRepository>
5353
<snapshotRepository>https://oss.sonatype.org/content/repositories/snapshots/</snapshotRepository>

0 commit comments

Comments
 (0)