From a41756fd5fa9544863b32cdbe64d78a6374e5196 Mon Sep 17 00:00:00 2001
From: duncpro <duncpro@icloud.com>
Date: Mon, 15 Aug 2022 07:26:22 -0400
Subject: [PATCH] fix getOrAdd

---
 .idea/workspace.xml                           | 36 +++++++++----------
 build.gradle.kts                              |  2 +-
 .../com/duncpro/jroute/router/TreeRouter.java |  2 ++
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff169db..ad63b28 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,7 @@
     <list default="true" id="377cceba-08b5-47e5-aead-ba5d96f09aa9" name="Default Changelist" comment="add Route.resolve">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/Router.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/Router.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/TreeRouter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/TreeRouter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,19 +105,19 @@
       <recent name="com.duncpro.jroute" />
     </key>
   </component>
-  <component name="RunManager" selected="Gradle.JRoute [test]">
-    <configuration name="JRoute [publishAllPublicationsToMavenRepository]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+  <component name="RunManager" selected="Gradle.JRoute [build]">
+    <configuration name="JRoute [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
+        <option name="scriptParameters" value="" />
         <option name="taskDescriptions">
           <list />
         </option>
         <option name="taskNames">
           <list>
-            <option value="publishAllPublicationsToMavenRepository" />
+            <option value="build" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -129,18 +127,18 @@
       <DebugAllEnabled>false</DebugAllEnabled>
       <method v="2" />
     </configuration>
-    <configuration name="JRoute [test]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="JRoute [publishAllPublicationsToMavenRepository]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="--info" />
+        <option name="scriptParameters" />
         <option name="taskDescriptions">
           <list />
         </option>
         <option name="taskNames">
           <list>
-            <option value="test" />
+            <option value="publishAllPublicationsToMavenRepository" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -150,41 +148,41 @@
       <DebugAllEnabled>false</DebugAllEnabled>
       <method v="2" />
     </configuration>
-    <configuration name="ParameterizedRouteTest" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="JRoute [test]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="" />
+        <option name="scriptParameters" value="--info" />
         <option name="taskDescriptions">
           <list />
         </option>
         <option name="taskNames">
           <list>
-            <option value=":test" />
-            <option value="--tests" />
-            <option value="&quot;com.duncpro.jroute.route.ParameterizedRouteTest&quot;" />
+            <option value="test" />
           </list>
         </option>
         <option name="vmOptions" />
       </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
       <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
       <DebugAllEnabled>false</DebugAllEnabled>
       <method v="2" />
     </configuration>
-    <configuration name="TreeRouterTest.compose" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="ParameterizedRouteTest" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="--tests &quot;com.duncpro.jroute.router.TreeRouterTest.compose&quot;" />
+        <option name="scriptParameters" value="" />
         <option name="taskDescriptions">
           <list />
         </option>
         <option name="taskNames">
           <list>
             <option value=":test" />
+            <option value="--tests" />
+            <option value="&quot;com.duncpro.jroute.route.ParameterizedRouteTest&quot;" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -217,11 +215,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Gradle.JRoute [build]" />
         <item itemvalue="Gradle.JRoute [test]" />
         <item itemvalue="Gradle.ParameterizedRouteTest" />
         <item itemvalue="Gradle.JRoute [publishAllPublicationsToMavenRepository]" />
         <item itemvalue="Gradle.TreeRouterTest.prefix" />
-        <item itemvalue="Gradle.TreeRouterTest.compose" />
       </list>
     </recent_temporary>
   </component>
@@ -238,7 +236,7 @@
       <workItem from="1660427010812" duration="5460000" />
       <workItem from="1660432755377" duration="1607000" />
       <workItem from="1660558378320" duration="486000" />
-      <workItem from="1660558937116" duration="160000" />
+      <workItem from="1660558937116" duration="1055000" />
     </task>
     <servers />
   </component>
diff --git a/build.gradle.kts b/build.gradle.kts
index 68eb50d..4441ed9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.duncpro"
-version = "1.0-SNAPSHOT-11"
+version = "1.0-SNAPSHOT-12"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/com/duncpro/jroute/router/TreeRouter.java b/src/main/java/com/duncpro/jroute/router/TreeRouter.java
index ba77f16..e701acb 100644
--- a/src/main/java/com/duncpro/jroute/router/TreeRouter.java
+++ b/src/main/java/com/duncpro/jroute/router/TreeRouter.java
@@ -29,6 +29,8 @@ public void add(Route route, E endpoint) throws RouteConflictException {
     @Override
     public E getOrAdd(Route route, Supplier<E> endpointFactory) {
         final var node = findOrCreateNode(rootRoute, route);
+        if (node.getEndpoint().isPresent()) return node.getEndpoint().get();
+
         final var endpoint = endpointFactory.get();
         node.setEndpoint(endpoint);
         return endpoint;