Skip to content

Commit 4d7b62f

Browse files
committed
HV-2145 Remove a few now unnecessary forbidden api suppressions
Signed-off-by: marko-bekhta <[email protected]>
1 parent 57f261a commit 4d7b62f

10 files changed

+0
-30
lines changed

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/ListPropertyValueExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.ListProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class ListPropertyValueExtractor implements ValueExtractor<ListProperty<@ExtractedValue ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new ListPropertyValueExtractor(), ListProperty.class,

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/MapPropertyKeyExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.MapProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class MapPropertyKeyExtractor implements ValueExtractor<MapProperty<@ExtractedValue ?, ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new MapPropertyKeyExtractor(), MapProperty.class,

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/MapPropertyValueExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.MapProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class MapPropertyValueExtractor implements ValueExtractor<MapProperty<?, @ExtractedValue ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new MapPropertyValueExtractor(), MapProperty.class,

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/ObservableValueValueExtractor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@
1010
import jakarta.validation.valueextraction.UnwrapByDefault;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
14-
1513
import javafx.beans.value.ObservableValue;
1614

1715
/**
1816
* A value extractor for JavaFX's {@link ObservableValue}, e.g. {@code Property<String>}.
1917
*
2018
* @author Gunnar Morling
2119
*/
22-
@SuppressWarnings("restriction")
23-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2420
@UnwrapByDefault
2521
class ObservableValueValueExtractor implements ValueExtractor<ObservableValue<@ExtractedValue ?>> {
2622

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/ReadOnlyListPropertyValueExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.ReadOnlyListProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class ReadOnlyListPropertyValueExtractor implements ValueExtractor<ReadOnlyListProperty<@ExtractedValue ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new ReadOnlyListPropertyValueExtractor(), ReadOnlyListProperty.class,

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/ReadOnlyMapPropertyKeyExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.ReadOnlyMapProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class ReadOnlyMapPropertyKeyExtractor implements ValueExtractor<ReadOnlyMapProperty<@ExtractedValue ?, ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new ReadOnlyMapPropertyKeyExtractor(), ReadOnlyMapProperty.class,

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/ReadOnlyMapPropertyValueExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.ReadOnlyMapProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class ReadOnlyMapPropertyValueExtractor implements ValueExtractor<ReadOnlyMapProperty<?, @ExtractedValue ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new ReadOnlyMapPropertyValueExtractor(), ReadOnlyMapProperty.class,

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/ReadOnlySetPropertyValueExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.ReadOnlySetProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class ReadOnlySetPropertyValueExtractor implements ValueExtractor<ReadOnlySetProperty<@ExtractedValue ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new ReadOnlySetPropertyValueExtractor(), ReadOnlySetProperty.class,

engine/src/main/java/org/hibernate/validator/internal/engine/valueextraction/SetPropertyValueExtractor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import jakarta.validation.valueextraction.ExtractedValue;
1111
import jakarta.validation.valueextraction.ValueExtractor;
1212

13-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
1413
import org.hibernate.validator.internal.engine.path.MutableNode;
1514

1615
import javafx.beans.property.SetProperty;
@@ -24,8 +23,6 @@
2423
*
2524
* @author Guillaume Smet
2625
*/
27-
@SuppressWarnings("restriction")
28-
@IgnoreForbiddenApisErrors(reason = "Usage of JavaFX classes")
2926
class SetPropertyValueExtractor implements ValueExtractor<SetProperty<@ExtractedValue ?>> {
3027

3128
static final ValueExtractorDescriptor DESCRIPTOR = new ValueExtractorDescriptor( new SetPropertyValueExtractor(), SetProperty.class,

engine/src/test/java/org/hibernate/validator/test/internal/engine/ValidatorFactoryNoELBootstrapTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import jakarta.validation.Validator;
2424
import jakarta.validation.constraints.Min;
2525

26-
import org.hibernate.validator.internal.IgnoreForbiddenApisErrors;
2726
import org.hibernate.validator.internal.util.actions.GetClassLoader;
2827
import org.hibernate.validator.internal.util.actions.SetContextClassLoader;
2928
import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
@@ -141,7 +140,6 @@ public ELIgnoringClassLoader(String packageMissing) {
141140
}
142141

143142
@Override
144-
@IgnoreForbiddenApisErrors(reason = "getPackage() is deprecated but getDefinedPackage() is only available from JDK 9.")
145143
public Class<?> loadClass(String className) throws ClassNotFoundException {
146144
// This is what we in the end want to achieve. Throw ClassNotFoundException for jakarta.el classes
147145
if ( className.startsWith( packageMissing ) ) {

0 commit comments

Comments
 (0)