Skip to content

Commit 7697807

Browse files
authored
Add default methods to AwsServiceClientConfiguration.Builder and SdkServiceClientConfiguration.Builder. (#4263)
This allows older client versions to still compile with newer runtime versions.
1 parent 8d8985b commit 7697807

File tree

2 files changed

+33
-11
lines changed

2 files changed

+33
-11
lines changed

core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsServiceClientConfiguration.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,31 @@ public interface Builder extends SdkServiceClientConfiguration.Builder {
6969
/**
7070
* Return the region
7171
*/
72-
Region region();
72+
default Region region() {
73+
throw new UnsupportedOperationException();
74+
}
7375

7476
/**
7577
* Configure the region
7678
*/
77-
Builder region(Region region);
79+
default Builder region(Region region) {
80+
throw new UnsupportedOperationException();
81+
}
7882

7983
@Override
80-
Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration);
84+
default Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration) {
85+
throw new UnsupportedOperationException();
86+
}
8187

8288
@Override
83-
Builder endpointOverride(URI endpointOverride);
89+
default Builder endpointOverride(URI endpointOverride) {
90+
throw new UnsupportedOperationException();
91+
}
8492

8593
@Override
86-
Builder endpointProvider(EndpointProvider endpointProvider);
94+
default Builder endpointProvider(EndpointProvider endpointProvider) {
95+
throw new UnsupportedOperationException();
96+
}
8797

8898
@Override
8999
AwsServiceClientConfiguration build();

core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkServiceClientConfiguration.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,27 +97,39 @@ public interface Builder {
9797
/**
9898
* Return the client override configuration
9999
*/
100-
ClientOverrideConfiguration overrideConfiguration();
100+
default ClientOverrideConfiguration overrideConfiguration() {
101+
throw new UnsupportedOperationException();
102+
}
101103

102104
/**
103105
* Return the endpoint override
104106
*/
105-
URI endpointOverride();
107+
default URI endpointOverride() {
108+
throw new UnsupportedOperationException();
109+
}
106110

107-
EndpointProvider endpointProvider();
111+
default EndpointProvider endpointProvider() {
112+
throw new UnsupportedOperationException();
113+
}
108114

109115
/**
110116
* Configure the client override configuration
111117
*/
112-
Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration);
118+
default Builder overrideConfiguration(ClientOverrideConfiguration clientOverrideConfiguration) {
119+
throw new UnsupportedOperationException();
120+
}
113121

114122
/**
115123
* Configure the endpoint override
116124
*/
117-
Builder endpointOverride(URI endpointOverride);
125+
default Builder endpointOverride(URI endpointOverride) {
126+
throw new UnsupportedOperationException();
127+
}
118128

119129

120-
Builder endpointProvider(EndpointProvider endpointProvider);
130+
default Builder endpointProvider(EndpointProvider endpointProvider) {
131+
throw new UnsupportedOperationException();
132+
}
121133

122134
/**
123135
* Build the service client configuration using the configuration on this builder

0 commit comments

Comments
 (0)