This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch appmod/java-upgrade-20250910060318 in repository https://gitbox.apache.org/repos/asf/sling-samples.git
commit 0b4c1435959ea87e8e1cc96e185d4dae9f41fa60 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Sep 10 10:26:04 2025 +0200 Migrate to Sling API 3 --- slingshot/pom.xml | 4 ++-- .../org/apache/sling/sample/slingshot/SlingshotUtil.java | 4 ++-- .../slingshot/comments/impl/CommentPostServlet.java | 15 +++++++-------- .../org/apache/sling/sample/slingshot/package-info.java | 2 +- .../sample/slingshot/ratings/impl/RatingPostServlet.java | 15 +++++++-------- .../apache/sling/sample/slingshot/SlingshotUtilTest.java | 2 +- .../sling/sample/slingshot/impl/SetupServiceTest.java | 2 +- .../org/apache/sling/sample/slingshot/impl/UtilTest.java | 3 +-- .../slingshot/ratings/impl/RatingServiceImplTest.java | 2 +- 9 files changed, 23 insertions(+), 26 deletions(-) diff --git a/slingshot/pom.xml b/slingshot/pom.xml index a8aed16..c4510a9 100644 --- a/slingshot/pom.xml +++ b/slingshot/pom.xml @@ -101,7 +101,7 @@ <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> <version>6.0.0</version> - <scope>test</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.jcr</groupId> @@ -217,7 +217,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- + <!-- <configuration> <testSourceDirectory>src/main/it</testSourceDirectory> </configuration> diff --git a/slingshot/src/main/java/org/apache/sling/sample/slingshot/SlingshotUtil.java b/slingshot/src/main/java/org/apache/sling/sample/slingshot/SlingshotUtil.java index f3802f1..0ab1009 100644 --- a/slingshot/src/main/java/org/apache/sling/sample/slingshot/SlingshotUtil.java +++ b/slingshot/src/main/java/org/apache/sling/sample/slingshot/SlingshotUtil.java @@ -18,7 +18,7 @@ */ package org.apache.sling.sample.slingshot; -import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingJakartaHttpServletRequest; import org.apache.sling.api.resource.Resource; public abstract class SlingshotUtil { @@ -66,7 +66,7 @@ public abstract class SlingshotUtil { * @param request The request * @return {@code true} if it is a known user. */ - public static boolean isUser(final SlingHttpServletRequest request) { + public static boolean isUser(final SlingJakartaHttpServletRequest request) { final boolean isUser = request.getRemoteUser() != null && !request.getRemoteUser().equals("anonymous"); return isUser; diff --git a/slingshot/src/main/java/org/apache/sling/sample/slingshot/comments/impl/CommentPostServlet.java b/slingshot/src/main/java/org/apache/sling/sample/slingshot/comments/impl/CommentPostServlet.java index 9df7b11..57a97c2 100644 --- a/slingshot/src/main/java/org/apache/sling/sample/slingshot/comments/impl/CommentPostServlet.java +++ b/slingshot/src/main/java/org/apache/sling/sample/slingshot/comments/impl/CommentPostServlet.java @@ -18,19 +18,18 @@ */ package org.apache.sling.sample.slingshot.comments.impl; -import javax.servlet.Servlet; -import javax.servlet.ServletException; - import java.io.IOException; import java.io.Serial; -import org.apache.sling.api.SlingHttpServletRequest; -import org.apache.sling.api.SlingHttpServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import org.apache.sling.api.SlingJakartaHttpServletRequest; +import org.apache.sling.api.SlingJakartaHttpServletResponse; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; -import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.api.servlets.SlingJakartaAllMethodsServlet; import org.apache.sling.sample.slingshot.comments.Comment; import org.apache.sling.sample.slingshot.comments.CommentsService; import org.apache.sling.sample.slingshot.comments.CommentsUtil; @@ -47,7 +46,7 @@ import org.slf4j.LoggerFactory; "sling.servlet.extensions=comments", "sling.servlet.resourceTypes=" + StreamEntry.RESOURCETYPE }) -public class CommentPostServlet extends SlingAllMethodsServlet { +public class CommentPostServlet extends SlingJakartaAllMethodsServlet { @Serial private static final long serialVersionUID = 1L; @@ -61,7 +60,7 @@ public class CommentPostServlet extends SlingAllMethodsServlet { private CommentsService commentsService; @Override - protected void doPost(final SlingHttpServletRequest request, final SlingHttpServletResponse response) + protected void doPost(final SlingJakartaHttpServletRequest request, final SlingJakartaHttpServletResponse response) throws ServletException, IOException { final String title = request.getParameter(CommentsUtil.PROPERTY_TITLE); final String text = request.getParameter(CommentsUtil.PROPERTY_TEXT); diff --git a/slingshot/src/main/java/org/apache/sling/sample/slingshot/package-info.java b/slingshot/src/main/java/org/apache/sling/sample/slingshot/package-info.java index 8afacc9..3dc9df6 100644 --- a/slingshot/src/main/java/org/apache/sling/sample/slingshot/package-info.java +++ b/slingshot/src/main/java/org/apache/sling/sample/slingshot/package-info.java @@ -16,5 +16,5 @@ * specific language governing permissions and limitations * under the License. */ [email protected]("1.0.1") [email protected]("2.0.0") package org.apache.sling.sample.slingshot; diff --git a/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java b/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java index 1aced6e..6d70792 100644 --- a/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java +++ b/slingshot/src/main/java/org/apache/sling/sample/slingshot/ratings/impl/RatingPostServlet.java @@ -18,20 +18,19 @@ */ package org.apache.sling.sample.slingshot.ratings.impl; -import javax.servlet.Servlet; -import javax.servlet.ServletException; - import java.io.IOException; import java.io.PrintWriter; import java.io.Serial; -import org.apache.sling.api.SlingHttpServletRequest; -import org.apache.sling.api.SlingHttpServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import org.apache.sling.api.SlingJakartaHttpServletRequest; +import org.apache.sling.api.SlingJakartaHttpServletResponse; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; -import org.apache.sling.api.servlets.SlingAllMethodsServlet; +import org.apache.sling.api.servlets.SlingJakartaAllMethodsServlet; import org.apache.sling.sample.slingshot.model.StreamEntry; import org.apache.sling.sample.slingshot.ratings.RatingsService; import org.apache.sling.sample.slingshot.ratings.RatingsUtil; @@ -51,7 +50,7 @@ import org.slf4j.LoggerFactory; "sling.servlet.extensions=ratings", "sling.servlet.resourceTypes=" + StreamEntry.RESOURCETYPE }) -public class RatingPostServlet extends SlingAllMethodsServlet { +public class RatingPostServlet extends SlingJakartaAllMethodsServlet { @Serial private static final long serialVersionUID = 1L; @@ -65,7 +64,7 @@ public class RatingPostServlet extends SlingAllMethodsServlet { private RatingsService ratingsService; @Override - protected void doPost(final SlingHttpServletRequest request, final SlingHttpServletResponse response) + protected void doPost(final SlingJakartaHttpServletRequest request, final SlingJakartaHttpServletResponse response) throws ServletException, IOException { final String rating = request.getParameter(RatingsUtil.PROPERTY_RATING); final String userId = request.getRemoteUser(); diff --git a/slingshot/src/test/java/org/apache/sling/sample/slingshot/SlingshotUtilTest.java b/slingshot/src/test/java/org/apache/sling/sample/slingshot/SlingshotUtilTest.java index b5a7f57..f891dc6 100644 --- a/slingshot/src/test/java/org/apache/sling/sample/slingshot/SlingshotUtilTest.java +++ b/slingshot/src/test/java/org/apache/sling/sample/slingshot/SlingshotUtilTest.java @@ -24,9 +24,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; public class SlingshotUtilTest { diff --git a/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java b/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java index 227a84c..97b4d7f 100644 --- a/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java +++ b/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/SetupServiceTest.java @@ -34,9 +34,9 @@ import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import static org.apache.sling.sample.slingshot.impl.InternalConstants.RESOURCETYPE_HOME; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.anyString; diff --git a/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/UtilTest.java b/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/UtilTest.java index f2433b5..60215e5 100644 --- a/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/UtilTest.java +++ b/slingshot/src/test/java/org/apache/sling/sample/slingshot/impl/UtilTest.java @@ -26,8 +26,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; @RunWith(Parameterized.class) public class UtilTest { @@ -53,7 +53,6 @@ public class UtilTest { @Test public void filter() { - assertThat(output, equalTo(Util.filter(input))); } } diff --git a/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingServiceImplTest.java b/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingServiceImplTest.java index 5a9e67d..b9ed8f4 100644 --- a/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingServiceImplTest.java +++ b/slingshot/src/test/java/org/apache/sling/sample/slingshot/ratings/impl/RatingServiceImplTest.java @@ -24,9 +24,9 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; public class RatingServiceImplTest {
