You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/07/11 20:10:04 UTC
svn commit: r1835671 - in /aries/trunk/cdi: cdi-extender/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/
cdi-extender/src/test/java/org/apache/aries/cdi/co...
Author: rotty3000
Date: Wed Jul 11 20:10:03 2018
New Revision: 1835671
URL: http://svn.apache.org/viewvc?rev=1835671&view=rev
Log:
[cdi] removed methods from spec API
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/pom.xml
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CCR.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/ExtensionPhaseTest.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiContainerTests.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java
Modified: aries/trunk/cdi/cdi-extender/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/pom.xml?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/pom.xml (original)
+++ aries/trunk/cdi/cdi-extender/pom.xml Wed Jul 11 20:10:03 2018
@@ -28,7 +28,7 @@
<artifactId>org.apache.aries.cdi.extender</artifactId>
<name>Aries CCR</name>
- <description>Aries CDI Component Runtime</description>
+ <description>Aries CDI Component Runtime which implements OSGi CDI Integration Specification 1.0</description>
<build>
<plugins>
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CCR.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CCR.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CCR.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/CCR.java Wed Jul 11 20:10:03 2018
@@ -65,24 +65,6 @@ public class CCR implements CDIComponent
}
@Override
- public ContainerDTO getContainerDTO(Bundle bundle) {
- return call(
- () -> Optional.ofNullable(_states.get(bundle)).map(
- cs -> DTOs.copy(cs.containerDTO(), true)
- ).orElse(null)
- );
- }
-
- @Override
- public long getContainerChangeCount(Bundle bundle) {
- return call(
- () -> Optional.ofNullable(_states.get(bundle)).map(
- cs -> cs.containerDTO().changeCount
- ).orElse(-1l)
- );
- }
-
- @Override
public ContainerTemplateDTO getContainerTemplateDTO(Bundle bundle) {
return call(
() -> Optional.ofNullable(_states.get(bundle)).map(
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java Wed Jul 11 20:10:03 2018
@@ -47,14 +47,14 @@ public class CDICommand {
public String info(Bundle bundle) {
try (Formatter f = new Formatter()) {
- ContainerDTO containerDTO = _ccr.getContainerDTO(bundle);
+ Collection<ContainerDTO> containerDTOs = _ccr.getContainerDTOs(bundle);
- if (containerDTO == null) {
+ if (containerDTOs.isEmpty()) {
f.format(NO_BUNDLES);
return f.toString();
}
- list0(f, containerDTO, false, true);
+ list0(f, containerDTOs.iterator().next(), false, true);
return f.toString();
}
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/ExtensionPhaseTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/ExtensionPhaseTest.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/ExtensionPhaseTest.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/phase/ExtensionPhaseTest.java Wed Jul 11 20:10:03 2018
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -66,7 +67,9 @@ public class ExtensionPhaseTest extends
cdiBundle.start();
- ContainerDTO containerDTO = ccr.getContainerDTO(bundle);
+ Collection<ContainerDTO> containerDTOs = ccr.getContainerDTOs(bundle);
+ assertFalse(containerDTOs.isEmpty());
+ ContainerDTO containerDTO = containerDTOs.iterator().next();
assertNotNull(containerDTO);
assertNotNull(containerDTO.bundle);
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java Wed Jul 11 20:10:03 2018
@@ -49,6 +49,7 @@ import org.osgi.namespace.extender.Exten
import org.osgi.namespace.service.ServiceNamespace;
import org.osgi.service.cdi.CDIConstants;
import org.osgi.service.cdi.runtime.CDIComponentRuntime;
+import org.osgi.service.cdi.runtime.dto.ContainerDTO;
import org.osgi.util.promise.PromiseFactory;
import org.osgi.util.tracker.ServiceTracker;
@@ -132,6 +133,28 @@ public class AbstractTestCase {
return null;
}
+ public ContainerDTO getContainerDTO(CDIComponentRuntime runtime, Bundle bundle) {
+ Iterator<ContainerDTO> iterator;
+ ContainerDTO containerDTO = null;
+ int attempts = 50;
+ while (--attempts > 0) {
+ iterator = cdiRuntime.getContainerDTOs(bundle).iterator();
+ if (iterator.hasNext()) {
+ containerDTO = iterator.next();
+ if (containerDTO != null) {
+ break;
+ }
+ }
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ assertNotNull(containerDTO);
+ return containerDTO;
+ }
+
public static Bundle installBundle(String url) throws Exception {
return installBundle(url, true);
}
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java Wed Jul 11 20:10:03 2018
@@ -115,7 +115,7 @@ public class CdiBeanTests extends Abstra
assertNotNull(beanService);
assertEquals("PREFIXMETHOD", beanService.doSomething());
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(cdiBundle);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, cdiBundle);
assertNotNull(containerDTO);
ComponentDTO containerComponentDTO = containerDTO.components.stream().filter(
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiContainerTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiContainerTests.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiContainerTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiContainerTests.java Wed Jul 11 20:10:03 2018
@@ -59,11 +59,11 @@ public class CdiContainerTests extends A
@Test
public void testContainerComponentSingleton() throws Exception {
- while (cdiRuntime.getContainerDTO(cdiBundle).components.isEmpty()) {
+ while (getContainerDTO(cdiRuntime, cdiBundle).components.isEmpty()) {
Thread.sleep(10);
}
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(cdiBundle);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, cdiBundle);
assertNotNull(containerDTO);
ComponentDTO containerComponentDTO = containerDTO.components.stream()
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java Wed Jul 11 20:10:03 2018
@@ -73,7 +73,7 @@ public class ConfigurationTests extends
ComponentDTO configurationBeanA = null;
while (--attempts > 0) {
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(tb3Bundle);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, tb3Bundle);
configurationBeanA = containerDTO.components.stream().filter(
c -> c.template.name.equals("configurationBeanA")
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java Wed Jul 11 20:10:03 2018
@@ -54,14 +54,14 @@ public class EventsTests extends Abstrac
assertEquals(0, pojo.getCount());
assertEquals("[]", pojo.foo(null));
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(tb);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, tb);
long changeCount = containerDTO.changeCount;
ServiceRegistration<Integer> int1 = bundleContext.registerService(Integer.class, new Integer(12), null);
try {
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -74,7 +74,7 @@ public class EventsTests extends Abstrac
properties.put("foo", "bar");
int1.setProperties(properties);
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -85,7 +85,7 @@ public class EventsTests extends Abstrac
int1.unregister();
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -110,14 +110,14 @@ public class EventsTests extends Abstrac
assertEquals(0, pojo.getCount());
assertEquals("[]", pojo.foo(null));
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(tb);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, tb);
long changeCount = containerDTO.changeCount;
ServiceRegistration<Integer> int1 = bundleContext.registerService(Integer.class, new Integer(12), null);
try {
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -130,7 +130,7 @@ public class EventsTests extends Abstrac
properties.put("foo", "bar");
int1.setProperties(properties);
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -141,7 +141,7 @@ public class EventsTests extends Abstrac
int1.unregister();
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java?rev=1835671&r1=1835670&r2=1835671&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/OptionalReluctantReferenceTests.java Wed Jul 11 20:10:03 2018
@@ -57,7 +57,7 @@ public class OptionalReluctantReferenceT
assertEquals(-1, pojo.getCount());
assertEquals("-1", pojo.foo(""));
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(tb);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, tb);
long changeCount = containerDTO.changeCount;
@@ -66,7 +66,7 @@ public class OptionalReluctantReferenceT
new Hashtable<>(Collections.singletonMap("bean.id", "as")));
try {
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -82,11 +82,11 @@ public class OptionalReluctantReferenceT
assertEquals("12", pojo.foo(""));
}
finally {
- changeCount = cdiRuntime.getContainerDTO(tb).changeCount;
+ changeCount = getContainerDTO(cdiRuntime, tb).changeCount;
int1.unregister();
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -113,7 +113,7 @@ public class OptionalReluctantReferenceT
assertEquals(-1, pojo.getCount());
assertEquals("-1", pojo.foo(""));
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(tb);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, tb);
long changeCount = containerDTO.changeCount;
@@ -122,7 +122,7 @@ public class OptionalReluctantReferenceT
new Hashtable<>(Collections.singletonMap("bean.id", "sc")));
try {
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -138,11 +138,11 @@ public class OptionalReluctantReferenceT
assertEquals("12", pojo.foo(""));
}
finally {
- changeCount = cdiRuntime.getContainerDTO(tb).changeCount;
+ changeCount = getContainerDTO(cdiRuntime, tb).changeCount;
int1.unregister();
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -186,7 +186,7 @@ public class OptionalReluctantReferenceT
assertEquals(-1, pojo.getCount());
assertEquals("-1", pojo.foo(""));
- ContainerDTO containerDTO = cdiRuntime.getContainerDTO(tb);
+ ContainerDTO containerDTO = getContainerDTO(cdiRuntime, tb);
long changeCount = containerDTO.changeCount;
@@ -195,7 +195,7 @@ public class OptionalReluctantReferenceT
new Hashtable<>(Collections.singletonMap("bean.id", "fc")));
try {
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}
@@ -211,11 +211,11 @@ public class OptionalReluctantReferenceT
assertEquals("12", pojo.foo(""));
}
finally {
- changeCount = cdiRuntime.getContainerDTO(tb).changeCount;
+ changeCount = getContainerDTO(cdiRuntime, tb).changeCount;
int1.unregister();
- for (long i = 10; i > 0 && (cdiRuntime.getContainerDTO(tb).changeCount == changeCount); i--) {
+ for (long i = 10; i > 0 && (getContainerDTO(cdiRuntime, tb).changeCount == changeCount); i--) {
Thread.sleep(20);
}