fixes problems with Bulkhead

Author: dhilpipre

resilience4j-bulkhead_2.x/build.gradle

@@ -26,5 +26,5 @@ jar {
 }
 
 verifyInstrumentation {
-  passes 'io.github.resilience4j:resilience4j-bulkhead:[2.0.0)'
+  passes 'io.github.resilience4j:resilience4j-bulkhead:[2.0.0,)'
 }

resilience4j-bulkhead_2.x/src/main/java/io/github/resilience4j/bulkhead/Bulkhead.java

@@ -19,7 +19,6 @@
 import io.github.resilience4j.core.functions.CheckedFunction;
 import io.github.resilience4j.core.functions.CheckedRunnable;
 import io.github.resilience4j.core.functions.CheckedSupplier;
-import io.github.resilience4j.core.functions.Either;
 
 @Weave(type = MatchType.Interface)
 public abstract class Bulkhead {
@@ -68,13 +67,6 @@ public <T> T executeSupplier(Supplier<T> supplier) {
 		return Weaver.callOriginal();
 	}
 
-	@Trace
-	public <T> Either<Exception, T> executeEitherSupplier(Supplier<Either<? extends Exception, T>> supplier) {
-		NewRelic.getAgent().getTracedMethod().setMetricName("Custom", "Resilience4j", "Bulkhead", getName(),
-				"executeEitherSupplier");
-		return Weaver.callOriginal();
-	}
-
 	@Trace
 	public void onComplete() {
 		NewRelic.getAgent().getTracedMethod().setMetricName("Custom", "Resilience4j", "Bulkhead", getName(),
@@ -98,7 +90,7 @@ public BulkheadConfig getBulkheadConfig() {
 
 	// Static methods
 	@Trace
-	static <T> CheckedSupplier<T> decorateCheckedSupplier(Bulkhead bulkhead, CheckedSupplier<T> supplier) {
+	public static <T> CheckedSupplier<T> decorateCheckedSupplier(Bulkhead bulkhead, CheckedSupplier<T> supplier) {
 		NewRelic.getAgent().getTracedMethod().setMetricName("Custom", "Resilience4j", "Bulkhead", bulkhead.getName(),
 				"decorateCheckedSupplier");
 		return Weaver.callOriginal();
@@ -140,14 +132,6 @@ public static <T> Supplier<T> decorateSupplier(Bulkhead bulkhead, Supplier<T> su
 		return Weaver.callOriginal();
 	}
 
-	@Trace
-	public static <T> Supplier<Either<Exception, T>> decorateEitherSupplier(Bulkhead bulkhead,
-			Supplier<Either<? extends Exception, T>> supplier) {
-		NewRelic.getAgent().getTracedMethod().setMetricName("Custom", "Resilience4j", "Bulkhead", bulkhead.getName(),
-				"decorateEitherSupplier");
-		return Weaver.callOriginal();
-	}
-
 	@Trace
 	public static <T> Consumer<T> decorateConsumer(Bulkhead bulkhead, Consumer<T> consumer) {
 		NewRelic.getAgent().getTracedMethod().setMetricName("Custom", "Resilience4j", "Bulkhead", bulkhead.getName(),
@@ -177,7 +161,7 @@ public static <T, R> Function<T, R> decorateFunction(Bulkhead bulkhead, Function
 	}
 
 	@Trace
-	static <T, R> CheckedFunction<T, R> decorateCheckedFunction(Bulkhead bulkhead, CheckedFunction<T, R> function) {
+	public static <T, R> CheckedFunction<T, R> decorateCheckedFunction(Bulkhead bulkhead, CheckedFunction<T, R> function) {
 		NewRelic.getAgent().getTracedMethod().setMetricName("Custom", "Resilience4j", "Bulkhead", bulkhead.getName(),
 				"decorateCheckedFunction");
 		return Weaver.callOriginal();