Updated Branches: refs/heads/trunk 08d2ac72b -> 50d27d9e6
moving to java 7 Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/ee3a4c3b Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/ee3a4c3b Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/ee3a4c3b Branch: refs/heads/trunk Commit: ee3a4c3b5a25026b1a747baefaad4450c39d40a3 Parents: 08d2ac7 Author: jvermillard <[email protected]> Authored: Tue Jun 18 21:12:04 2013 +0200 Committer: jvermillard <[email protected]> Committed: Tue Jun 18 21:12:04 2013 +0200 ---------------------------------------------------------------------- .../org/apache/mina/examples/coap/CoapClient.java | 2 +- .../org/apache/mina/examples/coap/CoapServer.java | 16 ++++++++-------- pom.xml | 16 ++-------------- 3 files changed, 11 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/ee3a4c3b/examples/src/main/java/org/apache/mina/examples/coap/CoapClient.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/mina/examples/coap/CoapClient.java b/examples/src/main/java/org/apache/mina/examples/coap/CoapClient.java index 4a5cfe0..79c7761 100644 --- a/examples/src/main/java/org/apache/mina/examples/coap/CoapClient.java +++ b/examples/src/main/java/org/apache/mina/examples/coap/CoapClient.java @@ -50,7 +50,7 @@ public class CoapClient { final String status = "status message"; System.err.println(status.length()); - final RequestFilter<CoapMessage, CoapMessage> rq = new RequestFilter<CoapMessage, CoapMessage>(); + final RequestFilter<CoapMessage, CoapMessage> rq = new RequestFilter<>(); NioUdpClient client = new NioUdpClient(); client.setFilters( // http://git-wip-us.apache.org/repos/asf/mina/blob/ee3a4c3b/examples/src/main/java/org/apache/mina/examples/coap/CoapServer.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/mina/examples/coap/CoapServer.java b/examples/src/main/java/org/apache/mina/examples/coap/CoapServer.java index 24da802..206a282 100644 --- a/examples/src/main/java/org/apache/mina/examples/coap/CoapServer.java +++ b/examples/src/main/java/org/apache/mina/examples/coap/CoapServer.java @@ -50,7 +50,7 @@ public class CoapServer { public static void main(String[] args) { - final Map<String, IoSession> registration = new ConcurrentHashMap<String, IoSession>(); + final Map<String, IoSession> registration = new ConcurrentHashMap<>(); // create a CoAP resource registry final ResourceRegistry reg = new ResourceRegistry(); @@ -107,12 +107,12 @@ public class CoapServer { }); BioUdpServer server = new BioUdpServer(); - final RequestFilter<CoapMessage, CoapMessage> rq = new RequestFilter<CoapMessage, CoapMessage>(); + final RequestFilter<CoapMessage, CoapMessage> rq = new RequestFilter<>(); - server.setFilters(/* new LoggingFilter(), */new ProtocolCodecFilter<CoapMessage, ByteBuffer, Void, Void>( + server.setFilters(new ProtocolCodecFilter<CoapMessage, ByteBuffer, Void, Void>( new CoapEncoder(), new CoapDecoder()), rq); // idle in 10 minute - server.getSessionConfig().setIdleTimeInMillis(IdleStatus.READ_IDLE, 10 * 60 * 1000); + server.getSessionConfig().setIdleTimeInMillis(IdleStatus.READ_IDLE, 60 * 10_000); server.setIoHandler(new AbstractIoHandler() { long start = System.currentTimeMillis(); @@ -126,7 +126,7 @@ public class CoapServer { System.err.println("resp : " + resp); session.write(resp); count++; - if (count >= 100000) { + if (count >= 100_000) { System.err.println("time for 100k msg : " + (System.currentTimeMillis() - start)); count = 0; start = System.currentTimeMillis(); @@ -152,7 +152,7 @@ public class CoapServer { public void run() { for (;;) { for (IoSession s : registration.values()) { - rq.request(s, CoapMessage.get("st", true), 15000).register( + rq.request(s, CoapMessage.get("st", true), 15_000).register( new AbstractIoFutureListener<CoapMessage>() { @Override public void completed(CoapMessage result) { @@ -163,7 +163,7 @@ public class CoapServer { try { // let's poll every 10 seconds - Thread.sleep(10000); + Thread.sleep(10_000); } catch (InterruptedException e) { break; } @@ -172,7 +172,7 @@ public class CoapServer { }.start(); for (;;) { - Thread.sleep(1000); + Thread.sleep(1_000); } } catch (InterruptedException e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/mina/blob/ee3a4c3b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cb3b2b5..61cd1d9 100644 --- a/pom.xml +++ b/pom.xml @@ -175,13 +175,6 @@ <scope>test</scope> </dependency> - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${version.slf4j.log4j12}</version> - <scope>test</scope> - </dependency--> - <dependency> <groupId>org.apache.logging.log4j.adapters</groupId> <artifactId>slf4j-impl</artifactId> @@ -203,11 +196,6 @@ </dependency> <!-- logging implementation used for unit tests --> - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency--> <dependency> <groupId>junit</groupId> @@ -543,8 +531,8 @@ <version>${version.maven.compiler.plugin}</version> <configuration> <encoding>UTF-8</encoding> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <debug>true</debug> <optimize>true</optimize> <showDeprecations>true</showDeprecations>
