From 1f385ee6a7c9da7652fef3477c38b8dd89f33af4 Mon Sep 17 00:00:00 2001
From: Andrey Litvitski <andrey1010102008@gmail.com>
Date: Sat, 7 Dec 2024 22:32:35 +0300
Subject: [PATCH] Change the isPresent Option state to functional style

---
 .../inject/internal/InjectorBindingData.java  | 44 +++++++------------
 .../internal/InjectorJitBindingData.java      |  4 +-
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/core/src/com/google/inject/internal/InjectorBindingData.java b/core/src/com/google/inject/internal/InjectorBindingData.java
index 395022809e..ac09f3ddfb 100644
--- a/core/src/com/google/inject/internal/InjectorBindingData.java
+++ b/core/src/com/google/inject/internal/InjectorBindingData.java
@@ -178,13 +178,10 @@ public void addInterceptorBinding(InterceptorBinding interceptorBinding) {
   }
 
   public ImmutableList<InterceptorBinding> getInterceptorBindings() {
-    if (parent.isPresent()) {
-      return new ImmutableList.Builder<InterceptorBinding>()
-          .addAll(parent.get().getInterceptorBindings())
-          .addAll(interceptorBindings)
-          .build();
-    }
-    return ImmutableList.copyOf(interceptorBindings);
+      return parent.map(injectorBindingData -> new ImmutableList.Builder<InterceptorBinding>()
+              .addAll(injectorBindingData.getInterceptorBindings())
+              .addAll(interceptorBindings)
+              .build()).orElseGet(() -> ImmutableList.copyOf(interceptorBindings));
   }
 
   public ImmutableList<InterceptorBinding> getInterceptorBindingsThisLevel() {
@@ -196,13 +193,10 @@ public void addTypeListener(TypeListenerBinding listenerBinding) {
   }
 
   public ImmutableList<TypeListenerBinding> getTypeListenerBindings() {
-    if (parent.isPresent()) {
-      return new ImmutableList.Builder<TypeListenerBinding>()
-          .addAll(parent.get().getTypeListenerBindings())
-          .addAll(typeListenerBindings)
-          .build();
-    }
-    return ImmutableList.copyOf(typeListenerBindings);
+      return parent.map(injectorBindingData -> new ImmutableList.Builder<TypeListenerBinding>()
+              .addAll(injectorBindingData.getTypeListenerBindings())
+              .addAll(typeListenerBindings)
+              .build()).orElseGet(() -> ImmutableList.copyOf(typeListenerBindings));
   }
 
   public ImmutableList<TypeListenerBinding> getTypeListenerBindingsThisLevel() {
@@ -214,13 +208,10 @@ public void addProvisionListener(ProvisionListenerBinding listenerBinding) {
   }
 
   public ImmutableList<ProvisionListenerBinding> getProvisionListenerBindings() {
-    if (parent.isPresent()) {
-      return new ImmutableList.Builder<ProvisionListenerBinding>()
-          .addAll(parent.get().getProvisionListenerBindings())
-          .addAll(provisionListenerBindings)
-          .build();
-    }
-    return ImmutableList.copyOf(provisionListenerBindings);
+      return parent.map(injectorBindingData -> new ImmutableList.Builder<ProvisionListenerBinding>()
+              .addAll(injectorBindingData.getProvisionListenerBindings())
+              .addAll(provisionListenerBindings)
+              .build()).orElseGet(() -> ImmutableList.copyOf(provisionListenerBindings));
   }
 
   public ImmutableList<ProvisionListenerBinding> getProvisionListenerBindingsThisLevel() {
@@ -232,13 +223,10 @@ public void addScanner(ModuleAnnotatedMethodScannerBinding scanner) {
   }
 
   public ImmutableList<ModuleAnnotatedMethodScannerBinding> getScannerBindings() {
-    if (parent.isPresent()) {
-      return new ImmutableList.Builder<ModuleAnnotatedMethodScannerBinding>()
-          .addAll(parent.get().getScannerBindings())
-          .addAll(scannerBindings)
-          .build();
-    }
-    return ImmutableList.copyOf(scannerBindings);
+      return parent.map(injectorBindingData -> new ImmutableList.Builder<ModuleAnnotatedMethodScannerBinding>()
+              .addAll(injectorBindingData.getScannerBindings())
+              .addAll(scannerBindings)
+              .build()).orElseGet(() -> ImmutableList.copyOf(scannerBindings));
   }
 
   public ImmutableList<ModuleAnnotatedMethodScannerBinding> getScannerBindingsThisLevel() {
diff --git a/core/src/com/google/inject/internal/InjectorJitBindingData.java b/core/src/com/google/inject/internal/InjectorJitBindingData.java
index 07a747a067..4e64963e20 100644
--- a/core/src/com/google/inject/internal/InjectorJitBindingData.java
+++ b/core/src/com/google/inject/internal/InjectorJitBindingData.java
@@ -82,9 +82,7 @@ void banKey(Key<?> key, InjectorBindingData injectorBindingData, Object source)
    * overriding explicit bindings declared in a child injector.
    */
   void banKeyInParent(Key<?> key, InjectorBindingData injectorBindingData, Object source) {
-    if (parent.isPresent()) {
-      parent.get().banKey(key, injectorBindingData, source);
-    }
+      parent.ifPresent(injectorJitBindingData -> injectorJitBindingData.banKey(key, injectorBindingData, source));
   }
 
   /**