svn commit: r1788246 - in /sling/trunk/bundles/commons/metrics/src: main/java/org/apache/sling/commons/metrics/internal/ test/java/org/apache/sling/commons/metrics/internal/

[bdelacretaz]

Author: bdelacretaz
Date: Thu Mar 23 14:01:20 2017
New Revision: 1788246

URL: http://svn.apache.org/viewvc?rev=1788246&view=rev
Log:
SLING-6702 - rename the existing MetricsServiceFactory

Added:
    
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java
      - copied, changed from r1788244, 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java
Removed:
    
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java
Modified:
    
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
    
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java

Copied: 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java
 (from r1788244, 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java)
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java?p2=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java&p1=sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java&r1=1788244&r2=1788246&rev=1788246&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactory.java
 (original)
+++ 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/InternalMetricsServiceFactory.java
 Thu Mar 23 14:01:20 2017
@@ -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;
     }

Modified: 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java?rev=1788246&r1=1788245&r2=1788246&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
 (original)
+++ 
sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricsServiceImpl.java
 Thu Mar 23 14:01:20 2017
@@ -71,7 +71,7 @@ public class MetricsServiceImpl implemen
         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");

Modified: 
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java?rev=1788246&r1=1788245&r2=1788246&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java
 (original)
+++ 
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricsServiceFactoryTest.java
 Thu Mar 23 14:01:20 2017
@@ -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