Merge branch 'master' into sla-pr/1201-dhrubayotti-log4j2

JGit/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [A Guide to JGit](http://www.baeldung.com/jgit)

algorithms/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Dijkstra Algorithm in Java](http://www.baeldung.com/java-dijkstra)

apache-bval/README.md

@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Intro to Apache BVal](http://www.baeldung.com/apache-bval)

apache-thrift/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Working with Apache Thrift](http://www.baeldung.com/apache-thrift)

apache-velocity/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Introduction to Apache Velocity](http://www.baeldung.com/apache-velocity)

core-java-9/README.md

@@ -6,3 +6,5 @@
 
 ### Relevant Articles:
 - [Java 9 Stream API Improvements](http://www.baeldung.com/java-9-stream-api)
+- [Java 9 Convenience Factory Methods for Collections](http://www.baeldung.com/java-9-collections-factory-methods) 
+- [New Stream Collectors in Java 9](http://www.baeldung.com/java9-stream-collectors)

core-java/README.md

@@ -58,3 +58,24 @@
 - [Guide to java.util.concurrent.BlockingQueue](http://www.baeldung.com/java-blocking-queue)
 - [Guide to CountDownLatch in Java](http://www.baeldung.com/java-countdown-latch)
 - [How to Design a Genetic Algorithm in Java](http://www.baeldung.com/java-genetic-algorithm)
+- [A Guide to ConcurrentMap](http://www.baeldung.com/java-concurrent-map)
+- [Guide to PriorityBlockingQueue in Java](http://www.baeldung.com/java-priority-blocking-queue)
+- [Guide to Java 8 groupingBy Collector](http://www.baeldung.com/java-groupingby-collector)
+- [Avoiding the ConcurrentModificationException in Java](http://www.baeldung.com/java-concurrentmodificationexception)
+- [Guide to WeakHashMap in Java](http://www.baeldung.com/java-weakhashmap)
+- [Strategy Design Pattern in Java 8](http://www.baeldung.com/java-strategy-pattern)
+- [Java 8 and Infinite Streams](http://www.baeldung.com/java-inifinite-streams)
+- [Custom Thread Pools In Java 8 Parallel Streams](http://www.baeldung.com/java-8-parallel-streams-custom-threadpool)
+- [String Operations with Java Streams](http://www.baeldung.com/java-stream-operations-on-strings)
+- [Spring Security – Cache Control Headers](http://www.baeldung.com/spring-security-cache-control-headers)
+- [Basic Introduction to JMX](http://www.baeldung.com/java-management-extensions)
+- [AWS Lambda With Java](http://www.baeldung.com/java-aws-lambda)
+- [Introduction to Nashorn](http://www.baeldung.com/java-nashorn)
+- [Exceptions in Java 8 Lambda Expressions](http://www.baeldung.com/java-lambda-exceptions)
+- [Guide to the Guava BiMap](http://www.baeldung.com/guava-bimap)
+- [Iterable to Stream in Java](http://www.baeldung.com/java-iterable-to-stream)
+- [Java 8 Stream findFirst() vs. findAny()](http://www.baeldung.com/java-stream-findfirst-vs-findany)
+- [Chained Exceptions in Java](http://www.baeldung.com/java-chained-exceptions)
+- [The Java HashMap Under the Hood](http://www.baeldung.com/java-hashmap)
+- [A Guide to LinkedHashMap in Java](http://www.baeldung.com/java-linked-hashmap)
+- [A Guide to TreeMap in Java](http://www.baeldung.com/java-treemap)

core-java/src/test/java/com/baeldung/java/map/README.md

@@ -1,2 +0,0 @@
-### Relevant Articles:
-- [The Java HashMap Under the Hood](http://www.baeldung.com/java-hashmap)

couchbase-sdk/README.md

@@ -4,6 +4,7 @@
 - [Introduction to Couchbase SDK for Java](http://www.baeldung.com/java-couchbase-sdk)
 - [Using Couchbase in a Spring Application](http://www.baeldung.com/couchbase-sdk-spring)
 - [Asynchronous Batch Opereations in Couchbase](http://www.baeldung.com/async-batch-operations-in-couchbase)
+- [Querying Couchbase with MapReduce Views](http://www.baeldung.com/couchbase-query-mapreduce-view)
 
 ### Overview
 This Maven project contains the Java code for the Couchbase entities and Spring services

disruptor/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Concurrency with LMAX Disruptor – An Introduction](http://www.baeldung.com/lmax-disruptor-concurrency)

ejb/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Guide to EJB Set-up](http://www.baeldung.com/ejb-intro)

guava/README.md

@@ -16,3 +16,11 @@
 - [Guava – Sets](http://www.baeldung.com/guava-sets)
 - [Guava – Maps](http://www.baeldung.com/guava-maps)
 - [Guava Set + Function = Map](http://www.baeldung.com/guava-set-function-map-tutorial)
+- [Guide to Guava’s Ordering](http://www.baeldung.com/guava-ordering)
+- [Guide to Guava’s PreConditions](http://www.baeldung.com/guava-preconditions)
+- [Introduction to Guava CacheLoader](http://www.baeldung.com/guava-cacheloader)
+- [Guide to Guava’s EventBus](http://www.baeldung.com/guava-eventbus)
+- [Guide to Guava Multimap](http://www.baeldung.com/guava-multimap)
+- [Guide to Guava RangeSet](http://www.baeldung.com/guava-rangeset)
+- [Guide to Guava RangeMap](http://www.baeldung.com/guava-rangemap)
+- [Guide to Guava Table](http://www.baeldung.com/guava-table)

httpclient/README.md

@@ -19,3 +19,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Multipart Upload with HttpClient 4](http://www.baeldung.com/httpclient-multipart-upload)
 - [HttpAsyncClient Tutorial](http://www.baeldung.com/httpasyncclient-tutorial)
 - [HttpClient 4 Tutorial](http://www.baeldung.com/httpclient-guide)
+- [Advanced HttpClient Configuration](http://www.baeldung.com/httpclient-advanced-config)

jackson/README.md

@@ -25,3 +25,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [More Jackson Annotations](http://www.baeldung.com/jackson-advanced-annotations)
 - [Inheritance with Jackson](http://www.baeldung.com/jackson-inheritance)
 - [Guide to @JsonFormat in Jackson](http://www.baeldung.com/jackson-jsonformat)
+- [A Guide to Optional with Jackson](http://www.baeldung.com/jackson-optional)

java-mongodb/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [A Guide to MongoDB with Java](http://www.baeldung.com/java-mongodb)

javaslang/README.md

@@ -1,2 +1,4 @@
 ### Relevant Articles:
 - [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)

jee7/README.md

@@ -1,2 +1,3 @@
 ### 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)

jee7/src/main/java/com/baeldung/javaeeannotations/AccountServlet.java

@@ -0,0 +1,57 @@
+package com.baeldung.javaeeannotations;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.HttpConstraint;
+import javax.servlet.annotation.HttpMethodConstraint;
+import javax.servlet.annotation.ServletSecurity;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(
+  name = "BankAccountServlet", 
+  description = "Represents a Bank Account and it's transactions", 
+  urlPatterns = {"/account", "/bankAccount" }, 
+  initParams = { @WebInitParam(name = "type", value = "savings") }
+  )
+@ServletSecurity(
+  value = @HttpConstraint(rolesAllowed = {"admin"}),
+  httpMethodConstraints = {@HttpMethodConstraint(value = "POST", rolesAllowed = {"admin"})}
+  )
+public class AccountServlet extends javax.servlet.http.HttpServlet {
+
+    String accountType = null;
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        accountType = config.getInitParameter("type");
+    }
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        PrintWriter writer = response.getWriter();
+        writer.println("<html>Hello, I am an AccountServlet!</html>");
+        writer.flush();
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        double accountBalance = 1000d;
+        double interestRate = Double.parseDouble(request.getAttribute("interest").toString());
+
+        String paramDepositAmt = request.getParameter("dep");
+        double depositAmt = Double.parseDouble(paramDepositAmt);
+
+        accountBalance = accountBalance + depositAmt;
+
+        PrintWriter writer = response.getWriter();
+        writer.println("<html> Balance of " + accountType + " account is: " + 
+           accountBalance + "<br> This account bares an interest rate of " + interestRate + 
+           " % </html>");
+        writer.flush();
+
+    }
+}

jee7/src/main/java/com/baeldung/javaeeannotations/BankAppServletContextListener.java

@@ -0,0 +1,17 @@
+package com.baeldung.javaeeannotations;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+@WebListener
+public class BankAppServletContextListener implements ServletContextListener {
+
+    public void contextInitialized(ServletContextEvent sce) { 
+        sce.getServletContext().setAttribute("ATTR_DEFAULT_LANGUAGE", "english"); 
+    } 
+    
+    public void contextDestroyed(ServletContextEvent sce) { 
+        System.out.println("CONTEXT DESTROYED"); 
+    } 
+}

jee7/src/main/java/com/baeldung/javaeeannotations/LoggingFilter.java

@@ -0,0 +1,36 @@
+package com.baeldung.javaeeannotations;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebFilter(
+  urlPatterns = "/bankAccount/*",
+  filterName = "LoggingFilter",
+  description = "Filter all account transaction URLs"
+  )
+public class LoggingFilter implements javax.servlet.Filter {
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest req = (HttpServletRequest) request;
+        HttpServletResponse res = (HttpServletResponse) response;
+
+        res.sendRedirect(req.getContextPath() + "/login.jsp");
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    public void destroy() {
+    }
+
+}

jee7/src/main/java/com/baeldung/javaeeannotations/UploadCustomerDocumentsServlet.java

@@ -0,0 +1,29 @@
+package com.baeldung.javaeeannotations;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+
+@WebServlet(urlPatterns = { "/uploadCustDocs" })
+@MultipartConfig(
+  fileSizeThreshold = 1024 * 1024 * 20,
+  maxFileSize = 1024 * 1024 * 20,
+  maxRequestSize = 1024 * 1024 * 25,
+  location = "D:/custDocs"
+  )
+public class UploadCustomerDocumentsServlet extends HttpServlet {
+
+    protected void doPost(
+     HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        for (Part part : request.getParts()) {
+            part.write("myFile");
+        }
+    }
+
+}

jee7/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,11 @@
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+                             http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>default</realm-name>
+    </login-config>
+
+</web-app>

jee7/src/main/webapp/index.jsp

@@ -0,0 +1,16 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>My Account</title>
+</head>
+<body>
+<form action="account" method="post">
+        Width: <input type="text" size="5" name="dep"/> 
+        &nbsp;&nbsp;
+        <input type="submit" value="Deposit" />
+</form>
+</body>
+</html>

jee7/src/main/webapp/login.jsp

@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Login</title>
+</head>
+<body>
+Login Here...
+</body>
+</html>

jee7/src/main/webapp/upload.jsp

@@ -0,0 +1,16 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+<form action="uploadCustDocs" method="post" enctype="multipart/form-data">
+<input type="file" name="file" size="50" />
+<br />
+<input type="submit" value="Upload File" />
+</form>
+</body>
+</html>

kotlin/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Introduction to the Kotlin Language](http://www.baeldung.com/kotlin)

metrics/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Intro to Dropwizard Metrics](http://www.baeldung.com/dropwizard-metrics)

pdf/README.md

@@ -1,2 +1,3 @@
 ### Relevant Articles:
 - [PDF Conversions in Java](http://www.baeldung.com/pdf-conversions-java)
+- [Creating PDF Files in Java](http://www.baeldung.com/java-pdf-creation)

rxjava/README.md

@@ -0,0 +1,4 @@
+## Relevant articles:
+
+- [Dealing with Backpressure with RxJava](http://www.baeldung.com/rxjava-backpressure)
+- [How to Test RxJava?](http://www.baeldung.com/rxjava-testing)

spring-all/README.md

@@ -16,3 +16,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Quick Guide to Spring Controllers](http://www.baeldung.com/spring-controllers)
 - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
 - [Introduction To Ehcache](http://www.baeldung.com/ehcache)
+- [A Guide to the Spring Task Scheduler](http://www.baeldung.com/spring-task-scheduler)
+- [Guide to Spring Retry](http://www.baeldung.com/spring-retry)