Skip to content

Remove preview wording/annotations #6656

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
dagnir merged 2 commits into from
Jan 5, 2026
Merged

Remove preview wording/annotations #6656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe224ca
Remove preview wording/annotations
dagnir Jan 5, 2026
f383a99
Fix test
dagnir Jan 5, 2026
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
4 changes: 1 addition & 3 deletions ...s/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
import org.apache.hc.core5.ssl.SSLInitializationException;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import software.amazon.awssdk.annotations.SdkPreviewApi;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.annotations.SdkTestInternalApi;
import software.amazon.awssdk.http.AbortableInputStream;
Expand Down Expand Up @@ -126,11 +125,10 @@
* <p>This can be created via {@link #builder()}</p>
*/

@SdkPreviewApi
@SdkPublicApi
public final class Apache5HttpClient implements SdkHttpClient {

private static final String CLIENT_NAME = "Apache5Preview";
private static final String CLIENT_NAME = "Apache5";

private static final Logger log = Logger.loggerFor(Apache5HttpClient.class);
private static final HostnameVerifier DEFAULT_HOSTNAME_VERIFIER = new DefaultHostnameVerifier();
Expand Down
2 changes: 0 additions & 2 deletions ...ache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5SdkHttpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@

package software.amazon.awssdk.http.apache5;

import software.amazon.awssdk.annotations.SdkPreviewApi;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.http.SdkHttpClient;
import software.amazon.awssdk.http.SdkHttpService;

/**
* Service binding for the Apache5 implementation.
*/
@SdkPreviewApi
@SdkPublicApi
public class Apache5SdkHttpService implements SdkHttpService {
@Override
Expand Down
2 changes: 0 additions & 2 deletions .../apache5-client/src/main/java/software/amazon/awssdk/http/apache5/ProxyConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import software.amazon.awssdk.annotations.SdkPreviewApi;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.utils.ProxyConfigProvider;
import software.amazon.awssdk.utils.ProxySystemSetting;
Expand All @@ -34,7 +33,6 @@
/**
* Configuration that defines how to communicate via an HTTP or HTTPS proxy.
*/
@SdkPreviewApi
@SdkPublicApi
public final class ProxyConfiguration implements ToCopyableBuilder<ProxyConfiguration.Builder, ProxyConfiguration> {
private final URI endpoint;
Expand Down
4 changes: 2 additions & 2 deletions ...apache5-client/src/test/java/software/amazon/awssdk/http/apache5/MetricReportingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void prepareRequest_callableCalled_metricsReported() throws IOException {

client.prepareRequest(executeRequest).call();
MetricCollection collected = collector.collect();
assertThat(collected.metricValues(HTTP_CLIENT_NAME)).containsExactly("Apache5Preview");
assertThat(collected.metricValues(HTTP_CLIENT_NAME)).containsExactly("Apache5");
assertThat(collected.metricValues(LEASED_CONCURRENCY)).containsExactly(1);
assertThat(collected.metricValues(PENDING_CONCURRENCY_ACQUIRES)).containsExactly(2);
assertThat(collected.metricValues(AVAILABLE_CONCURRENCY)).containsExactly(3);
Expand All @@ -94,7 +94,7 @@ public void prepareRequest_connectionManagerNotPooling_callableCalled_metricsRep

MetricCollection collected = collector.collect();

assertThat(collected.metricValues(HTTP_CLIENT_NAME)).containsExactly("Apache5Preview");
assertThat(collected.metricValues(HTTP_CLIENT_NAME)).containsExactly("Apache5");
assertThat(collected.metricValues(LEASED_CONCURRENCY)).isEmpty();
assertThat(collected.metricValues(PENDING_CONCURRENCY_ACQUIRES)).isEmpty();
assertThat(collected.metricValues(AVAILABLE_CONCURRENCY)).isEmpty();
Expand Down
Loading