Simplify ComponentUtils.handleWithHierarchy()

Summary: Trivial simplifications found while investigating adding metadata.

Reviewed By: mihaelao

Differential Revision: D27656006

fbshipit-source-id: d34bbb93b8df61141dd47e723eb3f25de9ea090d

litho-core/src/main/java/com/facebook/litho/ComponentLifecycle.java

@@ -642,14 +642,6 @@ protected boolean shouldUpdate(
   protected void transferState(
       StateContainer previousStateContainer, StateContainer nextStateContainer) {}
 
-  /**
-   * For internal use, only. In order to reraise an error event up the hierarchy use {@link
-   * ComponentUtils#raise(ComponentContext, Exception)} instead.
-   */
-  protected static void dispatchErrorEvent(ComponentContext c, Exception e) {
-    ComponentUtils.dispatchErrorEvent(c, e);
-  }
-
   /** For internal use, only. */
   public static void dispatchErrorEvent(ComponentContext c, ErrorEvent e) {
     ComponentUtils.dispatchErrorEvent(c, e);

litho-core/src/main/java/com/facebook/litho/ComponentUtils.java

@@ -521,9 +521,7 @@ static void handleWithHierarchy(
     }
 
     final LithoMetadataExceptionWrapper metadataWrapper =
-        (exceptionToThrow instanceof LithoMetadataExceptionWrapper)
-            ? (LithoMetadataExceptionWrapper) exceptionToThrow
-            : new LithoMetadataExceptionWrapper(parent, exceptionToThrow);
+        wrapWithMetadata(parent, exceptionToThrow);
     metadataWrapper.addComponentForLayoutStack(component);
 
     // This means it was already handled by this handler so throw it up to the next frame until we
@@ -535,7 +533,7 @@ static void handleWithHierarchy(
       ((ErrorEventHandler) nextHandler).onError(metadataWrapper);
     } else { // Handle again with new handler
       try {
-        ComponentLifecycle.dispatchErrorEvent(parent, exceptionToThrow);
+        dispatchErrorEvent(parent, exceptionToThrow);
       } catch (ReThrownException ex) { // error handler re-raised the exception
         metadataWrapper.lastHandler = nextHandler;
         throw metadataWrapper;