This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit bf3278398b80f4ae1c196b5c18ce5f9919e92cb0 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Dec 25 15:34:33 2025 +0100 Fill the `fixed` attribute on @Workaround annotation for RFE #4093999 in Sun's bug database ("Relax constraint on placement of this()/super() call in constructors"). This is resolved in Java 25 with flexible constructors. --- .../main/org/apache/sis/console/IdentifierCommand.java | 2 +- .../apache/sis/metadata/iso/extent/NotSpatioTemporalException.java | 2 +- .../apache/sis/referencing/gazetteer/GeohashReferenceSystem.java | 2 +- .../sis/referencing/gazetteer/MilitaryGridReferenceSystem.java | 4 ++-- .../main/org/apache/sis/parameter/MapProjectionDescriptor.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 2 +- .../main/org/apache/sis/referencing/cs/DefaultCompoundCS.java | 2 +- .../apache/sis/referencing/operation/DefaultOperationMethod.java | 2 +- .../sis/referencing/operation/projection/AlbersEqualArea.java | 4 ++-- .../sis/referencing/operation/projection/AzimuthalEquidistant.java | 2 +- .../apache/sis/referencing/operation/projection/CassiniSoldner.java | 2 +- .../sis/referencing/operation/projection/CylindricalEqualArea.java | 4 ++-- .../referencing/operation/projection/EquidistantCylindrical.java | 4 ++-- .../referencing/operation/projection/LambertAzimuthalEqualArea.java | 4 ++-- .../sis/referencing/operation/projection/LambertConicConformal.java | 4 ++-- .../org/apache/sis/referencing/operation/projection/Mercator.java | 4 ++-- .../operation/projection/ModifiedAzimuthalEquidistant.java | 4 ++-- .../org/apache/sis/referencing/operation/projection/Mollweide.java | 2 +- .../sis/referencing/operation/projection/ObliqueMercator.java | 3 ++- .../sis/referencing/operation/projection/ObliqueStereographic.java | 3 ++- .../apache/sis/referencing/operation/projection/Orthographic.java | 4 ++-- .../sis/referencing/operation/projection/PolarStereographic.java | 4 ++-- .../org/apache/sis/referencing/operation/projection/Polyconic.java | 3 ++- .../org/apache/sis/referencing/operation/projection/Robinson.java | 2 +- .../sis/referencing/operation/projection/SatelliteTracking.java | 3 ++- .../org/apache/sis/referencing/operation/projection/Sinusoidal.java | 4 ++-- .../sis/referencing/operation/projection/TransverseMercator.java | 2 +- .../main/org/apache/sis/referencing/operation/provider/Affine.java | 2 +- .../test/org/apache/sis/referencing/operation/projection/NoOp.java | 6 +++--- .../main/org/apache/sis/storage/UnsupportedStorageException.java | 2 +- .../test/org/apache/sis/storage/esri/BILConsistencyTest.java | 3 ++- .../test/org/apache/sis/storage/esri/BIPConsistencyTest.java | 3 ++- .../test/org/apache/sis/storage/esri/BSQConsistencyTest.java | 3 ++- .../test/org/apache/sis/storage/image/SelfConsistencyTest.java | 3 ++- .../test/org/apache/sis/storage/test/CoverageReadConsistency.java | 2 +- .../src/org.apache.sis.util/test/org/apache/sis/test/Printer.java | 2 +- .../org/apache/sis/storage/isobmff/base/IdentifiedMediaData.java | 2 +- .../main/org/apache/sis/storage/geopackage/GpkgStore.java | 2 +- .../main/org/apache/sis/storage/geopackage/Initializer.java | 2 +- 39 files changed, 60 insertions(+), 52 deletions(-) diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java index 32be57adc0..b4c69abf1e 100644 --- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java +++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java @@ -93,7 +93,7 @@ final class IdentifierCommand extends FormattedOutputCommand { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static EnumSet<Option> options() { final EnumSet<Option> options = MetadataCommand.options(); options.remove(Option.TIMEZONE); diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java index b19f777cfa..1c4b4823ce 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java @@ -78,7 +78,7 @@ public class NotSpatioTemporalException extends TransformException { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static String message(final int type, final CoordinateReferenceSystem crs) { return (crs != null) ? Resources.format(Resources.Keys.MissingDimension_2, type, crs.getName()) : Errors.format(Errors.Keys.UnspecifiedCRS); diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java index 804a700ff5..5d8f4569c9 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java @@ -197,7 +197,7 @@ public class GeohashReferenceSystem extends ReferencingByIdentifiers { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static LocationType[] types() { final ModifiableLocationType gzd = new ModifiableLocationType(IDENTIFIER); gzd.addIdentification(Vocabulary.formatInternational(Vocabulary.Keys.Code)); diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java index 0db44dc3c4..53160a9e22 100644 --- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java +++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java @@ -292,7 +292,7 @@ public class MilitaryGridReferenceSystem extends ReferencingByIdentifiers { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Map<String,?> properties() { Party party; try { @@ -309,7 +309,7 @@ public class MilitaryGridReferenceSystem extends ReferencingByIdentifiers { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static LocationType[] types() { final ModifiableLocationType gzd = new ModifiableLocationType(Resources.formatInternational(Resources.Keys.GridZoneDesignator)); final ModifiableLocationType square = new ModifiableLocationType(Resources.formatInternational(Resources.Keys.SquareIdentifier100)); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java index 986ca22775..02b5a315ac 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java @@ -91,7 +91,7 @@ final class MapProjectionDescriptor extends DefaultParameterDescriptorGroup { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static ParameterDescriptor<?>[] addAxisLengths(final ParameterDescriptor<?>[] parameters) { final ParameterDescriptor<?>[] ext = new ParameterDescriptor<?>[parameters.length + 2]; ext[0] = MapProjection.SEMI_MAJOR; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java index 9201692401..c880201617 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java @@ -143,7 +143,7 @@ public class DefaultProjectedCRS extends AbstractDerivedCRS implements Projected * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static GeodeticCRS checkDimensions(final GeodeticCRS baseCRS, final CartesianCS derivedCS) { int n = baseCRS.getCoordinateSystem().getDimension(); if (derivedCS != null) { diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java index aa1be96fdb..d356b2c3fd 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java @@ -129,7 +129,7 @@ public class DefaultCompoundCS extends AbstractCS { * * @param components the coordinate systems. */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private DefaultCompoundCS(final CoordinateSystem[] components, final CoordinateSystemAxis[] axes) { super(Map.of(NAME_KEY, AxisDirections.appendTo(new StringBuilder(60).append("Compound CS"), axes)), axes); this.components = List.of(components); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java index 9d5229608f..acf3d1d4fc 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultOperationMethod.java @@ -243,7 +243,7 @@ public class DefaultOperationMethod extends AbstractIdentifiedObject implements * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Map<String,?> getProperties(final MathTransform transform) { ArgumentChecks.ensureNonNull("transform", transform); if (transform instanceof Parameterized) { diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java index f27e833a7e..4df06a0993 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java @@ -92,7 +92,7 @@ public class AlbersEqualArea extends AuthalicConversion { * ("Relax constraint on placement of this()/super() call in constructors"). */ @SuppressWarnings("fallthrough") - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.FALSE_EASTING, EASTING_AT_FALSE_ORIGIN); @@ -105,7 +105,7 @@ public class AlbersEqualArea extends AuthalicConversion { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private AlbersEqualArea(final Initializer initializer) { super(initializer, null); double φ0 = initializer.getAndStore(LATITUDE_OF_FALSE_ORIGIN); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java index 1221c5d6b5..100edba838 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AzimuthalEquidistant.java @@ -83,7 +83,7 @@ public class AzimuthalEquidistant extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.LATITUDE_OF_CONFORMAL_SPHERE_RADIUS, LATITUDE_OF_ORIGIN); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java index 2fb4d233d2..23770b1fd0 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CassiniSoldner.java @@ -144,7 +144,7 @@ public class CassiniSoldner extends MeridianArcBased { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, new Variant[] {Variant.HYPERBOLIC}, Variant.DEFAULT); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java index 4cd28cd643..737033915a 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java @@ -134,7 +134,7 @@ public class CylindricalEqualArea extends AuthalicConversion { * ("Relax constraint on placement of this()/super() call in constructors"). */ @SuppressWarnings("fallthrough") - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, Variant.values(), Variant.ELLIPSOIDAL); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); @@ -153,7 +153,7 @@ public class CylindricalEqualArea extends AuthalicConversion { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private CylindricalEqualArea(final Initializer initializer) { super(initializer, null); variant = (Variant) initializer.variant; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java index 3efb1416af..bbe96dbf74 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/EquidistantCylindrical.java @@ -87,7 +87,7 @@ public class EquidistantCylindrical extends NormalizedProjection { * ("Relax constraint on placement of this()/super() call in constructors"). */ @SuppressWarnings("fallthrough") - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.FALSE_EASTING, Equirectangular.FALSE_EASTING); @@ -100,7 +100,7 @@ public class EquidistantCylindrical extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private EquidistantCylindrical(final Initializer initializer) { super(initializer, null); final double φ1 = toRadians(initializer.getAndStore(Equirectangular.STANDARD_PARALLEL)); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java index 799dbd245e..e386699b22 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java @@ -84,7 +84,7 @@ public class LambertAzimuthalEqualArea extends AuthalicConversion { * ("Relax constraint on placement of this()/super() call in constructors"). */ @SuppressWarnings("fallthrough") - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.CENTRAL_MERIDIAN, LONGITUDE_OF_ORIGIN); @@ -97,7 +97,7 @@ public class LambertAzimuthalEqualArea extends AuthalicConversion { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private LambertAzimuthalEqualArea(final Initializer initializer) { super(initializer, null); final double φ0 = toRadians(initializer.getAndStore(LATITUDE_OF_ORIGIN)); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java index 237cdb988d..7bfa5750aa 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java @@ -184,7 +184,7 @@ public class LambertConicConformal extends ConformalProjection { * ("Relax constraint on placement of this()/super() call in constructors"). */ @SuppressWarnings("fallthrough") - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, Variant.values(), Variant.TWO_PARALLELS); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); @@ -230,7 +230,7 @@ public class LambertConicConformal extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private LambertConicConformal(final Initializer initializer) { super(initializer); final Variant variant = (Variant) initializer.variant; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java index 2d8d94500f..4884e1a17e 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java @@ -187,7 +187,7 @@ public class Mercator extends ConformalProjection { * ("Relax constraint on placement of this()/super() call in constructors"). */ @SuppressWarnings("fallthrough") - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, Variant.values(), Variant.TWO_PARALLELS); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); @@ -238,7 +238,7 @@ public class Mercator extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private Mercator(final Initializer initializer) { super(initializer); variant = (Variant) initializer.variant; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java index 897efef1c9..2ec28b7902 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ModifiedAzimuthalEquidistant.java @@ -83,7 +83,7 @@ public class ModifiedAzimuthalEquidistant extends AzimuthalEquidistant { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.CENTRAL_MERIDIAN, LONGITUDE_OF_ORIGIN); @@ -111,7 +111,7 @@ public class ModifiedAzimuthalEquidistant extends AzimuthalEquidistant { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private ModifiedAzimuthalEquidistant(final Initializer initializer) { super(initializer); var ν0 = initializer.rν2(sinφ0).sqrt().inverse(); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java index 845db2afba..9ed01b9ed5 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mollweide.java @@ -73,7 +73,7 @@ public class Mollweide extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.CENTRAL_MERIDIAN, CENTRAL_MERIDIAN); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java index 28b09adbcf..68009a4470 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueMercator.java @@ -154,7 +154,7 @@ public class ObliqueMercator extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, Variant.values(), Variant.DEFAULT); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); @@ -169,6 +169,7 @@ public class ObliqueMercator extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ + @Workaround(library="JDK", version="7", fixed="25") private ObliqueMercator(final Initializer initializer) { super(initializer); final Variant variant = (Variant) initializer.variant; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java index 8f3d99da87..29c65e405f 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java @@ -109,7 +109,7 @@ public class ObliqueStereographic extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.CENTRAL_MERIDIAN, LONGITUDE_OF_ORIGIN); @@ -123,6 +123,7 @@ public class ObliqueStereographic extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ + @Workaround(library="JDK", version="7", fixed="25") private ObliqueStereographic(final Initializer initializer) { super(initializer, null); final double φ0 = toRadians(initializer.getAndStore(LATITUDE_OF_ORIGIN)); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java index 7e5454a54a..6affdb1dc3 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Orthographic.java @@ -67,7 +67,7 @@ public class Orthographic extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.CENTRAL_MERIDIAN, LONGITUDE_OF_ORIGIN); @@ -95,7 +95,7 @@ public class Orthographic extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private Orthographic(final Initializer initializer) { super(initializer, null); final double φ0 = toRadians(initializer.getAndStore(LATITUDE_OF_ORIGIN)); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java index 9ad021cdba..60da7e68d7 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java @@ -137,7 +137,7 @@ public class PolarStereographic extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, Variant.values(), Variant.B); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); @@ -160,7 +160,7 @@ public class PolarStereographic extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private PolarStereographic(final Initializer initializer) { super(initializer); final Variant variant = (Variant) initializer.variant; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java index fd079ce026..0c1563940d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Polyconic.java @@ -89,7 +89,7 @@ public class Polyconic extends MeridianArcBased { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.CENTRAL_MERIDIAN, LONGITUDE_OF_ORIGIN); @@ -117,6 +117,7 @@ public class Polyconic extends MeridianArcBased { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ + @Workaround(library="JDK", version="8", fixed="25") private Polyconic(final Initializer initializer) { super(initializer); final double φ0 = toRadians(initializer.getAndStore(LATITUDE_OF_ORIGIN)); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Robinson.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Robinson.java index 07589af2e9..404a3173c8 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Robinson.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Robinson.java @@ -93,7 +93,7 @@ public class Robinson extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); roles.put(ParameterRole.CENTRAL_MERIDIAN, CENTRAL_MERIDIAN); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/SatelliteTracking.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/SatelliteTracking.java index a8f92dbd81..1e33245e84 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/SatelliteTracking.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/SatelliteTracking.java @@ -101,7 +101,7 @@ public class SatelliteTracking extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database ("Relax constraint on * placement of this()/super() call in constructors"). */ - @Workaround(library = "JDK", version = "1.8") + @Workaround(library="JDK", version="8", fixed="25") static Initializer initializer(final OperationMethod method, final Parameters parameters) { final EnumMap<NormalizedProjection.ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(NormalizedProjection.ParameterRole.class); roles.put(NormalizedProjection.ParameterRole.CENTRAL_MERIDIAN, CENTRAL_MERIDIAN); @@ -124,6 +124,7 @@ public class SatelliteTracking extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ + @Workaround(library="JDK", version="8", fixed="25") private SatelliteTracking(final Initializer initializer) { super(initializer, null); final double φ0 = toRadians(initializer.getAndStore(LATITUDE_OF_ORIGIN)); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java index 7dccde4ed5..b4e7c35a26 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Sinusoidal.java @@ -90,7 +90,7 @@ public class Sinusoidal extends MeridianArcBased { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.8") + @Workaround(library="JDK", version="8", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, Variant.values(), null); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); @@ -119,7 +119,7 @@ public class Sinusoidal extends MeridianArcBased { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private Sinusoidal(final Initializer initializer) { super(initializer); variant = (Variant) initializer.variant; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java index a1c8bfe073..fbd23875b0 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java @@ -201,7 +201,7 @@ public class TransverseMercator extends NormalizedProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Initializer initializer(final OperationMethod method, final Parameters parameters) { final Variant variant = variant(method, Variant.values(), null); final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java index 2bf3b283e8..38078c546b 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java @@ -141,7 +141,7 @@ public final class Affine extends AbstractProvider { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static ParameterDescriptor<?>[] descriptors() { final var descriptors = MatrixParameters.EPSG.getAllDescriptors(EPSG_DIMENSION, EPSG_DIMENSION + 1); return new ParameterDescriptor<?>[] { diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java index a1875b0bcc..a2b94ee4e7 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java @@ -68,7 +68,7 @@ final class NoOp extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private NoOp(final Parameters parameters) { super(new Initializer(new DefaultOperationMethod( Map.of(DefaultOperationMethod.NAME_KEY, parameters.getDescriptor().getName()), @@ -79,7 +79,7 @@ final class NoOp extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Parameters parameters(final Ellipsoid ellipsoid, final boolean declareIvf) { final Parameters parameters = parameters( ellipsoid.getSemiMajorAxis(), @@ -94,7 +94,7 @@ final class NoOp extends ConformalProjection { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static Parameters parameters(final double semiMajor, final double semiMinor) { final ParameterValueGroup group = new ParameterBuilder() .addName("No-operation").createGroupForMapProjection().createValue(); diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/UnsupportedStorageException.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/UnsupportedStorageException.java index 12eec9386f..e1fbdbda72 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/UnsupportedStorageException.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/UnsupportedStorageException.java @@ -111,7 +111,7 @@ public class UnsupportedStorageException extends IllegalOpenParameterException { * This is a work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="10") + @Workaround(library="JDK", version="10", fixed="25") private static Object type(final Object storage) { if ((storage instanceof File && ((File) storage).isDirectory()) || (storage instanceof Path && Files.isDirectory((Path) storage))) diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java index 81149dcb9b..3b51dd7fb4 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java @@ -48,7 +48,7 @@ public final class BILConsistencyTest extends CoverageReadConsistency<RawRasterS * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static RawRasterStore openFile() throws IOException, DataStoreException { final URL url = BIPConsistencyTest.class.getResource("BIL.raw"); assertNotNull(url, "Test file not found."); @@ -60,6 +60,7 @@ public final class BILConsistencyTest extends CoverageReadConsistency<RawRasterS * ("Relax constraint on placement of this()/super() call in constructors"). */ @Override + @Workaround(library="JDK", version="7", fixed="25") protected GridCoverageResource resource() throws DataStoreException { return store; } diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java index 445d1006f6..637f453e30 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java @@ -48,7 +48,7 @@ public final class BIPConsistencyTest extends CoverageReadConsistency<RawRasterS * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static RawRasterStore openFile() throws IOException, DataStoreException { final URL url = BIPConsistencyTest.class.getResource("BIP.raw"); assertNotNull(url, "Test file not found."); @@ -60,6 +60,7 @@ public final class BIPConsistencyTest extends CoverageReadConsistency<RawRasterS * ("Relax constraint on placement of this()/super() call in constructors"). */ @Override + @Workaround(library="JDK", version="7", fixed="25") protected GridCoverageResource resource() throws DataStoreException { return store; } diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java index 52049a7eff..25509b3c6e 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java @@ -48,7 +48,7 @@ public final class BSQConsistencyTest extends CoverageReadConsistency<RawRasterS * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static RawRasterStore openFile() throws IOException, DataStoreException { final URL url = BSQConsistencyTest.class.getResource("BSQ.raw"); assertNotNull(url, "Test file not found."); @@ -60,6 +60,7 @@ public final class BSQConsistencyTest extends CoverageReadConsistency<RawRasterS * ("Relax constraint on placement of this()/super() call in constructors"). */ @Override + @Workaround(library="JDK", version="7", fixed="25") protected GridCoverageResource resource() throws DataStoreException { return store; } diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java index 7bb47e5b1d..3b4420bda5 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java @@ -52,7 +52,7 @@ public final class SelfConsistencyTest extends CoverageReadConsistency<WorldFile * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private static WorldFileStore openFile() throws IOException, DataStoreException { final URL url = WorldFileStoreTest.class.getResource("gradient.png"); assertNotNull(url, "Test file not found."); @@ -64,6 +64,7 @@ public final class SelfConsistencyTest extends CoverageReadConsistency<WorldFile * ("Relax constraint on placement of this()/super() call in constructors"). */ @Override + @Workaround(library="JDK", version="7", fixed="25") protected GridCoverageResource resource() throws DataStoreException { return store.components().iterator().next(); } diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/CoverageReadConsistency.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/CoverageReadConsistency.java index da57d46dde..f44e47ccdf 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/CoverageReadConsistency.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/CoverageReadConsistency.java @@ -187,7 +187,7 @@ public abstract class CoverageReadConsistency<S extends DataStore> extends TestC * @return the resource to test. * @throws DataStoreException if an error occurred while reading the resource. */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") protected abstract GridCoverageResource resource() throws DataStoreException; /** diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Printer.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Printer.java index a0284331be..b504da1115 100644 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Printer.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Printer.java @@ -59,7 +59,7 @@ public final class Printer extends PrintWriter { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private Printer(final StringWriter buffer) { super(buffer); this.buffer = buffer; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/IdentifiedMediaData.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/IdentifiedMediaData.java index 310b446f5b..c53c29905c 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/IdentifiedMediaData.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/IdentifiedMediaData.java @@ -68,7 +68,7 @@ public final class IdentifiedMediaData extends MediaData { * ("Relax constraint on placement of this()/super() call in constructors"). * The identifier needs to be read before the call to `super(reader)`. */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private IdentifiedMediaData(final Reader reader, final int id) throws IOException { super(reader); identifier = id; diff --git a/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgStore.java b/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgStore.java index f585741201..88ceeca80e 100644 --- a/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgStore.java +++ b/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgStore.java @@ -143,7 +143,7 @@ public class GpkgStore extends SQLStore implements WritableAggregate { * Work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). */ - @Workaround(library="JDK", version="1.7") + @Workaround(library="JDK", version="7", fixed="25") private GpkgStore(final DataStoreProvider provider, final Initializer init) throws DataStoreException { super(provider, init.connector); path = init.path; diff --git a/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Initializer.java b/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Initializer.java index 9b2fb3e11e..176533f6c5 100644 --- a/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Initializer.java +++ b/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Initializer.java @@ -47,7 +47,7 @@ import org.apache.sis.util.Workaround; * * @author Martin Desruisseaux (Geomatys). */ -@Workaround(library="JDK", version="1.7") +@Workaround(library="JDK", version="7", fixed="25") final class Initializer { /** * Suffixes of auxiliary files.
