Skip to content

HDDS-14203. Use EndpointBuilder in all S3G unit tests #9522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 1 commit into from
Dec 18, 2025
Merged

HDDS-14203. Use EndpointBuilder in all S3G unit tests #9522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/client/ObjectStoreStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCKET_NOT_EMPTY;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCKET_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_FOUND;
import static org.mockito.Mockito.mock;

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

public ObjectStoreStub() {
super();
super(conf, mock(ClientProtocol.class));
}

public ObjectStoreStub(ConfigurationSource conf, ClientProtocol proxy) {
Expand Down
10 changes: 8 additions & 2 deletions ...op-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import javax.ws.rs.core.UriInfo;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.s3.RequestIdentifier;
import org.apache.hadoop.ozone.s3.signature.SignatureInfo;

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

if (ozoneClient != null) {
endpoint.setClient(ozoneClient);
if (endpoint.getClient() == null) {
endpoint.setClient(getClient());
}

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

endpoint.initialization();

return endpoint;
}

protected OzoneClient getClient() {
if (ozoneClient == null) {
ozoneClient = new OzoneClientStub();
}
return ozoneClient;
}

Expand Down
Loading