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

Bump inject.version from 10.1 to 10.2 #243

Merged
merged 2 commits into from
Jul 25, 2024
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package example.avaje.nested;

import io.avaje.lang.Nullable;
import org.jspecify.annotations.Nullable;

import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<surefire.useModulePath>false</surefire.useModulePath>
<nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
<maven.compiler.release>17</maven.compiler.release>
<inject.version>10.1</inject.version>
<inject.version>10.2</inject.version>
<spi.version>2.1</spi.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;

import io.avaje.lang.Nullable;
import org.jspecify.annotations.Nullable;

import io.avaje.validation.adapter.ValidationAdapter;
import io.avaje.validation.adapter.ValidationContext;
import io.avaje.validation.core.adapters.BasicAdapters;
Expand Down
17 changes: 11 additions & 6 deletions validator/src/main/java/io/avaje/validation/core/DRequest.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
package io.avaje.validation.core;

import io.avaje.lang.Nullable;
import java.util.ArrayDeque;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import org.jspecify.annotations.Nullable;

import io.avaje.validation.ConstraintViolation;
import io.avaje.validation.ConstraintViolationException;
import io.avaje.validation.adapter.ValidationContext;
import io.avaje.validation.adapter.ValidationRequest;
import io.avaje.validation.groups.Default;

import java.util.*;

final class DRequest implements ValidationRequest {

private static final List<Class<?>> DEFAULT_GROUP = List.of(Default.class);
Expand Down Expand Up @@ -83,9 +88,9 @@ public void throwWithViolations() {
private String message() {
final var msg = new StringBuilder(100);
msg.append(violations.size()).append(" constraint violation(s) occurred.");
violations.stream().limit(10).forEach(cv -> {
msg.append("\n ").append(cv.path()).append(": ").append(cv.message());
});
violations.stream()
.limit(10)
.forEach(cv -> msg.append("\n ").append(cv.path()).append(": ").append(cv.message()));
final int others = violations.size() - 10;
if (others > 0) {
msg.append("\n and ").append(others).append(" other error(s)");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;

import io.avaje.lang.Nullable;
import org.jspecify.annotations.Nullable;

import io.avaje.validation.ConstraintViolation;
import io.avaje.validation.Validator;
import io.avaje.validation.adapter.ValidationAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.Locale;
import java.util.Set;

import io.avaje.lang.Nullable;
import org.jspecify.annotations.Nullable;

final class LocaleResolver {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;

import org.jspecify.annotations.Nullable;

import io.avaje.applog.AppLog;
import io.avaje.lang.Nullable;

final class ResourceBundleManager {
private static final System.Logger logger = AppLog.getLogger(ResourceBundleManager.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import java.util.Locale;
import java.util.Set;

import io.avaje.lang.Nullable;
import org.jspecify.annotations.Nullable;

import io.avaje.validation.ConstraintViolation;
import io.avaje.validation.ConstraintViolationException;
import io.avaje.validation.adapter.ValidationAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.avaje.validation.adapter.ValidationContext;
import io.avaje.validation.adapter.ValidationContext.AdapterCreateRequest;
import io.avaje.validation.adapter.ValidationRequest;
import io.avaje.validation.core.adapters.BasicAdapters.PatternAdapter;
import io.avaje.validation.spi.AnnotationFactory;

public final class BasicAdapters {
Expand Down
Loading