Skip to content

Verifying the http default values #525

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
merged 1 commit into from
Jun 6, 2018
Merged

Verifying the http default values #525

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
2 changes: 0 additions & 2 deletions .../src/main/java/software/amazon/awssdk/awscore/config/options/AwsAdvancedClientOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

package software.amazon.awssdk.awscore.config.options;

import software.amazon.awssdk.annotations.ReviewBeforeRelease;
import software.amazon.awssdk.annotations.SdkPublicApi;
import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
import software.amazon.awssdk.core.config.ClientOverrideConfiguration.Builder;
Expand All @@ -31,7 +30,6 @@
*
* @param <T> The type of value associated with the option.
*/
@ReviewBeforeRelease("Ensure that all of these options are actually advanced.")
@SdkPublicApi
public final class AwsAdvancedClientOption<T> extends SdkAdvancedClientOption<T> {

Expand Down
6 changes: 0 additions & 6 deletions core/src/main/java/software/amazon/awssdk/core/SdkSystemSetting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ public enum SdkSystemSetting implements SystemSetting {
*/
AWS_REGION("aws.region", null),

/**
* Whether the default configuration applied to AWS clients should be optimized for services within the same region.
* This will usually include lower request timeouts because requests do not need to travel outside of the AWS network.
*/
AWS_IN_REGION_OPTIMIZATION_ENABLED("aws.inRegionOptimizationEnabled", "false"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing this because it is unused?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes


/**
* Whether to load information such as credentials, regions from EC2 Metadata instance service.
*/
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/software/amazon/awssdk/core/config/options/SdkAdvancedClientOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
*
* @param <T> The type of value associated with the option.
*/
@ReviewBeforeRelease("Ensure that all of these options are actually advanced.")
@SdkPublicApi
public class SdkAdvancedClientOption<T> extends ClientOption<T> {
/**
Expand Down
1 change: 0 additions & 1 deletion http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpConfigurationOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ public final class SdkHttpConfigurationOption<T> extends AttributeMap.Key<T> {
private static final Boolean DEFAULT_USE_STRICT_HOSTNAME_VERIFICATION = Boolean.TRUE;
private static final Boolean DEFAULT_TRUST_ALL_CERTIFICATES = Boolean.FALSE;

@ReviewBeforeRelease("Confirm defaults")
public static final AttributeMap GLOBAL_HTTP_DEFAULTS = AttributeMap
.builder()
.put(READ_TIMEOUT, DEFAULT_SOCKET_READ_TIMEOUT)
Expand Down
7 changes: 5 additions & 2 deletions ...nts/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/Defaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,20 @@
package software.amazon.awssdk.http.apache.internal;

import java.time.Duration;
import software.amazon.awssdk.annotations.ReviewBeforeRelease;

/**
* Default configuration values.
*/
@ReviewBeforeRelease("These values")
public final class Defaults {

/**
* The default maximum idle time (in milliseconds) for a connection to be idle in the connection pool and
* still be eligible for reuse.
*/
public static final Duration MAX_IDLE_CONNECTION_TIME = Duration.ofSeconds(60);

/**
* The default expiration time for a connection in the connection pool.
* A value of -1 means infinite TTL in Apache.
*/
public static final Duration CONNECTION_POOL_TTL = Duration.ofMillis(-1);
Expand Down