svn commit: r1857906 [9/9] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/ applications/accounting/src/main/java/org...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1857906 [9/9] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/ applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/ applications/accounting/src/main/java/org...

mthl
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/EventFactory.java Sun Apr 21 12:49:52 2019
@@ -37,7 +37,7 @@ public class EventFactory {
 
     public static final String module = EventFactory.class.getName();
 
-    private final Map<String, EventHandler> handlers = new HashMap<String, EventHandler>();
+    private final Map<String, EventHandler> handlers = new HashMap<>();
 
     public EventFactory(ServletContext context, URL controllerConfigURL) {
         // load all the event handlers

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java Sun Apr 21 12:49:52 2019
@@ -53,7 +53,7 @@ public class GroovyEventHandler implemen
     private static final Set<String> protectedKeys = createProtectedKeys();
 
     private static Set<String> createProtectedKeys() {
-        Set<String> newSet = new HashSet<String>();
+        Set<String> newSet = new HashSet<>();
         newSet.add("request");
         newSet.add("response");
         newSet.add("session");
@@ -77,7 +77,7 @@ public class GroovyEventHandler implemen
         try {
             beganTransaction = TransactionUtil.begin();
 
-            Map<String, Object> context = new HashMap<String, Object>();
+            Map<String, Object> context = new HashMap<>();
             context.put("request", request);
             context.put("response", response);
             HttpSession session = request.getSession();

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java Sun Apr 21 12:49:52 2019
@@ -26,7 +26,7 @@ import javax.servlet.ServletRequest;
 
 /** Factory class that provides the proper <code>RequestBodyMapHandler</code> based on the content type of the <code>ServletRequest</code> */
 public class RequestBodyMapHandlerFactory {
-    private final static Map<String, RequestBodyMapHandler> requestBodyMapHandlers = new HashMap<String, RequestBodyMapHandler>();
+    private final static Map<String, RequestBodyMapHandler> requestBodyMapHandlers = new HashMap<>();
     static {
         requestBodyMapHandlers.put("application/json", new JSONRequestBodyMapHandler());
     }

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ScriptEventHandler.java Sun Apr 21 12:49:52 2019
@@ -62,7 +62,7 @@ public final class ScriptEventHandler im
     private static final Set<String> protectedKeys = createProtectedKeys();
 
     private static Set<String> createProtectedKeys() {
-        Set<String> newSet = new HashSet<String>();
+        Set<String> newSet = new HashSet<>();
         newSet.add("request");
         newSet.add("response");
         newSet.add("session");
@@ -85,7 +85,7 @@ public final class ScriptEventHandler im
     @Override
     public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException {
         try {
-            Map<String, Object> context = new HashMap<String, Object>();
+            Map<String, Object> context = new HashMap<>();
             context.put("request", request);
             context.put("response", response);
             HttpSession session = request.getSession();

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java Sun Apr 21 12:49:52 2019
@@ -126,7 +126,7 @@ public class ServiceEventHandler impleme
         Set<String> urlOnlyParameterNames = UtilHttp.getUrlOnlyParameterMap(request).keySet();
 
         // we have a service and the model; build the context
-        Map<String, Object> serviceContext = new HashMap<String, Object>();
+        Map<String, Object> serviceContext = new HashMap<>();
         for (ModelParam modelParam: model.getInModelParamList()) {
             String name = modelParam.name;
 
@@ -202,7 +202,7 @@ public class ServiceEventHandler impleme
 
         // get only the parameters for this service - converted to proper type
         // TODO: pass in a list for error messages, like could not convert type or not a proper X, return immediately with messages if there are any
-        List<Object> errorMessages = new LinkedList<Object>();
+        List<Object> errorMessages = new LinkedList<>();
         serviceContext = model.makeValid(serviceContext, ModelService.IN_PARAM, true, errorMessages, timeZone, locale);
         if (errorMessages.size() > 0) {
             // uh-oh, had some problems...

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java Sun Apr 21 12:49:52 2019
@@ -154,8 +154,8 @@ public class ServiceMultiEventHandler im
         String messageSuffixStr = UtilProperties.getMessage("DefaultMessagesUiLabels", "service.message.suffix", locale);
 
         // prepare the error message and success message lists
-        List<Object> errorMessages = new LinkedList<Object>();
-        List<String> successMessages = new LinkedList<String>();
+        List<Object> errorMessages = new LinkedList<>();
+        List<String> successMessages = new LinkedList<>();
 
         // Check the global-transaction attribute of the event from the controller to see if the
         //  event should be wrapped in a transaction
@@ -206,7 +206,7 @@ public class ServiceMultiEventHandler im
                 }
 
                 // build the context
-                Map<String, Object> serviceContext = new HashMap<String, Object>();
+                Map<String, Object> serviceContext = new HashMap<>();
                 for (ModelParam modelParam: modelService.getInModelParamList()) {
                     String paramName = modelParam.name;
 

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java Sun Apr 21 12:49:52 2019
@@ -198,7 +198,7 @@ public class XmlRpcEventHandler extends
                 String password = config.getBasicPassword();
 
                 // check the account
-                Map<String, Object> context = new HashMap<String, Object>();
+                Map<String, Object> context = new HashMap<>();
                 context.put("login.username", username);
                 context.put("login.password", password);
 
@@ -380,7 +380,7 @@ public class XmlRpcEventHandler extends
             }
 
             // context placeholder
-            Map<String, Object> context = new HashMap<String, Object>();
+            Map<String, Object> context = new HashMap<>();
 
             if (model != null) {
                 int parameterCount = xmlRpcReq.getParameterCount();

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/stats/ServerHitBin.java Sun Apr 21 12:49:52 2019
@@ -58,18 +58,18 @@ public class ServerHitBin {
     private static final String[] typeIds = {"", "REQUEST", "EVENT", "VIEW", "ENTITY", "SERVICE"};
 
     // these Maps contain Lists of ServerHitBin objects by id, the most recent is first in the list
-    public static final ConcurrentMap<String, Deque<ServerHitBin>> requestHistory = new ConcurrentHashMap<String, Deque<ServerHitBin>>();
-    public static final ConcurrentMap<String, Deque<ServerHitBin>> eventHistory = new ConcurrentHashMap<String, Deque<ServerHitBin>>();
-    public static final ConcurrentMap<String, Deque<ServerHitBin>> viewHistory = new ConcurrentHashMap<String, Deque<ServerHitBin>>();
-    public static final ConcurrentMap<String, Deque<ServerHitBin>> entityHistory = new ConcurrentHashMap<String, Deque<ServerHitBin>>();
-    public static final ConcurrentMap<String, Deque<ServerHitBin>> serviceHistory = new ConcurrentHashMap<String, Deque<ServerHitBin>>();
+    public static final ConcurrentMap<String, Deque<ServerHitBin>> requestHistory = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, Deque<ServerHitBin>> eventHistory = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, Deque<ServerHitBin>> viewHistory = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, Deque<ServerHitBin>> entityHistory = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, Deque<ServerHitBin>> serviceHistory = new ConcurrentHashMap<>();
 
     // these Maps contain ServerHitBin objects by id
-    public static final ConcurrentMap<String, ServerHitBin> requestSinceStarted = new ConcurrentHashMap<String, ServerHitBin>();
-    public static final ConcurrentMap<String, ServerHitBin> eventSinceStarted = new ConcurrentHashMap<String, ServerHitBin>();
-    public static final ConcurrentMap<String, ServerHitBin> viewSinceStarted = new ConcurrentHashMap<String, ServerHitBin>();
-    public static final ConcurrentMap<String, ServerHitBin> entitySinceStarted = new ConcurrentHashMap<String, ServerHitBin>();
-    public static final ConcurrentMap<String, ServerHitBin> serviceSinceStarted = new ConcurrentHashMap<String, ServerHitBin>();
+    public static final ConcurrentMap<String, ServerHitBin> requestSinceStarted = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, ServerHitBin> eventSinceStarted = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, ServerHitBin> viewSinceStarted = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, ServerHitBin> entitySinceStarted = new ConcurrentHashMap<>();
+    public static final ConcurrentMap<String, ServerHitBin> serviceSinceStarted = new ConcurrentHashMap<>();
 
     public static void countRequest(String id, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin) {
         countHit(id, REQUEST, request, startTime, runningTime, userLogin);
@@ -172,7 +172,7 @@ public class ServerHitBin {
         }
 
         if (binList == null) {
-            binList = new ConcurrentLinkedDeque<ServerHitBin>();
+            binList = new ConcurrentLinkedDeque<>();
             Deque<ServerHitBin> listFromMap = null;
             switch (type) {
             case REQUEST:

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ViewFactory.java Sun Apr 21 12:49:52 2019
@@ -38,7 +38,7 @@ public class ViewFactory {
 
     public static final String module = ViewFactory.class.getName();
 
-    private final Map<String, ViewHandler> handlers = new HashMap<String, ViewHandler>();
+    private final Map<String, ViewHandler> handlers = new HashMap<>();
 
     public ViewFactory(ServletContext context, URL controllerConfigURL) {
         // load all the view handlers

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/PropFindHelper.java Sun Apr 21 12:49:52 2019
@@ -55,7 +55,7 @@ public class PropFindHelper extends Resp
     }
 
     public List<Element> getFindPropsList(String nameSpaceUri) {
-        List<Element> result = new LinkedList<Element>();
+        List<Element> result = new LinkedList<>();
         NodeList nodeList = this.requestDocument.getElementsByTagNameNS(nameSpaceUri == null ? "*" : nameSpaceUri, "prop");
         for (int i = 0; i < nodeList.getLength(); i++) {
             Node node = nodeList.item(i).getFirstChild();

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java Sun Apr 21 12:49:52 2019
@@ -96,7 +96,7 @@ public final class WebDavUtil {
         if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security", "password.lowercase"))) {
             password = password.toLowerCase();
         }
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = new HashMap<>();
         result.put("login.username", username);
         result.put("login.password", password);
         return result;

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java Sun Apr 21 12:49:52 2019
@@ -108,7 +108,7 @@ public class WebToolsServices {
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Locale locale = (Locale) context.get("locale");
-        List<String> messages = new LinkedList<String>();
+        List<String> messages = new LinkedList<>();
 
         String filename = (String)context.get("filename");
         String fmfilename = (String)context.get("fmfilename");
@@ -213,7 +213,7 @@ public class WebToolsServices {
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Locale locale = (Locale) context.get("locale");
-        List<String> messages = new LinkedList<String>();
+        List<String> messages = new LinkedList<>();
 
         String path = (String) context.get("path");
         String onlyInserts = (String) context.get("onlyInserts");
@@ -239,7 +239,7 @@ public class WebToolsServices {
 
             if (baseDir.isDirectory() && baseDir.canRead()) {
                 File[] fileArray = baseDir.listFiles();
-                List<File> files = new LinkedList<File>();
+                List<File> files = new LinkedList<>();
                 for (File file: fileArray) {
                     if (file.getName().toUpperCase().endsWith("XML")) {
                         files.add(file);
@@ -249,11 +249,11 @@ public class WebToolsServices {
                 int passes=0;
                 int initialListSize = files.size();
                 int lastUnprocessedFilesCount = 0;
-                List<File> unprocessedFiles = new LinkedList<File>();
+                List<File> unprocessedFiles = new LinkedList<>();
                 while (files.size()>0 &&
                         files.size() != lastUnprocessedFilesCount) {
                     lastUnprocessedFilesCount = files.size();
-                    unprocessedFiles = new LinkedList<File>();
+                    unprocessedFiles = new LinkedList<>();
                     for (File f: files) {
                         Map<String, Object> parseEntityXmlFileArgs = UtilMisc.toMap("onlyInserts", onlyInserts,
                                 "createDummyFks", createDummyFks,
@@ -324,13 +324,13 @@ public class WebToolsServices {
         Integer txTimeoutInt = (Integer) context.get("txTimeout");
         int txTimeout = txTimeoutInt != null ? txTimeoutInt : -1;
 
-        List<Object> messages = new LinkedList<Object>();
+        List<Object> messages = new LinkedList<>();
 
         // parse the pass in list of readers to use
         List<String> readerNames = null;
         if (UtilValidate.isNotEmpty(readers) && !"none".equalsIgnoreCase(readers)) {
             if (readers.indexOf(",") == -1) {
-                readerNames = new LinkedList<String>();
+                readerNames = new LinkedList<>();
                 readerNames.add(readers);
             } else {
                 readerNames = StringUtil.split(readers, ",");
@@ -360,7 +360,7 @@ public class WebToolsServices {
 
         // need a list if it is empty
         if (urlList == null) {
-            urlList = new LinkedList<URL>();
+            urlList = new LinkedList<>();
         }
 
         // process the list of files
@@ -368,8 +368,8 @@ public class WebToolsServices {
         changedFormat.setMinimumIntegerDigits(5);
         changedFormat.setGroupingUsed(false);
 
-        List<Object> errorMessages = new LinkedList<Object>();
-        List<String> infoMessages = new LinkedList<String>();
+        List<Object> errorMessages = new LinkedList<>();
+        List<String> infoMessages = new LinkedList<>();
         int totalRowsChanged = 0;
         if (UtilValidate.isNotEmpty(urlList)) {
             messages.add("=-=-=-=-=-=-= Doing a data " + (checkDataOnly ? "check" : "load") + " with the following files:");
@@ -473,7 +473,7 @@ public class WebToolsServices {
             txTimeout = 7200;
         }
 
-        List<String> results = new LinkedList<String>();
+        List<String> results = new LinkedList<>();
 
         if (UtilValidate.isNotEmpty(outpath)) {
             File outdir = new File(outpath);
@@ -485,7 +485,7 @@ public class WebToolsServices {
                 try {
                     ModelReader reader = delegator.getModelReader();
                     Collection<String> ec = reader.getEntityNames();
-                    passedEntityNames = new TreeSet<String>(ec);
+                    passedEntityNames = new TreeSet<>(ec);
                 } catch (Exception exc) {
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EntityImportErrorRetrievingEntityNames", locale));
                 }
@@ -498,7 +498,7 @@ public class WebToolsServices {
                         results.add("["+fileNumber +"] [vvv] " + curEntityName + " skipping view entity");
                         continue;
                     }
-                    List<EntityCondition> conds = new LinkedList<EntityCondition>();
+                    List<EntityCondition> conds = new LinkedList<>();
                     if (UtilValidate.isNotEmpty(fromDate)) {
                         conds.add(EntityCondition.makeCondition("createdStamp", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
                     }
@@ -611,9 +611,9 @@ public class WebToolsServices {
         Map<String, Object> resultMap = ServiceUtil.returnSuccess();
 
         ModelReader reader = delegator.getModelReader();
-        Map<String, TreeSet<String>> entitiesByPackage = new HashMap<String, TreeSet<String>>();
-        Set<String> packageNames = new TreeSet<String>();
-        Set<String> tableNames = new TreeSet<String>();
+        Map<String, TreeSet<String>> entitiesByPackage = new HashMap<>();
+        Set<String> packageNames = new TreeSet<>();
+        Set<String> tableNames = new TreeSet<>();
 
         //put the entityNames TreeSets in a HashMap by packageName
         try {
@@ -627,7 +627,7 @@ public class WebToolsServices {
                 }
                 TreeSet<String> entities = entitiesByPackage.get(ent.getPackageName());
                 if (entities == null) {
-                    entities = new TreeSet<String>();
+                    entities = new TreeSet<>();
                     entitiesByPackage.put(ent.getPackageName(), entities);
                     packageNames.add(ent.getPackageName());
                 }
@@ -638,14 +638,14 @@ public class WebToolsServices {
         }
 
         String search = (String) context.get("search");
-        List<Map<String, Object>> packagesList = new LinkedList<Map<String,Object>>();
+        List<Map<String, Object>> packagesList = new LinkedList<>();
         try {
             for (String pName : packageNames) {
-                Map<String, Object> packageMap = new HashMap<String, Object>();
+                Map<String, Object> packageMap = new HashMap<>();
                 TreeSet<String> entities = entitiesByPackage.get(pName);
-                List<Map<String, Object>> entitiesList = new LinkedList<Map<String,Object>>();
+                List<Map<String, Object>> entitiesList = new LinkedList<>();
                 for (String entityName: entities) {
-                    Map<String, Object> entityMap = new HashMap<String, Object>();
+                    Map<String, Object> entityMap = new HashMap<>();
                     String helperName = delegator.getEntityHelperName(entityName);
                     String groupName = delegator.getEntityGroupName(entityName);
                     if (search == null || entityName.toLowerCase().indexOf(search.toLowerCase()) != -1) {
@@ -669,9 +669,9 @@ public class WebToolsServices {
                         }
 
                         // fields list
-                        List<Map<String, Object>> javaNameList = new LinkedList<Map<String,Object>>();
+                        List<Map<String, Object>> javaNameList = new LinkedList<>();
                         for (Iterator<ModelField> f = entity.getFieldsIterator(); f.hasNext();) {
-                            Map<String, Object> javaNameMap = new HashMap<String, Object>();
+                            Map<String, Object> javaNameMap = new HashMap<>();
                             ModelField field = f.next();
                             ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());
                             javaNameMap.put("isPk", field.getIsPk());
@@ -705,14 +705,14 @@ public class WebToolsServices {
                         }
 
                         // relations list
-                        List<Map<String, Object>> relationsList = new LinkedList<Map<String,Object>>();
+                        List<Map<String, Object>> relationsList = new LinkedList<>();
                         for (int r = 0; r < entity.getRelationsSize(); r++) {
-                            Map<String, Object> relationMap = new HashMap<String, Object>();
+                            Map<String, Object> relationMap = new HashMap<>();
                             ModelRelation relation = entity.getRelation(r);
-                            List<Map<String, Object>> keysList = new LinkedList<Map<String,Object>>();
+                            List<Map<String, Object>> keysList = new LinkedList<>();
                             int row = 1;
                             for (ModelKeyMap keyMap : relation.getKeyMaps()) {
-                                Map<String, Object> keysMap = new HashMap<String, Object>();
+                                Map<String, Object> keysMap = new HashMap<>();
                                 String fieldName = null;
                                 String relFieldName = null;
                                 if (keyMap.getFieldName().equals(keyMap.getRelFieldName())) {
@@ -738,16 +738,16 @@ public class WebToolsServices {
                         }
 
                         // index list
-                        List<Map<String, Object>> indexList = new LinkedList<Map<String,Object>>();
+                        List<Map<String, Object>> indexList = new LinkedList<>();
                         for (int r = 0; r < entity.getIndexesSize(); r++) {
-                            List<String> fieldNameList = new LinkedList<String>();
+                            List<String> fieldNameList = new LinkedList<>();
 
                             ModelIndex index = entity.getIndex(r);
                             for (Iterator<ModelIndex.Field> fieldIterator = index.getFields().iterator(); fieldIterator.hasNext();) {
                                 fieldNameList.add(fieldIterator.next().getFieldName());
                             }
 
-                            Map<String, Object> indexMap = new HashMap<String, Object>();
+                            Map<String, Object> indexMap = new HashMap<>();
                             indexMap.put("name", index.getName());
                             indexMap.put("description", index.getDescription());
                             indexMap.put("fieldNameList", fieldNameList);
@@ -808,9 +808,9 @@ public class WebToolsServices {
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, "WebtoolsEomodelFullPathIsNotWriteable", UtilMisc.toMap("eomodeldFullPath", eomodeldFullPath), locale));
             }
 
-            Set<String> entityNames = new TreeSet<String>();
+            Set<String> entityNames = new TreeSet<>();
             if (UtilValidate.isNotEmpty(entityPackageNameOrig)) {
-                Set<String> entityPackageNameSet = new HashSet<String>();
+                Set<String> entityPackageNameSet = new HashSet<>();
                 entityPackageNameSet.addAll(StringUtil.split(entityPackageNameOrig, ","));
 
                 Debug.logInfo("Exporting with entityPackageNameSet: " + entityPackageNameSet, module);
@@ -838,12 +838,12 @@ public class WebToolsServices {
             }
 
             // write the index.eomodeld file
-            Map<String, Object> topLevelMap = new HashMap<String, Object>();
+            Map<String, Object> topLevelMap = new HashMap<>();
             topLevelMap.put("EOModelVersion", "\"2.1\"");
-            List<Map<String, Object>> entitiesMapList = new LinkedList<Map<String,Object>>();
+            List<Map<String, Object>> entitiesMapList = new LinkedList<>();
             topLevelMap.put("entities", entitiesMapList);
             for (String entityName: entityNames) {
-                Map<String, Object> entitiesMap = new HashMap<String, Object>();
+                Map<String, Object> entitiesMap = new HashMap<>();
                 entitiesMapList.add(entitiesMap);
                 entitiesMap.put("className", "EOGenericRecord");
                 entitiesMap.put("name", entityName);

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Sun Apr 21 12:49:52 2019
@@ -77,40 +77,40 @@ public class ArtifactInfoFactory {
     protected final ModelReader entityModelReader;
     protected final DispatchContext dispatchContext;
 
-    public Map<String, EntityArtifactInfo> allEntityInfos = new ConcurrentHashMap<String, EntityArtifactInfo>();
-    public Map<String, ServiceArtifactInfo> allServiceInfos = new ConcurrentHashMap<String, ServiceArtifactInfo>();
-    public Map<ServiceEcaRule, ServiceEcaArtifactInfo> allServiceEcaInfos = new ConcurrentHashMap<ServiceEcaRule, ServiceEcaArtifactInfo>();
-    public Map<String, FormWidgetArtifactInfo> allFormInfos = new ConcurrentHashMap<String, FormWidgetArtifactInfo>();
-    public Map<String, ScreenWidgetArtifactInfo> allScreenInfos = new ConcurrentHashMap<String, ScreenWidgetArtifactInfo>();
-    public Map<String, ControllerRequestArtifactInfo> allControllerRequestInfos = new ConcurrentHashMap<String, ControllerRequestArtifactInfo>();
-    public Map<String, ControllerViewArtifactInfo> allControllerViewInfos = new ConcurrentHashMap<String, ControllerViewArtifactInfo>();
+    public Map<String, EntityArtifactInfo> allEntityInfos = new ConcurrentHashMap<>();
+    public Map<String, ServiceArtifactInfo> allServiceInfos = new ConcurrentHashMap<>();
+    public Map<ServiceEcaRule, ServiceEcaArtifactInfo> allServiceEcaInfos = new ConcurrentHashMap<>();
+    public Map<String, FormWidgetArtifactInfo> allFormInfos = new ConcurrentHashMap<>();
+    public Map<String, ScreenWidgetArtifactInfo> allScreenInfos = new ConcurrentHashMap<>();
+    public Map<String, ControllerRequestArtifactInfo> allControllerRequestInfos = new ConcurrentHashMap<>();
+    public Map<String, ControllerViewArtifactInfo> allControllerViewInfos = new ConcurrentHashMap<>();
 
     // reverse-associative caches for walking backward in the diagram
-    public Map<String, Set<ServiceEcaArtifactInfo>> allServiceEcaInfosReferringToServiceName = new ConcurrentHashMap<String, Set<ServiceEcaArtifactInfo>>();
-    public Map<String, Set<ServiceArtifactInfo>> allServiceInfosReferringToServiceName = new ConcurrentHashMap<String, Set<ServiceArtifactInfo>>();
-    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosReferringToServiceName = new ConcurrentHashMap<String, Set<FormWidgetArtifactInfo>>();
-    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosBasedOnServiceName = new ConcurrentHashMap<String, Set<FormWidgetArtifactInfo>>();
-    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToServiceName = new ConcurrentHashMap<String, Set<ScreenWidgetArtifactInfo>>();
-    public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToServiceName = new ConcurrentHashMap<String, Set<ControllerRequestArtifactInfo>>();
-
-    public Map<String, Set<ServiceArtifactInfo>> allServiceInfosReferringToEntityName = new ConcurrentHashMap<String, Set<ServiceArtifactInfo>>();
-    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosReferringToEntityName = new ConcurrentHashMap<String, Set<FormWidgetArtifactInfo>>();
-    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToEntityName = new ConcurrentHashMap<String, Set<ScreenWidgetArtifactInfo>>();
-
-    public Map<ServiceEcaRule, Set<ServiceArtifactInfo>> allServiceInfosReferringToServiceEcaRule = new ConcurrentHashMap<ServiceEcaRule, Set<ServiceArtifactInfo>>();
-
-    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosExtendingForm = new ConcurrentHashMap<String, Set<FormWidgetArtifactInfo>>();
-    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToForm = new ConcurrentHashMap<String, Set<ScreenWidgetArtifactInfo>>();
-
-    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToScreen = new ConcurrentHashMap<String, Set<ScreenWidgetArtifactInfo>>();
-    public Map<String, Set<ControllerViewArtifactInfo>> allViewInfosReferringToScreen = new ConcurrentHashMap<String, Set<ControllerViewArtifactInfo>>();
-
-    public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToView = new ConcurrentHashMap<String, Set<ControllerRequestArtifactInfo>>();
-
-    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosTargetingRequest = new ConcurrentHashMap<String, Set<FormWidgetArtifactInfo>>();
-    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosReferringToRequest = new ConcurrentHashMap<String, Set<FormWidgetArtifactInfo>>();
-    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToRequest = new ConcurrentHashMap<String, Set<ScreenWidgetArtifactInfo>>();
-    public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToRequest = new ConcurrentHashMap<String, Set<ControllerRequestArtifactInfo>>();
+    public Map<String, Set<ServiceEcaArtifactInfo>> allServiceEcaInfosReferringToServiceName = new ConcurrentHashMap<>();
+    public Map<String, Set<ServiceArtifactInfo>> allServiceInfosReferringToServiceName = new ConcurrentHashMap<>();
+    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosReferringToServiceName = new ConcurrentHashMap<>();
+    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosBasedOnServiceName = new ConcurrentHashMap<>();
+    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToServiceName = new ConcurrentHashMap<>();
+    public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToServiceName = new ConcurrentHashMap<>();
+
+    public Map<String, Set<ServiceArtifactInfo>> allServiceInfosReferringToEntityName = new ConcurrentHashMap<>();
+    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosReferringToEntityName = new ConcurrentHashMap<>();
+    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToEntityName = new ConcurrentHashMap<>();
+
+    public Map<ServiceEcaRule, Set<ServiceArtifactInfo>> allServiceInfosReferringToServiceEcaRule = new ConcurrentHashMap<>();
+
+    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosExtendingForm = new ConcurrentHashMap<>();
+    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToForm = new ConcurrentHashMap<>();
+
+    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToScreen = new ConcurrentHashMap<>();
+    public Map<String, Set<ControllerViewArtifactInfo>> allViewInfosReferringToScreen = new ConcurrentHashMap<>();
+
+    public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToView = new ConcurrentHashMap<>();
+
+    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosTargetingRequest = new ConcurrentHashMap<>();
+    public Map<String, Set<FormWidgetArtifactInfo>> allFormInfosReferringToRequest = new ConcurrentHashMap<>();
+    public Map<String, Set<ScreenWidgetArtifactInfo>> allScreenInfosReferringToRequest = new ConcurrentHashMap<>();
+    public Map<String, Set<ControllerRequestArtifactInfo>> allRequestInfosReferringToRequest = new ConcurrentHashMap<>();
 
     public static ArtifactInfoFactory getArtifactInfoFactory(String delegatorName) throws GeneralException {
         if (UtilValidate.isEmpty(delegatorName)) {
@@ -143,7 +143,7 @@ public class ArtifactInfoFactory {
 
     public void prepareAll() throws GeneralException {
         Debug.logInfo("Loading artifact info objects...", module);
-        List<Future<Void>> futures = new ArrayList<Future<Void>>();
+        List<Future<Void>> futures = new ArrayList<>();
         Set<String> entityNames = this.getEntityModelReader().getEntityNames();
         for (String entityName: entityNames) {
             this.getEntityArtifactInfo(entityName);
@@ -157,7 +157,7 @@ public class ArtifactInfoFactory {
 
         Collection<ComponentConfig> componentConfigs = ComponentConfig.getAllComponents();
         ExecutionPool.getAllFutures(futures);
-        futures = new ArrayList<Future<Void>>();
+        futures = new ArrayList<>();
         for (ComponentConfig componentConfig: componentConfigs) {
             futures.add(ExecutionPool.GLOBAL_FORK_JOIN.submit(prepareTaskForComponentAnalysis(componentConfig)));
         }
@@ -328,7 +328,7 @@ public class ArtifactInfoFactory {
     }
 
     public Set<ArtifactInfoBase> getAllArtifactInfosByNamePartial(String artifactNamePartial, String type) {
-        Set<ArtifactInfoBase> aiBaseSet = new HashSet<ArtifactInfoBase>();
+        Set<ArtifactInfoBase> aiBaseSet = new HashSet<>();
 
         if (UtilValidate.isEmpty(artifactNamePartial)) {
             return aiBaseSet;
@@ -396,9 +396,9 @@ public class ArtifactInfoFactory {
         return () -> {
             String componentName = componentConfig.getGlobalName();
             String rootComponentPath = componentConfig.getRootLocation();
-            List<File> screenFiles = new ArrayList<File>();
-            List<File> formFiles = new ArrayList<File>();
-            List<File> controllerFiles = new ArrayList<File>();
+            List<File> screenFiles = new ArrayList<>();
+            List<File> formFiles = new ArrayList<>();
+            List<File> controllerFiles = new ArrayList<>();
             try {
                 screenFiles = FileUtil.findXmlFiles(rootComponentPath, null, "screens", "widget-screen.xsd");
             } catch (IOException ioe) {

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java Sun Apr 21 12:49:52 2019
@@ -44,8 +44,8 @@ public class ControllerRequestArtifactIn
     protected ConfigXMLReader.RequestMap requestInfoMap;
 
     protected ServiceArtifactInfo serviceCalledByRequestEvent = null;
-    protected Set<ControllerRequestArtifactInfo> requestsThatAreResponsesToThisRequest = new TreeSet<ControllerRequestArtifactInfo>();
-    protected Set<ControllerViewArtifactInfo> viewsThatAreResponsesToThisRequest = new TreeSet<ControllerViewArtifactInfo>();
+    protected Set<ControllerRequestArtifactInfo> requestsThatAreResponsesToThisRequest = new TreeSet<>();
+    protected Set<ControllerViewArtifactInfo> viewsThatAreResponsesToThisRequest = new TreeSet<>();
 
     public ControllerRequestArtifactInfo(URL controllerXmlUrl, String requestUri, ArtifactInfoFactory aif) throws GeneralException {
         super(aif);

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java Sun Apr 21 12:49:52 2019
@@ -38,8 +38,8 @@ import org.apache.ofbiz.entityext.eca.En
 public class EntityArtifactInfo extends ArtifactInfoBase {
     protected ModelEntity modelEntity;
 
-    protected Set<EntityArtifactInfo> entitiesRelatedOne = new TreeSet<EntityArtifactInfo>();
-    protected Set<EntityArtifactInfo> entitiesRelatedMany = new TreeSet<EntityArtifactInfo>();
+    protected Set<EntityArtifactInfo> entitiesRelatedOne = new TreeSet<>();
+    protected Set<EntityArtifactInfo> entitiesRelatedMany = new TreeSet<>();
 
     public EntityArtifactInfo(String entityName, ArtifactInfoFactory aif) throws GenericEntityException {
         super(aif);
@@ -111,13 +111,13 @@ public class EntityArtifactInfo extends
 
     /** Get the Services called by Entity ECA */
     public Set<ServiceArtifactInfo> getServicesCalledByEntityEca() {
-        Set<ServiceArtifactInfo> serviceSet = new HashSet<ServiceArtifactInfo>();
+        Set<ServiceArtifactInfo> serviceSet = new HashSet<>();
         // TODO: implement this
         return serviceSet;
     }
 
     public Set<EntityEcaRule> getEntityEcaRules() {
-        Set<EntityEcaRule> eecaSet = new HashSet<EntityEcaRule>();
+        Set<EntityEcaRule> eecaSet = new HashSet<>();
         // TODO: implement this
         return eecaSet;
     }

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java Sun Apr 21 12:49:52 2019
@@ -49,11 +49,11 @@ public class FormWidgetArtifactInfo exte
     protected String formName;
     protected String formLocation;
 
-    protected Set<EntityArtifactInfo> entitiesUsedInThisForm = new TreeSet<EntityArtifactInfo>();
-    protected Set<ServiceArtifactInfo> servicesUsedInThisForm = new TreeSet<ServiceArtifactInfo>();
+    protected Set<EntityArtifactInfo> entitiesUsedInThisForm = new TreeSet<>();
+    protected Set<ServiceArtifactInfo> servicesUsedInThisForm = new TreeSet<>();
     protected FormWidgetArtifactInfo formThisFormExtends = null;
-    protected Set<ControllerRequestArtifactInfo> requestsLinkedToInForm = new TreeSet<ControllerRequestArtifactInfo>();
-    protected Set<ControllerRequestArtifactInfo> requestsTargetedByInForm = new TreeSet<ControllerRequestArtifactInfo>();
+    protected Set<ControllerRequestArtifactInfo> requestsLinkedToInForm = new TreeSet<>();
+    protected Set<ControllerRequestArtifactInfo> requestsTargetedByInForm = new TreeSet<>();
 
     public FormWidgetArtifactInfo(String formName, String formLocation, ArtifactInfoFactory aif) throws GeneralException {
         super(aif);

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/RunTestEvents.java Sun Apr 21 12:49:52 2019
@@ -43,7 +43,7 @@ public class RunTestEvents {
         String caseName = request.getParameter("caseName");
         String result = null;
 
-        List<StartupCommand> ofbizCommands = new ArrayList<StartupCommand>();
+        List<StartupCommand> ofbizCommands = new ArrayList<>();
         if (caseName == null) {
             ofbizCommands.add(new StartupCommand.Builder("test").properties(
                     UtilMisc.toMap("component", component, "suitename", suiteName)).build());

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java Sun Apr 21 12:49:52 2019
@@ -48,10 +48,10 @@ public class ScreenWidgetArtifactInfo ex
     protected String screenName;
     protected String screenLocation;
 
-    protected Set<EntityArtifactInfo> entitiesUsedInThisScreen = new TreeSet<EntityArtifactInfo>();
-    protected Set<ServiceArtifactInfo> servicesUsedInThisScreen = new TreeSet<ServiceArtifactInfo>();
-    protected Set<FormWidgetArtifactInfo> formsIncludedInThisScreen = new TreeSet<FormWidgetArtifactInfo>();
-    protected Set<ControllerRequestArtifactInfo> requestsLinkedToInScreen = new TreeSet<ControllerRequestArtifactInfo>();
+    protected Set<EntityArtifactInfo> entitiesUsedInThisScreen = new TreeSet<>();
+    protected Set<ServiceArtifactInfo> servicesUsedInThisScreen = new TreeSet<>();
+    protected Set<FormWidgetArtifactInfo> formsIncludedInThisScreen = new TreeSet<>();
+    protected Set<ControllerRequestArtifactInfo> requestsLinkedToInScreen = new TreeSet<>();
 
     public ScreenWidgetArtifactInfo(String screenName, String screenLocation, ArtifactInfoFactory aif) throws GeneralException {
         super(aif);
@@ -215,7 +215,7 @@ public class ScreenWidgetArtifactInfo ex
 
     public Set<ScreenWidgetArtifactInfo> getScreensIncludedInScreen() {
         // TODO: implement this
-        return new HashSet<ScreenWidgetArtifactInfo>();
+        return new HashSet<>();
     }
 
     public Set<ScreenWidgetArtifactInfo> getScreensIncludingThisScreen() {

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java Sun Apr 21 12:49:52 2019
@@ -59,9 +59,9 @@ public class ServiceArtifactInfo extends
     protected ModelService modelService;
     protected String displayPrefix = null;
 
-    Set<EntityArtifactInfo> entitiesUsedByThisService = new TreeSet<EntityArtifactInfo>();
-    Set<ServiceArtifactInfo> servicesCalledByThisService = new TreeSet<ServiceArtifactInfo>();
-    Set<ServiceEcaArtifactInfo> serviceEcasTriggeredByThisService = new TreeSet<ServiceEcaArtifactInfo>();
+    Set<EntityArtifactInfo> entitiesUsedByThisService = new TreeSet<>();
+    Set<ServiceArtifactInfo> servicesCalledByThisService = new TreeSet<>();
+    Set<ServiceEcaArtifactInfo> serviceEcasTriggeredByThisService = new TreeSet<>();
 
     public ServiceArtifactInfo(String serviceName, ArtifactInfoFactory aif) throws GeneralException {
         super(aif);
@@ -182,7 +182,7 @@ public class ServiceArtifactInfo extends
                 populateServicesFromNameSet(allServiceNameSet);
             }
         } else if ("group".equals(this.modelService.engineName)) {
-            Set<String> allServiceNameSet = new HashSet<String>();
+            Set<String> allServiceNameSet = new HashSet<>();
             GroupModel groupModel = modelService.internalGroup;
             if (groupModel == null) {
                 groupModel = ServiceGroupReader.getGroupModel(this.modelService.location);
@@ -283,7 +283,7 @@ public class ServiceArtifactInfo extends
 
     public Set<ServiceArtifactInfo> getServicesCalledByServiceEcas() {
         // TODO: implement this sometime, not really necessary
-        return new HashSet<ServiceArtifactInfo>();
+        return new HashSet<>();
     }
 
     public Set<ServiceEcaArtifactInfo> getServiceEcaRulesTriggeredByService() {
@@ -292,7 +292,7 @@ public class ServiceArtifactInfo extends
 
     public Set<ServiceArtifactInfo> getServicesCallingServiceByEcas() {
         // TODO: implement this sometime, not really necessary
-        return new HashSet<ServiceArtifactInfo>();
+        return new HashSet<>();
     }
 
     public Set<ServiceEcaArtifactInfo> getServiceEcaRulesCallingService() {
@@ -320,9 +320,9 @@ public class ServiceArtifactInfo extends
 
         Debug.logInfo("Writing Service Call Graph EO Model for service [" + this.modelService.name + "] to [" + eomodeldFullPath + "]", module);
 
-        Set<String> allDiagramEntitiesWithPrefixes = new HashSet<String>();
-        List<ServiceArtifactInfo> allServiceList = new LinkedList<ServiceArtifactInfo>();
-        List<ServiceEcaArtifactInfo> allServiceEcaList = new LinkedList<ServiceEcaArtifactInfo>();
+        Set<String> allDiagramEntitiesWithPrefixes = new HashSet<>();
+        List<ServiceArtifactInfo> allServiceList = new LinkedList<>();
+        List<ServiceEcaArtifactInfo> allServiceEcaList = new LinkedList<>();
 
         // make sure that any prefix that might have been set on this is cleared
         this.setDisplayPrefix("");
@@ -349,7 +349,7 @@ public class ServiceArtifactInfo extends
             allServiceList.add(calledService);
         }
 
-        Map<String, Integer> displaySuffixNumByEcaName = new HashMap<String, Integer>();
+        Map<String, Integer> displaySuffixNumByEcaName = new HashMap<>();
 
         // all SECAs and triggering services that call this service as an action
         Set<ServiceEcaArtifactInfo> callingServiceEcaSet = this.getServiceEcaRulesCallingService();
@@ -390,12 +390,12 @@ public class ServiceArtifactInfo extends
         }
 
         // write index.eomodeld file
-        Map<String, Object> indexEoModelMap = new HashMap<String, Object>();
+        Map<String, Object> indexEoModelMap = new HashMap<>();
         indexEoModelMap.put("EOModelVersion", "\"2.1\"");
-        List<Map<String, Object>> entitiesMapList = new LinkedList<Map<String,Object>>();
+        List<Map<String, Object>> entitiesMapList = new LinkedList<>();
         indexEoModelMap.put("entities", entitiesMapList);
         for (String entityName: allDiagramEntitiesWithPrefixes) {
-            Map<String, Object> entitiesMap = new HashMap<String, Object>();
+            Map<String, Object> entitiesMap = new HashMap<>();
             entitiesMapList.add(entitiesMap);
             entitiesMap.put("className", "EOGenericRecord");
             entitiesMap.put("name", entityName);
@@ -450,17 +450,17 @@ public class ServiceArtifactInfo extends
     }
 
     public Map<String, Object> createEoModelMap(Set<ServiceArtifactInfo> callingServiceSet, Set<ServiceArtifactInfo> calledServiceSet, Set<ServiceEcaArtifactInfo> callingServiceEcaSet, Set<ServiceEcaArtifactInfo> calledServiceEcaSet, boolean useMoreDetailedNames) {
-        if (callingServiceSet == null) callingServiceSet = new HashSet<ServiceArtifactInfo>();
-        if (calledServiceSet == null) calledServiceSet = new HashSet<ServiceArtifactInfo>();
-        if (callingServiceEcaSet == null) callingServiceEcaSet = new HashSet<ServiceEcaArtifactInfo>();
-        if (calledServiceEcaSet == null) calledServiceEcaSet = new HashSet<ServiceEcaArtifactInfo>();
-        Map<String, Object> topLevelMap = new HashMap<String, Object>();
+        if (callingServiceSet == null) callingServiceSet = new HashSet<>();
+        if (calledServiceSet == null) calledServiceSet = new HashSet<>();
+        if (callingServiceEcaSet == null) callingServiceEcaSet = new HashSet<>();
+        if (calledServiceEcaSet == null) calledServiceEcaSet = new HashSet<>();
+        Map<String, Object> topLevelMap = new HashMap<>();
 
         topLevelMap.put("name", this.getDisplayPrefixedName());
         topLevelMap.put("className", "EOGenericRecord");
 
         // for classProperties add attribute names AND relationship names to get a nice, complete chart
-        List<String> classPropertiesList = new LinkedList<String>();
+        List<String> classPropertiesList = new LinkedList<>();
         topLevelMap.put("classProperties", classPropertiesList);
         for (ModelParam param: this.modelService.getModelParamList()) {
             // skip the internal parameters, very redundant in the diagrams
@@ -486,10 +486,10 @@ public class ServiceArtifactInfo extends
         }
 
         // attributes
-        List<Map<String, Object>> attributesList = new LinkedList<Map<String,Object>>();
+        List<Map<String, Object>> attributesList = new LinkedList<>();
         topLevelMap.put("attributes", attributesList);
         for (ModelParam param: this.modelService.getModelParamList()) {
-            Map<String, Object> attributeMap = new HashMap<String, Object>();
+            Map<String, Object> attributeMap = new HashMap<>();
             attributesList.add(attributeMap);
 
             if (useMoreDetailedNames) {
@@ -502,10 +502,10 @@ public class ServiceArtifactInfo extends
         }
 
         // relationships
-        List<Map<String, Object>> relationshipsMapList = new LinkedList<Map<String,Object>>();
+        List<Map<String, Object>> relationshipsMapList = new LinkedList<>();
 
         for (ServiceArtifactInfo sai: callingServiceSet) {
-            Map<String, Object> relationshipMap = new HashMap<String, Object>();
+            Map<String, Object> relationshipMap = new HashMap<>();
             relationshipsMapList.add(relationshipMap);
 
             relationshipMap.put("name", sai.getDisplayPrefixedName());
@@ -520,7 +520,7 @@ public class ServiceArtifactInfo extends
             //joinsMap.put("destinationAttribute", keyMap.getRelFieldName());
         }
         for (ServiceArtifactInfo sai: calledServiceSet) {
-            Map<String, Object> relationshipMap = new HashMap<String, Object>();
+            Map<String, Object> relationshipMap = new HashMap<>();
             relationshipsMapList.add(relationshipMap);
 
             relationshipMap.put("name", sai.getDisplayPrefixedName());
@@ -536,7 +536,7 @@ public class ServiceArtifactInfo extends
         }
 
         for (ServiceEcaArtifactInfo seai: callingServiceEcaSet) {
-            Map<String, Object> relationshipMap = new HashMap<String, Object>();
+            Map<String, Object> relationshipMap = new HashMap<>();
             relationshipsMapList.add(relationshipMap);
 
             relationshipMap.put("name", seai.getDisplayPrefixedName());
@@ -545,7 +545,7 @@ public class ServiceArtifactInfo extends
             relationshipMap.put("isMandatory", "Y");
         }
         for (ServiceEcaArtifactInfo seai: calledServiceEcaSet) {
-            Map<String, Object> relationshipMap = new HashMap<String, Object>();
+            Map<String, Object> relationshipMap = new HashMap<>();
             relationshipsMapList.add(relationshipMap);
 
             relationshipMap.put("name", seai.getDisplayPrefixedName());

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java Sun Apr 21 12:49:52 2019
@@ -43,7 +43,7 @@ public class ServiceEcaArtifactInfo exte
     protected String displayPrefix = null;
     protected int displaySuffixNum = 0;
 
-    protected Set<ServiceArtifactInfo> servicesCalledByThisServiceEca = new TreeSet<ServiceArtifactInfo>();
+    protected Set<ServiceArtifactInfo> servicesCalledByThisServiceEca = new TreeSet<>();
 
     public ServiceEcaArtifactInfo(ServiceEcaRule serviceEcaRule, ArtifactInfoFactory aif) throws GeneralException {
         super(aif);
@@ -113,15 +113,15 @@ public class ServiceEcaArtifactInfo exte
     }
 
     public Map<String, Object> createEoModelMap(Set<ServiceArtifactInfo> triggeringServiceSet, Set<ServiceArtifactInfo> triggeredServiceSet, boolean useMoreDetailedNames) {
-        if (triggeringServiceSet == null) triggeringServiceSet = new HashSet<ServiceArtifactInfo>();
-        if (triggeredServiceSet == null) triggeredServiceSet = new HashSet<ServiceArtifactInfo>();
-        Map<String, Object> topLevelMap = new HashMap<String, Object>();
+        if (triggeringServiceSet == null) triggeringServiceSet = new HashSet<>();
+        if (triggeredServiceSet == null) triggeredServiceSet = new HashSet<>();
+        Map<String, Object> topLevelMap = new HashMap<>();
 
         topLevelMap.put("name", this.getDisplayPrefixedName());
         topLevelMap.put("className", "EOGenericRecord");
 
         // for classProperties add attribute names AND relationship names to get a nice, complete chart
-        List<String> classPropertiesList = new LinkedList<String>();
+        List<String> classPropertiesList = new LinkedList<>();
         topLevelMap.put("classProperties", classPropertiesList);
         // conditions
         for (ServiceEcaCondition ecaCondition: this.serviceEcaRule.getEcaConditionList()) {
@@ -155,10 +155,10 @@ public class ServiceEcaArtifactInfo exte
         */
 
         // relationships
-        List<Map<String, Object>> relationshipsMapList = new LinkedList<Map<String,Object>>();
+        List<Map<String, Object>> relationshipsMapList = new LinkedList<>();
 
         for (ServiceArtifactInfo sai: triggeringServiceSet) {
-            Map<String, Object> relationshipMap = new HashMap<String, Object>();
+            Map<String, Object> relationshipMap = new HashMap<>();
             relationshipsMapList.add(relationshipMap);
 
             relationshipMap.put("name", sai.getDisplayPrefixedName());
@@ -167,7 +167,7 @@ public class ServiceEcaArtifactInfo exte
             relationshipMap.put("isMandatory", "Y");
         }
         for (ServiceArtifactInfo sai: triggeredServiceSet) {
-            Map<String, Object> relationshipMap = new HashMap<String, Object>();
+            Map<String, Object> relationshipMap = new HashMap<>();
             relationshipsMapList.add(relationshipMap);
 
             relationshipMap.put("name", sai.getDisplayPrefixedName());

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelInfo.java Sun Apr 21 12:49:52 2019
@@ -31,7 +31,7 @@ public class LabelInfo {
     protected String labelKey = "";
     protected String labelKeyComment = "";
     protected String fileName = "";
-    protected Map<String, LabelValue> labelValues = new LinkedHashMap<String, LabelValue>();
+    protected Map<String, LabelValue> labelValues = new LinkedHashMap<>();
 
     public LabelInfo(String labelKey, String labelKeyComment, String fileName, String localeStr, String labelValue, String labelComment) {
         this.labelKey = labelKey;

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Sun Apr 21 12:49:52 2019
@@ -54,9 +54,9 @@ public class LabelManagerFactory {
     protected static Set<String> componentNamesFound = null;
     protected static Map<String, LabelFile> filesFound = null;
 
-    protected Map<String, LabelInfo> labels = new TreeMap<String, LabelInfo>();
-    protected Set<String> localesFound = new TreeSet<String>();
-    protected List<LabelInfo> duplicatedLocalesLabelsList = new LinkedList<LabelInfo>();
+    protected Map<String, LabelInfo> labels = new TreeMap<>();
+    protected Set<String> localesFound = new TreeSet<>();
+    protected List<LabelInfo> duplicatedLocalesLabelsList = new LinkedList<>();
 
     public static synchronized LabelManagerFactory getInstance() throws IOException {
         if (componentNamesFound == null) {
@@ -72,7 +72,7 @@ public class LabelManagerFactory {
     }
 
     protected static void loadComponentNames() {
-        componentNamesFound = new TreeSet<String>();
+        componentNamesFound = new TreeSet<>();
         Collection<ComponentConfig> componentConfigs = ComponentConfig.getAllComponents();
         for (ComponentConfig componentConfig : componentConfigs) {
             componentNamesFound.add(componentConfig.getComponentName());
@@ -80,7 +80,7 @@ public class LabelManagerFactory {
     }
 
     protected static void loadLabelFiles() throws IOException {
-        filesFound = new TreeMap<String, LabelFile>();
+        filesFound = new TreeMap<>();
         List<ClasspathInfo> cpInfos = ComponentConfig.getAllClasspathInfos();
         for (ClasspathInfo cpi : cpInfos) {
             if ("dir".equals(cpi.type)) {
@@ -192,7 +192,7 @@ public class LabelManagerFactory {
     }
 
     public Set<String> getLocalesFound() {
-        return new TreeSet<String>(localesFound);
+        return new TreeSet<>(localesFound);
     }
 
     public static Collection<LabelFile> getFilesFound() {

Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java Sun Apr 21 12:49:52 2019
@@ -62,12 +62,12 @@ public class LabelReferences {
     private static final String getResourceRegex = "ServiceUtil\\.getResource\\(\\)";
     private static final String getResource = "ServiceUtil.getResource  ";
 
-    protected Map<String, Map<String, Integer>> references = new TreeMap<String, Map<String, Integer>>();
+    protected Map<String, Map<String, Integer>> references = new TreeMap<>();
     protected Delegator delegator;
     protected DispatchContext dispatchContext;
     protected Map<String, LabelInfo> labels;
-    protected Set<String> labelSet = new HashSet<String>();
-    protected Set<String> rootFolders = new HashSet<String>();
+    protected Set<String> labelSet = new HashSet<>();
+    protected Set<String> rootFolders = new HashSet<>();
 
     public LabelReferences(Delegator delegator, LabelManagerFactory factory) {
         this.delegator = delegator;
@@ -116,7 +116,7 @@ public class LabelReferences {
         // get labels from simple method files
         getLabelsFromSimpleMethodFiles();
         // get labels from widgets files
-        List<File> fileList = new LinkedList<File>();
+        List<File> fileList = new LinkedList<>();
         for (String rootFolder : this.rootFolders) {
             fileList.addAll(FileUtil.findXmlFiles(rootFolder + "webapp", null, null, null));
             fileList.addAll(FileUtil.findXmlFiles(rootFolder + "widget", null, null, null));
@@ -143,7 +143,7 @@ public class LabelReferences {
     private void setLabelReference(String labelKey, String filePath) {
         Map<String, Integer> reference = references.get(labelKey);
         if (UtilValidate.isEmpty(reference)) {
-            reference = new TreeMap<String, Integer>();
+            reference = new TreeMap<>();
             reference.put(filePath, 1);
             references.put(labelKey, reference);
         } else {
@@ -299,7 +299,7 @@ public class LabelReferences {
     }
 
     private void getLabelsFromFormWidgets(String inFile, File file) throws MalformedURLException, SAXException, ParserConfigurationException, IOException, GenericServiceException {
-        Set<String> fieldNames = new HashSet<String>();
+        Set<String> fieldNames = new HashSet<>();
         findUiLabelMapInFile(inFile, file.getPath());
         Document formDocument = UtilXml.readXmlDocument(file.toURI().toURL());
         Element rootElem = formDocument.getDocumentElement();

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoContext.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoContext.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoContext.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/artifact/ArtifactInfoContext.java Sun Apr 21 12:49:52 2019
@@ -26,12 +26,12 @@ import java.util.Set;
  */
 public final class ArtifactInfoContext {
 
-    private final Set<String> entityNameSet = new HashSet<String>();
-    private final Set<String> serviceNameSet = new HashSet<String>();
-    private final Set<String> screenLocationSet = new HashSet<String>();
-    private final Set<String> formLocationSet = new HashSet<String>();
-    private final Set<String> requestLocationSet = new HashSet<String>();
-    private final Set<String> targetLocationSet = new HashSet<String>();
+    private final Set<String> entityNameSet = new HashSet<>();
+    private final Set<String> serviceNameSet = new HashSet<>();
+    private final Set<String> screenLocationSet = new HashSet<>();
+    private final Set<String> formLocationSet = new HashSet<>();
+    private final Set<String> requestLocationSet = new HashSet<>();
+    private final Set<String> targetLocationSet = new HashSet<>();
 
     /**
      * Adds an entity name to this context.

Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/portal/PortalPageWorker.java Sun Apr 21 12:49:52 2019
@@ -70,7 +70,7 @@ public class PortalPageWorker {
                                 EntityOperator.OR)),
                         EntityOperator.AND);
                 portalPages = EntityQuery.use(delegator).from("PortalPage").where(cond).queryList();
-                List<GenericValue> userPortalPages = new ArrayList<GenericValue>();
+                List<GenericValue> userPortalPages = new ArrayList<>();
                 if (UtilValidate.isNotEmpty(context.get("userLogin"))) { // check if a user is logged in
                     String userLoginId = ((GenericValue)context.get("userLogin")).getString("userLoginId");
                     // replace with private pages