You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/05/21 11:33:00 UTC

[sling-org-apache-sling-servlet-helpers] branch master updated: Fixed typo on getStatusMessage()

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git


The following commit(s) were added to refs/heads/master by this push:
     new fed7c42  Fixed typo on getStatusMessage()
fed7c42 is described below

commit fed7c42c3f04ea9e0c64e5c1af0233c21f7d2330
Author: Rob McDougall <rm...@rogers.com>
AuthorDate: Sat May 18 08:09:22 2019 -0400

    Fixed typo on getStatusMessage()
    
    Closes #5
---
 .../servlethelpers/MockSlingHttpServletResponse.java      | 15 ++++++++++++++-
 .../org/apache/sling/servlethelpers/package-info.java     |  2 +-
 .../servlethelpers/MockSlingHttpServletResponseTest.java  |  3 ++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
index 94a1e9e..9bba6f9 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
@@ -262,10 +262,23 @@ public class MockSlingHttpServletResponse extends SlingAdaptable implements Slin
         this.locale = loc;
     }
 
-    public String geStatusMessage() {
+    /**
+     * @return status message that was set using {@link #setStatus(int, String)} or {@link #sendError(int, String)}
+     */
+    public String getStatusMessage() {
         return statusMessage;
     }
     
+    /**
+     * @deprecated As of package version 1.6, use {@link #getStatusMessage()} instead.
+     * 
+     * @return status message that was set using {@link #setStatus(int, String)} or {@link #sendError(int, String)}
+     */
+    @Deprecated
+    public String geStatusMessage() {
+        return this.getStatusMessage();
+    }
+    
     // --- unsupported operations ---
     @Override
     public String encodeRedirectUrl(String url) {
diff --git a/src/main/java/org/apache/sling/servlethelpers/package-info.java b/src/main/java/org/apache/sling/servlethelpers/package-info.java
index 0133e44..8941ca5 100644
--- a/src/main/java/org/apache/sling/servlethelpers/package-info.java
+++ b/src/main/java/org/apache/sling/servlethelpers/package-info.java
@@ -19,5 +19,5 @@
 /**
  * Mock implementation of selected Servlet-related Sling APIs.
  */
-@org.osgi.annotation.versioning.Version("1.5")
+@org.osgi.annotation.versioning.Version("1.6")
 package org.apache.sling.servlethelpers;
diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
index e6cf6e0..3c4972d 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
@@ -121,7 +121,8 @@ public class MockSlingHttpServletResponseTest {
     public void testSendErrorWithMEssage() throws Exception {
         response.sendError(HttpServletResponse.SC_NOT_FOUND, "my error message");
         assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatus());
-        assertEquals("my error message", response.geStatusMessage());
+        assertEquals("my error message", response.geStatusMessage());	// This version has been depracated.
+        assertEquals("my error message", response.getStatusMessage());
     }
 
     @Test