Author: desruisseaux Date: Fri Jan 26 10:48:27 2018 New Revision: 1822268 URL: http://svn.apache.org/viewvc?rev=1822268&view=rev Log: Upgrade trunk from Java 7 to Java 8. Removed: sis/trunk/application/sis-javafx/ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptySortedSet.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/ISOCalendar.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/ Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java sis/trunk/core/sis-build-helper/pom.xml sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Java2D.java sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ElementTest.java sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/AbstractLocationType.java sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ModifiableLocationType.java sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationViewer.java sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/CoordinateFormat.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameter.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/LazySet.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/MergedProperties.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ServicesForMetadata.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/IntegerList.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterTableRow.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NameIterator.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxesConvention.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/CoordinateSystems.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/SQLTranslator.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/OperationMethodSet.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NoOp.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/AbstractIterator.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/AbstractMap.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/Numerics.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/CompoundDirectPositions.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/PackedVector.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Scalar.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/SystemUnit.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Exceptions.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/IntegerList.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/MathFunctionsTest.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/MetadataMock.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java sis/trunk/ide-project/NetBeans/nbproject/project.properties sis/trunk/pom.xml sis/trunk/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java sis/trunk/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4Factory.java sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoKeys.java sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Type.java sis/trunk/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/GeoIdentifiers.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/DiscreteSampling.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/FeaturesInfo.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/FeaturesWrapper.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.java sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java sis/trunk/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java sis/trunk/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureIterator.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelDataInput.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelDataOutput.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelFactory.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/ChannelImageInputStream.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/IOUtilities.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/InputStreamAdapter.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/io/Region.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureNaming.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/Query.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/UnsupportedQueryException.java sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataInputTest.java sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelDataOutputTest.java sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageInputStreamTest.java sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/ChannelImageOutputStreamTest.java sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/io/HyperRectangleReaderTest.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Copyright.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/GroupAsPolylineOperation.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Metadata.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Reader.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamWriter.java sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java [UTF-8] (original) +++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -131,7 +131,7 @@ public class ResourcesDownloader extends */ @Override public Set getAuthorities() { - return (console != null && directory != null) ? Collections.singleton(EPSG) : Collections.emptySet(); + return (console != null && directory != null) ? Collections.singleton(EPSG) : Collections.emptySet(); } /** Modified: sis/trunk/core/sis-build-helper/pom.xml URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/pom.xml?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-build-helper/pom.xml (original) +++ sis/trunk/core/sis-build-helper/pom.xml Fri Jan 26 10:48:27 2018 @@ -163,7 +163,7 @@ Define Maven Mojos and Javadoc taglets f This copy will not be needed anymore if http://jira.codehaus.org/browse/MNG-3328 get fixed. --> - jdk7-tools.jar + jdk8-tools.jar java.vendor Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] (original) +++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -17,7 +17,6 @@ package org.apache.sis.internal.doclet; import java.io.File; -import java.io.FilenameFilter; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileNotFoundException; @@ -209,13 +208,8 @@ public final class Doclet extends HtmlDo * @throws IOException if an error occurred while reading or writing. */ private static void copyResources(final File inputDirectory, final File outputDirectory) throws IOException { - final File[] inputFiles = inputDirectory.listFiles(new FilenameFilter() { - @Override public boolean accept(final File dir, final String name) { - return !name.startsWith(".") && - !name.equals("overview.html") && - !name.equals(STYLESHEET); - } - }); + final File[] inputFiles = inputDirectory.listFiles((final File dir, final String name) -> + !name.startsWith(".") && !name.equals("overview.html") && !name.equals(STYLESHEET)); try { for (final File input : inputFiles) { final File output = new File(outputDirectory, input.getName()); Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java [UTF-8] (original) +++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/InlineTaglet.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -43,20 +43,7 @@ abstract class InlineTaglet implements T */ private static synchronized RootDoc getRootDoc() { if (configuration == null) { - /* - * Try to invoke ConfigurationImpl.getInstance(), which exists on JDK6 and JDK7 but not on JDK8. - * If we fail, fallback on direct instantiation of ConfigurationImpl(), which is possible only - * in JDK8 (because the constructor is private on JDK6 and JDK7). - */ - try { - configuration = (Configuration) ConfigurationImpl.class.getMethod("getInstance").invoke(null); - } catch (ReflectiveOperationException e) { - try { - configuration = ConfigurationImpl.class.newInstance(); - } catch (ReflectiveOperationException e2) { - return null; // Allowed by this method contract. - } - } + configuration = new ConfigurationImpl(); } return configuration.root; } Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAssociation.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -240,11 +240,6 @@ public abstract class AbstractAssociatio @Override public Object next() { return it.next().getPropertyValue(pt); } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } }).toString(); } Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -373,7 +373,7 @@ public abstract class AbstractAttribute< * is suitable when then caller only wants to read the map and does not plan to write anything. */ final Map> characteristicsReadOnly() { - return (characteristics != null) ? characteristics : Collections.>emptyMap(); + return (characteristics != null) ? characteristics : Collections.emptyMap(); } /** Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -31,7 +31,8 @@ import org.apache.sis.util.Classes; import org.apache.sis.util.Debug; // Branch-dependent imports -import org.apache.sis.internal.jdk8.UncheckedIOException; +import java.util.function.BiFunction; +import java.io.UncheckedIOException; /** @@ -60,7 +61,9 @@ import org.apache.sis.internal.jdk8.Unch * @since 0.6 * @module */ -public abstract class AbstractOperation extends AbstractIdentifiedType { +public abstract class AbstractOperation extends AbstractIdentifiedType + implements BiFunction +{ /** * For cross-version compatibility. */ @@ -190,6 +193,7 @@ public abstract class AbstractOperation * Can be {@code null} if the operation does not take any parameters. * @return the operation result, or {@code null} if this operation does not produce any result. */ + @Override public abstract Object apply(AbstractFeature feature, ParameterValueGroup parameters); /** Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -28,7 +28,6 @@ import org.apache.sis.util.resources.Err import static org.apache.sis.util.ArgumentChecks.ensureNonNullElement; -import org.apache.sis.internal.jdk8.JDK8; /** * Implementation of the map returned by {@link DefaultAttributeType#characteristics()}. @@ -144,7 +143,7 @@ final class CharacteristicTypeMap extend for (final Map.Entry entry : aliases.entrySet()) { final Integer value = entry.getValue(); if (value >= 0) { - JDK8.putIfAbsent(indices, entry.getKey(), value); + indices.putIfAbsent(entry.getKey(), value); } } this.indices = CollectionsExt.compact(indices); Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -31,8 +31,6 @@ import org.apache.sis.internal.util.Nume import static org.apache.sis.util.ArgumentChecks.*; -// Branch-dependent imports - /** * Definition of an attribute in a feature type. @@ -315,7 +313,7 @@ public class DefaultAttributeType ext * @see AbstractAttribute#characteristics() */ public Map> characteristics() { - return (characteristics != null) ? characteristics : Collections.>emptyMap(); + return (characteristics != null) ? characteristics : Collections.emptyMap(); } /** Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -40,9 +40,6 @@ import org.apache.sis.internal.util.Coll import org.apache.sis.internal.util.UnmodifiableArrayList; import org.apache.sis.internal.feature.Resources; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; - /** * Abstraction of a real-world phenomena. A {@code FeatureType} instance describes the class of all @@ -411,7 +408,7 @@ public class DefaultFeatureType extends final AbstractIdentifiedType property = entry.getValue(); if (property != null) { final String tip = entry.getKey(); - if (JDK8.putIfAbsent(byName, tip, property) == null) { + if (byName.putIfAbsent(tip, property) == null) { /* * This block is skipped if there is properties named "tip" and "head:tip". * The 'indices' value may be null if the property is an operation. Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/EnvelopeOperation.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -38,9 +38,6 @@ import org.apache.sis.geometry.GeneralEn import org.apache.sis.referencing.CRS; import org.apache.sis.util.resources.Errors; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; - /** * An operation computing the envelope that encompass all geometries found in a list of attributes. @@ -159,7 +156,7 @@ final class EnvelopeOperation extends Ab } characterizedByCRS = true; } - JDK8.putIfAbsent(names, attributeName, attributeCRS); + names.putIfAbsent(attributeName, attributeCRS); } } /* Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -49,7 +49,7 @@ import org.apache.sis.referencing.Identi import org.apache.sis.math.MathFunctions; // Branch-dependent imports -import org.apache.sis.internal.jdk8.UncheckedIOException; +import java.io.UncheckedIOException; /** Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -28,8 +28,6 @@ import org.apache.sis.util.Classes; import org.apache.sis.util.Debug; import org.apache.sis.internal.feature.Resources; -// Branch-dependent imports - /** * An attribute or association implementation which delegate its work to the parent feature. @@ -110,7 +108,7 @@ final class PropertyView { * @return a collection containing the given element if non-null, or an empty collection otherwise. */ static List singletonOrEmpty(final V element) { - return (element != null) ? Collections.singletonList(element) : Collections.emptyList(); + return (element != null) ? Collections.singletonList(element) : Collections.emptyList(); } /** Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeRole.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -19,7 +19,6 @@ package org.apache.sis.feature.builder; import java.util.Set; import java.util.EnumSet; import org.apache.sis.feature.FeatureOperations; -import org.apache.sis.internal.jdk8.BiFunction; /** @@ -74,17 +73,11 @@ public enum AttributeRole { /** * Returns the union of the given set of attribute roles. - * Note: this is a lambda function on the JDK8 branch. */ - static final BiFunction, Set, Set> merge = - new BiFunction, Set, Set>() + static Set merge(final Set oldValue, + final Set newValue) { - @Override - public Set apply(final Set oldValue, - final Set newValue) - { - final EnumSet union = EnumSet.copyOf(oldValue); - return union.addAll(newValue) ? union : oldValue; - } - }; + final EnumSet union = EnumSet.copyOf(oldValue); + return union.addAll(newValue) ? union : oldValue; + } } Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -43,7 +43,6 @@ import org.apache.sis.util.resources.Err import org.apache.sis.util.ArraysExt; // Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; import org.apache.sis.feature.AbstractFeature; import org.apache.sis.feature.AbstractIdentifiedType; import org.apache.sis.feature.DefaultAssociationRole; @@ -336,10 +335,10 @@ public class FeatureTypeBuilder extends final Set rc = Collections.singleton(role); if (property instanceof AbstractOperation) { for (final String dependency : ((AbstractOperation) property).getDependencies()) { - JDK8.merge(propertyRoles, dependency, rc, AttributeRole.merge); + propertyRoles.merge(dependency, rc, AttributeRole::merge); } } else { - JDK8.merge(propertyRoles, name.toString(), rc, AttributeRole.merge); + propertyRoles.merge(name.toString(), rc, AttributeRole::merge); } } if (builder != null) { Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/DateList.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -21,7 +21,7 @@ import org.apache.sis.math.Vector; import org.apache.sis.util.collection.CheckedContainer; // Branch-dependent imports -import org.apache.sis.internal.jdk8.Instant; +import java.time.Instant; /** Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Java2D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Java2D.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Java2D.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/Java2D.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -23,7 +23,6 @@ import java.awt.geom.Path2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import org.apache.sis.geometry.GeneralEnvelope; -import org.apache.sis.internal.jdk8.JDK8; import org.apache.sis.setup.GeometryLibrary; import org.apache.sis.internal.referencing.j2d.ShapeUtilities; import org.apache.sis.math.Vector; @@ -128,7 +127,7 @@ final class Java2D extends Geometries= 0;) { final double value = v.doubleValue(i); Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/MovingFeature.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -30,8 +30,8 @@ import org.apache.sis.util.CorruptedObje import org.apache.sis.internal.util.UnmodifiableArrayList; // Branch-dependent imports -import org.apache.sis.internal.jdk8.Instant; -import org.apache.sis.internal.jdk8.Consumer; +import java.time.Instant; +import java.util.function.Consumer; import org.apache.sis.feature.AbstractFeature; import org.apache.sis.feature.AbstractAttribute; import org.apache.sis.feature.DefaultAttributeType; Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -47,7 +47,7 @@ public final strictfp class DefaultAttri * @return an attribute type for a city name. */ public static DefaultAttributeType city() { - return city(new HashMap()); + return city(new HashMap<>()); } /** Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -117,7 +117,7 @@ public final strictfp class FeatureForma @SuppressWarnings("serial") public void testFeatureTypeWithDeprecatedProperties() { DefaultFeatureType feature = DefaultFeatureTypeTest.city(); - final Map properties = new HashMap(name("highway")); + final Map properties = new HashMap<>(name("highway")); properties.put(DefaultAttributeType.DEPRECATED_KEY, Boolean.TRUE); properties.put(DefaultAttributeType.DESCRIPTION_KEY, "Replaced by pedestrian areas."); feature = new DefaultFeatureType(name("City for human"), false, new DefaultFeatureType[] {feature}, Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -49,7 +49,7 @@ public final strictfp class MultiValuedA * This attribute has no default value. */ private static MultiValuedAttribute population() { - return new MultiValuedAttribute<>(DefaultAttributeTypeTest.population(new HashMap(4))); + return new MultiValuedAttribute<>(DefaultAttributeTypeTest.population(new HashMap<>(4))); } /** Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -57,7 +57,7 @@ public final strictfp class SingletonAtt * This attribute has no default value. */ static SingletonAttribute population() { - return new SingletonAttribute<>(DefaultAttributeTypeTest.population(new HashMap(4))); + return new SingletonAttribute<>(DefaultAttributeTypeTest.population(new HashMap<>(4))); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -22,9 +22,6 @@ import java.lang.reflect.Field; import org.apache.sis.util.logging.Logging; import org.apache.sis.internal.system.Modules; -// Branch-specific imports -import org.apache.sis.internal.jdk8.JDK8; - /** * Constants for axis names specified by ISO 19111 and ISO 19162. @@ -204,6 +201,6 @@ public final class AxisNames { * @return the given name in camel case. */ public static String toCamelCase(final String name) { - return JDK8.getOrDefault(VALUES, toUpperCase(name, new StringBuilder(name.length())), name); + return VALUES.getOrDefault(toUpperCase(name, new StringBuilder(name.length())), name); } } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -192,7 +192,7 @@ public abstract class LegacyPropertyAdap * @return the given value as a collection. */ public static Collection asCollection(final L value) { - return (value != null) ? Collections.singleton(value) : Collections.emptySet(); + return (value != null) ? Collections.singleton(value) : Collections.emptySet(); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -32,9 +32,6 @@ import org.apache.sis.util.CorruptedObje import org.apache.sis.util.resources.Errors; import org.apache.sis.util.Classes; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; - /** * Merges the content of two metadata instances. @@ -184,7 +181,7 @@ public class Merger { final String propertyName = entry.getKey(); final Object sourceValue = entry.getValue(); final Object targetValue = dryRun ? targetMap.get(propertyName) - : JDK8.putIfAbsentConservative(targetMap, propertyName, sourceValue); + : targetMap.putIfAbsent(propertyName, sourceValue); if (targetValue != null) { if (targetValue instanceof ModifiableMetadata) { success = copy(sourceValue, (ModifiableMetadata) targetValue, dryRun); Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -278,11 +278,7 @@ public abstract class Initializer { boolean create = false; final boolean isEnvClear = DataDirectory.isEnvClear(); if (!isEnvClear || (source = embedded()) == null) { - final String home = AccessController.doPrivileged(new PrivilegedAction() { - @Override public String run() { - return System.getProperty(DERBY_HOME_KEY); - } - }); + final String home = AccessController.doPrivileged((PrivilegedAction) () -> System.getProperty(DERBY_HOME_KEY)); final Path dir = DataDirectory.DATABASES.getDirectory(); final String dbURL; if (dir != null) { @@ -335,11 +331,9 @@ public abstract class Initializer { * Register the shutdown hook before to attempt any operation on the database in order to close * it properly if the schemas creation below fail. */ - Shutdown.register(new Callable() { - @Override public Object call() throws ReflectiveOperationException { - shutdown(); - return null; - } + Shutdown.register(() -> { + shutdown(); + return null; }); /* * If the database does not exist, create it. We allow creation only if we are inside @@ -368,11 +362,8 @@ public abstract class Initializer { */ public static boolean hasJNDI() { return NamingManager.hasInitialContextFactoryBuilder() || - AccessController.doPrivileged(new PrivilegedAction() { - @Override public Boolean run() { - return System.getProperty(Context.INITIAL_CONTEXT_FACTORY) != null; - } - }); + AccessController.doPrivileged((PrivilegedAction) () -> + System.getProperty(Context.INITIAL_CONTEXT_FACTORY) != null); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -37,8 +37,7 @@ import org.apache.sis.util.CharSequences import org.apache.sis.util.resources.Errors; // Branch-specific imports -import org.apache.sis.internal.jdk8.JDK8; -import org.apache.sis.internal.jdk8.BiFunction; +import java.util.function.BiFunction; /** @@ -426,7 +425,7 @@ public class ScriptRunner implements Aut * @return the word to use instead. */ protected final String getReplacement(final String inScript) { - return JDK8.getOrDefault(replacements, inScript, inScript); + return replacements.getOrDefault(inScript, inScript); } /** @@ -436,7 +435,7 @@ public class ScriptRunner implements Aut * @param function the function that modify the replacement mapping. */ protected final void modifyReplacements(final BiFunction function) { - JDK8.replaceAll(replacements, function); + replacements.replaceAll(function); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -38,9 +38,6 @@ import org.apache.sis.internal.util.Unmo import static org.apache.sis.util.CharSequences.skipLeadingWhitespaces; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; - /** * An element in a Well Know Text (WKT). An {@code Element} is made of {@link String}, @@ -317,7 +314,7 @@ final class Element implements Serializa * Store the value, using shared instances if this Element may be stored for a long time. */ if (sharedValues != null) { - final Object e = JDK8.putIfAbsent(sharedValues, value, value); + final Object e = sharedValues.putIfAbsent(value, value); if (e != null) { value = e; } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -1544,7 +1544,7 @@ public class Formatter implements Locali */ private Warnings warnings() { if (warnings == null) { - warnings = new Warnings(locale, false, Collections.>emptyMap()); + warnings = new Warnings(locale, false, Collections.emptyMap()); } return warnings; } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -201,7 +201,7 @@ class GeodeticObjectParser extends MathT public GeodeticObjectParser(final Map defaultProperties, final ObjectFactory factories, final MathTransformFactory mtFactory) { - super(Symbols.getDefault(), Collections.emptyMap(), null, null, null, + super(Symbols.getDefault(), Collections.emptyMap(), null, null, null, mtFactory, (Locale) defaultProperties.get(Errors.LOCALE_KEY)); crsFactory = (CRSFactory) factories; csFactory = (CSFactory) factories; @@ -927,7 +927,7 @@ class GeodeticObjectParser extends MathT name = AxisDirections.appendTo(buffer.append("CS"), axes); } if (csProperties == null) { - csProperties = java.util.Collections.singletonMap(CoordinateSystem.NAME_KEY, name); + csProperties = singletonMap(CoordinateSystem.NAME_KEY, name); } else { csProperties.put(CoordinateSystem.NAME_KEY, name); } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -113,7 +113,7 @@ class MathTransformParser extends Abstra * @param mtFactory the factory to use to create {@link MathTransform} objects. */ public MathTransformParser(final MathTransformFactory mtFactory) { - this(Symbols.getDefault(), Collections.emptyMap(), null, null, null, mtFactory, null); + this(Symbols.getDefault(), Collections.emptyMap(), null, null, null, mtFactory, null); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -47,9 +47,6 @@ import org.apache.sis.util.resources.Err import org.apache.sis.internal.util.Constants; import org.apache.sis.internal.util.StandardDateFormat; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; - /** * Parser and formatter for Well Known Text (WKT) strings. @@ -693,7 +690,7 @@ public class WKTFormat extends CompoundF new Object[] {name + " = " + element.keyword + "[…]", CharSequences.token(wkt, index)}, index); } // 'fragments' map has been created by 'parser()'. - if (JDK8.putIfAbsent(fragments, name, element) == null) { + if (fragments.putIfAbsent(name, element) == null) { return; } error = Errors.Keys.ElementAlreadyPresent_1; Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -204,9 +204,7 @@ public final class Warnings implements L */ final void publish() { if (!published) { - ignoredElements = ignoredElements.isEmpty() - ? Collections.>emptyMap() - : new LinkedHashMap<>(ignoredElements); + ignoredElements = ignoredElements.isEmpty() ? Collections.emptyMap() : new LinkedHashMap<>(ignoredElements); published = true; } } @@ -285,7 +283,7 @@ public final class Warnings implements L * @return the non-fatal exceptions that occurred. */ public Set getExceptions() { - return (exceptionSources != null) ? exceptionSources.keySet() : Collections.emptySet(); + return (exceptionSources != null) ? exceptionSources.keySet() : Collections.emptySet(); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -146,8 +146,7 @@ final class Freezer extends Cloner { * by their unmodifiable variant. The keys are assumed already immutable. */ if (object instanceof Map) { - @SuppressWarnings("unchecked") - final Map map = new LinkedHashMap<>((Map) object); + final Map map = new LinkedHashMap<>((Map) object); for (final Map.Entry entry : map.entrySet()) { entry.setValue(clone(entry.getValue())); } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -218,8 +218,7 @@ public class MetadataCopier { return c; } if (metadata instanceof Map) { - @SuppressWarnings("unchecked") - final Map copy = new LinkedHashMap<>((Map) metadata); + final Map copy = new LinkedHashMap<>((Map) metadata); for (final Map.Entry entry : copy.entrySet()) { entry.setValue(copyRecursively(type, entry.getValue())); } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -44,10 +44,6 @@ import org.apache.sis.internal.simple.Si import static org.apache.sis.util.ArgumentChecks.ensureNonNull; import static org.apache.sis.util.ArgumentChecks.ensureNonNullElement; -// Branch-specific imports -import org.apache.sis.internal.jdk8.JDK8; -import org.apache.sis.internal.jdk8.BiFunction; - /** * Enumeration of some metadata standards. A standard is defined by a set of Java interfaces @@ -363,20 +359,18 @@ public class MetadataStandard implements * Found the interface for which to create an accessor. Creates the accessor now, unless an accessor * has been created concurrently in another thread in which case the later will be returned. */ - return (PropertyAccessor) JDK8.compute(accessors, key, new BiFunction() { - @Override public Object apply(final CacheKey k, final Object v) { - if (v instanceof PropertyAccessor) { - return v; - } - final Class standardImpl = getImplementation(type); - final PropertyAccessor accessor; - if (SpecialCases.isSpecialCase(type)) { - accessor = new SpecialCases(citation, type, k.type, standardImpl); - } else { - accessor = new PropertyAccessor(citation, type, k.type, standardImpl); - } - return accessor; + return (PropertyAccessor) accessors.compute(key, (k, v) -> { + if (v instanceof PropertyAccessor) { + return v; + } + final Class standardImpl = getImplementation(type); + final PropertyAccessor accessor; + if (SpecialCases.isSpecialCase(type)) { + accessor = new SpecialCases(citation, type, k.type, standardImpl); + } else { + accessor = new PropertyAccessor(citation, type, k.type, standardImpl); } + return accessor; }); } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -37,11 +37,7 @@ final class ObjectPair { /** * The set of objects currently in process of being compared. */ - static final ThreadLocal> CURRENT = new ThreadLocal>() { - @Override protected Set initialValue() { - return new HashSet<>(); - } - }; + static final ThreadLocal> CURRENT = ThreadLocal.withInitial(HashSet::new); /** * The pair of objects in process of being compared. Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -267,7 +267,7 @@ final class PropertyInformation exten */ @Override public Integer getMaximumOccurrence() { - final int n = maximumOccurs & 0xFF; + final int n = Byte.toUnsignedInt(maximumOccurs); return (n == 0xFF) ? Integer.MAX_VALUE : n; } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -137,13 +137,10 @@ abstract class PropertyMap extends Ab return index < accessor.count(); } - /** - * Assumes that the underlying map is unmodifiable. + /* + * remove() is an unsupported operation since we assume that the underlying map is unmodifiable. + * So we inherit the default implementation from Iterator. */ - @Override - public final void remove() { - throw new UnsupportedOperationException(); - } } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -74,7 +74,7 @@ final class TypeMap extends PropertyMap< throw new NoSuchElementException(); } final Class value = accessor.type(index, valuePolicy); - return new SimpleImmutableEntry>(accessor.name(index++, keyPolicy), value); + return new SimpleImmutableEntry<>(accessor.name(index++, keyPolicy), value); } }; } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -1059,7 +1059,7 @@ public class DefaultMetadata extends ISO final InternationalString i18n = (newValue != null) ? new SimpleInternationalString(newValue) : null; final List newValues = (metadataStandards != null) ? new ArrayList<>(metadataStandards) - : new ArrayList(1); + : new ArrayList<>(1); DefaultCitation citation = newValues.isEmpty() ? null : DefaultCitation.castOrCopy(newValues.get(0)); if (citation == null) { citation = new DefaultCitation(); Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -105,7 +105,7 @@ public final class Citations extends Sta * * @since 0.6 */ - public static final List ISO_19115 = UnmodifiableArrayList.wrap(new CitationConstant[] { + public static final List ISO_19115 = UnmodifiableArrayList.wrap(new CitationConstant[] { new CitationConstant("ISO 19115-1"), new CitationConstant("ISO 19115-2") }); Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -301,7 +301,7 @@ public class DefaultTelephone extends IS owner = new ArrayList<>(4); owner.add(this); } else { - owner = Collections.singletonList(this); + owner = Collections.singletonList(this); } } return owner; Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -17,6 +17,7 @@ package org.apache.sis.metadata.iso.distribution; import java.util.Collection; +import java.util.function.BiConsumer; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -32,7 +33,6 @@ import org.apache.sis.metadata.iso.citat import org.apache.sis.metadata.iso.ISOMetadata; // Branch-dependent imports -import org.apache.sis.internal.jdk8.BiConsumer; import static org.opengis.annotation.Obligation.OPTIONAL; import static org.opengis.annotation.Obligation.MANDATORY; import static org.opengis.annotation.Specification.ISO_19115; @@ -259,11 +259,7 @@ public class DefaultFormat extends ISOMe @Deprecated public void setSpecification(final InternationalString newValue) { checkWritePermission(); - setFormatSpecificationCitation(new BiConsumer() { - @Override public void accept(DefaultCitation citation, InternationalString value) { - citation.setTitle(value); - } - }, newValue); + setFormatSpecificationCitation((citation, value) -> citation.setTitle(value), newValue); } /** @@ -300,11 +296,8 @@ public class DefaultFormat extends ISOMe @Deprecated public void setName(final InternationalString newValue) { checkWritePermission(); - setFormatSpecificationCitation(new BiConsumer() { - @Override public void accept(DefaultCitation citation, InternationalString value) { - citation.setAlternateTitles(LegacyPropertyAdapter.asCollection(value)); - } - }, newValue); + setFormatSpecificationCitation((citation, value) -> + citation.setAlternateTitles(LegacyPropertyAdapter.asCollection(value)), newValue); } /** @@ -337,11 +330,7 @@ public class DefaultFormat extends ISOMe @Deprecated public void setVersion(final InternationalString newValue) { checkWritePermission(); - setFormatSpecificationCitation(new BiConsumer() { - @Override public void accept(DefaultCitation citation, InternationalString value) { - citation.setEdition(value); - } - }, newValue); + setFormatSpecificationCitation((citation, value) -> citation.setEdition(value), newValue); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -19,6 +19,7 @@ package org.apache.sis.metadata.iso.exte import java.util.Set; import java.util.LinkedHashSet; import java.util.Collection; +import java.util.function.BinaryOperator; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -40,9 +41,6 @@ import org.apache.sis.internal.metadata. import org.apache.sis.xml.NilObject; import org.apache.sis.xml.NilReason; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.BinaryOperator; - /** * Information about spatial, vertical, and temporal extent. @@ -331,9 +329,9 @@ public class DefaultExtent extends ISOMe description = NilReason.MISSING.createNilObject(InternationalString.class); } } - geographicElements = intersect(GeographicExtent.class, geographicElements, other.getGeographicElements(), new BinaryOperator() {@Override public GeographicExtent apply(GeographicExtent e1, GeographicExtent e2) {return Extents.intersection(e1, e2);}}); - verticalElements = intersect(VerticalExtent.class, verticalElements, other.getVerticalElements(), new BinaryOperator () {@Override public VerticalExtent apply(VerticalExtent e1, VerticalExtent e2) {return Extents.intersection(e1, e2);}}); - temporalElements = intersect(TemporalExtent.class, temporalElements, other.getTemporalElements(), new BinaryOperator () {@Override public TemporalExtent apply(TemporalExtent e1, TemporalExtent e2) {return Extents.intersection(e1, e2);}}); + geographicElements = intersect(GeographicExtent.class, geographicElements, other.getGeographicElements(), Extents::intersection); + verticalElements = intersect(VerticalExtent.class, verticalElements, other.getVerticalElements(), Extents::intersection); + temporalElements = intersect(TemporalExtent.class, temporalElements, other.getTemporalElements(), Extents::intersection); } /** Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/Extents.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -52,9 +52,6 @@ import org.apache.sis.util.Static; import static java.lang.Math.*; import static org.apache.sis.internal.metadata.ReferencingServices.AUTHALIC_RADIUS; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; - /** * Convenience static methods for extracting information from {@link Extent} objects. @@ -382,7 +379,7 @@ public final class Extents extends Stati if (min == null) return max; if (max == null) return min; final long startTime = min.getTime(); - return new Date(startTime + Math.round((max.getTime() - startTime) * location)); // addExact on JDK8 branch. + return new Date(Math.addExact(startTime, Math.round((max.getTime() - startTime) * location))); } /** @@ -402,7 +399,7 @@ public final class Extents extends Stati xmax += (Longitude.MAX_VALUE - Longitude.MIN_VALUE); } x = Longitude.normalize((x + xmax) / 2); - if (JDK8.isFinite(x) || JDK8.isFinite(y)) { + if (Double.isFinite(x) || Double.isFinite(y)) { return ReferencingServices.getInstance().geographic(x, y); } } Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -214,7 +214,7 @@ public class DefaultAggregateInformation * If there is more than one value, replace only the first one and keep all other ones unchanged. * The intend is to be consistent with the getter method, which returns the first element. */ - final ArrayList identifiers = new ArrayList(name.getIdentifiers()); + final ArrayList identifiers = new ArrayList<>(name.getIdentifiers()); if (identifiers.isEmpty()) { identifiers.add(newValue); } else { Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java?rev=1822268&r1=1822267&r2=1822268&view=diff ============================================================================== --- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java [UTF-8] (original) +++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/Dispatcher.java [UTF-8] Fri Jan 26 10:48:27 2018 @@ -31,9 +31,6 @@ import org.apache.sis.metadata.ValueExis import org.apache.sis.internal.system.Semaphores; import org.apache.sis.internal.metadata.Dependencies; -// Branch-dependent imports -import org.apache.sis.internal.jdk8.JDK8; - /** * The handler for metadata proxy that implement (indirectly) metadata interfaces like @@ -242,7 +239,7 @@ final class Dispatcher implements Invoca final Map map = source.standard.asValueMap(cache, type, KeyNamePolicy.METHOD_NAME, ValueExistencePolicy.ALL); synchronized (cache) { - value = JDK8.putIfAbsent(map, method.getName(), value); + value = map.putIfAbsent(method.getName(), value); if (value == null) { value = method.invoke(cache); }