You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mb...@apache.org on 2017/12/10 09:22:19 UTC
svn commit: r1817678 -
/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java
Author: mbrohl
Date: Sun Dec 10 09:22:19 2017
New Revision: 1817678
URL: http://svn.apache.org/viewvc?rev=1817678&view=rev
Log:
Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.shipment.thirdparty.dhl.
(OFBIZ-9810)
Thanks Julian Leichert for reporting and providing the patch.
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=1817678&r1=1817677&r2=1817678&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java Sun Dec 10 09:22:19 2017
@@ -37,6 +37,7 @@ import org.apache.ofbiz.base.util.HttpCl
import org.apache.ofbiz.base.util.HttpClientException;
import org.apache.ofbiz.base.util.StringUtil;
import org.apache.ofbiz.base.util.UtilDateTime;
+import org.apache.ofbiz.base.util.UtilIO;
import org.apache.ofbiz.base.util.UtilMisc;
import org.apache.ofbiz.base.util.UtilProperties;
import org.apache.ofbiz.base.util.UtilValidate;
@@ -95,7 +96,7 @@ public class DhlServices {
public static String sendDhlRequest(String xmlString, Delegator delegator, String shipmentGatewayConfigId,
String resource, Locale locale) throws DhlConnectException {
String conStr = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "connectUrl", resource, "shipment.dhl.connect.url");
- if (conStr == null) {
+ if (conStr.isEmpty()) {
throw new DhlConnectException(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlConnectUrlIncomplete", locale));
}
@@ -192,7 +193,7 @@ public class DhlServices {
String password = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessPassword", resource, "shipment.dhl.access.password");
String shippingKey = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessShippingKey", resource, "shipment.dhl.access.shippingKey");
String accountNbr = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessAccountNbr", resource, "shipment.dhl.access.accountNbr");
- if ((shippingKey == null) || (accountNbr == null) || (shippingKey.length() == 0) || (accountNbr.length() == 0)) {
+ if ((shippingKey.length() == 0) || (accountNbr.length() == 0)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlGatewayNotAvailable", locale));
}
@@ -233,11 +234,11 @@ public class DhlServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlShippableWeightExceed", locale));
}
- String weight = (Integer.valueOf((int) shippableWeight.longValue())).toString();
+ String weight = shippableWeight.toString();
// create AccessRequest XML doc using FreeMarker template
String templateName = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "rateEstimateTemplate", resource, "shipment.dhl.template.rate.estimate");
- if ((templateName == null) || (templateName.trim().length() == 0)) {
+ if (templateName.trim().length() == 0) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlShipmentTemplateLocationNotFound", locale));
}
@@ -396,11 +397,11 @@ public class DhlServices {
String resource = (String) context.get("serviceConfigProps");
String shipmentGatewayConfigId = (String) context.get("shipmentGatewayConfigId");
Locale locale = (Locale) context.get("locale");
- Map<String, Object> result = new HashMap<String, Object>();
+ Map<String, Object> result;
String postalCode = (String) context.get("postalCode");
String accountNbr = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessAccountNbr",
resource, "shipment.dhl.access.accountNbr");
- if (accountNbr == null) {
+ if (accountNbr.isEmpty()) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlAccessAccountNbrMandotoryForRegisterAccount", locale));
}
@@ -701,14 +702,14 @@ public class DhlServices {
String password = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessPassword", resource, "shipment.dhl.access.password");
String shippingKey = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessShippingKey", resource, "shipment.dhl.access.shippingKey");
String accountNbr = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "accessAccountNbr", resource, "shipment.dhl.access.accountNbr");
- if ((shippingKey == null) || (accountNbr == null) || (shippingKey.length() == 0) || (accountNbr.length() == 0)) {
+ if ((shippingKey.length() == 0) || (accountNbr.length() == 0)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlGatewayNotAvailable", locale));
}
// label image preference (PNG or GIF)
String labelImagePreference = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "labelImageFormat", resource, "shipment.dhl.label.image.format");
- if (labelImagePreference == null) {
+ if (labelImagePreference.isEmpty()) {
Debug.logInfo("shipment.dhl.label.image.format not specified, assuming PNG", module);
labelImagePreference="PNG";
} else if (!("PNG".equals(labelImagePreference) || "GIF".equals(labelImagePreference))) {
@@ -720,7 +721,7 @@ public class DhlServices {
// create AccessRequest XML doc using FreeMarker template
String templateName = getShipmentGatewayConfigValue(delegator, shipmentGatewayConfigId, "rateEstimateTemplate", resource, "shipment.dhl.template.rate.estimate");
- if ((templateName == null) || (templateName.trim().length() == 0)) {
+ if ((templateName.trim().length() == 0)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentDhlRateEstimateTemplateNotConfigured", locale));
}
@@ -843,7 +844,7 @@ public class DhlServices {
continue;
sb.append(encodedImageString.charAt(i));
}
- byte[] labelBytes = Base64.base64Decode(sb.toString().getBytes());
+ byte[] labelBytes = Base64.base64Decode(sb.toString().getBytes(UtilIO.getUtf8()));
if (labelBytes != null) {
// store in db blob