Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HADOOP-18620 Avoid using grizzly-http-* APIs #5356

Merged
merged 1 commit into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions hadoop-common-project/hadoop-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,6 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,27 @@

package org.apache.hadoop.security.authentication.server;

import java.io.IOException;
import java.io.PrintWriter;
import java.security.Principal;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;

import javax.servlet.FilterConfig;
import javax.servlet.FilterChain;
import javax.servlet.ServletContext;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import static org.assertj.core.api.Assertions.assertThat;
import org.glassfish.grizzly.servlet.HttpServletResponseImpl;
import org.junit.Test;
import org.mockito.Mockito;

Expand Down Expand Up @@ -76,8 +82,192 @@ public ServletContext getServletContext() {
}
}

private class HttpServletResponseForTest extends HttpServletResponseImpl {
private class HttpServletResponseForTest implements HttpServletResponse {

@Override
public void addCookie(Cookie cookie) {

}

@Override
public boolean containsHeader(String name) {
return false;
}

@Override
public String encodeURL(String url) {
return null;
}

@Override
public String encodeRedirectURL(String url) {
return null;
}

@Override
public String encodeUrl(String url) {
return null;
}

@Override
public String encodeRedirectUrl(String url) {
return null;
}

@Override
public void sendError(int sc, String msg) throws IOException {

}

@Override
public void sendError(int sc) throws IOException {

}

@Override
public void sendRedirect(String location) throws IOException {

}

@Override
public void setDateHeader(String name, long date) {

}

@Override
public void addDateHeader(String name, long date) {

}

@Override
public void setHeader(String name, String value) {

}

@Override
public void addHeader(String name, String value) {

}

@Override
public void setIntHeader(String name, int value) {

}

@Override
public void addIntHeader(String name, int value) {

}

@Override
public void setStatus(int sc) {

}

@Override
public void setStatus(int sc, String sm) {

}

@Override
public int getStatus() {
return 0;
}

@Override
public String getHeader(String name) {
return null;
}

@Override
public Collection<String> getHeaders(String name) {
return null;
}

@Override
public Collection<String> getHeaderNames() {
return null;
}

@Override
public String getCharacterEncoding() {
return null;
}

@Override
public String getContentType() {
return null;
}

@Override
public ServletOutputStream getOutputStream() throws IOException {
return null;
}

@Override
public PrintWriter getWriter() throws IOException {
return null;
}

@Override
public void setCharacterEncoding(String charset) {

}

@Override
public void setContentLength(int len) {

}

@Override
public void setContentLengthLong(long len) {

}

@Override
public void setContentType(String type) {

}

@Override
public void setBufferSize(int size) {

}

@Override
public int getBufferSize() {
return 0;
}

@Override
public void flushBuffer() throws IOException {

}

@Override
public void resetBuffer() {

}

@Override
public boolean isCommitted() {
return false;
}

@Override
public void reset() {

}

@Override
public void setLocale(Locale loc) {

}

@Override
public Locale getLocale() {
return null;
}
}


Expand Down
17 changes: 0 additions & 17 deletions hadoop-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
<kotlin-stdlib-common.version>1.6.20</kotlin-stdlib-common.version>
<jdom2.version>2.0.6.1</jdom2.version>
<jna.version>5.2.0</jna.version>
<grizzly.version>2.2.21</grizzly.version>
<gson.version>2.9.0</gson.version>
<metrics.version>3.2.4</metrics.version>
<netty4.version>4.1.77.Final</netty4.version>
Expand Down Expand Up @@ -1535,22 +1534,6 @@
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-servlet</artifactId>
<version>${grizzly.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http</artifactId>
<version>${grizzly.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
<version>${grizzly.version}</version>
</dependency>

<dependency>
<groupId>${leveldbjni.group}</groupId>
<artifactId>leveldbjni-all</artifactId>
Expand Down
Loading