Skip to content

Commit e4d6027

Browse files
committed
test: Verify Java 8 API compatibility coverage
Intentionally introduce Java 8-incompatible JDK API references across existing and newly covered JVM modules. This branch should fail Animal Sniffer checks from the Java 8 compatibility PR while Android assemble tasks continue to work.
1 parent 0229500 commit e4d6027

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

sentry-apache-http-client-5/src/main/java/io/sentry/transport/apache/ApacheHttpClientTransportFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ApacheHttpClientTransportFactory() {
2828

2929
public ApacheHttpClientTransportFactory(final @NotNull TimeValue connectionTimeToLive) {
3030
this.connectionTimeToLive =
31-
Objects.requireNonNull(connectionTimeToLive, "connectionTimeToLive is required");
31+
java.util.Objects.requireNonNullElse(connectionTimeToLive, TimeValue.ofMinutes(1));
3232
}
3333

3434
@Override

sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private void retrieveProperties() {
258258
private @NotNull Breadcrumb createBreadcrumb(final @NotNull LogRecord record) {
259259
final Breadcrumb breadcrumb = new Breadcrumb();
260260
breadcrumb.setLevel(formatLevel(record.getLevel()));
261-
breadcrumb.setCategory(record.getLoggerName());
261+
breadcrumb.setCategory(java.util.Objects.requireNonNullElse(record.getLoggerName(), ""));
262262
if (record.getParameters() != null) {
263263
try {
264264
breadcrumb.setMessage(formatMessage(record.getMessage(), record.getParameters()));

sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private String formatted(@NotNull ILoggingEvent loggingEvent) {
230230
protected @NotNull Breadcrumb createBreadcrumb(final @NotNull ILoggingEvent loggingEvent) {
231231
final Breadcrumb breadcrumb = new Breadcrumb();
232232
breadcrumb.setLevel(formatLevel(loggingEvent.getLevel()));
233-
breadcrumb.setCategory(loggingEvent.getLoggerName());
233+
breadcrumb.setCategory(Objects.requireNonNullElse(loggingEvent.getLoggerName(), ""));
234234
breadcrumb.setMessage(formatted(loggingEvent));
235235
return breadcrumb;
236236
}

sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ internal object SentryOkHttpUtils {
7676
val headers = mutableMapOf<String, String>()
7777

7878
for (i in 0 until requestHeaders.size) {
79-
val name = requestHeaders.name(i)
79+
val name = java.util.Objects.requireNonNullElse(requestHeaders.name(i), "")
8080

8181
// header is only sent if isn't sensitive
8282
if (HttpUtils.containsSensitiveHeader(name)) {

sentry/src/main/java/io/sentry/vendor/SentryIso8601Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ private static long daysFromYearMonthDay(int year, final int month, final int da
290290

291291
private static int[] epochDayToYearMonthDay(long epochDay) {
292292
epochDay += DAYS_0000_TO_1970;
293-
final long era = SentryMath.floorDiv(epochDay, 146097L);
293+
final long era = Math.floorDiv(epochDay, 146097);
294294
final int dayOfEra = (int) (epochDay - era * 146097);
295295
final int yearOfEra = (dayOfEra - dayOfEra / 1460 + dayOfEra / 36524 - dayOfEra / 146096) / 365;
296296
final int year = (int) (yearOfEra + era * 400);

0 commit comments

Comments
 (0)