You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:23:10 UTC
[sling-org-apache-sling-commons-metrics] 06/10: SLING-6702 - rename
the existing MetricsServiceFactory
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.metrics-1.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics.git
commit fd392422a947b4a28ef58f98870f540a049bc0e7
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Mar 23 14:01:20 2017 +0000
SLING-6702 - rename the existing MetricsServiceFactory
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/metrics@1788246 13f79535-47bb-0310-9956-ffa450edef68
---
...{MetricsServiceFactory.java => InternalMetricsServiceFactory.java} | 4 ++--
.../org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java | 2 +-
.../sling/commons/metrics/internal/MetricsServiceFactoryTest.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java b/src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java
similarity index 94%
rename from src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java
rename to src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java
index b9d8bb6..c3f7fff 100644
--- a/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java
+++ b/src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java
@@ -32,11 +32,11 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
-class MetricsServiceFactory implements ServiceFactory<MetricsService> {
+class InternalMetricsServiceFactory implements ServiceFactory<MetricsService> {
private final MetricsService delegate;
private final BundleMetricsMapper metricsMapper;
- public MetricsServiceFactory(MetricsService delegate, BundleMetricsMapper metricsMapper) {
+ public InternalMetricsServiceFactory(MetricsService delegate, BundleMetricsMapper metricsMapper) {
this.delegate = delegate;
this.metricsMapper = metricsMapper;
}
diff --git a/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java b/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
index cec64bb..5d57ab9 100644
--- a/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
+++ b/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
@@ -71,7 +71,7 @@ public class MetricsServiceImpl implements MetricsService {
svcProps.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Metrics Service");
svcProps.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
regs.add(context.registerService(MetricsService.class.getName(),
- new MetricsServiceFactory(this, metricsMapper), svcProps));
+ new InternalMetricsServiceFactory(this, metricsMapper), svcProps));
final Dictionary<String, String> regProps = new Hashtable<>();
regProps.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Metrics Registry");
diff --git a/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java b/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java
index 71d7fe4..f6d635b 100644
--- a/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java
+++ b/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java
@@ -44,7 +44,7 @@ public class MetricsServiceFactoryTest {
private MetricsServiceImpl serviceImpl = new MetricsServiceImpl();
private MetricRegistry registry = serviceImpl.getRegistry();
private BundleMetricsMapper mapper = new BundleMetricsMapper(registry);
- private MetricsServiceFactory srvFactory = new MetricsServiceFactory(serviceImpl, mapper);
+ private InternalMetricsServiceFactory srvFactory = new InternalMetricsServiceFactory(serviceImpl, mapper);
private ServiceRegistration<MetricsService> reg = mock(ServiceRegistration.class);
@Test
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.