Author: rmannibucau
Date: Sat Jul 1 12:32:47 2017
New Revision: 1800497
URL: http://svn.apache.org/viewvc?rev=1800497&view=rev
Log:
cdi 2 spec has an issue in its SeContainerInitializer selection logic, let's
keep our selector until the spec API is fixed
Added:
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeContainerSelector.java
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
Modified:
openwebbeans/trunk/webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
Added:
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeContainerSelector.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeContainerSelector.java?rev=1800497&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeContainerSelector.java
(added)
+++
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeContainerSelector.java
Sat Jul 1 12:32:47 2017
@@ -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 org.apache.openwebbeans.se;
+
+import javax.enterprise.inject.se.SeContainerInitializer;
+
+public interface SeContainerSelector
+{
+ SeContainerInitializer find();
+}
Added:
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java?rev=1800497&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
(added)
+++
openwebbeans/trunk/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
Sat Jul 1 12:32:47 2017
@@ -0,0 +1,139 @@
+/*
+ * 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 org.apache.openwebbeans.se;
+
+import javax.enterprise.inject.se.SeContainer;
+import javax.enterprise.inject.se.SeContainerInitializer;
+import javax.enterprise.inject.spi.Extension;
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ServiceLoader;
+
+// will allow to plug other impl but reusing most of our logic
+public class SeInitializerFacade extends SeContainerInitializer
+{
+ private final SeContainerInitializer delegate;
+
+ public SeInitializerFacade()
+ {
+ delegate =
Optional.of(ServiceLoader.load(SeContainerSelector.class).iterator())
+ .filter(Iterator::hasNext)
+ .map(Iterator::next)
+ .map(SeContainerSelector::find)
+ .orElseGet(OWBInitializer::new);
+ }
+
+ @Override
+ public SeContainerInitializer addBeanClasses(Class<?>... classes)
+ {
+ return delegate.addBeanClasses(classes);
+ }
+
+ @Override
+ public SeContainerInitializer addPackages(Class<?>... packageClasses)
+ {
+ return delegate.addPackages(packageClasses);
+ }
+
+ @Override
+ public SeContainerInitializer addPackages(boolean scanRecursively,
Class<?>... packageClasses)
+ {
+ return delegate.addPackages(scanRecursively, packageClasses);
+ }
+
+ @Override
+ public SeContainerInitializer addPackages(Package... packages)
+ {
+ return delegate.addPackages(packages);
+ }
+
+ @Override
+ public SeContainerInitializer addPackages(boolean scanRecursively,
Package... packages)
+ {
+ return delegate.addPackages(scanRecursively, packages);
+ }
+
+ @Override
+ public SeContainerInitializer addExtensions(Extension... extensions)
+ {
+ return delegate.addExtensions(extensions);
+ }
+
+ @Override
+ public SeContainerInitializer addExtensions(Class<? extends Extension>...
extensions)
+ {
+ return delegate.addExtensions(extensions);
+ }
+
+ @Override
+ public SeContainerInitializer enableInterceptors(Class<?>...
interceptorClasses)
+ {
+ return delegate.enableInterceptors(interceptorClasses);
+ }
+
+ @Override
+ public SeContainerInitializer enableDecorators(Class<?>...
decoratorClasses)
+ {
+ return delegate.enableDecorators(decoratorClasses);
+ }
+
+ @Override
+ public SeContainerInitializer selectAlternatives(Class<?>...
alternativeClasses)
+ {
+ return delegate.selectAlternatives(alternativeClasses);
+ }
+
+ @Override
+ public SeContainerInitializer selectAlternativeStereotypes(Class<? extends
Annotation>... alternativeStereotypeClasses)
+ {
+ return
delegate.selectAlternativeStereotypes(alternativeStereotypeClasses);
+ }
+
+ @Override
+ public SeContainerInitializer addProperty(String key, Object value)
+ {
+ return delegate.addProperty(key, value);
+ }
+
+ @Override
+ public SeContainerInitializer setProperties(Map<String, Object> properties)
+ {
+ return delegate.setProperties(properties);
+ }
+
+ @Override
+ public SeContainerInitializer disableDiscovery()
+ {
+ return delegate.disableDiscovery();
+ }
+
+ @Override
+ public SeContainerInitializer setClassLoader(ClassLoader classLoader)
+ {
+ return delegate.setClassLoader(classLoader);
+ }
+
+ @Override
+ public SeContainer initialize()
+ {
+ return delegate.initialize();
+ }
+}
Modified:
openwebbeans/trunk/webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer?rev=1800497&r1=1800496&r2=1800497&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
(original)
+++
openwebbeans/trunk/webbeans-se/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
Sat Jul 1 12:32:47 2017
@@ -14,4 +14,4 @@
#KIND, either express or implied. See the License for the
#specific language governing permissions and limitations
#under the License.
-org.apache.openwebbeans.se.OWBInitializer
+org.apache.openwebbeans.se.SeInitializerFacade
