diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml
index c79ce3e2cbe0..723ad4eef42d 100644
--- a/.idea/libraries/Netty.xml
+++ b/.idea/libraries/Netty.xml
@@ -1,11 +1,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 9513ef4b630e..eaeb82e1c4b4 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -250,7 +250,7 @@ libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license:
libraryLicense(name: "XStream", version: "1.4.3", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html")
libraryLicense(name: "YourKit Java Profiler", libraryName: "yjp-controller-api-redist.jar", version: "8.0.x", license: "link (commercial license)", url: "http://yourkit.com/", licenseUrl: "http://www.yourkit.com/purchase/license.html")
libraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt?r=367")
-libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Alpha2", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Beta1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
libraryLicense(name: "Kryo", libraryName: "Kryo", version: "2.22", license: "New BSD License", url: "https://github.com/EsotericSoftware/kryo", licenseUrl: "https://github.com/EsotericSoftware/kryo/blob/master/license.txt")
libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "0.3", license: "Apache 2.0", url: "https://github.com/dain/snappy", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
diff --git a/lib/netty-all-4.1.0.Alpha1.jar b/lib/netty-all-4.1.0.Alpha1.jar
deleted file mode 100644
index ef99234e5fc2..000000000000
Binary files a/lib/netty-all-4.1.0.Alpha1.jar and /dev/null differ
diff --git a/lib/netty-all-4.1.0.Beta1.jar b/lib/netty-all-4.1.0.Beta1.jar
new file mode 100644
index 000000000000..cbd8b2cb6d33
Binary files /dev/null and b/lib/netty-all-4.1.0.Beta1.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 46f1c3646c62..77d0b5b11961 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -48,7 +48,7 @@ microba.jar
miglayout-swing.jar
nanoxml-2.2.3.jar
nekohtml-1.9.14.jar
-netty-all-4.1.0.Alpha1.jar
+netty-all-4.1.0.Beta1.jar
oromatcher.jar
picocontainer.jar
protobuf-2.5.0.jar
diff --git a/lib/src/netty-all-4.1.0.Alpha1-sources.jar b/lib/src/netty-all-4.1.0.Alpha1-sources.jar
deleted file mode 100644
index a3fff4f2fe59..000000000000
Binary files a/lib/src/netty-all-4.1.0.Alpha1-sources.jar and /dev/null differ
diff --git a/lib/src/netty-all-4.1.0.Beta1-sources.jar b/lib/src/netty-all-4.1.0.Beta1-sources.jar
new file mode 100644
index 000000000000..48e83c77330f
Binary files /dev/null and b/lib/src/netty-all-4.1.0.Beta1-sources.jar differ
diff --git a/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java b/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java
index ed279b4bbd37..692baaf1d4e4 100644
--- a/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java
+++ b/platform/platform-impl/src/org/jetbrains/io/DelegatingHttpRequestHandlerBase.java
@@ -25,10 +25,10 @@ abstract class DelegatingHttpRequestHandlerBase extends SimpleChannelInboundHand
protected void messageReceived(ChannelHandlerContext context, FullHttpRequest message) throws Exception {
if (BuiltInServer.LOG.isDebugEnabled()) {
// BuiltInServer.LOG.debug("IN HTTP:\n" + message);
- BuiltInServer.LOG.debug("IN HTTP: " + message.getUri());
+ BuiltInServer.LOG.debug("IN HTTP: " + message.uri());
}
- if (!process(context, message, new QueryStringDecoder(message.getUri()))) {
+ if (!process(context, message, new QueryStringDecoder(message.uri()))) {
Responses.sendStatus(HttpResponseStatus.NOT_FOUND, context.channel(), message);
}
}
diff --git a/platform/platform-impl/src/org/jetbrains/io/FileResponses.java b/platform/platform-impl/src/org/jetbrains/io/FileResponses.java
index 372605ce8036..0f187659e28c 100644
--- a/platform/platform-impl/src/org/jetbrains/io/FileResponses.java
+++ b/platform/platform-impl/src/org/jetbrains/io/FileResponses.java
@@ -85,12 +85,12 @@ public class FileResponses {
try {
long fileLength = raf.length();
- if (request.getMethod() != HttpMethod.HEAD) {
+ if (request.method() != HttpMethod.HEAD) {
HttpHeaders.setContentLength(response, fileLength);
}
channel.write(response);
- if (request.getMethod() != HttpMethod.HEAD) {
+ if (request.method() != HttpMethod.HEAD) {
if (channel.pipeline().get(SslHandler.class) == null) {
// no encryption - use zero-copy
channel.write(new DefaultFileRegion(raf.getChannel(), 0, fileLength));
diff --git a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java b/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java
index 466c996b4c19..3f88327d3d28 100644
--- a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java
+++ b/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java
@@ -34,6 +34,8 @@ import java.security.KeyStore;
import java.security.Security;
import java.util.UUID;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
+
@ChannelHandler.Sharable
class PortUnificationServerHandler extends Decoder {
private static final AtomicNotNullLazyValue SSL_SERVER_CONTEXT = new AtomicNotNullLazyValue() {
@@ -113,7 +115,7 @@ class PortUnificationServerHandler extends Decoder {
if (message instanceof HttpResponse) {
// BuiltInServer.LOG.debug("OUT HTTP:\n" + message);
HttpResponse response = (HttpResponse)message;
- BuiltInServer.LOG.debug("OUT HTTP: " + response.getStatus().code() + " " + response.headers().get("Content-type"));
+ BuiltInServer.LOG.debug("OUT HTTP: " + response.status().code() + " " + response.headers().get(CONTENT_TYPE));
}
super.write(context, message, promise);
}
diff --git a/platform/platform-impl/src/org/jetbrains/io/Responses.java b/platform/platform-impl/src/org/jetbrains/io/Responses.java
index fdb2a03c5b0c..02d1d76ca1ad 100644
--- a/platform/platform-impl/src/org/jetbrains/io/Responses.java
+++ b/platform/platform-impl/src/org/jetbrains/io/Responses.java
@@ -100,7 +100,7 @@ public final class Responses {
}
public static void send(HttpResponse response, Channel channel, @Nullable HttpRequest request) {
- if (response.getStatus() != HttpResponseStatus.NOT_MODIFIED && !HttpHeaders.isContentLengthSet(response)) {
+ if (response.status() != HttpResponseStatus.NOT_MODIFIED && !HttpHeaders.isContentLengthSet(response)) {
HttpHeaders.setContentLength(response,
response instanceof FullHttpResponse ? ((FullHttpResponse)response).content().readableBytes() : 0);
}
@@ -159,7 +159,7 @@ public final class Responses {
}
private static HttpResponse createStatusResponse(HttpResponseStatus responseStatus, @Nullable HttpRequest request, @Nullable String description) {
- if (request != null && request.getMethod() == HttpMethod.HEAD) {
+ if (request != null && request.method() == HttpMethod.HEAD) {
return response(responseStatus);
}