diff --git a/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java b/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java
index 7f547a38b..0e735f174 100644
--- a/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java
+++ b/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java
@@ -16,17 +16,9 @@
 
 import com.google.api.client.http.HttpMethods;
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.util.Preconditions;
-import com.google.api.client.util.SecurityUtils;
-import com.google.api.client.util.SslUtils;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.ProxySelector;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.CertificateFactory;
 import java.util.concurrent.TimeUnit;
-import javax.net.ssl.SSLContext;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
diff --git a/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/package-info.java b/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/package-info.java
index bc753838b..1909a2f75 100644
--- a/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/package-info.java
+++ b/google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/package-info.java
@@ -13,7 +13,7 @@
  */
 
 /**
- * HTTP Transport library for Google API's based on Apache HTTP Client version 4.5+
+ * HTTP Transport library for Google API's based on Apache HTTP Client version 4.5+.
  *
  * @since 1.30
  * @author Yaniv Inbar
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonGeneratorTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonGeneratorTest.java
index 0f92bc10f..1a2a1bb54 100644
--- a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonGeneratorTest.java
+++ b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonGeneratorTest.java
@@ -38,10 +38,10 @@ public void testSerialize_simpleMap() throws Exception {
     StringWriter writer = new StringWriter();
     JsonGenerator generator = newGenerator(writer);
 
-    Map m = new HashMap<String, String>();
-    m.put("a", "b");
+    Map<String, String> map = new HashMap<String, String>();
+    map.put("a", "b");
 
-    generator.serialize(m);
+    generator.serialize(map);
     generator.close();
     assertEquals("{\"a\":\"b\"}", writer.toString());
   }
@@ -50,10 +50,10 @@ public void testSerialize_iterableMap() throws Exception {
     StringWriter writer = new StringWriter();
     JsonGenerator generator = newGenerator(writer);
 
-    Map m = new IterableMap();
-    m.put("a", "b");
+    Map<String, String> map = new IterableMap();
+    map.put("a", "b");
 
-    generator.serialize(m);
+    generator.serialize(map);
     generator.close();
     assertEquals("{\"a\":\"b\"}", writer.toString());
   }
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonParserTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonParserTest.java
index a61dc5c27..ef641e868 100644
--- a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonParserTest.java
+++ b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonParserTest.java
@@ -30,9 +30,9 @@ public abstract class AbstractJsonParserTest extends TestCase {
 
   protected abstract JsonFactory newJsonFactory();
 
-  private static String TEST_JSON =
+  private static final String TEST_JSON =
       "{\"strValue\": \"bar\", \"intValue\": 123, \"boolValue\": false}";
-  private static String TEST_JSON_BIG_DECIMAL = "{\"bigDecimalValue\": 1559341956102}";
+  private static final String TEST_JSON_BIG_DECIMAL = "{\"bigDecimalValue\": 1559341956102}";
 
   public void testParse_basic() throws IOException {
     JsonObjectParser parser = new JsonObjectParser(newJsonFactory());
diff --git a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java
index 3ba4eb676..3e90cb2c2 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java
@@ -81,7 +81,6 @@ private static Proxy defaultProxy() {
 
   private static final String SHOULD_USE_PROXY_FLAG = "com.google.api.client.should_use_proxy";
 
-  /** Factory to produce connections from {@link URL}s */
   private final ConnectionFactory connectionFactory;
 
   /** SSL socket factory or {@code null} for the default. */
diff --git a/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java b/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java
index fb3599f98..3830a8664 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java
@@ -115,7 +115,6 @@ public static FieldInfo of(Field field) {
   /** Field. */
   private final Field field;
 
-  /** Setters Method for field */
   private final Method[] setters;
 
   /**
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java
index 946f5961f..f024e05cb 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java
@@ -31,6 +31,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+
+import junit.framework.TestCase;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Arrays;
@@ -41,8 +44,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+
+import org.junit.Assert;
 
 /**
  * Tests {@link HttpRequest}.
diff --git a/google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java b/google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java
index 9dabe8298..c1d3872c0 100644
--- a/google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java
@@ -15,11 +15,14 @@
 package com.google.api.client.util;
 
 import com.google.api.client.util.GenericData.Flags;
+
+import junit.framework.TestCase;
+
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
-import junit.framework.Assert;
-import junit.framework.TestCase;
+
+import org.junit.Assert;
 
 /**
  * Tests {@link GenericData}.
@@ -191,7 +194,7 @@ public void testPutShouldUseSetter() {
     MyData data = new MyData();
     data.put("fieldB", "value1");
     assertEquals("value1", data.fieldB.get(0));
-    List<String> list = new ArrayList();
+    List<String> list = new ArrayList<>();
     list.add("value2");
     data.put("fieldB", list);
     assertEquals(list, data.fieldB);