Skip to content

Commit da1db18

Browse files
jreznotmaibin
jreznot
authored and
maibin
committed
Fix CDI package names (eugenp#7715)
* Fix beans.xsd location for JavaEE 7 * Fix cdi2observers package names
1 parent 823bc9d commit da1db18

9 files changed

Lines changed: 97 additions & 94 deletions

File tree

‎cdi/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
package com.baeldung.cdi.cdi2observers.application;
2-
3-
import com.baeldung.cdi.cdi2observers.events.ExampleEvent;
4-
import javax.enterprise.inject.se.SeContainer;
5-
import javax.enterprise.inject.se.SeContainerInitializer;
6-
7-
public class BootstrappingApplication {
8-
9-
public static void main(String... args) {
10-
SeContainerInitializer containerInitializer = SeContainerInitializer.newInstance();
11-
try (SeContainer container = containerInitializer.initialize()) {
12-
container.getBeanManager().fireEvent(new ExampleEvent("Welcome to Baeldung!"));
13-
}
14-
}
15-
}
1+
package com.baeldung.cdi2observers.application;
2+
3+
import com.baeldung.cdi2observers.events.ExampleEvent;
4+
5+
import javax.enterprise.inject.se.SeContainer;
6+
import javax.enterprise.inject.se.SeContainerInitializer;
7+
8+
public class BootstrappingApplication {
9+
10+
public static void main(String... args) {
11+
SeContainerInitializer containerInitializer = SeContainerInitializer.newInstance();
12+
try (SeContainer container = containerInitializer.initialize()) {
13+
container.getBeanManager().fireEvent(new ExampleEvent("Welcome to Baeldung!"));
14+
}
15+
}
16+
}

‎cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEvent.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.baeldung.cdi.cdi2observers.events;
2-
3-
public class ExampleEvent {
4-
5-
private final String eventMessage;
6-
7-
public ExampleEvent(String eventMessage) {
8-
this.eventMessage = eventMessage;
9-
}
10-
11-
public String getEventMessage() {
12-
return eventMessage;
13-
}
14-
}
1+
package com.baeldung.cdi2observers.events;
2+
3+
public class ExampleEvent {
4+
5+
private final String eventMessage;
6+
7+
public ExampleEvent(String eventMessage) {
8+
this.eventMessage = eventMessage;
9+
}
10+
11+
public String getEventMessage() {
12+
return eventMessage;
13+
}
14+
}

‎cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.baeldung.cdi.cdi2observers.events;
2-
3-
import javax.enterprise.event.Event;
4-
import javax.inject.Inject;
5-
6-
public class ExampleEventSource {
7-
8-
@Inject
9-
Event<ExampleEvent> exampleEvent;
10-
11-
public void fireEvent() {
12-
exampleEvent.fireAsync(new ExampleEvent("Welcome to Baeldung!"));
13-
}
14-
}
1+
package com.baeldung.cdi2observers.events;
2+
3+
import javax.enterprise.event.Event;
4+
import javax.inject.Inject;
5+
6+
public class ExampleEventSource {
7+
8+
@Inject
9+
Event<ExampleEvent> exampleEvent;
10+
11+
public void fireEvent() {
12+
exampleEvent.fireAsync(new ExampleEvent("Welcome to Baeldung!"));
13+
}
14+
}

‎cdi/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
package com.baeldung.cdi.cdi2observers.observers;
2-
3-
import com.baeldung.cdi.cdi2observers.events.ExampleEvent;
4-
import javax.annotation.Priority;
5-
import javax.enterprise.event.Observes;
6-
7-
public class AnotherExampleEventObserver {
8-
9-
public String onEvent(@Observes @Priority(2) ExampleEvent event) {
10-
return event.getEventMessage();
11-
}
12-
}
1+
package com.baeldung.cdi2observers.observers;
2+
3+
import com.baeldung.cdi2observers.events.ExampleEvent;
4+
5+
import javax.annotation.Priority;
6+
import javax.enterprise.event.Observes;
7+
8+
public class AnotherExampleEventObserver {
9+
10+
public String onEvent(@Observes @Priority(2) ExampleEvent event) {
11+
return event.getEventMessage();
12+
}
13+
}

‎cdi/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.baeldung.cdi.cdi2observers.observers;
2-
3-
import com.baeldung.cdi.cdi2observers.events.ExampleEvent;
4-
import com.baeldung.cdi.cdi2observers.services.TextService;
5-
import javax.annotation.Priority;
6-
import javax.enterprise.event.Observes;
7-
8-
public class ExampleEventObserver {
9-
10-
public String onEvent(@Observes @Priority(1) ExampleEvent event, TextService textService) {
11-
return textService.parseText(event.getEventMessage());
12-
}
13-
}
1+
package com.baeldung.cdi2observers.observers;
2+
3+
import com.baeldung.cdi2observers.events.ExampleEvent;
4+
import com.baeldung.cdi2observers.services.TextService;
5+
import javax.annotation.Priority;
6+
import javax.enterprise.event.Observes;
7+
8+
public class ExampleEventObserver {
9+
10+
public String onEvent(@Observes @Priority(1) ExampleEvent event, TextService textService) {
11+
return textService.parseText(event.getEventMessage());
12+
}
13+
}

‎cdi/src/main/java/com/baeldung/cdi2observers/services/TextService.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.baeldung.cdi.cdi2observers.services;
2-
3-
public class TextService {
4-
5-
public String parseText(String text) {
6-
return text.toUpperCase();
7-
}
8-
}
1+
package com.baeldung.cdi2observers.services;
2+
3+
public class TextService {
4+
5+
public String parseText(String text) {
6+
return text.toUpperCase();
7+
}
8+
}

‎cdi/src/main/resources/META-INF/beans.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<beans xmlns="http://java.sun.com/xml/ns/javaee"
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
23
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
4-
http://java.sun.com/xml/ns/javaee/beans_1_2.xsd">
4+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
5+
bean-discovery-mode="all">
56
<interceptors>
67
<class>com.baeldung.interceptor.AuditedInterceptor</class>
78
</interceptors>

‎cdi/src/test/java/com/baeldung/test/cdi2observers/tests/TextServiceUnitTest.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
package com.baeldung.cdi.cdi2observers.tests;
2-
3-
import com.baeldung.cdi.cdi2observers.services.TextService;
4-
import static org.assertj.core.api.Assertions.assertThat;
5-
import org.junit.Test;
6-
7-
public class TextServiceUnitTest {
8-
9-
@Test
10-
public void givenTextServiceInstance_whenCalledparseText_thenCorrect() {
11-
TextService textService = new TextService();
12-
assertThat(textService.parseText("Baeldung")).isEqualTo("BAELDUNG");
13-
}
14-
}
1+
package com.baeldung.test.cdi2observers.tests;
2+
3+
import com.baeldung.cdi2observers.services.TextService;
4+
import org.junit.Test;
5+
6+
import static org.assertj.core.api.Assertions.assertThat;
7+
8+
public class TextServiceUnitTest {
9+
10+
@Test
11+
public void givenTextServiceInstance_whenCalledparseText_thenCorrect() {
12+
TextService textService = new TextService();
13+
assertThat(textService.parseText("Baeldung")).isEqualTo("BAELDUNG");
14+
}
15+
}

‎cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerFactoryUnitTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.junit.Test;
77

88
public class TimeLoggerFactoryUnitTest {
9-
109
@Test
1110
public void givenTimeLoggerFactory_whenCalledgetTimeLogger_thenOneAssertion() {
1211
TimeLoggerFactory timeLoggerFactory = new TimeLoggerFactory();

0 commit comments

Comments
 (0)