Merge pull request #294 from DevFactory/release/diamond-operator-should-be-used-fix-1

Code quality fix - The diamond operator ("<>") should be used.

Author: Igor Polevoy

activeweb-gwt/src/main/java/org/javalite/activeweb/GWTAppController.java

@@ -202,7 +202,7 @@ private SerializationPolicy loadSerializationPolicy(String moduleBaseURL, String
      * A cache of moduleBaseURL and serialization policy strong name to
      * {@link SerializationPolicy}.
      */
-    private final Map<String, SerializationPolicy> serializationPolicyCache = new HashMap<String, SerializationPolicy>();
+    private final Map<String, SerializationPolicy> serializationPolicyCache = new HashMap<>();
 
     public final SerializationPolicy getSerializationPolicy(String moduleBaseURL,
             String strongName) {

activeweb-testing/src/main/java/org/javalite/activeweb/DBSpecHelper.java

@@ -83,7 +83,7 @@ public static void closeTestConnections() {
 
     private static List<ConnectionSpecWrapper> getTestConnectionWrappers() {
         List<ConnectionSpecWrapper> allConnections = Configuration.getConnectionSpecWrappers();
-        List<ConnectionSpecWrapper> result = new LinkedList<ConnectionSpecWrapper>();
+        List<ConnectionSpecWrapper> result = new LinkedList<>();
 
         for (ConnectionSpecWrapper connectionWrapper : allConnections) {
             if (connectionWrapper.isTesting())

activeweb-testing/src/main/java/org/javalite/activeweb/MockMultipartHttpServletRequestImpl.java

@@ -31,7 +31,7 @@
  */
 public class MockMultipartHttpServletRequestImpl extends MockHttpServletRequest implements AWMockMultipartHttpServletRequest{
 
-    private List<FormItem> formItems = new ArrayList<FormItem>();
+    private List<FormItem> formItems = new ArrayList<>();
 
     public void addFormItem(FormItem item) {
         formItems.add(item);

activeweb-testing/src/main/java/org/javalite/activeweb/RequestBuilder.java

@@ -34,16 +34,16 @@ public class RequestBuilder {
     private static final String MULTIPART = "multipart/form-data";
 
     private boolean integrateViews;
-    private Map<String, Object> values = new HashMap<String, Object>();
-    private Map<String, String> headers = new HashMap<String, String>();
+    private Map<String, Object> values = new HashMap<>();
+    private Map<String, String> headers = new HashMap<>();
     private String contentType;
     private byte[] content;
     private String controllerPath;
     private SessionTestFacade sessionFacade;
-    private List<org.javalite.activeweb.Cookie> cookies = new ArrayList<org.javalite.activeweb.Cookie>();
+    private List<org.javalite.activeweb.Cookie> cookies = new ArrayList<>();
     private MockHttpServletRequest request;
     private String realAction;
-    private List<FormItem> formItems =  new ArrayList<FormItem>();
+    private List<FormItem> formItems = new ArrayList<>();
     private String id;
     private String queryString;
     private String format;
@@ -411,7 +411,7 @@ private void addHeaders(MockHttpServletRequest request) {
     }
 
     private void addCookiesInternal(MockHttpServletRequest request) {
-        List<javax.servlet.http.Cookie> servletCookieList = new ArrayList<javax.servlet.http.Cookie>();
+        List<javax.servlet.http.Cookie> servletCookieList = new ArrayList<>();
         for(org.javalite.activeweb.Cookie cookie: cookies){
             servletCookieList.add(org.javalite.activeweb.Cookie.toServletCookie(cookie));
         }
@@ -423,7 +423,7 @@ private void addParameterValues(MockHttpServletRequest httpServletRequest) {
         for (String key : values.keySet()) {
             Object value = values.get(key);
             if(value instanceof List){
-                List<String> strings = new ArrayList<String>(((List)value).size());
+                List<String> strings = new ArrayList<>(((List) value).size());
                 for (Object v: ((List)value)) {
                     strings.add(v.toString());
                 }

activeweb-testing/src/main/java/org/javalite/activeweb/RequestSpecHelper.java

@@ -285,7 +285,7 @@ protected String redirectValue(){
     protected Cookie[] getCookies(){
         if(Context.getHttpResponse() == null) throw new IllegalStateException("response does not exist");
         javax.servlet.http.Cookie[] servletCookies = ((MockHttpServletResponse) Context.getHttpResponse()).getCookies();
-        List<Cookie> cookies = new ArrayList<Cookie>();
+        List<Cookie> cookies = new ArrayList<>();
         for(javax.servlet.http.Cookie cookie: servletCookies){
             cookies.add(Cookie.fromServletCookie(cookie));
         }

activeweb-testing/src/main/java/org/javalite/activeweb/SessionTestFacade.java

@@ -103,7 +103,7 @@ public void setTimeToLive(int seconds){
      * @return names of current attributes as a list.
      */
     public String[] names(){
-        List<String> namesList = new ArrayList<String>();
+        List<String> namesList = new ArrayList<>();
         Enumeration names = session.getAttributeNames();
         while (names.hasMoreElements()) {
             Object o = names.nextElement();

activeweb-testing/src/test/java/app/controllers/UploadController.java

@@ -43,7 +43,7 @@ public void save(){
     @POST
     public void upload(){
         Iterator<FormItem> iterator =  uploadedFiles();
-        List<Map> items = new ArrayList<Map>();
+        List<Map> items = new ArrayList<>();
         while (iterator.hasNext()) {
             FormItem item = iterator.next();
             items.add(map("name", item.getFileName(), "content", new String(item.getBytes())));
@@ -55,7 +55,7 @@ public void upload(){
     @POST
     public void uploadMultipart(){
         List<FormItem> formItems = multipartFormItems();
-        List<Map> items = new ArrayList<Map>();
+        List<Map> items = new ArrayList<>();
         for (FormItem item : formItems) {
             items.add(map("name", item.getFileName(), "content", new String(item.getBytes())));
         }
@@ -66,7 +66,7 @@ public void uploadMultipart(){
     public void withId(){
         view("id", getId());
         Iterator<FormItem> iterator =  uploadedFiles();
-        List<Map> items = new ArrayList<Map>();
+        List<Map> items = new ArrayList<>();
         while (iterator.hasNext()) {
             FormItem item = iterator.next();
             items.add(map("name", item.getFileName(), "content", new String(item.getBytes())));

activeweb/src/main/java/org/javalite/activeweb/AbstractControllerConfig.java

@@ -56,7 +56,7 @@
 public abstract class AbstractControllerConfig extends AppConfig {
 
     //exclude some controllers from filters
-    private List<ExcludeBuilder> excludeBuilders = new ArrayList<ExcludeBuilder>();
+    private List<ExcludeBuilder> excludeBuilders = new ArrayList<>();
 
     public class FilterBuilder {
         private ControllerFilter[] filters;
@@ -156,8 +156,8 @@ public void completeInit() {
 
     public class ExcludeBuilder{
 
-        private List<Class<? extends AppController>> excludeControllerClasses = new ArrayList<Class<? extends AppController>>();
-        private List<ControllerFilter> filters = new ArrayList<ControllerFilter>();
+        private List<Class<? extends AppController>> excludeControllerClasses = new ArrayList<>();
+        private List<ControllerFilter> filters = new ArrayList<>();
 
         public ExcludeBuilder(ControllerFilter[] filters) {
             this.filters.addAll(Arrays.asList(filters));

activeweb/src/main/java/org/javalite/activeweb/AbstractRouteConfig.java

@@ -8,10 +8,10 @@
  */
 public abstract class AbstractRouteConfig extends AppConfig{
 
-    private List<RouteBuilder> routes = new ArrayList<RouteBuilder>();
+    private List<RouteBuilder> routes = new ArrayList<>();
 
     //ignore some URLs
-    private List<IgnoreSpec> ignoreSpecs = new ArrayList<IgnoreSpec>();
+    private List<IgnoreSpec> ignoreSpecs = new ArrayList<>();
 
 
 
@@ -26,7 +26,7 @@ protected List<RouteBuilder> getRoutes() {
     }
 
     protected void clear(){
-        routes = new ArrayList<RouteBuilder>();
+        routes = new ArrayList<>();
     }
 
 

activeweb/src/main/java/org/javalite/activeweb/Context.java

@@ -27,17 +27,17 @@
  */
 class Context {
 
-    private static ThreadLocal<ControllerRegistry> registry = new ThreadLocal<ControllerRegistry>();
-    private static ThreadLocal<HttpServletRequest> request = new ThreadLocal<HttpServletRequest>();
-    private static ThreadLocal<HttpServletResponse> response = new ThreadLocal<HttpServletResponse>();
-    private static ThreadLocal<FilterConfig> filterConfig = new ThreadLocal<FilterConfig>();
-    private static ThreadLocal<ControllerResponse> controllerResponse = new ThreadLocal<ControllerResponse>();
-    private static ThreadLocal<AppContext> appContext = new ThreadLocal<AppContext>();
-    private static ThreadLocal<RequestContext> requestContext = new ThreadLocal<RequestContext>();
-    private static ThreadLocal<String> format = new ThreadLocal<String>();
-    private static ThreadLocal<String> encoding = new ThreadLocal<String>();
-    private static ThreadLocal<Route> route = new ThreadLocal<Route>();
-    private static ThreadLocal<Map<String, Object>> values =new ThreadLocal<Map<String, Object>>();
+    private static ThreadLocal<ControllerRegistry> registry = new ThreadLocal<>();
+    private static ThreadLocal<HttpServletRequest> request = new ThreadLocal<>();
+    private static ThreadLocal<HttpServletResponse> response = new ThreadLocal<>();
+    private static ThreadLocal<FilterConfig> filterConfig = new ThreadLocal<>();
+    private static ThreadLocal<ControllerResponse> controllerResponse = new ThreadLocal<>();
+    private static ThreadLocal<AppContext> appContext = new ThreadLocal<>();
+    private static ThreadLocal<RequestContext> requestContext = new ThreadLocal<>();
+    private static ThreadLocal<String> format = new ThreadLocal<>();
+    private static ThreadLocal<String> encoding = new ThreadLocal<>();
+    private static ThreadLocal<Route> route = new ThreadLocal<>();
+    private static ThreadLocal<Map<String, Object>> values = new ThreadLocal<>();
 
     private Context() {}