From 5329558f48144d9d472b18cc311ea8166d8b5359 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 16 Jul 2024 18:28:46 +0200 Subject: [PATCH] cosmetic: eliminate code warnings --- .../java/io/wcm/testing/mock/aem/MockDesign.java | 2 +- .../wcm/testing/mock/aem/MockLanguageManager.java | 2 +- .../main/java/io/wcm/testing/mock/aem/MockTag.java | 3 +-- .../context/ContextResourceResolverFactory.java | 1 + .../wcm/testing/mock/aem/dam/MockAssetManager.java | 9 +++------ .../wcm/testing/mock/aem/MockPageManagerTest.java | 2 +- .../java/io/wcm/testing/mock/aem/MockPageTest.java | 4 ++-- .../io/wcm/testing/mock/aem/MockTemplateTest.java | 4 ++-- .../mock/aem/builder/ContentBuilderTest.java | 14 +++++++------- .../mock/aem/context/AemContextImplTest.java | 4 ++-- .../mock/aem/context/MockAemSlingBindingsTest.java | 4 ++-- .../mock/aem/context/SlingAlias_JcrMockTest.java | 2 +- .../mock/aem/context/SlingAlias_JcrOakTest.java | 2 +- .../testing/mock/aem/context/TestAemContext.java | 3 +-- .../testing/mock/aem/context/UniqueRootTest.java | 2 +- .../testing/mock/aem/dam/MockAssetStoreTest.java | 2 +- .../io/wcm/testing/mock/aem/dam/MockAssetTest.java | 10 +++++----- .../testing/mock/aem/dam/MockPublishUtilsTest.java | 2 +- .../testing/mock/aem/dam/MockRenditionTest.java | 2 +- .../mock/aem/dam/ngdm/MockAssetDeliveryTest.java | 2 +- .../ngdm/MockNextGenDynamicMediaConfigTest.java | 2 +- .../granite/MockResourceCollectionManagerTest.java | 2 +- .../testing/mock/aem/junit5/AemContextStore.java | 2 +- .../BeforeAllStaticMemberAemContextPluginTest.java | 2 +- 24 files changed, 40 insertions(+), 44 deletions(-) diff --git a/core/src/main/java/io/wcm/testing/mock/aem/MockDesign.java b/core/src/main/java/io/wcm/testing/mock/aem/MockDesign.java index bb1727f1..7d0d7d64 100644 --- a/core/src/main/java/io/wcm/testing/mock/aem/MockDesign.java +++ b/core/src/main/java/io/wcm/testing/mock/aem/MockDesign.java @@ -73,7 +73,7 @@ public Style getStyle(Cell cell) { @Override public Style getStyle(Resource resource) { ContentPolicyManager contentPolicyManager = resource.getResourceResolver().adaptTo(ContentPolicyManager.class); - if (contentPolicyManager != null && (contentPolicyManager instanceof MockContentPolicyManager)) { + if (contentPolicyManager instanceof MockContentPolicyManager) { // unwrap resource to make sure the correct resource type is used when using resource-type forcing wrappers Resource unwrappedResource = ResourceUtil.unwrap(resource); ContentPolicy policy = ((MockContentPolicyManager)contentPolicyManager).getPolicy(unwrappedResource); diff --git a/core/src/main/java/io/wcm/testing/mock/aem/MockLanguageManager.java b/core/src/main/java/io/wcm/testing/mock/aem/MockLanguageManager.java index abfb7898..369bdd16 100644 --- a/core/src/main/java/io/wcm/testing/mock/aem/MockLanguageManager.java +++ b/core/src/main/java/io/wcm/testing/mock/aem/MockLanguageManager.java @@ -256,7 +256,7 @@ private String getLanguageRootPath(Resource res, boolean respectContent) { path = path.substring(0, idx); } Resource hr = res.getResourceResolver().getResource(path); - while (hr != null && !hr.getPath().equals("/")) { + while (hr != null && !StringUtils.equals(hr.getPath(), "/")) { ValueMap props = hr.getValueMap(); if (props.get("jcr:content/cq:isLanguageRoot", Boolean.FALSE)) { String iso = props.get("jcr:content/jcr:language", ""); diff --git a/core/src/main/java/io/wcm/testing/mock/aem/MockTag.java b/core/src/main/java/io/wcm/testing/mock/aem/MockTag.java index 897fb1ce..c1c6167e 100644 --- a/core/src/main/java/io/wcm/testing/mock/aem/MockTag.java +++ b/core/src/main/java/io/wcm/testing/mock/aem/MockTag.java @@ -47,7 +47,6 @@ import com.day.cq.commons.LanguageUtil; import com.day.cq.commons.jcr.JcrConstants; import com.day.cq.tagging.Tag; -import com.day.cq.tagging.TagConstants; import com.day.cq.tagging.TagManager; import com.day.cq.wcm.api.NameConstants; @@ -326,7 +325,7 @@ public String getXPathSearchExpression(String property) { final String propertyName = extractPathPart(property, StringUtils::substringAfterLast, property); final String propertyPath = extractPathPart(property, StringUtils::substringBeforeLast, StringUtils.EMPTY); final String xpathProperty = (StringUtils.isEmpty(propertyPath) ? "" : ISO9075.encodePath(propertyPath) + '/') + '@' + ISO9075.encode(propertyName); - final String xpathNamespace = TagConstants.DEFAULT_NAMESPACE.equals(ns) ? relPath : ns + ":" + relPath; + final String xpathNamespace = DEFAULT_NAMESPACE.equals(ns) ? relPath : ns + ":" + relPath; return "(" + xpathProperty + "='" + xpathNamespace + "' " + "or " + xpathProperty + "='" + tagRoot + "/" + ns + "/" + relPath + "' " + "or jcr:like(" + xpathProperty + ", '" + xpathNamespace + "/%') or " diff --git a/core/src/main/java/io/wcm/testing/mock/aem/context/ContextResourceResolverFactory.java b/core/src/main/java/io/wcm/testing/mock/aem/context/ContextResourceResolverFactory.java index 3c9cefff..a9b3cc89 100644 --- a/core/src/main/java/io/wcm/testing/mock/aem/context/ContextResourceResolverFactory.java +++ b/core/src/main/java/io/wcm/testing/mock/aem/context/ContextResourceResolverFactory.java @@ -48,6 +48,7 @@ private ContextResourceResolverFactory() { // static methods only } + @SuppressWarnings({ "PMD.ExceptionAsFlowControl", "java:S2139", "java:S112" }) // ignore exception handling public static @NotNull ResourceResolverFactory get(@NotNull final ResourceResolverType resourceResolverType, @NotNull final BundleContext bundleContext) { try { diff --git a/core/src/main/java/io/wcm/testing/mock/aem/dam/MockAssetManager.java b/core/src/main/java/io/wcm/testing/mock/aem/dam/MockAssetManager.java index 3808a1fb..9e4e61c6 100644 --- a/core/src/main/java/io/wcm/testing/mock/aem/dam/MockAssetManager.java +++ b/core/src/main/java/io/wcm/testing/mock/aem/dam/MockAssetManager.java @@ -40,7 +40,6 @@ import java.util.Map; import javax.jcr.Binary; -import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; @@ -189,18 +188,16 @@ public Revision createRevision(Asset asset, String s, String s1) throws Exceptio } @Override - public String assignAssetID(Asset asset) throws PathNotFoundException, RepositoryException { + public String assignAssetID(Asset asset) throws RepositoryException { throw new UnsupportedOperationException(); } - // AEM 6.5 - @SuppressWarnings("unused") + @Override public Asset createOrUpdateAsset(String arg0, Binary arg1, String arg2, boolean arg3) { throw new UnsupportedOperationException(); } - // AEM 6.5.5 - @SuppressWarnings("unused") + @Override public Revision createRevision(Asset arg0, String arg1, String arg2, User arg3) { throw new UnsupportedOperationException(); } diff --git a/core/src/test/java/io/wcm/testing/mock/aem/MockPageManagerTest.java b/core/src/test/java/io/wcm/testing/mock/aem/MockPageManagerTest.java index 7f48d145..b598caf3 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/MockPageManagerTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/MockPageManagerTest.java @@ -69,7 +69,7 @@ public class MockPageManagerTest { private ResourceResolver resourceResolver; @Before - public void setUp() throws Exception { + public void setUp() { this.resourceResolver = this.context.resourceResolver(); context.load().json("/json-import-samples/content.json", "/content/sample/en"); diff --git a/core/src/test/java/io/wcm/testing/mock/aem/MockPageTest.java b/core/src/test/java/io/wcm/testing/mock/aem/MockPageTest.java index 702c4098..a1656070 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/MockPageTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/MockPageTest.java @@ -58,7 +58,7 @@ public class MockPageTest { private Page page; @Before - public void setUp() throws Exception { + public void setUp() { context.load().json("/json-import-samples/content.json", "/content/sample/en"); Resource resource = this.context.resourceResolver().getResource("/content/sample/en"); @@ -289,7 +289,7 @@ public void testGetLanguage() { } @Test - public void testEquals() throws Exception { + public void testEquals() { Page page1 = context.pageManager().getPage("/content/sample/en"); Page page2 = context.pageManager().getPage("/content/sample/en"); Page page3 = context.pageManager().getPage("/content/sample/en/toolbar/profiles"); diff --git a/core/src/test/java/io/wcm/testing/mock/aem/MockTemplateTest.java b/core/src/test/java/io/wcm/testing/mock/aem/MockTemplateTest.java index ee97fcb0..c65ae773 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/MockTemplateTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/MockTemplateTest.java @@ -44,7 +44,7 @@ public class MockTemplateTest { private Template template; @Before - public void setUp() throws Exception { + public void setUp() { context.load().json("/json-import-samples/application.json", "/apps/sample"); Resource resource = this.context.resourceResolver().getResource("/apps/sample/templates/homepage"); @@ -66,7 +66,7 @@ public void testProperties() { } @Test - public void testEquals() throws Exception { + public void testEquals() { Template template1 = this.context.resourceResolver().getResource("/apps/sample/templates/homepage").adaptTo(Template.class); Template template2 = this.context.resourceResolver().getResource("/apps/sample/templates/homepage").adaptTo(Template.class); Template template3 = this.context.resourceResolver().getResource("/apps/sample/templates/contentpage").adaptTo(Template.class); diff --git a/core/src/test/java/io/wcm/testing/mock/aem/builder/ContentBuilderTest.java b/core/src/test/java/io/wcm/testing/mock/aem/builder/ContentBuilderTest.java index 9d572a6b..318b59a9 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/builder/ContentBuilderTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/builder/ContentBuilderTest.java @@ -210,7 +210,7 @@ public void testAssetFromByteArray() throws Exception { } @Test - public void testAssetFromWidthHeight_Jpeg() throws Exception { + public void testAssetFromWidthHeight_Jpeg() { Asset asset = context.create().asset(damRoot + "/sample1.jpg", 100, 50, "image/jpeg"); assertNotNull(asset); @@ -234,7 +234,7 @@ public void testAssetFromWidthHeight_Jpeg() throws Exception { } @Test - public void testAssetFromWidthHeight_Jpeg_BigImage_WebEnabled_Ratio1() throws Exception { + public void testAssetFromWidthHeight_Jpeg_BigImage_WebEnabled_Ratio1() { Asset asset = context.create().asset(damRoot + "/sample1.jpg", 2000, 1000, "image/jpeg"); assertNotNull(asset); @@ -248,7 +248,7 @@ public void testAssetFromWidthHeight_Jpeg_BigImage_WebEnabled_Ratio1() throws Ex } @Test - public void testAssetFromWidthHeight_Jpeg_BigImage_WebEnabled_Ratio2() throws Exception { + public void testAssetFromWidthHeight_Jpeg_BigImage_WebEnabled_Ratio2() { Asset asset = context.create().asset(damRoot + "/sample1.jpg", 1000, 2000, "image/jpeg"); assertNotNull(asset); @@ -262,7 +262,7 @@ public void testAssetFromWidthHeight_Jpeg_BigImage_WebEnabled_Ratio2() throws Ex } @Test - public void testAssetFromWidthHeight_Gif() throws Exception { + public void testAssetFromWidthHeight_Gif() { Asset asset = context.create().asset(damRoot + "/sample1.gif", 100, 50, "image/gif"); assertNotNull(asset); @@ -279,7 +279,7 @@ public void testAssetFromWidthHeight_Gif() throws Exception { } @Test - public void testAssetFromWidthHeight_Tiff() throws Exception { + public void testAssetFromWidthHeight_Tiff() { Asset asset = context.create().asset(damRoot + "/sample1.tif", 100, 50, "image/tiff"); assertNotNull(asset); @@ -296,7 +296,7 @@ public void testAssetFromWidthHeight_Tiff() throws Exception { } @Test - public void testAssetFromWidthHeight_SVG() throws Exception { + public void testAssetFromWidthHeight_SVG() { Asset asset = context.create().asset(damRoot + "/sample1.svg", 100, 50, "image/svg+xml"); assertNotNull(asset); @@ -313,7 +313,7 @@ public void testAssetFromWidthHeight_SVG() throws Exception { } @Test - public void testAssetWithMetadata() throws Exception { + public void testAssetWithMetadata() { Asset asset = context.create().asset(damRoot + "/sample1.jpg", 100, 50, "image/jpeg", "prop1", "value1", "prop2", 1); assertNotNull(asset); diff --git a/core/src/test/java/io/wcm/testing/mock/aem/context/AemContextImplTest.java b/core/src/test/java/io/wcm/testing/mock/aem/context/AemContextImplTest.java index b5fd19f2..7a8d887b 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/context/AemContextImplTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/context/AemContextImplTest.java @@ -46,7 +46,7 @@ public class AemContextImplTest { private String appsRoot; @Before - public void setUp() throws Exception { + public void setUp() { contentRoot = context.uniqueRoot().content() + "/sample"; appsRoot = context.uniqueRoot().apps() + "/sample"; @@ -56,7 +56,7 @@ public void setUp() throws Exception { } @After - public void tearDown() throws Exception { + public void tearDown() { this.context.tearDown(); } diff --git a/core/src/test/java/io/wcm/testing/mock/aem/context/MockAemSlingBindingsTest.java b/core/src/test/java/io/wcm/testing/mock/aem/context/MockAemSlingBindingsTest.java index 698d9da2..055f0a0f 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/context/MockAemSlingBindingsTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/context/MockAemSlingBindingsTest.java @@ -55,7 +55,7 @@ public class MockAemSlingBindingsTest { private Resource currentResource; @Before - public void setUp() throws Exception { + public void setUp() { context.addModelsForClasses(SlingBindingsModel.class); currentPage = context.create().page("/content/testPage"); @@ -182,7 +182,7 @@ public void testBindings_EditMode() { } @Test - public void testBindingsModelFactory() throws Exception { + public void testBindingsModelFactory() { context.currentResource(currentResource); ModelFactory modelFactory = context.getService(ModelFactory.class); diff --git a/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrMockTest.java b/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrMockTest.java index 131d6388..9b2479d4 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrMockTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrMockTest.java @@ -52,7 +52,7 @@ public class SlingAlias_JcrMockTest { private String contentRoot; @Before - public void setUp() throws Exception { + public void setUp() { contentRoot = context.uniqueRoot().content() + "/sample"; } diff --git a/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrOakTest.java b/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrOakTest.java index 99556488..6e4c1567 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrOakTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/context/SlingAlias_JcrOakTest.java @@ -43,7 +43,7 @@ public class SlingAlias_JcrOakTest { private String contentRoot; @Before - public void setUp() throws Exception { + public void setUp() { contentRoot = context.uniqueRoot().content() + "/sample"; } diff --git a/core/src/test/java/io/wcm/testing/mock/aem/context/TestAemContext.java b/core/src/test/java/io/wcm/testing/mock/aem/context/TestAemContext.java index edbe29ea..f9f1bde3 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/context/TestAemContext.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/context/TestAemContext.java @@ -25,7 +25,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.sling.api.resource.PersistenceException; import org.apache.sling.testing.mock.sling.NodeTypeDefinitionScanner; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.jetbrains.annotations.NotNull; @@ -75,7 +74,7 @@ private TestAemContext() { private static final class SetUpCallback implements AemContextCallback { @Override - public void execute(@NotNull AemContext context) throws PersistenceException, IOException { + public void execute(@NotNull AemContext context) throws IOException { try { // register manually because in project's unit tests itself MANIFEST.MF is not available NodeTypeDefinitionScanner.get().register(context.resourceResolver().adaptTo(Session.class), diff --git a/core/src/test/java/io/wcm/testing/mock/aem/context/UniqueRootTest.java b/core/src/test/java/io/wcm/testing/mock/aem/context/UniqueRootTest.java index 06a259fc..139c9671 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/context/UniqueRootTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/context/UniqueRootTest.java @@ -33,7 +33,7 @@ public class UniqueRootTest { public AemContext context = TestAemContext.newAemContext(); @Test - public void testDam() throws Exception { + public void testDam() { String path = context.uniqueRoot().dam(); assertNotNull(context.resourceResolver().getResource(path)); assertTrue(path.matches("^/content/dam/[^/]+")); diff --git a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetStoreTest.java b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetStoreTest.java index 030bb1f2..511912aa 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetStoreTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetStoreTest.java @@ -52,7 +52,7 @@ public void testAssetHandler_Invalid() { } @Test - public void testGetAssetHandler_JPEG() throws Exception { + public void testGetAssetHandler_JPEG() { assertNotNull(underTest.getAssetHandler(JPEG_MIME_TYPE)); } diff --git a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetTest.java b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetTest.java index 1b1802b0..f4efafd1 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockAssetTest.java @@ -64,7 +64,7 @@ public class MockAssetTest { private DamEventHandler damEventHandler; @Before - public void setUp() throws Exception { + public void setUp() { context.load().json("/json-import-samples/dam.json", "/content/dam/sample"); Resource resource = this.context.resourceResolver().getResource("/content/dam/sample/portraits/scott_reynolds.jpg"); @@ -110,7 +110,7 @@ private boolean hasRendition(List renditions, String renditionName) { } @Test - public void testEquals() throws Exception { + public void testEquals() { Asset asset1 = this.context.resourceResolver().getResource("/content/dam/sample/portraits/scott_reynolds.jpg").adaptTo(Asset.class); Asset asset2 = this.context.resourceResolver().getResource("/content/dam/sample/portraits/scott_reynolds.jpg").adaptTo(Asset.class); @@ -146,18 +146,18 @@ private void doTestAddRemoveRendition(final String renditionName) { } @Test - public void testAddRemoveRendition() throws Exception { + public void testAddRemoveRendition() { doTestAddRemoveRendition("test.bin"); } @Test - public void testRenditionListMutable() throws Exception { + public void testRenditionListMutable() { // make sure rendition list is modifiable by calling getBestfitRendition which does a sort on it UIHelper.getBestfitRendition(asset, 100); } @Test - public void testBatchMode() throws Exception { + public void testBatchMode() { if (context.resourceResolverType() == ResourceResolverType.JCR_MOCK) { // resource resolver revert not support for JCR_MOCK - skip test return; diff --git a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockPublishUtilsTest.java b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockPublishUtilsTest.java index b111d565..6393a5b5 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockPublishUtilsTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockPublishUtilsTest.java @@ -41,7 +41,7 @@ public class MockPublishUtilsTest { private PublishUtils underTest; @Before - public void setUp() throws Exception { + public void setUp() { underTest = context.getService(PublishUtils.class); assertNotNull(underTest); } diff --git a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockRenditionTest.java b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockRenditionTest.java index ea04b7c4..6fa59edd 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/dam/MockRenditionTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/dam/MockRenditionTest.java @@ -43,7 +43,7 @@ public class MockRenditionTest { private Rendition rendition; @Before - public void setUp() throws Exception { + public void setUp() { context.load().json("/json-import-samples/dam.json", "/content/dam/sample"); Resource resource = this.context.resourceResolver() diff --git a/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockAssetDeliveryTest.java b/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockAssetDeliveryTest.java index 9f3a3cfe..65acedb7 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockAssetDeliveryTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockAssetDeliveryTest.java @@ -49,7 +49,7 @@ public class MockAssetDeliveryTest { private Resource assetResource; @Before - public void setUp() throws Exception { + public void setUp() { this.underTest = context.registerInjectActivateService(MockAssetDelivery.class); asset = context.create().asset("/content/dam/test.jpg", 10, 10, "image/jpeg"); assetResource = asset.adaptTo(Resource.class); diff --git a/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockNextGenDynamicMediaConfigTest.java b/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockNextGenDynamicMediaConfigTest.java index da938cab..ab3ded42 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockNextGenDynamicMediaConfigTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/dam/ngdm/MockNextGenDynamicMediaConfigTest.java @@ -46,7 +46,7 @@ public class MockNextGenDynamicMediaConfigTest { private MockNextGenDynamicMediaConfig underTest; @Before - public void setUp() throws Exception { + public void setUp() { underTest = context.registerInjectActivateService(MockNextGenDynamicMediaConfig.class); } diff --git a/core/src/test/java/io/wcm/testing/mock/aem/granite/MockResourceCollectionManagerTest.java b/core/src/test/java/io/wcm/testing/mock/aem/granite/MockResourceCollectionManagerTest.java index 5777e229..3d328633 100644 --- a/core/src/test/java/io/wcm/testing/mock/aem/granite/MockResourceCollectionManagerTest.java +++ b/core/src/test/java/io/wcm/testing/mock/aem/granite/MockResourceCollectionManagerTest.java @@ -68,7 +68,7 @@ public class MockResourceCollectionManagerTest { private Asset sampleAsset; @Before - public void setUp() throws Exception { + public void setUp() { underTest = context.getService(ResourceCollectionManager.class); samplePage1 = context.create().page("/content/mysite/page1"); diff --git a/junit5/src/main/java/io/wcm/testing/mock/aem/junit5/AemContextStore.java b/junit5/src/main/java/io/wcm/testing/mock/aem/junit5/AemContextStore.java index a553a376..250033ce 100644 --- a/junit5/src/main/java/io/wcm/testing/mock/aem/junit5/AemContextStore.java +++ b/junit5/src/main/java/io/wcm/testing/mock/aem/junit5/AemContextStore.java @@ -53,7 +53,7 @@ private AemContextStore() { return null; } // try to get existing context from current extension context, or any parent extension context (in case of nested tests) - return Optional.ofNullable(AemContextStore.getStore(extensionContext).get(testClass, AemContext.class)) + return Optional.ofNullable(getStore(extensionContext).get(testClass, AemContext.class)) .orElseGet(() -> extensionContext.getParent().map(AemContextStore::getAemContext).orElse(null)); } diff --git a/junit5/src/test/java/io/wcm/testing/mock/aem/junit5/BeforeAllStaticMemberAemContextPluginTest.java b/junit5/src/test/java/io/wcm/testing/mock/aem/junit5/BeforeAllStaticMemberAemContextPluginTest.java index a88c8570..77d9a625 100644 --- a/junit5/src/test/java/io/wcm/testing/mock/aem/junit5/BeforeAllStaticMemberAemContextPluginTest.java +++ b/junit5/src/test/java/io/wcm/testing/mock/aem/junit5/BeforeAllStaticMemberAemContextPluginTest.java @@ -61,7 +61,7 @@ static void beforeAll() throws Exception { } @Test - void testRequest() throws Exception { + void testRequest() { assertNotNull(context.request()); }