From b2a65a6b63e8691b0101f4652705fab79dc26d99 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 7 Dec 2016 12:37:43 +0300
Subject: juick-xmpp: refactoring

---
 .../src/main/java/com/juick/components/s2s/Connection.java       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java')

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java b/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
index 67953b76..b6052fc8 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/Connection.java
@@ -1,9 +1,6 @@
 package com.juick.components.s2s;
 
 import com.juick.components.XMPPServer;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.codec.digest.HmacUtils;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmlpull.mxp1.MXParser;
@@ -16,7 +13,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import java.io.*;
 import java.net.Socket;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.security.cert.CertificateException;
 import java.util.UUID;
@@ -99,7 +96,7 @@ public class Connection {
 
     public void closeConnection() {
         if (streamID != null) {
-            logger.info("CLOSING STREAM {}", streamID);
+            logger.info("closing stream {}", streamID);
         }
 
         try {
@@ -130,7 +127,7 @@ public class Connection {
         parser = new MXParser();
         parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
         parser.setInput(new InputStreamReader(socket.getInputStream()));
-        writer = new OutputStreamWriter(socket.getOutputStream(), Charset.forName("UTF-8"));
+        writer = new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8);
         streamID = UUID.randomUUID().toString();
     }
 }
-- 
cgit v1.2.3