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.

Sign up for GitHub

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

Jump to bottom

Just a simple upgrade to littleproxy-1.0beta4 #127

Merged
merged 1 commit into from Jan 28, 2014
Merged

Just a simple upgrade to littleproxy-1.0beta4 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions betamax-proxy/src/main/java/co/freeside/betamax/proxy/BetamaxFilters.java
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ public HttpResponse requestPost(HttpObject httpObject) {
} }


@Override @Override
public void responsePre(HttpObject httpObject) { public HttpObject responsePre(HttpObject httpObject) {
if (httpObject instanceof HttpResponse) { if (httpObject instanceof HttpResponse) {
upstreamResponse = NettyResponseAdapter.wrap(httpObject); upstreamResponse = NettyResponseAdapter.wrap(httpObject);
} }
Expand All @@ -108,14 +108,18 @@ public void responsePre(HttpObject httpObject) {
throw new NonWritableTapeException(); throw new NonWritableTapeException();
} }
} }

return httpObject;
} }


@Override @Override
public void responsePost(HttpObject httpObject) { public HttpObject responsePost(HttpObject httpObject) {
if (httpObject instanceof HttpResponse) { if (httpObject instanceof HttpResponse) {
setBetamaxHeader((HttpResponse) httpObject, "REC"); setBetamaxHeader((HttpResponse) httpObject, "REC");
setViaHeader((HttpMessage) httpObject); setViaHeader((HttpMessage) httpObject);
} }

return httpObject;
} }


private Optional<? extends FullHttpResponse> onRequestIntercepted() throws IOException { private Optional<? extends FullHttpResponse> onRequestIntercepted() throws IOException {
Expand Down
12 changes: 8 additions & 4 deletions betamax-proxy/src/main/java/co/freeside/betamax/proxy/netty/PredicatedHttpFilters.java
View file
Open in desktop
Expand Up @@ -59,16 +59,20 @@ public HttpResponse requestPost(HttpObject httpObject) {
} }


@Override @Override
public void responsePre(HttpObject httpObject) { public HttpObject responsePre(HttpObject httpObject) {
if (predicate.apply(originalRequest)) { if (predicate.apply(originalRequest)) {
delegate.responsePre(httpObject); return delegate.responsePre(httpObject);
} else {
return httpObject;
} }
} }


@Override @Override
public void responsePost(HttpObject httpObject) { public HttpObject responsePost(HttpObject httpObject) {
if (predicate.apply(originalRequest)) { if (predicate.apply(originalRequest)) {
delegate.responsePost(httpObject); return delegate.responsePost(httpObject);
} else {
return httpObject;
} }
} }
} }
2 changes: 1 addition & 1 deletion betamax.gradle
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ allprojects {
}), }),
httpClient: dependencies.create("org.apache.httpcomponents:httpclient:4.3.1"), httpClient: dependencies.create("org.apache.httpcomponents:httpclient:4.3.1"),
junit: dependencies.create("junit:junit:4.10"), junit: dependencies.create("junit:junit:4.10"),
littleProxy: dependencies.create("org.littleshoot:littleproxy:1.0.0-beta3"), littleProxy: dependencies.create("org.littleshoot:littleproxy:1.0.0-beta4"),
netty: dependencies.create("io.netty:netty-all:4.0.11.Final"), netty: dependencies.create("io.netty:netty-all:4.0.11.Final"),
snakeYaml: dependencies.create("org.yaml:snakeyaml:1.13"), snakeYaml: dependencies.create("org.yaml:snakeyaml:1.13"),
spock: dependencies.create("org.spockframework:spock-core:0.7-groovy-2.0", { spock: dependencies.create("org.spockframework:spock-core:0.7-groovy-2.0", {
Expand Down