You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by he...@apache.org on 2026/03/30 09:43:44 UTC
(sling-org-apache-sling-testing-sling-mock) branch SLING-13146 updated: SLING-13146 Fix build issue (@Nullable for artifactCoordinates)
This is an automated email from the ASF dual-hosted git repository.
henrykuijpers pushed a commit to branch SLING-13146
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
The following commit(s) were added to refs/heads/SLING-13146 by this push:
new 7d9cbf1 SLING-13146 Fix build issue (@Nullable for artifactCoordinates)
7d9cbf1 is described below
commit 7d9cbf13a62c777ad0039d79b5e209a6843e58bb
Author: Henry Kuijpers <he...@apache.org>
AuthorDate: Mon Mar 30 11:43:35 2026 +0200
SLING-13146 Fix build issue (@Nullable for artifactCoordinates)
---
.../org/apache/sling/testing/mock/sling/ResourceResolverType.java | 7 ++++---
.../mock/sling/ThreadsafeMockAdapterManagerWrapperTest.java | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
index 080f618..e15222b 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
@@ -19,6 +19,7 @@
package org.apache.sling.testing.mock.sling;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* The resource resolver mock implementation supports different underlying
@@ -90,12 +91,12 @@ public enum ResourceResolverType {
NONE(MockNoneResourceResolverAdapter.class.getName(), null, NodeTypeMode.NOT_SUPPORTED);
private final @NotNull String resourceResolverTypeAdapterClass;
- private final @NotNull String artifactCoordinates;
+ private final @Nullable String artifactCoordinates;
private final @NotNull NodeTypeMode nodeTypeMode;
private ResourceResolverType(
@NotNull final String resourceResolverTypeAdapterClass,
- @NotNull final String artifactCoordinates,
+ @Nullable final String artifactCoordinates,
@NotNull final NodeTypeMode nodeTypeMode) {
this.resourceResolverTypeAdapterClass = resourceResolverTypeAdapterClass;
this.artifactCoordinates = artifactCoordinates;
@@ -107,7 +108,7 @@ public enum ResourceResolverType {
return this.resourceResolverTypeAdapterClass;
}
- @NotNull
+ @Nullable
String getArtifactCoordinates() {
return this.artifactCoordinates;
}
diff --git a/core/src/test/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapperTest.java b/core/src/test/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapperTest.java
index 22c81ed..556ebf1 100644
--- a/core/src/test/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapperTest.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapperTest.java
@@ -36,8 +36,9 @@ import static org.junit.Assert.assertNotNull;
public class ThreadsafeMockAdapterManagerWrapperTest {
@Rule
- public final SlingContext context =
- new SlingContextBuilder().registerSlingModelsFromClassPath(false).build();
+ public final SlingContext context = new SlingContextBuilder(ResourceResolverType.RESOURCEPROVIDER_MOCK)
+ .registerSlingModelsFromClassPath(false)
+ .build();
@Before
public void setUp() {