andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unchecked warnings

Browse Source
This commit is contained in:
Trustin Lee 2012-11-10 07:29:14 +09:00
parent 9f2c1c4774
commit c77bac44a2
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
View File

@ -26,7 +26,7 @@ import org.osgi.util.tracker.ServiceTracker;
*/
public class OsgiLoggerFactory extends InternalLoggerFactory {
private final ServiceTracker logServiceTracker;
private final ServiceTracker<LogService, LogService> logServiceTracker;
private final InternalLoggerFactory fallback;
volatile LogService logService;
@ -46,18 +46,17 @@ public class OsgiLoggerFactory extends InternalLoggerFactory {
}
this.fallback = fallback;
logServiceTracker = new ServiceTracker(
logServiceTracker = new ServiceTracker<LogService, LogService>(
ctx, "org.osgi.service.log.LogService", null) {
@Override
public Object addingService(ServiceReference reference) {
LogService service = (LogService) super.addingService(reference);
public LogService addingService(ServiceReference<LogService> reference) {
LogService service = super.addingService(reference);
logService = service;
return service;
}
@Override
public void removedService(ServiceReference reference,
Object service) {
public void removedService(ServiceReference<LogService> reference, LogService service) {
logService = null;
}
};

8
testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
View File

@ -15,7 +15,6 @@
*/
package io.netty.testsuite.transport.socket;
import static org.junit.Assert.*;
import io.netty.bootstrap.AbstractBootstrap;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
@ -26,13 +25,14 @@ import io.netty.channel.socket.DatagramChannel;
import io.netty.channel.socket.DatagramPacket;
import io.netty.channel.socket.oio.OioDatagramChannel;
import io.netty.util.NetworkConstants;
import org.junit.Ignore;
import org.junit.Test;
import java.net.InetSocketAddress;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
public class DatagramMulticastTest extends AbstractDatagramTest {
@ -42,7 +42,7 @@ public class DatagramMulticastTest extends AbstractDatagramTest {
run();
}
public void testMulticast(AbstractBootstrap sb, AbstractBootstrap cb) throws Throwable {
public void testMulticast(AbstractBootstrap<?> sb, AbstractBootstrap<?> cb) throws Throwable {
MulticastTestHandler mhandler = new MulticastTestHandler();
sb.handler(new ChannelInboundMessageHandlerAdapter<DatagramPacket>() {

6
testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
View File

@ -15,18 +15,18 @@
*/
package io.netty.testsuite.transport.socket;
import static org.junit.Assert.*;
import io.netty.bootstrap.AbstractBootstrap;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundMessageHandlerAdapter;
import io.netty.channel.socket.DatagramPacket;
import org.junit.Test;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import static org.junit.Assert.*;
public class DatagramUnicastTest extends AbstractDatagramTest {
@ -35,7 +35,7 @@ public class DatagramUnicastTest extends AbstractDatagramTest {
run();
}
public void testSimpleSend(AbstractBootstrap sb, AbstractBootstrap cb) throws Throwable {
public void testSimpleSend(AbstractBootstrap<?> sb, AbstractBootstrap<?> cb) throws Throwable {
final CountDownLatch latch = new CountDownLatch(1);
sb.handler(new ChannelInboundMessageHandlerAdapter<DatagramPacket>() {