[ofbiz-plugins] branch trunk updated: Improved: Corrected all checkstyle issues related to succeeding space for comma in plugins directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review.
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git The following commit(s) were added to refs/heads/trunk by this push: new 6f26494 Improved: Corrected all checkstyle issues related to succeeding space for comma in plugins directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review. 6f26494 is described below commit 6f264947c72da74fcc068849be2c34e49b3ce58e Author: Suraj Khurana <[hidden email]> AuthorDate: Thu Jul 9 12:02:54 2020 +0530 Improved: Corrected all checkstyle issues related to succeeding space for comma in plugins directory. (OFBIZ-11805) Thanks Jacques and Ritesh Kumar for review. --- .../org/apache/ofbiz/birt/flexible/BirtUtil.java | 4 +- .../org/apache/ofbiz/ebaystore/EbayEvents.java | 64 +++++----- .../java/org/apache/ofbiz/ebaystore/EbayStore.java | 140 ++++++++++----------- .../ofbiz/ebaystore/EbayStoreAutoPrefEvents.java | 2 +- .../ofbiz/ebaystore/EbayStoreAutoPreferences.java | 4 +- .../ofbiz/ebaystore/EbayStoreCategoryFacade.java | 30 ++--- .../apache/ofbiz/ebaystore/EbayStoreHelper.java | 20 +-- .../ebaystore/EbayStoreInventoryServices.java | 22 ++-- .../apache/ofbiz/ebaystore/EbayStoreOptions.java | 48 +++---- .../ofbiz/ebaystore/EbayStoreSiteFacade.java | 2 +- .../ofbiz/content/search/ProductDocument.java | 2 +- .../java/org/apache/ofbiz/scrum/ScrumEvents.java | 2 +- .../java/org/apache/ofbiz/scrum/ScrumServices.java | 2 +- .../java/org/apache/ofbiz/solr/CategoryUtil.java | 1 - 14 files changed, 171 insertions(+), 172 deletions(-) diff --git a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java index c1db5f5..d3bb482 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java @@ -48,7 +48,7 @@ public final class BirtUtil { "value", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, "email", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, "comment", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, - "id-long",DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, + "id-long", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, "id-vlong", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, "very-long", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, "indicator", DesignChoiceConstants.COLUMN_DATA_TYPE_STRING, @@ -77,7 +77,7 @@ public final class BirtUtil { "value", DesignChoiceConstants.PARAM_TYPE_STRING, "email", DesignChoiceConstants.PARAM_TYPE_STRING, "comment", DesignChoiceConstants.PARAM_TYPE_STRING, - "id-long",DesignChoiceConstants.PARAM_TYPE_STRING, + "id-long", DesignChoiceConstants.PARAM_TYPE_STRING, "id-vlong", DesignChoiceConstants.PARAM_TYPE_STRING, "very-long", DesignChoiceConstants.PARAM_TYPE_STRING, "indicator", DesignChoiceConstants.PARAM_TYPE_STRING, diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java index fe5c13a..db9a11d 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java @@ -152,7 +152,7 @@ public class EbayEvents { /* event to add products to prepare create & export listing */ public static String addProductListing(HttpServletRequest request, HttpServletResponse response) { Delegator delegator = (Delegator) request.getAttribute("delegator"); - Map<String,Object> requestParams = UtilHttp.getParameterMap(request); + Map<String, Object> requestParams = UtilHttp.getParameterMap(request); Locale locale = UtilHttp.getLocale(request); if (UtilValidate.isEmpty(requestParams.get("productStoreId"))) { @@ -178,8 +178,8 @@ public class EbayEvents { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); //String webSiteUrl = (String) requestParams.get("webSiteUrl"); String webSiteUrl = "https://demo-trunk.ofbiz.apache.org"; - Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); - List<Map<String,Object>> itemObjs = null; + Map<String, Object> addItemObject = getAddItemListingObject(request, apiContext); + List<Map<String, Object>> itemObjs = null; if (UtilValidate.isNotEmpty(addItemObject.get("itemListings"))) { itemObjs = UtilGenerics.checkList(addItemObject.get("itemListings")); } else { @@ -190,7 +190,7 @@ public class EbayEvents { try { // check add new product obj ? to export for (String productId : productIds) { - for (Map<String,Object> itObj : itemObjs) { + for (Map<String, Object> itObj : itemObjs) { if (UtilValidate.isNotEmpty(itObj.get(productId.concat("_Obj")))) { productIds.remove(productId); } @@ -245,8 +245,8 @@ public class EbayEvents { addItemCall.setItem(item); addItemCall.setWarningLevel(WarningLevelCodeType.HIGH); - Map<String,Object> itemListing = null; - for (Map<String,Object> itemObj : itemObjs) { + Map<String, Object> itemListing = null; + for (Map<String, Object> itemObj : itemObjs) { if (UtilValidate.isNotEmpty(itemObj.get(productId.concat("_Obj")))) { itemListing = UtilGenerics.checkMap(itemObj.get(productId.concat("_Obj"))); itemListing.put("addItemCall", addItemCall); @@ -324,7 +324,7 @@ public class EbayEvents { } else { siteFacade = (EbayStoreSiteFacade)session.getAttribute(siteFacadeName); } - Debug.logInfo("loaded session for ebay site Facade is ".concat(siteFacadeName).concat(session.getAttribute(siteFacadeName).toString()),MODULE); + Debug.logInfo("loaded session for ebay site Facade is ".concat(siteFacadeName).concat(session.getAttribute(siteFacadeName).toString()), MODULE); return siteFacade; } @@ -348,15 +348,15 @@ public class EbayEvents { public static void removeItemListingObject(HttpServletRequest request, ApiContext apiContext) { HttpSession session = request.getSession(true); String siteCode = apiContext.getSite().name(); - Map<String,Object> addItemObject = UtilGenerics.checkMap(session.getAttribute("itemListings_".concat(siteCode))); + Map<String, Object> addItemObject = UtilGenerics.checkMap(session.getAttribute("itemListings_".concat(siteCode))); if (UtilValidate.isNotEmpty(addItemObject)) { session.removeAttribute("itemListings_".concat(siteCode)); } } - public static Map<String,Object> getAddItemListingObject(HttpServletRequest request, ApiContext apiContext) { + public static Map<String, Object> getAddItemListingObject(HttpServletRequest request, ApiContext apiContext) { String siteCode = apiContext.getSite().name(); - Map<String,Object> addItemObject = UtilGenerics.checkMap(request.getAttribute("itemListings_".concat(siteCode))); + Map<String, Object> addItemObject = UtilGenerics.checkMap(request.getAttribute("itemListings_".concat(siteCode))); HttpSession session = request.getSession(true); if (addItemObject == null) { addItemObject = UtilGenerics.checkMap(session.getAttribute("itemListings_".concat(siteCode))); @@ -517,7 +517,7 @@ public class EbayEvents { } public static String setSelectedEbayCategory(HttpServletRequest request, HttpServletResponse response) { - Map<String,Object> requestParams = UtilHttp.getParameterMap(request); + Map<String, Object> requestParams = UtilHttp.getParameterMap(request); Delegator delegator = (Delegator) request.getAttribute("delegator"); if (UtilValidate.isEmpty(requestParams.get("productStoreId"))) { request.setAttribute("_ERROR_MESSAGE_","Required productStoreId."); @@ -546,11 +546,11 @@ public class EbayEvents { try { if (UtilValidate.isNotEmpty(EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne())) { ApiContext apiContext = getApiContext(request); - Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); - List<Map<String,Object>> addItemlist = UtilGenerics.checkList(addItemObject.get("itemListing")); + Map<String, Object> addItemObject = getAddItemListingObject(request, apiContext); + List<Map<String, Object>> addItemlist = UtilGenerics.checkList(addItemObject.get("itemListing")); if (UtilValidate.isNotEmpty(addItemlist)) { - for (Map<String,Object> addItemCall : addItemlist) { + for (Map<String, Object> addItemCall : addItemlist) { AddItemCall itemCall = (AddItemCall) addItemCall.get("addItemCall"); ItemType item = itemCall.getItem(); if (productId.equals(item.getSKU())) { @@ -619,7 +619,7 @@ public class EbayEvents { Delegator delegator = (Delegator) request.getAttribute("delegator"); HttpSession session = request.getSession(true); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); - Map<String,Object> requestParams = UtilHttp.getParameterMap(request); + Map<String, Object> requestParams = UtilHttp.getParameterMap(request); Locale locale = UtilHttp.getLocale(request); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); Map<String, Object> attributeMapList = new HashMap<>(); @@ -676,15 +676,15 @@ public class EbayEvents { try { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); - Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); - List<Map<String,Object>> listAddItem = null; + Map<String, Object> addItemObject = getAddItemListingObject(request, apiContext); + List<Map<String, Object>> listAddItem = null; if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) { listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing")); } else { listAddItem = new LinkedList<>(); } - for (Map<String,Object> itemObj : listAddItem) { + for (Map<String, Object> itemObj : listAddItem) { AddItemCall addItemCall = (AddItemCall) itemObj.get("addItemCall"); ItemType item = addItemCall.getItem(); String SKU = item.getSKU(); @@ -876,7 +876,7 @@ public class EbayEvents { int intAtp = atp.intValue(); if ((facilityId != "") && (intAtp != 0)) { int newAtp = intAtp - 1; - Map<String,Object> inMap = new HashMap<>(); + Map<String, Object> inMap = new HashMap<>(); inMap.put("productStoreId", productStoreId); inMap.put("facilityId", facilityId); inMap.put("productId", productId); @@ -998,7 +998,7 @@ public class EbayEvents { public static String verifyItemBeforeAddAndExportToEbay(HttpServletRequest request, HttpServletResponse response) { Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); - Map<String,Object> requestParams = UtilHttp.getParameterMap(request); + Map<String, Object> requestParams = UtilHttp.getParameterMap(request); Locale locale = UtilHttp.getLocale(request); String productStoreId = (String) requestParams.get("productStoreId"); HttpSession session = request.getSession(true); @@ -1012,15 +1012,15 @@ public class EbayEvents { VerifyAddItemCall verifyCall = new VerifyAddItemCall(apiContext); - Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); - List<Map<String,Object>> listAddItem = null; + Map<String, Object> addItemObject = getAddItemListingObject(request, apiContext); + List<Map<String, Object>> listAddItem = null; if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) { listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing")); } else { listAddItem = new LinkedList<>(); } double feesummary = 0.0; - for (Map<String,Object> itemObj : listAddItem) { + for (Map<String, Object> itemObj : listAddItem) { AddItemCall addItemCall = (AddItemCall) itemObj.get("addItemCall"); ItemType item = addItemCall.getItem(); String SKU = item.getSKU(); @@ -1062,20 +1062,20 @@ public class EbayEvents { public static String removeProductFromListing(HttpServletRequest request, HttpServletResponse response) { Delegator delegator = (Delegator) request.getAttribute("delegator"); - Map<String,Object> requestParams = UtilHttp.getParameterMap(request); + Map<String, Object> requestParams = UtilHttp.getParameterMap(request); Locale locale = UtilHttp.getLocale(request); String productStoreId = (String) requestParams.get("productStoreId"); try { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); - Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); - List<Map<String,Object>> listAddItem = null; + Map<String, Object> addItemObject = getAddItemListingObject(request, apiContext); + List<Map<String, Object>> listAddItem = null; if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) { listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing")); } else { listAddItem = new LinkedList<>(); } int i = 0; - for (Map<String,Object> itemObj : listAddItem) { + for (Map<String, Object> itemObj : listAddItem) { AddItemCall addItemCall = (AddItemCall) itemObj.get("addItemCall"); ItemType item = addItemCall.getItem(); String SKU = item.getSKU(); @@ -1102,21 +1102,21 @@ public class EbayEvents { public static String exportListingToEbay(HttpServletRequest request, HttpServletResponse response) { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Delegator delegator = (Delegator) request.getAttribute("delegator"); - Map<String,Object> requestParams = UtilHttp.getParameterMap(request); + Map<String, Object> requestParams = UtilHttp.getParameterMap(request); Locale locale = UtilHttp.getLocale(request); String productStoreId = (String) requestParams.get("productStoreId"); HttpSession session = request.getSession(true); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); try { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); - Map<String,Object> addItemObject = getAddItemListingObject(request, apiContext); - List<Map<String,Object>> listAddItem = null; + Map<String, Object> addItemObject = getAddItemListingObject(request, apiContext); + List<Map<String, Object>> listAddItem = null; if (UtilValidate.isNotEmpty(addItemObject.get("itemListing"))) { listAddItem = UtilGenerics.checkList(addItemObject.get("itemListing")); } else { listAddItem = new LinkedList<>(); } - for (Map<String,Object> itemObj : listAddItem) { + for (Map<String, Object> itemObj : listAddItem) { updateQuantityInventoryProduct(itemObj, productStoreId, locale, delegator, dispatcher, userLogin); Map<String, Object> result = dispatcher.runSync("exportProductEachItem", UtilMisc.toMap("itemObject", itemObj)); if (ServiceUtil.isError(result)) { @@ -1185,7 +1185,7 @@ public class EbayEvents { public static Map<String, Map<String, List<String>>> categorySpecifics(String categoryId, HttpServletRequest request) { Map<String, Map<String, List<String>>> recommendationMap = new HashMap<>(); Delegator delegator = (Delegator) request.getAttribute("delegator"); - Map<String,Object> requestParams = UtilHttp.getParameterMap(request); + Map<String, Object> requestParams = UtilHttp.getParameterMap(request); Locale locale = UtilHttp.getLocale(request); String productStoreId = (String) requestParams.get("productStoreId"); diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java index 84c5308..c5d2880 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java @@ -217,7 +217,7 @@ public class EbayStore { return outputBuilder.toString(); } /* add/update/delete categories and child into your ebay store category */ - public static Map<String,Object> exportCategoriesSelectedToEbayStore(DispatchContext dctx, Map<String,? extends Object> context) { + public static Map<String, Object> exportCategoriesSelectedToEbayStore(DispatchContext dctx, Map<String,? extends Object> context) { Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); Map<String, Object> result = new HashMap<>(); @@ -385,7 +385,7 @@ public class EbayStore { return storeCustomCategoryTypeArry; } public static Map<String, Object> excuteExportCategoryToEbayStore(SetStoreCategoriesCall call, SetStoreCategoriesRequestType req, - StoreCategoryUpdateActionCodeType actionCode, Delegator delegator, String partyId,List<GenericValue> catalogCategories, Locale locale) { + StoreCategoryUpdateActionCodeType actionCode, Delegator delegator, String partyId, List<GenericValue> catalogCategories, Locale locale) { Map<String, Object> result = new HashMap<>(); SetStoreCategoriesResponseType resp = null; try { @@ -612,11 +612,11 @@ public class EbayStore { /*Editing the Store Settings */ /* Get store output */ - public static Map<String,Object> getEbayStoreOutput(DispatchContext dctx, Map<String,Object> context) { + public static Map<String, Object> getEbayStoreOutput(DispatchContext dctx, Map<String, Object> context) { Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); Delegator delegator = dctx.getDelegator(); - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); StoreType returnedStoreType = null; GetStoreRequestType req = new GetStoreRequestType(); GetStoreResponseType resp = null; @@ -651,7 +651,7 @@ public class EbayStore { //result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "EbayStoreLoadSuccess", locale)); // update product store in ofbiz updateProductStore(dctx, context, returnedStoreType, (String) context.get("productStoreId")); - Map<String,Object> ebayResp = new HashMap<>(); + Map<String, Object> ebayResp = new HashMap<>(); ebayResp.put("storeName", returnedStoreType.getName()); ebayResp.put("storeUrl", returnedStoreType.getURL()); ebayResp.put("storeUrlPath", returnedStoreType.getURLPath()); @@ -684,9 +684,9 @@ public class EbayStore { if (fontType != null) {// basic & advance theme String themeId = themeType.getThemeID().toString().concat("-").concat(colorSchemeType.getColorSchemeID().toString()); context.put("themeId", themeId); - Map<String,Object> results = retrieveThemeColorSchemeByThemeId(dctx, context); + Map<String, Object> results = retrieveThemeColorSchemeByThemeId(dctx, context); if (results != null) { - Map<String,Object> storeFontScheme = UtilGenerics.checkMap(results.get("storeFontScheme")); + Map<String, Object> storeFontScheme = UtilGenerics.checkMap(results.get("storeFontScheme")); if (storeFontScheme != null) { ebayResp.put("storeDescFontFace", storeFontScheme.get("storeFontTypeFontDescValue")); ebayResp.put("storeDescSizeCode", storeFontScheme.get("storeDescSizeValue")); @@ -704,10 +704,10 @@ public class EbayStore { ebayResp.put("storeHeaderStyle", storeHeaderStyleCodeType.value()); StoreHeaderStyleCodeType[] storeHeaderStyleCodeList = StoreHeaderStyleCodeType.values(); if (storeHeaderStyleCodeList != null) { - List<Map<String,Object>> storeHeaderStyleList = new LinkedList<>(); + List<Map<String, Object>> storeHeaderStyleList = new LinkedList<>(); int i=0; while (i<storeHeaderStyleCodeList.length) { - Map<String,Object> storeHeaderStyleMap = new HashMap<>(); + Map<String, Object> storeHeaderStyleMap = new HashMap<>(); StoreHeaderStyleCodeType storeHeaderStyleCode = storeHeaderStyleCodeList[i]; storeHeaderStyleMap.put("storeHeaderStyleName", storeHeaderStyleCode.name()); storeHeaderStyleMap.put("storeHeaderStyleValue", storeHeaderStyleCode.value()); @@ -723,10 +723,10 @@ public class EbayStore { ebayResp.put("storeItemLayoutSelected", storeItemListLayoutCodeType.value()); StoreItemListLayoutCodeType[] storeItemListLayoutCodeTypeList = StoreItemListLayoutCodeType.values(); if (storeItemListLayoutCodeTypeList != null) { - List<Map<String,Object>> storeItemListLayoutCodeList = new LinkedList<>(); + List<Map<String, Object>> storeItemListLayoutCodeList = new LinkedList<>(); int i = 0; while (i < storeItemListLayoutCodeTypeList.length) { - Map<String,Object> storeItemListLayoutCodeMap = new HashMap<>(); + Map<String, Object> storeItemListLayoutCodeMap = new HashMap<>(); StoreItemListLayoutCodeType storeItemListLayoutCode = storeItemListLayoutCodeTypeList[i]; storeItemListLayoutCodeMap.put("storeItemLayoutName", storeItemListLayoutCode.name()); storeItemListLayoutCodeMap.put("storeItemLayoutValue", storeItemListLayoutCode.value()); @@ -739,10 +739,10 @@ public class EbayStore { ebayResp.put("storeItemSortOrderSelected", storeItemListSortOrderCodeType.value()); StoreItemListSortOrderCodeType[] storeItemListSortOrderCodeTypeList = StoreItemListSortOrderCodeType.values(); if (storeItemListSortOrderCodeTypeList != null) { - List<Map<String,Object>> storeItemSortOrderCodeList = new LinkedList<>(); + List<Map<String, Object>> storeItemSortOrderCodeList = new LinkedList<>(); int i = 0; while (i < storeItemListSortOrderCodeTypeList.length) { - Map<String,Object> storeItemSortOrderCodeMap = new HashMap<>(); + Map<String, Object> storeItemSortOrderCodeMap = new HashMap<>(); StoreItemListSortOrderCodeType storeItemListLayoutCode = storeItemListSortOrderCodeTypeList[i]; storeItemSortOrderCodeMap.put("storeItemSortLayoutName", storeItemListLayoutCode.name()); storeItemSortOrderCodeMap.put("storeItemSortLayoutValue", storeItemListLayoutCode.value()); @@ -757,10 +757,10 @@ public class EbayStore { ebayResp.put("storeCustomHeaderLayout", storeCustomHeaderLayoutCodeType.value()); StoreCustomHeaderLayoutCodeType[] storeCustomHeaderLayoutCodeTypeList = StoreCustomHeaderLayoutCodeType.values(); if (storeCustomHeaderLayoutCodeTypeList != null) { - List<Map<String,Object>> storeCustomHeaderLayoutList = new LinkedList<>(); + List<Map<String, Object>> storeCustomHeaderLayoutList = new LinkedList<>(); int i = 0; while (i < storeCustomHeaderLayoutCodeTypeList.length) { - Map<String,Object> storeCustomHeaderLayoutMap = new HashMap<>(); + Map<String, Object> storeCustomHeaderLayoutMap = new HashMap<>(); StoreCustomHeaderLayoutCodeType StoreCustomHeaderLayoutCode = storeCustomHeaderLayoutCodeTypeList[i]; storeCustomHeaderLayoutMap.put("storeCustomHeaderLayoutName", StoreCustomHeaderLayoutCode.name()); storeCustomHeaderLayoutMap.put("storeCustomHeaderLayoutValue", StoreCustomHeaderLayoutCode.value()); @@ -782,10 +782,10 @@ public class EbayStore { ebayResp.put("storeCustomListingHeaderDisplayValue", storeCustomListingHeaderDisplayCodeType.value()); StoreCustomListingHeaderDisplayCodeType[] storeCustomListingHeaderDisplayCodeTypeList = StoreCustomListingHeaderDisplayCodeType.values(); if (storeCustomListingHeaderDisplayCodeTypeList != null) { - List<Map<String,Object>> storeCustomListingHeaderDisplayCodeList = new LinkedList<>(); + List<Map<String, Object>> storeCustomListingHeaderDisplayCodeList = new LinkedList<>(); int i = 0; while (i < storeCustomListingHeaderDisplayCodeTypeList.length) { - Map<String,Object> storeCustomListingHeaderDisplayCodeMap = new HashMap<>(); + Map<String, Object> storeCustomListingHeaderDisplayCodeMap = new HashMap<>(); StoreCustomListingHeaderDisplayCodeType storeCustomListingHeaderDisplayCode = storeCustomListingHeaderDisplayCodeTypeList[i]; storeCustomListingHeaderDisplayCodeMap.put("storeCustomHeaderLayoutName", storeCustomListingHeaderDisplayCode.name()); storeCustomListingHeaderDisplayCodeMap.put("storeCustomHeaderLayoutValue", storeCustomListingHeaderDisplayCode.value()); @@ -801,10 +801,10 @@ public class EbayStore { ebayResp.put("storeMerchDisplay", merchDisplayCodeType.value()); MerchDisplayCodeType[] merchDisplayCodeTypeList = MerchDisplayCodeType.values(); if (merchDisplayCodeTypeList != null) { - List<Map<String,Object>> merchDisplayCodeList = new LinkedList<>(); + List<Map<String, Object>> merchDisplayCodeList = new LinkedList<>(); int i = 0; while (i < merchDisplayCodeTypeList.length) { - Map<String,Object> merchDisplayCodeMap = new HashMap<>(); + Map<String, Object> merchDisplayCodeMap = new HashMap<>(); MerchDisplayCodeType merchDisplayCode = merchDisplayCodeTypeList[i]; merchDisplayCodeMap.put("merchDisplayCodeName", merchDisplayCode.name()); merchDisplayCodeMap.put("merchDisplayCodeValue", merchDisplayCode.value()); @@ -820,10 +820,10 @@ public class EbayStore { returnedStoreType.getSubscriptionLevel(); StoreSubscriptionLevelCodeType[] storeSubscriptionlevelList = StoreSubscriptionLevelCodeType.values(); if (storeSubscriptionlevelList != null) { - List<Map<String,Object>> storeSubscriptionLevelCodeList = new LinkedList<>(); + List<Map<String, Object>> storeSubscriptionLevelCodeList = new LinkedList<>(); int i = 0; while (i < storeSubscriptionlevelList.length) { - Map<String,Object> storeSubscriptionLevelCodeMap = new HashMap<>(); + Map<String, Object> storeSubscriptionLevelCodeMap = new HashMap<>(); StoreSubscriptionLevelCodeType storeSubscriptionLevelCode= storeSubscriptionlevelList[i]; storeSubscriptionLevelCodeMap.put("storeSubscriptionLevelCodeName", storeSubscriptionLevelCode.name()); storeSubscriptionLevelCodeMap.put("storeSubscriptionLevelCodeValue", storeSubscriptionLevelCode.value()); @@ -850,10 +850,10 @@ public class EbayStore { return result; } - public static void updateProductStore(DispatchContext dctx, Map<String,Object> context, StoreType returnStoreType, String productStoreId) { + public static void updateProductStore(DispatchContext dctx, Map<String, Object> context, StoreType returnStoreType, String productStoreId) { LocalDispatcher dispatcher = dctx.getDispatcher(); try { - Map<String,Object> inMap = new HashMap<>(); + Map<String, Object> inMap = new HashMap<>(); if (returnStoreType != null) { inMap.put("productStoreId", productStoreId); inMap.put("storeName", returnStoreType.getName()); @@ -870,11 +870,11 @@ public class EbayStore { } } - public static Map<String,Object> retrieveThemeColorSchemeByThemeId(DispatchContext dctx, Map<String,Object> context) { + public static Map<String, Object> retrieveThemeColorSchemeByThemeId(DispatchContext dctx, Map<String, Object> context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); GetStoreOptionsRequestType req = null; GetStoreOptionsResponseType resp = null; StoreThemeArrayType returnedBasicThemeArray = null; @@ -894,16 +894,16 @@ public class EbayStore { int i = 0; String colorSchemeId = themeId.substring(themeId.indexOf("-") + 1); - themeId = themeId.substring(0,themeId.indexOf("-")); + themeId = themeId.substring(0, themeId.indexOf("-")); - Map<String,Object> storeColorSchemeMap = null; + Map<String, Object> storeColorSchemeMap = null; while (i < storeBasicTheme.length) { StoreThemeType storeThemeType = storeBasicTheme[i]; if (themeId.equals(storeThemeType.getThemeID().toString())) { StoreColorSchemeType colorSchemeType = storeThemeType.getColorScheme(); if (colorSchemeType != null) { if (colorSchemeId.equals(colorSchemeType.getColorSchemeID().toString())) { - // get font,size and color + // get font, size and color storeColorSchemeMap = new HashMap<>(); StoreFontType storeFontType = colorSchemeType.getFont(); storeColorSchemeMap.put("storeFontTypeFontFaceValue", storeFontType.getNameFace().value()); @@ -935,9 +935,9 @@ public class EbayStore { return result; } - public static Map<String,Object> retrievePredesignedLogoOption(DispatchContext dctx, Map<String,Object> context) { + public static Map<String, Object> retrievePredesignedLogoOption(DispatchContext dctx, Map<String, Object> context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); GetStoreOptionsRequestType req = null; @@ -954,9 +954,9 @@ public class EbayStore { returnedLogoArray = resp.getLogoArray(); int i = 0; - List<Map<String,Object>> logoList = new LinkedList<>(); + List<Map<String, Object>> logoList = new LinkedList<>(); while (i < returnedLogoArray.getLogoLength()) { - Map<String,Object> logo = new HashMap<>(); + Map<String, Object> logo = new HashMap<>(); StoreLogoType storeLogoType = returnedLogoArray.getLogo(i); logo.put("storeLogoId", storeLogoType.getLogoID()); logo.put("storeLogoName", storeLogoType.getName()); @@ -980,8 +980,8 @@ public class EbayStore { } return result; } - public static Map<String,Object> retrieveBasicThemeArray(DispatchContext dctx, Map<String,Object> context) { - Map<String,Object> result = new HashMap<>(); + public static Map<String, Object> retrieveBasicThemeArray(DispatchContext dctx, Map<String, Object> context) { + Map<String, Object> result = new HashMap<>(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -999,16 +999,16 @@ public class EbayStore { if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { returnedBasicThemeArray = resp.getBasicThemeArray(); int i = 0; - List<Map<String,Object>> themeList = new LinkedList<>(); + List<Map<String, Object>> themeList = new LinkedList<>(); while (i < returnedBasicThemeArray.getThemeLength()) { - Map<String,Object> basictheme = new HashMap<>(); + Map<String, Object> basictheme = new HashMap<>(); StoreThemeType storeBasicThemeType = returnedBasicThemeArray.getTheme(i); basictheme.put("storeThemeId", storeBasicThemeType.getThemeID()); basictheme.put("storeThemeName", storeBasicThemeType.getName()); StoreColorSchemeType storeColorSchemeType = storeBasicThemeType.getColorScheme(); - basictheme.put("storeColorSchemeId",storeColorSchemeType.getColorSchemeID()); - basictheme.put("storeColorSchemeName",storeColorSchemeType.getName()); + basictheme.put("storeColorSchemeId", storeColorSchemeType.getColorSchemeID()); + basictheme.put("storeColorSchemeName", storeColorSchemeType.getName()); if (storeFontColorSchemeType == null) { storeFontColorSchemeType = storeBasicThemeType.getColorScheme(); @@ -1032,8 +1032,8 @@ public class EbayStore { return result; } - public static Map<String,Object> retrieveAdvancedThemeArray(DispatchContext dctx, Map<String,Object> context) { - Map<String,Object> result = new HashMap<>(); + public static Map<String, Object> retrieveAdvancedThemeArray(DispatchContext dctx, Map<String, Object> context) { + Map<String, Object> result = new HashMap<>(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -1053,21 +1053,21 @@ public class EbayStore { returnedAdvancedThemeArray = resp.getAdvancedThemeArray(); int i = 0; - List<Map<String,Object>> themeList = new LinkedList<>(); + List<Map<String, Object>> themeList = new LinkedList<>(); while (i < returnedAdvancedThemeArray.getThemeLength()) { - Map<String,Object> advanceTheme = new HashMap<>(); + Map<String, Object> advanceTheme = new HashMap<>(); StoreThemeType storeThemeType = returnedAdvancedThemeArray.getTheme(i); - advanceTheme.put("storeThemeId",storeThemeType.getThemeID()); - advanceTheme.put("storeThemeName",storeThemeType.getName()); + advanceTheme.put("storeThemeId", storeThemeType.getThemeID()); + advanceTheme.put("storeThemeName", storeThemeType.getName()); themeList.add(advanceTheme); i++; } result.put("storeThemeList", themeList); int j = 0; StoreColorSchemeType[] storeColorSchemeTypes = returnedAdvancedThemeArray.getGenericColorSchemeArray().getColorScheme(); - List<Map<String,Object>> themeColorList = new LinkedList<>(); + List<Map<String, Object>> themeColorList = new LinkedList<>(); while (j < storeColorSchemeTypes.length) { - Map<String,Object> advanceColorTheme = new HashMap<>(); + Map<String, Object> advanceColorTheme = new HashMap<>(); StoreColorSchemeType storeColorSchemeType = storeColorSchemeTypes[j]; advanceColorTheme.put("storeColorSchemeId", storeColorSchemeType.getColorSchemeID()); advanceColorTheme.put("storeColorName", storeColorSchemeType.getName()); @@ -1090,8 +1090,8 @@ public class EbayStore { return result; } - public static Map<String,Object> retrieveStoreFontTheme(DispatchContext dctx, Map<String,Object> context) { - Map<String,Object> result = new HashMap<>(); + public static Map<String, Object> retrieveStoreFontTheme(DispatchContext dctx, Map<String, Object> context) { + Map<String, Object> result = new HashMap<>(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -1105,7 +1105,7 @@ public class EbayStore { resp = (GetStoreOptionsResponseType) call.execute(req); - Map<String,Object> advanceFontTheme = new HashMap<>(); + Map<String, Object> advanceFontTheme = new HashMap<>(); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { returnedThemeArray = resp.getAdvancedThemeArray(); int i = 0; @@ -1114,13 +1114,13 @@ public class EbayStore { StoreColorSchemeType storeColorSchemeType = storeColorSchemeTypes[i]; StoreFontType storeFontType = storeColorSchemeType.getFont(); - advanceFontTheme.put("storeFontTypeNameFaceColor",storeFontType.getNameColor()); + advanceFontTheme.put("storeFontTypeNameFaceColor", storeFontType.getNameColor()); int j = 0; storeFontType.getNameFace(); StoreFontFaceCodeType[] storeFontNameFaceCodeTypes = StoreFontFaceCodeType.values(); - List<Map<String,Object>> nameFaces = new LinkedList<>(); + List<Map<String, Object>> nameFaces = new LinkedList<>(); while (j < storeFontNameFaceCodeTypes.length) { - Map<String,Object> storeFontNameFaceCodeTypeMap = new HashMap<>(); + Map<String, Object> storeFontNameFaceCodeTypeMap = new HashMap<>(); StoreFontFaceCodeType storeFontNameFaceCodeType = storeFontNameFaceCodeTypes[j]; storeFontNameFaceCodeTypeMap.put("storeFontValue", storeFontNameFaceCodeType.value()); storeFontNameFaceCodeTypeMap.put("storeFontName", storeFontNameFaceCodeType.name()); @@ -1131,9 +1131,9 @@ public class EbayStore { j = 0; storeFontType.getNameSize(); StoreFontSizeCodeType[] storeFontSizeCodeTypes = StoreFontSizeCodeType.values(); - List<Map<String,Object>> sizeFaces = new LinkedList<>(); + List<Map<String, Object>> sizeFaces = new LinkedList<>(); while (j < storeFontSizeCodeTypes.length) { - Map<String,Object> storeFontSizeCodeTypeMap = new HashMap<>(); + Map<String, Object> storeFontSizeCodeTypeMap = new HashMap<>(); StoreFontSizeCodeType storeFontSizeCodeType = storeFontSizeCodeTypes[j]; storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value()); storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name()); @@ -1146,39 +1146,39 @@ public class EbayStore { j = 0; storeFontType.getTitleFace(); StoreFontFaceCodeType[] storeFontTypeTitleFaces = StoreFontFaceCodeType.values(); - List<Map<String,Object>> titleFaces = new LinkedList<>(); + List<Map<String, Object>> titleFaces = new LinkedList<>(); while (j < storeFontTypeTitleFaces.length) { - Map<String,Object> storeFontTypeTitleFaceMap = new HashMap<>(); + Map<String, Object> storeFontTypeTitleFaceMap = new HashMap<>(); StoreFontFaceCodeType storeFontTypeTitleFace = storeFontTypeTitleFaces[j]; storeFontTypeTitleFaceMap.put("storeFontValue", storeFontTypeTitleFace.value()); storeFontTypeTitleFaceMap.put("storeFontName", storeFontTypeTitleFace.name()); titleFaces.add(storeFontTypeTitleFaceMap); j++; } - advanceFontTheme.put("storeFontTypeFontTitleList",titleFaces); + advanceFontTheme.put("storeFontTypeFontTitleList", titleFaces); j = 0; storeFontType.getTitleSize(); StoreFontSizeCodeType[] storeTitleSizeCodeTypes = StoreFontSizeCodeType.values(); - List<Map<String,Object>> titleSizes = new LinkedList<>(); + List<Map<String, Object>> titleSizes = new LinkedList<>(); while (j < storeTitleSizeCodeTypes.length) { - Map<String,Object> storeFontSizeCodeTypeMap = new HashMap<>(); + Map<String, Object> storeFontSizeCodeTypeMap = new HashMap<>(); StoreFontSizeCodeType storeFontSizeCodeType = storeTitleSizeCodeTypes[j]; storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value()); storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name()); titleSizes.add(storeFontSizeCodeTypeMap); j++; } - advanceFontTheme.put("storeFontSizeTitleList",titleSizes); + advanceFontTheme.put("storeFontSizeTitleList", titleSizes); advanceFontTheme.put("storeFontTypeDescColor", storeFontType.getDescColor()); j = 0; storeFontType.getDescFace(); StoreFontFaceCodeType[] storeFontTypeDescFaces = StoreFontFaceCodeType.values(); - List<Map<String,Object>> descFaces = new LinkedList<>(); + List<Map<String, Object>> descFaces = new LinkedList<>(); while (j < storeFontTypeDescFaces.length) { - Map<String,Object> storeFontTypeDescFaceMap = new HashMap<>(); + Map<String, Object> storeFontTypeDescFaceMap = new HashMap<>(); StoreFontFaceCodeType storeFontTypeDescFace = storeFontTypeDescFaces[j]; storeFontTypeDescFaceMap.put("storeFontValue", storeFontTypeDescFace.value()); storeFontTypeDescFaceMap.put("storeFontName", storeFontTypeDescFace.name()); @@ -1190,9 +1190,9 @@ public class EbayStore { j = 0; storeFontType.getDescSize(); StoreFontSizeCodeType[] storeDescSizeCodeTypes = StoreFontSizeCodeType.values(); - List<Map<String,Object>> descSizes = new LinkedList<>(); + List<Map<String, Object>> descSizes = new LinkedList<>(); while (j < storeDescSizeCodeTypes.length) { - Map<String,Object> storeFontSizeCodeTypeMap = new HashMap<>(); + Map<String, Object> storeFontSizeCodeTypeMap = new HashMap<>(); StoreFontSizeCodeType storeFontSizeCodeType = storeDescSizeCodeTypes[j]; storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value()); storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name()); @@ -1218,8 +1218,8 @@ public class EbayStore { return result; } - public static Map<String,Object> setEbayStoreInput(DispatchContext dctx, Map<String,Object> context) { - Map<String,Object> result = new HashMap<>(); + public static Map<String, Object> setEbayStoreInput(DispatchContext dctx, Map<String, Object> context) { + Map<String, Object> result = new HashMap<>(); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); SetStoreRequestType req = null; @@ -1317,7 +1317,7 @@ public class EbayStore { result = ServiceUtil.returnError(resp.getMessage()); } LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String,Object> results = dispatcher.runSync("getEbayStoreOutput",UtilMisc.toMap("productStoreId", (String) context.get("productStoreId"),"userLogin", context.get("userLogin"))); + Map<String, Object> results = dispatcher.runSync("getEbayStoreOutput", UtilMisc.toMap("productStoreId", (String) context.get("productStoreId"),"userLogin", context.get("userLogin"))); if (ServiceUtil.isError(results)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(results)); } @@ -1533,7 +1533,7 @@ public class EbayStore { } public static Map<String, Object> exportProductsFromEbayStore(DispatchContext dctx, Map<String, Object> context) { - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map<String, Object> eBayConfigResult = EbayHelper.buildEbayConfig(context, delegator); @@ -1636,7 +1636,7 @@ public class EbayStore { if (UtilValidate.isNotEmpty(ProductsExportToEbay.getProductExportSuccessMessageList())) { if ((facilityId != "") && (intAtp != 0)) { int newAtp = intAtp - 1; - Map<String,Object> inMap = new HashMap<>(); + Map<String, Object> inMap = new HashMap<>(); inMap.put("productStoreId", context.get("productStoreId").toString()); inMap.put("facilityId", facilityId); inMap.put("productId", context.get("productId")); @@ -2351,7 +2351,7 @@ public class EbayStore { } return result; } - public static Map<String ,Object> getClosedItem(ItemType tempItems) { + public static Map<String , Object> getClosedItem(ItemType tempItems) { Map <String, Object> result = new HashMap<>(); if (UtilValidate.isNotEmpty(tempItems)) { double hitCount = 0; diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java index 4472477..2aeac7e 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java @@ -103,7 +103,7 @@ public class EbayStoreAutoPrefEvents{ Map<String, Object> result = dispatcher.runSync("ebayBestOfferPrefCond", bestOfferCondition); if (ServiceUtil.isError(result)) { request.setAttribute("_ERROR_MESSAGE_", ServiceUtil.getErrorMessage(result)); - Debug.log( ServiceUtil.getErrorMessage(result),MODULE); + Debug.log( ServiceUtil.getErrorMessage(result), MODULE); return "error"; } } catch (GenericServiceException e) { diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java index d710592..f4a1e0e 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java @@ -1068,11 +1068,11 @@ public class EbayStoreAutoPreferences { return result; } - public static Map<String,Object> autoBlockItemsOutOfStock(DispatchContext dctx, Map<String,Object> context) { + public static Map<String, Object> autoBlockItemsOutOfStock(DispatchContext dctx, Map<String, Object> context) { Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); Delegator delegator = dctx.getDelegator(); - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); GetSellingManagerInventoryRequestType req = new GetSellingManagerInventoryRequestType(); GetSellingManagerInventoryResponseType resp = null; diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java index 6e758ad..8a2cbff 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java @@ -64,13 +64,13 @@ public class EbayStoreCategoryFacade { private AttributeSet[] joinedAttrSets = null; private ItemSpecificsEnabledCodeType itemSpecificEnabled = null; private Boolean retPolicyEnabled = null; - private Map<Integer,String[]> listingDurationMap = null; - private Map<String,Integer> listingDurationReferenceMap = null; + private Map<Integer, String[]> listingDurationMap = null; + private Map<String, Integer> listingDurationReferenceMap = null; private BuyerPaymentMethodCodeType[] paymentMethods = null; private NameRecommendationType[] nameRecommendationTypes = null; private StoreOwnerExtendedListingDurationsType storeOwnerExtendedListingDuration = null; private BestOfferEnabledDefinitionType bestOfferEnabled = null; - private List<Map<String,Object>> adItemTemplates = null; + private List<Map<String, Object>> adItemTemplates = null; public EbayStoreCategoryFacade(String catId, ApiContext apiContext, IAttributesMaster attrMaster, EbayStoreSiteFacade siteFacade) throws SdkException, Exception { this.catId = catId; @@ -178,7 +178,7 @@ public class EbayStoreCategoryFacade { * @return generic Object * @throws Exception */ - private Object getInheritProperty(String catId,String methodName, + private Object getInheritProperty(String catId, String methodName, Map<String, CategoryType> categoriesCacheMap, Map<String, CategoryFeatureType> cfsMap) throws Exception { if (cfsMap.containsKey(catId)) { CategoryFeatureType cf = cfsMap.get(catId); @@ -218,10 +218,10 @@ public class EbayStoreCategoryFacade { return null; } - public List<Map<String,Object>> syncAdItemTemplates() throws ApiException, SdkSoapException, SdkException { + public List<Map<String, Object>> syncAdItemTemplates() throws ApiException, SdkSoapException, SdkException { GetDescriptionTemplatesRequestType req = null; GetDescriptionTemplatesResponseType resp = null; - List<Map<String,Object>> temGroupList = new LinkedList<>(); + List<Map<String, Object>> temGroupList = new LinkedList<>(); GetDescriptionTemplatesCall call = new GetDescriptionTemplatesCall(this.apiContext); req = new GetDescriptionTemplatesRequestType(); @@ -231,17 +231,17 @@ public class EbayStoreCategoryFacade { DescriptionTemplateType[] descriptionTemplateTypeList = resp.getDescriptionTemplate(); Debug.logInfo("layout of category "+ this.catId +":"+ resp.getLayoutTotal(), MODULE); for (DescriptionTemplateType descTemplateType : descriptionTemplateTypeList) { - List<Map<String,Object>> templateList = null; - Map<String,Object> templateGroup = null; + List<Map<String, Object>> templateList = null; + Map<String, Object> templateGroup = null; if ("THEME".equals(String.valueOf(descTemplateType.getType()))) { - Map<String,Object> template = new HashMap<>(); + Map<String, Object> template = new HashMap<>(); template.put("TemplateId", String.valueOf(descTemplateType.getID())); template.put("TemplateImageURL", descTemplateType.getImageURL()); template.put("TemplateName", descTemplateType.getName()); template.put("TemplateType", descTemplateType.getType()); // check group template by groupId - for (Map<String,Object> temGroup : temGroupList) { + for (Map<String, Object> temGroup : temGroupList) { if (temGroup.get("TemplateGroupId").equals(descTemplateType.getGroupID().toString())) { templateGroup = temGroup; break; @@ -265,7 +265,7 @@ public class EbayStoreCategoryFacade { } ThemeGroupType[] themes = resp.getThemeGroup(); if (themes != null && temGroupList != null) { - for (Map<String,Object> temGroup : temGroupList) { + for (Map<String, Object> temGroup : temGroupList) { for (ThemeGroupType theme : themes) { if (theme.getGroupID() == Integer.parseInt(temGroup.get("TemplateGroupId").toString())) { if (theme != null) temGroup.put("TemplateGroupName", theme.getGroupName()); @@ -280,9 +280,9 @@ public class EbayStoreCategoryFacade { return adItemTemplates = temGroupList; } - public List<Map<String,Object>> getAdItemTemplates(String temGroupId) { - List<Map<String,Object>> themes = new LinkedList<>(); - for (Map<String,Object> temp : this.adItemTemplates) { + public List<Map<String, Object>> getAdItemTemplates(String temGroupId) { + List<Map<String, Object>> themes = new LinkedList<>(); + for (Map<String, Object> temp : this.adItemTemplates) { if (temp.get("TemplateGroupId").equals(temGroupId)) { themes = UtilGenerics.checkList(temp.get("Templates")); break; @@ -339,7 +339,7 @@ public class EbayStoreCategoryFacade { return this.bestOfferEnabled; } - public List<Map<String,Object>> getAdItemTemplates() { + public List<Map<String, Object>> getAdItemTemplates() { return this.adItemTemplates; } } diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java index 606396f..6296b82 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java @@ -94,7 +94,7 @@ public class EbayStoreHelper { private static final String MODULE = EbayStoreHelper.class.getName(); private static final String RESOURCE = "EbayStoreUiLabels"; - public static ApiContext getApiContext(String productStoreId,Locale locale, Delegator delegator) { + public static ApiContext getApiContext(String productStoreId, Locale locale, Delegator delegator) { Map<String, Object> context = new HashMap<>(); context.put("locale", locale); context.put("productStoreId", productStoreId); @@ -168,12 +168,12 @@ public class EbayStoreHelper { GenericValue partyRole = null; try { if (partyId == null) { - Debug.logError("Require field partyId.",MODULE); + Debug.logError("Require field partyId.", MODULE); return false; } partyRole = EntityQuery.use(delegator).from("PartyRole").where("partyId", partyId, "roleTypeId", "EBAY_ACCOUNT").queryOne(); if (partyRole == null) { - Debug.logError("Party Id ".concat(partyId).concat("not have roleTypeId EBAY_ACCOUNT"),MODULE); + Debug.logError("Party Id ".concat(partyId).concat("not have roleTypeId EBAY_ACCOUNT"), MODULE); return false; } } catch (GenericEntityException e) { @@ -188,7 +188,7 @@ public class EbayStoreHelper { List<GenericValue> productCategoryRoles = null; try { if (partyId == null) { - Debug.logError("Require field partyId.",MODULE); + Debug.logError("Require field partyId.", MODULE); return ebayCategoryId; } productCategoryRoles = EntityQuery.use(delegator).from("ProductCategoryRole").where("productCategoryId", productCategoryId, "partyId", partyId, "roleTypeId", "EBAY_ACCOUNT").queryList(); @@ -197,7 +197,7 @@ public class EbayStoreHelper { ebayCategoryId = productCategoryRole.getString("comments"); } } else { - Debug.logInfo("Party Id ".concat(partyId).concat(" Not found productCategoryRole with productCategoryId "+ productCategoryId),MODULE); + Debug.logInfo("Party Id ".concat(partyId).concat(" Not found productCategoryRole with productCategoryId "+ productCategoryId), MODULE); return ebayCategoryId; } } catch (GenericEntityException e) { @@ -209,14 +209,14 @@ public class EbayStoreHelper { public static boolean createEbayCategoryIdByPartyId(Delegator delegator, String productCategoryId, String partyId, String ebayCategoryId) { try { if (partyId == null && ebayCategoryId != null) { - Debug.logError("Require field partyId and ebayCategoryId.",MODULE); + Debug.logError("Require field partyId and ebayCategoryId.", MODULE); return false; } GenericValue productCategoryRole = delegator.makeValue("ProductCategoryRole"); productCategoryRole.put("productCategoryId", productCategoryId); productCategoryRole.put("partyId", partyId); productCategoryRole.put("roleTypeId","EBAY_ACCOUNT"); - productCategoryRole.put("fromDate",UtilDateTime.nowTimestamp()); + productCategoryRole.put("fromDate", UtilDateTime.nowTimestamp()); productCategoryRole.put("comments", ebayCategoryId); productCategoryRole.create(); } catch (GenericEntityException e) { @@ -366,7 +366,7 @@ public class EbayStoreHelper { return result; } - public static void mappedPaymentMethods(Map<String,Object> requestParams, String itemPkCateId, Map<String,Object> addItemObject, ItemType item, HashMap<String, Object> attributeMapList) { + public static void mappedPaymentMethods(Map<String, Object> requestParams, String itemPkCateId, Map<String, Object> addItemObject, ItemType item, HashMap<String, Object> attributeMapList) { String refName = "itemCateFacade_"+itemPkCateId; if (UtilValidate.isNotEmpty(addItemObject) && UtilValidate.isNotEmpty(requestParams)) { EbayStoreCategoryFacade cf = (EbayStoreCategoryFacade) addItemObject.get(refName); @@ -422,7 +422,7 @@ public class EbayStoreHelper { } public static Map<String, Object> exportProductEachItem(DispatchContext dctx, Map<String, Object> context) { - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); Map<String, Object> itemObject = UtilGenerics.checkMap(context.get("itemObject")); @@ -475,7 +475,7 @@ public class EbayStoreHelper { valueToClear.remove(); } } - for (Map.Entry<String,Object> entry : attributeMapList.entrySet()) { + for (Map.Entry<String, Object> entry : attributeMapList.entrySet()) { if (UtilValidate.isNotEmpty(entry.getKey())) { ebayProductListingAttributeMap.put("productListingId", productListingId); ebayProductListingAttributeMap.put("attrName", entry.getKey().toString()); diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java index bf4d0f0..084bf14 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java @@ -68,8 +68,8 @@ public class EbayStoreInventoryServices { // TODO Auto-generated constructor stub } /*update inventory on ebay site*/ - public static Map<String,Object> updateEbayStoreInventory(DispatchContext dctx, Map<String,Object> context) { - Map<String,Object> result = new HashMap<>(); + public static Map<String, Object> updateEbayStoreInventory(DispatchContext dctx, Map<String, Object> context) { + Map<String, Object> result = new HashMap<>(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -133,7 +133,7 @@ public class EbayStoreInventoryServices { } /* add new product and quantity to ebay inventory */ - public static boolean createNewProductInEbayInventoryFolder(DispatchContext dctx, Map<String,Object> context) { + public static boolean createNewProductInEbayInventoryFolder(DispatchContext dctx, Map<String, Object> context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -177,7 +177,7 @@ public class EbayStoreInventoryServices { } /* update product and quantity to ebay inventory */ - public static boolean updateProductInEbayInventoryFolder(DispatchContext dctx, Map<String,Object> context) { + public static boolean updateProductInEbayInventoryFolder(DispatchContext dctx, Map<String, Object> context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -228,8 +228,8 @@ public class EbayStoreInventoryServices { return flag; } - public static Map<String,Object> getFolderInEbayStoreInventory(DispatchContext dctx, Map<String,Object> context) { - Map<String,Object> result = new HashMap<>(); + public static Map<String, Object> getFolderInEbayStoreInventory(DispatchContext dctx, Map<String, Object> context) { + Map<String, Object> result = new HashMap<>(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); @@ -273,7 +273,7 @@ public class EbayStoreInventoryServices { } /*create new folder for export product into inventory.*/ - public static String createNewFolderInEbayStoreInventory(DispatchContext dctx, Map<String,Object> context) { + public static String createNewFolderInEbayStoreInventory(DispatchContext dctx, Map<String, Object> context) { Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); Delegator delegator = dctx.getDelegator(); @@ -301,10 +301,10 @@ public class EbayStoreInventoryServices { } /* update inventory status from ebay store inventory */ - public static Map<String,Object> updateEbayInventoryStatusByProductId(DispatchContext dctx, Map<String,Object> context) { + public static Map<String, Object> updateEbayInventoryStatusByProductId(DispatchContext dctx, Map<String, Object> context) { Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); String productStoreId = (String)context.get("productStoreId"); String facilityId = (String)context.get("facilityId"); @@ -356,9 +356,9 @@ public class EbayStoreInventoryServices { return result; } - public static Map<String,Object> updateEbayInventoryStatus(DispatchContext dctx, Map<String,Object> context) { + public static Map<String, Object> updateEbayInventoryStatus(DispatchContext dctx, Map<String, Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String,Object> result = new HashMap<>(); + Map<String, Object> result = new HashMap<>(); Delegator delegator = dctx.getDelegator(); List<GenericValue> ebayProductStoreInventoryList = null; diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOptions.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOptions.java index f12e940..17b32c0 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOptions.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOptions.java @@ -82,9 +82,9 @@ public class EbayStoreOptions { int i=0; String colorSchemeId = themeId.substring(themeId.indexOf("-")+1); - themeId = themeId.substring(0,themeId.indexOf("-")); + themeId = themeId.substring(0, themeId.indexOf("-")); - Map<String,Object> storeColorSchemeMap = new HashMap<>(); + Map<String, Object> storeColorSchemeMap = new HashMap<>(); while (i < storeBasicTheme.length) { StoreThemeType storeThemeType = storeBasicTheme[i]; @@ -93,23 +93,23 @@ public class EbayStoreOptions { if (colorSchemeType != null) { if (colorSchemeId.equals(colorSchemeType.getColorSchemeID().toString())) { StoreColorType storeColor = colorSchemeType.getColor(); - storeColorSchemeMap.put("storeColorAccent",storeColor.getAccent()); - storeColorSchemeMap.put("storeColorPrimary",storeColor.getPrimary()); - storeColorSchemeMap.put("storeColorSecondary",storeColor.getSecondary()); + storeColorSchemeMap.put("storeColorAccent", storeColor.getAccent()); + storeColorSchemeMap.put("storeColorPrimary", storeColor.getPrimary()); + storeColorSchemeMap.put("storeColorSecondary", storeColor.getSecondary()); - // get font,size and color + // get font, size and color StoreFontType storeFontType = colorSchemeType.getFont(); - storeColorSchemeMap.put("storeFontTypeNameFaceColor",storeFontType.getNameColor()); - storeColorSchemeMap.put("storeFontTypeFontFaceValue",storeFontType.getNameFace().value()); - storeColorSchemeMap.put("storeFontTypeSizeFaceValue",storeFontType.getNameSize().value()); + storeColorSchemeMap.put("storeFontTypeNameFaceColor", storeFontType.getNameColor()); + storeColorSchemeMap.put("storeFontTypeFontFaceValue", storeFontType.getNameFace().value()); + storeColorSchemeMap.put("storeFontTypeSizeFaceValue", storeFontType.getNameSize().value()); - storeColorSchemeMap.put("storeFontTypeTitleColor",storeFontType.getTitleColor()); - storeColorSchemeMap.put("storeFontTypeFontTitleValue",storeFontType.getTitleFace().value()); - storeColorSchemeMap.put("storeFontSizeTitleValue",storeFontType.getTitleSize().value()); + storeColorSchemeMap.put("storeFontTypeTitleColor", storeFontType.getTitleColor()); + storeColorSchemeMap.put("storeFontTypeFontTitleValue", storeFontType.getTitleFace().value()); + storeColorSchemeMap.put("storeFontSizeTitleValue", storeFontType.getTitleSize().value()); - storeColorSchemeMap.put("storeFontTypeDescColor",storeFontType.getDescColor()); - storeColorSchemeMap.put("storeFontTypeFontDescValue",storeFontType.getDescFace().value()); - storeColorSchemeMap.put("storeDescSizeValue",storeFontType.getDescSize().value()); + storeColorSchemeMap.put("storeFontTypeDescColor", storeFontType.getDescColor()); + storeColorSchemeMap.put("storeFontTypeFontDescValue", storeFontType.getDescFace().value()); + storeColorSchemeMap.put("storeDescSizeValue", storeFontType.getDescSize().value()); request.setAttribute("storeColorSchemeMap", storeColorSchemeMap); break; @@ -129,16 +129,16 @@ public class EbayStoreOptions { return "success"; } - public static String retrieveItemTemplateByTemplateGroupId(HttpServletRequest request,HttpServletResponse response) { + public static String retrieveItemTemplateByTemplateGroupId(HttpServletRequest request, HttpServletResponse response) { Map<String, Object> paramMap = UtilHttp.getCombinedMap(request); if (paramMap.get("productStoreId") != null) { String temGroupId = (String)paramMap.get("templateGroupId"); - Map<String,Object> addItemObj = EbayEvents.getAddItemListingObject(request, EbayEvents.getApiContext(request)); + Map<String, Object> addItemObj = EbayEvents.getAddItemListingObject(request, EbayEvents.getApiContext(request)); if (UtilValidate.isNotEmpty(addItemObj)) { String refName = "itemCateFacade_".concat((String) paramMap.get("pkCategoryId")); if (UtilValidate.isNotEmpty(addItemObj.get(refName))) { EbayStoreCategoryFacade cf = (EbayStoreCategoryFacade) addItemObj.get(refName); - List<Map<String,Object>> theme = cf.getAdItemTemplates(temGroupId); + List<Map<String, Object>> theme = cf.getAdItemTemplates(temGroupId); if (theme.size() > 0) { request.setAttribute("itemTemplates", theme); } @@ -159,7 +159,7 @@ public class EbayStoreOptions { ebayCategoryId = ebayCategoryId.replace("CH_", ""); if (UtilValidate.isNotEmpty(ebayCategoryId)) { ApiContext apiContext = EbayEvents.getApiContext(request); - Map<String,Object> addItemObject = EbayEvents.getAddItemListingObject(request, apiContext); + Map<String, Object> addItemObject = EbayEvents.getAddItemListingObject(request, apiContext); String refName = "itemCateFacade_".concat(ebayCategoryId); if (UtilValidate.isNotEmpty(addItemObject.get(refName))) { addItemObject.remove(refName); @@ -171,9 +171,9 @@ public class EbayStoreOptions { request.setAttribute("categoryId", ebayCategoryId); results = EbayEvents.getChildCategories(request); if (UtilValidate.isNotEmpty(results)) { - List<Map<String,Object>> categories = new LinkedList<>(); + List<Map<String, Object>> categories = new LinkedList<>(); for (CategoryType category : results) { - Map<String,Object> context = new HashMap<>(); + Map<String, Object> context = new HashMap<>(); context.put("CategoryCode", category.getCategoryID()); context.put("CategoryName", category.getCategoryName()); String isLeaf = String.valueOf(category.isLeafCategory()!= null ? category.isLeafCategory() : "false"); @@ -206,7 +206,7 @@ public class EbayStoreOptions { ebayStoreCategory = ebayStoreCategory.replace("CH_", ""); if (UtilValidate.isNotEmpty(ebayStoreCategory)) { ApiContext apiContext = EbayEvents.getApiContext(request); - Map<String,Object> addItemObject = EbayEvents.getAddItemListingObject(request, apiContext); + Map<String, Object> addItemObject = EbayEvents.getAddItemListingObject(request, apiContext); String refName = "itemCateFacade_".concat(ebayStoreCategory); if (UtilValidate.isNotEmpty(addItemObject.get(refName))) { addItemObject.remove(refName); @@ -218,9 +218,9 @@ public class EbayStoreOptions { request.setAttribute("categoryId", ebayStoreCategory); results = EbayEvents.getStoreChildCategories(request); if (UtilValidate.isNotEmpty(results)) { - List<Map<String,Object>> categories = new LinkedList<>(); + List<Map<String, Object>> categories = new LinkedList<>(); for (StoreCustomCategoryType category : results) { - Map<String,Object> context = new HashMap<>(); + Map<String, Object> context = new HashMap<>(); context.put("CategoryCode", category.getCategoryID()); context.put("CategoryName", category.getName()); String isLeaf = "false"; diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java index eabad9c..f2f970f 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java @@ -58,7 +58,7 @@ public class EbayStoreSiteFacade { private static final int MAP_SIZE = 30000; private Map<SiteCodeType, Map<String, CategoryType>> siteCategoriesMap = new HashMap<SiteCodeType, Map<String, CategoryType>>(); private Map<SiteCodeType, List<StoreCustomCategoryType>> siteStoreCategoriesMap = new HashMap<SiteCodeType, List<StoreCustomCategoryType>>(); - private Map<SiteCodeType, List<CategoryType>> siteCategoriesCSMap = new HashMap<SiteCodeType,List<CategoryType>>(); + private Map<SiteCodeType, List<CategoryType>> siteCategoriesCSMap = new HashMap<SiteCodeType, List<CategoryType>>(); private Map<SiteCodeType, Map<String, CategoryFeatureType>> siteCategoriesFeaturesMap = new HashMap<SiteCodeType, Map<String, CategoryFeatureType>>(); private Map<SiteCodeType, SiteDefaultsType> siteFeatureDefaultMap = new HashMap<SiteCodeType, SiteDefaultsType>(); private Map<SiteCodeType, FeatureDefinitionsType> siteFeatureDefinitionsMap = new HashMap<SiteCodeType, FeatureDefinitionsType>(); diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java b/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java index 6f4ec80..61059a7 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java @@ -277,7 +277,7 @@ public class ProductDocument implements LuceneDocument { } // An attempt to boost/weight values in a similar manner to what OFBiz product search does. - private static void addTextField(Document doc, String fieldName, String value, boolean store,String fullTextFieldName, Delegator delegator) { + private static void addTextField(Document doc, String fieldName, String value, boolean store, String fullTextFieldName, Delegator delegator) { if (fieldName == null) return; Field field = new TextField(fieldName, checkValue(value), (store? Field.Store.YES: Field.Store.NO)); diff --git a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java index 2ad30df..9cf3b54 100644 --- a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java +++ b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java @@ -83,7 +83,7 @@ public class ScrumEvents { //compare week and compare date if ((timesheetDate.compareTo(weekStart) <= 0) && (realTimeDate.compareTo(nowStartDate) < 0)) { //check time entry - List<GenericValue> timeEntryList = timesheetMap.getRelated("TimeEntry", UtilMisc.toMap("partyId", partyId, "timesheetId",timesheetId, "fromDate", realTimeDate), null, false); + List<GenericValue> timeEntryList = timesheetMap.getRelated("TimeEntry", UtilMisc.toMap("partyId", partyId, "timesheetId", timesheetId, "fromDate", realTimeDate), null, false); //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)) { diff --git a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java index 71ff91c..5306471 100644 --- a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java +++ b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java @@ -209,7 +209,7 @@ public class ScrumServices { Debug.logInfo("Revision Link ============== >>>>>>>>>>> "+ revisionLink, MODULE); 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 <GenericValue> workeffContentList = EntityQuery.use(delegator).from("WorkEffortAndContentDataResource").where("contentName", version.trim() ,"drObjectInfo", revisionLink.trim()).queryList(); List<EntityCondition> exprsAnd = new LinkedList<>(); exprsAnd.add(EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, taskId)); diff --git a/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java index 573e546..d8617ba 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java @@ -146,7 +146,6 @@ public final class CategoryUtil { } else { cm = catMember.toString(); } - //Debug.logInfo("catMember "+cm,MODULE); return cm; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |