diff --git a/bundle/src/main/java/io/wcm/caconfig/editor/impl/ConfigPersistServlet.java b/bundle/src/main/java/io/wcm/caconfig/editor/impl/ConfigPersistServlet.java
index 10e6384..6b3237f 100644
--- a/bundle/src/main/java/io/wcm/caconfig/editor/impl/ConfigPersistServlet.java
+++ b/bundle/src/main/java/io/wcm/caconfig/editor/impl/ConfigPersistServlet.java
@@ -194,7 +194,7 @@ private ConfigurationPersistData parseConfigData(JsonNode item, ConfigurationMet
         // skip nested configuration and empty properties
         continue;
       }
-      else if (propertyType == null) {
+      if (propertyType == null) {
         JsonNode value = properties.get(propertyName);
         if (value.isArray()) {
           ArrayNode arrayValue = (ArrayNode)value;
diff --git a/bundle/src/test/java/io/wcm/caconfig/editor/impl/DropdownOptionProviderServiceTest.java b/bundle/src/test/java/io/wcm/caconfig/editor/impl/DropdownOptionProviderServiceTest.java
index fc21c97..45b5960 100644
--- a/bundle/src/test/java/io/wcm/caconfig/editor/impl/DropdownOptionProviderServiceTest.java
+++ b/bundle/src/test/java/io/wcm/caconfig/editor/impl/DropdownOptionProviderServiceTest.java
@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.wcm.caconfig.editor.DropdownOptionItem;
@@ -46,16 +47,16 @@ class DropdownOptionProviderServiceTest {
 
   @Mock
   private Resource resource;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private DropdownOptionProvider provider1;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private DropdownOptionProvider provider2;
 
   private DropdownOptionProviderService underTest;
 
   @BeforeEach
   @SuppressWarnings("null")
-  void setUp() throws Exception {
+  void setUp() {
     when(provider1.getDropdownOptions(resource)).thenReturn(List.of(
         new DropdownOptionItem("v1", "desc1"),
         new DropdownOptionItem("v2", "desc2")));
diff --git a/bundle/src/test/java/io/wcm/caconfig/editor/impl/PathBrowserRootPathProviderServiceTest.java b/bundle/src/test/java/io/wcm/caconfig/editor/impl/PathBrowserRootPathProviderServiceTest.java
index 46ed2fd..ed672c0 100644
--- a/bundle/src/test/java/io/wcm/caconfig/editor/impl/PathBrowserRootPathProviderServiceTest.java
+++ b/bundle/src/test/java/io/wcm/caconfig/editor/impl/PathBrowserRootPathProviderServiceTest.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.wcm.caconfig.editor.PathBrowserRootPathProvider;
@@ -42,9 +43,9 @@ class PathBrowserRootPathProviderServiceTest {
 
   @Mock
   private Resource resource;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private PathBrowserRootPathProvider provider1;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private PathBrowserRootPathProvider provider2;
 
   private PathBrowserRootPathProviderService underTest;
diff --git a/bundle/src/test/java/io/wcm/caconfig/editor/impl/TagBrowserRootPathProviderServiceTest.java b/bundle/src/test/java/io/wcm/caconfig/editor/impl/TagBrowserRootPathProviderServiceTest.java
index 5315989..071c5ff 100644
--- a/bundle/src/test/java/io/wcm/caconfig/editor/impl/TagBrowserRootPathProviderServiceTest.java
+++ b/bundle/src/test/java/io/wcm/caconfig/editor/impl/TagBrowserRootPathProviderServiceTest.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.Mock.Strictness;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import io.wcm.caconfig.editor.TagBrowserRootPathProvider;
@@ -42,15 +43,15 @@ class TagBrowserRootPathProviderServiceTest {
 
   @Mock
   private Resource resource;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private TagBrowserRootPathProvider provider1;
-  @Mock(lenient = true)
+  @Mock(strictness = Strictness.LENIENT)
   private TagBrowserRootPathProvider provider2;
 
   private TagBrowserRootPathProviderService underTest;
 
   @BeforeEach
-  void setUp() throws Exception {
+  void setUp() {
     when(provider1.getRootPath(resource)).thenReturn("/content/root1");
     context.registerService(TagBrowserRootPathProvider.class, provider1, TagBrowserRootPathProvider.PROPERTY_SELECTOR, "provider1");
     when(provider2.getRootPath(resource)).thenReturn("/content/root2");