[ofbiz-plugins] branch trunk updated: Improved: Corrected all incorrect indentation level issues in plugins component, also fixed some case indentation checkstyle issues. (OFBIZ-11922)
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 743c627 Improved: Corrected all incorrect indentation level issues in plugins component, also fixed some case indentation checkstyle issues. (OFBIZ-11922) 743c627 is described below commit 743c627f400906327e45c7437f6c3e42e4c0b142 Author: Suraj Khurana <[hidden email]> AuthorDate: Sun Jul 26 21:07:45 2020 +0530 Improved: Corrected all incorrect indentation level issues in plugins component, also fixed some case indentation checkstyle issues. (OFBIZ-11922) --- .../apache/ofbiz/birt/email/BirtEmailServices.java | 4 +- .../apache/ofbiz/ebay/ProductsExportToEbay.java | 2 +- .../org/apache/ofbiz/ebaystore/EbayAccount.java | 2 +- .../org/apache/ofbiz/ebaystore/EbayEvents.java | 28 ++++----- .../java/org/apache/ofbiz/ebaystore/EbayStore.java | 42 ++++++------- .../ofbiz/ebaystore/EbayStoreAutoPreferences.java | 2 +- .../apache/ofbiz/ebaystore/EbayStoreHelper.java | 6 +- .../ebaystore/EbayStoreInventoryServices.java | 2 +- .../apache/ofbiz/ebaystore/EbayStoreOptions.java | 2 +- .../ofbiz/content/search/DocumentIndexer.java | 2 +- .../ofbiz/content/search/LuceneDocument.java | 4 +- .../apache/ofbiz/pricat/InterfacePricatParser.java | 6 +- .../java/org/apache/ofbiz/solr/CategoryUtil.java | 2 +- .../org/apache/ofbiz/solr/SolrProductSearch.java | 70 ++++++++++++++-------- .../main/java/org/apache/ofbiz/solr/SolrUtil.java | 13 ++-- .../java/org/apache/ofbiz/solr/test/SolrTests.java | 4 +- 16 files changed, 106 insertions(+), 85 deletions(-) diff --git a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java index bb94c95..9facddf 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java @@ -191,7 +191,7 @@ public class BirtEmailServices { // store in the list of maps for sendmail.... List<Map<String, ? extends Object>> bodyParts = new LinkedList<>(); if (bodyText != null) { - bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); + bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); bodyParts.add(UtilMisc.toMap("content", bodyText, "type", "text/html")); } else { bodyParts.add(UtilMisc.toMap("content", bodyWriter.toString(), "type", "text/html")); @@ -231,7 +231,7 @@ public class BirtEmailServices { isMultiPart = false; // store body and type for single part message in the context. if (bodyText != null) { - bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); + bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); serviceContext.put("body", bodyText); } else { serviceContext.put("body", bodyWriter.toString()); diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java b/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java index e87b94f..324d006 100755 --- a/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java +++ b/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java @@ -72,7 +72,7 @@ public class ProductsExportToEbay { Map<String, Object> response = null; try { List<String> selectResult = UtilGenerics.checkCollection(context.get("selectResult"), String.class); - List<GenericValue> productsList = EntityQuery.use(delegator).from("Product").where(EntityCondition.makeCondition("productId", EntityOperator.IN, selectResult)).queryList(); + List<GenericValue> productsList = EntityQuery.use(delegator).from("Product").where(EntityCondition.makeCondition("productId", EntityOperator.IN, selectResult)).queryList(); if (UtilValidate.isNotEmpty(productsList)) { for (GenericValue product : productsList) { GenericValue startPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(product.getRelated("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MINIMUM_PRICE"), null, false))); diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayAccount.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayAccount.java index b5debbd..0210cc9 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayAccount.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayAccount.java @@ -58,7 +58,7 @@ public class EbayAccount { try { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); - GetUserCall getUserCall = new GetUserCall(apiContext); + GetUserCall getUserCall = new GetUserCall(apiContext); DetailLevelCodeType[] detailLevel = {DetailLevelCodeType.RETURN_ALL}; getUserCall.setDetailLevel(detailLevel); UserType user = getUserCall.getUser(); 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 a8b1e1b..29133d4 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java @@ -102,19 +102,19 @@ public class EbayEvents { int feedbackSize = Integer.parseInt((String) requestParams.get("feedbackSize")); String productStoreId = (String) requestParams.get("productStoreId"); for (int i = 1; i <= feedbackSize; i++) { - String commentType = (String) requestParams.get("commentType"+i); - String commentText = (String) requestParams.get("commentText"+i); + String commentType = (String) requestParams.get("commentType" + i); + String commentText = (String) requestParams.get("commentText" + i); if (!"none".equals(commentType) && commentText != null) { - String itemId = (String) requestParams.get("itemId"+i); - String transactionId = (String) requestParams.get("transactionId"+i); - String targetUser = (String) requestParams.get("targetUser"+i); - String commentingUser = (String) requestParams.get("commentingUser"+i); - String role = (String) requestParams.get("role"+i); - String ratingItem = (String) requestParams.get("ratingItem"+i); - String ratingComm = (String) requestParams.get("ratingComm"+i); - String ratingShip = (String) requestParams.get("ratingShip"+i); - String ratingShipHand = (String) requestParams.get("ratingShipHand"+i); - String AqItemAsDescribedId = (String) requestParams.get("AqItemAsDescribedId"+i); + String itemId = (String) requestParams.get("itemId" + i); + String transactionId = (String) requestParams.get("transactionId" + i); + String targetUser = (String) requestParams.get("targetUser" + i); + String commentingUser = (String) requestParams.get("commentingUser" + i); + String role = (String) requestParams.get("role" + i); + String ratingItem = (String) requestParams.get("ratingItem" + i); + String ratingComm = (String) requestParams.get("ratingComm" + i); + String ratingShip = (String) requestParams.get("ratingShip" + i); + String ratingShipHand = (String) requestParams.get("ratingShipHand" + i); + String AqItemAsDescribedId = (String) requestParams.get("AqItemAsDescribedId" + i); Map<String, Object> leavefeedback = new HashMap<>(); leavefeedback.put("productStoreId", productStoreId); @@ -196,7 +196,7 @@ public class EbayEvents { } } } - Debug.logInfo("run in with productIds "+productIds, MODULE); + Debug.logInfo("run in with productIds " + productIds, MODULE); for (String productId : productIds) { AddItemCall addItemCall = new AddItemCall(apiContext); ItemType item = new ItemType(); @@ -1145,7 +1145,7 @@ public class EbayEvents { GetSellingManagerInventoryCall call = new GetSellingManagerInventoryCall(EbayStoreHelper.getApiContext(productStoreId, locale, delegator)); resp = (GetSellingManagerInventoryResponseType)call.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { - returnedSellingManagerProductType = resp.getSellingManagerProduct(); + returnedSellingManagerProductType = resp.getSellingManagerProduct(); for (SellingManagerProductType sellingManagerProductType : returnedSellingManagerProductType) { SellingManagerProductDetailsType prodDetailType = sellingManagerProductType.getSellingManagerProductDetails(); String productIdInv = Long.toString(prodDetailType.getProductID()); 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 4f2b717..4449587 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java @@ -400,7 +400,7 @@ public class EbayStore { for (GenericValue productCategory : productCategoryList) { if (EbayStoreHelper.veriflyCategoryInCatalog(delegator, catalogCategories, productCategory.getString("productCategoryId"))) { if (EbayStoreHelper.createEbayCategoryIdByPartyId(delegator, productCategory.getString("productCategoryId"), partyId, String.valueOf(returnCategoryType.getCategoryID()))) { - Debug.logInfo("Create new ProductCategoryRollup with partyId "+partyId+" categoryId "+productCategory.getString("productCategoryId")+ " and ebayCategoryId "+String.valueOf(returnCategoryType.getCategoryID()), MODULE); + Debug.logInfo("Create new ProductCategoryRollup with partyId " + partyId + " categoryId "+productCategory.getString("productCategoryId")+ " and ebayCategoryId "+String.valueOf(returnCategoryType.getCategoryID()), MODULE); } break; } @@ -625,7 +625,7 @@ public class EbayStore { try { List<GenericValue> productStoreRoles = EntityQuery.use(delegator).from("ProductStoreRole").where("productStoreId", context.get("productStoreId").toString(), "roleTypeId", "EBAY_ACCOUNT").queryList(); if (productStoreRoles.size() != 0) { - partyId= (String) productStoreRoles.get(0).get("partyId"); + partyId = (String) productStoreRoles.get(0).get("partyId"); List<GenericValue> userLogins = EntityQuery.use(delegator).from("UserLogin").where("partyId", partyId).queryList(); if (userLogins.size() != 0) { userLoginId = (String) userLogins.get(0).get("userLoginId"); @@ -635,7 +635,7 @@ public class EbayStore { } catch (GenericEntityException e1) { e1.printStackTrace(); } - Debug.logInfo("userLoginId is "+userLoginId+" and productStoreId is "+ context.get("productStoreId"), MODULE); + Debug.logInfo("userLoginId is " + userLoginId + " and productStoreId is "+ context.get("productStoreId"), MODULE); GetStoreCall call = new GetStoreCall(EbayStoreHelper.getApiContext((String) context.get("productStoreId"), locale, delegator)); //call.setSite(EbayHelper.getSiteCodeType((String) context.get("productStoreId"), locale, delegator)); call.setCategoryStructureOnly(false); @@ -644,7 +644,7 @@ public class EbayStore { try { resp = (GetStoreResponseType)call.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { - returnedStoreType = resp.getStore(); + returnedStoreType = resp.getStore(); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); //result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "EbayStoreLoadSuccess", locale)); // update product store in ofbiz @@ -654,7 +654,7 @@ public class EbayStore { ebayResp.put("storeUrl", returnedStoreType.getURL()); ebayResp.put("storeUrlPath", returnedStoreType.getURLPath()); String desc = returnedStoreType.getDescription(); - if (desc != null) desc = desc.trim(); + if (desc != null) desc = desc.trim(); ebayResp.put("storeDesc", desc); StoreLogoType logoType = returnedStoreType.getLogo(); @@ -721,7 +721,7 @@ 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<>(); @@ -737,7 +737,7 @@ 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<>(); @@ -755,7 +755,7 @@ 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<>(); @@ -780,7 +780,7 @@ 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<>(); @@ -874,7 +874,7 @@ public class EbayStore { Delegator delegator = dctx.getDelegator(); Map<String, Object> result = new HashMap<>(); GetStoreOptionsRequestType req = null; - GetStoreOptionsResponseType resp = null; + GetStoreOptionsResponseType resp = null; StoreThemeArrayType returnedBasicThemeArray = null; try { @@ -940,7 +940,7 @@ public class EbayStore { Delegator delegator = dctx.getDelegator(); GetStoreOptionsRequestType req = null; StoreLogoArrayType returnedLogoArray = null; - GetStoreOptionsResponseType resp = null; + GetStoreOptionsResponseType resp = null; try { if (context.get("productStoreId") != null) { GetStoreOptionsCall call = new GetStoreOptionsCall(EbayStoreHelper.getApiContext((String) context.get("productStoreId"), locale, delegator)); @@ -954,7 +954,7 @@ public class EbayStore { int i = 0; 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()); @@ -985,7 +985,7 @@ public class EbayStore { Delegator delegator = dctx.getDelegator(); GetStoreOptionsRequestType req = null; StoreThemeArrayType returnedBasicThemeArray = null; - GetStoreOptionsResponseType resp = null; + GetStoreOptionsResponseType resp = null; try { if (context.get("productStoreId") != null) { GetStoreOptionsCall call = new GetStoreOptionsCall(EbayStoreHelper.getApiContext((String) context.get("productStoreId"), locale, delegator)); @@ -999,7 +999,7 @@ public class EbayStore { int i = 0; 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()); @@ -1037,7 +1037,7 @@ public class EbayStore { Delegator delegator = dctx.getDelegator(); GetStoreOptionsRequestType req = null; StoreThemeArrayType returnedAdvancedThemeArray = null; - GetStoreOptionsResponseType resp = null; + GetStoreOptionsResponseType resp = null; try { if (context.get("productStoreId") != null) { GetStoreOptionsCall call = new GetStoreOptionsCall(EbayStoreHelper.getApiContext((String) context.get("productStoreId"), locale, delegator)); @@ -1095,7 +1095,7 @@ public class EbayStore { Delegator delegator = dctx.getDelegator(); GetStoreOptionsRequestType req = null; StoreThemeArrayType returnedThemeArray = null; - GetStoreOptionsResponseType resp = null; + GetStoreOptionsResponseType resp = null; try { if (context.get("productStoreId") != null) { GetStoreOptionsCall call = new GetStoreOptionsCall(EbayStoreHelper.getApiContext((String) context.get("productStoreId"), locale, delegator)); @@ -1221,7 +1221,7 @@ public class EbayStore { Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); SetStoreRequestType req = null; - SetStoreResponseType resp = null; + SetStoreResponseType resp = null; StoreType storeType = null; try { if (context.get("productStoreId") != null) { @@ -1591,7 +1591,7 @@ public class EbayStore { if (intAtp != 0) { if (UtilValidate.isNotEmpty(context.get("listingTypeAuc")) && "on".equals(context.get("listingTypeAuc").toString())) { context.put("listingFormat", "Chinese"); - context.put("listingDuration", context.get("listingDurationAuc").toString()); + context.put("listingDuration", context.get("listingDurationAuc").toString()); StringBuffer dataItemsXml = new StringBuffer(); Map<String, Object> resultMap = ProductsExportToEbay.buildDataItemsXml(dctx, context, dataItemsXml, eBayConfigResult.get("token").toString(), product); @@ -2333,7 +2333,7 @@ public class EbayStore { } } OrderTransactionType[] tempSoldItems = null; - if (UtilValidate.isNotEmpty(getMyeBaySelling.getReturnedSoldList())) tempSoldItems = (getMyeBaySelling.getReturnedSoldList().getOrderTransactionArray()).getOrderTransaction(); + if (UtilValidate.isNotEmpty(getMyeBaySelling.getReturnedSoldList())) tempSoldItems = (getMyeBaySelling.getReturnedSoldList().getOrderTransactionArray()).getOrderTransaction(); if (UtilValidate.isNotEmpty(tempSoldItems)) { for (OrderTransactionType tempSoldItem : tempSoldItems) { @@ -2570,7 +2570,7 @@ public class EbayStore { shippingServiceCost = shippingServiceSelect.getShippingServiceCost().getValue(); } if (UtilValidate.isNotEmpty(shippingServiceSelect.getShippingServiceAdditionalCost())) { - shippingTotalAdditionalCost = shippingServiceSelect.getShippingServiceAdditionalCost().getValue(); + shippingTotalAdditionalCost = shippingServiceSelect.getShippingServiceAdditionalCost().getValue(); } } if (UtilValidate.isNotEmpty(transaction.getShippingDetails().getSalesTax().getSalesTaxAmount())) { @@ -2734,7 +2734,7 @@ public class EbayStore { private static Map<String, Object> getOrderHelper(OrderType order, Locale locale) { LinkedHashMap<String, Object> orderCtx = new LinkedHashMap<>(); - String externalOrderId = "EBS_"+order.getOrderID(); + String externalOrderId = "EBS_" + order.getOrderID(); double amountPaid = 0.0; String emailBuyer = null; String createdTime = null; 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 d10d7d7..64ed121 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java @@ -1082,7 +1082,7 @@ public class EbayStoreAutoPreferences { SellingManagerProductType[] returnedSellingManagerProductType = null; resp = (GetSellingManagerInventoryResponseType)call.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { - returnedSellingManagerProductType = resp.getSellingManagerProduct(); + returnedSellingManagerProductType = resp.getSellingManagerProduct(); for (SellingManagerProductType sellingManagerProductType : returnedSellingManagerProductType) { SellingManagerProductDetailsType prodDetailType = sellingManagerProductType.getSellingManagerProductDetails(); int qty = prodDetailType.getQuantityAvailable(); 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 e947a5d..64fde81 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java @@ -365,7 +365,7 @@ public class EbayStoreHelper { } public static void mappedPaymentMethods(Map<String, Object> requestParams, String itemPkCateId, Map<String, Object> addItemObject, ItemType item, HashMap<String, Object> attributeMapList) { - String refName = "itemCateFacade_"+itemPkCateId; + String refName = "itemCateFacade_" + itemPkCateId; if (UtilValidate.isNotEmpty(addItemObject) && UtilValidate.isNotEmpty(requestParams)) { EbayStoreCategoryFacade cf = (EbayStoreCategoryFacade) addItemObject.get(refName); BuyerPaymentMethodCodeType[] paymentMethods = cf.getPaymentMethods(); @@ -377,7 +377,7 @@ public class EbayStoreHelper { String payPara = (String) requestParams.get("Payments_".concat(pmName)); if ("true".equals(payPara)) { tempPayments[i] = paymentMethod; - attributeMapList.put(""+pmName, pmName); + attributeMapList.put("" + pmName, pmName); if ("PayPal".equals(pmName)) { if (UtilValidate.isNotEmpty(requestParams.get("paymentMethodPaypalEmail"))) { item.setPayPalEmailAddress(requestParams.get("paymentMethodPaypalEmail").toString()); @@ -626,7 +626,7 @@ public class EbayStoreHelper { ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator); GetOrdersCall ordersCall = new GetOrdersCall(apiContext); OrderIDArrayType orderIdArr = new OrderIDArrayType(); - String[] orderIdStr = {""+externalId}; + String[] orderIdStr = {"" + externalId}; orderIdArr.setOrderID(orderIdStr); req.setOrderIDArray(orderIdArr); Calendar orderFrom = Calendar.getInstance(); 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 1cd3fc2..8660965 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java @@ -195,7 +195,7 @@ public class EbayStoreInventoryServices { GenericValue ebayProductStoreInventory = EntityQuery.use(delegator).from("EbayProductStoreInventory").where("productId", productId, "facilityId", context.get("facilityId"), "productStoreId", context.get("productStoreId")).queryOne(); Long ebayProductId = null; if (ebayProductStoreInventory != null && ebayProductStoreInventory.getLong("ebayProductId") == null) { - Debug.logError("Can not update product "+productId+" has no ebay product Id in EbayProductStoreInventory. ", MODULE); + Debug.logError("Can not update product " + productId+" has no ebay product Id in EbayProductStoreInventory. ", MODULE); return flag; } if (ebayProductStoreInventory != null && ebayProductStoreInventory.getLong("ebayProductId") != 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 7b9b4d6..e0a32dd 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOptions.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOptions.java @@ -62,7 +62,7 @@ public class EbayStoreOptions { Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); GetStoreOptionsRequestType req = null; - GetStoreOptionsResponseType resp = null; + GetStoreOptionsResponseType resp = null; StoreThemeArrayType returnedBasicThemeArray = null; try { diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java index 0fefd75..9731000 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java @@ -100,7 +100,7 @@ public class DocumentIndexer extends Thread { try { StandardAnalyzer analyzer = new StandardAnalyzer(); analyzer.setVersion(SearchWorker.getLuceneVersion()); - indexWriter = new IndexWriter(this.indexDirectory, new IndexWriterConfig(analyzer)); + indexWriter = new IndexWriter(this.indexDirectory, new IndexWriterConfig(analyzer)); } catch (CorruptIndexException e) { Debug.logError("Corrupted lucene index: " + e.getMessage(), MODULE); break; diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/LuceneDocument.java b/lucene/src/main/java/org/apache/ofbiz/content/search/LuceneDocument.java index de0a4fb..fd359a2 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/LuceneDocument.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/LuceneDocument.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.Term; public interface LuceneDocument { - public Term getDocumentIdentifier(); + Term getDocumentIdentifier(); - public Document prepareDocument(Delegator delegator); + Document prepareDocument(Delegator delegator); } diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java b/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java index 8724fb4..6a947ed 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java @@ -35,9 +35,9 @@ import org.apache.ofbiz.entity.transaction.GenericTransactionException; * Interface of pricat parser. */ public interface InterfacePricatParser { - public static final String PARSE_EXCEL = "parse_excel"; - public static final String CONFIRM = "confirm_action"; - public static final String[] messageLabels = new String[] {"FORMAT_DEFAULT", "FORMAT_WARNING", "FORMAT_HEADLINE", "FORMAT_NOTE", "FORMAT_OK", "FORMAT_ERROR", "FORMAT_THROWABLE"}; + static final String PARSE_EXCEL = "parse_excel"; + static final String CONFIRM = "confirm_action"; + static final String[] messageLabels = new String[] {"FORMAT_DEFAULT", "FORMAT_WARNING", "FORMAT_HEADLINE", "FORMAT_NOTE", "FORMAT_OK", "FORMAT_ERROR", "FORMAT_THROWABLE"}; public static final List<String> messages = Collections.unmodifiableList(Arrays.asList(messageLabels)); public static final String tempFilesFolder = "runtime/pricat/"; public static final String FileDateTimePattern = "yyyyMMddHHmmss"; 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 1866651..a09e439 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java @@ -117,7 +117,7 @@ public final class CategoryUtil { * Returns categoryName with trail */ public static String getCategoryNameWithTrail(String productCategoryId, DispatchContext dctx) { - return getCategoryNameWithTrail(productCategoryId, true, dctx); + return getCategoryNameWithTrail(productCategoryId, true, dctx); } public static String getCategoryNameWithTrail(String productCategoryId, Boolean showDepth, DispatchContext dctx) { diff --git a/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java b/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java index 4ad50b5..eda9c4c 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java @@ -142,7 +142,8 @@ public abstract class SolrProductSearch { client.add(docs); client.commit(); - final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrDocumentForProductIdAddedToSolrIndex", UtilMisc.toMap("productId", context.get("productId")), locale); + final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrDocumentForProductIdAddedToSolrIndex", + UtilMisc.toMap("productId", context.get("productId")), locale); Debug.logInfo("Solr: " + statusStr, MODULE); result = ServiceUtil.returnSuccess(statusStr); } catch (MalformedURLException e) { @@ -214,7 +215,8 @@ public abstract class SolrProductSearch { client.add(docs); client.commit(); - final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrAddedDocumentsToSolrIndex", UtilMisc.toMap("fieldList", fieldList.size()), locale); + final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrAddedDocumentsToSolrIndex", + UtilMisc.toMap("fieldList", fieldList.size()), locale); Debug.logInfo("Solr: " + statusStr, MODULE); result = ServiceUtil.returnSuccess(statusStr); } catch (MalformedURLException e) { @@ -325,8 +327,9 @@ public abstract class SolrProductSearch { // solrQuery.setFilterQueries(tn); // } String queryFilter = (String) context.get("queryFilter"); - if (UtilValidate.isNotEmpty(queryFilter)) + if (UtilValidate.isNotEmpty(queryFilter)) { solrQuery.setFilterQueries(queryFilter.split(" ")); + } if ((String) context.get("returnFields") != null) { solrQuery.setFields((String) context.get("returnFields")); } @@ -334,10 +337,11 @@ public abstract class SolrProductSearch { // if ((Boolean) context.get("sortByReverse"))order.reverse(); if ((String) context.get("sortBy") != null && ((String) context.get("sortBy")).length() > 0) { SolrQuery.ORDER order; - if (!((Boolean) context.get("sortByReverse"))) + if (!((Boolean) context.get("sortByReverse"))) { order = SolrQuery.ORDER.asc; - else + } else { order = SolrQuery.ORDER.desc; + } solrQuery.setSort(((String) context.get("sortBy")).replaceFirst("-", ""), order); } @@ -377,14 +381,18 @@ public abstract class SolrProductSearch { if (UtilValidate.isNotEmpty(context.get("productCategoryId"))) { String productCategoryId = (String) context.get("productCategoryId"); dispatchMap.put("query", "cat:*" + productCategoryId + "*"); - } else + } else { return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "SolrMissingProductCategoryId", locale)); - if (context.get("viewSize") != null) + } + if (context.get("viewSize") != null) { dispatchMap.put("viewSize", Integer.parseInt(((String) context.get("viewSize")))); - if (context.get("viewIndex") != null) + } + if (context.get("viewIndex") != null) { dispatchMap.put("viewIndex", Integer.parseInt((String) context.get("viewIndex"))); - if (context.get("queryFilter") != null) + } + if (context.get("queryFilter") != null) { dispatchMap.put("queryFilter", context.get("queryFilter")); + } dispatchMap.put("facet", false); dispatchMap.put("spellcheck", true); dispatchMap.put("highlight", true); @@ -424,18 +432,23 @@ public abstract class SolrProductSearch { String solrIndexName = (String) context.get("indexName"); try { - if (context.get("query") == null || context.get("query").equals("")) + if (context.get("query") == null || context.get("query").equals("")) { context.put("query", "*:*"); + } Map<String, Object> dispatchMap = new HashMap<>(); - if (context.get("viewSize") != null) + if (context.get("viewSize") != null) { dispatchMap.put("viewSize", Integer.parseInt(((String) context.get("viewSize")))); - if (context.get("viewIndex") != null) + } + if (context.get("viewIndex") != null) { dispatchMap.put("viewIndex", Integer.parseInt((String) context.get("viewIndex"))); - if (context.get("query") != null) + } + if (context.get("query") != null) { dispatchMap.put("query", context.get("query")); - if (context.get("queryFilter") != null) + } + if (context.get("queryFilter") != null) { dispatchMap.put("queryFilter", context.get("queryFilter")); + } dispatchMap.put("spellcheck", true); dispatchMap.put("indexName", solrIndexName); @@ -455,7 +468,7 @@ public abstract class SolrProductSearch { } } - Boolean isCorrectlySpelled = true; + boolean isCorrectlySpelled = true; if (queryResult.getSpellCheckResponse() != null) { isCorrectlySpelled = queryResult.getSpellCheckResponse().isCorrectlySpelled(); } @@ -466,8 +479,9 @@ public abstract class SolrProductSearch { Map<String, Integer> facetQuery = queryResult.getFacetQuery(); Map<String, String> facetQueries = new HashMap<>(); for (String fq : facetQuery.keySet()) { - if (facetQuery.get(fq) > 0) + if (facetQuery.get(fq) > 0) { facetQueries.put(fq, fq.replaceAll("^.*\\u005B(.*)\\u005D", "$1") + " (" + facetQuery.get(fq) + ")"); + } } Map<String, Map<String, Long>> facetFields = new HashMap<>(); @@ -516,14 +530,15 @@ public abstract class SolrProductSearch { viewSize = (Integer) context.get("viewSize"); } String catalogId = null; - if (UtilValidate.isNotEmpty(context.get("catalogId"))) + if (UtilValidate.isNotEmpty(context.get("catalogId"))) { catalogId = (String) context.get("catalogId"); + } - String productCategoryId = (String) context.get("productCategoryId") != null ? CategoryUtil.getCategoryNameWithTrail((String) context.get("productCategoryId"), dctx) - : null; + String productCategoryId = (String) context.get("productCategoryId") != null + ? CategoryUtil.getCategoryNameWithTrail((String) context.get("productCategoryId"), dctx) : null; Debug.logInfo("productCategoryId " + productCategoryId, MODULE); - Map<String, Object> query = SolrUtil.categoriesAvailable(catalogId, productCategoryId, (String) context.get("productId"), displayProducts, viewIndex, viewSize, - solrIndexName); + Map<String, Object> query = SolrUtil.categoriesAvailable(catalogId, productCategoryId, (String) context.get("productId"), + displayProducts, viewIndex, viewSize, solrIndexName); QueryResponse cat = (QueryResponse) query.get("rows"); result = ServiceUtil.returnSuccess(); @@ -561,11 +576,12 @@ public abstract class SolrProductSearch { String solrIndexName = (String) context.get("indexName"); try { String catalogId = null; - if (UtilValidate.isNotEmpty(context.get("catalogId"))) + if (UtilValidate.isNotEmpty(context.get("catalogId"))) { catalogId = (String) context.get("catalogId"); + } - String productCategoryId = (String) context.get("productCategoryId") != null ? CategoryUtil.getCategoryNameWithTrail((String) context.get("productCategoryId"), dctx) - : null; + 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<>(); Debug.logInfo("productCategoryId: " + productCategoryId, MODULE); @@ -666,7 +682,8 @@ public abstract class SolrProductSearch { client.commit(); // THis adds all products to the Index (instantly) - Map<String, Object> runResult = dispatcher.runSync("addListToSolrIndex", UtilMisc.toMap("fieldList", solrDocs, "userLogin", userLogin, "locale", locale, "indexName", + Map<String, Object> runResult = dispatcher.runSync("addListToSolrIndex", + UtilMisc.toMap("fieldList", solrDocs, "userLogin", userLogin, "locale", locale, "indexName", solrIndexName, "treatConnectErrorNonFatal", treatConnectErrorNonFatal)); if (ServiceUtil.isError(runResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(runResult)); @@ -680,7 +697,8 @@ public abstract class SolrProductSearch { } else if (ServiceUtil.isFailure(runResult)) { result = ServiceUtil.returnFailure(runMsg); } else { - final String statusMsg = UtilProperties.getMessage(RESOURCE, "SolrClearedSolrIndexAndReindexedDocuments", UtilMisc.toMap("numDocs", numDocs), locale); + final String statusMsg = UtilProperties.getMessage(RESOURCE, "SolrClearedSolrIndexAndReindexedDocuments", + UtilMisc.toMap("numDocs", numDocs), locale); result = ServiceUtil.returnSuccess(statusMsg); } } catch (IOException | GenericServiceException e) { diff --git a/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java index ad9041e..4474471 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java @@ -241,20 +241,23 @@ public final class SolrUtil { client = getHttpSolrClient(solrIndexName); // create Query Object String query = "inStock[1 TO *]"; - if (categoryId != null) - query += " +cat:"+ categoryId; - else if (productId != null) + if (categoryId != null) { + query += " +cat:" + categoryId; + } else if (productId != null) { query += " +productId:" + productId; + } SolrQuery solrQuery = new SolrQuery(); solrQuery.setQuery(query); - if (catalogId != null) + if (catalogId != null) { solrQuery.setFilterQueries("catalog:" + catalogId); + } if (displayproducts) { if (viewSize > -1) { solrQuery.setRows(viewSize); - } else + } else { solrQuery.setRows(50000); + } if (viewIndex > -1) { solrQuery.setStart(viewIndex); } diff --git a/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java b/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java index 948949a..854dd2b 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/test/SolrTests.java @@ -109,7 +109,7 @@ public class SolrTests extends OFBizTestCase { products.add(product_1); products.add(product_2); - context = new HashMap<>(); + context = new HashMap<>(); context.put("fieldList", products); response = dispatcher.runSync("addListToSolrIndex", context); @@ -136,7 +136,7 @@ public class SolrTests extends OFBizTestCase { products.add(product_1); products.add(product_2); - context = new HashMap<>(); + context = new HashMap<>(); context.put("fieldList", products); response = dispatcher.runSync("addListToSolrIndex", context); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |