From 9c39406c1686c4f3ddc637a8b85914a970639404 Mon Sep 17 00:00:00 2001 From: Pritam Banerjee Date: Sun, 26 Feb 2017 04:31:19 -0800 Subject: [PATCH 01/22] BAEL - 626 : EJB: Stateless and Stateful Session Beans(Initial Commit) --- ejb/ejb-session-beans-client/pom.xml | 54 +++++++++++ .../ejb/session/client/EJBStatefulClient.java | 85 +++++++++++++++++ .../session/client/EJBStatelessClient.java | 88 +++++++++++++++++ .../resources/jboss-ejb-client.properties | 8 ++ .../client/test/EJBStatefulClientTest.java | 17 ++++ .../client/test/EJBStatelessClientTest.java | 16 ++++ ejb/ejb-session-beans/pom.xml | 95 +++++++++++++++++++ .../ejb/stateful/beans/ItemStateful.java | 27 ++++++ .../stateful/beans/ItemStatefulRemote.java | 14 +++ .../ejb/stateless/beans/ItemStateless.java | 29 ++++++ .../stateless/beans/ItemStatelessRemote.java | 13 +++ .../src/main/resources/META-INF/ejb-jar.xml | 6 ++ ejb/pom.xml | 9 +- 13 files changed, 460 insertions(+), 1 deletion(-) create mode 100644 ejb/ejb-session-beans-client/pom.xml create mode 100644 ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java create mode 100644 ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java create mode 100755 ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties create mode 100644 ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java create mode 100644 ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java create mode 100644 ejb/ejb-session-beans/pom.xml create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java create mode 100755 ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml diff --git a/ejb/ejb-session-beans-client/pom.xml b/ejb/ejb-session-beans-client/pom.xml new file mode 100644 index 0000000000..b5e107f23a --- /dev/null +++ b/ejb/ejb-session-beans-client/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + com.baeldung.ejb + ejb + 1.0-SNAPSHOT + + ejb-session-beans-client + EJB3 Client Maven + EJB3 Client Maven + + + 4.12 + 2.19 + + + + + org.wildfly + wildfly-ejb-client-bom + pom + import + + + + com.baeldung.ejb + ejb-session-beans + ejb + + + + junit + junit + 4.12 + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19 + + + **/*EJBSetupTest.java + + + + + + \ No newline at end of file diff --git a/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java b/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java new file mode 100644 index 0000000000..b2f79a2b13 --- /dev/null +++ b/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java @@ -0,0 +1,85 @@ +package com.baeldung.ejb.session.client; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import com.baeldung.ejb.stateful.beans.ItemStatefulRemote; + +public class EJBStatefulClient { + + public EJBStatefulClient() { + } + + private Context context = null; + + public Boolean getEJBRemoteMessage() { + EJBStatefulClient ejb = new EJBStatefulClient(); + Boolean result = true; + try { + // 1. Obtaining Context + ejb.createInitialContext(); + // 2. Generate JNDI Lookup name and caste + ItemStatefulRemote itemStatefulOne = ejb.lookup(); + ItemStatefulRemote itemStatefulTwo = ejb.lookup(); + + itemStatefulOne.addItem("Book"); + itemStatefulOne.addItem("Pen"); + itemStatefulOne.addItem("Copy"); + itemStatefulOne.addItem("Pencil"); + + result = itemStatefulOne.getItemList().equals(itemStatefulTwo.getItemList()); + + return result; + } catch (NamingException e) { + e.printStackTrace(); + return false; + } finally { + try { + ejb.closeContext(); + } catch (NamingException e) { + e.printStackTrace(); + + } + } + } + + public ItemStatefulRemote lookup() throws NamingException { + + // The app name is the EAR name of the deployed EJB without .ear suffix. + // Since we haven't deployed the application as a .ear, the app name for + // us will be an empty string + final String appName = ""; + final String moduleName = "session-beans"; + final String distinctName = ""; + final String beanName = "ItemStatefulRemote"; + final String viewClassName = ItemStatefulRemote.class.getName() + "?stateful"; + final String toLookup = String.format("ejb:%s/%s/%s/%s!%s", appName, moduleName, distinctName, beanName, + viewClassName); + return (ItemStatefulRemote) context.lookup(toLookup); + } + + public void createInitialContext() throws NamingException { + Properties prop = new Properties(); + prop.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming"); + prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); + prop.put(Context.PROVIDER_URL, "http-remoting://127.0.0.1:8080"); + prop.put(Context.SECURITY_PRINCIPAL, "testUser"); + prop.put(Context.SECURITY_CREDENTIALS, "admin1234!"); + prop.put("jboss.naming.client.ejb.context", false); + + context = new InitialContext(prop); + } + + public void closeContext() throws NamingException { + if (context != null) { + context.close(); + } + } + +} diff --git a/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java b/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java new file mode 100644 index 0000000000..3d00771a07 --- /dev/null +++ b/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java @@ -0,0 +1,88 @@ +package com.baeldung.ejb.session.client; + +import java.util.List; +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import com.baeldung.ejb.stateless.beans.ItemStatelessRemote; + +public class EJBStatelessClient { + + public EJBStatelessClient() { + } + + private Context context = null; + + public static void main(String[] arg) { + EJBStatelessClient ejb = new EJBStatelessClient(); + System.out.println(ejb.getEJBRemoteMessage()); + + } + + public Boolean getEJBRemoteMessage() { + EJBStatelessClient main = new EJBStatelessClient(); + Boolean result = true; + try { + // 1. Obtaining Context + main.createInitialContext(); + // 2. Generate JNDI Lookup name and caste + ItemStatelessRemote itemStatelessOne = main.lookup(); + ItemStatelessRemote itemStatelessTwo = main.lookup(); + + itemStatelessOne.addItem("Book"); + itemStatelessOne.addItem("Pen"); + itemStatelessOne.addItem("Pencil"); + itemStatelessOne.addItem("Eraser"); + + result = itemStatelessOne.getItemList().equals(itemStatelessTwo.getItemList()); + + return result; + } catch (NamingException e) { + e.printStackTrace(); + return false; + } finally { + try { + main.closeContext(); + } catch (NamingException e) { + e.printStackTrace(); + } + } + } + + public ItemStatelessRemote lookup() throws NamingException { + + // The app name is the EAR name of the deployed EJB without .ear suffix. + // Since we haven't deployed the application as a .ear, the app name for + // us will be an empty string + final String appName = ""; + final String moduleName = "session-beans"; + final String distinctName = ""; + final String beanName = "ItemStatelessRemote"; + final String viewClassName = ItemStatelessRemote.class.getName(); + final String toLookup = String.format("ejb:%s/%s/%s/%s!%s", appName, moduleName, distinctName, beanName, viewClassName); + + return (ItemStatelessRemote) context.lookup(toLookup); + } + + public void createInitialContext() throws NamingException { + Properties prop = new Properties(); + prop.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming"); + prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); + prop.put(Context.PROVIDER_URL, "http-remoting://127.0.0.1:8080"); + prop.put(Context.SECURITY_PRINCIPAL, "testUser"); + prop.put(Context.SECURITY_CREDENTIALS, "admin1234!"); + prop.put("jboss.naming.client.ejb.context", false); + + context = new InitialContext(prop); + } + + public void closeContext() throws NamingException { + if (context != null) { + context.close(); + } + } + +} diff --git a/ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties b/ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties new file mode 100755 index 0000000000..077cd7583f --- /dev/null +++ b/ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties @@ -0,0 +1,8 @@ +remote.connections=default +remote.connection.default.host=127.0.0.1 +remote.connection.default.port=8080 +remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false +remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false +remote.connection.default.connect.options.org.xnio.Options.SASL_DISALLOWED_MECHANISMS=${host.auth:JBOSS-LOCAL-USER} +remote.connection.default.username=testUser +remote.connection.default.password=admin1234! \ No newline at end of file diff --git a/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java b/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java new file mode 100644 index 0000000000..670dacc7aa --- /dev/null +++ b/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java @@ -0,0 +1,17 @@ +package com.baeldung.ejb.session.client.test; + +import static org.junit.Assert.*; + +import org.junit.Test; + +import com.baeldung.ejb.session.client.EJBStatefulClient; + +public class EJBStatefulClientTest { + + @Test + public void EJBClientTest() { + EJBStatefulClient ejbStatefulClient = new EJBStatefulClient(); + assertFalse(ejbStatefulClient.getEJBRemoteMessage()); + } + +} diff --git a/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java b/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java new file mode 100644 index 0000000000..90e3106130 --- /dev/null +++ b/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java @@ -0,0 +1,16 @@ +package com.baeldung.ejb.session.client.test; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; +import com.baeldung.ejb.session.client.EJBStatelessClient; + +public class EJBStatelessClientTest { + + @Test + public void EJBClientTest() { + EJBStatelessClient ejbStatelessClient = new EJBStatelessClient(); + assertTrue(ejbStatelessClient.getEJBRemoteMessage()); + } + +} diff --git a/ejb/ejb-session-beans/pom.xml b/ejb/ejb-session-beans/pom.xml new file mode 100644 index 0000000000..c1b908c0aa --- /dev/null +++ b/ejb/ejb-session-beans/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + + + com.baeldung.ejb + ejb + 1.0-SNAPSHOT + + + ejb-session-beans + ejb + + + + javax + javaee-api + ${javaee-api.version} + provided + + + + + + + + wildfly-standalone + + true + + + + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + + + + wildfly10x + + http://download.jboss.org/wildfly/10.1.0.Final/wildfly-10.1.0.Final.zip + + + + + + 127.0.0.1 + 9990 + testUser:admin1234! + + + + + + + + + + + + wildfly-runtime + + false + + + + + org.wildfly.plugins + wildfly-maven-plugin + 1.1.0.Alpha5 + + 127.0.0.1 + 9990 + testUser + admin1234! + ${build.finalName}.jar + + + + + + + + + + 7.0 + 1.6.1 + + + + + diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java new file mode 100644 index 0000000000..faab0bd4b1 --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java @@ -0,0 +1,27 @@ +package com.baeldung.ejb.stateful.beans; + +import java.util.ArrayList; +import java.util.List; + +import javax.ejb.Stateful; + +@Stateful(name = "ItemStatefulRemote") +public class ItemStateful implements ItemStatefulRemote { + + private List itemList; + + public ItemStateful() { + itemList = new ArrayList(); + } + + @Override + public void addItem(String itemName) { + itemList.add(itemName); + } + + @Override + public List getItemList() { + return itemList; + } + +} diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java new file mode 100644 index 0000000000..0d5313772d --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java @@ -0,0 +1,14 @@ +package com.baeldung.ejb.stateful.beans; + +import java.util.List; + +import javax.ejb.Remote; + +@Remote +public interface ItemStatefulRemote { + + void addItem(String itemName); + + List getItemList(); + +} diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java new file mode 100644 index 0000000000..23d24a5f21 --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java @@ -0,0 +1,29 @@ +package com.baeldung.ejb.stateless.beans; + +import java.util.ArrayList; +import java.util.List; + +import javax.ejb.Stateless; + +@Stateless(name = "ItemStatelessRemote") +public class ItemStateless implements ItemStatelessRemote { + + private List itemList; + + public ItemStateless() { + itemList = new ArrayList(); + } + + @Override + public void addItem(String itemName) { + + itemList.add(itemName); + } + + @Override + public List getItemList() { + + return itemList; + } + +} diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java new file mode 100644 index 0000000000..2ed2029cc8 --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java @@ -0,0 +1,13 @@ +package com.baeldung.ejb.stateless.beans; + +import java.util.List; + +import javax.ejb.Remote; + +@Remote +public interface ItemStatelessRemote { + + void addItem(String itemName); + + List getItemList(); +} diff --git a/ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml b/ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml new file mode 100755 index 0000000000..7ae4711863 --- /dev/null +++ b/ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml @@ -0,0 +1,6 @@ + + + session-beans + \ No newline at end of file diff --git a/ejb/pom.xml b/ejb/pom.xml index bfcc972417..c8ffcc4a55 100755 --- a/ejb/pom.xml +++ b/ejb/pom.xml @@ -34,7 +34,12 @@ 1.0-SNAPSHOT ejb - + + com.baeldung.ejb + ejb-session-beans + 1.0-SNAPSHOT + ejb + javax javaee-api @@ -78,5 +83,7 @@ ejb-remote ejb-client + ejb-session-beans + ejb-session-beans-client \ No newline at end of file From 0ebaefcb958ce6e5fdcbb3be22c0f2aec0184b74 Mon Sep 17 00:00:00 2001 From: Pritam Banerjee Date: Thu, 18 May 2017 23:56:44 -0700 Subject: [PATCH 02/22] session beans --- ejb/ejb-session-beans-client/pom.xml | 54 ------ .../ejb/session/client/EJBStatefulClient.java | 85 --------- .../session/client/EJBStatelessClient.java | 88 ---------- .../resources/jboss-ejb-client.properties | 8 - .../client/test/EJBStatefulClientTest.java | 17 -- .../client/test/EJBStatelessClientTest.java | 16 -- ejb/ejb-session-beans/pom.xml | 163 ++++++++++-------- .../ejb/stateful/beans/ItemStateful.java | 27 --- .../stateful/beans/ItemStatefulRemote.java | 14 -- .../ejb/stateless/beans/ItemStateless.java | 29 ---- .../stateless/beans/ItemStatelessRemote.java | 13 -- .../readlearncode/stateful/EJBClient1.java | 17 ++ .../readlearncode/stateful/EJBClient2.java | 17 ++ .../readlearncode/stateful/StatefulEJB.java | 16 ++ .../readlearncode/stateless/EJBClient1.java | 16 ++ .../readlearncode/stateless/EJBClient2.java | 17 ++ .../readlearncode/stateless/StatelessEJB.java | 16 ++ .../src/main/resources/META-INF/ejb-jar.xml | 6 - .../stateful/StatefulEJBTest.java | 52 ++++++ .../stateless/StatelessEJBTest.java | 63 +++++++ 20 files changed, 301 insertions(+), 433 deletions(-) delete mode 100644 ejb/ejb-session-beans-client/pom.xml delete mode 100644 ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java delete mode 100644 ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java delete mode 100755 ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties delete mode 100644 ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java delete mode 100644 ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java delete mode 100755 ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml create mode 100644 ejb/ejb-session-beans/src/test/java/com/readlearncode/stateful/StatefulEJBTest.java create mode 100644 ejb/ejb-session-beans/src/test/java/com/readlearncode/stateless/StatelessEJBTest.java diff --git a/ejb/ejb-session-beans-client/pom.xml b/ejb/ejb-session-beans-client/pom.xml deleted file mode 100644 index b5e107f23a..0000000000 --- a/ejb/ejb-session-beans-client/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - com.baeldung.ejb - ejb - 1.0-SNAPSHOT - - ejb-session-beans-client - EJB3 Client Maven - EJB3 Client Maven - - - 4.12 - 2.19 - - - - - org.wildfly - wildfly-ejb-client-bom - pom - import - - - - com.baeldung.ejb - ejb-session-beans - ejb - - - - junit - junit - 4.12 - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19 - - - **/*EJBSetupTest.java - - - - - - \ No newline at end of file diff --git a/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java b/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java deleted file mode 100644 index b2f79a2b13..0000000000 --- a/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatefulClient.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.baeldung.ejb.session.client; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import com.baeldung.ejb.stateful.beans.ItemStatefulRemote; - -public class EJBStatefulClient { - - public EJBStatefulClient() { - } - - private Context context = null; - - public Boolean getEJBRemoteMessage() { - EJBStatefulClient ejb = new EJBStatefulClient(); - Boolean result = true; - try { - // 1. Obtaining Context - ejb.createInitialContext(); - // 2. Generate JNDI Lookup name and caste - ItemStatefulRemote itemStatefulOne = ejb.lookup(); - ItemStatefulRemote itemStatefulTwo = ejb.lookup(); - - itemStatefulOne.addItem("Book"); - itemStatefulOne.addItem("Pen"); - itemStatefulOne.addItem("Copy"); - itemStatefulOne.addItem("Pencil"); - - result = itemStatefulOne.getItemList().equals(itemStatefulTwo.getItemList()); - - return result; - } catch (NamingException e) { - e.printStackTrace(); - return false; - } finally { - try { - ejb.closeContext(); - } catch (NamingException e) { - e.printStackTrace(); - - } - } - } - - public ItemStatefulRemote lookup() throws NamingException { - - // The app name is the EAR name of the deployed EJB without .ear suffix. - // Since we haven't deployed the application as a .ear, the app name for - // us will be an empty string - final String appName = ""; - final String moduleName = "session-beans"; - final String distinctName = ""; - final String beanName = "ItemStatefulRemote"; - final String viewClassName = ItemStatefulRemote.class.getName() + "?stateful"; - final String toLookup = String.format("ejb:%s/%s/%s/%s!%s", appName, moduleName, distinctName, beanName, - viewClassName); - return (ItemStatefulRemote) context.lookup(toLookup); - } - - public void createInitialContext() throws NamingException { - Properties prop = new Properties(); - prop.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming"); - prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); - prop.put(Context.PROVIDER_URL, "http-remoting://127.0.0.1:8080"); - prop.put(Context.SECURITY_PRINCIPAL, "testUser"); - prop.put(Context.SECURITY_CREDENTIALS, "admin1234!"); - prop.put("jboss.naming.client.ejb.context", false); - - context = new InitialContext(prop); - } - - public void closeContext() throws NamingException { - if (context != null) { - context.close(); - } - } - -} diff --git a/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java b/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java deleted file mode 100644 index 3d00771a07..0000000000 --- a/ejb/ejb-session-beans-client/src/main/java/com/baeldung/ejb/session/client/EJBStatelessClient.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.baeldung.ejb.session.client; - -import java.util.List; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import com.baeldung.ejb.stateless.beans.ItemStatelessRemote; - -public class EJBStatelessClient { - - public EJBStatelessClient() { - } - - private Context context = null; - - public static void main(String[] arg) { - EJBStatelessClient ejb = new EJBStatelessClient(); - System.out.println(ejb.getEJBRemoteMessage()); - - } - - public Boolean getEJBRemoteMessage() { - EJBStatelessClient main = new EJBStatelessClient(); - Boolean result = true; - try { - // 1. Obtaining Context - main.createInitialContext(); - // 2. Generate JNDI Lookup name and caste - ItemStatelessRemote itemStatelessOne = main.lookup(); - ItemStatelessRemote itemStatelessTwo = main.lookup(); - - itemStatelessOne.addItem("Book"); - itemStatelessOne.addItem("Pen"); - itemStatelessOne.addItem("Pencil"); - itemStatelessOne.addItem("Eraser"); - - result = itemStatelessOne.getItemList().equals(itemStatelessTwo.getItemList()); - - return result; - } catch (NamingException e) { - e.printStackTrace(); - return false; - } finally { - try { - main.closeContext(); - } catch (NamingException e) { - e.printStackTrace(); - } - } - } - - public ItemStatelessRemote lookup() throws NamingException { - - // The app name is the EAR name of the deployed EJB without .ear suffix. - // Since we haven't deployed the application as a .ear, the app name for - // us will be an empty string - final String appName = ""; - final String moduleName = "session-beans"; - final String distinctName = ""; - final String beanName = "ItemStatelessRemote"; - final String viewClassName = ItemStatelessRemote.class.getName(); - final String toLookup = String.format("ejb:%s/%s/%s/%s!%s", appName, moduleName, distinctName, beanName, viewClassName); - - return (ItemStatelessRemote) context.lookup(toLookup); - } - - public void createInitialContext() throws NamingException { - Properties prop = new Properties(); - prop.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming"); - prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); - prop.put(Context.PROVIDER_URL, "http-remoting://127.0.0.1:8080"); - prop.put(Context.SECURITY_PRINCIPAL, "testUser"); - prop.put(Context.SECURITY_CREDENTIALS, "admin1234!"); - prop.put("jboss.naming.client.ejb.context", false); - - context = new InitialContext(prop); - } - - public void closeContext() throws NamingException { - if (context != null) { - context.close(); - } - } - -} diff --git a/ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties b/ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties deleted file mode 100755 index 077cd7583f..0000000000 --- a/ejb/ejb-session-beans-client/src/main/resources/jboss-ejb-client.properties +++ /dev/null @@ -1,8 +0,0 @@ -remote.connections=default -remote.connection.default.host=127.0.0.1 -remote.connection.default.port=8080 -remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false -remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -remote.connection.default.connect.options.org.xnio.Options.SASL_DISALLOWED_MECHANISMS=${host.auth:JBOSS-LOCAL-USER} -remote.connection.default.username=testUser -remote.connection.default.password=admin1234! \ No newline at end of file diff --git a/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java b/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java deleted file mode 100644 index 670dacc7aa..0000000000 --- a/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatefulClientTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.ejb.session.client.test; - -import static org.junit.Assert.*; - -import org.junit.Test; - -import com.baeldung.ejb.session.client.EJBStatefulClient; - -public class EJBStatefulClientTest { - - @Test - public void EJBClientTest() { - EJBStatefulClient ejbStatefulClient = new EJBStatefulClient(); - assertFalse(ejbStatefulClient.getEJBRemoteMessage()); - } - -} diff --git a/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java b/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java deleted file mode 100644 index 90e3106130..0000000000 --- a/ejb/ejb-session-beans-client/src/test/java/com/baeldung/ejb/session/client/test/EJBStatelessClientTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.ejb.session.client.test; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; -import com.baeldung.ejb.session.client.EJBStatelessClient; - -public class EJBStatelessClientTest { - - @Test - public void EJBClientTest() { - EJBStatelessClient ejbStatelessClient = new EJBStatelessClient(); - assertTrue(ejbStatelessClient.getEJBRemoteMessage()); - } - -} diff --git a/ejb/ejb-session-beans/pom.xml b/ejb/ejb-session-beans/pom.xml index c1b908c0aa..a9b667baac 100644 --- a/ejb/ejb-session-beans/pom.xml +++ b/ejb/ejb-session-beans/pom.xml @@ -1,95 +1,106 @@ - - - 4.0.0 + + 4.0.0 + + com.baeldung.ejb + ejb + 1.0-SNAPSHOT + + ejb-session-beans + + + UTF-8 + 1.1.12.Final + 2.2.6 + 1.1.12.Final + 1.0.0.Final + 4.12 + 7.0 + - - com.baeldung.ejb - ejb - 1.0-SNAPSHOT - - - ejb-session-beans - ejb + + + + org.jboss.arquillian + arquillian-bom + 1.1.13.Final + import + pom + + + + javax javaee-api ${javaee-api.version} provided + + + + junit + junit + 4.12 + test + + + + + org.jboss.arquillian.junit + arquillian-junit-container + test + + - - - wildfly-standalone + arquillian-glassfish-embedded true - - - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - - - - wildfly10x - - http://download.jboss.org/wildfly/10.1.0.Final/wildfly-10.1.0.Final.zip - - - - - - 127.0.0.1 - 9990 - testUser:admin1234! - - - - - - - + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + 1.0.0.CR4 + test + + + org.glassfish.main.extras + glassfish-embedded-all + 3.1.2 + test + + - - - - wildfly-runtime - - false - - - - - org.wildfly.plugins - wildfly-maven-plugin - 1.1.0.Alpha5 - - 127.0.0.1 - 9990 - testUser - admin1234! - ${build.finalName}.jar - - - - - - - - 7.0 - 1.6.1 - - - - - + + + + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + maven-war-plugin + 2.4 + + false + + + + maven-surefire-plugin + 2.17 + + + + + + \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java deleted file mode 100644 index faab0bd4b1..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStateful.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.baeldung.ejb.stateful.beans; - -import java.util.ArrayList; -import java.util.List; - -import javax.ejb.Stateful; - -@Stateful(name = "ItemStatefulRemote") -public class ItemStateful implements ItemStatefulRemote { - - private List itemList; - - public ItemStateful() { - itemList = new ArrayList(); - } - - @Override - public void addItem(String itemName) { - itemList.add(itemName); - } - - @Override - public List getItemList() { - return itemList; - } - -} diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java deleted file mode 100644 index 0d5313772d..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/beans/ItemStatefulRemote.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung.ejb.stateful.beans; - -import java.util.List; - -import javax.ejb.Remote; - -@Remote -public interface ItemStatefulRemote { - - void addItem(String itemName); - - List getItemList(); - -} diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java deleted file mode 100644 index 23d24a5f21..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStateless.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.baeldung.ejb.stateless.beans; - -import java.util.ArrayList; -import java.util.List; - -import javax.ejb.Stateless; - -@Stateless(name = "ItemStatelessRemote") -public class ItemStateless implements ItemStatelessRemote { - - private List itemList; - - public ItemStateless() { - itemList = new ArrayList(); - } - - @Override - public void addItem(String itemName) { - - itemList.add(itemName); - } - - @Override - public List getItemList() { - - return itemList; - } - -} diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java deleted file mode 100644 index 2ed2029cc8..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/beans/ItemStatelessRemote.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.ejb.stateless.beans; - -import java.util.List; - -import javax.ejb.Remote; - -@Remote -public interface ItemStatelessRemote { - - void addItem(String itemName); - - List getItemList(); -} diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java new file mode 100644 index 0000000000..a61a3fef0c --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java @@ -0,0 +1,17 @@ +package com.readlearncode.stateful; + +import javax.ejb.EJB; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +public class EJBClient1 { + + @EJB + public StatefulEJB statefulEJB; + + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java new file mode 100644 index 0000000000..350df5ff86 --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java @@ -0,0 +1,17 @@ +package com.readlearncode.stateful; + +import javax.ejb.EJB; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +public class EJBClient2 { + + @EJB + public StatefulEJB statefulEJB; + + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java new file mode 100644 index 0000000000..771508584e --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java @@ -0,0 +1,16 @@ +package com.readlearncode.stateful; + +import javax.ejb.Stateful; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +@Stateful +public class StatefulEJB { + + public String name; + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java new file mode 100644 index 0000000000..e8e6e79a2d --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java @@ -0,0 +1,16 @@ +package com.readlearncode.stateless; + +import javax.ejb.EJB; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +public class EJBClient1 { + + @EJB + public StatelessEJB statelessEJB; + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java new file mode 100644 index 0000000000..ff90f2fcf1 --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java @@ -0,0 +1,17 @@ +package com.readlearncode.stateless; + +import javax.ejb.EJB; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +public class EJBClient2 { + + @EJB + public StatelessEJB statelessEJB; + + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java new file mode 100644 index 0000000000..1f60d12e71 --- /dev/null +++ b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java @@ -0,0 +1,16 @@ +package com.readlearncode.stateless; + +import javax.ejb.Stateless; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +@Stateless +public class StatelessEJB { + + public String name; + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml b/ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml deleted file mode 100755 index 7ae4711863..0000000000 --- a/ejb/ejb-session-beans/src/main/resources/META-INF/ejb-jar.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - session-beans - \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateful/StatefulEJBTest.java b/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateful/StatefulEJBTest.java new file mode 100644 index 0000000000..04d01975f6 --- /dev/null +++ b/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateful/StatefulEJBTest.java @@ -0,0 +1,52 @@ +package com.readlearncode.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 javax.inject.Inject; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +@RunWith(Arquillian.class) +public class StatefulEJBTest { + + @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"); + } + +} diff --git a/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateless/StatelessEJBTest.java b/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateless/StatelessEJBTest.java new file mode 100644 index 0000000000..8c7d3e1bc9 --- /dev/null +++ b/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateless/StatelessEJBTest.java @@ -0,0 +1,63 @@ +package com.readlearncode.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 javax.inject.Inject; + +/** + * Source code github.com/readlearncode + * + * @author Alex Theedom www.readlearncode.com + * @version 1.0 + */ +@RunWith(Arquillian.class) +public class StatelessEJBTest { + + @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"); + } + +} From 93b4f3620251b86dee37403e0cd46ec20fe96c91 Mon Sep 17 00:00:00 2001 From: Pritam Banerjee Date: Sun, 21 May 2017 13:34:17 -0700 Subject: [PATCH 03/22] Fixed Package Names --- .../com/baeldung/ejb/stateful/EJBClient1.java | 11 +++++++++++ .../com/baeldung/ejb/stateful/EJBClient2.java | 11 +++++++++++ .../com/baeldung/ejb/stateful/StatefulEJB.java | 10 ++++++++++ .../com/baeldung/ejb/stateless/EJBClient1.java | 10 ++++++++++ .../com/baeldung/ejb/stateless/EJBClient2.java | 11 +++++++++++ .../baeldung/ejb/stateless/StatelessEJB.java | 11 +++++++++++ .../com/readlearncode/stateful/EJBClient1.java | 17 ----------------- .../com/readlearncode/stateful/EJBClient2.java | 17 ----------------- .../com/readlearncode/stateful/StatefulEJB.java | 16 ---------------- .../com/readlearncode/stateless/EJBClient1.java | 16 ---------------- .../com/readlearncode/stateless/EJBClient2.java | 17 ----------------- .../readlearncode/stateless/StatelessEJB.java | 16 ---------------- .../ejb/test}/stateful/StatefulEJBTest.java | 13 ++++++------- .../ejb/test}/stateless/StatelessEJBTest.java | 13 ++++++------- 14 files changed, 76 insertions(+), 113 deletions(-) create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java create mode 100644 ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java delete mode 100644 ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java rename ejb/ejb-session-beans/src/test/java/com/{readlearncode => baeldung/ejb/test}/stateful/StatefulEJBTest.java (88%) rename ejb/ejb-session-beans/src/test/java/com/{readlearncode => baeldung/ejb/test}/stateless/StatelessEJBTest.java (89%) diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java new file mode 100644 index 0000000000..0387beeb3c --- /dev/null +++ b/ejb/ejb-session-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; + + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java new file mode 100644 index 0000000000..54f88a993d --- /dev/null +++ b/ejb/ejb-session-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; + + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java new file mode 100644 index 0000000000..17bb08491a --- /dev/null +++ b/ejb/ejb-session-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; + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java new file mode 100644 index 0000000000..0d6f06449b --- /dev/null +++ b/ejb/ejb-session-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; + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java new file mode 100644 index 0000000000..a7fe650b1b --- /dev/null +++ b/ejb/ejb-session-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; + + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java b/ejb/ejb-session-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java new file mode 100644 index 0000000000..d4e9749252 --- /dev/null +++ b/ejb/ejb-session-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; + +} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java deleted file mode 100644 index a61a3fef0c..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient1.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.readlearncode.stateful; - -import javax.ejb.EJB; - -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ -public class EJBClient1 { - - @EJB - public StatefulEJB statefulEJB; - - -} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java deleted file mode 100644 index 350df5ff86..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/EJBClient2.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.readlearncode.stateful; - -import javax.ejb.EJB; - -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ -public class EJBClient2 { - - @EJB - public StatefulEJB statefulEJB; - - -} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java deleted file mode 100644 index 771508584e..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateful/StatefulEJB.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.readlearncode.stateful; - -import javax.ejb.Stateful; - -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ -@Stateful -public class StatefulEJB { - - public String name; - -} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java deleted file mode 100644 index e8e6e79a2d..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient1.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.readlearncode.stateless; - -import javax.ejb.EJB; - -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ -public class EJBClient1 { - - @EJB - public StatelessEJB statelessEJB; - -} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java deleted file mode 100644 index ff90f2fcf1..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/EJBClient2.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.readlearncode.stateless; - -import javax.ejb.EJB; - -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ -public class EJBClient2 { - - @EJB - public StatelessEJB statelessEJB; - - -} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java b/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java deleted file mode 100644 index 1f60d12e71..0000000000 --- a/ejb/ejb-session-beans/src/main/java/com/readlearncode/stateless/StatelessEJB.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.readlearncode.stateless; - -import javax.ejb.Stateless; - -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ -@Stateless -public class StatelessEJB { - - public String name; - -} \ No newline at end of file diff --git a/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateful/StatefulEJBTest.java b/ejb/ejb-session-beans/src/test/java/com/baeldung/ejb/test/stateful/StatefulEJBTest.java similarity index 88% rename from ejb/ejb-session-beans/src/test/java/com/readlearncode/stateful/StatefulEJBTest.java rename to ejb/ejb-session-beans/src/test/java/com/baeldung/ejb/test/stateful/StatefulEJBTest.java index 04d01975f6..2f3e45a769 100644 --- a/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateful/StatefulEJBTest.java +++ b/ejb/ejb-session-beans/src/test/java/com/baeldung/ejb/test/stateful/StatefulEJBTest.java @@ -1,4 +1,4 @@ -package com.readlearncode.stateful; +package com.baeldung.ejb.test.stateful; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -9,14 +9,13 @@ 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; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ + @RunWith(Arquillian.class) public class StatefulEJBTest { diff --git a/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateless/StatelessEJBTest.java b/ejb/ejb-session-beans/src/test/java/com/baeldung/ejb/test/stateless/StatelessEJBTest.java similarity index 89% rename from ejb/ejb-session-beans/src/test/java/com/readlearncode/stateless/StatelessEJBTest.java rename to ejb/ejb-session-beans/src/test/java/com/baeldung/ejb/test/stateless/StatelessEJBTest.java index 8c7d3e1bc9..9f88d478b7 100644 --- a/ejb/ejb-session-beans/src/test/java/com/readlearncode/stateless/StatelessEJBTest.java +++ b/ejb/ejb-session-beans/src/test/java/com/baeldung/ejb/test/stateless/StatelessEJBTest.java @@ -1,4 +1,4 @@ -package com.readlearncode.stateless; +package com.baeldung.ejb.test.stateless; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -9,14 +9,13 @@ 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; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ + @RunWith(Arquillian.class) public class StatelessEJBTest { From 9a2827f84e7782e806c45d58b7c0d4748b27d57a Mon Sep 17 00:00:00 2001 From: Pritam Banerjee Date: Tue, 23 May 2017 03:32:06 -0700 Subject: [PATCH 04/22] BAEL-725: Map Iteration --- .../baeldung/map/iteration/MapIteration.java | 57 ++++++++++++++++ .../map/iteration/MapIterationTest.java | 68 +++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java create mode 100644 core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java diff --git a/core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java b/core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java new file mode 100644 index 0000000000..3b2a213aa0 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java @@ -0,0 +1,57 @@ +package com.baeldung.map.iteration; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + +public class MapIteration { + + public ArrayList iterateUsingEntrySet(Map map) { + ArrayList mapKeyValueList = new ArrayList(); + for (Map.Entry entry : map.entrySet()) { + mapKeyValueList.add(entry.getKey() + ":" + entry.getValue()); + } + return mapKeyValueList; + } + + public ArrayList iterateUsingLambda(Map map) { + ArrayList mapKeyValueList = new ArrayList(); + map.forEach((k, v) -> mapKeyValueList.add(k + ":" + v)); + return mapKeyValueList; + } + + public ArrayList iterateUsingIteratorAndEntry(Map map) { + ArrayList mapKeyValueList = new ArrayList(); + Iterator> iterator = map.entrySet().iterator(); + + while (iterator.hasNext()) { + Map.Entry pair = iterator.next(); + mapKeyValueList.add(pair.getKey() + ":" + pair.getValue()); + } + + return mapKeyValueList; + } + + public ArrayList iterateUsingKeySetAndForeach(Map map) { + ArrayList mapKeyValueList = new ArrayList(); + for (String key : map.keySet()) { + mapKeyValueList.add(key + ":" + map.get(key)); + } + return mapKeyValueList; + } + + public ArrayList iterateUsingStreamAPI(Map map) { + ArrayList mapKeyValueList = new ArrayList(); + map.entrySet().stream().forEach(e -> mapKeyValueList.add(e.getKey() + ":" + e.getValue())); + return mapKeyValueList; + } + + public ArrayList iterateKeys(Map map) { + ArrayList mapKeyList = new ArrayList(); + for (String key : map.keySet()) { + mapKeyList.add(key); + } + return mapKeyList; + } + +} \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java b/core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java new file mode 100644 index 0000000000..5953c118fd --- /dev/null +++ b/core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java @@ -0,0 +1,68 @@ +package com.baeldung.map.iteration; + +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class MapIterationTest { + + public static Map testMap = new HashMap(); + public static String testString1 = "One:1"; + public static String testString2 = "Two:2"; + public static String testString3 = "Three:3"; + + @BeforeClass + public static void createTestData() { + testMap.put("One", 1); + testMap.put("Three", 3); + testMap.put("Two", 2); + } + + @Test + public void iterateUsingEntrySet_test() { + MapIteration mapIteration = new MapIteration(); + ArrayList list = mapIteration.iterateUsingEntrySet(testMap); + assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); + } + + @Test + public void iterateUsingLambda_test() { + MapIteration mapIteration = new MapIteration(); + ArrayList list = mapIteration.iterateUsingLambda(testMap); + assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); + } + + @Test + public void iterateUsingIteratorAndEntry_test() { + MapIteration mapIteration = new MapIteration(); + ArrayList list = mapIteration.iterateUsingIteratorAndEntry(testMap); + assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); + } + + @Test + public void iterateUsingKeySetAndForeach_test() { + MapIteration mapIteration = new MapIteration(); + ArrayList list = mapIteration.iterateUsingKeySetAndForeach(testMap); + assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); + } + + @Test + public void iterateUsingStreamAPI_test() { + MapIteration mapIteration = new MapIteration(); + ArrayList list = mapIteration.iterateUsingStreamAPI(testMap); + assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); + } + + @Test + public void iterateKeys_test() { + MapIteration mapIteration = new MapIteration(); + ArrayList list = mapIteration.iterateKeys(testMap); + assertTrue((list.contains("One")) && (list.contains("Two")) && (list.contains("Three"))); + } + +} From 0ce35bb11e9e66af4764eac142821fc227f6bb1d Mon Sep 17 00:00:00 2001 From: Yasin Date: Sat, 27 May 2017 19:18:20 +0530 Subject: [PATCH 05/22] BAEL-900 Input generator simplified (#1941) * BAEL-900 Guide to dynamic tests in Junit 5 * BAEL-900 Guide to Dynamic Tests in Junit 5 * Revert "BAEL-900 Guide to Dynamic Tests in Junit 5" This reverts commit d0d45c9067223347da20d0f2c80de391fcade38e. * BAEL-900 Guide to Dynamic Tests in Junit 5 * BAEL-900 Guide to dynamic tests in Junit 5 * removed unnecessary annotation * BAEL-900 unused imports removed * BAEL-900 simplified input generator code --- .../com/baeldung/DynamicTestsExample.java | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/junit5/src/test/java/com/baeldung/DynamicTestsExample.java b/junit5/src/test/java/com/baeldung/DynamicTestsExample.java index 6a97f2347b..fd6bb3e0a8 100644 --- a/junit5/src/test/java/com/baeldung/DynamicTestsExample.java +++ b/junit5/src/test/java/com/baeldung/DynamicTestsExample.java @@ -3,7 +3,6 @@ package com.baeldung; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -56,32 +55,12 @@ public class DynamicTestsExample { // sample input and output List inputList = - new ArrayList<>(Arrays.asList("www.somedomain.com", "www.anotherdomain.com", "www.yetanotherdomain.com")); + Arrays.asList("www.somedomain.com", "www.anotherdomain.com", "www.yetanotherdomain.com"); List outputList = - new ArrayList<>(Arrays.asList("154.174.10.56", "211.152.104.132", "178.144.120.156")); + Arrays.asList("154.174.10.56", "211.152.104.132", "178.144.120.156"); // input generator that generates inputs using inputList - Iterator inputGenerator = new Iterator() { - - String current; - int size = inputList.size(); - int index = 0; - - @Override - public boolean hasNext() { - if(index == size) { - return false; - } - current = inputList.get(index); - index++; - return true; - } - - @Override - public String next() { - return current; - } - }; + Iterator inputGenerator = inputList.iterator(); // a display name generator that creates a different name based on the input Function displayNameGenerator = (input) -> "Resolving: " + input; From 7c6536685ce557165a16b137fad6d7e179f898d2 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sat, 27 May 2017 20:13:30 +0200 Subject: [PATCH 06/22] Extract a Random instance to a variable (#1942) --- .../main/java/com/baeldung/string/StringHelper.java | 10 +++++----- .../java/org/baeldung/java/JavaRandomUnitTest.java | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core-java/src/main/java/com/baeldung/string/StringHelper.java b/core-java/src/main/java/com/baeldung/string/StringHelper.java index ad2a0b3419..dac0d1272e 100644 --- a/core-java/src/main/java/com/baeldung/string/StringHelper.java +++ b/core-java/src/main/java/com/baeldung/string/StringHelper.java @@ -2,23 +2,23 @@ package com.baeldung.string; import java.util.Optional; -public class StringHelper { - public static String removeLastChar(String s) { +class StringHelper { + static String removeLastChar(String s) { return (s == null || s.length() == 0) ? s : (s.substring(0, s.length() - 1)); } - public static String removeLastCharRegex(String s) { + static String removeLastCharRegex(String s) { return (s == null) ? s : s.replaceAll(".$", ""); } - public static String removeLastCharOptional(String s) { + static String removeLastCharOptional(String s) { return Optional.ofNullable(s) .filter(str -> str.length() != 0) .map(str -> str.substring(0, str.length() - 1)) .orElse(s); } - public static String removeLastCharRegexOptional(String s) { + static String removeLastCharRegexOptional(String s) { return Optional.ofNullable(s) .map(str -> str.replaceAll(".$", "")) .orElse(s); diff --git a/core-java/src/test/java/org/baeldung/java/JavaRandomUnitTest.java b/core-java/src/test/java/org/baeldung/java/JavaRandomUnitTest.java index f058e5d862..a11659547e 100644 --- a/core-java/src/test/java/org/baeldung/java/JavaRandomUnitTest.java +++ b/core-java/src/test/java/org/baeldung/java/JavaRandomUnitTest.java @@ -167,9 +167,11 @@ public class JavaRandomUnitTest { final int leftLimit = 97; // letter 'a' final int rightLimit = 122; // letter 'z' final int targetStringLength = 10; + final Random random = new Random(); final StringBuilder buffer = new StringBuilder(targetStringLength); + for (int i = 0; i < targetStringLength; i++) { - final int randomLimitedInt = leftLimit + (int) (new Random().nextFloat() * (rightLimit - leftLimit + 1)); + final int randomLimitedInt = leftLimit + (int) (random.nextFloat() * (rightLimit - leftLimit + 1)); buffer.append((char) randomLimitedInt); } final String generatedString = buffer.toString(); From 99c7a91587f746033b6578fd94ff3080df74cd13 Mon Sep 17 00:00:00 2001 From: Anand kumar Date: Sun, 28 May 2017 15:36:56 +0530 Subject: [PATCH 07/22] guide to uuid generation in java (#1879) * guide to uuid generation in java * updated readme.md --- core-java/README.md | 2 +- .../java/com/baeldung/uuid/UUIDGenerator.java | 118 ++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java diff --git a/core-java/README.md b/core-java/README.md index 1de57c9311..6dd43fe6d9 100644 --- a/core-java/README.md +++ b/core-java/README.md @@ -102,6 +102,7 @@ - [How to Perform a Simple HTTP Request in Java](http://www.baeldung.com/java-http-request) - [Call Methods at Runtime Using Java Reflection](http://www.baeldung.com/java-method-reflection) - [Guide to DelayQueue](http://www.baeldung.com/java-delay-queue) +- [Guide to UUID in JAVA] (http://www.baeldung.com/guide-to-uuid-in-java) - [Comparing getPath(), getAbsolutePath(), and getCanonicalPath() in Java](http://www.baeldung.com/java-path) - [How to Add a Single Element to a Stream](http://www.baeldung.com/java-stream-append-prepend) - [A Guide to Java SynchronousQueue](http://www.baeldung.com/java-synchronous-queue) @@ -111,4 +112,3 @@ - [Difference Between Wait and Sleep in Java](http://www.baeldung.com/java-wait-and-sleep) - [LongAdder and LongAccumulator in Java](http://www.baeldung.com/java-longadder-and-longaccumulator) - [Using Java MappedByteBuffer](http://www.baeldung.com/java-mapped-byte-buffer) - diff --git a/core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java b/core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java new file mode 100644 index 0000000000..23baf5d5b4 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/uuid/UUIDGenerator.java @@ -0,0 +1,118 @@ +package com.baeldung.uuid; + +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.UUID; + +public class UUIDGenerator { + + /** + * These are predefined UUID for name spaces + */ + private static final String NAMESPACE_DNS = "6ba7b810-9dad-11d1-80b4-00c04fd430c8"; + private static final String NAMESPACE_URL = "6ba7b811-9dad-11d1-80b4-00c04fd430c8"; + private static final String NAMESPACE_OID = "6ba7b812-9dad-11d1-80b4-00c04fd430c8"; + private static final String NAMESPACE_X500 = "6ba7b814-9dad-11d1-80b4-00c04fd430c8"; + + private static final char[] hexArray = "0123456789ABCDEF".toCharArray(); + + public static void main(String[] args) { + try { + System.out.println("Type 3 : " + generateType3UUID(NAMESPACE_DNS, "google.com")); + System.out.println("Type 4 : " + generateType4UUID()); + System.out.println("Type 5 : " + generateType5UUID(NAMESPACE_URL, "google.com")); + System.out.println("Unique key : " + generateUniqueKeysWithUUIDAndMessageDigest()); + } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + + /** + * Type 4 UUID Generation + */ + public static UUID generateType4UUID() { + UUID uuid = UUID.randomUUID(); + return uuid; + } + + /** + * Type 3 UUID Generation + * + * @throws UnsupportedEncodingException + */ + public static UUID generateType3UUID(String namespace, String name) throws UnsupportedEncodingException { + String source = namespace + name; + byte[] bytes = source.getBytes("UTF-8"); + UUID uuid = UUID.nameUUIDFromBytes(bytes); + return uuid; + } + + /** + * Type 5 UUID Generation + * + * @throws UnsupportedEncodingException + */ + public static UUID generateType5UUID(String namespace, String name) throws UnsupportedEncodingException { + String source = namespace + name; + byte[] bytes = source.getBytes("UTF-8"); + UUID uuid = type5UUIDFromBytes(bytes); + return uuid; + } + + + public static UUID type5UUIDFromBytes(byte[] name) { + MessageDigest md; + try { + md = MessageDigest.getInstance("SHA-1"); + } catch (NoSuchAlgorithmException nsae) { + throw new InternalError("MD5 not supported", nsae); + } + byte[] bytes = md.digest(name); + bytes[6] &= 0x0f; /* clear version */ + bytes[6] |= 0x50; /* set to version 5 */ + bytes[8] &= 0x3f; /* clear variant */ + bytes[8] |= 0x80; /* set to IETF variant */ + return constructType5UUID(bytes); + } + + private static UUID constructType5UUID(byte[] data) { + long msb = 0; + long lsb = 0; + assert data.length == 16 : "data must be 16 bytes in length"; + + for (int i=0; i<8; i++) + msb = (msb << 8) | (data[i] & 0xff); + + for (int i=8; i<16; i++) + lsb = (lsb << 8) | (data[i] & 0xff); + return new UUID(msb, lsb); + } + + + /** + * Unique Keys Generation Using Message Digest and Type 4 UUID + * + * @throws NoSuchAlgorithmException + * @throws UnsupportedEncodingException + */ + public static String generateUniqueKeysWithUUIDAndMessageDigest() throws NoSuchAlgorithmException, UnsupportedEncodingException { + MessageDigest salt = MessageDigest.getInstance("SHA-256"); + salt.update(UUID.randomUUID() + .toString() + .getBytes("UTF-8")); + String digest = bytesToHex(salt.digest()); + return digest; + } + + public static String bytesToHex(byte[] bytes) { + char[] hexChars = new char[bytes.length * 2]; + for (int j = 0; j < bytes.length; j++) { + int v = bytes[j] & 0xFF; + hexChars[j * 2] = hexArray[v >>> 4]; + hexChars[j * 2 + 1] = hexArray[v & 0x0F]; + } + return new String(hexChars); + } + +} From 8c8c01ebbb121ee67ec0cfcf9921655caf8b30e3 Mon Sep 17 00:00:00 2001 From: Syed Ali Raza Date: Sun, 28 May 2017 15:07:15 +0500 Subject: [PATCH 08/22] BAEL-833: How to get last element of a Stream in Java? (#1930) * Different Types of Bean Injection in Spring * Fixed code formatting and test names for "Different Types of Bean Injection in Spring" * BAEL-833: How to get last element of a Stream in Java? * BAEL-833: Updated based on review from editor --- .../java/com/baeldung/stream/StreamApi.java | 24 +++++++++++ .../com/baeldung/stream/StreamApiTest.java | 43 +++++++++++++++++++ .../baeldung/beaninjection/FileReader.java | 19 ++++++++ .../com/baeldung/beaninjection/FtpReader.java | 28 ++++++++++++ .../com/baeldung/beaninjection/Location.java | 17 ++++++++ .../ReaderApplicationConfig.java | 15 +++++++ .../baeldung/beaninjection/ReaderManager.java | 33 ++++++++++++++ .../baeldung/beaninjection/ReaderService.java | 14 ++++++ .../src/main/resources/injectiontypes.xml | 15 +++++++ .../beaninjection/FileReaderTest.java | 24 +++++++++++ .../baeldung/beaninjection/FtpReaderTest.java | 25 +++++++++++ .../beaninjection/ReaderManagerTest.java | 25 +++++++++++ .../beaninjection/ReaderServiceTest.java | 24 +++++++++++ 13 files changed, 306 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/stream/StreamApi.java create mode 100644 core-java/src/test/java/com/baeldung/stream/StreamApiTest.java create mode 100644 spring-core/src/main/java/com/baeldung/beaninjection/FileReader.java create mode 100644 spring-core/src/main/java/com/baeldung/beaninjection/FtpReader.java create mode 100644 spring-core/src/main/java/com/baeldung/beaninjection/Location.java create mode 100644 spring-core/src/main/java/com/baeldung/beaninjection/ReaderApplicationConfig.java create mode 100644 spring-core/src/main/java/com/baeldung/beaninjection/ReaderManager.java create mode 100644 spring-core/src/main/java/com/baeldung/beaninjection/ReaderService.java create mode 100644 spring-core/src/main/resources/injectiontypes.xml create mode 100644 spring-core/src/test/java/com/baeldung/beaninjection/FileReaderTest.java create mode 100644 spring-core/src/test/java/com/baeldung/beaninjection/FtpReaderTest.java create mode 100644 spring-core/src/test/java/com/baeldung/beaninjection/ReaderManagerTest.java create mode 100644 spring-core/src/test/java/com/baeldung/beaninjection/ReaderServiceTest.java diff --git a/core-java/src/main/java/com/baeldung/stream/StreamApi.java b/core-java/src/main/java/com/baeldung/stream/StreamApi.java new file mode 100644 index 0000000000..ec792314d2 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/stream/StreamApi.java @@ -0,0 +1,24 @@ +package com.baeldung.stream; + +import java.util.List; +import java.util.stream.Stream; + +public class StreamApi { + + public String getLastElementUsingReduce(List valueList) { + Stream stream = valueList.stream(); + return stream.reduce((first, second) -> second).orElse(null); + } + + public Integer getInfiniteStreamLastElementUsingReduce() { + Stream stream = Stream.iterate(0, i -> i + 1); + return stream.limit(20).reduce((first, second) -> second).orElse(null); + } + + public String getLastElementUsingSkip(List valueList) { + long count = valueList.stream().count(); + Stream stream = valueList.stream(); + return stream.skip(count - 1).findFirst().orElse(null); + } + +} diff --git a/core-java/src/test/java/com/baeldung/stream/StreamApiTest.java b/core-java/src/test/java/com/baeldung/stream/StreamApiTest.java new file mode 100644 index 0000000000..af52b3ee69 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/stream/StreamApiTest.java @@ -0,0 +1,43 @@ +package com.baeldung.stream; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + +public class StreamApiTest { + private StreamApi streamApi = new StreamApi(); + + @Test + public void givenList_whenGetLastElementUsingReduce_thenReturnLastElement() { + List valueList = new ArrayList(); + valueList.add("Joe"); + valueList.add("John"); + valueList.add("Sean"); + + String last = streamApi.getLastElementUsingReduce(valueList); + + assertEquals("Sean", last); + } + + @Test + public void givenInfiniteStream_whenGetInfiniteStreamLastElementUsingReduce_thenReturnLastElement() { + Integer last = streamApi.getInfiniteStreamLastElementUsingReduce(); + assertEquals(new Integer(19), last); + } + + @Test + public void givenListAndCount_whenGetLastElementUsingSkip_thenReturnLastElement() { + List valueList = new ArrayList(); + valueList.add("Joe"); + valueList.add("John"); + valueList.add("Sean"); + + String last = streamApi.getLastElementUsingSkip(valueList); + + assertEquals("Sean", last); + } + +} diff --git a/spring-core/src/main/java/com/baeldung/beaninjection/FileReader.java b/spring-core/src/main/java/com/baeldung/beaninjection/FileReader.java new file mode 100644 index 0000000000..7ea64e2ce6 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/beaninjection/FileReader.java @@ -0,0 +1,19 @@ +package com.baeldung.beaninjection; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class FileReader { + + @Autowired + private Location location; + + public Location getLocation() { + return location; + } + + public void setLocation(Location location) { + this.location = location; + } +} diff --git a/spring-core/src/main/java/com/baeldung/beaninjection/FtpReader.java b/spring-core/src/main/java/com/baeldung/beaninjection/FtpReader.java new file mode 100644 index 0000000000..259710ce94 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/beaninjection/FtpReader.java @@ -0,0 +1,28 @@ +package com.baeldung.beaninjection; + +public class FtpReader { + private String ftpHost = null; + private Integer ftpPort = null; + + // Constructor with arguments + public FtpReader(String host, Integer port) { + this.ftpHost = host; + this.ftpPort = port; + } + + public String getFtpHost() { + return ftpHost; + } + + public void setFtpHost(String ftpHost) { + this.ftpHost = ftpHost; + } + + public Integer getFtpPort() { + return ftpPort; + } + + public void setFtpPort(Integer ftpPort) { + this.ftpPort = ftpPort; + } +} diff --git a/spring-core/src/main/java/com/baeldung/beaninjection/Location.java b/spring-core/src/main/java/com/baeldung/beaninjection/Location.java new file mode 100644 index 0000000000..9ecab83ef6 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/beaninjection/Location.java @@ -0,0 +1,17 @@ +package com.baeldung.beaninjection; + +import org.springframework.stereotype.Component; + +@Component +public class Location { + private String filePath; + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/beaninjection/ReaderApplicationConfig.java b/spring-core/src/main/java/com/baeldung/beaninjection/ReaderApplicationConfig.java new file mode 100644 index 0000000000..cf4d91b1f5 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/beaninjection/ReaderApplicationConfig.java @@ -0,0 +1,15 @@ +package com.baeldung.beaninjection; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan(basePackages = { "com.baeldung.beaninjection" }) +public class ReaderApplicationConfig { + + @Bean + public FtpReader exampleDAO() { + return new FtpReader("localhost", 21); + } +} diff --git a/spring-core/src/main/java/com/baeldung/beaninjection/ReaderManager.java b/spring-core/src/main/java/com/baeldung/beaninjection/ReaderManager.java new file mode 100644 index 0000000000..155f2d6eea --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/beaninjection/ReaderManager.java @@ -0,0 +1,33 @@ +package com.baeldung.beaninjection; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class ReaderManager { + private FileReader fileReader; + private FtpReader ftpReader; + + @Autowired + public ReaderManager(FtpReader ftpReader) { + this.ftpReader = ftpReader; + } + + @Autowired + public void setFileReader(FileReader fileReader) { + this.fileReader = fileReader; + } + + public FileReader getFileReader() { + return fileReader; + } + + public void setFtpReader(FtpReader ftpReader) { + this.ftpReader = ftpReader; + } + + public FtpReader getFtpReader() { + return ftpReader; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/beaninjection/ReaderService.java b/spring-core/src/main/java/com/baeldung/beaninjection/ReaderService.java new file mode 100644 index 0000000000..60bdac61e5 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/beaninjection/ReaderService.java @@ -0,0 +1,14 @@ +package com.baeldung.beaninjection; + +public class ReaderService { + private FtpReader ftpReader; + + public void setFtpReader(FtpReader reader) { + this.ftpReader = reader; + } + + public FtpReader getFtpReader() { + return ftpReader; + } + +} diff --git a/spring-core/src/main/resources/injectiontypes.xml b/spring-core/src/main/resources/injectiontypes.xml new file mode 100644 index 0000000000..9dad1e300a --- /dev/null +++ b/spring-core/src/main/resources/injectiontypes.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/beaninjection/FileReaderTest.java b/spring-core/src/test/java/com/baeldung/beaninjection/FileReaderTest.java new file mode 100644 index 0000000000..f843fddd4d --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/beaninjection/FileReaderTest.java @@ -0,0 +1,24 @@ +package com.baeldung.beaninjection; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = ReaderApplicationConfig.class) +public class FileReaderTest { + + @Autowired + private ApplicationContext context; + + @Test + public void testAutowiredAnnotation_WhenField_ThenInjected() { + FileReader service = context.getBean(FileReader.class); + assertNotNull(service.getLocation()); + } +} diff --git a/spring-core/src/test/java/com/baeldung/beaninjection/FtpReaderTest.java b/spring-core/src/test/java/com/baeldung/beaninjection/FtpReaderTest.java new file mode 100644 index 0000000000..a11afff9ea --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/beaninjection/FtpReaderTest.java @@ -0,0 +1,25 @@ +package com.baeldung.beaninjection; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = "classpath:injectiontypes.xml") +public class FtpReaderTest { + + @Autowired + private ApplicationContext context; + + @Test + public void testXMLBeanConfig_WhenConstructorArguments_ThenInjected() { + FtpReader service = context.getBean(FtpReader.class); + assertNotNull(service.getFtpHost()); + assertNotNull(service.getFtpPort()); + } +} diff --git a/spring-core/src/test/java/com/baeldung/beaninjection/ReaderManagerTest.java b/spring-core/src/test/java/com/baeldung/beaninjection/ReaderManagerTest.java new file mode 100644 index 0000000000..7d85c0bf07 --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/beaninjection/ReaderManagerTest.java @@ -0,0 +1,25 @@ +package com.baeldung.beaninjection; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = ReaderApplicationConfig.class) +public class ReaderManagerTest { + + @Autowired + private ApplicationContext context; + + @Test + public void testAutowiredAnnotation_WhenConstructorAndSetter_ThenInjected() { + ReaderManager service = context.getBean(ReaderManager.class); + assertNotNull(service.getFtpReader()); + assertNotNull(service.getFileReader()); + } +} diff --git a/spring-core/src/test/java/com/baeldung/beaninjection/ReaderServiceTest.java b/spring-core/src/test/java/com/baeldung/beaninjection/ReaderServiceTest.java new file mode 100644 index 0000000000..da4684ad4e --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/beaninjection/ReaderServiceTest.java @@ -0,0 +1,24 @@ +package com.baeldung.beaninjection; + +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = "classpath:injectiontypes.xml") +public class ReaderServiceTest { + + @Autowired + private ApplicationContext context; + + @Test + public void testXMLBeanConfig_WhenSetter_ThenInjected() { + ReaderService service = context.getBean(ReaderService.class); + assertNotNull(service.getFtpReader()); + } +} From efd2c2bd341d11205dc16aaf2da386cf2b38e229 Mon Sep 17 00:00:00 2001 From: Parth Joshi Date: Sun, 28 May 2017 22:13:31 +0530 Subject: [PATCH 09/22] Hibernate5 multitenancy changing to hibernate.properties config file. (#1881) * First commit for Hibernate 5 Multitenancy tutorial * Changes to fix the code. * Added hibernate begin transaction code. * Changes to solve the multitenancy issue. * Changes to integrate h2 * Changing configs to solve the error * Changes to solve h2 error... * Changes to fix H2 error. * Cleaned POM.xml and changed entity name * Changes table name to supplier * Removed MySql Dep from pom.xml. * Changes as per comment in the PR... * Removed try-catch from test functions. * Removing the hibernate xml config. * Changed the formatting as per the formatter. * Clean up after merge. * # WARNING: head commit changed in the meantime Merge remote-tracking branch 'upstream/master' into hibernate5-multitenancy Conflicts: hibernate5/pom.xml pom.xml --- hibernate5/pom.xml | 33 +++++++ .../hibernate/HibernateMultiTenantUtil.java | 72 ++++++++++------ .../src/main/resources/hibernate.cfg.xml | 14 --- .../src/main/resources/hibernate.properties | 8 ++ .../MultiTenantHibernateIntegrationTest.java | 86 ++++++++++--------- hibernate5/src/test/java/hibernate.properties | 8 ++ 6 files changed, 141 insertions(+), 80 deletions(-) delete mode 100644 hibernate5/src/main/resources/hibernate.cfg.xml create mode 100644 hibernate5/src/main/resources/hibernate.properties create mode 100644 hibernate5/src/test/java/hibernate.properties diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml index 63e0799281..c501b7f11d 100644 --- a/hibernate5/pom.xml +++ b/hibernate5/pom.xml @@ -15,6 +15,8 @@ http://maven.apache.org UTF-8 + + 3.6.0 @@ -22,6 +24,11 @@ hibernate-core 5.2.9.Final + + junit + junit + 4.12 + com.h2database h2 @@ -37,6 +44,32 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 3 + true + + **/*IntegrationTest.java + **/*LiveTest.java + + + + + + diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java index c3e7b621d0..5a10b2ba56 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java @@ -1,5 +1,9 @@ package com.baeldung.hibernate; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URL; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -20,44 +24,56 @@ import com.baeldung.hibernate.pojo.Supplier; public class HibernateMultiTenantUtil { private static SessionFactory sessionFactory; private static Map connectionProviderMap = new HashMap<>(); - private static final String[] tenantDBNames = { "mydb1","mydb2"}; + private static final String[] tenantDBNames = { "mydb1", "mydb2" }; - public static SessionFactory getSessionFactory() throws UnsupportedTenancyException { + public static SessionFactory getSessionFactory() throws UnsupportedTenancyException, IOException { if (sessionFactory == null) { - Configuration configuration = new Configuration().configure(); - ServiceRegistry serviceRegistry = configureServiceRegistry(configuration); - sessionFactory = makeSessionFactory (serviceRegistry); -// sessionFactory = configuration.buildSessionFactory(serviceRegistry); - - + // Configuration configuration = new Configuration().configure(); + ServiceRegistry serviceRegistry = configureServiceRegistry(); + sessionFactory = makeSessionFactory(serviceRegistry); + } return sessionFactory; } private static SessionFactory makeSessionFactory(ServiceRegistry serviceRegistry) { - MetadataSources metadataSources = new MetadataSources( serviceRegistry ); - for(Class annotatedClasses : getAnnotatedClasses()) { - metadataSources.addAnnotatedClass( annotatedClasses ); + MetadataSources metadataSources = new MetadataSources(serviceRegistry); + for (Class annotatedClasses : getAnnotatedClasses()) { + metadataSources.addAnnotatedClass(annotatedClasses); } Metadata metadata = metadataSources.buildMetadata(); - return metadata.getSessionFactoryBuilder().build(); - + return metadata.getSessionFactoryBuilder() + .build(); + } private static Class[] getAnnotatedClasses() { - return new Class[] { - Supplier.class - }; + return new Class[] { Supplier.class }; } - private static ServiceRegistry configureServiceRegistry(Configuration configuration) throws UnsupportedTenancyException { - Properties properties = configuration.getProperties(); + private static ServiceRegistry configureServiceRegistry() throws UnsupportedTenancyException, IOException { + + // Properties properties = configuration.getProperties(); + Properties properties = getProperties(); connectionProviderMap = setUpConnectionProviders(properties, tenantDBNames); properties.put(AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER, new ConfigurableMultiTenantConnectionProvider(connectionProviderMap)); - return new StandardServiceRegistryBuilder().applySettings(properties).build(); + return new StandardServiceRegistryBuilder().applySettings(properties) + .build(); + } + + private static Properties getProperties() throws IOException { + Properties properties = new Properties(); + URL propertiesURL = Thread.currentThread() + .getContextClassLoader() + .getResource("hibernate.properties"); + FileInputStream inputStream = new FileInputStream(propertiesURL.getFile()); + properties.load(inputStream); + System.out.println("LOADED PROPERTIES FROM hibernate.properties"); + + return properties; } private static Map setUpConnectionProviders(Properties properties, String[] tenantNames) throws UnsupportedTenancyException { @@ -66,23 +82,27 @@ public class HibernateMultiTenantUtil { DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl(); String tenantStrategy = properties.getProperty("hibernate.multiTenancy"); - System.out.println("Strategy:"+tenantStrategy); + System.out.println("Strategy:" + tenantStrategy); properties.put(Environment.URL, tenantUrl(properties.getProperty(Environment.URL), tenant, tenantStrategy)); - System.out.println("URL:"+properties.getProperty(Environment.URL)); + System.out.println("URL:" + properties.getProperty(Environment.URL)); connectionProvider.configure(properties); - System.out.println("Tenant:"+tenant); + System.out.println("Tenant:" + tenant); providerMap.put(tenant, connectionProvider); - + } System.out.println("Added connections for:"); - providerMap.keySet().stream().forEach(System.out::println); + providerMap.keySet() + .stream() + .forEach(System.out::println); return providerMap; } private static Object tenantUrl(String originalUrl, String tenant, String tenantStrategy) throws UnsupportedTenancyException { - if (tenantStrategy.toUpperCase().equals("DATABASE")) { + if (tenantStrategy.toUpperCase() + .equals("DATABASE")) { return originalUrl.replace(DEFAULT_DB_NAME, tenant); - } else if (tenantStrategy.toUpperCase().equals("SCHEMA")) { + } else if (tenantStrategy.toUpperCase() + .equals("SCHEMA")) { return originalUrl + String.format(SCHEMA_TOKEN, tenant); } else { throw new UnsupportedTenancyException("Not yet supported"); diff --git a/hibernate5/src/main/resources/hibernate.cfg.xml b/hibernate5/src/main/resources/hibernate.cfg.xml deleted file mode 100644 index 26be05f931..0000000000 --- a/hibernate5/src/main/resources/hibernate.cfg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - org.h2.Driver - jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1 - sa - - org.hibernate.dialect.H2Dialect - DATABASE - - diff --git a/hibernate5/src/main/resources/hibernate.properties b/hibernate5/src/main/resources/hibernate.properties new file mode 100644 index 0000000000..a8f927a280 --- /dev/null +++ b/hibernate5/src/main/resources/hibernate.properties @@ -0,0 +1,8 @@ +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1 +hibernate.connection.username=sa +jdbc.password= + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=true +hibernate.multiTenancy=DATABASE diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateIntegrationTest.java index 8f2e88ac3d..610617cb8d 100644 --- a/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateIntegrationTest.java +++ b/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateIntegrationTest.java @@ -1,65 +1,71 @@ package com.baeldung.hibernate; -import com.baeldung.hibernate.pojo.Supplier; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; -import org.junit.Test; import static org.junit.Assert.assertNotEquals; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.Transaction; +import org.junit.Before; +import org.junit.Test; + +import com.baeldung.hibernate.pojo.Supplier; public class MultiTenantHibernateIntegrationTest { @Test - public void givenDBMode_whenFetchingSuppliers_thenComparingFromDbs () { - SessionFactory sessionFactory; - try { - sessionFactory = HibernateMultiTenantUtil.getSessionFactory(); - - Session db1Session = sessionFactory - .withOptions().tenantIdentifier("mydb1").openSession(); - - initDb1(db1Session); - - Transaction transaction = db1Session.getTransaction(); - transaction.begin(); - Supplier supplierFromDB1 = (Supplier)db1Session.createCriteria(Supplier.class).list().get(0); - transaction.commit(); - - Session db2Session = sessionFactory - .withOptions().tenantIdentifier("mydb2").openSession(); - - initDb2(db2Session); - db2Session.getTransaction().begin(); - Supplier supplierFromDB2 = (Supplier) db2Session.createCriteria(Supplier.class).list().get(0); - db2Session.getTransaction().commit(); - - System.out.println(supplierFromDB1); - System.out.println(supplierFromDB2); - - assertNotEquals(supplierFromDB1, supplierFromDB2); - } catch (UnsupportedTenancyException e) { - e.printStackTrace(); - } + public void givenDBMode_whenFetchingSuppliers_thenComparingFromDbs() throws UnsupportedTenancyException, IOException { + SessionFactory sessionFactory = HibernateMultiTenantUtil.getSessionFactory(); + + Session db1Session = sessionFactory.withOptions().tenantIdentifier("mydb1").openSession(); + + initDb1(db1Session); + + Transaction transaction = db1Session.getTransaction(); + transaction.begin(); + Supplier supplierFromDB1 = (Supplier) db1Session.createCriteria(Supplier.class).list().get(0); + transaction.commit(); + + Session db2Session = sessionFactory.withOptions().tenantIdentifier("mydb2").openSession(); + + initDb2(db2Session); + db2Session.getTransaction().begin(); + Supplier supplierFromDB2 = (Supplier) db2Session.createCriteria(Supplier.class).list().get(0); + db2Session.getTransaction().commit(); + + System.out.println(supplierFromDB1); + System.out.println(supplierFromDB2); + + assertNotEquals(supplierFromDB1, supplierFromDB2); + } - - private void initDb1(Session db1Session) { System.out.println("Init DB1"); Transaction transaction = db1Session.getTransaction(); transaction.begin(); db1Session.createSQLQuery("DROP ALL OBJECTS").executeUpdate(); - db1Session.createSQLQuery("create table Supplier (id integer generated by default as identity, country varchar(255), name varchar(255), primary key (id))").executeUpdate(); + db1Session + .createSQLQuery( + "create table Supplier (id integer generated by default as identity, country varchar(255), name varchar(255), primary key (id))") + .executeUpdate(); db1Session.createSQLQuery("insert into Supplier (id, country, name) values (null, 'John', 'USA')").executeUpdate(); transaction.commit(); } - + private void initDb2(Session db2Session) { System.out.println("Init DB2"); Transaction transaction = db2Session.getTransaction(); transaction.begin(); db2Session.createSQLQuery("DROP ALL OBJECTS").executeUpdate(); - db2Session.createSQLQuery("create table Supplier (id integer generated by default as identity, country varchar(255), name varchar(255), primary key (id))").executeUpdate(); + db2Session + .createSQLQuery( + "create table Supplier (id integer generated by default as identity, country varchar(255), name varchar(255), primary key (id))") + .executeUpdate(); db2Session.createSQLQuery("insert into Supplier (id, country, name) values (null, 'Miller', 'UK')").executeUpdate(); transaction.commit(); } diff --git a/hibernate5/src/test/java/hibernate.properties b/hibernate5/src/test/java/hibernate.properties new file mode 100644 index 0000000000..a8f927a280 --- /dev/null +++ b/hibernate5/src/test/java/hibernate.properties @@ -0,0 +1,8 @@ +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1 +hibernate.connection.username=sa +jdbc.password= + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=true +hibernate.multiTenancy=DATABASE From 994ac4ddbf1bb86eee71751ad33c71b40c6c5e2b Mon Sep 17 00:00:00 2001 From: Chandravadan S Date: Mon, 29 May 2017 12:04:13 +0530 Subject: [PATCH 10/22] Dining Philosophers Problem (#1944) --- .../DiningPhilosophers.java | 29 +++++++++++++++ .../diningphilosophers/Philosopher.java | 36 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java create mode 100644 core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java diff --git a/core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java b/core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java new file mode 100644 index 0000000000..7a077432f5 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/DiningPhilosophers.java @@ -0,0 +1,29 @@ +package com.baeldung.concurrent.diningphilosophers; + +public class DiningPhilosophers { + + public static void main(String[] args) throws Exception { + + Philosopher[] philosophers = new Philosopher[5]; + Object[] forks = new Object[philosophers.length]; + + for (int i = 0; i < forks.length; i++) { + forks[i] = new Object(); + } + + for (int i = 0; i < philosophers.length; i++) { + + Object leftFork = forks[i]; + Object rightFork = forks[(i + 1) % forks.length]; + + if (i == philosophers.length - 1) { + philosophers[i] = new Philosopher(rightFork, leftFork); // The last philosopher picks up the right fork first + } else { + philosophers[i] = new Philosopher(leftFork, rightFork); + } + + Thread t = new Thread(philosophers[i], "Philosopher " + (i + 1)); + t.start(); + } + } +} diff --git a/core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java b/core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java new file mode 100644 index 0000000000..3f1eacd276 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/concurrent/diningphilosophers/Philosopher.java @@ -0,0 +1,36 @@ +package com.baeldung.concurrent.diningphilosophers; + +public class Philosopher implements Runnable { + + private final Object leftFork; + private final Object rightFork; + + public Philosopher(Object left, Object right) { + this.leftFork = left; + this.rightFork = right; + } + + private void doAction(String action) throws InterruptedException { + System.out.println(Thread.currentThread().getName() + " " + action); + Thread.sleep(((int) (Math.random() * 100))); + } + + @Override public void run() { + try { + while (true) { + doAction(System.nanoTime() + ": Thinking"); // thinking + synchronized (leftFork) { + doAction(System.nanoTime() + ": Picked up left fork"); + synchronized (rightFork) { + doAction(System.nanoTime() + ": Picked up right fork - eating"); // eating + doAction(System.nanoTime() + ": Put down right fork"); + } + doAction(System.nanoTime() + ": Put down left fork. Returning to thinking"); + } + } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + } +} \ No newline at end of file From b135086d0710c68846df9749cd84537206b009e4 Mon Sep 17 00:00:00 2001 From: Wim Deblauwe Date: Mon, 29 May 2017 10:30:25 +0200 Subject: [PATCH 11/22] BAEL-885 - How to merge two Java streams? (#1884) Added examples using: * JDK8 * StreamEx library * JOOl library --- libraries/pom.xml | 10 ++++ .../baeldung/stream/JoolMergeStreamsTest.java | 35 ++++++++++++ .../com/baeldung/stream/MergeStreamsTest.java | 53 +++++++++++++++++++ .../stream/StreamExMergeStreamsTest.java | 51 ++++++++++++++++++ 4 files changed, 149 insertions(+) create mode 100644 libraries/src/test/java/com/baeldung/stream/JoolMergeStreamsTest.java create mode 100644 libraries/src/test/java/com/baeldung/stream/MergeStreamsTest.java create mode 100644 libraries/src/test/java/com/baeldung/stream/StreamExMergeStreamsTest.java diff --git a/libraries/pom.xml b/libraries/pom.xml index a4b554365d..ff1997e969 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -276,6 +276,16 @@ 2.3.0 + + one.util + streamex + 0.6.5 + + + org.jooq + jool + 0.9.12 + 0.7.0 diff --git a/libraries/src/test/java/com/baeldung/stream/JoolMergeStreamsTest.java b/libraries/src/test/java/com/baeldung/stream/JoolMergeStreamsTest.java new file mode 100644 index 0000000000..e73861d8af --- /dev/null +++ b/libraries/src/test/java/com/baeldung/stream/JoolMergeStreamsTest.java @@ -0,0 +1,35 @@ +package com.baeldung.stream; + +import org.jooq.lambda.Seq; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; + +import static junit.framework.TestCase.assertEquals; + +public class JoolMergeStreamsTest { + @Test + public void givenTwoStreams_whenMergingStreams_thenResultingStreamContainsElementsFromBothStreams() { + Seq seq1 = Seq.of(1, 3, 5); + Seq seq2 = Seq.of(2, 4, 6); + + Seq resultingSeq = seq1.append(seq2); + + assertEquals(Arrays.asList(1, 3, 5, 2, 4, 6), + resultingSeq.toList()); + } + + @Test + public void givenThreeStreams_whenAppendingAndPrependingStreams_thenResultingStreamContainsElementsFromAllStreams() { + Seq seq = Seq.of("foo", "bar"); + Seq openingBracketSeq = Seq.of("["); + Seq closingBracketSeq = Seq.of("]"); + + Seq resultingStream = seq.append(closingBracketSeq) + .prepend(openingBracketSeq); + + Assert.assertEquals(Arrays.asList("[", "foo", "bar", "]"), + resultingStream.toList()); + } +} \ No newline at end of file diff --git a/libraries/src/test/java/com/baeldung/stream/MergeStreamsTest.java b/libraries/src/test/java/com/baeldung/stream/MergeStreamsTest.java new file mode 100644 index 0000000000..217d2b5b64 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/stream/MergeStreamsTest.java @@ -0,0 +1,53 @@ +package com.baeldung.stream; + +import org.junit.Test; + +import java.util.Arrays; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.junit.Assert.assertEquals; + +public class MergeStreamsTest { + + @Test + public void givenTwoStreams_whenMergingStreams_thenResultingStreamContainsElementsFromBothStreams() { + Stream stream1 = Stream.of(1, 3, 5); + Stream stream2 = Stream.of(2, 4, 6); + + Stream resultingStream = Stream.concat(stream1, + stream2); + + assertEquals(Arrays.asList(1, 3, 5, 2, 4, 6), + resultingStream.collect(Collectors.toList())); + } + + @Test + public void givenThreeStreams_whenMergingStreams_thenResultingStreamContainsElementsFromAllStreams() { + Stream stream1 = Stream.of(1, 3, 5); + Stream stream2 = Stream.of(2, 4, 6); + Stream stream3 = Stream.of(18, 15, 36); + + Stream resultingStream = Stream.concat(Stream.concat(stream1, + stream2), + stream3); + + assertEquals(Arrays.asList(1, 3, 5, 2, 4, 6, 18, 15, 36), + resultingStream.collect(Collectors.toList())); + } + + @Test + public void givenFourStreams_whenMergingStreams_thenResultingStreamContainsElementsFromAllStreams() { + Stream stream1 = Stream.of(1, 3, 5); + Stream stream2 = Stream.of(2, 4, 6); + Stream stream3 = Stream.of(18, 15, 36); + Stream stream4 = Stream.of(99); + + Stream resultingStream = Stream.of(stream1, stream2, stream3, stream4).flatMap(Function.identity()); + + assertEquals(Arrays.asList(1, 3, 5, 2, 4, 6, 18, 15, 36, 99), + resultingStream.collect(Collectors.toList())); + + } +} \ No newline at end of file diff --git a/libraries/src/test/java/com/baeldung/stream/StreamExMergeStreamsTest.java b/libraries/src/test/java/com/baeldung/stream/StreamExMergeStreamsTest.java new file mode 100644 index 0000000000..a964d76e8a --- /dev/null +++ b/libraries/src/test/java/com/baeldung/stream/StreamExMergeStreamsTest.java @@ -0,0 +1,51 @@ +package com.baeldung.stream; + +import one.util.streamex.StreamEx; +import org.junit.Test; + +import java.util.Arrays; + +import static org.junit.Assert.assertEquals; + +public class StreamExMergeStreamsTest { + + @Test + public void givenTwoStreams_whenMergingStreams_thenResultingStreamContainsElementsFromBothStreams() { + StreamEx stream1 = StreamEx.of(1, 3, 5); + StreamEx stream2 = StreamEx.of(2, 4, 6); + + StreamEx resultingStream = stream1.append(stream2); + + assertEquals(Arrays.asList(1, 3, 5, 2, 4, 6), + resultingStream.toList()); + } + + @Test + public void givenFourStreams_whenMergingStreams_thenResultingStreamContainsElementsFromAllStreams() { + StreamEx stream1 = StreamEx.of(1, 3, 5); + StreamEx stream2 = StreamEx.of(2, 4, 6); + StreamEx stream3 = StreamEx.of(18, 15, 36); + StreamEx stream4 = StreamEx.of(99); + + StreamEx resultingStream = stream1.append(stream2) + .append(stream3) + .append(stream4); + + assertEquals(Arrays.asList(1, 3, 5, 2, 4, 6, 18, 15, 36, 99), + resultingStream.toList()); + + } + + @Test + public void givenThreeStreams_whenAppendingAndPrependingStreams_thenResultingStreamContainsElementsFromAllStreams() { + StreamEx stream1 = StreamEx.of("foo", "bar"); + StreamEx openingBracketStream = StreamEx.of("["); + StreamEx closingBracketStream = StreamEx.of("]"); + + StreamEx resultingStream = stream1.append(closingBracketStream) + .prepend(openingBracketStream); + + assertEquals(Arrays.asList("[", "foo", "bar", "]"), + resultingStream.toList()); + } +} From fe841fe53b97fd0338553a9f8eb98999ec0547e9 Mon Sep 17 00:00:00 2001 From: asif-anwar Date: Mon, 29 May 2017 16:13:41 +0400 Subject: [PATCH 12/22] spring-5-mvc (#1946) * Spring5 MVC Project * Spring5 MVC Project --- pom.xml | 1 + spring-5-mvc/.gitignore | 20 +++ spring-5-mvc/pom.xml | 154 ++++++++++++++++++ .../java/com/baeldung/Spring5Application.java | 13 ++ .../src/main/java/com/baeldung/model/Foo.java | 84 ++++++++++ .../baeldung/persistence/DataSetupBean.java | 26 +++ .../baeldung/persistence/FooRepository.java | 10 ++ .../java/com/baeldung/web/FooController.java | 66 ++++++++ .../src/main/resources/application.properties | 6 + spring-5-mvc/src/main/webapp/WEB-INF/web.xml | 21 +++ .../test/java/com/baeldung/test/LiveTest.java | 54 ++++++ .../Spring5ApplicationIntegrationTest.java | 18 ++ .../src/test/resources/baeldung-weekly.png | Bin 0 -> 22275 bytes 13 files changed, 473 insertions(+) create mode 100644 spring-5-mvc/.gitignore create mode 100644 spring-5-mvc/pom.xml create mode 100644 spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java create mode 100644 spring-5-mvc/src/main/java/com/baeldung/model/Foo.java create mode 100644 spring-5-mvc/src/main/java/com/baeldung/persistence/DataSetupBean.java create mode 100644 spring-5-mvc/src/main/java/com/baeldung/persistence/FooRepository.java create mode 100644 spring-5-mvc/src/main/java/com/baeldung/web/FooController.java create mode 100644 spring-5-mvc/src/main/resources/application.properties create mode 100644 spring-5-mvc/src/main/webapp/WEB-INF/web.xml create mode 100644 spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java create mode 100644 spring-5-mvc/src/test/java/com/baeldung/test/Spring5ApplicationIntegrationTest.java create mode 100644 spring-5-mvc/src/test/resources/baeldung-weekly.png diff --git a/pom.xml b/pom.xml index d1b27bc9c9..e6e11326d7 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,7 @@ solr spark-java spring-5 + spring-5-mvc spring-akka spring-amqp spring-all diff --git a/spring-5-mvc/.gitignore b/spring-5-mvc/.gitignore new file mode 100644 index 0000000000..b7b5c734f2 --- /dev/null +++ b/spring-5-mvc/.gitignore @@ -0,0 +1,20 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +.settings/ +.classpath +.project +target/ + +*.iml +.idea + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/spring-5-mvc/pom.xml b/spring-5-mvc/pom.xml new file mode 100644 index 0000000000..b8c341afde --- /dev/null +++ b/spring-5-mvc/pom.xml @@ -0,0 +1,154 @@ + + + 4.0.0 + + com.baeldung + spring-5-mvc + 0.0.1-SNAPSHOT + jar + + spring-5-mvc + spring 5 MVC sample project about new features + + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.M1 + + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + + + + org.apache.commons + commons-lang3 + + + org.slf4j + slf4j-api + + + org.slf4j + jcl-over-slf4j + + + + + + org.springframework.boot + spring-boot-devtools + runtime + + + com.h2database + h2 + runtime + + + + org.springframework + spring-test + + + org.springframework.boot + spring-boot-starter-test + test + + + + junit + junit + test + + + + com.jayway.restassured + rest-assured + ${rest-assured.version} + test + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + false + + **/*IntegrationTest.java + **/*LiveTest.java + + + + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + 2.9.0 + UTF-8 + UTF-8 + 1.8 + + + diff --git a/spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java b/spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java new file mode 100644 index 0000000000..41b5c1eed1 --- /dev/null +++ b/spring-5-mvc/src/main/java/com/baeldung/Spring5Application.java @@ -0,0 +1,13 @@ +package com.baeldung; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Spring5Application { + + public static void main(String[] args) { + SpringApplication.run(Spring5Application.class, args); + } + +} diff --git a/spring-5-mvc/src/main/java/com/baeldung/model/Foo.java b/spring-5-mvc/src/main/java/com/baeldung/model/Foo.java new file mode 100644 index 0000000000..a9ffee14da --- /dev/null +++ b/spring-5-mvc/src/main/java/com/baeldung/model/Foo.java @@ -0,0 +1,84 @@ +package com.baeldung.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class Foo { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + private String name; + + public Foo() { + super(); + } + + public Foo(final String name) { + super(); + + this.name = name; + } + + public Foo(final long id, final String name) { + super(); + + this.id = id; + this.name = name; + } + + // API + + public String getName() { + return name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public void setName(final String name) { + this.name = name; + } + + // + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Foo other = (Foo) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + return true; + } + + @Override + public String toString() { + return "Foo [name=" + name + "]"; + } + +} \ No newline at end of file diff --git a/spring-5-mvc/src/main/java/com/baeldung/persistence/DataSetupBean.java b/spring-5-mvc/src/main/java/com/baeldung/persistence/DataSetupBean.java new file mode 100644 index 0000000000..cf78977961 --- /dev/null +++ b/spring-5-mvc/src/main/java/com/baeldung/persistence/DataSetupBean.java @@ -0,0 +1,26 @@ +package com.baeldung.persistence; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; + +import java.util.stream.IntStream; + +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.baeldung.model.Foo; + +@Component +public class DataSetupBean implements InitializingBean { + + @Autowired + private FooRepository repo; + + // + + @Override + public void afterPropertiesSet() throws Exception { + IntStream.range(1, 5).forEach(i -> repo.save(new Foo(randomAlphabetic(8)))); + } + +} diff --git a/spring-5-mvc/src/main/java/com/baeldung/persistence/FooRepository.java b/spring-5-mvc/src/main/java/com/baeldung/persistence/FooRepository.java new file mode 100644 index 0000000000..3c70f38fce --- /dev/null +++ b/spring-5-mvc/src/main/java/com/baeldung/persistence/FooRepository.java @@ -0,0 +1,10 @@ +package com.baeldung.persistence; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +import com.baeldung.model.Foo; + +public interface FooRepository extends JpaRepository, JpaSpecificationExecutor { + +} diff --git a/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java b/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java new file mode 100644 index 0000000000..d03cebb4fd --- /dev/null +++ b/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java @@ -0,0 +1,66 @@ +package com.baeldung.web; + +import java.util.List; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import com.baeldung.model.Foo; +import com.baeldung.persistence.FooRepository; + +@RestController("/foos") +public class FooController { + + @Autowired + private FooRepository repo; + + // API - read + + @GetMapping("/foos/{id}") + @Validated + public Foo findById(@PathVariable @Min(0) final long id) { + return repo.findById(id).orElse(null); + } + + @GetMapping + public List findAll() { + return repo.findAll(); + } + + @GetMapping(params = { "page", "size" }) + @Validated + public List findPaginated(@RequestParam("page") @Min(0) final int page, @Max(100) @RequestParam("size") final int size) { + return repo.findAll(PageRequest.of(page, size)).getContent(); + } + + // API - write + + @PutMapping("/foos/{id}") + @ResponseStatus(HttpStatus.OK) + public Foo update(@PathVariable("id") final String id, @RequestBody final Foo foo) { + return foo; + } + + @PostMapping + @ResponseStatus(HttpStatus.CREATED) + public void create( @RequestBody final Foo foo) { + if (null == foo || null == foo.getName()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST," 'name' is required"); + } + repo.save(foo); + } +} diff --git a/spring-5-mvc/src/main/resources/application.properties b/spring-5-mvc/src/main/resources/application.properties new file mode 100644 index 0000000000..886ea1978b --- /dev/null +++ b/spring-5-mvc/src/main/resources/application.properties @@ -0,0 +1,6 @@ +server.port=8081 + +security.user.name=user +security.user.password=pass + +logging.level.root=INFO \ No newline at end of file diff --git a/spring-5-mvc/src/main/webapp/WEB-INF/web.xml b/spring-5-mvc/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..bfcf43dad2 --- /dev/null +++ b/spring-5-mvc/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,21 @@ + + + + Spring Functional Application + + + functional + com.baeldung.functional.RootServlet + 1 + true + + + functional + / + + + + \ No newline at end of file diff --git a/spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java b/spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java new file mode 100644 index 0000000000..637913541c --- /dev/null +++ b/spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java @@ -0,0 +1,54 @@ +package com.baeldung.test; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.springframework.http.MediaType; + +import com.jayway.restassured.RestAssured; +import com.jayway.restassured.response.Response; +import com.jayway.restassured.specification.RequestSpecification; + +public class LiveTest { + + private static String APP_ROOT = "http://localhost:8081"; + + + @Test + public void givenUser_whenPostWithNullName_then400BadRequest() { + final Response response = givenAuth("user", "pass").contentType(MediaType.APPLICATION_JSON.toString()).body(resourceWithNullName()).post(APP_ROOT + "/user"); + assertEquals(400, response.getStatusCode()); + } + + @Test + public void givenUser_whenResourceCreated_then201Created() { + final Response response = givenAuth("user", "pass").contentType(MediaType.APPLICATION_JSON.toString()).body(resourceString()).post(APP_ROOT + "/user"); + assertEquals(201, response.getStatusCode()); + } + + /*@Test + public void givenUser_whenGetAllFoos_thenOK() { + final Response response = givenAuth("user", "pass").get(APP_ROOT + "/foos"); + assertEquals(200, response.getStatusCode()); + }*/ + + + + // + + private final String resourceWithNullName() { + final String roleData = "{\"name\":null}"; + return roleData; + } + + private final String resourceString() { + final String roleData = "{\"name\":\"" + randomAlphabetic(8) + "\"}"; + return roleData; + } + + private final RequestSpecification givenAuth(String username, String password) { + return RestAssured.given().auth().preemptive().basic(username, password); + } + +} \ No newline at end of file diff --git a/spring-5-mvc/src/test/java/com/baeldung/test/Spring5ApplicationIntegrationTest.java b/spring-5-mvc/src/test/java/com/baeldung/test/Spring5ApplicationIntegrationTest.java new file mode 100644 index 0000000000..c3790333ff --- /dev/null +++ b/spring-5-mvc/src/test/java/com/baeldung/test/Spring5ApplicationIntegrationTest.java @@ -0,0 +1,18 @@ +package com.baeldung.test; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import com.baeldung.Spring5Application; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = Spring5Application.class) +public class Spring5ApplicationIntegrationTest { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-5-mvc/src/test/resources/baeldung-weekly.png b/spring-5-mvc/src/test/resources/baeldung-weekly.png new file mode 100644 index 0000000000000000000000000000000000000000..5a27d61dae718016a947083e01411ed1bc14f90e GIT binary patch literal 22275 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 Date: Mon, 29 May 2017 17:47:39 +0530 Subject: [PATCH 13/22] BAEL-839 Delete as no longer needed --- .../com/baeldung/regexp/EscapingChars.java | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 core-java/src/main/java/com/baeldung/regexp/EscapingChars.java diff --git a/core-java/src/main/java/com/baeldung/regexp/EscapingChars.java b/core-java/src/main/java/com/baeldung/regexp/EscapingChars.java deleted file mode 100644 index 3268339a15..0000000000 --- a/core-java/src/main/java/com/baeldung/regexp/EscapingChars.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baeldung.regexp; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class EscapingChars { - public boolean isMatching(String input, String pattern) { - return input.matches(pattern); - } - - public int splitAndCountWords(String input, String pattern) { - return input.split(pattern).length; - } - - public int splitAndCountWordsUsingQuoteMethod(String input, String pattern) { - return input.split(Pattern.quote(pattern)).length; - } - - public String changeCurrencySymbol(String input, String pattern, - String correctStr) { - Pattern p = Pattern.compile(pattern); - Matcher m = p.matcher(input); - return m.replaceAll(correctStr); - } -} From 4586d471a1942834c8aaad8c0dd0681f3a91ba97 Mon Sep 17 00:00:00 2001 From: buddhini81 Date: Mon, 29 May 2017 17:55:10 +0530 Subject: [PATCH 14/22] BAEL-839 changes in all test methods --- .../baeldung/regexp/EscapingCharsTest.java | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java b/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java index 1e2293955a..49d349f69f 100644 --- a/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java +++ b/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java @@ -11,57 +11,59 @@ public class EscapingCharsTest { public void givenRegexWithDot_whenMatchingStr_thenMatches() { String strInput = "foof"; String strRegex = "foo."; - EscapingChars e = new EscapingChars(); - - assertEquals(true, e.isMatching(strInput, strRegex)); + + assertEquals(true, strInput.matches(strRegex)); } - + @Test public void givenRegexWithDotEsc_whenMatchingStr_thenNotMatching() { String strInput = "foof"; String strRegex = "foo\\."; - EscapingChars e = new EscapingChars(); - - assertEquals(false, e.isMatching(strInput, strRegex)); + + assertEquals(false, strInput.matches(strRegex)); } - + @Test public void givenRegexWithPipeEscaped_whenSplitStr_thenSplits() { String strInput = "foo|bar|hello|world"; String strRegex = "\\Q|\\E"; - EscapingChars e = new EscapingChars(); - - assertEquals(4, e.splitAndCountWords(strInput, strRegex)); + + assertEquals(4, strInput.split(strRegex).length); } - + @Test public void givenRegexWithPipeEscQuoteMeth_whenSplitStr_thenSplits() { String strInput = "foo|bar|hello|world"; String strRegex = "|"; - EscapingChars e = new EscapingChars(); - - assertEquals(4, e.splitAndCountWordsUsingQuoteMethod(strInput, strRegex)); + + assertEquals(4,strInput.split(Pattern.quote(strRegex)).length); } - + @Test public void givenRegexWithDollar_whenReplacing_thenNotReplace() { - String strInput = "I gave $50 to my brother.He bought candy for $35. Now he has $15 left."; + String strInput = "I gave $50 to my brother." + + "He bought candy for $35. Now he has $15 left."; String strRegex = "$"; - String strReplacement = "�"; - String output = "I gave �50 to my brother.He bought candy for �35. Now he has �15 left."; - EscapingChars e = new EscapingChars(); - - assertThat(output, not(equalTo(e.changeCurrencySymbol(strInput, strRegex, strReplacement)))); + String strReplacement = "£"; + String output = "I gave £50 to my brother." + + "He bought candy for £35. Now he has £15 left."; + Pattern p = Pattern.compile(strRegex); + Matcher m = p.matcher(strInput); + + assertThat(output, not(equalTo(m.replaceAll(strReplacement)))); } - + @Test public void givenRegexWithDollarEsc_whenReplacing_thenReplace() { - String strInput = "I gave $50 to my brother. He bought candy for $35. Now he has $15 left."; + String strInput = "I gave $50 to my brother." + + "He bought candy for $35. Now he has $15 left."; String strRegex = "\\$"; - String strReplacement = "�"; - String output = "I gave �50 to my brother. He bought candy for �35. Now he has �15 left."; - EscapingChars e = new EscapingChars(); - - assertEquals(output, e.changeCurrencySymbol(strInput, strRegex, strReplacement)); + String strReplacement = "£"; + String output = "I gave £50 to my brother." + + "He bought candy for £35. Now he has £15 left."; + Pattern p = Pattern.compile(strRegex); + Matcher m = p.matcher(strInput); + + assertEquals(output,m.replaceAll(strReplacement)); } } From 4eeaf5b7902238ffbf76dcb3fadf632740cb1af1 Mon Sep 17 00:00:00 2001 From: buddhini81 Date: Mon, 29 May 2017 18:30:53 +0530 Subject: [PATCH 15/22] BAEL-839 - Add the missing imports --- .../src/test/java/com/baeldung/regexp/EscapingCharsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java b/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java index 49d349f69f..f8dbde4c4f 100644 --- a/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java +++ b/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java @@ -3,6 +3,8 @@ package com.baeldung.regexp; import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertThat; import static org.hamcrest.CoreMatchers.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.junit.Test; From 8f3039b292b66140e91b0f44bb96764b0f6d6876 Mon Sep 17 00:00:00 2001 From: asif-anwar Date: Mon, 29 May 2017 20:58:25 +0400 Subject: [PATCH 16/22] spring-5-mvc (#1952) --- .../java/com/baeldung/web/FooController.java | 132 +++++++++--------- .../test/java/com/baeldung/test/LiveTest.java | 6 +- .../src/test/resources/baeldung-weekly.png | Bin 22275 -> 0 bytes 3 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 spring-5-mvc/src/test/resources/baeldung-weekly.png diff --git a/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java b/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java index d03cebb4fd..137864cddd 100644 --- a/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java +++ b/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java @@ -1,66 +1,66 @@ -package com.baeldung.web; - -import java.util.List; - -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.PageRequest; -import org.springframework.http.HttpStatus; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.server.ResponseStatusException; - -import com.baeldung.model.Foo; -import com.baeldung.persistence.FooRepository; - -@RestController("/foos") -public class FooController { - - @Autowired - private FooRepository repo; - - // API - read - - @GetMapping("/foos/{id}") - @Validated - public Foo findById(@PathVariable @Min(0) final long id) { - return repo.findById(id).orElse(null); - } - - @GetMapping - public List findAll() { - return repo.findAll(); - } - - @GetMapping(params = { "page", "size" }) - @Validated - public List findPaginated(@RequestParam("page") @Min(0) final int page, @Max(100) @RequestParam("size") final int size) { - return repo.findAll(PageRequest.of(page, size)).getContent(); - } - - // API - write - - @PutMapping("/foos/{id}") - @ResponseStatus(HttpStatus.OK) - public Foo update(@PathVariable("id") final String id, @RequestBody final Foo foo) { - return foo; - } - - @PostMapping - @ResponseStatus(HttpStatus.CREATED) - public void create( @RequestBody final Foo foo) { - if (null == foo || null == foo.getName()) { - throw new ResponseStatusException(HttpStatus.BAD_REQUEST," 'name' is required"); - } - repo.save(foo); - } -} +package com.baeldung.web; + +import java.util.List; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.HttpStatus; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import com.baeldung.model.Foo; +import com.baeldung.persistence.FooRepository; + +@RestController +public class FooController { + + @Autowired + private FooRepository repo; + + // API - read + + @GetMapping("/foos/{id}") + @Validated + public Foo findById(@PathVariable @Min(0) final long id) { + return repo.findById(id).orElse(null); + } + + @GetMapping("/foos") + public List findAll() { + return repo.findAll(); + } + + @GetMapping( value="/foos", params = { "page", "size" }) + @Validated + public List findPaginated(@RequestParam("page") @Min(0) final int page, @Max(100) @RequestParam("size") final int size) { + return repo.findAll(PageRequest.of(page, size)).getContent(); + } + + // API - write + + @PutMapping("/foos/{id}") + @ResponseStatus(HttpStatus.OK) + public Foo update(@PathVariable("id") final String id, @RequestBody final Foo foo) { + return foo; + } + + @PostMapping("/foos") + @ResponseStatus(HttpStatus.CREATED) + public void create( @RequestBody final Foo foo) { + if (null == foo || null == foo.getName()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST," 'name' is required"); + } + repo.save(foo); + } +} \ No newline at end of file diff --git a/spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java b/spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java index 637913541c..f6dd921b25 100644 --- a/spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java +++ b/spring-5-mvc/src/test/java/com/baeldung/test/LiveTest.java @@ -16,14 +16,14 @@ public class LiveTest { @Test - public void givenUser_whenPostWithNullName_then400BadRequest() { - final Response response = givenAuth("user", "pass").contentType(MediaType.APPLICATION_JSON.toString()).body(resourceWithNullName()).post(APP_ROOT + "/user"); + public void givenUser_whenResourceCreatedWithNullName_then400BadRequest() { + final Response response = givenAuth("user", "pass").contentType(MediaType.APPLICATION_JSON.toString()).body(resourceWithNullName()).post(APP_ROOT + "/foos"); assertEquals(400, response.getStatusCode()); } @Test public void givenUser_whenResourceCreated_then201Created() { - final Response response = givenAuth("user", "pass").contentType(MediaType.APPLICATION_JSON.toString()).body(resourceString()).post(APP_ROOT + "/user"); + final Response response = givenAuth("user", "pass").contentType(MediaType.APPLICATION_JSON.toString()).body(resourceString()).post(APP_ROOT + "/foos"); assertEquals(201, response.getStatusCode()); } diff --git a/spring-5-mvc/src/test/resources/baeldung-weekly.png b/spring-5-mvc/src/test/resources/baeldung-weekly.png deleted file mode 100644 index 5a27d61dae718016a947083e01411ed1bc14f90e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22275 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 Date: Mon, 29 May 2017 22:21:03 +0200 Subject: [PATCH 17/22] BAEL-923 init class not managed by Spring with Spring Bean (#1906) * adam.zawada@gmail.com - Different Types of Bean Injection in Spring * adam.zawada@gmail.com - Different Types of Bean Injection in Spring switch to Java based configuration * BAEL-895 calculate the period/duration between two dates in Java 8 * clean old PR * BAEL-923 How to inject a value from properties to a class not managed by Spring? * clean PR * BAEL-923 init class not managed by Spring with Spring Bean * clean previous PR * added mockito spring boot for test dependency --- spring-core/pom.xml | 7 ++++ .../value/ClassNotManagedBySpring.java | 28 +++++++++++++ .../com/baeldung/value/InitializerBean.java | 21 ++++++++++ .../src/main/resources/application.properties | 2 + .../value/ClassNotManagedBySpringTest.java | 40 +++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 spring-core/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java create mode 100644 spring-core/src/main/java/com/baeldung/value/InitializerBean.java create mode 100644 spring-core/src/main/resources/application.properties create mode 100644 spring-core/src/test/java/com/baeldung/value/ClassNotManagedBySpringTest.java diff --git a/spring-core/pom.xml b/spring-core/pom.xml index 16984a387b..70002bf3c1 100644 --- a/spring-core/pom.xml +++ b/spring-core/pom.xml @@ -58,6 +58,12 @@ lombok ${lombok.version} + + org.springframework.boot + spring-boot-test + ${mockito.spring.boot.version} + test + @@ -112,6 +118,7 @@ 1.10.19 + 1.4.4.RELEASE 4.3.4.RELEASE 1 20.0 diff --git a/spring-core/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java b/spring-core/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java new file mode 100644 index 0000000000..0329769d3c --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/value/ClassNotManagedBySpring.java @@ -0,0 +1,28 @@ +package com.baeldung.value; + +public class ClassNotManagedBySpring { + + private String customVariable; + private String anotherCustomVariable; + + public ClassNotManagedBySpring(String someInitialValue, String anotherManagedValue) { + this.customVariable = someInitialValue; + this.anotherCustomVariable = anotherManagedValue; + } + + public String getCustomVariable() { + return customVariable; + } + + public void setCustomVariable(String customVariable) { + this.customVariable = customVariable; + } + + public String getAnotherCustomVariable() { + return anotherCustomVariable; + } + + public void setAnotherCustomVariable(String anotherCustomVariable) { + this.anotherCustomVariable = anotherCustomVariable; + } +} diff --git a/spring-core/src/main/java/com/baeldung/value/InitializerBean.java b/spring-core/src/main/java/com/baeldung/value/InitializerBean.java new file mode 100644 index 0000000000..8c8634c767 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/value/InitializerBean.java @@ -0,0 +1,21 @@ +package com.baeldung.value; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class InitializerBean { + + private String someInitialValue; + private String anotherManagedValue; + + public InitializerBean(@Value("someInitialValue") String someInitialValue, @Value("anotherValue") String anotherManagedValue) { + this.someInitialValue = someInitialValue; + this.anotherManagedValue = anotherManagedValue; + } + + public ClassNotManagedBySpring initClass() { + return new ClassNotManagedBySpring(this.someInitialValue, this.anotherManagedValue); + } + +} diff --git a/spring-core/src/main/resources/application.properties b/spring-core/src/main/resources/application.properties new file mode 100644 index 0000000000..fdc6536237 --- /dev/null +++ b/spring-core/src/main/resources/application.properties @@ -0,0 +1,2 @@ +someInitialValue=This is only sample value +anotherValue=Another configured value \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/value/ClassNotManagedBySpringTest.java b/spring-core/src/test/java/com/baeldung/value/ClassNotManagedBySpringTest.java new file mode 100644 index 0000000000..d07d490642 --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/value/ClassNotManagedBySpringTest.java @@ -0,0 +1,40 @@ +package com.baeldung.value; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.junit4.SpringRunner; + +import static junit.framework.TestCase.assertEquals; +import static org.mockito.Mockito.when; + +@RunWith(SpringRunner.class) +public class ClassNotManagedBySpringTest { + + @MockBean + private InitializerBean initializerBean; + + @Before + public void init() { + when(initializerBean.initClass()) + .thenReturn(new ClassNotManagedBySpring("This is only sample value", "Another configured value")); + } + + @Test + public void givenInitializerBean_whenInvokedInitClass_shouldInitialize() throws Exception { + + //given + ClassNotManagedBySpring classNotManagedBySpring = initializerBean.initClass(); + + //when + String initializedValue = classNotManagedBySpring.getCustomVariable(); + String anotherCustomVariable = classNotManagedBySpring.getAnotherCustomVariable(); + + //then + assertEquals("This is only sample value", initializedValue); + assertEquals("Another configured value", anotherCustomVariable); + + } + +} \ No newline at end of file From ec041202ae55e467e7074bce97f5dbea95b77d53 Mon Sep 17 00:00:00 2001 From: Pritam Banerjee Date: Tue, 30 May 2017 01:53:54 -0700 Subject: [PATCH 18/22] Fixed EJB --- .../baeldung/map/iteration/MapIteration.java | 57 ---------------- .../map/iteration/MapIterationTest.java | 68 ------------------- 2 files changed, 125 deletions(-) delete mode 100644 core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java delete mode 100644 core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java diff --git a/core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java b/core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java deleted file mode 100644 index 3b2a213aa0..0000000000 --- a/core-java/src/main/java/com/baeldung/map/iteration/MapIteration.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.baeldung.map.iteration; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; - -public class MapIteration { - - public ArrayList iterateUsingEntrySet(Map map) { - ArrayList mapKeyValueList = new ArrayList(); - for (Map.Entry entry : map.entrySet()) { - mapKeyValueList.add(entry.getKey() + ":" + entry.getValue()); - } - return mapKeyValueList; - } - - public ArrayList iterateUsingLambda(Map map) { - ArrayList mapKeyValueList = new ArrayList(); - map.forEach((k, v) -> mapKeyValueList.add(k + ":" + v)); - return mapKeyValueList; - } - - public ArrayList iterateUsingIteratorAndEntry(Map map) { - ArrayList mapKeyValueList = new ArrayList(); - Iterator> iterator = map.entrySet().iterator(); - - while (iterator.hasNext()) { - Map.Entry pair = iterator.next(); - mapKeyValueList.add(pair.getKey() + ":" + pair.getValue()); - } - - return mapKeyValueList; - } - - public ArrayList iterateUsingKeySetAndForeach(Map map) { - ArrayList mapKeyValueList = new ArrayList(); - for (String key : map.keySet()) { - mapKeyValueList.add(key + ":" + map.get(key)); - } - return mapKeyValueList; - } - - public ArrayList iterateUsingStreamAPI(Map map) { - ArrayList mapKeyValueList = new ArrayList(); - map.entrySet().stream().forEach(e -> mapKeyValueList.add(e.getKey() + ":" + e.getValue())); - return mapKeyValueList; - } - - public ArrayList iterateKeys(Map map) { - ArrayList mapKeyList = new ArrayList(); - for (String key : map.keySet()) { - mapKeyList.add(key); - } - return mapKeyList; - } - -} \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java b/core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java deleted file mode 100644 index 5953c118fd..0000000000 --- a/core-java/src/test/java/com/baeldung/map/iteration/MapIterationTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.baeldung.map.iteration; - -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import org.junit.BeforeClass; -import org.junit.Test; - -public class MapIterationTest { - - public static Map testMap = new HashMap(); - public static String testString1 = "One:1"; - public static String testString2 = "Two:2"; - public static String testString3 = "Three:3"; - - @BeforeClass - public static void createTestData() { - testMap.put("One", 1); - testMap.put("Three", 3); - testMap.put("Two", 2); - } - - @Test - public void iterateUsingEntrySet_test() { - MapIteration mapIteration = new MapIteration(); - ArrayList list = mapIteration.iterateUsingEntrySet(testMap); - assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); - } - - @Test - public void iterateUsingLambda_test() { - MapIteration mapIteration = new MapIteration(); - ArrayList list = mapIteration.iterateUsingLambda(testMap); - assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); - } - - @Test - public void iterateUsingIteratorAndEntry_test() { - MapIteration mapIteration = new MapIteration(); - ArrayList list = mapIteration.iterateUsingIteratorAndEntry(testMap); - assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); - } - - @Test - public void iterateUsingKeySetAndForeach_test() { - MapIteration mapIteration = new MapIteration(); - ArrayList list = mapIteration.iterateUsingKeySetAndForeach(testMap); - assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); - } - - @Test - public void iterateUsingStreamAPI_test() { - MapIteration mapIteration = new MapIteration(); - ArrayList list = mapIteration.iterateUsingStreamAPI(testMap); - assertTrue((list.contains(testString1)) && (list.contains(testString2)) && (list.contains(testString3))); - } - - @Test - public void iterateKeys_test() { - MapIteration mapIteration = new MapIteration(); - ArrayList list = mapIteration.iterateKeys(testMap); - assertTrue((list.contains("One")) && (list.contains("Two")) && (list.contains("Three"))); - } - -} From 33653d82c253de53af18d82e04314e82420ef226 Mon Sep 17 00:00:00 2001 From: yetanotherallisonf Date: Tue, 30 May 2017 14:57:41 -0500 Subject: [PATCH 19/22] Update README.md (#1907) --- core-java/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core-java/README.md b/core-java/README.md index 6dd43fe6d9..6c671a632d 100644 --- a/core-java/README.md +++ b/core-java/README.md @@ -105,6 +105,7 @@ - [Guide to UUID in JAVA] (http://www.baeldung.com/guide-to-uuid-in-java) - [Comparing getPath(), getAbsolutePath(), and getCanonicalPath() in Java](http://www.baeldung.com/java-path) - [How to Add a Single Element to a Stream](http://www.baeldung.com/java-stream-append-prepend) +- [Iterating Over Enum Values in Java](http://www.baeldung.com/java-enum-iteration) - [A Guide to Java SynchronousQueue](http://www.baeldung.com/java-synchronous-queue) - [Guide to the Java TransferQueue](http://www.baeldung.com/java-transfer-queue) - [Kotlin Java Interoperability](http://www.baeldung.com/kotlin-java-interoperability) @@ -112,3 +113,4 @@ - [Difference Between Wait and Sleep in Java](http://www.baeldung.com/java-wait-and-sleep) - [LongAdder and LongAccumulator in Java](http://www.baeldung.com/java-longadder-and-longaccumulator) - [Using Java MappedByteBuffer](http://www.baeldung.com/java-mapped-byte-buffer) + From fb3c480fa46ac93db4a9e17ac634186bcddfdfe3 Mon Sep 17 00:00:00 2001 From: KevinGilmore Date: Tue, 30 May 2017 14:58:07 -0500 Subject: [PATCH 20/22] BAEL-917: README (#1908) * BAEL-886: Updated README * BAEL-917 Testing with Google Truth Updated README --- testing/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/README.md b/testing/README.md index fd94279fdf..e9208bfbf3 100644 --- a/testing/README.md +++ b/testing/README.md @@ -9,4 +9,4 @@ - [AssertJ for Guava](http://www.baeldung.com/assertJ-for-guava) - [Introduction to AssertJ](http://www.baeldung.com/introduction-to-assertj) - [Cucumber and Scenario Outline](http://www.baeldung.com/cucumber-scenario-outline) - +- [Testing with Google Truth](http://www.baeldung.com/google-truth) From 98e768c8638ca313fdf49f90457aa2d3e7954532 Mon Sep 17 00:00:00 2001 From: Danil Kornishev Date: Wed, 31 May 2017 13:39:35 -0400 Subject: [PATCH 21/22] Structurizr (#1927) * Structurizr * Structurizr --- structurizr/pom.xml | 54 ++++++ .../structurizr/StructurizrSimple.java | 155 ++++++++++++++++++ .../structurizr/spring/GenericComponent.java | 7 + .../structurizr/spring/PaymentController.java | 14 ++ .../structurizr/spring/PaymentRepository.java | 7 + 5 files changed, 237 insertions(+) create mode 100644 structurizr/pom.xml create mode 100644 structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java create mode 100644 structurizr/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java create mode 100644 structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentController.java create mode 100644 structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java diff --git a/structurizr/pom.xml b/structurizr/pom.xml new file mode 100644 index 0000000000..1656bb10ec --- /dev/null +++ b/structurizr/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + com.baeldung + structurizr + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + 1.8 + 1.8 + + + + + com.structurizr + structurizr-core + 1.0.0-RC3 + + + com.structurizr + structurizr-spring + 1.0.0-RC3 + + + com.structurizr + structurizr-client + 0.6.0 + + + org.springframework + spring-context + 4.3.8.RELEASE + + + + + + + false + + central + bintray + http://jcenter.bintray.com + + + \ No newline at end of file diff --git a/structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java b/structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java new file mode 100644 index 0000000000..6eb0c7de73 --- /dev/null +++ b/structurizr/src/main/java/com/baeldung/structurizr/StructurizrSimple.java @@ -0,0 +1,155 @@ +package com.baeldung.structurizr; + +import java.io.File; +import java.io.StringWriter; + +import com.structurizr.Workspace; +import com.structurizr.api.StructurizrClient; +import com.structurizr.api.StructurizrClientException; +import com.structurizr.componentfinder.ComponentFinder; +import com.structurizr.componentfinder.ReferencedTypesSupportingTypesStrategy; +import com.structurizr.componentfinder.SourceCodeComponentFinderStrategy; +import com.structurizr.componentfinder.SpringComponentFinderStrategy; +import com.structurizr.io.WorkspaceWriterException; +import com.structurizr.io.plantuml.PlantUMLWriter; +import com.structurizr.model.Component; +import com.structurizr.model.Container; +import com.structurizr.model.Model; +import com.structurizr.model.Person; +import com.structurizr.model.SoftwareSystem; +import com.structurizr.model.Tags; +import com.structurizr.view.ComponentView; +import com.structurizr.view.ContainerView; +import com.structurizr.view.Routing; +import com.structurizr.view.Shape; +import com.structurizr.view.Styles; +import com.structurizr.view.SystemContextView; +import com.structurizr.view.View; +import com.structurizr.view.ViewSet; + +public class StructurizrSimple { + + public static final String PAYMENT_TERMINAL = "Payment Terminal"; + public static final String FRAUD_DETECTOR = "Fraud Detector"; + public static final String SOFTWARE_SYSTEM_VIEW = "SoftwareSystemView"; + public static final String CONTAINER_VIEW = "ContainerView"; + public static final String COMPONENT_VIEW = "ComponentView"; + public static final String JVM2_COMPONENT_VIEW = "JVM2ComponentView"; + + public static void main(String[] args) throws Exception { + Workspace workspace = getSoftwareSystem(); + + addContainers(workspace); + addComponents(workspace); + addSpringComponents(workspace); + exportToPlantUml(workspace.getViews().getViewWithKey(SOFTWARE_SYSTEM_VIEW)); + exportToPlantUml(workspace.getViews().getViewWithKey(CONTAINER_VIEW)); + exportToPlantUml(workspace.getViews().getViewWithKey(COMPONENT_VIEW)); + + exportToPlantUml(workspace.getViews().getViewWithKey(JVM2_COMPONENT_VIEW)); + + addStyles(workspace.getViews()); + //uploadToExternal(workspace); + } + + private static void addSpringComponents(Workspace workspace) throws Exception { + Container jvm2 = workspace.getModel().getSoftwareSystemWithName(PAYMENT_TERMINAL).getContainerWithName("JVM-2"); + findComponents(jvm2); + + ComponentView view = workspace.getViews().createComponentView(jvm2, JVM2_COMPONENT_VIEW, "JVM2ComponentView"); + view.addAllComponents(); + + } + + private static void findComponents(Container jvm) throws Exception { + ComponentFinder componentFinder = new ComponentFinder( + jvm, + "com.baeldung.structurizr", + new SpringComponentFinderStrategy( + new ReferencedTypesSupportingTypesStrategy() + ), + new SourceCodeComponentFinderStrategy(new File("."), 150)); + + componentFinder.findComponents(); + } + + private static void addComponents(Workspace workspace) { + Model model = workspace.getModel(); + + SoftwareSystem paymentTerminal = model.getSoftwareSystemWithName(PAYMENT_TERMINAL); + Container jvm1 = paymentTerminal.getContainerWithName("JVM-1"); + + Component jaxrs = jvm1.addComponent("jaxrs-jersey", "restful webservice implementation", "rest"); + Component gemfire = jvm1.addComponent("gemfire", "Clustered Cache Gemfire", "cache"); + Component hibernate = jvm1.addComponent("hibernate", "Data Access Layer", "jpa"); + + jaxrs.uses(gemfire, ""); + gemfire.uses(hibernate, ""); + + ComponentView componentView = workspace.getViews().createComponentView(jvm1, COMPONENT_VIEW, "JVM Components"); + componentView.addAllComponents(); + } + + private static void addContainers(Workspace workspace) { + Model model = workspace.getModel(); + + SoftwareSystem paymentTerminal = model.getSoftwareSystemWithName(PAYMENT_TERMINAL); + Container f5 = paymentTerminal.addContainer("Payment Load Balancer", "Payment Load Balancer", "F5"); + Container jvm1 = paymentTerminal.addContainer("JVM-1", "JVM-1", "Java Virtual Machine"); + Container jvm2 = paymentTerminal.addContainer("JVM-2", "JVM-2", "Java Virtual Machine"); + Container jvm3 = paymentTerminal.addContainer("JVM-3", "JVM-3", "Java Virtual Machine"); + Container oracle = paymentTerminal.addContainer("oracleDB", "Oracle Database", "RDBMS"); + + f5.uses(jvm1, "route"); + f5.uses(jvm2, "route"); + f5.uses(jvm3, "route"); + + jvm1.uses(oracle, "storage"); + jvm2.uses(oracle, "storage"); + jvm3.uses(oracle, "storage"); + + ContainerView view = workspace.getViews().createContainerView(paymentTerminal, CONTAINER_VIEW, "Container View"); + view.addAllContainers(); + } + + private static void uploadToExternal(Workspace workspace) throws StructurizrClientException { + StructurizrClient client = new StructurizrClient("e94bc0c9-76ef-41b0-8de7-82afc1010d04", "78d555dd-2a31-487c-952c-50508f1da495"); + client.putWorkspace(32961L, workspace); + } + + private static void exportToPlantUml(View view) throws WorkspaceWriterException { + StringWriter stringWriter = new StringWriter(); + PlantUMLWriter plantUMLWriter = new PlantUMLWriter(); + plantUMLWriter.write(view, stringWriter); + System.out.println(stringWriter.toString()); + } + + private static Workspace getSoftwareSystem() { + Workspace workspace = new Workspace("Payment Gateway", "Payment Gateway"); + Model model = workspace.getModel(); + + Person user = model.addPerson("Merchant", "Merchant"); + SoftwareSystem paymentTerminal = model.addSoftwareSystem(PAYMENT_TERMINAL, "Payment Terminal"); + user.uses(paymentTerminal, "Makes payment"); + SoftwareSystem fraudDetector = model.addSoftwareSystem(FRAUD_DETECTOR, "Fraud Detector"); + paymentTerminal.uses(fraudDetector, "Obtains fraud score"); + + ViewSet viewSet = workspace.getViews(); + + SystemContextView contextView = viewSet.createSystemContextView(workspace.getModel().getSoftwareSystemWithName(PAYMENT_TERMINAL), SOFTWARE_SYSTEM_VIEW, "Payment Gateway Diagram"); + contextView.addAllElements(); + + return workspace; + } + + private static void addStyles(ViewSet viewSet) { + Styles styles = viewSet.getConfiguration().getStyles(); + styles.addElementStyle(Tags.ELEMENT).color("#000000"); + styles.addElementStyle(Tags.PERSON).background("#ffbf00").shape(Shape.Person); + styles.addElementStyle(Tags.CONTAINER).background("#facc2E"); + styles.addRelationshipStyle(Tags.RELATIONSHIP).routing(Routing.Orthogonal); + + styles.addRelationshipStyle(Tags.ASYNCHRONOUS).dashed(true); + styles.addRelationshipStyle(Tags.SYNCHRONOUS).dashed(false); + } +} diff --git a/structurizr/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java b/structurizr/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java new file mode 100644 index 0000000000..56f2d52ce0 --- /dev/null +++ b/structurizr/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java @@ -0,0 +1,7 @@ +package com.baeldung.structurizr.spring; + +import org.springframework.stereotype.Component; + +@Component +public class GenericComponent { +} diff --git a/structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentController.java b/structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentController.java new file mode 100644 index 0000000000..89a58b9885 --- /dev/null +++ b/structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentController.java @@ -0,0 +1,14 @@ +package com.baeldung.structurizr.spring; + +import org.springframework.stereotype.Controller; + +import javax.annotation.Resource; + +@Controller +public class PaymentController { + @Resource + private PaymentRepository repository; + + @Resource + private GenericComponent component; +} diff --git a/structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java b/structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java new file mode 100644 index 0000000000..78b00495b6 --- /dev/null +++ b/structurizr/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java @@ -0,0 +1,7 @@ +package com.baeldung.structurizr.spring; + +import org.springframework.stereotype.Repository; + +@Repository +public class PaymentRepository { +} From 0b108e387daa6ece90c921a5f2a20e471e645403 Mon Sep 17 00:00:00 2001 From: Tomasz Lelek Date: Wed, 31 May 2017 20:21:01 +0200 Subject: [PATCH 22/22] BAEL-949 java9 optional test (#1960) --- .../com/baeldung/java9/Java9OptionalTest.java | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java diff --git a/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java b/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java new file mode 100644 index 0000000000..cd0efb028d --- /dev/null +++ b/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalTest.java @@ -0,0 +1,85 @@ +package com.baeldung.java9; + +public class Java9OptionalTest { + @Test + public void givenOptionalOfSome_whenToStream_thenShouldTreatItAsOneElementStream() { + //given + Optional value = Optional.of("a"); + + //when + List collect = value.stream().map(String::toUpperCase).collect(Collectors.toList()); + + //then + assertThat(collect).hasSameElementsAs(List.of("A")); + } + + @Test + public void givenOptionalOfNone_whenToStream_thenShouldTreatItAsZeroElementStream() { + //given + Optional value = Optional.empty(); + + //when + List collect = value.stream().map(String::toUpperCase).collect(Collectors.toList()); + + //then + assertThat(collect).isEmpty(); + } + + @Test + public void givenOptional_whenPresent_thenShouldExecuteProperCallback() { + //given + Optional value = Optional.of("properValue"); + AtomicInteger successCounter = new AtomicInteger(0); + AtomicInteger onEmptyOptionalCounter = new AtomicInteger(0); + + //when + value.ifPresentOrElse((v) -> successCounter.incrementAndGet(), onEmptyOptionalCounter::incrementAndGet); + + //then + assertThat(successCounter.get()).isEqualTo(1); + assertThat(onEmptyOptionalCounter.get()).isEqualTo(0); + } + + @Test + public void givenOptional_whenNotPresent_thenShouldExecuteProperCallback() { + //given + Optional value = Optional.empty(); + AtomicInteger successCounter = new AtomicInteger(0); + AtomicInteger onEmptyOptionalCounter = new AtomicInteger(0); + + //when + value.ifPresentOrElse((v) -> successCounter.incrementAndGet(), onEmptyOptionalCounter::incrementAndGet); + + //then + assertThat(successCounter.get()).isEqualTo(0); + assertThat(onEmptyOptionalCounter.get()).isEqualTo(1); + } + + @Test + public void givenOptional_whenPresent_thenShouldTakeAValueFromIt() { + //given + String expected = "properValue"; + Optional value = Optional.of(expected); + Optional defaultValue = Optional.of("default"); + + //when + Optional result = value.or(() -> defaultValue); + + //then + assertThat(result.get()).isEqualTo(expected); + } + + @Test + public void givenOptional_whenEmpty_thenShouldTakeAValueFromOr() { + //given + String defaultString = "default"; + Optional value = Optional.empty(); + Optional defaultValue = Optional.of(defaultString); + + //when + Optional result = value.or(() -> defaultValue); + + //then + assertThat(result.get()).isEqualTo(defaultString); + } +} \ No newline at end of file