From 654032a954d55a00fc5ee90da815da98cb6676a1 Mon Sep 17 00:00:00 2001 From: Sam Berlin Date: Wed, 10 May 2023 19:41:22 -0700 Subject: [PATCH] Internal change. PiperOrigin-RevId: 531069248 --- .../google/inject/internal/InternalFlags.java | 11 ++++++--- .../google/inject/internal/RealMapBinder.java | 24 +++++++++---------- .../inject/internal/RealMultibinder.java | 7 +++--- .../inject/internal/RealOptionalBinder.java | 10 ++++---- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/core/src/com/google/inject/internal/InternalFlags.java b/core/src/com/google/inject/internal/InternalFlags.java index 22d2305871..c6de91baa6 100644 --- a/core/src/com/google/inject/internal/InternalFlags.java +++ b/core/src/com/google/inject/internal/InternalFlags.java @@ -48,7 +48,7 @@ public final class InternalFlags { public enum IncludeStackTraceOption { /** No stack trace collection */ OFF, - /** Minimum stack trace collection (Default) */ + /** Minimum stack trace collection (Default) */ ONLY_FOR_DECLARING_SOURCE, } @@ -197,8 +197,13 @@ public String run() { } catch (SecurityException e) { return secureValue; } catch (IllegalArgumentException e) { - logger.warning(value + " is not a valid flag value for " + name + ". " - + " Values must be one of " + Arrays.asList(enumType.getEnumConstants())); + logger.warning( + value + + " is not a valid flag value for " + + name + + ". " + + " Values must be one of " + + Arrays.asList(enumType.getEnumConstants())); return defaultValue; } } diff --git a/core/src/com/google/inject/internal/RealMapBinder.java b/core/src/com/google/inject/internal/RealMapBinder.java index b45d791733..2fbe350483 100644 --- a/core/src/com/google/inject/internal/RealMapBinder.java +++ b/core/src/com/google/inject/internal/RealMapBinder.java @@ -303,9 +303,9 @@ public void configure(Binder binder) { // The map this exposes is internally an ImmutableMap, so it's OK to massage // the guice Provider to jakarta Provider in the value (since Guice provider // implements jakarta Provider). - binder - .bind(bindingSelection.getJakartaProviderMapKey()) - .to((Key) bindingSelection.getProviderMapKey()); + binder + .bind(bindingSelection.getJakartaProviderMapKey()) + .to((Key) bindingSelection.getProviderMapKey()); // Bind Map to the provider w/ extension support. binder @@ -318,9 +318,9 @@ public void configure(Binder binder) { // The Map.Entries are all ProviderMapEntry instances which do not allow setValue, so it is // safe to massage the return type like this - binder - .bind(bindingSelection.getEntrySetJakartaProviderKey()) - .to((Key) bindingSelection.getEntrySetBinder().getSetKey()); + binder + .bind(bindingSelection.getEntrySetJakartaProviderKey()) + .to((Key) bindingSelection.getEntrySetBinder().getSetKey()); } @Override @@ -1021,17 +1021,17 @@ public void configure(Binder binder) { // The collection this exposes is internally an ImmutableMap, so it's OK to massage // the guice Provider to jakarta Provider in the value (since the guice Provider implements // jakarta Provider). - binder - .bind(bindingSelection.getJakartaProviderSetMultimapKey()) - .to((Key) bindingSelection.getProviderSetMultimapKey()); + binder + .bind(bindingSelection.getJakartaProviderSetMultimapKey()) + .to((Key) bindingSelection.getProviderSetMultimapKey()); binder .bind(bindingSelection.getProviderCollectionMultimapKey()) .to((Key) bindingSelection.getProviderSetMultimapKey()); - binder - .bind(bindingSelection.getJakartaProviderCollectionMultimapKey()) - .to((Key) bindingSelection.getProviderSetMultimapKey()); + binder + .bind(bindingSelection.getJakartaProviderCollectionMultimapKey()) + .to((Key) bindingSelection.getProviderSetMultimapKey()); // Binds a Map> binder diff --git a/core/src/com/google/inject/internal/RealMultibinder.java b/core/src/com/google/inject/internal/RealMultibinder.java index 7c15b4feed..813671cb0d 100644 --- a/core/src/com/google/inject/internal/RealMultibinder.java +++ b/core/src/com/google/inject/internal/RealMultibinder.java @@ -114,9 +114,9 @@ public void configure(Binder binder) { // The collection this exposes is internally an ImmutableList, so it's OK to massage // the guice Provider to jakarta Provider in the value (since the guice Provider implements // jakarta Provider). - binder - .bind(bindingSelection.getCollectionOfJakartaProvidersKey()) - .to((Key) bindingSelection.getCollectionOfProvidersKey()); + binder + .bind(bindingSelection.getCollectionOfJakartaProvidersKey()) + .to((Key) bindingSelection.getCollectionOfProvidersKey()); } public void permitDuplicates() { @@ -274,6 +274,7 @@ private InternalProvisionException newDuplicateValuesException(T[] values) { bindingSelection.getSetKey(), bindings, values, ImmutableList.of(getSource()))); return new InternalProvisionException(message); } + @SuppressWarnings("unchecked") @Override public V acceptExtensionVisitor( diff --git a/core/src/com/google/inject/internal/RealOptionalBinder.java b/core/src/com/google/inject/internal/RealOptionalBinder.java index 84641c9b01..0f90d4803a 100644 --- a/core/src/com/google/inject/internal/RealOptionalBinder.java +++ b/core/src/com/google/inject/internal/RealOptionalBinder.java @@ -211,11 +211,11 @@ public void configure(Binder binder) { // Provider is assignable to jakarta.inject.Provider and the provider that the factory contains // cannot be modified so we can use some rawtypes hackery to share the same implementation. // cgcb.Optional> - binder.bind(key.ofType(optionalOfJakartaProvider(typeLiteral))).to((Key) guavaOptProviderKey); - // ju.Optional> - binder - .bind(key.ofType(javaOptionalOfJakartaProvider(typeLiteral))) - .to((Key) javaOptProviderKey); + binder.bind(key.ofType(optionalOfJakartaProvider(typeLiteral))).to((Key) guavaOptProviderKey); + // ju.Optional> + binder + .bind(key.ofType(javaOptionalOfJakartaProvider(typeLiteral))) + .to((Key) javaOptProviderKey); // cgcb.Optional Key> guavaOptKey = key.ofType(optionalOf(typeLiteral));