Author: mthl
Date: Sat Jul 20 18:39:57 2019
New Revision: 1863504
URL: http://svn.apache.org/viewvc?rev=1863504&view=rev
Log:
Improved: Use ‘java.util.Base64’
(OFBIZ-11142)
Since Java 8 a standard Base64 encoder/decoder is available. As a
consequence we can remove our embedded implementation and use it
instead.
Removed:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/Base64.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityJsonReader.java
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/EntityJsonHelper.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=1863504&r1=1863503&r2=1863504&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
Sat Jul 20 18:39:57 2019
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.StringWriter;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.Base64;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -30,7 +31,6 @@ import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.HttpClient;
@@ -850,7 +850,7 @@ public class DhlServices {
continue;
sb.append(encodedImageString.charAt(i));
}
- byte[] labelBytes =
Base64.base64Decode(sb.toString().getBytes(UtilIO.getUtf8()));
+ byte[] labelBytes =
Base64.getMimeDecoder().decode(sb.toString().getBytes(UtilIO.getUtf8()));
if (labelBytes != null) {
// store in db blob
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
Sat Jul 20 18:39:57 2019
@@ -24,6 +24,7 @@ import java.io.StringWriter;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
+import java.util.Base64;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -32,7 +33,6 @@ import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.HttpClient;
@@ -1021,7 +1021,7 @@ public class FedexServices {
"fDXShipReplyString", fDXShipReplyString),
locale));
}
- byte[] labelBytes =
Base64.base64Decode(encodedImageString.getBytes(UtilIO.getUtf8()));
+ byte[] labelBytes =
Base64.getMimeDecoder().decode(encodedImageString.getBytes(UtilIO.getUtf8()));
if (labelBytes != null) {
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java
Sat Jul 20 18:39:57 2019
@@ -24,7 +24,10 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -37,7 +40,6 @@ import java.util.TreeSet;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.HttpClient;
@@ -1103,15 +1105,15 @@ public class UpsServices {
}
byte[] labelImageBytes = null;
if (packageLabelGraphicImageString != null) {
- labelImageBytes =
Base64.base64Decode(packageLabelGraphicImageString.getBytes(UtilIO.getUtf8()));
+ labelImageBytes =
Base64.getMimeDecoder().decode(packageLabelGraphicImageString.getBytes(UtilIO.getUtf8()));
shipmentPackageRouteSeg.setBytes("labelImage",
labelImageBytes);
}
byte[] labelInternationalSignatureGraphicImageBytes = null;
if (packageLabelInternationalSignatureGraphicImageString !=
null) {
- labelInternationalSignatureGraphicImageBytes =
Base64.base64Decode(packageLabelInternationalSignatureGraphicImageString.getBytes(UtilIO.getUtf8()));
+ labelInternationalSignatureGraphicImageBytes =
Base64.getMimeDecoder().decode(packageLabelInternationalSignatureGraphicImageString.getBytes(UtilIO.getUtf8()));
shipmentPackageRouteSeg.set("labelIntlSignImage",
labelInternationalSignatureGraphicImageBytes);
}
- String packageLabelHTMLImageStringDecoded =
Base64.base64Decode(packageLabelHTMLImageString);
+ String packageLabelHTMLImageStringDecoded =
Arrays.toString(Base64.getMimeDecoder().decode(packageLabelHTMLImageString.getBytes(StandardCharsets.UTF_8)));
shipmentPackageRouteSeg.set("labelHtml",
packageLabelHTMLImageStringDecoded);
if (shipmentUpsSaveCertificationInfo) {
@@ -1161,7 +1163,7 @@ public class UpsServices {
Element controlLogReceiptElement =
UtilXml.firstChildElement(shipmentResultsElement, "ControlLogReceipt");
if (controlLogReceiptElement != null) {
String fileString =
UtilXml.childElementValue(controlLogReceiptElement, "GraphicImage");
- String fileStringDecoded = Base64.base64Decode(fileString);
+ String fileStringDecoded =
Arrays.toString(Base64.getMimeDecoder().decode(fileString.getBytes(StandardCharsets.UTF_8)));
if (fileStringDecoded != null) {
shipmentRouteSegment.set("upsHighValueReport",
fileStringDecoded);
shipmentRouteSegment.store();
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java
Sat Jul 20 18:39:57 2019
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
+import java.util.Base64;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
@@ -36,7 +37,6 @@ import java.util.Map;
import javax.xml.transform.TransformerException;
import org.apache.commons.lang.StringUtils;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.HttpClient;
@@ -1410,7 +1410,7 @@ public class UspsServices {
return
ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsDeliveryConfirmationResponseIncompleteElementDeliveryConfirmationLabel",
locale));
}
- shipmentPackageRouteSeg.setBytes("labelImage",
Base64.base64Decode(labelImageString.getBytes(UtilIO.getUtf8())));
+ shipmentPackageRouteSeg.setBytes("labelImage",
Base64.getMimeDecoder().decode(labelImageString.getBytes(UtilIO.getUtf8())));
String trackingCode =
UtilXml.childElementValue(responseElement, "DeliveryConfirmationNumber");
if (UtilValidate.isEmpty(trackingCode)) {
return
ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
@@ -1650,7 +1650,7 @@ public class UspsServices {
return
ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
"FacilityShipmentUspsPriorityMailLabelResponseIncompleteElementLabelImage",
locale));
}
- shipmentPackageRouteSeg.setBytes("labelImage",
Base64.base64Decode(labelImageString.getBytes(UtilIO.getUtf8())));
+ shipmentPackageRouteSeg.setBytes("labelImage",
Base64.getMimeDecoder().decode(labelImageString.getBytes(UtilIO.getUtf8())));
String trackingCode = UtilXml.childElementValue(responseElement,
"BarcodeNumber");
if (UtilValidate.isEmpty(trackingCode)) {
return
ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/HashCrypt.java
Sat Jul 20 18:39:57 2019
@@ -19,6 +19,7 @@
package org.apache.ofbiz.base.crypto;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -191,7 +192,7 @@ public class HashCrypt {
StringBuilder sb = new StringBuilder();
sb.append("{").append(pbkdf2Type).append("}");
sb.append(PBKDF2_ITERATIONS).append("$");
-
sb.append(org.apache.ofbiz.base.util.Base64.base64Encode(salt)).append("$");
+
sb.append(java.util.Base64.getMimeEncoder().encodeToString(salt.getBytes(StandardCharsets.UTF_8))).append("$");
sb.append(new String(hash));
return sb.toString();
} catch (InvalidKeySpecException e) {
@@ -207,7 +208,7 @@ public class HashCrypt {
String hashType = crypted.substring(1, typeEnd);
String[] parts = crypted.split("\\$");
int iterations = Integer.parseInt(parts[0].substring(typeEnd+1));
- byte[] salt =
org.apache.ofbiz.base.util.Base64.base64Decode(parts[1]).getBytes(UtilIO.getUtf8());
+ byte[] salt =
Arrays.toString(java.util.Base64.getMimeDecoder().decode(parts[1].getBytes(StandardCharsets.UTF_8))).getBytes(UtilIO.getUtf8());
byte[] hash =
Base64.decodeBase64(parts[2].getBytes(UtilIO.getUtf8()));
PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt,
iterations, hash.length * 8);
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java
Sat Jul 20 18:39:57 2019
@@ -26,7 +26,9 @@ import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.security.cert.CertificateException;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -487,7 +489,7 @@ public class HttpClient {
// if there is basicAuth info set the request property for it
if (basicAuthUsername != null) {
- String basicAuthString = "Basic " +
Base64.base64Encode(basicAuthUsername + ":" + (basicAuthPassword == null ? "" :
basicAuthPassword));
+ String basicAuthString = "Basic " +
Base64.getMimeEncoder().encodeToString((basicAuthUsername + ":" +
(basicAuthPassword == null ? "" :
basicAuthPassword)).getBytes(StandardCharsets.UTF_8));
con.setRequestProperty("Authorization", basicAuthString);
if (Debug.verboseOn() || debug) {
Debug.logVerbose("Header - Authorization: " +
basicAuthString, module);
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilFormatOut.java
Sat Jul 20 18:39:57 2019
@@ -22,6 +22,7 @@ import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.ParseException;
+import java.util.Base64;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
@@ -384,7 +385,7 @@ public final class UtilFormatOut {
if (data.length > 5120) {
return "[...binary data]";
}
- return new String(Base64.base64Encode(data), UtilIO.getUtf8());
+ return new String(Base64.getMimeEncoder().encode(data),
UtilIO.getUtf8());
}
return obj1.toString();
}
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java
Sat Jul 20 18:39:57 2019
@@ -24,6 +24,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.sql.Blob;
import java.sql.SQLException;
+import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -37,7 +38,6 @@ import java.util.ResourceBundle;
import java.util.TreeSet;
import org.apache.ofbiz.base.crypto.HashCrypt;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
import org.apache.ofbiz.base.util.ObjectType;
@@ -1193,7 +1193,7 @@ public class GenericEntity implements Ma
boolean b1 = obj instanceof byte [];
if (b1) {
byte [] binData = (byte [])obj;
- String strData = new String(Base64.base64Encode(binData),
UtilIO.getUtf8());
+ String strData = new
String(Base64.getMimeEncoder().encode(binData), UtilIO.getUtf8());
cdataMap.put(name, strData);
} else {
Debug.logWarning("Field:" + name + " is not of type
'byte[]'. obj: " + obj, module);
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityJsonReader.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityJsonReader.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityJsonReader.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityJsonReader.java
Sat Jul 20 18:39:57 2019
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -11,7 +12,6 @@ import java.util.List;
import java.util.Map;
import org.apache.ofbiz.base.lang.JSON;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.Delegator;
@@ -244,7 +244,7 @@ public class EntityJsonReader {
Object pkFieldValue = keyValPair.get(pkField);
String type = modelField.getType();
if (type != null && "blob".equals(type)) {
- byte[] binData =
Base64.base64Decode((pkFieldValue.toString()).getBytes());
+ byte[] binData =
Base64.getMimeDecoder().decode((pkFieldValue.toString()).getBytes());
currentValue.setBytes(pkField, binData);
} else {
currentValue.setString(pkField,
pkFieldValue.toString());
@@ -270,7 +270,7 @@ public class EntityJsonReader {
ModelField modelField =
modelEntity.getField(currentFieldName);
String type = modelField.getType();
if (type != null &&
"blob".equals(type)) {
- byte[] binData =
Base64.base64Decode(currentFieldValue.toString().getBytes());
+ byte[] binData =
Base64.getMimeDecoder().decode(currentFieldValue.toString().getBytes());
currentValue.setBytes(currentFieldName, binData);
} else {
currentValue.setString(currentFieldName, currentFieldValue.toString());
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java
Sat Jul 20 18:39:57 2019
@@ -28,6 +28,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Base64;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -38,7 +39,6 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.ofbiz.base.location.FlexibleLocation;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilIO;
import org.apache.ofbiz.base.util.UtilMisc;
@@ -369,7 +369,7 @@ public class EntitySaxReader extends Def
ModelField modelField =
modelEntity.getField(currentFieldName.toString());
String type = modelField.getType();
if (type != null && "blob".equals(type)) {
- byte[] binData = Base64.base64Decode((new
String(currentFieldValue)).getBytes());
+ byte[] binData =
Base64.getMimeDecoder().decode((new String(currentFieldValue)).getBytes());
currentValue.setBytes(currentFieldName.toString(),
binData);
} else {
currentValue.setString(currentFieldName.toString(), new
String(currentFieldValue));
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
Sat Jul 20 18:39:57 2019
@@ -20,8 +20,11 @@ package org.apache.ofbiz.webapp.webdav;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Base64;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +33,6 @@ import java.util.TimeZone;
import javax.servlet.http.HttpServletRequest;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilProperties;
import org.apache.ofbiz.base.util.UtilValidate;
@@ -78,7 +80,7 @@ public final class WebDavUtil {
if (UtilValidate.isEmpty(username) || UtilValidate.isEmpty(password)) {
String credentials = request.getHeader("Authorization");
if (credentials != null && credentials.startsWith("Basic ")) {
- credentials = Base64.base64Decode(credentials.replace("Basic
", ""));
+ credentials =
Arrays.toString(Base64.getMimeDecoder().decode(credentials.replace("Basic ",
"").getBytes(StandardCharsets.UTF_8)));
if (Debug.verboseOn()) Debug.logVerbose("Found HTTP Basic
credentials", module);
String[] parts = credentials.split(":");
if (parts.length < 2) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/EntityJsonHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/EntityJsonHelper.java?rev=1863504&r1=1863503&r2=1863504&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/EntityJsonHelper.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/EntityJsonHelper.java
Sat Jul 20 18:39:57 2019
@@ -18,7 +18,6 @@
*/
package org.apache.ofbiz.webtools;
-import org.apache.ofbiz.base.util.Base64;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilIO;
import org.apache.ofbiz.base.util.UtilValidate;
@@ -26,6 +25,7 @@ import org.apache.ofbiz.entity.GenericVa
import org.apache.ofbiz.entity.model.ModelField;
import java.io.PrintWriter;
+import java.util.Base64;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -52,7 +52,7 @@ public class EntityJsonHelper {
boolean b1 = obj instanceof byte[];
if (b1) {
byte[] binData = (byte[]) obj;
- String strData = new String(Base64.base64Encode(binData),
UtilIO.getUtf8());
+ String strData = new
String(Base64.getMimeEncoder().encode(binData), UtilIO.getUtf8());
if (UtilValidate.isNotEmpty(strData)) {
fieldMap.put(name, strData);
}
@@ -105,7 +105,7 @@ public class EntityJsonHelper {
boolean b1 = obj instanceof byte[];
if (b1) {
byte[] binData = (byte[]) obj;
- String strData = new String(Base64.base64Encode(binData),
UtilIO.getUtf8());
+ String strData = new
String(Base64.getMimeEncoder().encode(binData), UtilIO.getUtf8());
if (UtilValidate.isNotEmpty(strData)) {
fieldMap.put(name, strData);
}
