Skip to content

Commit a5d44be

Browse files
authored
HDDS-14203. Use EndpointBuilder in all S3G unit tests (#9522)
1 parent 8eaca4c commit a5d44be

10 files changed

Lines changed: 83 additions & 150 deletions

hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/ObjectStoreStub.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCKET_NOT_EMPTY;
2222
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCKET_NOT_FOUND;
2323
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_FOUND;
24+
import static org.mockito.Mockito.mock;
2425

2526
import java.io.IOException;
2627
import java.util.HashMap;
@@ -44,7 +45,7 @@ public class ObjectStoreStub extends ObjectStore {
4445
private Map<String, Boolean> bucketEmptyStatus = new HashMap<>();
4546

4647
public ObjectStoreStub() {
47-
super();
48+
super(conf, mock(ClientProtocol.class));
4849
}
4950

5051
public ObjectStoreStub(ConfigurationSource conf, ClientProtocol proxy) {

hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBuilder.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import javax.ws.rs.core.UriInfo;
2828
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
2929
import org.apache.hadoop.ozone.client.OzoneClient;
30+
import org.apache.hadoop.ozone.client.OzoneClientStub;
3031
import org.apache.hadoop.ozone.s3.RequestIdentifier;
3132
import org.apache.hadoop.ozone.s3.signature.SignatureInfo;
3233

@@ -97,8 +98,8 @@ public EndpointBuilder<T> setSignatureInfo(SignatureInfo newSignatureInfo) {
9798
public T build() {
9899
T endpoint = base != null ? base : constructor.get();
99100

100-
if (ozoneClient != null) {
101-
endpoint.setClient(ozoneClient);
101+
if (endpoint.getClient() == null) {
102+
endpoint.setClient(getClient());
102103
}
103104

104105
final OzoneConfiguration config = getConfig();
@@ -109,10 +110,15 @@ public T build() {
109110
endpoint.setRequestIdentifier(identifier);
110111
endpoint.setSignatureInfo(signatureInfo);
111112

113+
endpoint.initialization();
114+
112115
return endpoint;
113116
}
114117

115118
protected OzoneClient getClient() {
119+
if (ozoneClient == null) {
120+
ozoneClient = new OzoneClientStub();
121+
}
116122
return ozoneClient;
117123
}
118124

0 commit comments

Comments
 (0)