From a1910088b922f639a0c93629ab9f6ac271669987 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Thu, 8 Aug 2019 07:25:23 -0400
Subject: [PATCH 1/2] fix checkstyle import order warnings

---
 checkstyle.xml                                              | 6 ++++++
 .../api/client/http/apache/SSLSocketFactoryExtension.java   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 9d2f4bbe9..270a959d5 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -57,6 +57,12 @@ page at http://checkstyle.sourceforge.net/config.html -->
       <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
     </module>
 
+    <module name="CustomImportOrder">
+      <property name="sortImportsInGroupAlphabetically" value="true"/>
+      <property name="separateLineBetweenGroups" value="true"/>
+      <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+    </module>
+
     <!--
 
     JAVADOC CHECKS
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java b/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
index 18d9ebc58..453596169 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
@@ -28,7 +28,7 @@
 
 /**
  * Implementation of SSL socket factory that extends Apache's implementation to provide
- * functionality missing from the Android SDK that is available in Apache HTTP Client.
+ * functionality missing from the Android SDK that  is available in Apache HTTP Client.
  *
  * @author Yaniv Inbar
  */

From 3b2ff545f8298b7a2302d7e0162f66addcc695c6 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Thu, 8 Aug 2019 07:26:16 -0400
Subject: [PATCH 2/2] fix checkstyle import order warnings

---
 .../api/client/http/apache/SSLSocketFactoryExtension.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java b/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
index 453596169..18d9ebc58 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
@@ -28,7 +28,7 @@
 
 /**
  * Implementation of SSL socket factory that extends Apache's implementation to provide
- * functionality missing from the Android SDK that  is available in Apache HTTP Client.
+ * functionality missing from the Android SDK that is available in Apache HTTP Client.
  *
  * @author Yaniv Inbar
  */