You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2023/10/11 08:53:57 UTC

[sling-org-apache-sling-testing-osgi-mock] branch master updated: cosmetic: eliminate some code smells

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git


The following commit(s) were added to refs/heads/master by this push:
     new 9eb0cc4  cosmetic: eliminate some code smells
9eb0cc4 is described below

commit 9eb0cc4b1fd0e8e24c41181c15125b16ab412b70
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Oct 11 10:53:46 2023 +0200

    cosmetic: eliminate some code smells
---
 .../java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java | 2 +-
 .../org/apache/sling/testing/mock/osgi/MockBundleContextTest.java | 8 ++++----
 .../sling/testing/mock/osgi/MockServiceReferencesSortTest.java    | 2 +-
 .../mock/osgi/junit5/OsgiContextMemberInstantiatedTest.java       | 2 +-
 .../testing/mock/osgi/junit5/OsgiContextMemberSuperClassTest.java | 3 ++-
 .../sling/testing/mock/osgi/junit5/OsgiContextMemberTest.java     | 2 +-
 .../apache/sling/testing/mock/osgi/junit5/OsgiContextTest.java    | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
index e094d10..2f6e752 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtil.java
@@ -97,7 +97,7 @@ final class OsgiMetadataUtil {
         }
 
         @Override
-        public Iterator getPrefixes(String namespaceURI) {
+        public Iterator<String> getPrefixes(String namespaceURI) {
             return NAMESPACES.keySet().iterator();
         }
     };
diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
index c3c14d9..4a66dce 100644
--- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
@@ -234,7 +234,7 @@ public class MockBundleContextTest {
         reg1.unregister();
 
         assertNull(bundleContext.getServiceReference(clazz1));
-        
+
         try {
             reg1.unregister();
             Assert.fail("Unregistering a non existant service should throw IllegalStateException");
@@ -295,7 +295,7 @@ public class MockBundleContextTest {
             System.getProperties().remove(propName);
         }
         assertNull(bundleContext.getProperty(propName));
-        
+
     }
 
     @Test
@@ -378,8 +378,8 @@ public class MockBundleContextTest {
     @Test
     public void testGetServicesWithNoClassOnlyFilter() throws InvalidSyntaxException {
         bundleContext.registerService(String.class, "service1", testProperty());
-        bundleContext.registerService(Long.class, new Long(2), testProperty());
-        bundleContext.registerService(Integer.class, new Integer(9), testProperty());
+        bundleContext.registerService(Long.class, Long.valueOf(2), testProperty());
+        bundleContext.registerService(Integer.class, Integer.valueOf(9), testProperty());
 
         // should return service with lowest service id = which was registered first
         ServiceReference[] refs = bundleContext.getServiceReferences((String)null, "(prop1=value1)");
diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
index 33fb940..7b2ff69 100644
--- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
@@ -138,7 +138,7 @@ public class MockServiceReferencesSortTest {
 
     private ServiceRegistration<?> registerStringServiceWithRanking(String serviceValue, int index) {
         final Hashtable<String, Object> props = new Hashtable<String, Object>();
-        props.put(Constants.SERVICE_RANKING, new Integer(index));
+        props.put(Constants.SERVICE_RANKING, Integer.valueOf(index));
         return bundleContext.registerService(String.class, serviceValue, props);
     }
 
diff --git a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberInstantiatedTest.java b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberInstantiatedTest.java
index a503393..1d01b17 100644
--- a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberInstantiatedTest.java
+++ b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberInstantiatedTest.java
@@ -33,7 +33,7 @@ class OsgiContextMemberInstantiatedTest {
 
     @Test
     void testSimpleService() {
-        context.registerService(Integer.class, new Integer(5));
+        context.registerService(Integer.class, Integer.valueOf(5));
 
         Integer service = context.getService(Integer.class);
         assertEquals((Integer)5, service);
diff --git a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberSuperClassTest.java b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberSuperClassTest.java
index 4d7a236..7f43565 100644
--- a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberSuperClassTest.java
+++ b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberSuperClassTest.java
@@ -29,9 +29,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
 @ExtendWith(OsgiContextExtension.class)
 class OsgiContextMemberSuperClassTest extends OsgiContextMemberTest {
 
+    @Override
     @Test
     void testSimpleService() {
-        context.registerService(Integer.class, new Integer(5));
+        context.registerService(Integer.class, Integer.valueOf(5));
 
         Integer service = context.getService(Integer.class);
         assertEquals((Integer)5, service);
diff --git a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberTest.java b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberTest.java
index 74c92b7..1ad1694 100644
--- a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberTest.java
+++ b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextMemberTest.java
@@ -33,7 +33,7 @@ class OsgiContextMemberTest {
 
     @Test
     void testSimpleService() {
-        context.registerService(Integer.class, new Integer(5));
+        context.registerService(Integer.class, Integer.valueOf(5));
 
         Integer service = context.getService(Integer.class);
         assertEquals((Integer)5, service);
diff --git a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextTest.java b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextTest.java
index 78ba805..6aade46 100644
--- a/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextTest.java
+++ b/junit5/src/test/java/org/apache/sling/testing/mock/osgi/junit5/OsgiContextTest.java
@@ -31,7 +31,7 @@ class OsgiContextTest {
 
     @Test
     void testSimpleService(OsgiContext context) {
-        context.registerService(Integer.class, new Integer(5));
+        context.registerService(Integer.class, Integer.valueOf(5));
 
         Integer service = context.getService(Integer.class);
         assertEquals((Integer)5, service);