From 60c990b8c1e1df51203b8d592a39eea2ca439687 Mon Sep 17 00:00:00 2001
From: binary-joe <josepheid2@gmail.com>
Date: Sat, 14 Sep 2019 19:37:32 +0200
Subject: [PATCH] fix merge issue; refactoring

---
 .../core-java-networking-2/pom.xml            |  2 ++
 .../com/baeldung/url/auth/HttpClient.java     | 24 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core-java-modules/core-java-networking-2/pom.xml b/core-java-modules/core-java-networking-2/pom.xml
index 3837b77eba..2d404a553b 100644
--- a/core-java-modules/core-java-networking-2/pom.xml
+++ b/core-java-modules/core-java-networking-2/pom.xml
@@ -16,6 +16,8 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>${httpclient.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
diff --git a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java
index dccaf3de84..779f8aa898 100644
--- a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java
+++ b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java
@@ -48,12 +48,11 @@ public class HttpClient {
         }
     }
 
-    private void setAuthenticator() {
-        Authenticator.setDefault(new Authenticator() {
-            protected PasswordAuthentication getPasswordAuthentication() {
-                return new PasswordAuthentication(user, password.toCharArray());
-            }
-        });
+    private HttpURLConnection createConnection(String urlString) throws MalformedURLException, IOException, ProtocolException {
+        URL url = new URL(String.format(urlString));
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+        return connection;
     }
 
     private String createBasicAuthHeaderValue() {
@@ -63,10 +62,13 @@ public class HttpClient {
         return authHeaderValue;
     }
 
-    private HttpURLConnection createConnection(String urlString) throws MalformedURLException, IOException, ProtocolException {
-        URL url = new URL(String.format(urlString));
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-        connection.setRequestMethod("GET");
-        return connection;
+    private void setAuthenticator() {
+        Authenticator.setDefault(new BasicAuthenticator());
+    }
+
+    private final class BasicAuthenticator extends Authenticator {
+        protected PasswordAuthentication getPasswordAuthentication() {
+            return new PasswordAuthentication(user, password.toCharArray());
+        }
     }
 }