Skip to content

Commit 654032a

Browse files
samebGuice Team
authored andcommitted
Internal change.
PiperOrigin-RevId: 531069248
1 parent bee813b commit 654032a

File tree

4 files changed

+29
-23
lines changed

4 files changed

+29
-23
lines changed

core/src/com/google/inject/internal/InternalFlags.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public final class InternalFlags {
4848
public enum IncludeStackTraceOption {
4949
/** No stack trace collection */
5050
OFF,
51-
/** Minimum stack trace collection (Default) */
51+
/** Minimum stack trace collection (Default) */
5252
ONLY_FOR_DECLARING_SOURCE,
5353
}
5454

@@ -197,8 +197,13 @@ public String run() {
197197
} catch (SecurityException e) {
198198
return secureValue;
199199
} catch (IllegalArgumentException e) {
200-
logger.warning(value + " is not a valid flag value for " + name + ". "
201-
+ " Values must be one of " + Arrays.asList(enumType.getEnumConstants()));
200+
logger.warning(
201+
value
202+
+ " is not a valid flag value for "
203+
+ name
204+
+ ". "
205+
+ " Values must be one of "
206+
+ Arrays.asList(enumType.getEnumConstants()));
202207
return defaultValue;
203208
}
204209
}

core/src/com/google/inject/internal/RealMapBinder.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ public void configure(Binder binder) {
303303
// The map this exposes is internally an ImmutableMap, so it's OK to massage
304304
// the guice Provider to jakarta Provider in the value (since Guice provider
305305
// implements jakarta Provider).
306-
binder
307-
.bind(bindingSelection.getJakartaProviderMapKey())
308-
.to((Key) bindingSelection.getProviderMapKey());
306+
binder
307+
.bind(bindingSelection.getJakartaProviderMapKey())
308+
.to((Key) bindingSelection.getProviderMapKey());
309309

310310
// Bind Map<K, V> to the provider w/ extension support.
311311
binder
@@ -318,9 +318,9 @@ public void configure(Binder binder) {
318318

319319
// The Map.Entries are all ProviderMapEntry instances which do not allow setValue, so it is
320320
// safe to massage the return type like this
321-
binder
322-
.bind(bindingSelection.getEntrySetJakartaProviderKey())
323-
.to((Key) bindingSelection.getEntrySetBinder().getSetKey());
321+
binder
322+
.bind(bindingSelection.getEntrySetJakartaProviderKey())
323+
.to((Key) bindingSelection.getEntrySetBinder().getSetKey());
324324
}
325325

326326
@Override
@@ -1021,17 +1021,17 @@ public void configure(Binder binder) {
10211021
// The collection this exposes is internally an ImmutableMap, so it's OK to massage
10221022
// the guice Provider to jakarta Provider in the value (since the guice Provider implements
10231023
// jakarta Provider).
1024-
binder
1025-
.bind(bindingSelection.getJakartaProviderSetMultimapKey())
1026-
.to((Key) bindingSelection.getProviderSetMultimapKey());
1024+
binder
1025+
.bind(bindingSelection.getJakartaProviderSetMultimapKey())
1026+
.to((Key) bindingSelection.getProviderSetMultimapKey());
10271027

10281028
binder
10291029
.bind(bindingSelection.getProviderCollectionMultimapKey())
10301030
.to((Key) bindingSelection.getProviderSetMultimapKey());
10311031

1032-
binder
1033-
.bind(bindingSelection.getJakartaProviderCollectionMultimapKey())
1034-
.to((Key) bindingSelection.getProviderSetMultimapKey());
1032+
binder
1033+
.bind(bindingSelection.getJakartaProviderCollectionMultimapKey())
1034+
.to((Key) bindingSelection.getProviderSetMultimapKey());
10351035

10361036
// Binds a Map<K, Set<V>>
10371037
binder

core/src/com/google/inject/internal/RealMultibinder.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ public void configure(Binder binder) {
114114
// The collection this exposes is internally an ImmutableList, so it's OK to massage
115115
// the guice Provider to jakarta Provider in the value (since the guice Provider implements
116116
// jakarta Provider).
117-
binder
118-
.bind(bindingSelection.getCollectionOfJakartaProvidersKey())
119-
.to((Key) bindingSelection.getCollectionOfProvidersKey());
117+
binder
118+
.bind(bindingSelection.getCollectionOfJakartaProvidersKey())
119+
.to((Key) bindingSelection.getCollectionOfProvidersKey());
120120
}
121121

122122
public void permitDuplicates() {
@@ -274,6 +274,7 @@ private InternalProvisionException newDuplicateValuesException(T[] values) {
274274
bindingSelection.getSetKey(), bindings, values, ImmutableList.of(getSource())));
275275
return new InternalProvisionException(message);
276276
}
277+
277278
@SuppressWarnings("unchecked")
278279
@Override
279280
public <B, V> V acceptExtensionVisitor(

core/src/com/google/inject/internal/RealOptionalBinder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ public void configure(Binder binder) {
211211
// Provider is assignable to jakarta.inject.Provider and the provider that the factory contains
212212
// cannot be modified so we can use some rawtypes hackery to share the same implementation.
213213
// cgcb.Optional<jakarta.inject.Provider<T>>
214-
binder.bind(key.ofType(optionalOfJakartaProvider(typeLiteral))).to((Key) guavaOptProviderKey);
215-
// ju.Optional<jakarta.inject.Provider<T>>
216-
binder
217-
.bind(key.ofType(javaOptionalOfJakartaProvider(typeLiteral)))
218-
.to((Key) javaOptProviderKey);
214+
binder.bind(key.ofType(optionalOfJakartaProvider(typeLiteral))).to((Key) guavaOptProviderKey);
215+
// ju.Optional<jakarta.inject.Provider<T>>
216+
binder
217+
.bind(key.ofType(javaOptionalOfJakartaProvider(typeLiteral)))
218+
.to((Key) javaOptProviderKey);
219219

220220
// cgcb.Optional<T>
221221
Key<Optional<T>> guavaOptKey = key.ofType(optionalOf(typeLiteral));

0 commit comments

Comments
 (0)