Changeset 10618 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-07-23T23:54:27+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - Java 8: use java.util.Base64

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/OsmConnection.java (modified) (3 diffs)
• tools/Base64.java (deleted)
• tools/bugreport/BugReportSender.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -8 +8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Objects;
 import java.util.concurrent.FutureTask;
@@ -24 +22 @@
 import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Utils;
@@ -80 +77 @@
             String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
             token = username + ':' + password;
-            try {
-                ByteBuffer bytes = StandardCharsets.UTF_8.newEncoder().encode(CharBuffer.wrap(token));
-                con.setHeader("Authorization", "Basic "+Base64.encode(bytes));
-            } catch (CharacterCodingException e) {
-                throw new OsmTransferException(e);
-            }
+            con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
         }
     }

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

@@ -10 +10 @@
 import java.net.URL;
 import java.net.URLEncoder;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 import javax.swing.JOptionPane;
@@ -27 +25 @@
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.UrlLabel;
-import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -84 +81 @@
         try {
             String text = Utils.strip(statusText);
-            ByteBuffer buffer = Charset.forName("UTF-8").encode(CharBuffer.wrap(text));
-            String pdata = Base64.encode(buffer, false);
+            String pdata = Base64.getEncoder().encodeToString(text.getBytes(StandardCharsets.UTF_8));
             String postQuery = "pdata=" + URLEncoder.encode(pdata, "UTF-8");
             HttpClient client = HttpClient.create(new URL(getJOSMTicketURL()), "POST")