diff --git a/disruptor/pom.xml b/disruptor/pom.xml
index 2523cc2125..865a87596a 100644
--- a/disruptor/pom.xml
+++ b/disruptor/pom.xml
@@ -40,11 +40,6 @@
jcl-over-slf4j
${org.slf4j.version}
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
diff --git a/feign/pom.xml b/feign/pom.xml
index 160f37ec2c..de086a3e43 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -18,7 +18,6 @@
UTF-8
9.4.0
1.7.21
- 2.7
1.16.12
4.12
3.6.0
@@ -52,16 +51,6 @@
slf4j-api
${slf4j.version}
-
- org.apache.logging.log4j
- log4j-core
- ${log4j.version}
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
- ${log4j.version}
-
org.projectlombok
lombok
diff --git a/feign/src/main/resources/log4j2.xml b/feign/src/main/resources/log4j2.xml
deleted file mode 100644
index 659c5fda0e..0000000000
--- a/feign/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/groovy-spock/README.md b/groovy-spock/README.md
new file mode 100644
index 0000000000..18d26e8fc0
--- /dev/null
+++ b/groovy-spock/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Introduction to Testing with Spock and Groovy](http://www.baeldung.com/groovy-spock)
diff --git a/guava/pom.xml b/guava/pom.xml
index 0edbb90efd..447ee47cfc 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -76,11 +76,6 @@
${org.slf4j.version}
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
diff --git a/guava21/README.md b/guava21/README.md
index ff12555376..8725352d69 100644
--- a/guava21/README.md
+++ b/guava21/README.md
@@ -1 +1,2 @@
-## Relevant articles:
+### Relevant articles:
+- [New Stream, Comparator and Collector Functionality in Guava 21](http://www.baeldung.com/guava-21-new)
diff --git a/handling-spring-static-resources/pom.xml b/handling-spring-static-resources/pom.xml
index 9a14ce9372..1e892ed237 100644
--- a/handling-spring-static-resources/pom.xml
+++ b/handling-spring-static-resources/pom.xml
@@ -155,11 +155,6 @@
${org.slf4j.version}
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
diff --git a/hbase/pom.xml b/hbase/pom.xml
index 9d523abf1a..c692054f0f 100644
--- a/hbase/pom.xml
+++ b/hbase/pom.xml
@@ -28,6 +28,12 @@
org.apache.hbase
hbase-client
${hbase.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.hbase
diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml
new file mode 100644
index 0000000000..b7473ec5b7
--- /dev/null
+++ b/hibernate5/pom.xml
@@ -0,0 +1,62 @@
+
+
+ 4.0.0
+
+ com.baeldung
+ parent-modules
+ 1.0.0-SNAPSHOT
+
+ com.baeldung
+ hibernate5
+ 0.0.1-SNAPSHOT
+ hibernate5
+ http://maven.apache.org
+
+ UTF-8
+
+ 3.6.0
+
+
+
+ org.hibernate
+ hibernate-core
+ 5.2.9.Final
+
+
+ junit
+ junit
+ 4.12
+
+
+ com.h2database
+ h2
+ 1.4.194
+
+
+
+ hibernate5
+
+
+ src/main/resources
+ true
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+
+ 1.8
+ 1.8
+
+
+
+
+
+
+
+
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/App.java b/hibernate5/src/main/java/com/baeldung/hibernate/App.java
new file mode 100644
index 0000000000..26a40bb782
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/App.java
@@ -0,0 +1,30 @@
+package com.baeldung.hibernate;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+
+import com.baeldung.hibernate.pojo.Supplier;
+
+/**
+ * Hello world!
+ *
+ */
+public class App {
+ public static void main(String[] args) {
+ try {
+ // NOTE: this is just for boostrap testing for multitenancy.
+ System.out.println("Checking the system.");
+ SessionFactory sessionFactory = HibernateMultiTenantUtil.getSessionFactory();
+ Session currentSession = sessionFactory.withOptions().tenantIdentifier("h2db1").openSession();
+ Transaction transaction = currentSession.getTransaction();
+ transaction.begin();
+ currentSession.createCriteria(Supplier.class).list().stream().forEach(System.out::println);
+ transaction.commit();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/ConfigurableMultiTenantConnectionProvider.java b/hibernate5/src/main/java/com/baeldung/hibernate/ConfigurableMultiTenantConnectionProvider.java
new file mode 100644
index 0000000000..b9ed2bd139
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/ConfigurableMultiTenantConnectionProvider.java
@@ -0,0 +1,41 @@
+package com.baeldung.hibernate;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+
+public class ConfigurableMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider {
+
+ private final Map connectionProviderMap =
+ new HashMap<>();
+
+
+ public ConfigurableMultiTenantConnectionProvider(
+ Map connectionProviderMap) {
+ this.connectionProviderMap.putAll( connectionProviderMap );
+ }
+ @Override
+ protected ConnectionProvider getAnyConnectionProvider() {
+ System.out.println("Any");
+ return connectionProviderMap.values().iterator().next();
+ }
+
+ @Override
+ protected ConnectionProvider selectConnectionProvider(String tenantIdentifier) {
+ System.out.println("Specific");
+ return connectionProviderMap.get( tenantIdentifier );
+ }
+
+ @Override
+ public Connection getConnection(String tenantIdentifier) throws SQLException {
+ Connection connection = super.getConnection(tenantIdentifier);
+ // uncomment to see option 2 for SCHEMA strategy.
+ //connection.createStatement().execute("SET SCHEMA '" + tenantIdentifier + "'");
+ return connection;
+ }
+
+}
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java
new file mode 100644
index 0000000000..c3e7b621d0
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java
@@ -0,0 +1,95 @@
+package com.baeldung.hibernate;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.service.ServiceRegistry;
+
+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"};
+
+ public static SessionFactory getSessionFactory() throws UnsupportedTenancyException {
+ if (sessionFactory == null) {
+ Configuration configuration = new Configuration().configure();
+ ServiceRegistry serviceRegistry = configureServiceRegistry(configuration);
+ sessionFactory = makeSessionFactory (serviceRegistry);
+// sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+
+
+ }
+ return sessionFactory;
+ }
+
+ private static SessionFactory makeSessionFactory(ServiceRegistry serviceRegistry) {
+ MetadataSources metadataSources = new MetadataSources( serviceRegistry );
+ for(Class annotatedClasses : getAnnotatedClasses()) {
+ metadataSources.addAnnotatedClass( annotatedClasses );
+ }
+
+ Metadata metadata = metadataSources.buildMetadata();
+ return metadata.getSessionFactoryBuilder().build();
+
+ }
+
+ private static Class[] getAnnotatedClasses() {
+ return new Class[] {
+ Supplier.class
+ };
+ }
+
+ private static ServiceRegistry configureServiceRegistry(Configuration configuration) throws UnsupportedTenancyException {
+ Properties properties = configuration.getProperties();
+
+ connectionProviderMap = setUpConnectionProviders(properties, tenantDBNames);
+ properties.put(AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER, new ConfigurableMultiTenantConnectionProvider(connectionProviderMap));
+
+ return new StandardServiceRegistryBuilder().applySettings(properties).build();
+ }
+
+ private static Map setUpConnectionProviders(Properties properties, String[] tenantNames) throws UnsupportedTenancyException {
+ Map providerMap = new HashMap<>();
+ for (String tenant : tenantNames) {
+ DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl();
+
+ String tenantStrategy = properties.getProperty("hibernate.multiTenancy");
+ System.out.println("Strategy:"+tenantStrategy);
+ properties.put(Environment.URL, tenantUrl(properties.getProperty(Environment.URL), tenant, tenantStrategy));
+ System.out.println("URL:"+properties.getProperty(Environment.URL));
+ connectionProvider.configure(properties);
+ System.out.println("Tenant:"+tenant);
+ providerMap.put(tenant, connectionProvider);
+
+ }
+ System.out.println("Added connections for:");
+ 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")) {
+ return originalUrl.replace(DEFAULT_DB_NAME, tenant);
+ } else if (tenantStrategy.toUpperCase().equals("SCHEMA")) {
+ return originalUrl + String.format(SCHEMA_TOKEN, tenant);
+ } else {
+ throw new UnsupportedTenancyException("Not yet supported");
+ }
+ }
+
+ public static final String SCHEMA_TOKEN = ";INIT=CREATE SCHEMA IF NOT EXISTS %1$s\\;SET SCHEMA %1$s";
+ public static final String DEFAULT_DB_NAME = "mydb1";
+
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
new file mode 100644
index 0000000000..c1f7301d46
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java
@@ -0,0 +1,24 @@
+package com.baeldung.hibernate;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+
+public class HibernateUtil {
+
+ private static final SessionFactory sessionFactory;
+
+ static {
+ try {
+ Configuration configuration = new Configuration().configure();
+ sessionFactory = configuration.buildSessionFactory();
+
+ } catch (Throwable ex) {
+ System.err.println("Initial SessionFactory creation failed." + ex);
+ throw new ExceptionInInitializerError(ex);
+ }
+ }
+
+ public static SessionFactory getSessionFactory() {
+ return sessionFactory;
+ }
+}
\ No newline at end of file
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/UnsupportedTenancyException.java b/hibernate5/src/main/java/com/baeldung/hibernate/UnsupportedTenancyException.java
new file mode 100644
index 0000000000..99d9505ea3
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/UnsupportedTenancyException.java
@@ -0,0 +1,8 @@
+package com.baeldung.hibernate;
+
+public class UnsupportedTenancyException extends Exception {
+ public UnsupportedTenancyException (String message) {
+ super(message);
+ }
+
+}
diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Supplier.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Supplier.java
new file mode 100644
index 0000000000..d0187bba47
--- /dev/null
+++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Supplier.java
@@ -0,0 +1,67 @@
+package com.baeldung.hibernate.pojo;
+// Generated Feb 9, 2017 11:31:36 AM by Hibernate Tools 5.1.0.Final
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * Suppliers generated by hbm2java
+ */
+@Entity(name = "Supplier")
+@Table(name ="Supplier")
+public class Supplier implements java.io.Serializable {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
+ private String name;
+ private String country;
+
+ public Supplier() {
+ }
+
+ public Supplier(String name, String country) {
+ this.name = name;
+ this.country = country;
+ }
+
+ public Integer getId() {
+ return this.id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCountry() {
+ return this.country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ @Override
+ public String toString() {
+ return new StringBuffer().append("[").append(id).append(",").append(name).append(",").append(country).append("]").toString();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return name.equals(((Supplier) obj).getName());
+ }
+}
diff --git a/hibernate5/src/main/java/hibernate.cfg.xml b/hibernate5/src/main/java/hibernate.cfg.xml
new file mode 100644
index 0000000000..26be05f931
--- /dev/null
+++ b/hibernate5/src/main/java/hibernate.cfg.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ org.h2.Driver
+ jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1
+ sa
+ org.hibernate.dialect.H2Dialect
+ DATABASE
+
+
diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateTest.java
new file mode 100644
index 0000000000..4a701de48d
--- /dev/null
+++ b/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantHibernateTest.java
@@ -0,0 +1,73 @@
+package com.baeldung.hibernate;
+import static org.junit.Assert.assertNotEquals;
+
+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 MultiTenantHibernateTest {
+ @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();
+ }
+ }
+
+
+
+ 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("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("insert into Supplier (id, country, name) values (null, 'Miller', 'UK')").executeUpdate();
+ transaction.commit();
+ }
+}
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index eec705b224..976f04c9c2 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -41,6 +41,12 @@
org.apache.httpcomponents
fluent-hc
${httpclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -59,6 +65,12 @@
org.apache.httpcomponents
httpasyncclient
${httpasyncclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -80,11 +92,6 @@
${org.slf4j.version}
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index ba1a596631..5ccc66709f 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -56,6 +56,12 @@
com.netflix.hystrix
hystrix-core
${hystrix-core.version}
+
+
+ commons-logging
+ commons-logging
+
+
com.netflix.hystrix
diff --git a/image-processing/pom.xml b/image-processing/pom.xml
index 8766da571e..1e19686be2 100644
--- a/image-processing/pom.xml
+++ b/image-processing/pom.xml
@@ -17,11 +17,23 @@
net.imagej
ij
${ij.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.openimaj
core-image
${core-image.version}
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/jackson/README.md b/jackson/README.md
index 5bc16e66b7..51919f6769 100644
--- a/jackson/README.md
+++ b/jackson/README.md
@@ -27,3 +27,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Guide to @JsonFormat in Jackson](http://www.baeldung.com/jackson-jsonformat)
- [A Guide to Optional with Jackson](http://www.baeldung.com/jackson-optional)
- [Map Serialization and Deserialization with Jackson](http://www.baeldung.com/jackson-map)
+- [Jackson Streaming API](http://www.baeldung.com/jackson-streaming-api)
diff --git a/jackson/pom.xml b/jackson/pom.xml
index 8e627c146b..df2f65d359 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -154,11 +154,6 @@
${org.slf4j.version}
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
diff --git a/java-cassandra/pom.xml b/java-cassandra/pom.xml
index 5796043b95..dfc5452617 100644
--- a/java-cassandra/pom.xml
+++ b/java-cassandra/pom.xml
@@ -49,11 +49,6 @@
${org.slf4j.version}
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
junit
diff --git a/javaslang/README.md b/javaslang/README.md
index e451883516..fe413fc275 100644
--- a/javaslang/README.md
+++ b/javaslang/README.md
@@ -2,3 +2,4 @@
- [Introduction to Javaslang](http://www.baeldung.com/javaslang)
- [Guide to Try in Javaslang](http://www.baeldung.com/javaslang-try)
- [Guide to Pattern Matching in Javaslang](http://www.baeldung.com/javaslang-pattern-matching)
+- [Property Testing Example With Javaslang](http://www.baeldung.com/javaslang-property-testing)
diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml
index 68a1b9c441..c5eeafbab3 100644
--- a/javax-servlets/pom.xml
+++ b/javax-servlets/pom.xml
@@ -49,6 +49,12 @@
httpclient
${org.apache.httpcomponents.version}
test
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/jaxb/pom.xml b/jaxb/pom.xml
index b636a4dc82..75b98c8c51 100644
--- a/jaxb/pom.xml
+++ b/jaxb/pom.xml
@@ -135,6 +135,9 @@
${basedir}/src/main/java
false
+ true
+ true
+ false
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java
new file mode 100644
index 0000000000..0a3da677ce
--- /dev/null
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java
@@ -0,0 +1,48 @@
+
+package com.baeldung.jaxb.gen;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the com.baeldung.jaxb.gen package.
+ * An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.baeldung.jaxb.gen
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link UserRequest }
+ *
+ */
+ public UserRequest createUserRequest() {
+ return new UserRequest();
+ }
+
+ /**
+ * Create an instance of {@link UserResponse }
+ *
+ */
+ public UserResponse createUserResponse() {
+ return new UserResponse();
+ }
+
+}
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java
new file mode 100644
index 0000000000..1c1abc61a6
--- /dev/null
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java
@@ -0,0 +1,87 @@
+
+package com.baeldung.jaxb.gen;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ *
Java class for UserRequest complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType name="UserRequest">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "UserRequest", propOrder = {
+ "id",
+ "name"
+})
+@XmlRootElement(name = "userRequest")
+public class UserRequest
+ implements Serializable
+{
+
+ private final static long serialVersionUID = -1L;
+ protected int id;
+ @XmlElement(required = true)
+ protected String name;
+
+ /**
+ * Gets the value of the id property.
+ *
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * Sets the value of the id property.
+ *
+ */
+ public void setId(int value) {
+ this.id = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+}
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java
new file mode 100644
index 0000000000..b80405e4a9
--- /dev/null
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java
@@ -0,0 +1,149 @@
+
+package com.baeldung.jaxb.gen;
+
+import java.io.Serializable;
+import java.util.Calendar;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.w3._2001.xmlschema.Adapter1;
+
+
+/**
+ * Java class for UserResponse complex type.
+ *
+ *
The following schema fragment specifies the expected content contained within this class.
+ *
+ *
+ * <complexType name="UserResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="id" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="gender" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element name="created" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ *
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "UserResponse", propOrder = {
+ "id",
+ "name",
+ "gender",
+ "created"
+})
+@XmlRootElement(name = "userResponse")
+public class UserResponse
+ implements Serializable
+{
+
+ private final static long serialVersionUID = -1L;
+ protected int id;
+ @XmlElement(required = true)
+ protected String name;
+ @XmlElement(required = true)
+ protected String gender;
+ @XmlElement(required = true, type = String.class)
+ @XmlJavaTypeAdapter(Adapter1 .class)
+ @XmlSchemaType(name = "dateTime")
+ protected Calendar created;
+
+ /**
+ * Gets the value of the id property.
+ *
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * Sets the value of the id property.
+ *
+ */
+ public void setId(int value) {
+ this.id = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the gender property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getGender() {
+ return gender;
+ }
+
+ /**
+ * Sets the value of the gender property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setGender(String value) {
+ this.gender = value;
+ }
+
+ /**
+ * Gets the value of the created property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public Calendar getCreated() {
+ return created;
+ }
+
+ /**
+ * Sets the value of the created property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setCreated(Calendar value) {
+ this.created = value;
+ }
+
+}
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java
new file mode 100644
index 0000000000..639d00179c
--- /dev/null
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java
@@ -0,0 +1,2 @@
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.baeldung.com/jaxb/gen", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package com.baeldung.jaxb.gen;
diff --git a/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java b/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java
new file mode 100644
index 0000000000..54b3c360dc
--- /dev/null
+++ b/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java
@@ -0,0 +1,23 @@
+
+package org.w3._2001.xmlschema;
+
+import java.util.Calendar;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public class Adapter1
+ extends XmlAdapter
+{
+
+
+ public Calendar unmarshal(String value) {
+ return (javax.xml.bind.DatatypeConverter.parseDateTime(value));
+ }
+
+ public String marshal(Calendar value) {
+ if (value == null) {
+ return null;
+ }
+ return (javax.xml.bind.DatatypeConverter.printDateTime(value));
+ }
+
+}
diff --git a/jee7/README.md b/jee7/README.md
index bc242c3340..8381bcbf34 100644
--- a/jee7/README.md
+++ b/jee7/README.md
@@ -1,3 +1,4 @@
### Relevant Articles:
- [Scheduling in Java EE](http://www.baeldung.com/scheduling-in-java-enterprise-edition)
- [JSON Processing in Java EE 7](http://www.baeldung.com/jee7-json)
+- [Converters, Listeners and Validators in Java EE 7](http://www.baeldung.com/java-ee7-converter-listener-validator)
diff --git a/jhipster/README.md b/jhipster/README.md
index d45796d867..d321e9e81e 100644
--- a/jhipster/README.md
+++ b/jhipster/README.md
@@ -1,3 +1,8 @@
+### Relevant articles
+
+- [Intro to JHipster](http://www.baeldung.com/jhipster)
+
+
# baeldung
This application was generated using JHipster 4.0.8, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.0.8](https://jhipster.github.io/documentation-archive/v4.0.8).
diff --git a/jsf/pom.xml b/jsf/pom.xml
index 271a869576..a206870f89 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -65,6 +65,12 @@
org.springframework
spring-web
${org.springframework.version}
+
+
+ commons-logging
+ commons-logging
+
+
javax.servlet
@@ -92,11 +98,6 @@
${org.slf4j.version}
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
diff --git a/json/pom.xml b/json/pom.xml
index 2b2f80e987..f22626ce70 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -11,6 +11,12 @@
org.everit.json
org.everit.json.schema
${everit.json.schema.version}
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/jws/README.md b/jws/README.md
new file mode 100644
index 0000000000..428d8b650d
--- /dev/null
+++ b/jws/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [A Guide to the Java Web Start](http://www.baeldung.com/java-web-start)
diff --git a/lagom/README b/lagom/README.md
similarity index 92%
rename from lagom/README
rename to lagom/README.md
index 0d81a4b3c1..909fe0dff4 100644
--- a/lagom/README
+++ b/lagom/README.md
@@ -1,3 +1,10 @@
+### Relevant articles
+
+- [Guide to Reactive Microservices Using Lagom Framework](http://www.baeldung.com/lagom-reactive-microservices)
+
+
+
+
Steps to setup from scratch
1) Create sbt build file "build.sbt"
diff --git a/libraries/README.md b/libraries/README.md
index 8a32a8b0e7..1cfa7be86c 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -7,6 +7,8 @@
- [Introduction to Javassist](http://www.baeldung.com/javassist)
- [Embedded Jetty Server in Java](http://www.baeldung.com/jetty-embedded)
- [Introduction to Apache Flink with Java](http://www.baeldung.com/apache-flink)
+- [Introduction to JSONassert](http://www.baeldung.com/jsonassert)
+- [Intro to JaVer](http://www.baeldung.com/javers)
The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own.
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 939d674d97..0643e8257b 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -111,6 +111,12 @@
org.apache.httpcomponents
httpclient
${httpclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
commons-io
@@ -130,7 +136,7 @@
org.apache.httpcomponents
httpclient
- ${httpclient.version}
+ ${httpclient.version}
commons-io
@@ -141,11 +147,23 @@
org.apache.flink
flink-core
${flink.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.flink
flink-java
${flink.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.flink
@@ -153,6 +171,11 @@
${flink.version}
test
+
+ org.apache.commons
+ commons-math3
+ 3.6.1
+
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/ComplexTests.java b/libraries/src/test/java/com/baeldung/commons/math/ComplexTests.java
similarity index 100%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/ComplexTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/ComplexTests.java
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/FractionTests.java b/libraries/src/test/java/com/baeldung/commons/math/FractionTests.java
similarity index 89%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/FractionTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/FractionTests.java
index 6efef79b23..6828c8490c 100644
--- a/apache-commons-math/src/test/java/com/baeldung/commons/math/FractionTests.java
+++ b/libraries/src/test/java/com/baeldung/commons/math/FractionTests.java
@@ -1,7 +1,6 @@
package com.baeldung.commons.math;
import org.apache.commons.math3.fraction.Fraction;
-import org.apache.commons.math3.fraction.FractionFormat;
import org.junit.Assert;
import org.junit.Test;
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/GeometryTests.java b/libraries/src/test/java/com/baeldung/commons/math/GeometryTests.java
similarity index 100%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/GeometryTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/GeometryTests.java
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/IntegrationTests.java b/libraries/src/test/java/com/baeldung/commons/math/IntegrationTests.java
similarity index 100%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/IntegrationTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/IntegrationTests.java
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/LinearAlgebraTests.java b/libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraTests.java
similarity index 100%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/LinearAlgebraTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraTests.java
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/ProbabilitiesTests.java b/libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesTests.java
similarity index 100%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/ProbabilitiesTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesTests.java
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/RootFindingTests.java b/libraries/src/test/java/com/baeldung/commons/math/RootFindingTests.java
similarity index 100%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/RootFindingTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/RootFindingTests.java
diff --git a/apache-commons-math/src/test/java/com/baeldung/commons/math/StatisticsTests.java b/libraries/src/test/java/com/baeldung/commons/math/StatisticsTests.java
similarity index 100%
rename from apache-commons-math/src/test/java/com/baeldung/commons/math/StatisticsTests.java
rename to libraries/src/test/java/com/baeldung/commons/math/StatisticsTests.java
diff --git a/log-mdc/pom.xml b/log-mdc/pom.xml
index 931e68a178..10dcb3eaf0 100644
--- a/log-mdc/pom.xml
+++ b/log-mdc/pom.xml
@@ -13,7 +13,7 @@
org.springframework
spring-core
- ${springframework.version}
+ ${springframework.version}
org.springframework
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index a4c8f19f69..c348982bcf 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -43,7 +43,7 @@
org.apache.commons
commons-dbcp2
- ${commons-dbcp2.version}
+ ${commons-dbcp2.version}
diff --git a/mapstruct/pom.xml b/mapstruct/pom.xml
index 72a67d19db..81bcdb4cb9 100644
--- a/mapstruct/pom.xml
+++ b/mapstruct/pom.xml
@@ -32,6 +32,12 @@
org.springframework
spring-context
${springframework.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.springframework
diff --git a/mybatis/.gitignore b/mybatis/.gitignore
new file mode 100644
index 0000000000..a5ecefc44c
--- /dev/null
+++ b/mybatis/.gitignore
@@ -0,0 +1,16 @@
+*.class
+
+.settings
+.project
+*.log
+
+#folders#
+/target
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+/testdb1
+
+# Packaged files #
+*.jar
+*.war
+*.ear
diff --git a/mybatis/src/main/java/com/baeldung/mybatis/utils/MyBatisUtil.java b/mybatis/src/main/java/com/baeldung/mybatis/utils/MyBatisUtil.java
index fb8e15245a..da323a5c24 100644
--- a/mybatis/src/main/java/com/baeldung/mybatis/utils/MyBatisUtil.java
+++ b/mybatis/src/main/java/com/baeldung/mybatis/utils/MyBatisUtil.java
@@ -3,7 +3,6 @@ package com.baeldung.mybatis.utils;
import com.baeldung.mybatis.mapper.AddressMapper;
import com.baeldung.mybatis.mapper.PersonMapper;
import org.apache.ibatis.datasource.pooled.PooledDataSource;
-import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.SQL;
import org.apache.ibatis.mapping.Environment;
import org.apache.ibatis.session.Configuration;
@@ -12,8 +11,6 @@ import org.apache.ibatis.session.SqlSessionFactoryBuilder;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
import javax.sql.DataSource;
-import java.io.IOException;
-import java.io.InputStream;
public class MyBatisUtil {
public static final String DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
diff --git a/mybatis/src/test/java/com/baeldung/mybatis/mapper/PersonMapperTest.java b/mybatis/src/test/java/com/baeldung/mybatis/mapper/PersonMapperTest.java
deleted file mode 100644
index 8dbf7d2589..0000000000
--- a/mybatis/src/test/java/com/baeldung/mybatis/mapper/PersonMapperTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.baeldung.mybatis.mapper;
-
-import com.baeldung.mybatis.model.Address;
-import com.baeldung.mybatis.model.Person;
-import com.baeldung.mybatis.utils.MyBatisUtil;
-import org.apache.ibatis.session.SqlSession;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Map;
-
-import static junit.framework.TestCase.assertEquals;
-
-public class PersonMapperTest {
-
- SqlSession session;
-
- @Before
- public void setup() throws SQLException {
-
- session = MyBatisUtil.buildqlSessionFactory().openSession();
- createTables(session);
-
- }
-
- private void createTables(SqlSession session) throws SQLException {
-
- String createPersonTable = "create table person (" + "personId integer not null generated always as"
- + " identity (start with 1, increment by 1), " + "name varchar(30) not null, "
- + "constraint primary_key_person primary key (personId))";
-
- String createAddressTable = "create table address (" + "addressId integer not null generated always as"
- + " identity (start with 1, increment by 1), " + "streetAddress varchar(300), personId integer, "
- + "constraint primary_key_address primary key (addressId))";
-
- String alterTable = "ALTER TABLE "
- + " address ADD CONSTRAINT fk_person FOREIGN KEY (personId) REFERENCES person (personId)";
-
- session.getConnection().createStatement().execute(createPersonTable);
- session.getConnection().createStatement().execute(createAddressTable);
- session.getConnection().createStatement().execute(alterTable);
-
- }
-
- @Test
- public void whenPersonAdressSaved_ThenPersonAddressCanBeQueried() {
- Person person = new Person("Baljeet S");
- Address address = new Address("Pune");
- PersonMapper personMapper = session.getMapper(PersonMapper.class);
- Integer id = personMapper.save(person);
- address.setPersonId(id);
- AddressMapper addressMapper = session.getMapper(AddressMapper.class);
- addressMapper.saveAddress(address);
-
- Person returnedPerson = personMapper.getPersonById(id);
- assertEquals("Baljeet S", returnedPerson.getName());
- assertEquals("Pune", returnedPerson.getAddresses().get(0).getStreetAddress());
- }
-
- @Test
- public void whenPersonSaved_ThenPersonCanBeQueried() {
- Person person = new Person("Baljeet S");
- Address address = new Address("Pune");
- PersonMapper personMapper = session.getMapper(PersonMapper.class);
- Integer id = personMapper.save(person);
- address.setPersonId(id);
- AddressMapper addressMapper = session.getMapper(AddressMapper.class);
- addressMapper.saveAddress(address);
-
- Person returnedPerson = personMapper.getPerson(id);
- assertEquals("Baljeet S", returnedPerson.getName());
- }
-
- @Test
- public void whenPersonUpdated_ThenPersonIsChanged() {
- Person person = new Person("Baljeet S");
- Address address = new Address("Pune");
- PersonMapper personMapper = session.getMapper(PersonMapper.class);
- Integer id = personMapper.save(person);
- address.setPersonId(id);
- AddressMapper addressMapper = session.getMapper(AddressMapper.class);
- addressMapper.saveAddress(address);
-
- personMapper.updatePerson(new Person(id, "Baljeet1"));
- Person returnedPerson = personMapper.getPerson(id);
- assertEquals("Baljeet1", returnedPerson.getName());
- }
-
- @Test
- public void whenPersoSaved_ThenMapIsReturned() {
- Person person = new Person("Baljeet S");
- Address address = new Address("Pune");
- PersonMapper personMapper = session.getMapper(PersonMapper.class);
- Integer id = personMapper.save(person);
- address.setPersonId(id);
- AddressMapper addressMapper = session.getMapper(AddressMapper.class);
- addressMapper.saveAddress(address);
-
- Map returnedPerson = personMapper.getAllPerson();
- assertEquals(1, returnedPerson.size());
- }
-
- @Test
- public void whenPersonSearched_ThenResultIsReturned() {
- Person person = new Person("Baljeet S");
- Address address = new Address("Pune");
- PersonMapper personMapper = session.getMapper(PersonMapper.class);
- Integer id = personMapper.save(person);
- address.setPersonId(id);
- AddressMapper addressMapper = session.getMapper(AddressMapper.class);
- addressMapper.saveAddress(address);
-
- Person returnedPerson = personMapper.getPersonByName("Baljeet S");
- assertEquals("Baljeet S", returnedPerson.getName());
- }
-
- @Test
- public void whenAddressSearched_ThenResultIsReturned() {
- Person person = new Person("Baljeet S");
- Address address = new Address("Pune");
- PersonMapper personMapper = session.getMapper(PersonMapper.class);
- Integer id = personMapper.save(person);
- address.setPersonId(id);
- AddressMapper addressMapper = session.getMapper(AddressMapper.class);
- Integer addressId = addressMapper.saveAddress(address);
- Address returnedAddress = addressMapper.getAddresses(addressId);
-
- assertEquals("Pune", returnedAddress.getStreetAddress());
- }
-
- @After
- public void cleanup() throws SQLException {
- session.getConnection().createStatement().execute("drop table address");
- session.getConnection().createStatement().execute("drop table person");
-
- session.close();
-
- }
-
-}
diff --git a/pdf/pom.xml b/pdf/pom.xml
index 332e1f5244..53232377b5 100644
--- a/pdf/pom.xml
+++ b/pdf/pom.xml
@@ -37,11 +37,23 @@
org.apache.pdfbox
pdfbox-tools
${pdfbox-tools.version}
+
+
+ commons-logging
+ commons-logging
+
+
net.sf.cssbox
pdf2dom
${pdf2dom.version}
+
+
+ commons-logging
+ commons-logging
+
+
com.itextpdf
diff --git a/pom.xml b/pom.xml
index a705ac7cb1..7671d05d75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,7 +226,7 @@
1.6.0
maven
-
+ hibernate5
@@ -253,4 +253,4 @@
-->
-
+
\ No newline at end of file
diff --git a/querydsl/pom.xml b/querydsl/pom.xml
index 1335d0f1fd..d6fe7f4191 100644
--- a/querydsl/pom.xml
+++ b/querydsl/pom.xml
@@ -91,6 +91,12 @@
org.springframework
spring-context
${spring.version}
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/ratpack/README.md b/ratpack/README.md
index af473ef0e8..91c8e025f0 100644
--- a/ratpack/README.md
+++ b/ratpack/README.md
@@ -1,3 +1,4 @@
### Relevant articles
- [Introduction to Ratpack](http://www.baeldung.com/ratpack)
+- [Ratpack Google Guice Integration](http://www.baeldung.com/ratpack-google-guice)
diff --git a/rest-assured/pom.xml b/rest-assured/pom.xml
index 2c8039401e..0c3bf38dc5 100644
--- a/rest-assured/pom.xml
+++ b/rest-assured/pom.xml
@@ -71,12 +71,6 @@
${logback.version}
-
- commons-logging
- commons-logging
- ${commons-logging.version}
-
-
org.apache.httpcomponents
httpcore
@@ -151,6 +145,12 @@
org.apache.httpcomponents
httpclient
${httpclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -184,6 +184,12 @@
com.github.fge
json-schema-core
${json-schema-core.version}
+
+
+ commons-logging
+ commons-logging
+
+
junit
@@ -282,7 +288,6 @@
3.5
- 1.2
3.2.2
4.4.5
diff --git a/rest-testing/README.md b/rest-testing/README.md
index 5dd4e49162..37a53dd815 100644
--- a/rest-testing/README.md
+++ b/rest-testing/README.md
@@ -9,3 +9,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Test a REST API with Java](http://www.baeldung.com/2011/10/13/integration-testing-a-rest-api/)
- [Introduction to WireMock](http://www.baeldung.com/introduction-to-wiremock)
- [REST API Testing with Cucumber](http://www.baeldung.com/cucumber-rest-api-testing)
+- [Testing a REST API with JBehave](http://www.baeldung.com/jbehave-rest-testing)
diff --git a/rest-testing/pom.xml b/rest-testing/pom.xml
index 746752133c..a6a9bb39b3 100644
--- a/rest-testing/pom.xml
+++ b/rest-testing/pom.xml
@@ -35,6 +35,12 @@
org.apache.httpcomponents
httpclient
${httpclient.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.apache.httpcomponents
@@ -69,11 +75,6 @@
${org.slf4j.version}
runtime
-
- org.slf4j
- log4j-over-slf4j
- ${org.slf4j.version}
-
diff --git a/resteasy/README.md b/resteasy/README.md
index 722f1dfe93..83051037d2 100644
--- a/resteasy/README.md
+++ b/resteasy/README.md
@@ -6,3 +6,4 @@
### Relevant Articles:
- [A Guide to RESTEasy](http://www.baeldung.com/resteasy-tutorial)
- [RESTEasy Client API](http://www.baeldung.com/resteasy-client-tutorial)
+- [CORS in JAX-RS](http://www.baeldung.com/cors-in-jax-rs)
diff --git a/resteasy/pom.xml b/resteasy/pom.xml
index f0bd8298f5..eacde92353 100644
--- a/resteasy/pom.xml
+++ b/resteasy/pom.xml
@@ -67,6 +67,12 @@
org.jboss.resteasy
resteasy-servlet-initializer
${resteasy.version}
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/selenium-junit-testng/pom.xml b/selenium-junit-testng/pom.xml
index b4490f779b..fceeb6eec6 100644
--- a/selenium-junit-testng/pom.xml
+++ b/selenium-junit-testng/pom.xml
@@ -56,6 +56,12 @@
org.seleniumhq.selenium
selenium-java
${selenium-java.version}
+
+
+ commons-logging
+ commons-logging
+
+
junit
diff --git a/solr/README.md b/solr/README.md
new file mode 100644
index 0000000000..631a4f44d1
--- /dev/null
+++ b/solr/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Full-text Search with Solr](http://www.baeldung.com/full-text-search-with-solr)
diff --git a/solr/pom.xml b/solr/pom.xml
index e784d87157..cc3a6165fe 100644
--- a/solr/pom.xml
+++ b/solr/pom.xml
@@ -20,11 +20,6 @@
solr-solrj
6.4.1
-
- log4j
- log4j
- 1.2.16
-
junit
junit
diff --git a/spring-5/README.md b/spring-5/README.md
index 47a5314009..31f665f4a2 100644
--- a/spring-5/README.md
+++ b/spring-5/README.md
@@ -6,3 +6,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
### Relevant Articles
- [Concurrent Test Execution in Spring 5](http://www.baeldung.com/spring-5-concurrent-tests)
+- [Introduction to the Functional Web Framework in Spring 5](http://www.baeldung.com/spring-5-functional-web)
diff --git a/spring-akka/pom.xml b/spring-akka/pom.xml
index 5965213e65..497022064c 100644
--- a/spring-akka/pom.xml
+++ b/spring-akka/pom.xml
@@ -12,6 +12,12 @@
org.springframework
spring-context
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/spring-all/README.md b/spring-all/README.md
index 3493871c78..29be01c79e 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -20,3 +20,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [A Guide to the Spring Task Scheduler](http://www.baeldung.com/spring-task-scheduler)
- [Guide to Spring Retry](http://www.baeldung.com/spring-retry)
- [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
+- [New in Guava 21 common.util.concurrent](http://www.baeldung.com/guava-21-util-concurrent)
+- [A CLI with Spring Shell](http://www.baeldung.com/spring-shell-cli)
+- [JasperReports with Spring](http://www.baeldung.com/spring-jasper)
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index 1b12d7e42c..7fbb6acced 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -25,6 +25,12 @@
org.springframework
spring-web
+
+
+ commons-logging
+ commons-logging
+
+
org.springframework
@@ -111,6 +117,12 @@
net.sf.jasperreports
jasperreports
${jasperreports.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -129,10 +141,6 @@
jcl-over-slf4j
-
- org.slf4j
- log4j-over-slf4j
-
diff --git a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
index 1e3d5f3b14..73df386aff 100644
--- a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
+++ b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
@@ -2,14 +2,16 @@ package org.baeldung.scopes;
import javax.annotation.Resource;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
public class ScopesController {
- public static final Logger LOG = Logger.getLogger(ScopesController.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ScopesController.class);
@Resource(name = "requestMessage")
HelloMessageGenerator requestMessage;
diff --git a/spring-all/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java b/spring-all/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
index d4334437f7..f36b8703ea 100644
--- a/spring-all/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
+++ b/spring-all/src/main/java/org/baeldung/startup/AllStrategiesExampleBean.java
@@ -1,6 +1,8 @@
package org.baeldung.startup;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@@ -11,7 +13,7 @@ import javax.annotation.PostConstruct;
@Scope(value = "prototype")
public class AllStrategiesExampleBean implements InitializingBean {
- private static final Logger LOG = Logger.getLogger(AllStrategiesExampleBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AllStrategiesExampleBean.class);
public AllStrategiesExampleBean() {
LOG.info("Constructor");
diff --git a/spring-all/src/main/java/org/baeldung/startup/EventListenerExampleBean.java b/spring-all/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
index e9cd1a159d..58e42337cc 100644
--- a/spring-all/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
+++ b/spring-all/src/main/java/org/baeldung/startup/EventListenerExampleBean.java
@@ -1,13 +1,15 @@
package org.baeldung.startup;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
@Component
public class EventListenerExampleBean {
- private static final Logger LOG = Logger.getLogger(EventListenerExampleBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(EventListenerExampleBean.class);
public static int counter;
diff --git a/spring-all/src/main/java/org/baeldung/startup/InitMethodExampleBean.java b/spring-all/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
index cea6b026d6..f3d30011f8 100644
--- a/spring-all/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
+++ b/spring-all/src/main/java/org/baeldung/startup/InitMethodExampleBean.java
@@ -1,23 +1,24 @@
package org.baeldung.startup;
-import org.apache.log4j.Logger;
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
-import java.util.Arrays;
-
@Component
@Scope(value = "prototype")
public class InitMethodExampleBean {
- private static final Logger LOG = Logger.getLogger(InitMethodExampleBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InitMethodExampleBean.class);
@Autowired
private Environment environment;
public void init() {
- LOG.info(Arrays.asList(environment.getDefaultProfiles()));
+ LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
}
}
diff --git a/spring-all/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java b/spring-all/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
index 33b14864f3..5d6f8c9d88 100644
--- a/spring-all/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
+++ b/spring-all/src/main/java/org/baeldung/startup/InitializingBeanExampleBean.java
@@ -1,25 +1,26 @@
package org.baeldung.startup;
-import org.apache.log4j.Logger;
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
-import java.util.Arrays;
-
@Component
@Scope(value = "prototype")
public class InitializingBeanExampleBean implements InitializingBean {
- private static final Logger LOG = Logger.getLogger(InitializingBeanExampleBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InitializingBeanExampleBean.class);
@Autowired
private Environment environment;
@Override
public void afterPropertiesSet() throws Exception {
- LOG.info(Arrays.asList(environment.getDefaultProfiles()));
+ LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
}
}
diff --git a/spring-all/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java b/spring-all/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
index 2a7b3e26c7..d25a83942a 100644
--- a/spring-all/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
+++ b/spring-all/src/main/java/org/baeldung/startup/LogicInConstructorExampleBean.java
@@ -1,25 +1,22 @@
package org.baeldung.startup;
-import org.apache.log4j.Logger;
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
-import java.util.Arrays;
-
@Component
@Scope(value = "prototype")
public class LogicInConstructorExampleBean {
- private static final Logger LOG = Logger.getLogger(LogicInConstructorExampleBean.class);
-
- private final Environment environment;
+ private static final Logger LOG = LoggerFactory.getLogger(LogicInConstructorExampleBean.class);
@Autowired
public LogicInConstructorExampleBean(Environment environment) {
- this.environment = environment;
-
- LOG.info(Arrays.asList(environment.getDefaultProfiles()));
+ LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
}
}
diff --git a/spring-all/src/main/java/org/baeldung/startup/PostConstructExampleBean.java b/spring-all/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
index 4cabaad4df..2397c3a0a2 100644
--- a/spring-all/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
+++ b/spring-all/src/main/java/org/baeldung/startup/PostConstructExampleBean.java
@@ -1,25 +1,27 @@
package org.baeldung.startup;
-import org.apache.log4j.Logger;
+import java.util.Arrays;
+
+import javax.annotation.PostConstruct;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
-import java.util.Arrays;
-
@Component
@Scope(value = "prototype")
public class PostConstructExampleBean {
- private static final Logger LOG = Logger.getLogger(PostConstructExampleBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PostConstructExampleBean.class);
@Autowired
private Environment environment;
@PostConstruct
public void init() {
- LOG.info(Arrays.asList(environment.getDefaultProfiles()));
+ LOG.info("Env Default Profiles", Arrays.asList(environment.getDefaultProfiles()));
}
}
diff --git a/spring-all/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java b/spring-all/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
index 32a63f0c1a..e02388dea3 100644
--- a/spring-all/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
+++ b/spring-all/src/main/java/org/baeldung/startup/StartupApplicationListenerExample.java
@@ -1,6 +1,8 @@
package org.baeldung.startup;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
@@ -8,7 +10,7 @@ import org.springframework.stereotype.Component;
@Component
public class StartupApplicationListenerExample implements ApplicationListener {
- private static final Logger LOG = Logger.getLogger(StartupApplicationListenerExample.class);
+ private static final Logger LOG = LoggerFactory.getLogger(StartupApplicationListenerExample.class);
public static int counter;
diff --git a/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIUnitTest.java b/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIUnitTest.java
index 0353083943..cc5ac863b5 100644
--- a/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIUnitTest.java
+++ b/spring-all/src/test/java/org/baeldung/shell/simple/SimpleCLIUnitTest.java
@@ -1,6 +1,7 @@
package org.baeldung.shell.simple;
import java.io.File;
+
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -15,13 +16,18 @@ public class SimpleCLIUnitTest {
@BeforeClass
public static void startUp() throws InterruptedException {
- Bootstrap bootstrap = new Bootstrap();
+ final Bootstrap bootstrap = new Bootstrap();
shell = bootstrap.getJLineShellComponent();
}
@AfterClass
public static void shutdown() {
shell.stop();
+ // delete contents.txt
+ final File testFile = new File("contents.txt");
+ if (testFile.exists()) {
+ testFile.delete();
+ }
}
public static JLineShellComponent getShell() {
@@ -31,7 +37,7 @@ public class SimpleCLIUnitTest {
@Test
public void givenCommandConfig_whenExecutingWebGetCommand_thenCorrectResult() {
- CommandResult resultWebSave = shell.executeCommand("web-get --url https://www.google.com");
+ final CommandResult resultWebSave = shell.executeCommand("web-get --url https://www.google.com");
Assert.assertTrue(resultWebSave.isSuccess());
}
@@ -40,37 +46,27 @@ public class SimpleCLIUnitTest {
public void givenCommandConfig_whenExecutingWebSaveCommand_thenCorrectResult() {
shell.executeCommand("admin-enable");
- CommandResult result = shell.executeCommand("web-save --url https://www.google.com --out contents.txt");
+ final CommandResult result = shell.executeCommand("web-save --url https://www.google.com --out contents.txt");
- Assert.assertArrayEquals(
- new boolean[]{
- result.isSuccess(),
- new File("contents.txt").exists()},
- new boolean[]{true, true});
+ Assert.assertArrayEquals(new boolean[] { result.isSuccess(), new File("contents.txt").exists() }, new boolean[] { true, true });
}
@Test
public void givenCommandConfig_whenAdminEnableCommandExecuted_thenCorrectAvailability() {
-
- CommandResult resultAdminDisable = shell.executeCommand("admin-disable");
- CommandResult resultWebSaveUnavailable = shell.executeCommand("web-save --url https://www.google.com --out contents.txt");
- CommandResult resultAdminEnable = shell.executeCommand("admin-enable");
- CommandResult resultWebSaveAvailable = shell.executeCommand("web-save --url https://www.google.com --out contents.txt");
- Assert.assertArrayEquals(
- new boolean[]{
- resultAdminDisable.isSuccess(),
- resultWebSaveUnavailable.isSuccess(),
- resultAdminEnable.isSuccess(),
- resultWebSaveAvailable.isSuccess()},
- new boolean[]{true, false, true, true});
+ final CommandResult resultAdminDisable = shell.executeCommand("admin-disable");
+ final CommandResult resultWebSaveUnavailable = shell.executeCommand("web-save --url https://www.google.com --out contents.txt");
+ final CommandResult resultAdminEnable = shell.executeCommand("admin-enable");
+ final CommandResult resultWebSaveAvailable = shell.executeCommand("web-save --url https://www.google.com --out contents.txt");
+
+ Assert.assertArrayEquals(new boolean[] { resultAdminDisable.isSuccess(), resultWebSaveUnavailable.isSuccess(), resultAdminEnable.isSuccess(), resultWebSaveAvailable.isSuccess() }, new boolean[] { true, false, true, true });
}
@Test
public void givenCommandConfig_whenWebSaveCommandExecutedNoOutArgument_thenError() {
shell.executeCommand("admin-enable");
- CommandResult resultWebSave = shell.executeCommand("web-save --url https://www.google.com");
+ final CommandResult resultWebSave = shell.executeCommand("web-save --url https://www.google.com");
Assert.assertEquals(resultWebSave.isSuccess(), false);
}
@@ -78,7 +74,7 @@ public class SimpleCLIUnitTest {
@Test
public void givenCommandConfig_whenExecutingWebGetCommandWithDefaultArgument_thenCorrectResult() {
- CommandResult result = shell.executeCommand("web-get https://www.google.com");
+ final CommandResult result = shell.executeCommand("web-get https://www.google.com");
Assert.assertEquals(result.isSuccess(), true);
}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java
index b757dfebe8..6eb13c18f6 100644
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java
+++ b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java
@@ -1,15 +1,17 @@
package com.baeldung.springamqpsimple;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
@Component
public class MessageConsumer {
- private static final Logger logger = LogManager.getLogger(MessageConsumer.class);
+ private static final Logger logger = LoggerFactory.getLogger(MessageConsumer.class);
+ @RabbitListener(queues = {SpringAmqpConfig.queueName})
public void receiveMessage(String message) {
logger.info("Received Message: " + message);
}
-}
+}
\ No newline at end of file
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java
index 78d79dd47a..f6c82b635e 100644
--- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java
+++ b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java
@@ -1,6 +1,10 @@
package com.baeldung.springamqpsimple;
-import org.springframework.amqp.core.*;
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Exchange;
+import org.springframework.amqp.core.Queue;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter;
@@ -32,7 +36,7 @@ public class SpringAmqpConfig {
@Bean
SimpleMessageListenerContainer container(ConnectionFactory connectionFactory,
- MessageListenerAdapter listenerAdapter) {
+ MessageListenerAdapter listenerAdapter) {
SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
container.setConnectionFactory(connectionFactory);
container.setQueueNames(queueName);
@@ -44,5 +48,4 @@ public class SpringAmqpConfig {
MessageListenerAdapter listenerAdapter(MessageConsumer messageReceiver) {
return new MessageListenerAdapter(messageReceiver, "receiveMessage");
}
-
}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastConfig.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastConfig.java
new file mode 100644
index 0000000000..1d02b4dad9
--- /dev/null
+++ b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastConfig.java
@@ -0,0 +1,70 @@
+package com.baeldung.springamqpsimple.broadcast;
+
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.Declarable;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.FanoutExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.TopicExchange;
+import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Configuration
+@Profile("!test")
+public class BroadcastConfig {
+
+ public final static String fanoutQueue1Name = "com.baeldung.spring-amqp-simple.fanout.queue1";
+ public final static String fanoutQueue2Name = "com.baeldung.spring-amqp-simple.fanout.queue2";
+ public final static String fanoutExchangeName = "com.baeldung.spring-amqp-simple.fanout.exchange";
+
+ public final static String topicQueue1Name = "com.baeldung.spring-amqp-simple.topic.queue1";
+ public final static String topicQueue2Name = "com.baeldung.spring-amqp-simple.topic.queue2";
+ public final static String topicExchangeName = "com.baeldung.spring-amql-simple.topic.exchange";
+
+ @Bean
+ public List topicBindings() {
+ Queue topicQueue1 = new Queue(topicQueue1Name, false);
+ Queue topicQueue2 = new Queue(topicQueue2Name, false);
+
+ TopicExchange topicExchange = new TopicExchange(topicExchangeName);
+
+ return Arrays.asList(
+ topicQueue1,
+ topicQueue2,
+ topicExchange,
+ BindingBuilder.bind(topicQueue1).to(topicExchange).with("*.important.*"),
+ BindingBuilder.bind(topicQueue2).to(topicExchange).with("user.#")
+ );
+ }
+
+ @Bean
+ public List fanoutBindings() {
+ Queue fanoutQueue1 = new Queue(fanoutQueue1Name, false);
+ Queue fanoutQueue2 = new Queue(fanoutQueue2Name, false);
+
+ FanoutExchange fanoutExchange = new FanoutExchange(fanoutExchangeName);
+
+ return Arrays.asList(
+ fanoutQueue1,
+ fanoutQueue2,
+ fanoutExchange,
+ BindingBuilder.bind(fanoutQueue1).to(fanoutExchange),
+ BindingBuilder.bind(fanoutQueue2).to(fanoutExchange)
+ );
+ }
+
+ @Bean
+ public SimpleRabbitListenerContainerFactory container(ConnectionFactory connectionFactory, SimpleRabbitListenerContainerFactoryConfigurer configurer) {
+ SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+ configurer.configure(factory, connectionFactory);
+ return factory;
+ }
+
+}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageConsumers.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageConsumers.java
new file mode 100644
index 0000000000..0ae04ea092
--- /dev/null
+++ b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageConsumers.java
@@ -0,0 +1,32 @@
+package com.baeldung.springamqpsimple.broadcast;
+
+import com.baeldung.springamqpsimple.MessageConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BroadcastMessageConsumers {
+ private static final Logger logger = LoggerFactory.getLogger(MessageConsumer.class);
+
+ @RabbitListener(queues = {BroadcastConfig.fanoutQueue1Name})
+ public void receiveMessageFromFanout1(String message) {
+ logger.info("Received fanout 1 message: " + message);
+ }
+
+ @RabbitListener(queues = {BroadcastConfig.fanoutQueue2Name})
+ public void receiveMessageFromFanout2(String message) {
+ logger.info("Received fanout 2 message: " + message);
+ }
+
+ @RabbitListener(queues = {BroadcastConfig.topicQueue1Name})
+ public void receiveMessageFromTopic1(String message) {
+ logger.info("Received topic 1 message: " + message);
+ }
+
+ @RabbitListener(queues = {BroadcastConfig.topicQueue2Name})
+ public void receiveMessageFromTopic2(String message) {
+ logger.info("Received topic 2 message: " + message);
+ }
+}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageController.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageController.java
new file mode 100644
index 0000000000..75d4d20e55
--- /dev/null
+++ b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageController.java
@@ -0,0 +1,26 @@
+package com.baeldung.springamqpsimple.broadcast;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@Controller
+public class BroadcastMessageController {
+
+ private final BroadcastMessageProducer messageProducer;
+
+ @Autowired
+ public BroadcastMessageController(BroadcastMessageProducer messageProducer) {
+ this.messageProducer = messageProducer;
+ }
+
+ @RequestMapping(value="/broadcast", method= RequestMethod.POST)
+ @ResponseStatus(value= HttpStatus.CREATED)
+ public void sendMessage(@RequestBody String message) {
+ messageProducer.sendMessages(message);
+ }
+}
diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageProducer.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageProducer.java
new file mode 100644
index 0000000000..590da24962
--- /dev/null
+++ b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastMessageProducer.java
@@ -0,0 +1,22 @@
+package com.baeldung.springamqpsimple.broadcast;
+
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BroadcastMessageProducer {
+
+ private final RabbitTemplate rabbitTemplate;
+
+ @Autowired
+ public BroadcastMessageProducer(RabbitTemplate rabbitTemplate) {
+ this.rabbitTemplate = rabbitTemplate;
+ }
+
+ public void sendMessages(String message) {
+ rabbitTemplate.convertAndSend(BroadcastConfig.fanoutExchangeName, "", message);
+ rabbitTemplate.convertAndSend(BroadcastConfig.topicExchangeName, "user.not-important.info", message);
+ rabbitTemplate.convertAndSend(BroadcastConfig.topicExchangeName, "user.important.error", message);
+ }
+}
diff --git a/spring-amqp-simple/src/main/resources/application.yaml b/spring-amqp-simple/src/main/resources/application.yaml
index 4aca1bb783..47e7a3b9e0 100644
--- a/spring-amqp-simple/src/main/resources/application.yaml
+++ b/spring-amqp-simple/src/main/resources/application.yaml
@@ -1,4 +1,5 @@
spring:
rabbitmq:
- username: baeldung
- password: baeldung
\ No newline at end of file
+ username: guest
+ password: guest
+ host: 10.10.10.105
\ No newline at end of file
diff --git a/spring-amqp-simple/src/test/java/broadcast/BroadcastMessageControllerIntegrationTest.java b/spring-amqp-simple/src/test/java/broadcast/BroadcastMessageControllerIntegrationTest.java
new file mode 100644
index 0000000000..c3be7f1ede
--- /dev/null
+++ b/spring-amqp-simple/src/test/java/broadcast/BroadcastMessageControllerIntegrationTest.java
@@ -0,0 +1,48 @@
+package broadcast;
+
+import com.baeldung.springamqpsimple.broadcast.BroadcastConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@ActiveProfiles("test")
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+public class BroadcastMessageControllerIntegrationTest {
+
+ @Autowired
+ private TestRestTemplate restTemplate;
+
+ @MockBean
+ private RabbitTemplate rabbitTemplate;
+
+ @Test
+ public void whenPostingMessage_thenMessageIsCreated() {
+ final String message = "Hello World!";
+ ResponseEntity responseEntity = restTemplate.postForEntity("/broadcast", message, Void.class);
+
+ assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode());
+ }
+
+ @Test
+ public void whenPostingMessage_thenMessageIsSentToBroker() {
+ final String message = "Hello World!";
+ restTemplate.postForEntity("/broadcast", message, Void.class);
+
+ verify(rabbitTemplate).convertAndSend(BroadcastConfig.fanoutExchangeName, "", message);
+ verify(rabbitTemplate).convertAndSend(BroadcastConfig.topicExchangeName, "user.not-important.info", message);
+ verify(rabbitTemplate).convertAndSend(BroadcastConfig.topicExchangeName, "user.important.error", message);
+ }
+}
\ No newline at end of file
diff --git a/spring-amqp/pom.xml b/spring-amqp/pom.xml
index bb26b2d15d..4eef6070c7 100755
--- a/spring-amqp/pom.xml
+++ b/spring-amqp/pom.xml
@@ -20,6 +20,12 @@
org.springframework.amqp
spring-rabbit
1.6.6.RELEASE
+
+
+ commons-logging
+ commons-logging
+
+
diff --git a/spring-aop/README.md b/spring-aop/README.md
new file mode 100644
index 0000000000..28295faf23
--- /dev/null
+++ b/spring-aop/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Implementing a Custom Spring AOP Annotation](http://www.baeldung.com/spring-aop-annotation)
diff --git a/spring-apache-camel/pom.xml b/spring-apache-camel/pom.xml
index da7dad1a1f..0b1b10a730 100644
--- a/spring-apache-camel/pom.xml
+++ b/spring-apache-camel/pom.xml
@@ -35,6 +35,12 @@
org.apache.camel
camel-spring
${env.camel.version}
+
+
+ commons-logging
+ commons-logging
+
+
@@ -48,11 +54,6 @@
spring-context
${env.spring.version}
-
- org.slf4j
- slf4j-log4j12
- 1.7.21
-
org.apache.camel
camel-spring-javaconfig
diff --git a/spring-apache-camel/src/main/resources/log4j.xml b/spring-apache-camel/src/main/resources/log4j.xml
deleted file mode 100644
index 4a86fb2357..0000000000
--- a/spring-apache-camel/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml
index a92a0e8323..8885bd452c 100644
--- a/spring-batch/pom.xml
+++ b/spring-batch/pom.xml
@@ -27,6 +27,12 @@
org.springframework
spring-oxm
${spring.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.springframework
diff --git a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
new file mode 100644
index 0000000000..62c3676ae4
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
@@ -0,0 +1,59 @@
+
+ 4.0.0
+
+ com.baeldung
+ greeter-spring-boot-autoconfigure
+ 0.0.1-SNAPSHOT
+
+
+ UTF-8
+ 1.5.2.RELEASE
+ 0.0.1-SNAPSHOT
+
+
+
+
+
+ org.springframework.boot
+ spring-boot
+ ${spring-boot.version}
+
+
+
+ org.springframework.boot
+ spring-boot-autoconfigure
+ ${spring-boot.version}
+
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ ${spring-boot.version}
+ true
+
+
+
+ com.baeldung
+ greeter
+ ${greeter.version}
+ true
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ 1.8
+ 1.8
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/java/com/baeldung/greeter/autoconfigure/GreeterAutoConfiguration.java b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/java/com/baeldung/greeter/autoconfigure/GreeterAutoConfiguration.java
new file mode 100644
index 0000000000..4cf078aa00
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/java/com/baeldung/greeter/autoconfigure/GreeterAutoConfiguration.java
@@ -0,0 +1,48 @@
+package com.baeldung.greeter.autoconfigure;
+
+import static com.baeldung.greeter.GreeterConfigParams.*;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.greeter.Greeter;
+import com.baeldung.greeter.GreetingConfig;
+
+@Configuration
+@ConditionalOnClass(Greeter.class)
+@EnableConfigurationProperties(GreeterProperties.class)
+public class GreeterAutoConfiguration {
+
+ @Autowired
+ private GreeterProperties greeterProperties;
+
+ @Bean
+ @ConditionalOnMissingBean
+ public GreetingConfig greeterConfig() {
+
+ String userName = greeterProperties.getUserName() == null ? System.getProperty("user.name") : greeterProperties.getUserName();
+ String morningMessage = greeterProperties.getMorningMessage() == null ? "Good Morning" : greeterProperties.getMorningMessage();
+ String afternoonMessage = greeterProperties.getAfternoonMessage() == null ? "Good Afternoon" : greeterProperties.getAfternoonMessage();
+ String eveningMessage = greeterProperties.getEveningMessage() == null ? "Good Evening" : greeterProperties.getEveningMessage();
+ String nightMessage = greeterProperties.getNightMessage() == null ? "Good Night" : greeterProperties.getNightMessage();
+
+ GreetingConfig greetingConfig = new GreetingConfig();
+ greetingConfig.put(USER_NAME, userName);
+ greetingConfig.put(MORNING_MESSAGE, morningMessage);
+ greetingConfig.put(AFTERNOON_MESSAGE, afternoonMessage);
+ greetingConfig.put(EVENING_MESSAGE, eveningMessage);
+ greetingConfig.put(NIGHT_MESSAGE, nightMessage);
+ return greetingConfig;
+ }
+
+ @Bean
+ @ConditionalOnMissingBean
+ public Greeter greeter(GreetingConfig greetingConfig) {
+ return new Greeter(greetingConfig);
+ }
+
+}
diff --git a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/java/com/baeldung/greeter/autoconfigure/GreeterProperties.java b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/java/com/baeldung/greeter/autoconfigure/GreeterProperties.java
new file mode 100644
index 0000000000..c60c45c8c6
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/java/com/baeldung/greeter/autoconfigure/GreeterProperties.java
@@ -0,0 +1,54 @@
+package com.baeldung.greeter.autoconfigure;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "baeldung.greeter")
+public class GreeterProperties {
+
+ private String userName;
+ private String morningMessage;
+ private String afternoonMessage;
+ private String eveningMessage;
+ private String nightMessage;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getMorningMessage() {
+ return morningMessage;
+ }
+
+ public void setMorningMessage(String morningMessage) {
+ this.morningMessage = morningMessage;
+ }
+
+ public String getAfternoonMessage() {
+ return afternoonMessage;
+ }
+
+ public void setAfternoonMessage(String afternoonMessage) {
+ this.afternoonMessage = afternoonMessage;
+ }
+
+ public String getEveningMessage() {
+ return eveningMessage;
+ }
+
+ public void setEveningMessage(String eveningMessage) {
+ this.eveningMessage = eveningMessage;
+ }
+
+ public String getNightMessage() {
+ return nightMessage;
+ }
+
+ public void setNightMessage(String nightMessage) {
+ this.nightMessage = nightMessage;
+ }
+
+}
diff --git a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000..418201227b
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.baeldung.greeter.autoconfigure.GreeterAutoConfiguration
\ No newline at end of file
diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml
new file mode 100644
index 0000000000..bb1d35cfaa
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml
@@ -0,0 +1,39 @@
+
+ 4.0.0
+
+ com.baeldung
+ greeter-spring-boot-sample-app
+ 0.0.1-SNAPSHOT
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 1.5.2.RELEASE
+
+
+
+ UTF-8
+ 1.8
+ 0.0.1-SNAPSHOT
+
+
+
+
+
+ com.baeldung
+ greeter-spring-boot-starter
+ ${greeter-starter.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/main/java/com/baeldung/greeter/sample/GreeterSampleApplication.java b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/main/java/com/baeldung/greeter/sample/GreeterSampleApplication.java
new file mode 100644
index 0000000000..3c87524648
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/main/java/com/baeldung/greeter/sample/GreeterSampleApplication.java
@@ -0,0 +1,25 @@
+package com.baeldung.greeter.sample;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import com.baeldung.greeter.Greeter;
+
+@SpringBootApplication
+public class GreeterSampleApplication implements CommandLineRunner {
+
+ @Autowired
+ private Greeter greeter;
+
+ public static void main(String[] args) {
+ SpringApplication.run(GreeterSampleApplication.class, args);
+ }
+
+ @Override
+ public void run(String... args) throws Exception {
+ String message = greeter.greet();
+ System.out.println(message);
+ }
+}
diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/main/resources/application.properties b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/main/resources/application.properties
new file mode 100644
index 0000000000..6136e602f7
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+baeldung.greeter.userName=Baeldung
+baeldung.greeter.afternoonMessage=Woha\ Afternoon
diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationTest.java b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationTest.java
new file mode 100644
index 0000000000..bdb8fd0112
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.greeter.sample;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDateTime;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.baeldung.greeter.Greeter;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = GreeterSampleApplication.class)
+public class GreeterSampleApplicationTest {
+
+ @Autowired
+ private Greeter greeter;
+
+ @Test
+ public void givenMorningTime_ifMorningMessage_thenSuccess() {
+ String expected = "Hello Baeldung, Good Morning";
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 6, 0));
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ public void givenAfternoonTime_ifAfternoonMessage_thenSuccess() {
+ String expected = "Hello Baeldung, Woha Afternoon";
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 13, 0));
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ public void givenEveningTime_ifEveningMessage_thenSuccess() {
+ String expected = "Hello Baeldung, Good Evening";
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 19, 0));
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ public void givenNightTime_ifNightMessage_thenSuccess() {
+ String expected = "Hello Baeldung, Good Night";
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 21, 0));
+ assertEquals(expected, actual);
+ }
+
+}
diff --git a/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml b/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml
new file mode 100644
index 0000000000..7b38c53c09
--- /dev/null
+++ b/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml
@@ -0,0 +1,51 @@
+
+ 4.0.0
+
+ com.baeldung
+ greeter-spring-boot-starter
+ 0.0.1-SNAPSHOT
+
+
+ UTF-8
+ 0.0.1-SNAPSHOT
+ 1.5.2.RELEASE
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+ ${spring-boot.version}
+
+
+
+ com.baeldung
+ greeter-spring-boot-autoconfigure
+ ${project.version}
+
+
+
+ com.baeldung
+ greeter
+ ${greeter.version}
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ 1.8
+ 1.8
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-boot-custom-starter/greeter/README.md b/spring-boot-custom-starter/greeter/README.md
new file mode 100644
index 0000000000..3b26cbddcb
--- /dev/null
+++ b/spring-boot-custom-starter/greeter/README.md
@@ -0,0 +1,19 @@
+# Greeter App
+
+This app takes in the user's name and messages for different times of day as configuration parameters and outptus the greeting messge. For example it will take the name **John** and the message for morning time as **Good Morning** and output the message **Hello John, Good Morning**.
+
+## Usage
+
+Create and populate the class `GreetingConfig`, instantiate a `Greeter` using the `GreetingConfig` and use it get greeting messages:
+
+```java
+GreetingConfig greetingConfig = new GreetingConfig();
+greetingConfig.put(USER_NAME, "World");
+greetingConfig.put(MORNING_MESSAGE, "Good Morning");
+greetingConfig.put(AFTERNOON_MESSAGE, "Good Afternoon");
+greetingConfig.put(EVENING_MESSAGE, "Good Evening");
+greetingConfig.put(NIGHT_MESSAGE, "Good Night");
+
+Greeter greeter = new Greeter(greetingConfig);
+greeter.greet();
+```
\ No newline at end of file
diff --git a/apache-commons-math/pom.xml b/spring-boot-custom-starter/greeter/pom.xml
similarity index 51%
rename from apache-commons-math/pom.xml
rename to spring-boot-custom-starter/greeter/pom.xml
index 98c6953120..b0e37a9ed9 100644
--- a/apache-commons-math/pom.xml
+++ b/spring-boot-custom-starter/greeter/pom.xml
@@ -1,23 +1,32 @@
-
-
+
4.0.0
com.baeldung
- apache-commons-math
- 1.0-SNAPSHOT
+ greeter
+ 0.0.1-SNAPSHOT
- 3.6.0
+ UTF-8
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
- ${maven-compiler-plugin.version}
+ 3.5.1
1.8
1.8
@@ -26,19 +35,4 @@
-
-
- org.apache.commons
- commons-math3
- 3.6.1
-
-
-
- junit
- junit
- 4.12
- test
-
-
-
\ No newline at end of file
diff --git a/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/Greeter.java b/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/Greeter.java
new file mode 100644
index 0000000000..970561d1fd
--- /dev/null
+++ b/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/Greeter.java
@@ -0,0 +1,35 @@
+package com.baeldung.greeter;
+
+import static com.baeldung.greeter.GreeterConfigParams.*;
+
+import java.time.LocalDateTime;
+
+public class Greeter {
+
+ private GreetingConfig greetingConfig;
+
+ public Greeter(GreetingConfig greetingConfig) {
+ this.greetingConfig = greetingConfig;
+ }
+
+ public String greet(LocalDateTime localDateTime) {
+
+ String name = greetingConfig.getProperty(USER_NAME);
+ int hourOfDay = localDateTime.getHour();
+
+ if (hourOfDay >= 5 && hourOfDay < 12) {
+ return String.format("Hello %s, %s", name, greetingConfig.get(MORNING_MESSAGE));
+ } else if (hourOfDay >= 12 && hourOfDay < 17) {
+ return String.format("Hello %s, %s", name, greetingConfig.get(AFTERNOON_MESSAGE));
+ } else if (hourOfDay >= 17 && hourOfDay < 20) {
+ return String.format("Hello %s, %s", name, greetingConfig.get(EVENING_MESSAGE));
+ } else {
+ return String.format("Hello %s, %s", name, greetingConfig.get(NIGHT_MESSAGE));
+ }
+ }
+
+ public String greet() {
+ return greet(LocalDateTime.now());
+ }
+
+}
diff --git a/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/GreeterConfigParams.java b/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/GreeterConfigParams.java
new file mode 100644
index 0000000000..fa30b0f312
--- /dev/null
+++ b/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/GreeterConfigParams.java
@@ -0,0 +1,11 @@
+package com.baeldung.greeter;
+
+public class GreeterConfigParams {
+
+ public static final String USER_NAME = "user.name";
+ public static final String MORNING_MESSAGE = "morning.message";
+ public static final String AFTERNOON_MESSAGE = "afternoon.message";
+ public static final String EVENING_MESSAGE = "evening.message";
+ public static final String NIGHT_MESSAGE = "night.message";
+
+}
diff --git a/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/GreetingConfig.java b/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/GreetingConfig.java
new file mode 100644
index 0000000000..fbbe11cf4f
--- /dev/null
+++ b/spring-boot-custom-starter/greeter/src/main/java/com/baeldung/greeter/GreetingConfig.java
@@ -0,0 +1,9 @@
+package com.baeldung.greeter;
+
+import java.util.Properties;
+
+public class GreetingConfig extends Properties{
+
+ private static final long serialVersionUID = 5662570853707247891L;
+
+}
diff --git a/spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterTest.java b/spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterTest.java
new file mode 100644
index 0000000000..834f1447bd
--- /dev/null
+++ b/spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.greeter;
+
+import static com.baeldung.greeter.GreeterConfigParams.*;
+import static org.junit.Assert.assertEquals;
+
+import java.time.LocalDateTime;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class GreeterTest {
+
+ private static GreetingConfig greetingConfig;
+
+ @BeforeClass
+ public static void initalizeGreetingConfig() {
+ greetingConfig = new GreetingConfig();
+ greetingConfig.put(USER_NAME, "World");
+ greetingConfig.put(MORNING_MESSAGE, "Good Morning");
+ greetingConfig.put(AFTERNOON_MESSAGE, "Good Afternoon");
+ greetingConfig.put(EVENING_MESSAGE, "Good Evening");
+ greetingConfig.put(NIGHT_MESSAGE, "Good Night");
+ }
+
+ @Test
+ public void givenMorningTime_ifMorningMessage_thenSuccess() {
+ String expected = "Hello World, Good Morning";
+ Greeter greeter = new Greeter(greetingConfig);
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 6, 0));
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ public void givenAfternoonTime_ifAfternoonMessage_thenSuccess() {
+ String expected = "Hello World, Good Afternoon";
+ Greeter greeter = new Greeter(greetingConfig);
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 13, 0));
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ public void givenEveningTime_ifEveningMessage_thenSuccess() {
+ String expected = "Hello World, Good Evening";
+ Greeter greeter = new Greeter(greetingConfig);
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 19, 0));
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ public void givenNightTime_ifNightMessage_thenSuccess() {
+ String expected = "Hello World, Good Night";
+ Greeter greeter = new Greeter(greetingConfig);
+ String actual = greeter.greet(LocalDateTime.of(2017, 3, 1, 21, 0));
+ assertEquals(expected, actual);
+ }
+}
diff --git a/spring-boot-custom-starter/pom.xml b/spring-boot-custom-starter/pom.xml
new file mode 100644
index 0000000000..e24ff071d4
--- /dev/null
+++ b/spring-boot-custom-starter/pom.xml
@@ -0,0 +1,34 @@
+
+ 4.0.0
+ com.baeldung
+ spring-boot-custom-starter
+ 0.0.1-SNAPSHOT
+ pom
+
+
+ UTF-8
+
+
+
+ greeter
+ greeter-spring-boot-autoconfigure
+ greeter-spring-boot-starter
+ greeter-spring-boot-sample-app
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ 1.8
+ 1.8
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-boot/README.MD b/spring-boot/README.MD
index bb15ffc8cc..dfd1327781 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -18,3 +18,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Create a Custom FailureAnalyzer with Spring Boot](http://www.baeldung.com/spring-boot-failure-analyzer)
- [Configuring Separate Spring DataSource for Tests](http://www.baeldung.com/spring-testing-separate-data-source)
- [Dynamic DTO Validation Config Retrieved from DB](http://www.baeldung.com/spring-dynamic-dto-validation)
+- [Custom Information in Spring Boot Info Endpoint](http://www.baeldung.com/spring-boot-info-actuator-custom)
+- [Using @JsonComponent in Spring Boot](http://www.baeldung.com/spring-boot-jsoncomponent)
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 5f77be43e3..b00af7fc94 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -119,6 +119,12 @@
${tomee-servlet-api.version}
provided
+
+
+ mysql
+ mysql-connector-java
+ 6.0.6
+
@@ -165,6 +171,7 @@
**/*IntegrationTest.java
**/*LiveTest.java
+ **/AutoconfigurationTest.java
@@ -190,6 +197,7 @@
**/*LiveTest.java
+ **/AutoconfigurationTest.java
**/*IntegrationTest.java
@@ -206,6 +214,39 @@
+