Skip to content

Commit 2a31fb9

Browse files
zzq996zzq996
authored
Merge pull request #133 from zzq996/master
Version 3.23.3 New features: 1. 支持crr进度查询 2. 新增对象标签接口(设置、获取、删除 对象标签) Third-party dependence: 1. 使用 powermock-module-junit4 2.0.9 替代 powermock-module-junit4 1.6.5 2. 使用 powermock-api-mockito2 2.0.9 替代 powermock-api-mockito 1.6.5 3. 使用 mockito-core 4.11.0 替代 mockito-core 1.10.19
2 parents 0512c23 + 978113d commit 2a31fb9

File tree

71 files changed

+1264
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1264
-171
lines changed

‎README-Android.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 3.23.3
2+
New features:
3+
1. Allow you to query the progress of crr
4+
2. Added interfaces of Object tagging(set, get, delete)
5+
6+
Third-party dependence:
7+
1. Replace powermock-module-junit4 2.0.9 with powermock-module-junit4 1.6.5
8+
2. Replace powermock-api-mockito2 2.0.9 with powermock-api-mockito 1.6.5
9+
3. Replace mockito-core 4.11.0 with mockito-core 1.10.19
10+
-----------------------------------------------------------------------------------
11+
112
Version 3.21.12
213
Third-party dependence:
314
1. Replace log4j2 2.16.0 with log4j2 2.17.0

‎README-Java.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 3.23.3
2+
New features:
3+
1. Allow you to query the progress of crr
4+
2. Added interfaces of Object tagging(set, get, delete)
5+
6+
Third-party dependence:
7+
1. Replace powermock-module-junit4 2.0.9 with powermock-module-junit4 1.6.5
8+
2. Replace powermock-api-mockito2 2.0.9 with powermock-api-mockito 1.6.5
9+
3. Replace mockito-core 4.11.0 with mockito-core 1.10.19
10+
-----------------------------------------------------------------------------------
11+
112
Version 3.22.12
213
New features:
314
1. Added the Deep Archive storage class in the Java SDK.

‎README.MD‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 3.23.3
2+
New features:
3+
1. Allow you to query the progress of crr
4+
2. Added interfaces of Object tagging(set, get, delete)
5+
6+
Third-party dependence:
7+
1. Replace powermock-module-junit4 2.0.9 with powermock-module-junit4 1.6.5
8+
2. Replace powermock-api-mockito2 2.0.9 with powermock-api-mockito 1.6.5
9+
3. Replace mockito-core 4.11.0 with mockito-core 1.10.19
10+
-----------------------------------------------------------------------------------
11+
112
Version 3.22.12
213
New features:
314
1. Added the Deep Archive storage class in the Java SDK.

‎README_CN.MD‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 3.23.3
2+
New features:
3+
1. 支持crr进度查询
4+
2. 新增对象标签接口(设置、获取、删除 对象标签)
5+
6+
Third-party dependence:
7+
1. 使用 powermock-module-junit4 2.0.9 替代 powermock-module-junit4 1.6.5
8+
2. 使用 powermock-api-mockito2 2.0.9 替代 powermock-api-mockito 1.6.5
9+
3. 使用 mockito-core 4.11.0 替代 mockito-core 1.10.19
10+
-----------------------------------------------------------------------------------
11+
112
Version 3.22.12
213
New features:
314
1. Java SDK支持深度归档

‎app/src/main/java/com/obs/log/BasicLogger.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,131 +24,152 @@ public class BasicLogger implements ILogger {
2424
this.logger = logger;
2525
}
2626

27+
@Override
2728
public boolean isInfoEnabled() {
2829
return this.logger.isLoggable(LogConfigurator.INFO);
2930
}
3031

32+
@Override
3133
public void info(CharSequence msg) {
3234
if (msg != null) {
3335
this.logger.info(msg.toString());
3436
AccessLoggerUtils.appendLog(msg, "info");
3537
}
3638
}
3739

40+
@Override
3841
public void info(Object obj) {
3942
if (obj != null) {
4043
this.logger.info(obj.toString());
4144
AccessLoggerUtils.appendLog(obj, "info");
4245
}
4346
}
4447

48+
@Override
4549
public void info(Object obj, Throwable e) {
4650
if (obj != null) {
4751
this.logger.log(LogConfigurator.INFO, obj.toString(), e);
4852
AccessLoggerUtils.appendLog(obj, "info");
4953
}
5054
}
5155

56+
@Override
5257
public boolean isWarnEnabled() {
5358
return this.logger.isLoggable(LogConfigurator.WARN);
5459
}
5560

61+
@Override
5662
public void warn(CharSequence msg) {
5763
if (msg != null) {
5864
this.logger.warning(msg.toString());
5965
AccessLoggerUtils.appendLog(msg, "warn");
6066
}
6167
}
6268

69+
@Override
6370
public void warn(Object obj) {
6471
if (obj != null) {
6572
this.logger.warning(obj.toString());
6673
AccessLoggerUtils.appendLog(obj, "warn");
6774
}
6875
}
6976

77+
@Override
7078
public void warn(Object obj, Throwable e) {
7179
if (obj != null) {
7280
this.logger.log(LogConfigurator.WARN, obj.toString(), e);
7381
AccessLoggerUtils.appendLog(obj, "warn");
7482
}
7583
}
7684

85+
@Override
7786
public boolean isErrorEnabled() {
7887
return this.logger.isLoggable(LogConfigurator.ERROR);
7988
}
8089

90+
@Override
8191
public void error(CharSequence msg) {
8292
if (msg != null) {
8393
this.logger.severe(msg.toString());
8494
AccessLoggerUtils.appendLog(msg, "error");
8595
}
8696
}
8797

98+
@Override
8899
public void error(Object obj) {
89100
if (obj != null) {
90101
this.logger.severe(obj.toString());
91102
AccessLoggerUtils.appendLog(obj, "error");
92103
}
93104
}
94105

106+
@Override
95107
public void error(Object obj, Throwable e) {
96108
if (obj != null) {
97109
this.logger.log(LogConfigurator.ERROR, obj.toString(), e);
98110
AccessLoggerUtils.appendLog(obj, "error");
99111
}
100112
}
101113

114+
@Override
102115
public boolean isDebugEnabled() {
103116
return this.logger.isLoggable(LogConfigurator.DEBUG);
104117
}
105118

119+
@Override
106120
public void debug(CharSequence msg) {
107121
if (msg != null) {
108122
this.logger.log(LogConfigurator.DEBUG, msg.toString());
109123
AccessLoggerUtils.appendLog(msg, "debug");
110124
}
111125
}
112126

127+
@Override
113128
public void debug(Object obj) {
114129
if (obj != null) {
115130
this.logger.log(LogConfigurator.DEBUG, obj.toString());
116131
AccessLoggerUtils.appendLog(obj, "debug");
117132
}
118133
}
119134

135+
@Override
120136
public void debug(Object obj, Throwable e) {
121137
if (obj != null) {
122138
this.logger.log(LogConfigurator.DEBUG, obj.toString(), e);
123139
AccessLoggerUtils.appendLog(obj, "debug");
124140
}
125141
}
126142

143+
@Override
127144
public boolean isTraceEnabled() {
128145
return this.logger.isLoggable(LogConfigurator.TRACE);
129146
}
130147

148+
@Override
131149
public void trace(CharSequence msg) {
132150
if (msg != null) {
133151
this.logger.log(LogConfigurator.TRACE, msg.toString());
134152
AccessLoggerUtils.appendLog(msg, "trace");
135153
}
136154
}
137155

156+
@Override
138157
public void trace(Object obj) {
139158
if (obj != null) {
140159
this.logger.log(LogConfigurator.TRACE, obj.toString());
141160
AccessLoggerUtils.appendLog(obj, "trace");
142161
}
143162
}
144163

164+
@Override
145165
public void trace(Object obj, Throwable e) {
146166
if (obj != null) {
147167
this.logger.log(LogConfigurator.TRACE, obj.toString(), e);
148168
AccessLoggerUtils.appendLog(obj, "trace");
149169
}
150170
}
151171

172+
@Override
152173
public void accessRecord(Object obj) {
153174
if (obj != null) {
154175
this.logger.log(LogConfigurator.INFO, obj.toString());

‎app/src/main/java/com/obs/log/Log4j2Logger.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ private static class Log4j2LoggerMethodHolder extends LoggerMethodHolder {
5353
super(logger);
5454
}
5555

56+
@Override
5657
public boolean isInfoEnabled() {
5758
if (isInfoE == -1) {
5859
try {
@@ -65,6 +66,7 @@ public boolean isInfoEnabled() {
6566
return isInfoE == 1;
6667
}
6768

69+
@Override
6870
public boolean isWarnEnabled() {
6971
if (isWarnE == -1) {
7072
try {
@@ -77,6 +79,7 @@ public boolean isWarnEnabled() {
7779
return isWarnE == 1;
7880
}
7981

82+
@Override
8083
public boolean isErrorEnabled() {
8184
if (isErrorE == -1) {
8285
try {
@@ -89,6 +92,7 @@ public boolean isErrorEnabled() {
8992
return isErrorE == 1;
9093
}
9194

95+
@Override
9296
public boolean isDebugEnabled() {
9397
if (isDebugE == -1) {
9498
try {
@@ -101,6 +105,7 @@ public boolean isDebugEnabled() {
101105
return isDebugE == 1;
102106
}
103107

108+
@Override
104109
public boolean isTraceEnabled() {
105110
if (isTraceE == -1) {
106111
try {

‎app/src/main/java/com/obs/log/Log4jLogger.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ private static class Log4jLoggerMethodHolder extends LoggerMethodHolder {
5757
super(logger);
5858
}
5959

60+
@Override
6061
public boolean isInfoEnabled() {
6162
try {
6263
return this.logger != null && Log4jLoggerMethodHolder.infoLevel != null
@@ -67,6 +68,7 @@ public boolean isInfoEnabled() {
6768
}
6869
}
6970

71+
@Override
7072
public boolean isWarnEnabled() {
7173
try {
7274
return this.logger != null && Log4jLoggerMethodHolder.warnLevel != null
@@ -77,6 +79,7 @@ public boolean isWarnEnabled() {
7779
}
7880
}
7981

82+
@Override
8083
public boolean isErrorEnabled() {
8184
try {
8285
return this.logger != null && Log4jLoggerMethodHolder.errorLevel != null
@@ -87,6 +90,7 @@ public boolean isErrorEnabled() {
8790
}
8891
}
8992

93+
@Override
9094
public boolean isDebugEnabled() {
9195
try {
9296
return this.logger != null && Log4jLoggerMethodHolder.debugLevel != null
@@ -97,6 +101,7 @@ public boolean isDebugEnabled() {
97101
}
98102
}
99103

104+
@Override
100105
public boolean isTraceEnabled() {
101106
try {
102107
return this.logger != null && Log4jLoggerMethodHolder.traceLevel != null

‎app/src/main/java/com/obs/log/LoggerBuilder.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@ static class GetLoggerHolder {
3131
logManagerClass = Class.forName("org.apache.logging.log4j.LogManager");
3232
loggerClass = Class.forName("org.apache.logging.log4j.Logger");
3333
getLoggerClass = GetLoggerHolder.logManagerClass.getMethod("getLogger", String.class);
34-
} catch (NoSuchMethodException | SecurityException | ClassNotFoundException e) {
34+
} catch (NoSuchMethodException | SecurityException | ClassNotFoundException | NoClassDefFoundError e) {
3535
try {
3636
loggerClass = Class.forName("org.apache.log4j.Logger");
3737
getLoggerClass = GetLoggerHolder.loggerClass.getMethod("getLogger", String.class);
38-
} catch (NoSuchMethodException | SecurityException | ClassNotFoundException ex) {
38+
} catch (NoSuchMethodException | SecurityException | ClassNotFoundException | NoClassDefFoundError ex) {
3939
try {
4040
loggerClass = Class.forName("java.util.logging.Logger");
4141
getLoggerClass = GetLoggerHolder.loggerClass.getMethod("getLogger", String.class);
42-
} catch (NoSuchMethodException | SecurityException | ClassNotFoundException exx) {
42+
} catch (NoSuchMethodException | SecurityException | ClassNotFoundException |
43+
NoClassDefFoundError exx) {
4344
ILOG.warning(exx.getMessage());
4445
}
4546
}

‎app/src/main/java/com/obs/services/AbstractBatchClient.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,7 @@ public TaskProgressStatus restoreObjects(RestoreObjectsRequest request) throws O
109109
executor.shutdown();
110110
executor.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
111111
} catch (Exception e) {
112-
if (e instanceof ObsException) {
113-
throw (ObsException) e;
114-
} else {
115-
throw new ObsException(e.getMessage(), e);
116-
}
112+
throw ServiceUtils.changeFromException(e);
117113
}
118114
return progreStatus;
119115
}
@@ -229,11 +225,7 @@ public UploadProgressStatus putObjects(final PutObjectsRequest request) throws O
229225
executor.shutdown();
230226
executor.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
231227
} catch (Exception e) {
232-
if (e instanceof ObsException) {
233-
throw (ObsException) e;
234-
} else {
235-
throw new ObsException(e.getMessage(), e);
236-
}
228+
throw ServiceUtils.changeFromException(e);
237229
}
238230

239231
return progressStatus;

‎app/src/main/java/com/obs/services/AbstractBucketAdvanceClient.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@
3636
import com.obs.services.model.SetBucketTaggingRequest;
3737
import com.obs.services.model.SetBucketWebsiteRequest;
3838
import com.obs.services.model.WebsiteConfiguration;
39+
import com.obs.services.model.crr.GetCrrProgressRequest;
40+
import com.obs.services.model.crr.GetCrrProgressResult;
3941
import com.obs.services.model.fs.GetBucketFSStatusRequest;
4042
import com.obs.services.model.fs.GetBucketFSStatusResult;
4143
import com.obs.services.model.fs.SetBucketFSStatusRequest;
44+
import com.obs.services.model.AuthTypeEnum;
4245

4346
public abstract class AbstractBucketAdvanceClient extends AbstractBucketClient {
4447
/*
@@ -574,6 +577,28 @@ public ReplicationConfiguration action() throws ServiceException {
574577
});
575578
}
576579

580+
@Override
581+
public GetCrrProgressResult getCrrProgress(final GetCrrProgressRequest request) throws ObsException {
582+
ServiceUtils.assertParameterNotNull(request, "GetCrrProgressRequest is null");
583+
ServiceUtils.assertParameterNotNull2(request.getBucketName(), "bucketName is null");
584+
ServiceUtils.assertParameterNotNull2(request.getRuleId(), "ruleId is null");
585+
return this.doActionWithResult("getCrrProgress", request.getBucketName(),
586+
new ActionCallbackWithResult<GetCrrProgressResult>() {
587+
@Override
588+
public GetCrrProgressResult action() throws ServiceException {
589+
return AbstractBucketAdvanceClient.this.getCrrProgressImpl(request);
590+
}
591+
void authTypeNegotiate(String bucketName) throws ServiceException {
592+
AuthTypeEnum authTypeEnum = AbstractBucketAdvanceClient.this.getProviderCredentials().getLocalAuthType().get(bucketName);
593+
if (authTypeEnum == null) {
594+
authTypeEnum = AbstractBucketAdvanceClient.this.getApiVersion(request.getBucketName());
595+
AbstractBucketAdvanceClient.this.getProviderCredentials().setLocalAuthType(bucketName, authTypeEnum);
596+
}
597+
598+
}
599+
});
600+
}
601+
577602
/*
578603
* (non-Javadoc)
579604
*

0 commit comments

Comments
 (0)