You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/07/19 08:55:13 UTC
[sis] 02/02: Add more @SuppressWarnings(…) specific to the master branch. In particular, we do not document the classes that are only placeholders for a future GeoAPI version.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 50e75f02471536d8c94501a1d08a11d5b05dc677
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Jul 19 10:53:56 2023 +0200
Add more @SuppressWarnings(…) specific to the master branch.
In particular, we do not document the classes that are only
placeholders for a future GeoAPI version.
---
core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java | 1 +
.../src/main/java/org/apache/sis/filter/PropertyValue.java | 4 ++--
.../apache/sis/internal/geoapi/filter/BetweenComparisonOperator.java | 1 +
.../apache/sis/internal/geoapi/filter/BinaryComparisonOperator.java | 1 +
.../org/apache/sis/internal/geoapi/filter/ComparisonOperatorName.java | 1 +
.../org/apache/sis/internal/geoapi/filter/DistanceOperatorName.java | 1 +
.../java/org/apache/sis/internal/geoapi/filter/FilterExpressions.java | 1 +
.../src/main/java/org/apache/sis/internal/geoapi/filter/Literal.java | 1 +
.../java/org/apache/sis/internal/geoapi/filter/LogicalOperator.java | 1 +
.../org/apache/sis/internal/geoapi/filter/LogicalOperatorName.java | 1 +
.../main/java/org/apache/sis/internal/geoapi/filter/MatchAction.java | 1 +
.../src/main/java/org/apache/sis/internal/geoapi/filter/Name.java | 1 +
.../src/main/java/org/apache/sis/internal/geoapi/filter/SortBy.java | 1 +
.../main/java/org/apache/sis/internal/geoapi/filter/SortOrder.java | 1 +
.../main/java/org/apache/sis/internal/geoapi/filter/SortProperty.java | 1 +
.../org/apache/sis/internal/geoapi/filter/SpatialOperatorName.java | 1 +
.../org/apache/sis/internal/geoapi/filter/TemporalOperatorName.java | 1 +
.../java/org/apache/sis/internal/geoapi/filter/ValueReference.java | 1 +
.../src/test/java/org/apache/sis/test/feature/FeatureComparator.java | 2 +-
.../java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java | 1 +
.../sis/metadata/iso/identification/DefaultOperationMetadata.java | 2 ++
.../org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java | 2 ++
.../apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java | 3 ++-
.../org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java | 2 ++
.../java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java | 1 +
.../apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java | 1 +
.../apache/sis/internal/referencing/provider/GeocentricAffine.java | 1 +
.../sis/referencing/operation/transform/ProjectiveTransformTest.java | 3 ++-
.../java/org/apache/sis/internal/geoapi/temporal/PeriodDuration.java | 1 +
.../java/org/apache/sis/internal/geoapi/temporal/TemporalFactory.java | 1 +
.../src/test/java/org/apache/sis/test/ContentVerifier.java | 1 +
.../src/test/java/org/apache/sis/internal/netcdf/TestData.java | 1 +
.../main/java/org/apache/sis/internal/storage/MetadataBuilder.java | 1 +
33 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java b/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
index 4836b86dd1..5604034892 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
@@ -52,6 +52,7 @@ final class Validator {
* @param scope {@code FEATURE} if the object to validate is a feature, or
* {@code ATTRIBUTE} for an attribute, or {@code null} otherwise.
*/
+ @SuppressWarnings("deprecation")
Validator(final ScopeCode scope) {
quality = new DefaultDataQuality();
if (scope != null) {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java b/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
index 1d0074bf4d..ccf1b26383 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/PropertyValue.java
@@ -392,8 +392,8 @@ split: if (path != null) {
}
while (type instanceof AbstractOperation) {
final AbstractIdentifiedType result = ((AbstractOperation) type).getResult();
- if (result != type && result instanceof AbstractIdentifiedType) {
- type = (AbstractIdentifiedType) result;
+ if (result != type && result != null) {
+ type = result;
} else if (result instanceof DefaultFeatureType) {
return addTo.addAssociation((DefaultFeatureType) result).setName(name);
} else {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BetweenComparisonOperator.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BetweenComparisonOperator.java
index 2905fb62c0..22dc83e23a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BetweenComparisonOperator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BetweenComparisonOperator.java
@@ -24,6 +24,7 @@ import org.apache.sis.filter.Filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public interface BetweenComparisonOperator<R> extends Filter<R> {
Expression<R,?> getExpression();
Expression<R,?> getLowerBoundary();
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BinaryComparisonOperator.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BinaryComparisonOperator.java
index eec80796c3..9094048ccd 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BinaryComparisonOperator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/BinaryComparisonOperator.java
@@ -24,6 +24,7 @@ import org.apache.sis.filter.Filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public interface BinaryComparisonOperator<R> extends Filter<R> {
Expression<R,?> getOperand1();
Expression<R,?> getOperand2();
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ComparisonOperatorName.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ComparisonOperatorName.java
index cc7e75160d..ebb93d5d9a 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ComparisonOperatorName.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ComparisonOperatorName.java
@@ -21,6 +21,7 @@ package org.apache.sis.internal.geoapi.filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public enum ComparisonOperatorName {
PROPERTY_IS_EQUAL_TO,
PROPERTY_IS_NOT_EQUAL_TO,
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/DistanceOperatorName.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/DistanceOperatorName.java
index d5a2c5c37d..d4f2ec60ff 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/DistanceOperatorName.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/DistanceOperatorName.java
@@ -21,6 +21,7 @@ package org.apache.sis.internal.geoapi.filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public enum DistanceOperatorName {
BEYOND, WITHIN;
}
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/FilterExpressions.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/FilterExpressions.java
index cae55c6df5..5030e583b2 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/FilterExpressions.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/FilterExpressions.java
@@ -30,6 +30,7 @@ import org.apache.sis.util.iso.Names;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
final class FilterExpressions<R> extends AbstractList<Expression<R,?>> {
private final List<Filter<R>> filters;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Literal.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Literal.java
index 93c3140420..8ffd9bb42f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Literal.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Literal.java
@@ -26,6 +26,7 @@ import org.apache.sis.filter.Expression;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public interface Literal<R,V> extends Expression<R,V> {
@Override
default ScopedName getFunctionName() {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperator.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperator.java
index e68663026b..1327747bf1 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperator.java
@@ -25,6 +25,7 @@ import org.apache.sis.filter.Expression;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public interface LogicalOperator<R> extends Filter<R> {
@Override
LogicalOperatorName getOperatorType();
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperatorName.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperatorName.java
index d9ddcbed8a..ada9815632 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperatorName.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/LogicalOperatorName.java
@@ -21,6 +21,7 @@ package org.apache.sis.internal.geoapi.filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public enum LogicalOperatorName {
AND, OR, NOT;
}
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/MatchAction.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/MatchAction.java
index 9ac098d757..8fac9ab8cd 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/MatchAction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/MatchAction.java
@@ -21,6 +21,7 @@ package org.apache.sis.internal.geoapi.filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public enum MatchAction {
ANY, ALL, ONE;
}
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Name.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Name.java
index a4387f00be..9f6f0e4f62 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Name.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/Name.java
@@ -26,6 +26,7 @@ import org.opengis.util.ScopedName;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public final class Name {
static final LocalName STANDARD = Names.createLocalName(null, null, "fes");
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortBy.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortBy.java
index 960845f03d..10bfda3d9f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortBy.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortBy.java
@@ -24,6 +24,7 @@ import java.util.Comparator;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public interface SortBy<R> extends Comparator<R> {
List<SortProperty<R>> getSortProperties();
}
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortOrder.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortOrder.java
index dab0c48d8e..258ee6668d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortOrder.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortOrder.java
@@ -21,6 +21,7 @@ package org.apache.sis.internal.geoapi.filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public enum SortOrder {
ASCENDING("ASC"), DESCENDING("DESC");
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortProperty.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortProperty.java
index f3cd74aa69..d8c197db17 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortProperty.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SortProperty.java
@@ -23,6 +23,7 @@ import java.util.Comparator;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public interface SortProperty<R> extends Comparator<R> {
ValueReference<R,?> getValueReference();
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SpatialOperatorName.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SpatialOperatorName.java
index 9c5c4ec508..774c8e6d5f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SpatialOperatorName.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/SpatialOperatorName.java
@@ -21,6 +21,7 @@ package org.apache.sis.internal.geoapi.filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public enum SpatialOperatorName {
BBOX, EQUALS, DISJOINT, INTERSECTS, TOUCHES, CROSSES, WITHIN, CONTAINS, OVERLAPS;
}
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/TemporalOperatorName.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/TemporalOperatorName.java
index 0780b9e8f7..1f4239b0bb 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/TemporalOperatorName.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/TemporalOperatorName.java
@@ -21,6 +21,7 @@ package org.apache.sis.internal.geoapi.filter;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public enum TemporalOperatorName {
AFTER, BEFORE, BEGINS, BEGUN_BY, CONTAINS, DURING, EQUALS, OVERLAPS, MEETS, ENDS,
OVERLAPPED_BY, MET_BY, ENDED_BY, ANY_INTERACTS;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ValueReference.java b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ValueReference.java
index dc3b5ba045..e7187683a8 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ValueReference.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/geoapi/filter/ValueReference.java
@@ -23,6 +23,7 @@ import org.apache.sis.filter.Expression;
* Placeholder for GeoAPI 3.1 interfaces (not yet released).
* Shall not be visible in public API, as it will be deleted after next GeoAPI release.
*/
+@SuppressWarnings("doclint:missing")
public interface ValueReference<R,V> extends Expression<R,V> {
String getXPath();
}
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
index 627c1c88cc..a5b1aa03af 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
@@ -190,7 +190,7 @@ public class FeatureComparator {
}
if (expected instanceof AbstractIdentifiedType) {
assertInstanceOf(path(), AbstractIdentifiedType.class, actual);
- comparePropertyType((AbstractIdentifiedType) expected, (AbstractIdentifiedType) actual);
+ comparePropertyType(expected, actual);
recognized = true;
}
if (!recognized) {
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index f0649b1712..bc1afc8ab7 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@ -102,6 +102,7 @@ public class DefaultMedium extends ISOMetadata implements Medium {
* Density at which the data is recorded.
* If non-null, then the number shall be greater than zero.
*/
+ @SuppressWarnings("serial")
private Collection<Double> densities;
/**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
index 831d542f38..5e3ccc7032 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
@@ -188,6 +188,7 @@ public class DefaultOperationMetadata extends ISOMetadata {
*
* @return distributed computing platforms on which the operation has been implemented.
*/
+ @SuppressWarnings("unchecked")
@XmlJavaTypeAdapter(DCPList.class)
@XmlElement(name = "distributedComputingPlatform", required = true)
@UML(identifier="distributedComputingPlatform", obligation=MANDATORY, specification=ISO_19115)
@@ -229,6 +230,7 @@ public class DefaultOperationMetadata extends ISOMetadata {
*
* @param newValues the new distributed computing platforms on which the operation has been implemented.
*/
+ @SuppressWarnings("unchecked")
public void setDistributedComputingPlatforms(final Collection<? extends CodeList<?>> newValues) {
distributedComputingPlatforms = writeCollection(newValues, distributedComputingPlatforms, (Class) CodeList.class);
}
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java
index 7619b889e5..72311b85a6 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/AttributeTypeAdapter.java
@@ -36,6 +36,7 @@ final class AttributeTypeAdapter extends XmlAdapter<GO_CharacterString, Attribut
* defined by ISO 19115-3:2016 schema.
*/
@Override
+ @SuppressWarnings("deprecation")
public AttributeType unmarshal(GO_CharacterString value) {
return new LegacyFeatureType(LegacyFeatureType.ADAPTER.unmarshal(value));
}
@@ -45,6 +46,7 @@ final class AttributeTypeAdapter extends XmlAdapter<GO_CharacterString, Attribut
* {@link DefaultScopeDescription}.
*/
@Override
+ @SuppressWarnings("deprecation")
public GO_CharacterString marshal(AttributeType value) {
return LegacyFeatureType.ADAPTER.marshal(LegacyFeatureType.wrap(value));
}
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
index 5e42274fbf..6b34730321 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
@@ -238,7 +238,7 @@ public class DefaultScopeDescription extends ISOMetadata implements ScopeDescrip
return cast(value, type);
} else if (!(value instanceof Set) || !((Set<?>) value).isEmpty()) {
return Semaphores.query(Semaphores.NULL_COLLECTION)
- ? null : new ExcludedSet<E>(NAMES[code-1], NAMES[property-1]);
+ ? null : new ExcludedSet<>(NAMES[code-1], NAMES[property-1]);
}
}
/*
@@ -563,6 +563,7 @@ public class DefaultScopeDescription extends ISOMetadata implements ScopeDescrip
*
* @since 1.0
*/
+ @SuppressWarnings("deprecation")
public void setLevelDescription(final ScopeCode level, final Set<? extends CharSequence> newValues) {
if (ScopeCode.DATASET.equals(level)) {
String description = null;
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java
index c3ef65d804..5cb88cc2b2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/FeatureTypeAdapter.java
@@ -36,6 +36,7 @@ final class FeatureTypeAdapter extends XmlAdapter<GO_CharacterString, FeatureTyp
* defined by ISO 19115-3:2016 schema.
*/
@Override
+ @SuppressWarnings("deprecation")
public FeatureType unmarshal(GO_CharacterString value) {
return new LegacyFeatureType(LegacyFeatureType.ADAPTER.unmarshal(value));
}
@@ -45,6 +46,7 @@ final class FeatureTypeAdapter extends XmlAdapter<GO_CharacterString, FeatureTyp
* {@link DefaultScopeDescription}.
*/
@Override
+ @SuppressWarnings("deprecation")
public GO_CharacterString marshal(FeatureType value) {
return LegacyFeatureType.ADAPTER.marshal(LegacyFeatureType.wrap(value));
}
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
index 24efd5b8ab..2f6f3c0907 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
@@ -115,6 +115,7 @@ public class DefaultDataQuality extends ISOMetadata implements DataQuality {
*
* @since 0.5
*/
+ @SuppressWarnings("deprecation")
public DefaultDataQuality(final ScopeCode level) {
if (level != null) {
scope = new DefaultScope(level);
diff --git a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
index a0baf34552..1c11dd97e1 100644
--- a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
+++ b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
@@ -118,6 +118,7 @@ public abstract class ReferencingByIdentifiers extends AbstractReferenceSystem {
*
* @see #getLocationTypes()
*/
+ @SuppressWarnings("serial")
final List<AbstractLocationType> locationTypes;
/**
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
index f3e4ef1e15..9d2fc36d48 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
@@ -69,6 +69,7 @@ public abstract class GeocentricAffine extends GeodeticOperation {
*
* @see #type
*/
+ @SuppressWarnings("doclint:missing")
protected enum Type {TRANSLATION, SEVEN_PARAM, FRAME_ROTATION, MOLODENSKY, CONVERSION};
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
index e23c2aecc9..d76f64631e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
@@ -56,6 +56,7 @@ import org.opengis.test.referencing.TransformTestCase;
* @version 1.4
* @since 0.5
*/
+@SuppressWarnings("doclint:missing")
@DependsOn({AbstractMathTransformTest.class, ScaleTransformTest.class})
public class ProjectiveTransformTest extends TransformTestCase {
/**
@@ -137,7 +138,7 @@ public class ProjectiveTransformTest extends TransformTestCase {
*/
static final String MESSAGE = "This test is not available in GeoAPI 3.0. "
- + "See Apache SIS JDK6, JDK7 or JDK8 branch for the actual tests.";
+ + "See Apache SIS geoapi-4.0 branch for the actual tests.";
@Test
@Ignore(MESSAGE)
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/PeriodDuration.java b/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/PeriodDuration.java
index 2e441d61b1..82a76952e7 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/PeriodDuration.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/PeriodDuration.java
@@ -29,6 +29,7 @@ import org.opengis.util.InternationalString;
* @since 0.3
* @version 0.3
*/
+@SuppressWarnings("doclint:missing")
public interface PeriodDuration extends org.opengis.temporal.PeriodDuration {
/**
* A positive integer, followed by the character "Y",
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/TemporalFactory.java b/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/TemporalFactory.java
index cbecf6dd3c..68850d609d 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/TemporalFactory.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/geoapi/temporal/TemporalFactory.java
@@ -27,6 +27,7 @@ import org.opengis.util.InternationalString;
* @since 0.3
* @version 0.3
*/
+@SuppressWarnings("doclint:missing")
public interface TemporalFactory {
Instant createInstant(Date date);
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/ContentVerifier.java b/core/sis-utility/src/test/java/org/apache/sis/test/ContentVerifier.java
index 51c5362dc8..6d206be9e7 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/ContentVerifier.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/ContentVerifier.java
@@ -25,6 +25,7 @@ import org.opengis.metadata.Metadata;
* Place-holder for a GeoAPI 3.1 class. Used only for allowing the code to compile.
* For real test execution, see the development branches on GeoAPI 4.0-SNAPSHOT.
*/
+@SuppressWarnings("doclint:missing")
public class ContentVerifier {
public void addPropertyToIgnore(Class<?> type, String property) {
assumeTrue("This test requires GeoAPI 3.1.", false);
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestData.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestData.java
index 0f6f4353f1..f421b3d76f 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestData.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestData.java
@@ -26,6 +26,7 @@ import static org.junit.Assume.*;
* Place-holder for a GeoAPI 3.1 class. Used only for allowing the code to compile.
* For real test execution, see the development branches on GeoAPI 4.0-SNAPSHOT.
*/
+@SuppressWarnings("doclint:missing")
public enum TestData {
NETCDF_2D_GEOGRAPHIC,
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
index 85825b4622..973a2cd795 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
@@ -2903,6 +2903,7 @@ parse: for (int i = 0; i < length;) {
* @see #addProcessing(CharSequence, String)
* @see #addProcessDescription(CharSequence)
*/
+ @SuppressWarnings("deprecation")
public final void addSource(final CharSequence description, final ScopeCode level, final CharSequence feature) {
final InternationalString i18n = trim(description);
if (i18n != null) {