Skip to content

Commit 019962a

Browse files
committed
https://github.com/eclipse-ee4j/faces-api/issues/1586
Remove references to long-deprecated servlet API classes/methods which were physically removed in 6.0.0
1 parent 0b849cf commit 019962a

File tree

4 files changed

+3
-57
lines changed

4 files changed

+3
-57
lines changed

impl/src/main/java/com/sun/faces/application/ViewHandlerResponseWrapper.java

-6
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ public void setStatus(int sc) {
6363
status = sc;
6464
}
6565

66-
@Override
67-
public void setStatus(int sc, String sm) {
68-
super.setStatus(sc, sm);
69-
status = sc;
70-
}
71-
7266
@Override
7367
public int getStatus() {
7468
return status;

impl/src/test/java/com/sun/faces/mock/MockHttpServletRequest.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.HashMap;
2626
import java.util.Locale;
2727
import java.util.Map;
28+
2829
import jakarta.servlet.AsyncContext;
2930
import jakarta.servlet.DispatcherType;
3031
import jakarta.servlet.RequestDispatcher;
@@ -243,11 +244,6 @@ public boolean isRequestedSessionIdFromCookie() {
243244
throw new UnsupportedOperationException();
244245
}
245246

246-
@Override
247-
public boolean isRequestedSessionIdFromUrl() {
248-
throw new UnsupportedOperationException();
249-
}
250-
251247
@Override
252248
public boolean isRequestedSessionIdFromURL() {
253249
throw new UnsupportedOperationException();
@@ -366,11 +362,6 @@ public BufferedReader getReader() {
366362
throw new UnsupportedOperationException();
367363
}
368364

369-
@Override
370-
public String getRealPath(String path) {
371-
throw new UnsupportedOperationException();
372-
}
373-
374365
@Override
375366
public String getRemoteAddr() {
376367
throw new UnsupportedOperationException();

impl/src/test/java/com/sun/faces/mock/MockHttpServletResponse.java

+1-15
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.PrintWriter;
2121
import java.util.Collection;
2222
import java.util.Locale;
23+
2324
import jakarta.servlet.ServletOutputStream;
2425
import jakarta.servlet.http.Cookie;
2526
import jakarta.servlet.http.HttpServletResponse;
@@ -57,21 +58,11 @@ public boolean containsHeader(String name) {
5758
throw new UnsupportedOperationException();
5859
}
5960

60-
@Override
61-
public String encodeRedirectUrl(String url) {
62-
return (encodeRedirectURL(url));
63-
}
64-
6561
@Override
6662
public String encodeRedirectURL(String url) {
6763
return (url);
6864
}
6965

70-
@Override
71-
public String encodeUrl(String url) {
72-
return (encodeURL(url));
73-
}
74-
7566
@Override
7667
public String encodeURL(String url) {
7768
return (url);
@@ -112,11 +103,6 @@ public void setStatus(int status) {
112103
this.status = status;
113104
}
114105

115-
@Override
116-
public void setStatus(int status, String message) {
117-
this.status = status;
118-
}
119-
120106
// ------------------------------------------------ ServletResponse Methods
121107
@Override
122108
public void flushBuffer() {

impl/src/test/java/com/sun/faces/mock/MockHttpSession.java

+1-26
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import java.util.Enumeration;
2020
import java.util.HashMap;
21+
2122
import jakarta.servlet.ServletContext;
2223
import jakarta.servlet.http.HttpSession;
23-
import jakarta.servlet.http.HttpSessionContext;
2424

2525
// Mock Object for HttpSession (Version 2.3)
2626
public class MockHttpSession implements HttpSession {
@@ -78,21 +78,6 @@ public ServletContext getServletContext() {
7878
return (this.servletContext);
7979
}
8080

81-
@Override
82-
public HttpSessionContext getSessionContext() {
83-
throw new UnsupportedOperationException();
84-
}
85-
86-
@Override
87-
public Object getValue(String name) {
88-
throw new UnsupportedOperationException();
89-
}
90-
91-
@Override
92-
public String[] getValueNames() {
93-
throw new UnsupportedOperationException();
94-
}
95-
9681
@Override
9782
public void invalidate() {
9883
throw new UnsupportedOperationException();
@@ -103,21 +88,11 @@ public boolean isNew() {
10388
throw new UnsupportedOperationException();
10489
}
10590

106-
@Override
107-
public void putValue(String name, Object value) {
108-
throw new UnsupportedOperationException();
109-
}
110-
11191
@Override
11292
public void removeAttribute(String name) {
11393
attributes.remove(name);
11494
}
11595

116-
@Override
117-
public void removeValue(String name) {
118-
throw new UnsupportedOperationException();
119-
}
120-
12196
@Override
12297
public void setAttribute(String name, Object value) {
12398
if (value == null) {

0 commit comments

Comments
 (0)