svn commit: r1860025 [2/2] - in /ofbiz/ofbiz-plugins/trunk: assetmaint/src/main/java/org/a
Locked
svn commit: r1860025 [2/2] - in /ofbiz/ofbiz-plugins/trunk: assetmaint/src/main/java/org/a
 
|
Modified: ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java Sat May 25 23:42:00 2019 @@ -56,7 +56,7 @@ public class ScrumEvents { HttpSession session = request.getSession(); Delegator delegator = (Delegator) session.getAttribute("delegator"); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - List<Map<String, Object>> noTimeEntryList = new LinkedList<Map<String,Object>>(); + List<Map<String, Object>> noTimeEntryList = new LinkedList<>(); String partyId = userLogin.getString("partyId"); Timestamp now = UtilDateTime.nowTimestamp(); Timestamp weekStart = UtilDateTime.getWeekStart(now); @@ -87,7 +87,7 @@ public class ScrumEvents { //check EmplLeave List<GenericValue> emplLeaveList = EntityQuery.use(delegator).from("EmplLeave").where("partyId", partyId, "fromDate", realTimeDate).cache(true).queryList(); if (UtilValidate.isEmpty(timeEntryList) && UtilValidate.isEmpty(emplLeaveList)) { - Map<String, Object> noEntryMap = new HashMap<String, Object>(); + Map<String, Object> noEntryMap = new HashMap<>(); noEntryMap.put("timesheetId", timesheetId); noTimeEntryList.add(noEntryMap); break; Modified: ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java Sat May 25 23:42:00 2019 @@ -178,7 +178,7 @@ public class ScrumServices { Integer revision = Integer.parseInt(latestRevision.trim()); for (int i = 1; i <= revision; i++) { String logline = null; - List<String> logMessageList = new LinkedList<String>(); + List<String> logMessageList = new LinkedList<>(); String logCommand = "svn log -r" + i + " " + repositoryRoot; Process logProcess = Runtime.getRuntime().exec(logCommand); BufferedReader logIn = new BufferedReader(new InputStreamReader(logProcess.getInputStream())); @@ -210,10 +210,10 @@ public class ScrumServices { if (UtilValidate.isNotEmpty(taskId)) { String version = "R" + i; List <GenericValue> workeffContentList = EntityQuery.use(delegator).from("WorkEffortAndContentDataResource").where("contentName",version.trim() ,"drObjectInfo", revisionLink.trim()).queryList(); - List<EntityCondition> exprsAnd = new LinkedList<EntityCondition>(); + List<EntityCondition> exprsAnd = new LinkedList<>(); exprsAnd.add(EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, taskId)); - List<EntityCondition> exprsOr = new LinkedList<EntityCondition>(); + List<EntityCondition> exprsOr = new LinkedList<>(); exprsOr.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); exprsOr.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); exprsOr.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -222,7 +222,7 @@ public class ScrumServices { List<GenericValue> workEffortList = EntityQuery.use(delegator).from("WorkEffort").where(exprsAnd).queryList(); if (UtilValidate.isEmpty(workeffContentList) && UtilValidate.isNotEmpty(workEffortList)) { - Map<String, Object> inputMap = new HashMap<String, Object>(); + Map<String, Object> inputMap = new HashMap<>(); inputMap.put("taskId", taskId); inputMap.put("user", user); inputMap.put("revisionNumber", Integer.toString(i)); @@ -268,7 +268,7 @@ public class ScrumServices { String repositoryRoot = (String) context.get("repositoryRoot"); Map<String, Object> result = ServiceUtil.returnSuccess(); try { - List<EntityCondition> exprsAnd = new LinkedList<EntityCondition>(); + List<EntityCondition> exprsAnd = new LinkedList<>(); String revisionLink = repositoryRoot.substring(repositoryRoot.lastIndexOf("svn/") + 4, repositoryRoot.length()) + "&revision="; exprsAnd.add(EntityCondition.makeCondition("workEffortContentTypeId", EntityOperator.EQUALS, "TASK_SUB_INFO")); exprsAnd.add(EntityCondition.makeCondition("contentTypeId", EntityOperator.EQUALS, "DOCUMENT")); @@ -276,8 +276,8 @@ public class ScrumServices { List<GenericValue> workEffortDataResourceList = EntityQuery.use(delegator).from("WorkEffortAndContentDataResource").where(exprsAnd).queryList(); if (UtilValidate.isNotEmpty(workEffortDataResourceList)) { Debug.logInfo("Total Content Size ============== >>>>>>>>>>> "+ workEffortDataResourceList.size(), module); - Set<String> keys = new HashSet<String>(); - Set<GenericValue> exclusions = new HashSet<GenericValue>(); + Set<String> keys = new HashSet<>(); + Set<GenericValue> exclusions = new HashSet<>(); for (GenericValue workEffort : workEffortDataResourceList) { String drObjectInfo = workEffort.getString("drObjectInfo"); if (keys.contains(drObjectInfo)) { Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java (original) +++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java Sat May 25 23:42:00 2019 @@ -49,7 +49,7 @@ public final class CategoryUtil { * This method is a supplement to CatalogWorker methods. */ public static List<String> getCatalogIdsByCategoryId(Delegator delegator, String productCategoryId) { - List<String> catalogIds = new ArrayList<String>(); + List<String> catalogIds = new ArrayList<>(); List<GenericValue> catalogs = null; try { EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toMap("productCategoryId", productCategoryId)); @@ -68,23 +68,23 @@ public final class CategoryUtil { public static List<List<String>> getCategoryTrail(String productCategoryId, DispatchContext dctx) { GenericDelegator delegator = (GenericDelegator) dctx.getDelegator(); - List<List<String>> trailElements = new ArrayList<List<String>>(); + List<List<String>> trailElements = new ArrayList<>(); String parentProductCategoryId = productCategoryId; while (UtilValidate.isNotEmpty(parentProductCategoryId)) { // find product category rollup try { - List<EntityCondition> rolllupConds = new ArrayList<EntityCondition>(); + List<EntityCondition> rolllupConds = new ArrayList<>(); rolllupConds.add(EntityCondition.makeCondition("productCategoryId", parentProductCategoryId)); rolllupConds.add(EntityUtil.getFilterByDateExpr()); List<GenericValue> productCategoryRollups = delegator.findList("ProductCategoryRollup", EntityCondition.makeCondition(rolllupConds), null, UtilMisc.toList("-fromDate"), null, true); if (UtilValidate.isNotEmpty(productCategoryRollups)) { - List<List<String>> trailElementsAux = new ArrayList<List<String>>(); + List<List<String>> trailElementsAux = new ArrayList<>(); trailElementsAux.addAll(trailElements); // add only categories that belong to the top category to trail for (GenericValue productCategoryRollup : productCategoryRollups) { String trailCategoryId = productCategoryRollup.getString("parentProductCategoryId"); parentProductCategoryId = trailCategoryId; - List<String> trailElement = new ArrayList<String>(); + List<String> trailElement = new ArrayList<>(); if (!trailElements.isEmpty()) { for (List<String> trailList : trailElementsAux) { trailElement.add(trailCategoryId); @@ -107,7 +107,7 @@ public final class CategoryUtil { } } if (trailElements.size() == 0) { - List<String> trailElement = new ArrayList<String>(); + List<String> trailElement = new ArrayList<>(); trailElement.add(productCategoryId); trailElements.add(trailElement); } Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java (original) +++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java Sat May 25 23:42:00 2019 @@ -54,7 +54,7 @@ public final class ProductUtil { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String productId = (String) product.get("productId"); - Map<String, Object> dispatchContext = new HashMap<String, Object>(); + Map<String, Object> dispatchContext = new HashMap<>(); Locale locale = new Locale("de_DE"); if (Debug.verboseOn()) { @@ -85,7 +85,7 @@ public final class ProductUtil { // Trying to set a correctand trail List<GenericValue> category = delegator.findList("ProductCategoryMember", EntityCondition.makeCondition(UtilMisc.toMap("productId", productId)), null, null, null, false); - List<String> trails = new ArrayList<String>(); + List<String> trails = new ArrayList<>(); for (Iterator<GenericValue> catIterator = category.iterator(); catIterator.hasNext();) { GenericValue cat = catIterator.next(); String productCategoryId = (String) cat.get("productCategoryId"); @@ -116,7 +116,7 @@ public final class ProductUtil { dispatchContext.put("category", trails); // Get the catalogs that have associated the categories - List<String> catalogs = new ArrayList<String>(); + List<String> catalogs = new ArrayList<>(); for (String trail : trails) { String productCategoryId = (trail.split("/").length > 0) ? trail.split("/")[1] : trail; List<String> catalogMembers = CategoryUtil.getCatalogIdsByCategoryId(delegator, productCategoryId); @@ -159,7 +159,7 @@ public final class ProductUtil { if (isPhysical) dispatchContext.put("isPhysical", isPhysical); - Map<String, String> title = new HashMap<String, String>(); + Map<String, String> title = new HashMap<>(); String detitle = productContentDe.get("PRODUCT_NAME", "html").toString(); if (detitle != null) title.put("de", detitle); @@ -177,7 +177,7 @@ public final class ProductUtil { title.put("fr", (String) product.get("productName")); dispatchContext.put("title", title); - Map<String, String> description = new HashMap<String, String>(); + Map<String, String> description = new HashMap<>(); String dedescription = productContentDe.get("DESCRIPTION", "html").toString(); if (dedescription != null) description.put("de", dedescription); @@ -189,7 +189,7 @@ public final class ProductUtil { description.put("fr", frdescription); dispatchContext.put("description", description); - Map<String, String> longDescription = new HashMap<String, String>(); + Map<String, String> longDescription = new HashMap<>(); String delongDescription = productContentDe.get("LONG_DESCRIPTION", "html").toString(); if (delongDescription != null) longDescription.put("de", delongDescription); Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java (original) +++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java Sat May 25 23:42:00 2019 @@ -137,7 +137,7 @@ public abstract class SolrProductSearch // Construct Documents SolrInputDocument doc1 = SolrUtil.generateSolrDocument(context); - Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>(); + Collection<SolrInputDocument> docs = new ArrayList<>(); if (Debug.verboseOn()) { Debug.logVerbose("Solr: Indexing document: " + doc1.toString(), module); @@ -206,7 +206,7 @@ public abstract class SolrProductSearch Map<String, Object> result; Boolean treatConnectErrorNonFatal = (Boolean) context.get("treatConnectErrorNonFatal"); try { - Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>(); + Collection<SolrInputDocument> docs = new ArrayList<>(); // Construct Documents List<Map<String, Object>> fieldList = UtilGenerics.<Map<String, Object>> checkList(context.get("fieldList")); @@ -393,7 +393,7 @@ public abstract class SolrProductSearch String solrIndexName = (String) context.get("indexName"); try { - Map<String, Object> dispatchMap = new HashMap<String, Object>(); + Map<String, Object> dispatchMap = new HashMap<>(); if (UtilValidate.isNotEmpty(context.get("productCategoryId"))) { String productCategoryId = (String) context.get("productCategoryId"); dispatchMap.put("query", "cat:*" + productCategoryId + "*"); @@ -448,7 +448,7 @@ public abstract class SolrProductSearch if (context.get("query") == null || context.get("query").equals("")) context.put("query", "*:*"); - Map<String, Object> dispatchMap = new HashMap<String, Object>(); + Map<String, Object> dispatchMap = new HashMap<>(); if (context.get("viewSize") != null) dispatchMap.put("viewSize", Integer.parseInt(((String) context.get("viewSize")))); if (context.get("viewIndex") != null) @@ -466,7 +466,7 @@ public abstract class SolrProductSearch } QueryResponse queryResult = (QueryResponse) searchResult.get("queryResult"); - List<List<String>> suggestions = new ArrayList<List<String>>(); + List<List<String>> suggestions = new ArrayList<>(); if (queryResult.getSpellCheckResponse() != null && queryResult.getSpellCheckResponse().getSuggestions() != null) { Iterator<Suggestion> iter = queryResult.getSpellCheckResponse().getSuggestions().iterator(); while (iter.hasNext()) { @@ -485,16 +485,16 @@ public abstract class SolrProductSearch result.put("isCorrectlySpelled", isCorrectlySpelled); Map<String, Integer> facetQuery = queryResult.getFacetQuery(); - Map<String, String> facetQueries = new HashMap<String, String>(); + Map<String, String> facetQueries = new HashMap<>(); for (String fq : facetQuery.keySet()) { if (facetQuery.get(fq) > 0) facetQueries.put(fq, fq.replaceAll("^.*\\u005B(.*)\\u005D", "$1") + " (" + facetQuery.get(fq) + ")"); } - Map<String, Map<String, Long>> facetFields = new HashMap<String, Map<String, Long>>(); + Map<String, Map<String, Long>> facetFields = new HashMap<>(); List<FacetField> facets = queryResult.getFacetFields(); for (FacetField facet : facets) { - Map<String, Long> facetEntry = new HashMap<String, Long>(); + Map<String, Long> facetEntry = new HashMap<>(); List<FacetField.Count> facetEntries = facet.getValues(); if (UtilValidate.isNotEmpty(facetEntries)) { for (FacetField.Count fcount : facetEntries) @@ -550,7 +550,7 @@ public abstract class SolrProductSearch QueryResponse cat = (QueryResponse) query.get("rows"); result = ServiceUtil.returnSuccess(); result.put("numFound", (long) 0); - Map<String, Object> categories = new HashMap<String, Object>(); + Map<String, Object> categories = new HashMap<>(); List<FacetField> catList = cat.getFacetFields(); for (Iterator<FacetField> catIterator = catList.iterator(); catIterator.hasNext();) { FacetField field = catIterator.next(); @@ -590,7 +590,7 @@ public abstract class SolrProductSearch String productCategoryId = (String) context.get("productCategoryId") != null ? CategoryUtil.getCategoryNameWithTrail((String) context.get("productCategoryId"), dctx) : null; result = ServiceUtil.returnSuccess(); - Map<String, List<Map<String, Object>>> catLevel = new HashMap<String, List<Map<String, Object>>>(); + Map<String, List<Map<String, Object>>> catLevel = new HashMap<>(); Debug.logInfo("productCategoryId: " + productCategoryId, module); //Add toplevel categories @@ -607,7 +607,7 @@ public abstract class SolrProductSearch String facetQuery = CategoryUtil.getFacetFilterForCategory(categoryPath, dctx); Map<String, Object> query = SolrUtil.categoriesAvailable(catalogId, categoryPath, null, facetQuery, false, 0, 0, solrIndexName); QueryResponse cat = (QueryResponse) query.get("rows"); - List<Map<String, Object>> categories = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> categories = new ArrayList<>(); List<FacetField> catList = cat.getFacetFields(); for (Iterator<FacetField> catIterator = catList.iterator(); catIterator.hasNext();) { @@ -617,8 +617,8 @@ public abstract class SolrProductSearch for (Iterator<Count> catIter = catL.iterator(); catIter.hasNext();) { FacetField.Count f = catIter.next(); if (f.getCount() > 0) { - Map<String, Object> catMap = new HashMap<String, Object>(); - LinkedList<String> iName = new LinkedList<String>(); + Map<String, Object> catMap = new HashMap<>(); + LinkedList<String> iName = new LinkedList<>(); iName.addAll(Arrays.asList(f.getName().split("/"))); catMap.put("catId", iName.getLast()); iName.removeFirst(); @@ -669,7 +669,7 @@ public abstract class SolrProductSearch client = SolrUtil.getHttpSolrClient(solrIndexName); // now lets fetch all products - List<Map<String, Object>> solrDocs = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> solrDocs = new ArrayList<>(); List<GenericValue> products = delegator.findList("Product", null, null, null, null, true); int numDocs = 0; if (products != null) { Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java (original) +++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java Sat May 25 23:42:00 2019 @@ -238,7 +238,7 @@ public final class SolrUtil { public static Map<String, Object> categoriesAvailable(String catalogId, String categoryId, String productId, String facetPrefix, boolean displayproducts, int viewIndex, int viewSize, String solrIndexName) { // create the data model - Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> result = new HashMap<>(); HttpSolrClient client = null; QueryResponse returnMap = new QueryResponse(); try { Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java (original) +++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java Sat May 25 23:42:00 2019 @@ -56,7 +56,7 @@ public class SolrTests extends OFBizTest GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", validTestProductId).queryOne(); - Map<String, Object> ctx = new HashMap<String, Object>(); + Map<String, Object> ctx = new HashMap<>(); ctx.put("instance", product); Map<String, Object> resp = dispatcher.runSync("addToSolr", ctx); @@ -66,7 +66,7 @@ public class SolrTests extends OFBizTest } assertTrue("Could not init search index", ServiceUtil.isSuccess(resp)); - Map<String, Object> sctx = new HashMap<String, Object>(); + Map<String, Object> sctx = new HashMap<>(); sctx.put("productCategoryId", "102"); Map<String, Object> sresp = dispatcher.runSync("solrProductsSearch", sctx); Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java (original) +++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java Sat May 25 23:42:00 2019 @@ -180,7 +180,7 @@ public class OFBizSolrContextFilter exte private void sendJsonHeaderMessage(HttpServletRequest httpRequest, HttpServletResponse httpResponse, GenericValue userLogin, String notLoginMessage, String noPermissionMessage, Locale locale) throws IOException { httpResponse.setContentType("application/json"); MapToJSON mapToJson = new MapToJSON(); - Map<String, Object> responseHeader = new HashMap<String, Object>(); + Map<String, Object> responseHeader = new HashMap<>(); JSON json; String message = ""; OutputStream os = null; Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java Sat May 25 23:42:00 2019 @@ -155,7 +155,7 @@ public class WebPosEvents { public static String getProductType(HttpServletRequest request, HttpServletResponse response) { Map<String, Object> featureMap = null; Map<String, Object> variantTreeMap = null; - Map<String, Object> featureTypes = new HashMap<String, Object>(); + Map<String, Object> featureTypes = new HashMap<>(); WebPosSession webPosSession = getWebPosSession(request, null); if (webPosSession != null) { Delegator delegator = webPosSession.getDelegator(); @@ -197,7 +197,7 @@ public class WebPosEvents { if (UtilValidate.isNotEmpty(variantTree)) { request.setAttribute("variantTree", variantTree); request.setAttribute("variantTreeSize", variantTree.size()); - List<String> featureOrder = new LinkedList<String>(); + List<String> featureOrder = new LinkedList<>(); featureOrder = UtilMisc.toList(featureSet); for (int i=0; i < featureOrder.size(); i++) { String featureKey = featureOrder.get(i); @@ -217,7 +217,7 @@ public class WebPosEvents { } Map<String, Object> imageMap = UtilGenerics.cast(variantTreeMap.get("variantSample")); if (UtilValidate.isNotEmpty(imageMap)) { - List<String> variantSampleList = new LinkedList<String>(); + List<String> variantSampleList = new LinkedList<>(); variantSampleList = UtilMisc.toList(imageMap.keySet()); request.setAttribute("variantSample", imageMap); request.setAttribute("variantSampleList", variantSampleList); Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java Sat May 25 23:42:00 2019 @@ -51,7 +51,7 @@ public class WebPosSearch { String goodIdentificationTypeId = (String) context.get("goodIdentificationTypeId"); Map<String, Object> result = ServiceUtil.returnSuccess(); - List<EntityCondition> andExprs = new LinkedList<EntityCondition>(); + List<EntityCondition> andExprs = new LinkedList<>(); EntityCondition mainCond = null; String entityName = "Product"; @@ -95,10 +95,10 @@ public class WebPosSearch { String shippingLocation = (String) context.get("shippingLocation"); Map<String, Object> result = ServiceUtil.returnSuccess(); - List<EntityCondition> andExprs = new LinkedList<EntityCondition>(); - List<EntityCondition> orExprs = new LinkedList<EntityCondition>(); + List<EntityCondition> andExprs = new LinkedList<>(); + List<EntityCondition> orExprs = new LinkedList<>(); EntityCondition mainCond = null; - List<String> orderBy = new LinkedList<String>(); + List<String> orderBy = new LinkedList<>(); // default view settings DynamicViewEntity dynamicView = new DynamicViewEntity(); Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java Sat May 25 23:42:00 2019 @@ -43,7 +43,7 @@ public class WebPosSession { public static final String module = WebPosSession.class.getName(); private String id = null; - private Map<String, Object> attributes = new HashMap<String, Object>(); + private Map<String, Object> attributes = new HashMap<>(); private GenericValue userLogin = null; private Locale locale = null; private String productStoreId = null; Modified: ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java?rev=1860025&r1=1860024&r2=1860025&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java Sat May 25 23:42:00 2019 @@ -418,7 +418,7 @@ public class WebPosTransaction { expYear = "20" + expYear; } - Map<String, Object> svcCtx = new HashMap<String, Object>(); + Map<String, Object> svcCtx = new HashMap<>(); svcCtx.put("userLogin", webPosSession.getUserLogin()); svcCtx.put("partyId", partyId); svcCtx.put("cardNumber", cardNumber); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |