Skip to content

Commit 8ce3a4d

Browse files
committed
AuthTransport -> GoogleAuthTransport.
1 parent ce74e45 commit 8ce3a4d

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ public class ComputeEngineCredentials extends GoogleCredentials
109109
static final int MAX_COMPUTE_PING_TRIES = 3;
110110
static final int COMPUTE_PING_CONNECTION_TIMEOUT_MS = 500;
111111

112-
public enum AuthTransport {
112+
public enum GoogleAuthTransport {
113113
// Authenticating to Google APIs via DirectPath
114114
ALTS("alts"),
115115
// Authenticating to Google APIs via GFE
116116
MTLS("mtls");
117117

118118
private final String label;
119119

120-
private AuthTransport(String label) {
120+
private GoogleAuthTransport(String label) {
121121
this.label = label;
122122
}
123123

@@ -156,7 +156,7 @@ public String getLabel() {
156156

157157
private final Collection<String> scopes;
158158

159-
private final AuthTransport transport;
159+
private final GoogleAuthTransport transport;
160160
private final BindingEnforcement bindingEnforcement;
161161

162162
private transient HttpTransportFactory transportFactory;
@@ -189,7 +189,7 @@ private ComputeEngineCredentials(ComputeEngineCredentials.Builder builder) {
189189
scopeList.removeAll(Arrays.asList("", null));
190190
this.scopes = ImmutableSet.<String>copyOf(scopeList);
191191
}
192-
this.transport = builder.getAuthTransport();
192+
this.transport = builder.getGoogleAuthTransport();
193193
this.bindingEnforcement = builder.getBindingEnforcement();
194194
}
195195

@@ -691,7 +691,7 @@ public static class Builder extends GoogleCredentials.Builder {
691691
private Collection<String> scopes;
692692
private Collection<String> defaultScopes;
693693

694-
private AuthTransport transport;
694+
private GoogleAuthTransport transport;
695695
private BindingEnforcement bindingEnforcement;
696696

697697
protected Builder() {
@@ -736,19 +736,19 @@ public Builder setQuotaProjectId(String quotaProjectId) {
736736
}
737737

738738
/**
739-
* Set the {@code AuthTransport} type.
740-
*
739+
* Set the {@code GoogleAuthTransport} type.
740+
*
741741
* @param transport the transport type over which to authenticate to Google APIs
742742
*/
743743
@CanIgnoreReturnValue
744-
public Builder setAuthTransport(AuthTransport transport) {
744+
public Builder setGoogleAuthTransport(GoogleAuthTransport transport) {
745745
this.transport = transport;
746746
return this;
747747
}
748748

749749
/**
750750
* Set the {@code BindingEnforcement} type.
751-
*
751+
*
752752
* @param bindingEnforcement the token binding enforcement policy.
753753
*/
754754
@CanIgnoreReturnValue
@@ -770,17 +770,17 @@ public Collection<String> getDefaultScopes() {
770770
}
771771

772772
/**
773-
* Get the {@code AuthTransport} type.
774-
*
773+
* Get the {@code GoogleAuthTransport} type.
774+
*
775775
* @return the transport type over which to authenticate to Google APIs
776776
*/
777-
public AuthTransport getAuthTransport() {
777+
public GoogleAuthTransport getGoogleAuthTransport() {
778778
return transport;
779779
}
780780

781781
/**
782782
* Get the {@code BindingEnforcement} type.
783-
*
783+
*
784784
* @return the token binding enforcement policy.
785785
*/
786786
public BindingEnforcement getBindingEnforcement() {

oauth2_http/javatests/com/google/auth/oauth2/ComputeEngineCredentialsTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void buildTokenUrlWithScopes_defaultScopes() {
194194
public void buildTokenUrl_nullTransport() {
195195
ComputeEngineCredentials credentials =
196196
ComputeEngineCredentials.newBuilder()
197-
.setAuthTransport(null)
197+
.setGoogleAuthTransport(null)
198198
.setBindingEnforcement(ComputeEngineCredentials.BindingEnforcement.ON)
199199
.build();
200200
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
@@ -206,7 +206,7 @@ public void buildTokenUrl_nullTransport() {
206206
public void buildTokenUrl_nullBindingEnforcement() {
207207
ComputeEngineCredentials credentials =
208208
ComputeEngineCredentials.newBuilder()
209-
.setAuthTransport(ComputeEngineCredentials.AuthTransport.MTLS)
209+
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.MTLS)
210210
.setBindingEnforcement(null)
211211
.build();
212212
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
@@ -218,7 +218,7 @@ public void buildTokenUrl_nullBindingEnforcement() {
218218
public void buildTokenUrl_nullTransport_nullBindingEnforcement() {
219219
ComputeEngineCredentials credentials =
220220
ComputeEngineCredentials.newBuilder()
221-
.setAuthTransport(null)
221+
.setGoogleAuthTransport(null)
222222
.setBindingEnforcement(null)
223223
.build();
224224
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
@@ -230,7 +230,7 @@ public void buildTokenUrl_nullTransport_nullBindingEnforcement() {
230230
public void buildTokenUrlSoftMtlsBound_mtls_transport() {
231231
ComputeEngineCredentials credentials =
232232
ComputeEngineCredentials.newBuilder()
233-
.setAuthTransport(ComputeEngineCredentials.AuthTransport.MTLS)
233+
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.MTLS)
234234
.build();
235235
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
236236

@@ -252,7 +252,7 @@ public void buildTokenUrlSoftMtlsBound_iam_enforcement() {
252252
public void buildTokenUrlSoftMtlsBound_mtls_transport_iam_enforcement() {
253253
ComputeEngineCredentials credentials =
254254
ComputeEngineCredentials.newBuilder()
255-
.setAuthTransport(ComputeEngineCredentials.AuthTransport.MTLS)
255+
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.MTLS)
256256
.setBindingEnforcement(ComputeEngineCredentials.BindingEnforcement.IAM_POLICY)
257257
.build();
258258
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
@@ -275,7 +275,7 @@ public void buildTokenUrlHardMtlsBound_always_enforced() {
275275
public void buildTokenUrlHardMtlsBound_mtls_transport_always_enforced() {
276276
ComputeEngineCredentials credentials =
277277
ComputeEngineCredentials.newBuilder()
278-
.setAuthTransport(ComputeEngineCredentials.AuthTransport.MTLS)
278+
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.MTLS)
279279
.setBindingEnforcement(ComputeEngineCredentials.BindingEnforcement.ON)
280280
.build();
281281
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
@@ -287,7 +287,7 @@ public void buildTokenUrlHardMtlsBound_mtls_transport_always_enforced() {
287287
public void buildTokenUrlHardDirectPathBound_alts_transport() {
288288
ComputeEngineCredentials credentials =
289289
ComputeEngineCredentials.newBuilder()
290-
.setAuthTransport(ComputeEngineCredentials.AuthTransport.ALTS)
290+
.setGoogleAuthTransport(ComputeEngineCredentials.GoogleAuthTransport.ALTS)
291291
.build();
292292
String softBoundTokenUrl = credentials.createTokenUrlWithScopes();
293293

0 commit comments

Comments
 (0)