Skip to content

Commit be0141c

Browse files
samebGuice Team
sameb
authored and
Guice Team
committed
Internal change
PiperOrigin-RevId: 530658894
1 parent 40a5bcf commit be0141c

3 files changed

Lines changed: 43 additions & 37 deletions

File tree

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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,12 @@ public void configure(Binder binder) {
302302
// The map this exposes is internally an ImmutableMap, so it's OK to massage
303303
// the guice Provider to jakarta Provider in the value (since Guice provider
304304
// implements jakarta Provider).
305-
@SuppressWarnings({"unchecked", "rawtypes"})
306-
Provider<Map<K, jakarta.inject.Provider<V>>> jakartaProviderMapProvider =
307-
(Provider) providerMapProvider;
308-
binder.bind(bindingSelection.getJakartaProviderMapKey()).toProvider(jakartaProviderMapProvider);
305+
@SuppressWarnings({"unchecked", "rawtypes"})
306+
Provider<Map<K, jakarta.inject.Provider<V>>> jakartaProviderMapProvider =
307+
(Provider) providerMapProvider;
308+
binder
309+
.bind(bindingSelection.getJakartaProviderMapKey())
310+
.toProvider(jakartaProviderMapProvider);
309311

310312
RealMapProvider<K, V> mapProvider = new RealMapProvider<>(bindingSelection);
311313
// Bind Map<K, V> to the provider w/ extension support.
@@ -317,10 +319,10 @@ public void configure(Binder binder) {
317319

318320
// The Map.Entries are all ProviderMapEntry instances which do not allow setValue, so it is
319321
// safe to massage the return type like this
320-
@SuppressWarnings({"unchecked", "rawtypes"})
321-
Key<Set<Map.Entry<K, jakarta.inject.Provider<V>>>> jakartaEntrySetProviderKey =
322-
(Key) bindingSelection.getEntrySetBinder().getSetKey();
323-
binder.bind(bindingSelection.getEntrySetJakartaProviderKey()).to(jakartaEntrySetProviderKey);
322+
@SuppressWarnings({"unchecked", "rawtypes"})
323+
Key<Set<Map.Entry<K, jakarta.inject.Provider<V>>>> jakartaEntrySetProviderKey =
324+
(Key) bindingSelection.getEntrySetBinder().getSetKey();
325+
binder.bind(bindingSelection.getEntrySetJakartaProviderKey()).to(jakartaEntrySetProviderKey);
324326
}
325327

326328
@Override
@@ -1050,23 +1052,25 @@ public void configure(Binder binder) {
10501052
// The collection this exposes is internally an ImmutableMap, so it's OK to massage
10511053
// the guice Provider to jakarta Provider in the value (since the guice Provider implements
10521054
// jakarta Provider).
1053-
@SuppressWarnings({"unchecked", "rawtypes"})
1054-
Provider<Map<K, Set<jakarta.inject.Provider<V>>>> jakartaProvider =
1055-
(Provider) multimapProvider;
1056-
binder.bind(bindingSelection.getJakartaProviderSetMultimapKey()).toProvider(jakartaProvider);
1055+
@SuppressWarnings({"unchecked", "rawtypes"})
1056+
Provider<Map<K, Set<jakarta.inject.Provider<V>>>> jakartaProvider =
1057+
(Provider) multimapProvider;
1058+
binder
1059+
.bind(bindingSelection.getJakartaProviderSetMultimapKey())
1060+
.toProvider(jakartaProvider);
10571061

10581062
@SuppressWarnings({"unchecked", "rawtypes"})
10591063
Provider<Map<K, Collection<Provider<V>>>> collectionProvider = (Provider) multimapProvider;
10601064
binder
10611065
.bind(bindingSelection.getProviderCollectionMultimapKey())
10621066
.toProvider(collectionProvider);
10631067

1064-
@SuppressWarnings({"unchecked", "rawtypes"})
1065-
Provider<Map<K, Collection<jakarta.inject.Provider<V>>>> collectionJakartaProvider =
1066-
(Provider) multimapProvider;
1067-
binder
1068-
.bind(bindingSelection.getJakartaProviderCollectionMultimapKey())
1069-
.toProvider(collectionJakartaProvider);
1068+
@SuppressWarnings({"unchecked", "rawtypes"})
1069+
Provider<Map<K, Collection<jakarta.inject.Provider<V>>>> collectionJakartaProvider =
1070+
(Provider) multimapProvider;
1071+
binder
1072+
.bind(bindingSelection.getJakartaProviderCollectionMultimapKey())
1073+
.toProvider(collectionJakartaProvider);
10701074

10711075
// Binds a Map<K, Set<V>>
10721076
@SuppressWarnings({"unchecked", "rawtypes"})

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,12 @@ public void configure(Binder binder) {
119119
// The collection this exposes is internally an ImmutableList, so it's OK to massage
120120
// the guice Provider to jakarta Provider in the value (since the guice Provider implements
121121
// jakarta Provider).
122-
@SuppressWarnings("unchecked")
123-
Provider<Collection<jakarta.inject.Provider<T>>> jakartaProvider =
124-
(Provider) collectionOfProvidersProvider;
125-
binder.bind(bindingSelection.getCollectionOfJakartaProvidersKey()).toProvider(jakartaProvider);
122+
@SuppressWarnings("unchecked")
123+
Provider<Collection<jakarta.inject.Provider<T>>> jakartaProvider =
124+
(Provider) collectionOfProvidersProvider;
125+
binder
126+
.bind(bindingSelection.getCollectionOfJakartaProvidersKey())
127+
.toProvider(jakartaProvider);
126128
}
127129

128130
public void permitDuplicates() {

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -209,21 +209,21 @@ public void configure(Binder binder) {
209209
// Provider is assignable to jakarta.inject.Provider and the provider that the factory contains
210210
// cannot be modified so we can use some rawtypes hackery to share the same implementation.
211211
// cgcb.Optional<jakarta.inject.Provider<T>>
212-
@SuppressWarnings("unchecked")
213-
InternalProviderInstanceBindingImpl.Factory<Optional<jakarta.inject.Provider<T>>>
214-
optionalJakartaProviderFactory =
215-
(InternalProviderInstanceBindingImpl.Factory) optionalProviderFactory;
216-
binder
217-
.bind(key.ofType(optionalOfJakartaProvider(typeLiteral)))
218-
.toProvider(optionalJakartaProviderFactory);
219-
// ju.Optional<jakarta.inject.Provider<T>>
220-
@SuppressWarnings("unchecked")
221-
InternalProviderInstanceBindingImpl.Factory<java.util.Optional<jakarta.inject.Provider<T>>>
222-
javaOptionalJakartaProviderFactory =
223-
(InternalProviderInstanceBindingImpl.Factory) javaOptionalProviderFactory;
224-
binder
225-
.bind(key.ofType(javaOptionalOfJakartaProvider(typeLiteral)))
226-
.toProvider(javaOptionalJakartaProviderFactory);
212+
@SuppressWarnings("unchecked")
213+
InternalProviderInstanceBindingImpl.Factory<Optional<jakarta.inject.Provider<T>>>
214+
optionalJakartaProviderFactory =
215+
(InternalProviderInstanceBindingImpl.Factory) optionalProviderFactory;
216+
binder
217+
.bind(key.ofType(optionalOfJakartaProvider(typeLiteral)))
218+
.toProvider(optionalJakartaProviderFactory);
219+
// ju.Optional<jakarta.inject.Provider<T>>
220+
@SuppressWarnings("unchecked")
221+
InternalProviderInstanceBindingImpl.Factory<java.util.Optional<jakarta.inject.Provider<T>>>
222+
javaOptionalJakartaProviderFactory =
223+
(InternalProviderInstanceBindingImpl.Factory) javaOptionalProviderFactory;
224+
binder
225+
.bind(key.ofType(javaOptionalOfJakartaProvider(typeLiteral)))
226+
.toProvider(javaOptionalJakartaProviderFactory);
227227

228228
// cgcb.Optional<T>
229229
Key<Optional<T>> optionalKey = key.ofType(optionalOf(typeLiteral));

0 commit comments

Comments
 (0)