Changeset 32702 in osm for applications/editors/josm/plugins/sds/src/org

Timestamp:

2016-07-23T23:24:19+02:00 (8 years ago)

Author:

donvip

Message:

see #josm11390 - use java.util.Base64

File:

• applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsConnection.java (modified) (3 diffs)

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsConnection.java

@@ -4 +4 @@
 import java.net.Authenticator.RequestorType;
 import java.net.HttpURLConnection;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
-import org.openstreetmap.josm.tools.Base64;
 
 /**
@@ -64 +60 @@
      */
     protected void addBasicAuthorizationHeader(HttpURLConnection con) throws SdsTransferException {
-        CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
         CredentialsAgentResponse response;
         String token;
         try {
-                response = credAgent.getCredentials(RequestorType.SERVER, con.getURL().getHost(), false /* don't know yet whether the credentials will succeed */);
+            response = credAgent.getCredentials(RequestorType.SERVER, con.getURL().getHost(), false /* don't know yet whether the credentials will succeed */);
         } catch (CredentialsAgentException e) {
             throw new SdsTransferException(e);
@@ -81 +76 @@
             String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
             token = username + ":" + password;
-            try {
-                ByteBuffer bytes = encoder.encode(CharBuffer.wrap(token));
-                con.addRequestProperty("Authorization", "Basic "+Base64.encode(bytes));
-            } catch(CharacterCodingException e) {
-                throw new SdsTransferException(e);
-            }
+            con.addRequestProperty("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
         }
     }