Fix CDI package names (#7715)

* Fix beans.xsd location for JavaEE 7

* Fix cdi2observers package names
This commit is contained in:
Yuriy Artamonov 2019-10-01 22:33:11 +03:00 committed by maibin
parent 823bc9d4b0
commit da1db18bc9
9 changed files with 97 additions and 94 deletions

View File

@ -1,15 +1,16 @@
package com.baeldung.cdi.cdi2observers.application; package com.baeldung.cdi2observers.application;
import com.baeldung.cdi.cdi2observers.events.ExampleEvent; import com.baeldung.cdi2observers.events.ExampleEvent;
import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer; import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer;
public class BootstrappingApplication {
public class BootstrappingApplication {
public static void main(String... args) {
SeContainerInitializer containerInitializer = SeContainerInitializer.newInstance(); public static void main(String... args) {
try (SeContainer container = containerInitializer.initialize()) { SeContainerInitializer containerInitializer = SeContainerInitializer.newInstance();
container.getBeanManager().fireEvent(new ExampleEvent("Welcome to Baeldung!")); try (SeContainer container = containerInitializer.initialize()) {
} container.getBeanManager().fireEvent(new ExampleEvent("Welcome to Baeldung!"));
} }
} }
}

View File

@ -1,14 +1,14 @@
package com.baeldung.cdi.cdi2observers.events; package com.baeldung.cdi2observers.events;
public class ExampleEvent { public class ExampleEvent {
private final String eventMessage; private final String eventMessage;
public ExampleEvent(String eventMessage) { public ExampleEvent(String eventMessage) {
this.eventMessage = eventMessage; this.eventMessage = eventMessage;
} }
public String getEventMessage() { public String getEventMessage() {
return eventMessage; return eventMessage;
} }
} }

View File

@ -1,14 +1,14 @@
package com.baeldung.cdi.cdi2observers.events; package com.baeldung.cdi2observers.events;
import javax.enterprise.event.Event; import javax.enterprise.event.Event;
import javax.inject.Inject; import javax.inject.Inject;
public class ExampleEventSource { public class ExampleEventSource {
@Inject @Inject
Event<ExampleEvent> exampleEvent; Event<ExampleEvent> exampleEvent;
public void fireEvent() { public void fireEvent() {
exampleEvent.fireAsync(new ExampleEvent("Welcome to Baeldung!")); exampleEvent.fireAsync(new ExampleEvent("Welcome to Baeldung!"));
} }
} }

View File

@ -1,12 +1,13 @@
package com.baeldung.cdi.cdi2observers.observers; package com.baeldung.cdi2observers.observers;
import com.baeldung.cdi.cdi2observers.events.ExampleEvent; import com.baeldung.cdi2observers.events.ExampleEvent;
import javax.annotation.Priority;
import javax.enterprise.event.Observes; import javax.annotation.Priority;
import javax.enterprise.event.Observes;
public class AnotherExampleEventObserver {
public class AnotherExampleEventObserver {
public String onEvent(@Observes @Priority(2) ExampleEvent event) {
return event.getEventMessage(); public String onEvent(@Observes @Priority(2) ExampleEvent event) {
} return event.getEventMessage();
} }
}

View File

@ -1,13 +1,13 @@
package com.baeldung.cdi.cdi2observers.observers; package com.baeldung.cdi2observers.observers;
import com.baeldung.cdi.cdi2observers.events.ExampleEvent; import com.baeldung.cdi2observers.events.ExampleEvent;
import com.baeldung.cdi.cdi2observers.services.TextService; import com.baeldung.cdi2observers.services.TextService;
import javax.annotation.Priority; import javax.annotation.Priority;
import javax.enterprise.event.Observes; import javax.enterprise.event.Observes;
public class ExampleEventObserver { public class ExampleEventObserver {
public String onEvent(@Observes @Priority(1) ExampleEvent event, TextService textService) { public String onEvent(@Observes @Priority(1) ExampleEvent event, TextService textService) {
return textService.parseText(event.getEventMessage()); return textService.parseText(event.getEventMessage());
} }
} }

View File

@ -1,8 +1,8 @@
package com.baeldung.cdi.cdi2observers.services; package com.baeldung.cdi2observers.services;
public class TextService { public class TextService {
public String parseText(String text) { public String parseText(String text) {
return text.toUpperCase(); return text.toUpperCase();
} }
} }

View File

@ -1,7 +1,8 @@
<beans xmlns="http://java.sun.com/xml/ns/javaee" <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
http://java.sun.com/xml/ns/javaee/beans_1_2.xsd"> bean-discovery-mode="all">
<interceptors> <interceptors>
<class>com.baeldung.interceptor.AuditedInterceptor</class> <class>com.baeldung.interceptor.AuditedInterceptor</class>
</interceptors> </interceptors>

View File

@ -1,14 +1,15 @@
package com.baeldung.cdi.cdi2observers.tests; package com.baeldung.test.cdi2observers.tests;
import com.baeldung.cdi.cdi2observers.services.TextService; import com.baeldung.cdi2observers.services.TextService;
import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
public class TextServiceUnitTest {
public class TextServiceUnitTest {
@Test
public void givenTextServiceInstance_whenCalledparseText_thenCorrect() { @Test
TextService textService = new TextService(); public void givenTextServiceInstance_whenCalledparseText_thenCorrect() {
assertThat(textService.parseText("Baeldung")).isEqualTo("BAELDUNG"); TextService textService = new TextService();
} assertThat(textService.parseText("Baeldung")).isEqualTo("BAELDUNG");
} }
}

View File

@ -6,7 +6,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test; import org.junit.Test;
public class TimeLoggerFactoryUnitTest { public class TimeLoggerFactoryUnitTest {
@Test @Test
public void givenTimeLoggerFactory_whenCalledgetTimeLogger_thenOneAssertion() { public void givenTimeLoggerFactory_whenCalledgetTimeLogger_thenOneAssertion() {
TimeLoggerFactory timeLoggerFactory = new TimeLoggerFactory(); TimeLoggerFactory timeLoggerFactory = new TimeLoggerFactory();