Merge branch 'master' into BAEL-16646-2

spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java

@@ -0,0 +1,11 @@
+package com.baeldung.ejb.stateful;
+
+import javax.ejb.EJB;
+
+public class EJBClient1 {
+
+    @EJB
+    public StatefulEJB statefulEJB;
+
+
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java

@@ -0,0 +1,11 @@
+package com.baeldung.ejb.stateful;
+
+import javax.ejb.EJB;
+
+public class EJBClient2 {
+
+    @EJB
+    public StatefulEJB statefulEJB;
+
+
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java

@@ -0,0 +1,10 @@
+package com.baeldung.ejb.stateful;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class StatefulEJB {
+
+    public String name;
+
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java

@@ -0,0 +1,10 @@
+package com.baeldung.ejb.stateless;
+
+import javax.ejb.EJB;
+
+public class EJBClient1 {
+
+    @EJB
+    public StatelessEJB statelessEJB;
+
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java

@@ -0,0 +1,11 @@
+package com.baeldung.ejb.stateless;
+
+import javax.ejb.EJB;
+
+public class EJBClient2 {
+
+    @EJB
+    public  StatelessEJB statelessEJB;
+
+
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java

@@ -0,0 +1,11 @@
+package com.baeldung.ejb.stateless;
+
+import javax.ejb.Stateless;
+
+
+@Stateless
+public class StatelessEJB {
+
+    public String name;
+
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java

@@ -0,0 +1,14 @@
+package com.baeldung.singletonbean;
+
+import java.util.List;
+
+import javax.ejb.Local;
+
+@Local
+public interface CountryState {
+
+    public List<String> getStates(String country);
+    
+    public void setStates(String country, List<String> states);
+
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java

@@ -0,0 +1,41 @@
+package com.baeldung.singletonbean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.ConcurrencyManagement;
+import javax.ejb.ConcurrencyManagementType;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+
+@Singleton
+@Startup
+@ConcurrencyManagement(ConcurrencyManagementType.BEAN)
+public class CountryStateBeanManagedBean implements CountryState {
+
+    private final Map<String, List<String>> countryStatesMap = new HashMap<String, List<String>>();
+
+    @PostConstruct
+    public void initialize() {
+
+        List<String> states = new ArrayList<String>();
+        states.add("Texas");
+        states.add("Alabama");
+        states.add("Alaska");
+        states.add("Arizona");
+        states.add("Arkansas");
+
+        countryStatesMap.put("UnitedStates", states);
+    }
+
+    public List<String> getStates(String country) {
+        return countryStatesMap.get(country);
+    }
+
+    public synchronized void setStates(String country, List<String> states) {
+        countryStatesMap.put(country, states);
+    }
+}

spring-ejb/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java

@@ -0,0 +1,46 @@
+package com.baeldung.singletonbean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.ConcurrencyManagement;
+import javax.ejb.ConcurrencyManagementType;
+import javax.ejb.Lock;
+import javax.ejb.LockType;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+
+@Singleton
+@Startup
+@ConcurrencyManagement(ConcurrencyManagementType.CONTAINER)
+public class CountryStateContainerManagedBean implements CountryState {
+
+    private Map<String, List<String>> countryStatesMap = new HashMap<String, List<String>>();
+
+    @Lock(LockType.WRITE)
+    @PostConstruct
+    public void initialize() {
+
+        List<String> states = new ArrayList<String>();
+        states.add("Texas");
+        states.add("Alabama");
+        states.add("Alaska");
+        states.add("Arizona");
+        states.add("Arkansas");
+
+        countryStatesMap.put("UnitedStates", states);
+    }
+
+    @Lock(LockType.READ)
+    public List<String> getStates(String country) {
+        return countryStatesMap.get(country);
+    }
+
+    @Lock(LockType.WRITE)
+    public void setStates(String country, List<String> states) {
+        countryStatesMap.put(country, states);
+    }
+}

spring-ejb/ejb-beans/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java

@@ -0,0 +1,51 @@
+package com.baeldung.ejb.stateful;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.baeldung.ejb.stateful.EJBClient1;
+import com.baeldung.ejb.stateful.EJBClient2;
+import com.baeldung.ejb.stateful.StatefulEJB;
+
+import javax.inject.Inject;
+
+
+@RunWith(Arquillian.class)
+public class StatefulEJBIntegrationTest {
+
+    @Inject
+    private EJBClient1 ejbClient1;
+
+    @Inject
+    private EJBClient2 ejbClient2;
+
+    @Test
+    public void givenOneStatefulBean_whenTwoClientsSetValueOnBean_thenClientStateIsMaintained() {
+
+        // act
+        ejbClient1.statefulEJB.name = "Client 1";
+        ejbClient2.statefulEJB.name = "Client 2";
+
+        // assert
+        Assert.assertNotEquals(ejbClient1.statefulEJB.name, ejbClient2.statefulEJB.name);
+        Assert.assertEquals("Client 1", ejbClient1.statefulEJB.name);
+        Assert.assertEquals("Client 2", ejbClient2.statefulEJB.name);
+
+    }
+
+    @Deployment
+    public static JavaArchive createDeployment() {
+        return ShrinkWrap.create(JavaArchive.class)
+                .addClass(StatefulEJB.class)
+                .addClass(EJBClient1.class)
+                .addClass(EJBClient2.class)
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+
+}

spring-ejb/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java

@@ -0,0 +1,62 @@
+package com.baeldung.ejb.stateless;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.baeldung.ejb.stateless.EJBClient1;
+import com.baeldung.ejb.stateless.EJBClient2;
+import com.baeldung.ejb.stateless.StatelessEJB;
+
+import javax.inject.Inject;
+
+
+@RunWith(Arquillian.class)
+public class StatelessEJBIntegrationTest {
+
+    @Inject
+    private EJBClient1 ejbClient1;
+
+    @Inject
+    private EJBClient2 ejbClient2;
+
+    @Test
+    public void givenOneStatelessBean_whenStateIsSetInOneBean_secondBeanShouldHaveSameState() {
+
+        // act
+        ejbClient1.statelessEJB.name = "Client 1";
+
+        // assert
+        Assert.assertEquals("Client 1", ejbClient1.statelessEJB.name);
+        Assert.assertEquals("Client 1", ejbClient2.statelessEJB.name);
+
+    }
+
+
+    @Test
+    public void givenOneStatelessBean_whenStateIsSetInBothBeans_secondBeanShouldHaveSecondBeanState() {
+
+        // act
+        ejbClient1.statelessEJB.name = "Client 1";
+        ejbClient2.statelessEJB.name = "Client 2";
+
+        // assert
+        Assert.assertEquals("Client 2", ejbClient2.statelessEJB.name);
+
+    }
+
+    @Deployment
+    public static JavaArchive createDeployment() {
+        return ShrinkWrap.create(JavaArchive.class)
+                .addClass(StatelessEJB.class)
+                .addClass(EJBClient1.class)
+                .addClass(EJBClient2.class)
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+    }
+
+}

spring-ejb/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java

@@ -0,0 +1,81 @@
+package com.baeldung.singletonbean;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CountryStateCacheBeanUnitTest {
+
+    private EJBContainer ejbContainer = null;
+
+    private Context context = null;
+
+    @Before
+    public void init() {
+        ejbContainer = EJBContainer.createEJBContainer();
+        context = ejbContainer.getContext();
+    }
+    
+    @Test
+    public void whenCallGetStatesFromContainerManagedBean_ReturnsStatesForCountry() throws Exception {
+
+        String[] expectedStates = { "Texas", "Alabama", "Alaska", "Arizona", "Arkansas" };
+
+        CountryState countryStateBean = (CountryState) context.lookup("java:global/ejb-beans/CountryStateContainerManagedBean");
+        List<String> actualStates = countryStateBean.getStates("UnitedStates");
+        assertNotNull(actualStates);
+        assertArrayEquals(expectedStates, actualStates.toArray());
+    }
+    
+    @Test
+    public void whenCallGetStatesFromBeanManagedBean_ReturnsStatesForCountry() throws Exception {
+
+        String[] expectedStates = { "Texas", "Alabama", "Alaska", "Arizona", "Arkansas" };
+
+        CountryState countryStateBean = (CountryState) context.lookup("java:global/ejb-beans/CountryStateBeanManagedBean");
+        List<String> actualStates = countryStateBean.getStates("UnitedStates");
+        assertNotNull(actualStates);
+        assertArrayEquals(expectedStates, actualStates.toArray());
+    }
+    
+    @Test
+    public void whenCallSetStatesFromContainerManagedBean_SetsStatesForCountry() throws Exception {
+        
+        String[] expectedStates = { "California", "Florida", "Hawaii", "Pennsylvania", "Michigan" };
+        
+        CountryState countryStateBean = (CountryState) context.lookup("java:global/ejb-beans/CountryStateContainerManagedBean");
+        countryStateBean.setStates("UnitedStates", Arrays.asList(expectedStates));
+        
+        List<String> actualStates = countryStateBean.getStates("UnitedStates");
+        assertNotNull(actualStates);
+        assertArrayEquals(expectedStates, actualStates.toArray());
+    }
+    
+    @Test
+    public void whenCallSetStatesFromBeanManagedBean_SetsStatesForCountry() throws Exception {
+        
+        String[] expectedStates = { "California", "Florida", "Hawaii", "Pennsylvania", "Michigan" };
+        
+        CountryState countryStateBean = (CountryState) context.lookup("java:global/ejb-beans/CountryStateBeanManagedBean");
+        countryStateBean.setStates("UnitedStates", Arrays.asList(expectedStates));
+        
+        List<String> actualStates = countryStateBean.getStates("UnitedStates");
+        assertNotNull(actualStates);
+        assertArrayEquals(expectedStates, actualStates.toArray());
+    }
+    
+    @After
+    public void close() {
+        if (ejbContainer != null)
+            ejbContainer.close();
+    }
+}