Versions update (#2234)

* Mockito refactor

* Httpclient refactor

* Refactor json-path

* MongoDB Refactor

javax-servlets/pom.xml

@@ -39,7 +39,7 @@
 
     <properties>
         <javax.servlet.version>3.1.0</javax.servlet.version>
-        <org.apache.httpcomponents.version>4.5.2</org.apache.httpcomponents.version>
+        <org.apache.httpcomponents.version>4.5.3</org.apache.httpcomponents.version>
     </properties>
 
 </project>

javax-servlets/src/test/java/com/baeldung/servlets/FormServletLiveTest.java

@@ -1,24 +1,24 @@
 package com.baeldung.servlets;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicNameValuePair;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
 public class FormServletLiveTest {
 
     @Test
     public void whenPostRequestUsingHttpClient_thenCorrect() throws Exception {
 
-        HttpClient client = new DefaultHttpClient();
+        HttpClient client = HttpClientBuilder.create().build();
         HttpPost method = new HttpPost("http://localhost:8080/calculateServlet");
 
         List<BasicNameValuePair> nvps = new ArrayList<>();

json-path/pom.xml

@@ -23,6 +23,6 @@
 
     <properties>
         <!-- json-path -->
-        <json-path.version>2.2.0</json-path.version>
+        <json-path.version>2.4.0</json-path.version>
     </properties>
 </project>

json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java

@@ -1,10 +1,10 @@
 package com.baeldung.jsonpath.introduction;
 
-import static org.junit.Assert.assertEquals;
+import com.jayway.jsonpath.Criteria;
-import static org.junit.Assert.assertThat;
+import com.jayway.jsonpath.DocumentContext;
-import static org.hamcrest.CoreMatchers.containsString;
+import com.jayway.jsonpath.Filter;
-import static org.hamcrest.CoreMatchers.not;
+import com.jayway.jsonpath.JsonPath;
-
+import com.jayway.jsonpath.Predicate;
 import org.junit.Test;
 
 import java.io.InputStream;
@@ -12,15 +12,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 
-import com.jayway.jsonpath.Criteria;
+import static org.hamcrest.CoreMatchers.containsString;
-import com.jayway.jsonpath.DocumentContext;
+import static org.hamcrest.CoreMatchers.not;
-import com.jayway.jsonpath.Filter;
+import static org.junit.Assert.assertEquals;
-import com.jayway.jsonpath.JsonPath;
+import static org.junit.Assert.assertThat;
-import com.jayway.jsonpath.Predicate;
 
 public class OperationIntegrationTest {
-    InputStream jsonInputStream = this.getClass().getClassLoader().getResourceAsStream("intro_api.json");
+    private InputStream jsonInputStream = this.getClass().getClassLoader().getResourceAsStream("intro_api.json");
-    String jsonDataSourceString = new Scanner(jsonInputStream, "UTF-8").useDelimiter("\\Z").next();
+    private String jsonDataSourceString = new Scanner(jsonInputStream, "UTF-8").useDelimiter("\\Z").next();
 
     @Test
     public void givenJsonPathWithoutPredicates_whenReading_thenCorrect() {
@@ -46,12 +45,7 @@ public class OperationIntegrationTest {
 
     @Test
     public void givenJsonPathWithCustomizedPredicate_whenReading_thenCorrect() {
-        Predicate expensivePredicate = new Predicate() {
+        Predicate expensivePredicate = context -> Float.valueOf(context.item(Map.class).get("price").toString()) > 20.00;
-            public boolean apply(PredicateContext context) {
-                String value = context.item(Map.class).get("price").toString();
-                return Float.valueOf(value) > 20.00;
-            }
-        };
         List<Map<String, Object>> expensive = JsonPath.parse(jsonDataSourceString).read("$['book'][?]", expensivePredicate);
         predicateUsageAssertionHelper(expensive);
     }

json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceTest.java

@@ -1,9 +1,9 @@
 package com.baeldung.jsonpath.introduction;
 
-import static org.junit.Assert.assertThat;
+import com.jayway.jsonpath.Configuration;
-import static org.junit.Assert.assertEquals;
+import com.jayway.jsonpath.DocumentContext;
-import static org.hamcrest.CoreMatchers.containsString;
+import com.jayway.jsonpath.JsonPath;
-
+import com.jayway.jsonpath.Option;
 import org.junit.Test;
 
 import java.io.InputStream;
@@ -13,14 +13,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 
-import com.jayway.jsonpath.Configuration;
+import static org.hamcrest.CoreMatchers.containsString;
-import com.jayway.jsonpath.DocumentContext;
+import static org.junit.Assert.assertEquals;
-import com.jayway.jsonpath.JsonPath;
+import static org.junit.Assert.assertThat;
-import com.jayway.jsonpath.Option;
 
 public class ServiceTest {
-    InputStream jsonInputStream = this.getClass().getClassLoader().getResourceAsStream("intro_service.json");
+    private InputStream jsonInputStream = this.getClass().getClassLoader().getResourceAsStream("intro_service.json");
-    String jsonString = new Scanner(jsonInputStream, "UTF-8").useDelimiter("\\Z").next();
+    private String jsonString = new Scanner(jsonInputStream, "UTF-8").useDelimiter("\\Z").next();
 
     @Test
     public void givenId_whenRequestingRecordData_thenSucceed() {

mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorForPartialMocking.java

@@ -1,12 +1,12 @@
 package com.baeldung.powermockito.introduction;
 
-public class CollaboratorForPartialMocking {
+class CollaboratorForPartialMocking {
 
-    public static String staticMethod() {
+    static String staticMethod() {
         return "Hello Baeldung!";
     }
 
-    public final String finalMethod() {
+    final String finalMethod() {
         return "Hello Baeldung!";
     }
 
@@ -14,7 +14,7 @@ public class CollaboratorForPartialMocking {
         return "Hello Baeldung!";
     }
 
-    public String privateMethodCaller() {
+    String privateMethodCaller() {
         return privateMethod() + " Welcome to the Java world.";
     }
 }

mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithFinalMethods.java

@@ -1,8 +1,8 @@
 package com.baeldung.powermockito.introduction;
 
-public class CollaboratorWithFinalMethods {
+class CollaboratorWithFinalMethods {
 
-    public final String helloMethod() {
+    final String helloMethod() {
         return "Hello World!";
     }
 

mockito/src/test/java/com/baeldung/powermockito/introduction/CollaboratorWithStaticMethods.java

@@ -1,16 +1,16 @@
 package com.baeldung.powermockito.introduction;
 
-public class CollaboratorWithStaticMethods {
+class CollaboratorWithStaticMethods {
 
-    public static String firstMethod(String name) {
+    static String firstMethod(String name) {
         return "Hello " + name + " !";
     }
 
-    public static String secondMethod() {
+    static String secondMethod() {
         return "Hello no one!";
     }
 
-    public static String thirdMethod() {
+    static String thirdMethod() {
         return "Hello no one again!";
     }
 }

mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java

@@ -17,7 +17,7 @@ public class MockitoAnnotationIntegrationTest {
     private List<String> mockedList;
 
     @Spy
-    List<String> spiedList = new ArrayList<String>();
+    private List<String> spiedList = new ArrayList<>();
 
     @Before
     public void init() {
@@ -87,6 +87,7 @@ public class MockitoAnnotationIntegrationTest {
     }
 
     @Captor
+    private
     ArgumentCaptor<String> argCaptor;
 
     @Test
@@ -98,10 +99,10 @@ public class MockitoAnnotationIntegrationTest {
     }
 
     @Mock
-    Map<String, String> wordMap;
+    private Map<String, String> wordMap;
 
     @InjectMocks
-    MyDictionary dic = new MyDictionary();
+    private MyDictionary dic = new MyDictionary();
 
     @Test
     public void whenUseInjectMocksAnnotation_thenCorrect() {

mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java

@@ -24,7 +24,7 @@ public class MockitoMockIntegrationTest {
     }
 
     @Rule
-    public ExpectedException thrown = ExpectedException.none();
+    private ExpectedException thrown = ExpectedException.none();
 
     @Test
     public void whenUsingSimpleMock_thenCorrect() {

mockito/src/test/java/org/baeldung/mockito/MyDictionary.java

@@ -3,19 +3,19 @@ package org.baeldung.mockito;
 import java.util.HashMap;
 import java.util.Map;
 
-public class MyDictionary {
+class MyDictionary {
 
-    Map<String, String> wordMap;
+    private Map<String, String> wordMap;
 
-    public MyDictionary() {
+    MyDictionary() {
-        wordMap = new HashMap<String, String>();
+        wordMap = new HashMap<>();
     }
 
     public void add(final String word, final String meaning) {
         wordMap.put(word, meaning);
     }
 
-    public String getMeaning(final String word) {
+    String getMeaning(final String word) {
         return wordMap.get(word);
     }
 }

mockito/src/test/java/org/baeldung/mockito/MyList.java

@@ -2,7 +2,7 @@ package org.baeldung.mockito;
 
 import java.util.AbstractList;
 
-public class MyList extends AbstractList<String> {
+class MyList extends AbstractList<String> {
 
     @Override
     public String get(final int index) {

spring-data-mongodb/src/main/java/org/baeldung/annotation/CascadeSave.java

@@ -8,5 +8,4 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface CascadeSave {
-
 }

spring-data-mongodb/src/main/java/org/baeldung/config/MongoConfig.java

@@ -1,8 +1,7 @@
 package org.baeldung.config;
 
-import java.util.ArrayList;
+import com.mongodb.Mongo;
-import java.util.List;
+import com.mongodb.MongoClient;
-
 import org.baeldung.converter.UserWriterConverter;
 import org.baeldung.event.CascadeSaveMongoEventListener;
 import org.baeldung.event.UserCascadeSaveMongoEventListener;
@@ -14,8 +13,8 @@ import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.gridfs.GridFsTemplate;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
-import com.mongodb.Mongo;
+import java.util.ArrayList;
-import com.mongodb.MongoClient;
+import java.util.List;
 
 @Configuration
 @EnableMongoRepositories(basePackages = "org.baeldung.repository")

spring-data-mongodb/src/main/java/org/baeldung/config/SimpleMongoConfig.java

@@ -1,13 +1,12 @@
 package org.baeldung.config;
 
+import com.mongodb.Mongo;
+import com.mongodb.MongoClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
-import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
-
 @Configuration
 @EnableMongoRepositories(basePackages = "org.baeldung.repository")
 public class SimpleMongoConfig {

spring-data-mongodb/src/main/java/org/baeldung/converter/UserWriterConverter.java

@@ -1,11 +1,10 @@
 package org.baeldung.converter;
 
-import org.baeldung.model.User;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
-
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
+import org.baeldung.model.User;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
 
 @Component
 public class UserWriterConverter implements Converter<User, DBObject> {

spring-data-mongodb/src/main/java/org/baeldung/event/CascadeCallback.java

@@ -12,7 +12,7 @@ public class CascadeCallback implements ReflectionUtils.FieldCallback {
     private Object source;
     private MongoOperations mongoOperations;
 
-    public CascadeCallback(final Object source, final MongoOperations mongoOperations) {
+    CascadeCallback(final Object source, final MongoOperations mongoOperations) {
         this.source = source;
         this.setMongoOperations(mongoOperations);
     }
@@ -35,7 +35,7 @@ public class CascadeCallback implements ReflectionUtils.FieldCallback {
 
     }
 
-    public Object getSource() {
+    private Object getSource() {
         return source;
     }
 
@@ -43,11 +43,11 @@ public class CascadeCallback implements ReflectionUtils.FieldCallback {
         this.source = source;
     }
 
-    public MongoOperations getMongoOperations() {
+    private MongoOperations getMongoOperations() {
         return mongoOperations;
     }
 
-    public void setMongoOperations(final MongoOperations mongoOperations) {
+    private void setMongoOperations(final MongoOperations mongoOperations) {
         this.mongoOperations = mongoOperations;
     }
 }

spring-data-mongodb/src/main/java/org/baeldung/repository/UserRepository.java

@@ -1,12 +1,12 @@
 package org.baeldung.repository;
 
-import java.util.List;
-
 import org.baeldung.model.User;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 
+import java.util.List;
+
 public interface UserRepository extends MongoRepository<User, String>, QueryDslPredicateExecutor<User> {
     @Query("{ 'name' : ?0 }")
     List<User> findUsersByName(String name);

spring-data-mongodb/src/test/java/org/baeldung/aggregation/ZipsAggregationLiveTest.java

@@ -1,17 +1,10 @@
 package org.baeldung.aggregation;
 
-import static org.junit.Assert.*;
+import com.mongodb.DB;
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import com.mongodb.DBCollection;
-
+import com.mongodb.DBObject;
-import java.io.BufferedReader;
+import com.mongodb.MongoClient;
-import java.io.InputStream;
+import com.mongodb.util.JSON;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
 import org.baeldung.aggregation.model.StatePopulation;
 import org.baeldung.config.MongoConfig;
 import org.junit.AfterClass;
@@ -33,11 +26,23 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.mongodb.DB;
+import java.io.BufferedReader;
-import com.mongodb.DBCollection;
+import java.io.InputStream;
-import com.mongodb.DBObject;
+import java.io.InputStreamReader;
-import com.mongodb.MongoClient;
+import java.util.ArrayList;
-import com.mongodb.util.JSON;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.group;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.limit;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.match;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.newAggregation;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.project;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.sort;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)

spring-data-mongodb/src/test/java/org/baeldung/gridfs/GridFSLiveTest.java

@@ -1,19 +1,8 @@
 package org.baeldung.gridfs;
 
-import static org.hamcrest.CoreMatchers.is;
+import com.mongodb.BasicDBObject;
-import static org.hamcrest.Matchers.nullValue;
+import com.mongodb.DBObject;
-import static org.junit.Assert.assertEquals;
+import com.mongodb.gridfs.GridFSDBFile;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import org.baeldung.config.MongoConfig;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,9 +16,18 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.mongodb.BasicDBObject;
+import java.io.FileInputStream;
-import com.mongodb.DBObject;
+import java.io.FileNotFoundException;
-import com.mongodb.gridfs.GridFSDBFile;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
 
 @ContextConfiguration("file:src/main/resources/mongoConfig.xml")
 @RunWith(SpringJUnit4ClassRunner.class)

spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/DocumentQueryLiveTest.java

@@ -1,11 +1,5 @@
 package org.baeldung.mongotemplate;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.Iterator;
-import java.util.List;
-
 import org.baeldung.config.MongoConfig;
 import org.baeldung.model.EmailAddress;
 import org.baeldung.model.User;
@@ -23,6 +17,12 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.Iterator;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class DocumentQueryLiveTest {

spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/MongoTemplateProjectionLiveTest.java

@@ -1,9 +1,5 @@
 package org.baeldung.mongotemplate;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 import org.baeldung.config.SimpleMongoConfig;
 import org.baeldung.model.User;
 import org.junit.After;
@@ -16,6 +12,10 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = SimpleMongoConfig.class)
 public class MongoTemplateProjectionLiveTest {

spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/MongoTemplateQueryLiveTest.java

@@ -1,11 +1,5 @@
 package org.baeldung.mongotemplate;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.Matchers.nullValue;
-
-import java.util.List;
-
 import org.baeldung.config.MongoConfig;
 import org.baeldung.model.EmailAddress;
 import org.baeldung.model.User;
@@ -26,6 +20,12 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class MongoTemplateQueryLiveTest {