Prerequisite refeat (#38)

 ✨ feat: prerequisite refactor

Author: jianggang

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.featureprobe</groupId>
     <artifactId>server-sdk-java</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <name>server-sdk-java</name>
     <description>FeatureProbe Server Side SDK for Java</description>
 
@@ -302,16 +302,29 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.3.0</version>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.1</version>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.featureprobe.sdk.example.FeatureProbeDemo</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>analyze-only-in-package</id>
+                        <id>make-assembly</id>
                         <goals>
-                            <goal>analyze-only</goal>
+                            <goal>single</goal>
                         </goals>
                         <phase>package</phase>
-                        <configuration />
+
                     </execution>
                 </executions>
             </plugin>

src/main/java/com/featureprobe/sdk/server/exceptions/PrerequisiteException.java

@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.featureprobe.sdk.server.exceptions;
+
+public class PrerequisiteException extends RuntimeException {
+
+    public PrerequisiteException(String message) {
+        super(message);
+    }
+
+}

src/main/java/com/featureprobe/sdk/server/model/Toggle.java

@@ -20,7 +20,7 @@
 import com.featureprobe.sdk.server.EvaluationResult;
 import com.featureprobe.sdk.server.FPUser;
 import com.featureprobe.sdk.server.HitResult;
-import com.featureprobe.sdk.server.exceptions.PrerequisitesDeepOverflowException;
+import com.featureprobe.sdk.server.exceptions.PrerequisiteException;
 
 import java.util.List;
 import java.util.Map;
@@ -53,6 +53,20 @@ public final class Toggle {
 
     public EvaluationResult eval(FPUser user, Map<String, Toggle> toggles, Map<String, Segment> segments,
                                  Object defaultValue, int deep) {
+        EvaluationResult result = createDefaultResult(user, key, defaultValue, "");
+        try {
+            return doEval(user, toggles, segments, defaultValue, deep);
+        } catch (PrerequisiteException e) {
+            result.setReason(e.getMessage());
+        } catch (Exception e) {
+            throw e;
+        }
+
+        return result;
+    }
+
+    public EvaluationResult doEval(FPUser user, Map<String, Toggle> toggles, Map<String, Segment> segments,
+                                   Object defaultValue, int deep) {
 
         String warning = "";
 
@@ -61,7 +75,7 @@ public EvaluationResult eval(FPUser user, Map<String, Toggle> toggles, Map<Strin
         }
 
         if (deep <= 0) {
-            throw new PrerequisitesDeepOverflowException("prerequisite deep overflow");
+            throw new PrerequisiteException("prerequisite deep overflow");
         }
 
         if (!prerequisite(user, toggles, segments, deep)) {
@@ -85,7 +99,7 @@ public EvaluationResult eval(FPUser user, Map<String, Toggle> toggles, Map<Strin
     private EvaluationResult createDisabledResult(FPUser user, String toggleKey, Object defaultValue) {
         EvaluationResult disabledResult = hitValue(disabledServe.evalIndex(user, this.key),
                 defaultValue, Optional.empty());
-        disabledResult.setReason("Toggle disabled");
+        disabledResult.setReason("Toggle disabled.");
         return disabledResult;
     }
 
@@ -100,19 +114,15 @@ private boolean prerequisite(FPUser user, Map<String, Toggle> toggles, Map<Strin
         if (Objects.isNull(prerequisites) || prerequisites.isEmpty()) {
             return true;
         }
-        try {
-            for (Prerequisite prerequisite : prerequisites) {
-                Toggle toggle = toggles.get(prerequisite.getKey());
-                if (Objects.isNull(toggle))
-                    return false;
-                EvaluationResult eval = toggle.eval(user, toggles, segments, null, deep - 1);
-                if (Objects.isNull(eval.getValue()))
-                    return false;
-                if (!eval.getValue().equals(prerequisite.getValue()))
-                    return false;
-            }
-        } catch (PrerequisitesDeepOverflowException e) {
-            throw e;
+        for (Prerequisite prerequisite : prerequisites) {
+            Toggle toggle = toggles.get(prerequisite.getKey());
+            if (Objects.isNull(toggle))
+                throw new PrerequisiteException("prerequisite not exist: " + this.key);
+            EvaluationResult eval = toggle.doEval(user, toggles, segments, null, deep - 1);
+            if (Objects.isNull(eval.getValue()))
+                return false;
+            if (!eval.getValue().equals(prerequisite.getValue()))
+                return false;
         }
         return true;
     }