This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 0999cb0f9f2b9f0600964dc8bf10b47dadfbf05a Author: Andy Seaborne <[email protected]> AuthorDate: Tue Aug 27 21:18:49 2024 +0100 Remove unused metrics provider in DataAccessPointRegistry --- .../org/apache/jena/fuseki/metrics/SimpleMetricsProvider.java | 2 ++ .../apache/jena/fuseki/server/DataAccessPointRegistry.java | 11 ++--------- .../org/apache/jena/fuseki/main/sys/FusekiAutoModules.java | 6 +++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/SimpleMetricsProvider.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/SimpleMetricsProvider.java index a7a5282299..3d22ed1bc7 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/SimpleMetricsProvider.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/metrics/SimpleMetricsProvider.java @@ -26,6 +26,8 @@ public class SimpleMetricsProvider implements MetricsProvider { private MeterRegistry meterRegistry = new SimpleMeterRegistry(); + public SimpleMetricsProvider() {} + @Override public MeterRegistry getMeterRegistry() { return meterRegistry; diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java index 14566f0977..b6d41f31da 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java @@ -23,12 +23,10 @@ import java.util.List; import jakarta.servlet.ServletContext; -import io.micrometer.core.instrument.MeterRegistry; import org.apache.jena.atlas.lib.Registry; import org.apache.jena.atlas.logging.Log; import org.apache.jena.fuseki.Fuseki; import org.apache.jena.fuseki.FusekiException; -import org.apache.jena.fuseki.metrics.MetricsProviderRegistry; /** * Registry of (dataset name, {@link DataAccessPoint}). @@ -36,15 +34,10 @@ import org.apache.jena.fuseki.metrics.MetricsProviderRegistry; */ public class DataAccessPointRegistry extends Registry<String, DataAccessPoint> { - private final MeterRegistry meterRegistry; - - public DataAccessPointRegistry() { - this.meterRegistry = MetricsProviderRegistry.get().getMeterRegistry(); - } + public DataAccessPointRegistry() {} public DataAccessPointRegistry(DataAccessPointRegistry other) { other.forEach((_name, accessPoint)->register(accessPoint)); - this.meterRegistry = other.meterRegistry; } // Preferred way to register. Other method for legacy. @@ -60,7 +53,7 @@ public class DataAccessPointRegistry extends Registry<String, DataAccessPoint> * generated from the registry contents and not still connected to the registry. * Registry changes will not interfere with iteration over the list. * {@link DataAccessPoint DataAccessPoints} can not be registered twice under - * differerent names (the same dataset can be via different + * different names (the same dataset can be via different * {@link DataAccessPoint DataAccessPoints} so the list has no duplicates. * There is no defined order to the list. */ diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModules.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModules.java index ba79616b4c..83c6523242 100644 --- a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModules.java +++ b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/sys/FusekiAutoModules.java @@ -107,7 +107,7 @@ public class FusekiAutoModules { altFusekiModules = fusekiModules; } - // Single auto module controller. + // Single auto-module controller. private static FusekiServiceLoaderModules autoModules = null; private static FusekiServiceLoaderModules getServiceLoaderModules() { @@ -202,13 +202,13 @@ public class FusekiAutoModules { } }; - // Create auto module object, skip loads in error, sort automodules into level a order. + // Create auto-module object, skip loads in error, sort auto-modules into level order. List<FusekiAutoModule> autoMods = serviceLoader.stream() .map(mapper) .filter(Objects::nonNull) .sorted((x,y)-> Integer.compare(x.level(), y.level())) .collect(Collectors.toList()); - // Start, and convert to FusekeiModules (generics issue) + // Start, and convert to FusekiModules (generics issue) List<FusekiModule> fmods = autoMods.stream().map(afmod->{ afmod.start(); return afmod;
