tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject tomee git commit: Remove temporarly the test and the class to see if build is green
Date Fri, 28 Dec 2018 09:41:48 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 81384b706 -> 85d7dbb63


Remove temporarly the test and the class to see if build is green


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/85d7dbb6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/85d7dbb6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/85d7dbb6

Branch: refs/heads/master
Commit: 85d7dbb63bea82fd6c1d002e027f1a50691b08b8
Parents: 81384b7
Author: Jean-Louis Monteiro <jeanouii@gmail.com>
Authored: Fri Dec 28 10:41:42 2018 +0100
Committer: Jean-Louis Monteiro <jeanouii@gmail.com>
Committed: Fri Dec 28 10:41:42 2018 +0100

----------------------------------------------------------------------
 ...ilsafeContainerExecutionManagerProvider.java | 67 -----------------
 ...feContainerExecutionManagerProviderTest.java | 75 --------------------
 2 files changed, 142 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/85d7dbb6/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
deleted file mode 100644
index a71fb77..0000000
--- a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.apache.tomee.microprofile.faulttolerance;
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-
-
-import org.apache.safeguard.api.ExecutionManager;
-import org.apache.safeguard.impl.FailsafeExecutionManager;
-import org.apache.safeguard.impl.bulkhead.BulkheadManagerImpl;
-import org.apache.safeguard.impl.cdi.FailsafeExecutionManagerProvider;
-import org.apache.safeguard.impl.circuitbreaker.FailsafeCircuitBreakerManager;
-import org.apache.safeguard.impl.config.MicroprofileAnnotationMapper;
-import org.apache.safeguard.impl.executionPlans.ExecutionPlanFactory;
-import org.apache.safeguard.impl.executorService.DefaultExecutorServiceProvider;
-import org.apache.safeguard.impl.retry.FailsafeRetryManager;
-
-import javax.annotation.Priority;
-import javax.annotation.Resource;
-import javax.enterprise.concurrent.ManagedScheduledExecutorService;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Specializes;
-import javax.interceptor.Interceptor;
-
-@Alternative
-@Priority(Interceptor.Priority.APPLICATION + 10)
-@ApplicationScoped
-public class FailsafeContainerExecutionManagerProvider extends FailsafeExecutionManagerProvider
{
-
-    @Resource
-    ManagedScheduledExecutorService executor;
-
-    @Override
-    @Produces
-    @Specializes
-    @ApplicationScoped
-    public ExecutionManager createExecutionManager() {
-        final MicroprofileAnnotationMapper mapper = MicroprofileAnnotationMapper.getInstance();
-        final DefaultExecutorServiceProvider executorServiceProvider = new DefaultExecutorServiceProvider(executor);
-        final BulkheadManagerImpl bulkheadManager = new BulkheadManagerImpl();
-        final FailsafeCircuitBreakerManager circuitBreakerManager = new FailsafeCircuitBreakerManager();
-        final FailsafeRetryManager retryManager = new FailsafeRetryManager();
-
-        return new FailsafeExecutionManager(
-                mapper,
-                bulkheadManager,
-                circuitBreakerManager,
-                retryManager,
-                new ExecutionPlanFactory(circuitBreakerManager, retryManager, bulkheadManager,
mapper,
-                        executorServiceProvider),
-                executorServiceProvider);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/85d7dbb6/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
b/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
deleted file mode 100644
index 0d6168b..0000000
--- a/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.tomee.microprofile.faulttolerance;
-
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-
-import org.apache.openejb.jee.WebApp;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Classes;
-import org.apache.openejb.testing.Module;
-import org.apache.safeguard.api.ExecutionManager;
-import org.apache.safeguard.impl.cdi.FailsafeExecutionManagerProvider;
-import org.apache.safeguard.impl.cdi.SafeguardInterceptor;
-import org.eclipse.microprofile.faulttolerance.CircuitBreaker;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.ejb.Singleton;
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(ApplicationComposer.class)
-public class FailsafeContainerExecutionManagerProviderTest {
-
-    @Inject
-    private FailsafeExecutionManagerProvider manager;
-
-    @Inject
-    private FTClass ftClass;
-
-    @Module
-    @Classes(value = {FailsafeContainerExecutionManagerProvider.class,
-            FailsafeExecutionManagerProvider.class,
-            ExecutionManager.class,
-            SafeguardInterceptor.class,
-            FTClass.class},
-            cdi = true)
-    public WebApp app() {
-        return new WebApp();
-    }
-
-    @Test
-    public void testManagerInjection() throws Exception {
-
-        assertEquals("called", ftClass.validateInjectedClass());
-
-        assertTrue("We must override the original FailsafeExecutionManagerProvider, was:"
+ manager.getClass(),
-                manager instanceof FailsafeContainerExecutionManagerProvider);
-    }
-
-    @Singleton
-    public static class FTClass {
-
-        @CircuitBreaker
-        public String validateInjectedClass() {
-            return "called";
-        }
-    }
-
-}
\ No newline at end of file


Mime
View raw message