This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit fd0471a759b66b3b898d05b6bce66b993d405af3 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Jun 24 17:14:31 2025 +0200 Rename `getLogRecord` as `createLogRecord` (internal method). --- .../main/org/apache/sis/console/AboutCommand.java | 2 +- .../sis/geometry/wrapper/GeometryFactories.java | 2 +- .../main/org/apache/sis/image/AnnotatedImage.java | 2 +- .../main/org/apache/sis/image/ErrorHandler.java | 2 +- .../org/apache/sis/image/privy/TileOpExecutor.java | 2 +- .../apache/sis/metadata/sql/CachedStatement.java | 2 +- .../apache/sis/metadata/sql/MetadataSource.java | 4 +- .../apache/sis/metadata/sql/MetadataWriter.java | 2 +- .../apache/sis/metadata/sql/privy/Initializer.java | 6 +-- .../main/org/apache/sis/util/iso/Types.java | 2 +- .../main/org/apache/sis/xml/bind/Context.java | 2 +- .../apache/sis/xml/privy/ExceptionSimplifier.java | 2 +- .../factory/AuthorityFactoryIdentifier.java | 4 +- .../factory/ConcurrentAuthorityFactory.java | 4 +- .../referencing/factory/GeodeticObjectFactory.java | 2 +- .../referencing/factory/IdentifiedObjectSet.java | 2 +- .../factory/MultiAuthoritiesFactory.java | 4 +- .../referencing/factory/sql/EPSGDataAccess.java | 14 ++++-- .../sis/referencing/factory/sql/EPSGInstaller.java | 13 +++-- .../factory/sql/InstallationScriptProvider.java | 4 +- .../internal/ParameterizedTransformBuilder.java | 9 ++-- .../operation/CoordinateOperationRegistry.java | 2 +- .../referencing/operation/gridded/GridFile.java | 5 +- .../referencing/operation/gridded/LoadedGrid.java | 2 +- .../provider/FranceGeocentricInterpolation.java | 2 +- .../sis/referencing/operation/provider/NTv2.java | 4 +- .../sis/referencing/privy/DefinitionVerifier.java | 2 +- .../sis/storage/geotiff/ImageFileDirectory.java | 2 +- .../sis/storage/geotiff/reader/CRSBuilder.java | 2 +- .../sis/storage/netcdf/NetcdfStoreProvider.java | 2 +- .../apache/sis/storage/netcdf/base/Decoder.java | 2 +- .../sis/storage/netcdf/base/NamedElement.java | 2 +- .../apache/sis/storage/sql/feature/Database.java | 2 +- .../sis/storage/sql/feature/SelectionClause.java | 2 +- .../apache/sis/storage/sql/postgis/Postgres.java | 6 ++- .../sis/storage/AbstractGridCoverageResource.java | 2 +- .../main/org/apache/sis/storage/URLDataSource.java | 9 ++-- .../sis/storage/base/DocumentedStoreProvider.java | 2 +- .../org/apache/sis/storage/base/URIDataStore.java | 6 ++- .../sis/storage/csv/MovingFeatureBuilder.java | 9 +++- .../main/org/apache/sis/storage/csv/Store.java | 2 +- .../org/apache/sis/storage/wkt/StoreFormat.java | 2 +- .../main/org/apache/sis/system/DataDirectory.java | 2 +- .../org/apache/sis/system/OptionalDependency.java | 6 ++- .../main/org/apache/sis/system/Supervisor.java | 2 +- .../org/apache/sis/util/collection/WeakEntry.java | 2 +- .../sis/util/resources/IndexedResourceBundle.java | 55 ++++++++++++---------- .../resources/ResourceInternationalString.java | 2 +- .../util/resources/IndexedResourceBundleTest.java | 8 ++-- .../apache/sis/storage/geoheif/GeoHeifStore.java | 2 +- .../org/apache/sis/storage/isobmff/Reader.java | 2 +- .../main/org/apache/sis/storage/gdal/GDAL.java | 2 +- .../apache/sis/storage/panama/LibraryLoader.java | 2 +- 53 files changed, 137 insertions(+), 103 deletions(-) diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java index ffad45f08c..e117142701 100644 --- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java +++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java @@ -144,7 +144,7 @@ final class AboutCommand extends CommandRunner { final double scale = (delay >= 10) ? 1 : (delay >= 1) ? 10 : 100; delay = Math.rint(delay * scale) / scale; } - final LogRecord record = Messages.forLocale(locale).getLogRecord(Level.INFO, + final LogRecord record = Messages.forLocale(locale).createLogRecord(Level.INFO, Messages.Keys.ConfigurationOf_3, address, new Date(), delay); record.setLoggerName(Loggers.APPLICATION); Logging.completeAndLog(null, Command.class, "main", record); diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryFactories.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryFactories.java index 76b8ec56a5..13a01772c2 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryFactories.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryFactories.java @@ -61,7 +61,7 @@ public final class GeometryFactories { try { factory = (Geometries<?>) Class.forName(classname).getField("INSTANCE").get(null); } catch (ReflectiveOperationException | LinkageError e) { - LogRecord record = Resources.forLocale(null).getLogRecord(Level.CONFIG, + LogRecord record = Resources.forLocale(null).createLogRecord(Level.CONFIG, Resources.Keys.OptionalLibraryNotFound_2, name, e.toString()); Logging.completeAndLog(Geometries.LOGGER, Geometries.class, "register", record); return previous; diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java index 04a5c4f71b..125f36ffe5 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java @@ -375,7 +375,7 @@ abstract class AnnotatedImage extends ImageAdapter { errors = report = new ErrorHandler.Report(); } report.add(null, e, () -> Errors.forLocale(null) - .getLogRecord(Level.WARNING, Errors.Keys.CanNotCompute_1, property)); + .createLogRecord(Level.WARNING, Errors.Keys.CanNotCompute_1, property)); } } finally { handler.putAndUnlock(success ? value : null); // Cache only if no error occurred. diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java index 4fd4b90173..c80bf50f6e 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorHandler.java @@ -173,7 +173,7 @@ public interface ErrorHandler { if (description == null) { if (tile != null) { description = Resources.forLocale(null) - .getLogRecord(Level.WARNING, Resources.Keys.CanNotProcessTile_2, tile.x, tile.y); + .createLogRecord(Level.WARNING, Resources.Keys.CanNotProcessTile_2, tile.x, tile.y); } else { description = new LogRecord(Level.WARNING, error.toString()); } diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileOpExecutor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileOpExecutor.java index 0b1ea180b9..cbea76f1d6 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileOpExecutor.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/privy/TileOpExecutor.java @@ -300,7 +300,7 @@ public class TileOpExecutor { } catch (Exception ex) { final Point tile = new Point(tx, ty); errors.add(tile, trimImagingWrapper(ex), () -> Resources.forLocale(null) - .getLogRecord(Level.WARNING, Resources.Keys.CanNotUpdateTile_2, tile.x, tile.y)); + .createLogRecord(Level.WARNING, Resources.Keys.CanNotUpdateTile_2, tile.x, tile.y)); } } errorHandler.publish(errors); diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java index 41188399c7..07927a9d51 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java @@ -150,7 +150,7 @@ final class CachedStatement implements AutoCloseable { final boolean hasNext = r.next(); r.close(); if (hasNext) { - warning(type, "<init>", Errors.forLocale(null).getLogRecord( + warning(type, "<init>", Errors.forLocale(null).createLogRecord( Level.WARNING, Errors.Keys.DuplicatedIdentifier_1, identifier)); } identifier = null; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java index 8f2367c401..1a17908534 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java @@ -331,7 +331,7 @@ public class MetadataSource implements AutoCloseable { * little bit simpler, keep only the root cause provided that the exception type is compatible. * If the Derby driver was not found at all, reduce the logging level since Derby is optional. */ - warning = Errors.forLocale(null).getLogRecord(Level.WARNING, Errors.Keys.CanNotConnectTo_1, Initializer.JNDI); + warning = Errors.forLocale(null).createLogRecord(Level.WARNING, Errors.Keys.CanNotConnectTo_1, Initializer.JNDI); warning.setThrown(Exceptions.unwrap(e)); if (e instanceof ClassNotFoundException) { warning.setLevel(Level.CONFIG); // Derby driver not on the module path. @@ -784,7 +784,7 @@ public class MetadataSource implements AutoCloseable { if (identifier == null) { identifier = candidate; } else if (!identifier.equals(candidate)) { - warning(MetadataSource.class, "search", Errors.forLocale(null).getLogRecord( + warning(MetadataSource.class, "search", Errors.forLocale(null).createLogRecord( Level.WARNING, Errors.Keys.DuplicatedElement_1, candidate)); break; } diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java index 135c5ae6da..ae6b925744 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java @@ -463,7 +463,7 @@ public class MetadataWriter extends MetadataSource { .appendIdentifier(schema(), table).append(" DROP CONSTRAINT ") .appendIdentifier(fkey.keyName).toString()); warning(MetadataWriter.class, "add", Messages.forLocale(null) - .getLogRecord(Level.WARNING, Messages.Keys.DroppedForeignerKey_1, + .createLogRecord(Level.WARNING, Messages.Keys.DroppedForeignerKey_1, table + '.' + column + " ⇒ " + fkey.tableName + '.' + ID_COLUMN)); } } diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Initializer.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Initializer.java index ee6c471520..dea1d6e2b1 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Initializer.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/privy/Initializer.java @@ -294,7 +294,7 @@ public abstract class Initializer { */ } } catch (NoInitialContextException | NameNotFoundException e) { - final LogRecord record = Messages.forLocale(null).getLogRecord( + final LogRecord record = Messages.forLocale(null).createLogRecord( Level.CONFIG, Messages.Keys.JNDINotSpecified_1, JNDI); // The null arguments let `Logging` infers the public caller. @@ -415,7 +415,7 @@ public abstract class Initializer { level = connected ? Level.FINE : Level.CONFIG; connected = true; } - final LogRecord record = Messages.forLocale(null).getLogRecord(level, + final LogRecord record = Messages.forLocale(null).createLogRecord(level, Messages.Keys.ConnectedToGeospatialDatabase_1, SQLUtilities.getSimplifiedURL(metadata)); Logging.completeAndLog(SystemListener.LOGGER, classe, method, record); } @@ -439,7 +439,7 @@ public abstract class Initializer { value = DataDirectory.ENV; } final Messages resources = Messages.forLocale(locale); - return asLog ? resources.getLogRecord(Level.WARNING, key, value) : resources.getString(key, value); + return asLog ? resources.createLogRecord(Level.WARNING, key, value) : resources.getString(key, value); } /** diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java index 1214ab578d..60481b6e4b 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java @@ -821,7 +821,7 @@ public final class Types extends Static { * may have been ignored. We declare Types.toInternationalString(…) as the source since * it is the public facade invoking this method. */ - final LogRecord record = Messages.forLocale(null).getLogRecord(Level.WARNING, Messages.Keys.LocalesDiscarded); + final LogRecord record = Messages.forLocale(null).createLogRecord(Level.WARNING, Messages.Keys.LocalesDiscarded); Logging.completeAndLog(LOGGER, Types.class, "toInternationalString", record); } } diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java index 5c9ca975f4..4c1983815a 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java @@ -823,7 +823,7 @@ public final class Context extends MarshalContext { } else { throw new IllegalArgumentException(String.valueOf(resources)); } - record = bundle.getLogRecord(level, key, arguments); + record = bundle.createLogRecord(level, key, arguments); } else { record = new LogRecord(level, Exceptions.formatChainedMessages(locale, null, exception)); } diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExceptionSimplifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExceptionSimplifier.java index 9db9997e58..28c1f0dee5 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExceptionSimplifier.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/privy/ExceptionSimplifier.java @@ -137,7 +137,7 @@ public final class ExceptionSimplifier { public LogRecord record(final Class<?> classe, final String method) { final LogRecord record; if (errorKey != 0) { - record = Errors.forLocale(null).getLogRecord(Level.WARNING, errorKey, errorValues); + record = Errors.forLocale(null).createLogRecord(Level.WARNING, errorKey, errorValues); } else { record = new LogRecord(Level.WARNING, exception.getMessage()); } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java index 96f01812d3..a67a3e1d15 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java @@ -273,7 +273,7 @@ final class AuthorityFactoryIdentifier { * @param used the factory which will be used. */ void logConflict(final AuthorityFactory used) { - log(Resources.forLocale(null).getLogRecord(Level.WARNING, Resources.Keys.IgnoredServiceProvider_3, + log(Resources.forLocale(null).createLogRecord(Level.WARNING, Resources.Keys.IgnoredServiceProvider_3, type.api, getAuthorityAndVersion(), Classes.getClass(used))); } @@ -282,7 +282,7 @@ final class AuthorityFactoryIdentifier { * {@code AuthorityFactoryIdentifier} fallback on a default version. */ void logFallback() { - log(Resources.forLocale(null).getLogRecord(Level.WARNING, Resources.Keys.FallbackDefaultFactoryVersion_2, + log(Resources.forLocale(null).createLogRecord(Level.WARNING, Resources.Keys.FallbackDefaultFactoryVersion_2, authority, version)); } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java index ec51343a7d..7dda302217 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java @@ -493,9 +493,9 @@ public abstract class ConcurrentAuthorityFactory<DAO extends GeodeticAuthorityFa final Messages resources = Messages.forLocale(null); final LogRecord record; if (code != null) { - record = resources.getLogRecord(level, Messages.Keys.CreateDurationFromIdentifier_3, type, code, duration); + record = resources.createLogRecord(level, Messages.Keys.CreateDurationFromIdentifier_3, type, code, duration); } else { - record = resources.getLogRecord(level, Messages.Keys.CreateDuration_2, type, duration); + record = resources.createLogRecord(level, Messages.Keys.CreateDuration_2, type, duration); } Logging.completeAndLog(LOGGER, getClass(), caller, record); } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java index 620896f25c..31f7617988 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java @@ -307,7 +307,7 @@ public class GeodeticObjectFactory extends AbstractFactory implements CRSFactory final Level level = Semaphores.query(Semaphores.FINER_OBJECT_CREATION_LOGS) ? Level.FINER : Level.FINE; if (LOGGER.isLoggable(level)) { final String id = IdentifiedObjects.toString(IdentifiedObjects.getIdentifier(c, null)); - final LogRecord record = Messages.forLocale(null).getLogRecord(level, + final LogRecord record = Messages.forLocale(null).createLogRecord(level, (id != null) ? Messages.Keys.CreatedIdentifiedObject_3 : Messages.Keys.CreatedNamedObject_2, c.getInterface(), c.getName().getCode(), id); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java index 818e5379f3..3c57d1fbf4 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectSet.java @@ -294,7 +294,7 @@ public class IdentifiedObjectSet<T extends IdentifiedObject> extends AbstractSet if (!isRecoverableFailure(exception)) { throw new BackingStoreException(exception); } - final LogRecord record = Messages.forLocale(getLocale()).getLogRecord(Level.WARNING, + final LogRecord record = Messages.forLocale(getLocale()).createLogRecord(Level.WARNING, Messages.Keys.CanNotInstantiateForIdentifier_3, type, code, getCause(exception)); Logging.completeAndLog(GeodeticAuthorityFactory.LOGGER, IdentifiedObjectSet.class, "createObject", record); } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java index 2a274354f7..15708c50f8 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java @@ -1490,7 +1490,7 @@ public class MultiAuthoritiesFactory extends GeodeticAuthorityFactory implements public Set<CoordinateOperation> createFromCoordinateReferenceSystemCodes( final String sourceCRS, final String targetCRS) throws FactoryException { - final Deferred deferred = new Deferred(); + final var deferred = new Deferred(); final CoordinateOperationAuthorityFactory factory = create(deferred, sourceCRS); final String source = deferred.code; if (create(deferred, targetCRS) == factory) { @@ -1500,7 +1500,7 @@ public class MultiAuthoritiesFactory extends GeodeticAuthorityFactory implements * No coordinate operation because of mismatched factories. This is not illegal (the result is an empty set) * but it is worth to notify the user because this case has some chances to be a user error. */ - final LogRecord record = Resources.forLocale(null).getLogRecord(Level.WARNING, + final LogRecord record = Resources.forLocale(null).createLogRecord(Level.WARNING, Resources.Keys.MismatchedOperationFactories_2, sourceCRS, targetCRS); Logging.completeAndLog(LOGGER, MultiAuthoritiesFactory.class, "createFromCoordinateReferenceSystemCodes", record); return super.createFromCoordinateReferenceSystemCodes(sourceCRS, targetCRS); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java index 261177717c..f02f2a29e7 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java @@ -1072,8 +1072,12 @@ codes: for (int i=0; i<codes.length; i++) { } } if (!quiet) { - LogRecord record = Resources.forLocale(locale).getLogRecord(Level.WARNING, Resources.Keys.DeprecatedCode_3, - Constants.EPSG + Constants.DEFAULT_SEPARATOR + code, replacedBy, reason); + LogRecord record = Resources.forLocale(locale).createLogRecord( + Level.WARNING, + Resources.Keys.DeprecatedCode_3, + Constants.EPSG + Constants.DEFAULT_SEPARATOR + code, + replacedBy, + reason); Logging.completeAndLog(LOGGER, EPSGDataAccess.class, method, record); } return (String) replacedBy; @@ -1935,8 +1939,10 @@ codes: for (int i=0; i<codes.length; i++) { if (!Double.isNaN(semiMinorAxis)) { // Both `inverseFlattening` and `semiMinorAxis` are defined. // Log a warning and create the ellipsoid using the inverse flattening. - final LogRecord record = resources().getLogRecord(Level.WARNING, - Resources.Keys.AmbiguousEllipsoid_1, Constants.EPSG + Constants.DEFAULT_SEPARATOR + code); + final LogRecord record = resources().createLogRecord( + Level.WARNING, + Resources.Keys.AmbiguousEllipsoid_1, + Constants.EPSG + Constants.DEFAULT_SEPARATOR + code); Logging.completeAndLog(LOGGER, EPSGDataAccess.class, "createEllipsoid", record); } ellipsoid = owner.datumFactory.createFlattenedSphere(properties, semiMajorAxis, inverseFlattening, unit); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java index 3b31dc424e..4a1d5f3fab 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java @@ -230,8 +230,11 @@ final class EPSGInstaller extends ScriptRunner { return false; } } - InstallationScriptProvider.log(Messages.forLocale(locale).getLogRecord(Level.INFO, - Messages.Keys.CreatingSchema_2, EPSG, SQLUtilities.getSimplifiedURL(getConnection().getMetaData()))); + InstallationScriptProvider.log(Messages.forLocale(locale).createLogRecord( + Level.INFO, + Messages.Keys.CreatingSchema_2, + EPSG, + SQLUtilities.getSimplifiedURL(getConnection().getMetaData()))); final String[] scripts = scriptProvider.getResourceNames(EPSG); int numRows = 0; for (int i=0; i<scripts.length; i++) { @@ -240,9 +243,11 @@ final class EPSGInstaller extends ScriptRunner { } } time = System.nanoTime() - time; - InstallationScriptProvider.log(Messages.forLocale(locale).getLogRecord( + InstallationScriptProvider.log(Messages.forLocale(locale).createLogRecord( PerformanceLevel.forDuration(time, TimeUnit.NANOSECONDS), - Messages.Keys.InsertDuration_2, numRows, time / (float) Constants.NANOS_PER_SECOND)); + Messages.Keys.InsertDuration_2, + numRows, + time / (float) Constants.NANOS_PER_SECOND)); return true; } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java index 6aa9588098..993922d5d6 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java @@ -325,8 +325,8 @@ public abstract class InstallationScriptProvider extends InstallationResources { if (found[i] == null) { found[i] = name; } else { - log(Errors.forLocale(locale) - .getLogRecord(Level.WARNING, Errors.Keys.DuplicatedFileReference_1, part)); + log(Errors.forLocale(locale).createLogRecord(Level.WARNING, + Errors.Keys.DuplicatedFileReference_1, part)); } } } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ParameterizedTransformBuilder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ParameterizedTransformBuilder.java index 4b9d9ef158..c012b8e7bb 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ParameterizedTransformBuilder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ParameterizedTransformBuilder.java @@ -552,9 +552,12 @@ public class ParameterizedTransformBuilder extends MathTransformBuilder implemen * have been set to `Boolean.FALSE`. */ if (mismatchedParam != null) { - final LogRecord record = Resources.forLocale(null).getLogRecord(Level.WARNING, - Resources.Keys.MismatchedEllipsoidAxisLength_3, ellipsoid.getName().getCode(), - mismatchedParam.getDescriptor().getName().getCode(), mismatchedValue); + final LogRecord record = Resources.forLocale(null).createLogRecord( + Level.WARNING, + Resources.Keys.MismatchedEllipsoidAxisLength_3, + ellipsoid.getName().getCode(), + mismatchedParam.getDescriptor().getName().getCode(), + mismatchedValue); Logging.completeAndLog(CoordinateOperations.LOGGER, getClass(), "create", record); } } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java index d880050e12..84ae08b5c6 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java @@ -1029,7 +1029,7 @@ class CoordinateOperationRegistry { sourceCRS, targetCRS, null, operation.getMethod(), mt); } else { // Should never happen because parameters are mandatory, but let be safe. - log(resources().getLogRecord(Level.WARNING, Resources.Keys.MissingParameterValues_1, + log(resources().createLogRecord(Level.WARNING, Resources.Keys.MissingParameterValues_1, IdentifiedObjects.getIdentifierOrName(operation)), null); } return null; diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridFile.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridFile.java index 239c7b8f52..427c31ddcd 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridFile.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridFile.java @@ -262,7 +262,8 @@ public final class GridFile { * @param file the grid file, as a {@link String} or a {@link URI}. */ public static void startLoading(final Class<?> caller, final Object file) { - GridLoader.log(caller, Resources.forLocale(null).getLogRecord(Level.FINE, Resources.Keys.LoadingDatumShiftFile_1, file)); + GridLoader.log(caller, Resources.forLocale(null) + .createLogRecord(Level.FINE, Resources.Keys.LoadingDatumShiftFile_1, file)); } /** @@ -278,7 +279,7 @@ public final class GridFile { if (localDirectory != null && !datumDirectoryLogged.get()) { final Path directory = localDirectory.getDirectory(); if (directory != null && !datumDirectoryLogged.getAndSet(true)) { - GridLoader.log(caller, Resources.forLocale(null).getLogRecord(Level.INFO, + GridLoader.log(caller, Resources.forLocale(null).createLogRecord(Level.INFO, Resources.Keys.DatumChangesDirectory_1, directory)); } } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/LoadedGrid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/LoadedGrid.java index 709c094b70..a1b77043cb 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/LoadedGrid.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/LoadedGrid.java @@ -500,7 +500,7 @@ public abstract class LoadedGrid<C extends Quantity<C>, T extends Quantity<T>> e final MathTransform st = createGeodeticTransformation(provider, factory, sg); if (specializations.putIfAbsent(domain, st) != null) { GridLoader.log(provider, Errors.forLocale(null) - .getLogRecord(Level.FINE, Errors.Keys.DuplicatedElement_1, domain)); + .createLogRecord(Level.FINE, Errors.Keys.DuplicatedElement_1, domain)); } } catch (TransformException e) { throw new FactoryException(e); diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java index 7a8ad245f9..c59cd24152 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java @@ -447,7 +447,7 @@ public final class FranceGeocentricInterpolation extends AbstractProvider { case '2': { final String interp = line.substring(p, length); if (!interp.matches("(?i)INTERPOLATION[^A-Z]+BILINEAIRE")) { - final LogRecord record = Errors.forLocale(null).getLogRecord( + final LogRecord record = Errors.forLocale(null).createLogRecord( Level.WARNING, Errors.Keys.UnsupportedInterpolation_1, interp); // We declare `createMathTransform(…)` method because it is closer to public API. diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java index 52022fe2cf..5631a5316d 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java @@ -649,7 +649,7 @@ public final class NTv2 extends AbstractProvider { try { final String source = (String) get("SYSTEM_F", "DATUM_F", "FROM"); final String target = (String) get("SYSTEM_T", "DATUM_T", "TO"); - log(caller, Resources.forLocale(null).getLogRecord(Level.FINE, + log(caller, Resources.forLocale(null).createLogRecord(Level.FINE, Resources.Keys.UsingDatumShiftGrid_4, source, target, (created != null) ? created : "?", (updated != null) ? updated : "?")); @@ -667,7 +667,7 @@ public final class NTv2 extends AbstractProvider { keywords.append(entry.getKey()); } } - log(caller, Messages.forLocale(null).getLogRecord(Level.WARNING, + log(caller, Messages.forLocale(null).createLogRecord(Level.WARNING, Messages.Keys.UnknownKeywordInRecord_2, file, keywords.toString())); } } diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/DefinitionVerifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/DefinitionVerifier.java index 5e1bd59b0d..8191883518 100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/DefinitionVerifier.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/DefinitionVerifier.java @@ -354,7 +354,7 @@ public final class DefinitionVerifier { public LogRecord warning(final boolean fine) { if (arguments != null) { if (resourceKey != 0) { - return Resources.forLocale(locale).getLogRecord(Level.WARNING, resourceKey, arguments); + return Resources.forLocale(locale).createLogRecord(Level.WARNING, resourceKey, arguments); } else if (fine) { return new LogRecord(Level.FINE, (String) arguments[0]); } diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java index 24665ac388..23a73e1eb9 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java @@ -1915,7 +1915,7 @@ final class ImageFileDirectory extends DataCube { * @param parameters the parameters to put in the message. */ private void warning(final Level level, final short key, final Object... parameters) { - final LogRecord record = reader.resources().getLogRecord(level, key, parameters); + final LogRecord record = reader.resources().createLogRecord(level, key, parameters); record.setSourceClassName(GeoTiffStore.class.getName()); record.setSourceMethodName("components()"); // Logger name will be set by listeners.warning(record). diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java index 652d409b24..3e9de28a0f 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/CRSBuilder.java @@ -225,7 +225,7 @@ public final class CRSBuilder extends ReferencingFactoryContainer { * @see GeoKeysLoader#warning(short, Object...) */ final void warning(final short key, final Object... args) { - LogRecord record = Resources.forLocale(getLocale()).getLogRecord(Level.WARNING, key, args); + LogRecord record = Resources.forLocale(getLocale()).createLogRecord(Level.WARNING, key, args); // Logger name will be set by listeners.warning(record). record.setSourceClassName(GeoTiffStore.class.getName()); record.setSourceMethodName("getMetadata"); diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java index 2a37675b3b..9d0bc662ee 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java @@ -439,7 +439,7 @@ public class NetcdfStoreProvider extends DataStoreProvider { reset(); netcdfFileClass = Void.TYPE; } - final LogRecord record = Resources.forLocale(null).getLogRecord(severity, Resources.Keys.CanNotUseUCAR); + final LogRecord record = Resources.forLocale(null).createLogRecord(severity, Resources.Keys.CanNotUseUCAR); record.setThrown(cause); Logging.completeAndLog(Decoder.LOGGER, NetcdfStoreProvider.class, open ? "open" : "probeContent", record); } diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java index e882d120e3..0c9a86c505 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java @@ -526,7 +526,7 @@ public abstract class Decoder extends ReferencingFactoryContainer { final Level level = PerformanceLevel.forDuration(time, TimeUnit.NANOSECONDS); final Logger logger = listeners.getLogger(); if (logger.isLoggable(level)) { - final LogRecord record = resources().getLogRecord(level, resourceKey, + final LogRecord record = resources().createLogRecord(level, resourceKey, getFilename(), time / (double) Constants.NANOS_PER_SECOND); Logging.completeAndLog(logger, caller, method, record); } diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java index f4a237050c..ec177b60be 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java @@ -107,7 +107,7 @@ public abstract class NamedElement { if (resources == null) { resources = Resources.forLocale(listeners.getLocale()); } - final LogRecord record = resources.getLogRecord(Level.WARNING, key, arguments); + final LogRecord record = resources.createLogRecord(Level.WARNING, key, arguments); record.setLoggerName(Modules.NETCDF); record.setSourceClassName(caller.getCanonicalName()); record.setSourceMethodName(method); diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java index 2fd5f41a7b..a23de1476c 100644 --- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java +++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java @@ -892,7 +892,7 @@ public class Database<G> extends Syntax { * @param cause the cause, or {@code null} if none. */ final void warning(final short resourceKey, final Exception cause) { - LogRecord record = Resources.forLocale(listeners.getLocale()).getLogRecord(Level.WARNING, resourceKey); + LogRecord record = Resources.forLocale(listeners.getLocale()).createLogRecord(Level.WARNING, resourceKey); record.setThrown(cause); log(record); } diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java index 46f6c94d59..efafb0a78f 100644 --- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java +++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java @@ -355,7 +355,7 @@ public final class SelectionClause extends SQLBuilder implements Consumer<Warnin */ @Override public void accept(final WarningEvent event) { - final LogRecord record = resources().getLogRecord( + final LogRecord record = resources().createLogRecord( Level.WARNING, Resources.Keys.IncompatibleLiteralCRS_2, event.getOperatorType().flatMap(CodeList::identifier).orElse("?"), diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Postgres.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Postgres.java index 519257998f..739bf969b4 100644 --- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Postgres.java +++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Postgres.java @@ -84,8 +84,10 @@ public final class Postgres<G> extends Database<G> { } } } catch (SQLException e) { - log(Resources.forLocale(listeners.getLocale()).getLogRecord(Level.CONFIG, - Resources.Keys.SpatialExtensionNotFound_1, "PostGIS")); + log(Resources.forLocale(listeners.getLocale()).createLogRecord( + Level.CONFIG, + Resources.Keys.SpatialExtensionNotFound_1, + "PostGIS")); } } diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java index 19c1728154..aee1c16c65 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java @@ -235,7 +235,7 @@ public abstract class AbstractGridCoverageResource extends AbstractResource impl } }); final LogRecord record = Resources.forLocale(locale) - .getLogRecord(level, Resources.Keys.LoadedGridCoverage_6, parameters); + .createLogRecord(level, Resources.Keys.LoadedGridCoverage_6, parameters); record.setSourceClassName(GridCoverageResource.class.getName()); record.setSourceMethodName("read"); record.setLoggerName(logger.getName()); diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/URLDataSource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/URLDataSource.java index b14bb098cd..585efdc40c 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/URLDataSource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/URLDataSource.java @@ -75,9 +75,12 @@ final class URLDataSource implements DataSource { log = DRIVERS.add(name); } if (log) { - final LogRecord record = Resources.forLocale(null) - .getLogRecord(Level.CONFIG, Resources.Keys.UseJdbcDriverVersion_3, name, - metadata.getDriverMajorVersion(), metadata.getDriverMinorVersion()); + final LogRecord record = Resources.forLocale(null).createLogRecord( + Level.CONFIG, + Resources.Keys.UseJdbcDriverVersion_3, + name, + metadata.getDriverMajorVersion(), + metadata.getDriverMinorVersion()); Logging.completeAndLog(LOGGER, StorageConnector.class, "getStorageAs", record); } } diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java index 4fb34d1c62..8231954996 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java @@ -90,7 +90,7 @@ public abstract class DocumentedStoreProvider extends URIDataStoreProvider { if (name != null) try { return format = MetadataSource.getProvided().lookup(Format.class, name); } catch (MetadataStoreException e) { - final LogRecord record = Resources.forLocale(null).getLogRecord(Level.WARNING, + final LogRecord record = Resources.forLocale(null).createLogRecord(Level.WARNING, Resources.Keys.CanNotGetCommonMetadata_2, getShortName(), e.getLocalizedMessage()); record.setSourceClassName(getClass().getCanonicalName()); record.setSourceMethodName("getFormat"); diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java index bcd4ff3af0..eb3ab0d38f 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java @@ -564,8 +564,10 @@ public abstract class URIDataStore extends DataStore implements StoreResource { protected final void cannotReadAuxiliaryFile(final Class<? extends DataStore> classe, final String method, final String extension, final Exception cause, final boolean warning) { - final LogRecord record = Resources.forLocale(getLocale()) - .getLogRecord(warning ? Level.WARNING : Level.FINE, Resources.Keys.CanNotReadAuxiliaryFile_1, extension); + final LogRecord record = Resources.forLocale(getLocale()).createLogRecord( + warning ? Level.WARNING : Level.FINE, + Resources.Keys.CanNotReadAuxiliaryFile_1, + extension); record.setSourceClassName(classe.getCanonicalName()); record.setSourceMethodName(method); record.setThrown(cause); diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java index fd3f4fadf7..e8d7999fec 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java @@ -220,8 +220,13 @@ final class MovingFeatureBuilder extends MovingFeatures { for (int j=i; --j >= 0;) { // This is inefficient but used only in case of warnings. p = p.previous; } - warningListener.accept(Resources.forLocale(null).getLogRecord(Level.WARNING, - Resources.Keys.UnexpectedNumberOfCoordinates_4, featureName, new Date(p.startTime), dimension, length)); + warningListener.accept(Resources.forLocale(null).createLogRecord( + Level.WARNING, + Resources.Keys.UnexpectedNumberOfCoordinates_4, + featureName, + new Date(p.startTime), + dimension, + length)); } continue; } diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java index b7a34724eb..5b59bf4f25 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java @@ -270,7 +270,7 @@ final class Store extends URIDataStore implements FeatureSet { break; } default: { - final LogRecord record = errors().getLogRecord(Level.WARNING, Errors.Keys.UnknownKeyword_1, keyword); + final LogRecord record = errors().createLogRecord(Level.WARNING, Errors.Keys.UnknownKeyword_1, keyword); record.setSourceClassName(Store.class.getName()); record.setSourceMethodName("parseHeader"); listeners.warning(record); diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java index 73842aa99e..6e20e1a82a 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java @@ -170,7 +170,7 @@ public final class StoreFormat extends WKTFormat { */ private void log(final Exception e) { final LogRecord record = Resources.forLocale(listeners.getLocale()) - .getLogRecord(Level.WARNING, Resources.Keys.CanNotReadCRS_WKT_1, listeners.getSourceName()); + .createLogRecord(Level.WARNING, Resources.Keys.CanNotReadCRS_WKT_1, listeners.getSourceName()); record.setSourceClassName(listeners.getSource().getClass().getCanonicalName()); record.setSourceMethodName("getMetadata"); record.setLoggerName(Loggers.WKT); diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/DataDirectory.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/DataDirectory.java index ce5d59171b..dfe7357d47 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/DataDirectory.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/DataDirectory.java @@ -125,7 +125,7 @@ public enum DataDirectory { * Logs a message to the {@code "org.apache.sis.system"} logger. */ private static void log(final Level level, final Exception e, final short key, final Object... parameters) { - final LogRecord record = Messages.forLocale(null).getLogRecord(level, key, parameters); + final LogRecord record = Messages.forLocale(null).createLogRecord(level, key, parameters); if (e != null) { record.setThrown(e); } diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/OptionalDependency.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/OptionalDependency.java index 7731def049..f5e540aebf 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/OptionalDependency.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/OptionalDependency.java @@ -66,8 +66,10 @@ public abstract class OptionalDependency extends SystemListener { { final T first = loader.findFirst().orElse(null); if (first == null) { - LogRecord record = Messages.forLocale(null).getLogRecord(Level.CONFIG, - Messages.Keys.OptionalModuleNotFound_1, dependency); + LogRecord record = Messages.forLocale(null).createLogRecord( + Level.CONFIG, + Messages.Keys.OptionalModuleNotFound_1, + dependency); record.setLoggerName(type.getModule().getName()); Logging.completeAndLog(null, type, "getInstance", record); } diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Supervisor.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Supervisor.java index 0c006b10c9..648b2f3e7b 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Supervisor.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/system/Supervisor.java @@ -90,7 +90,7 @@ public final class Supervisor extends StandardMBean implements SupervisorMBean { name = n; // Store only on success. return; } catch (InstanceAlreadyExistsException e) { - record = Messages.forLocale(null).getLogRecord(Level.CONFIG, Messages.Keys.AlreadyRegistered_2, "MBean", NAME); + record = Messages.forLocale(null).createLogRecord(Level.CONFIG, Messages.Keys.AlreadyRegistered_2, "MBean", NAME); } catch (JMException e) { record = new LogRecord(Level.WARNING, e.toString()); record.setThrown(e); diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakEntry.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakEntry.java index cf021c4af3..1d40fb0c89 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakEntry.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/collection/WeakEntry.java @@ -170,7 +170,7 @@ abstract class WeakEntry<E> extends WeakReference<E> implements Disposable { * We are done. Log the operation if logging is enabled at that level. */ if (LOGGER.isLoggable(Level.FINEST)) { - final LogRecord record = Messages.forLocale(null).getLogRecord(Level.FINEST, + final LogRecord record = Messages.forLocale(null).createLogRecord(Level.FINEST, Messages.Keys.ChangedContainerCapacity_2, oldTable.length, table.length); record.setSourceMethodName(callerMethod); record.setSourceClassName(entryType.getEnclosingClass().getCanonicalName()); diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/IndexedResourceBundle.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/IndexedResourceBundle.java index 1f5cd80eae..c1baa059cb 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/IndexedResourceBundle.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/IndexedResourceBundle.java @@ -669,37 +669,40 @@ public abstract class IndexedResourceBundle extends ResourceBundle implements Lo } /** - * Gets a localized log record. + * Creates a new log record with the localized message identified by the given key. + * The logger name, source class and source method are initially {@code null}. * * @param level the log record level. * @param key the resource key. * @return the log record. */ - public final LogRecord getLogRecord(final Level level, final short key) { - final LogRecord record = new LogRecord(level, getKeyConstants().getKeyName(key)); + public final LogRecord createLogRecord(final Level level, final short key) { + final var record = new LogRecord(level, getKeyConstants().getKeyName(key)); record.setResourceBundleName(getClass().getName()); record.setResourceBundle(this); return record; } /** - * Gets a localized log record. + * Creates a new log record with the localized message identified by the given key. + * The logger name, source class and source method are initially {@code null}. * * @param level the log record level. * @param key the resource key. * @param arg0 the parameter for the log message, which may be an array. * @return the log record. */ - public final LogRecord getLogRecord(final Level level, final short key, - final Object arg0) + public final LogRecord createLogRecord(final Level level, final short key, + final Object arg0) { - final LogRecord record = getLogRecord(level, key); + final LogRecord record = createLogRecord(level, key); record.setParameters(toArray(arg0)); return record; } /** - * Gets a localized log record. + * Creates a new log record with the localized message identified by the given key. + * The logger name, source class and source method are initially {@code null}. * * @param level the log record level. * @param key the resource key. @@ -707,15 +710,16 @@ public abstract class IndexedResourceBundle extends ResourceBundle implements Lo * @param arg1 the second parameter. * @return the log record. */ - public final LogRecord getLogRecord(final Level level, final short key, - final Object arg0, - final Object arg1) + public final LogRecord createLogRecord(final Level level, final short key, + final Object arg0, + final Object arg1) { - return getLogRecord(level, key, new Object[] {arg0, arg1}); + return createLogRecord(level, key, new Object[] {arg0, arg1}); } /** - * Gets a localized log record. + * Creates a new log record with the localized message identified by the given key. + * The logger name, source class and source method are initially {@code null}. * * @param level the log record level. * @param key the resource key. @@ -724,16 +728,17 @@ public abstract class IndexedResourceBundle extends ResourceBundle implements Lo * @param arg2 the third parameter. * @return the log record. */ - public final LogRecord getLogRecord(final Level level, final short key, - final Object arg0, - final Object arg1, - final Object arg2) + public final LogRecord createLogRecord(final Level level, final short key, + final Object arg0, + final Object arg1, + final Object arg2) { - return getLogRecord(level, key, new Object[] {arg0, arg1, arg2}); + return createLogRecord(level, key, new Object[] {arg0, arg1, arg2}); } /** - * Gets a localized log record. + * Creates a new log record with the localized message identified by the given key. + * The logger name, source class and source method are initially {@code null}. * * @param level the log record level. * @param key the resource key. @@ -743,13 +748,13 @@ public abstract class IndexedResourceBundle extends ResourceBundle implements Lo * @param arg3 the fourth parameter. * @return the log record. */ - public final LogRecord getLogRecord(final Level level, final short key, - final Object arg0, - final Object arg1, - final Object arg2, - final Object arg3) + public final LogRecord createLogRecord(final Level level, final short key, + final Object arg0, + final Object arg1, + final Object arg2, + final Object arg3) { - return getLogRecord(level, key, new Object[] {arg0, arg1, arg2, arg3}); + return createLogRecord(level, key, new Object[] {arg0, arg1, arg2, arg3}); } /** diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/ResourceInternationalString.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/ResourceInternationalString.java index 333e437107..6af4153494 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/ResourceInternationalString.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/ResourceInternationalString.java @@ -114,7 +114,7 @@ public abstract class ResourceInternationalString extends AbstractInternationalS */ public final LogRecord toLogRecord(final Level level) { final IndexedResourceBundle resources = getBundle(null); - final LogRecord record = resources.getLogRecord(level, key); + final LogRecord record = resources.createLogRecord(level, key); if (hasArguments) { record.setParameters(resources.toArray(arguments)); } diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/resources/IndexedResourceBundleTest.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/resources/IndexedResourceBundleTest.java index e9a8daa265..8dfa4327aa 100644 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/resources/IndexedResourceBundleTest.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/resources/IndexedResourceBundleTest.java @@ -188,15 +188,15 @@ public final class IndexedResourceBundleTest extends TestCase { } /** - * Tests the {@link IndexedResourceBundle#getLogRecord(Level, short, Object)} method. + * Tests the {@link IndexedResourceBundle#createLogRecord(Level, short, Object)} method. */ @Test - public void testGetLogRecord() { + public void testCreateLogRecord() { testing = Errors.forLocale(Locale.ENGLISH); - final LogRecord record = testing.getLogRecord(Level.FINE, Errors.Keys.NullArgument_1, "CRS"); + final LogRecord record = testing.createLogRecord(Level.FINE, Errors.Keys.NullArgument_1, "CRS"); assertEquals("NullArgument_1", record.getMessage()); - final SimpleFormatter formatter = new SimpleFormatter(); + final var formatter = new SimpleFormatter(); final String message = formatter.format(record); assertTrue(message.contains("Argument ‘CRS’ shall not be null.")); testing = null; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java index 0bbcd6bbd7..12c924a572 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java @@ -318,7 +318,7 @@ public class GeoHeifStore extends DataStore implements Aggregate { * @param args the parameter for the log message, which may be an array. */ final void warning(final short errorKey, final Object args) { - warning(Errors.forLocale(getLocale()).getLogRecord(Level.WARNING, errorKey, args)); + warning(Errors.forLocale(getLocale()).createLogRecord(Level.WARNING, errorKey, args)); } /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Reader.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Reader.java index b37bf0b435..297d93e1b2 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Reader.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Reader.java @@ -370,7 +370,7 @@ public final class Reader implements Cloneable { public final void cannotParse(final Exception error, final String value, final boolean ignoreable) { if (isNewWarning(error.getClass(), value)) { final LogRecord record = Errors.forLocale(listeners.getLocale()) - .getLogRecord(ignoreable ? Level.FINE : Level.WARNING, Errors.Keys.CanNotParse_1, value); + .createLogRecord(ignoreable ? Level.FINE : Level.WARNING, Errors.Keys.CanNotParse_1, value); record.setThrown(error); listeners.warning(record); } diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDAL.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDAL.java index 3b72ce5390..c8de35fe8b 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDAL.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDAL.java @@ -419,7 +419,7 @@ final class GDAL extends NativeFunctions { // Initialize GDAL after we found all functions. if (!invoke("GDALAllRegister")) { log(GDAL.class, "<init>", Resources.forLocale(null) - .getLogRecord(Level.WARNING, Resources.Keys.CannotInitialize_1, Constants.GDAL)); + .createLogRecord(Level.WARNING, Resources.Keys.CannotInitialize_1, Constants.GDAL)); } } diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/panama/LibraryLoader.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/panama/LibraryLoader.java index b9c6aa63b8..bac359f3f1 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/panama/LibraryLoader.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/panama/LibraryLoader.java @@ -214,7 +214,7 @@ create: try { if (error == null) { return Optional.empty(); } - LogRecord record = Resources.forLocale(null).getLogRecord(Level.CONFIG, Resources.Keys.CannotInitialize_1, name); + LogRecord record = Resources.forLocale(null).createLogRecord(Level.CONFIG, Resources.Keys.CannotInitialize_1, name); record.setThrown(error); return Optional.of(record); }
