You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jo...@apache.org on 2018/02/17 15:21:04 UTC
geronimo-safeguard git commit: GERONIMO-6598 - Fixing dependencies
from overzealous rename.
Repository: geronimo-safeguard
Updated Branches:
refs/heads/master 536d61e90 -> 2bad1534d
GERONIMO-6598 - Fixing dependencies from overzealous rename.
Project: http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/repo
Commit: http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/commit/2bad1534
Tree: http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/tree/2bad1534
Diff: http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/diff/2bad1534
Branch: refs/heads/master
Commit: 2bad1534d33564b664cbc9cb74446ee6d40de0f9
Parents: 536d61e
Author: John D. Ament <jo...@apache.org>
Authored: Sat Feb 17 10:21:00 2018 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Sat Feb 17 10:21:00 2018 -0500
----------------------------------------------------------------------
.../main/java/org/apache/safeguard/api/ExecutionManager.java | 3 +++
.../org/apache/safeguard/impl/cdi/SafeguardInterceptor.java | 5 +++--
.../apache/safeguard/circuitbreaker/test/CDICircuitTest.java | 8 ++++----
.../safeguard/circuitretry/test/CDIRetryCircuitTest.java | 4 ++--
4 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/blob/2bad1534/safeguard-api/src/main/java/org/apache/safeguard/api/ExecutionManager.java
----------------------------------------------------------------------
diff --git a/safeguard-api/src/main/java/org/apache/safeguard/api/ExecutionManager.java b/safeguard-api/src/main/java/org/apache/safeguard/api/ExecutionManager.java
index bcd372d..1061043 100644
--- a/safeguard-api/src/main/java/org/apache/safeguard/api/ExecutionManager.java
+++ b/safeguard-api/src/main/java/org/apache/safeguard/api/ExecutionManager.java
@@ -23,11 +23,14 @@ import org.apache.safeguard.api.bulkhead.BulkheadManager;
import org.apache.safeguard.api.circuitbreaker.CircuitBreakerManager;
import org.apache.safeguard.api.retry.RetryManager;
+import javax.interceptor.InvocationContext;
import java.util.concurrent.Callable;
public interface ExecutionManager {
<T> T execute(String name, Callable<T> callable);
+ Object execute(InvocationContext invocationContext);
+
CircuitBreakerManager getCircuitBreakerManager();
RetryManager getRetryManager();
http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/blob/2bad1534/safeguard-impl/src/main/java/org/apache/safeguard/impl/cdi/SafeguardInterceptor.java
----------------------------------------------------------------------
diff --git a/safeguard-impl/src/main/java/org/apache/safeguard/impl/cdi/SafeguardInterceptor.java b/safeguard-impl/src/main/java/org/apache/safeguard/impl/cdi/SafeguardInterceptor.java
index 4b986e9..1c211b5 100644
--- a/safeguard-impl/src/main/java/org/apache/safeguard/impl/cdi/SafeguardInterceptor.java
+++ b/safeguard-impl/src/main/java/org/apache/safeguard/impl/cdi/SafeguardInterceptor.java
@@ -19,6 +19,7 @@
package org.apache.safeguard.impl.cdi;
+import org.apache.safeguard.api.ExecutionManager;
import org.apache.safeguard.api.SafeguardEnabled;
import org.apache.safeguard.impl.FailsafeExecutionManager;
import org.apache.safeguard.impl.util.AnnotationUtil;
@@ -42,12 +43,12 @@ import java.lang.reflect.Method;
@Dependent
public class SafeguardInterceptor {
@Inject
- private FailsafeExecutionManager failsafeExecutionManager;
+ private ExecutionManager executionManager;
@AroundInvoke
public Object runSafeguards(InvocationContext invocationContext) throws Exception{
if(isMethodSafeguarded(invocationContext.getMethod())) {
- return failsafeExecutionManager.execute(invocationContext);
+ return executionManager.execute(invocationContext);
}
else {
return invocationContext.proceed();
http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/blob/2bad1534/safeguard-impl/src/test/java/org/apache/safeguard/circuitbreaker/test/CDICircuitTest.java
----------------------------------------------------------------------
diff --git a/safeguard-impl/src/test/java/org/apache/safeguard/circuitbreaker/test/CDICircuitTest.java b/safeguard-impl/src/test/java/org/apache/safeguard/circuitbreaker/test/CDICircuitTest.java
index f6bd311..f342e0c 100644
--- a/safeguard-impl/src/test/java/org/apache/safeguard/circuitbreaker/test/CDICircuitTest.java
+++ b/safeguard-impl/src/test/java/org/apache/safeguard/circuitbreaker/test/CDICircuitTest.java
@@ -20,9 +20,9 @@
package org.apache.safeguard.circuitbreaker.test;
import org.apache.safeguard.SafeguardCDITest;
+import org.apache.safeguard.api.ExecutionManager;
import org.apache.safeguard.api.circuitbreaker.CircuitBreaker;
import org.apache.safeguard.api.circuitbreaker.CircuitBreakerState;
-import org.apache.safeguard.impl.FailsafeExecutionManager;
import org.apache.safeguard.impl.util.NamingUtil;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.shrinkwrap.api.Archive;
@@ -43,7 +43,7 @@ public class CDICircuitTest extends SafeguardCDITest{
private CDICircuitBean cdiCircuitBean;
@Inject
- private FailsafeExecutionManager failsafeExecutionManager;
+ private ExecutionManager executionManager;
@Test
public void shouldTriggerCircuitOpen() throws Exception {
@@ -53,7 +53,7 @@ public class CDICircuitTest extends SafeguardCDITest{
for(int i = 0;i<5;i++) {
try {
cdiCircuitBean.sayHello();
- CircuitBreaker circuitBreaker = failsafeExecutionManager.getCircuitBreakerManager().getCircuitBreaker(name);
+ CircuitBreaker circuitBreaker = executionManager.getCircuitBreakerManager().getCircuitBreaker(name);
if (i < 4) {
assertThat(circuitBreaker.getState()).isEqualTo(CircuitBreakerState.CLOSED);
}
@@ -64,7 +64,7 @@ public class CDICircuitTest extends SafeguardCDITest{
catch (Exception e){ }
}
- CircuitBreaker circuitBreaker = failsafeExecutionManager.getCircuitBreakerManager().getCircuitBreaker(name);
+ CircuitBreaker circuitBreaker = executionManager.getCircuitBreakerManager().getCircuitBreaker(name);
assertThat(circuitBreaker.getState()).isEqualTo(CircuitBreakerState.OPEN);
}
}
http://git-wip-us.apache.org/repos/asf/geronimo-safeguard/blob/2bad1534/safeguard-impl/src/test/java/org/apache/safeguard/circuitretry/test/CDIRetryCircuitTest.java
----------------------------------------------------------------------
diff --git a/safeguard-impl/src/test/java/org/apache/safeguard/circuitretry/test/CDIRetryCircuitTest.java b/safeguard-impl/src/test/java/org/apache/safeguard/circuitretry/test/CDIRetryCircuitTest.java
index 27013e7..e4c6c9c 100644
--- a/safeguard-impl/src/test/java/org/apache/safeguard/circuitretry/test/CDIRetryCircuitTest.java
+++ b/safeguard-impl/src/test/java/org/apache/safeguard/circuitretry/test/CDIRetryCircuitTest.java
@@ -20,9 +20,9 @@
package org.apache.safeguard.circuitretry.test;
import org.apache.safeguard.SafeguardCDITest;
+import org.apache.safeguard.api.ExecutionManager;
import org.apache.safeguard.api.circuitbreaker.CircuitBreaker;
import org.apache.safeguard.api.circuitbreaker.CircuitBreakerState;
-import org.apache.safeguard.impl.FailsafeExecutionManager;
import org.apache.safeguard.impl.util.NamingUtil;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.shrinkwrap.api.Archive;
@@ -44,7 +44,7 @@ public class CDIRetryCircuitTest extends SafeguardCDITest{
private CDISimpleCallable simpleCallable;
@Inject
- private FailsafeExecutionManager executionManager;
+ private ExecutionManager executionManager;
@Test
public void shouldExecuteSevenTimes() throws Exception{