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 a05eea1 cosmetic: eliminate code and deprecation warnings
a05eea1 is described below
commit a05eea1d6e50a923270fb9eeba35ca9cd6a224cb
Author: Stefan Seifert <[email protected]>
AuthorDate: Thu Nov 16 16:36:09 2023 +0100
cosmetic: eliminate code and deprecation warnings
---
.../testing/mock/osgi/junit/ConfigCollector.java | 2 +-
.../testing/mock/osgi/junit/ConfigCollectorTest.java | 19 +++++++++++--------
.../osgi/junit5/OsgiConfigParametersExtension.java | 2 ++
.../activatedeactivate/ServiceWithDefaultValues.java | 1 +
.../ServiceWithDefaultValuesConstructor.java | 1 +
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git
a/junit4/src/main/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollector.java
b/junit4/src/main/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollector.java
index db107da..820e4f6 100644
---
a/junit4/src/main/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollector.java
+++
b/junit4/src/main/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollector.java
@@ -95,7 +95,7 @@ public class ConfigCollector implements TestRule,
ConfigCollection {
* @param component an optional component type as configuration pid to
apply
* @param pid specify a non-empty configuration pid
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "null" })
public ConfigCollector(@NotNull final OsgiContextImpl osgiContext,
@Nullable final Class component,
@Nullable final String pid) {
diff --git
a/junit4/src/test/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollectorTest.java
b/junit4/src/test/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollectorTest.java
index 11066c0..6760ff4 100644
---
a/junit4/src/test/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollectorTest.java
+++
b/junit4/src/test/java/org/apache/sling/testing/mock/osgi/junit/ConfigCollectorTest.java
@@ -18,6 +18,14 @@
*/
package org.apache.sling.testing.mock.osgi.junit;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+import java.util.Map;
+
import org.apache.sling.testing.mock.osgi.MapUtil;
import org.apache.sling.testing.mock.osgi.config.annotations.AutoConfig;
import org.apache.sling.testing.mock.osgi.config.annotations.ConfigType;
@@ -30,14 +38,6 @@ import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.propertytypes.ServiceRanking;
import org.osgi.service.component.propertytypes.ServiceVendor;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
@SetConfig(pid = "common-config", property = {
"service.ranking:Integer=42",
"service.vendor=Acme Software Foundation"
@@ -96,6 +96,7 @@ public class ConfigCollectorTest {
@Test
@ListConfig(size = 10, reverse = false)
+ @SuppressWarnings("null")
public void autoConfig1() throws Exception {
ConfigurationAdmin configurationAdmin =
osgiContext.getService(ConfigurationAdmin.class);
assertEquals(Map.of("size", 10, "reverse", false, "service.pid",
List.class.getName()),
@@ -104,6 +105,7 @@ public class ConfigCollectorTest {
@Test
@ListConfig(size = 12, reverse = true)
+ @SuppressWarnings("null")
public void autoConfig2() throws Exception {
ConfigurationAdmin configurationAdmin =
osgiContext.getService(ConfigurationAdmin.class);
assertEquals(Map.of("size", 12, "reverse", true, "service.pid",
List.class.getName()),
@@ -113,6 +115,7 @@ public class ConfigCollectorTest {
@Test
@AutoConfig(Void.class) // overrides class annotation with unset config pid
@ListConfig(size = 12, reverse = true)
+ @SuppressWarnings("null")
public void autoConfigVoid() throws Exception {
ConfigurationAdmin configurationAdmin =
osgiContext.getService(ConfigurationAdmin.class);
assertNull(MapUtil.toMap(configurationAdmin.getConfiguration(List.class.getName()).getProperties()));
diff --git
a/junit5/src/main/java/org/apache/sling/testing/mock/osgi/junit5/OsgiConfigParametersExtension.java
b/junit5/src/main/java/org/apache/sling/testing/mock/osgi/junit5/OsgiConfigParametersExtension.java
index 99fbd88..7a467b8 100644
---
a/junit5/src/main/java/org/apache/sling/testing/mock/osgi/junit5/OsgiConfigParametersExtension.java
+++
b/junit5/src/main/java/org/apache/sling/testing/mock/osgi/junit5/OsgiConfigParametersExtension.java
@@ -156,6 +156,7 @@ public class OsgiConfigParametersExtension implements
ParameterResolver, BeforeE
|| isSupportedConfigType(parameterType, extensionContext);
}
+ @SuppressWarnings("null")
Object resolveConfigCollectionParameter(ParameterContext parameterContext,
ExtensionContext extensionContext) {
CollectConfigTypes configTypes =
parameterContext.findAnnotation(CollectConfigTypes.class)
.orElse(null);
@@ -201,6 +202,7 @@ public class OsgiConfigParametersExtension implements
ParameterResolver, BeforeE
return requireSingleParameterValue(Map.class, value);
}
+ @SuppressWarnings("null")
Object resolveConfigTypeParameter(ParameterContext parameterContext,
ExtensionContext extensionContext) {
final boolean isArray =
parameterContext.getParameter().getType().isArray();
final Class<?> parameterType =
requireSupportedParameterType(parameterContext.getParameter().getType());
diff --git
a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValues.java
b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValues.java
index eecdf36..23008ba 100644
---
a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValues.java
+++
b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValues.java
@@ -24,6 +24,7 @@ import org.osgi.service.component.annotations.Component;
@Component
public class ServiceWithDefaultValues {
+ @SuppressWarnings("unused")
private ServiceWithDefaultValuesConfig config;
@Activate
diff --git
a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValuesConstructor.java
b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValuesConstructor.java
index e3bef73..235420f 100644
---
a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValuesConstructor.java
+++
b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/activatedeactivate/ServiceWithDefaultValuesConstructor.java
@@ -24,6 +24,7 @@ import org.osgi.service.component.annotations.Component;
@Component
public class ServiceWithDefaultValuesConstructor {
+ @SuppressWarnings("unused")
private final ServiceWithDefaultValuesConfig config;
@Activate
