Correct linting issues between gms and github. (#1295)

* Correct linting issues between gms and github. Should hopefully make integrating somewhat easier. * Update CipherBasicsTest.java Make it pass clang --------- Co-authored-by: Pete Bentley <[email protected]>
google · Jan 22, 2025 · 8565cc7 · 8565cc7
1 parent dad8ff7
commit 8565cc7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/common/src/main/java/org/conscrypt/metrics/NoopStatsLog.java b/common/src/main/java/org/conscrypt/metrics/NoopStatsLog.java
@@ -20,6 +20,9 @@
 import org.conscrypt.ct.PolicyCompliance;
 import org.conscrypt.ct.VerificationResult;
 
+/**
+ * Noop class for stats logging
+ */
 @Internal
 public class NoopStatsLog implements StatsLog {
     private static final StatsLog INSTANCE = new NoopStatsLog();

diff --git a/common/src/main/java/org/conscrypt/metrics/StatsLogImpl.java b/common/src/main/java/org/conscrypt/metrics/StatsLogImpl.java
@@ -44,6 +44,9 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * Implements logging for Conscrypt metrics.
+ */
 @Internal
 public final class StatsLogImpl implements StatsLog {
     private static final ExecutorService e = Executors.newSingleThreadExecutor(new ThreadFactory() {

diff --git a/common/src/test/java/org/conscrypt/javax/crypto/CipherBasicsTest.java b/common/src/test/java/org/conscrypt/javax/crypto/CipherBasicsTest.java
@@ -416,10 +416,11 @@ public void testAeadEncryption() throws Exception {
                         // Some providers may not support all tag lengths or nonce lengths,
                         // that's allowed
                         if (e.getMessage().contains("IV must not be re-used")) {
-                            throw new AssertionError(
-                                "The same IV was used twice and therefore some tests did not run." +
-                                "Provider = " + p.getName() + ", algorithm = " + transformation,
-                                e);
+                            throw new AssertionError("The same IV was used twice and therefore "
+                                            + "some tests did not run."
+                                            + "Provider = " + p.getName()
+                                            + ", algorithm = " + transformation,
+                                    e);
                         }
                     }
                 }

diff --git a/platform/src/test/java/org/conscrypt/AndroidHpkeSpiTest.java b/platform/src/test/java/org/conscrypt/AndroidHpkeSpiTest.java
@@ -54,4 +54,4 @@ public void functionalTest() throws Exception {
             assertNotNull(DuckTypedHpkeSpi.newInstance(spi));
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,4 +54,4 @@ public void functionalTest() throws Exception { @@
                 assertNotNull(DuckTypedHpkeSpi.newInstance(spi));
             }
         }
-    }
+    }