From 63d7c9d207a0c474152b04cabe04e590c22893ba Mon Sep 17 00:00:00 2001
From: Carpenter Lee <hooleeucas@163.com>
Date: Wed, 13 Mar 2019 11:01:25 +0800
Subject: [PATCH] Revert "Add more overload methods in SphO and SphO" to avoid
 ambiguous method call

This reverts commit 35371c1

Signed-off-by: Carpenter Lee <hooleeucas@163.com>
---
 .../java/com/alibaba/csp/sentinel/SphO.java   | 38 -------------------
 .../java/com/alibaba/csp/sentinel/SphU.java   | 32 +++-------------
 2 files changed, 5 insertions(+), 65 deletions(-)

diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphO.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphO.java
index 56904aa3..6f6231da 100755
--- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphO.java
+++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphO.java
@@ -165,44 +165,6 @@ public class SphO {
         return entry(name, type, count, OBJECTS0);
     }
 
-    /**
-     * Checking all {@link Rule}s about the resource.
-     *
-     * @param name the unique name for the protected resource
-     * @param args extra parameters.
-     * @return true if no rule's threshold is exceeded, otherwise return false.
-     */
-    public static boolean entry(String name, Object... args) {
-        try {
-            Env.sph.entry(name, EntryType.OUT, 1, args);
-        } catch (BlockException e) {
-            return false;
-        } catch (Throwable e) {
-            RecordLog.info("[Sentinel] Fatal error", e);
-            return true;
-        }
-        return true;
-    }
-
-    /**
-     * Checking all {@link Rule}s about the protected method.
-     *
-     * @param method the protected method
-     * @param args   the parameters of the method.
-     * @return true if no rule's threshold is exceeded, otherwise return false.
-     */
-    public static boolean entry(Method method, Object... args) {
-        try {
-            Env.sph.entry(method, EntryType.OUT, 1, args);
-        } catch (BlockException e) {
-            return false;
-        } catch (Throwable e) {
-            RecordLog.info("[Sentinel] Fatal error", e);
-            return true;
-        }
-        return true;
-    }
-
     /**
      * Checking all {@link Rule}s about the resource.
      *
diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphU.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphU.java
index fd4d50eb..696b686f 100755
--- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphU.java
+++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/SphU.java
@@ -172,28 +172,6 @@ public class SphU {
         return Env.sph.entry(name, type, count, OBJECTS0);
     }
 
-    /**
-     * Checking all {@link Rule}s about the protected method.
-     *
-     * @param method the protected method
-     * @param args   the parameters of the method.
-     * @throws BlockException if the block criteria is met, eg. when any rule's threshold is exceeded.
-     */
-    public static Entry entry(Method method, Object... args) throws BlockException {
-        return Env.sph.entry(method, EntryType.OUT, 1, args);
-    }
-
-    /**
-     * Checking all {@link Rule}s about the resource.
-     *
-     * @param name the unique name for the protected resource
-     * @param args extra parameters.
-     * @throws BlockException if the block criteria is met, eg. when any rule's threshold is exceeded.
-     */
-    public static Entry entry(String name, Object... args) throws BlockException {
-        return Env.sph.entry(name, EntryType.OUT, 1, args);
-    }
-
     /**
      * Checking all {@link Rule}s about the protected method.
      *
@@ -268,7 +246,7 @@ public class SphU {
     /**
      * Checking all {@link Rule}s related the resource. The entry is prioritized.
      *
-     * @param name the unique name for the protected resource
+     * @param name        the unique name for the protected resource
      * @throws BlockException if the block criteria is met, eg. when any rule's threshold is exceeded.
      * @since 1.4.0
      */
@@ -279,10 +257,10 @@ public class SphU {
     /**
      * Checking all {@link Rule}s related the resource. The entry is prioritized.
      *
-     * @param name the unique name for the protected resource
-     * @param type the resource is an inbound or an outbound method. This is used
-     *             to mark whether it can be blocked when the system is unstable,
-     *             only inbound traffic could be blocked by {@link SystemRule}
+     * @param name        the unique name for the protected resource
+     * @param type        the resource is an inbound or an outbound method. This is used
+     *                    to mark whether it can be blocked when the system is unstable,
+     *                    only inbound traffic could be blocked by {@link SystemRule}
      * @throws BlockException if the block criteria is met, eg. when any rule's threshold is exceeded.
      * @since 1.4.0
      */