Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct linting issues between gms and github. #1295

Merged
merged 4 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions common/src/main/java/org/conscrypt/metrics/NoopStatsLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 3 additions & 0 deletions common/src/main/java/org/conscrypt/metrics/StatsLogImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ public void functionalTest() throws Exception {
assertNotNull(DuckTypedHpkeSpi.newInstance(spi));
}
}
}
}
Loading