Author: markt Date: Mon Sep 6 16:34:19 2010 New Revision: 993087 URL: http://svn.apache.org/viewvc?rev=993087&view=rev Log: Add @Override to test code
Modified: tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Modified: tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java (original) +++ tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java Mon Sep 6 16:34:19 2010 @@ -30,6 +30,7 @@ public class TesterPrincipal implements name = theName; } + @Override public String getName() { return name; } Modified: tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java Mon Sep 6 16:34:19 2010 @@ -38,15 +38,18 @@ import javax.servlet.annotation.WebFilte public class DuplicateMappingParamFilter implements Filter { + @Override public void init(FilterConfig filterConfig) throws ServletException { // NO-OP } + @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws ServletException, IOException { chain.doFilter(req, res); } + @Override public void destroy() { // destroy } Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java Mon Sep 6 16:34:19 2010 @@ -40,10 +40,12 @@ public class ParamFilter implements Filt private FilterConfig _filterConfig; + @Override public void init(FilterConfig filterConfig) throws ServletException { _filterConfig = filterConfig; } + @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws ServletException, IOException { PrintWriter out = res.getWriter(); @@ -51,6 +53,7 @@ public class ParamFilter implements Filt chain.doFilter(req, res); } + @Override public void destroy() { // destroy } Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java Mon Sep 6 16:34:19 2010 @@ -41,13 +41,16 @@ import org.apache.tomcat.util.buf.ByteCh public class TestTomcatSSL extends TomcatBaseTest { static TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() { + @Override public X509Certificate[] getAcceptedIssuers() { return null; } + @Override public void checkClientTrusted(X509Certificate[] certs, String authType) { // NOOP - Trust everything } + @Override public void checkServerTrusted(X509Certificate[] certs, String authType) { // NOOP - Trust everything Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java Mon Sep 6 16:34:19 2010 @@ -67,6 +67,7 @@ public class EchoRpcTest implements RpcC * TODO Implement this org.apache.catalina.tribes.tipis.RpcCallback * method */ + @Override public void leftOver(Serializable msg, Member sender) { System.out.println("Received a left over message from ["+sender.getName()+"] with data ["+msg+"]"); } @@ -79,11 +80,13 @@ public class EchoRpcTest implements RpcC * TODO Implement this org.apache.catalina.tribes.tipis.RpcCallback * method */ + @Override public Serializable replyRequest(Serializable msg, Member sender) { System.out.println("Received a reply request message from ["+sender.getName()+"] with data ["+msg+"]"); return "Reply("+name+"):"+msg; } + @Override public void run() { long counter = 0; while (counter<count) { Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java Mon Sep 6 16:34:19 2010 @@ -590,6 +590,7 @@ public final class IntrospectionUtils { final String lext = ext; if (dir.isDirectory()) { names = dir.list(new FilenameFilter() { + @Override public boolean accept(File d, String name) { if (name.endsWith(lext)) { return true; Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java Mon Sep 6 16:34:19 2010 @@ -113,6 +113,7 @@ public class LoadTest implements Members } + @Override public void run() { long counter = 0; @@ -177,6 +178,7 @@ public class LoadTest implements Members * TODO Implement this org.apache.catalina.tribes.MembershipListener * method */ + @Override public void memberAdded(Member member) { log.info("Member added:"+member); synchronized (mutex) { @@ -191,14 +193,17 @@ public class LoadTest implements Members * TODO Implement this org.apache.catalina.tribes.MembershipListener * method */ + @Override public void memberDisappeared(Member member) { log.info("Member disappeared:"+member); } + @Override public boolean accept(Serializable msg, Member mbr){ return (msg instanceof LoadMessage) || (msg instanceof ByteMessage); } + @Override public void messageReceived(Serializable msg, Member mbr){ if ( receiveStart == 0 ) receiveStart = System.currentTimeMillis(); if ( debug ) { Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Mon Sep 6 16:34:19 2010 @@ -86,6 +86,7 @@ public class MapDemo implements ChannelL * will always return false since we rely on the * lazy map to do all the messaging for us */ + @Override public boolean accept(Serializable msg, Member source) { //simple refresh the table model table.dataModel.getValueAt(-1,-1); @@ -98,6 +99,7 @@ public class MapDemo implements ChannelL * @param msg - the message received * @param source - the sending member */ + @Override public void messageReceived(Serializable msg, Member source) { // NOOP } @@ -105,6 +107,7 @@ public class MapDemo implements ChannelL /** * Invoked when a member is added to the group */ + @Override public void memberAdded(Member member) { // NOOP } @@ -112,6 +115,7 @@ public class MapDemo implements ChannelL /** * Invoked when a member leaves the group */ + @Override public void memberDisappeared(Member member) { //just refresh the table model table.dataModel.getValueAt(-1,-1); @@ -219,8 +223,10 @@ public class MapDemo implements ChannelL "isProxy", "isBackup"}; + @Override public int getColumnCount() { return columnNames.length; } + @Override public int getRowCount() {return map.sizeFull() +1; } public StringBuilder getMemberNames(Member[] members){ @@ -234,6 +240,7 @@ public class MapDemo implements ChannelL return buf; } + @Override public Object getValueAt(int row, int col) { if ( row==-1 ) { update(); @@ -349,6 +356,7 @@ public class MapDemo implements ChannelL return button; } + @Override public void actionPerformed(ActionEvent e) { System.out.println(e.getActionCommand()); if ( "add".equals(e.getActionCommand()) ) { Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java Mon Sep 6 16:34:19 2010 @@ -52,6 +52,7 @@ public class MembersWithProperties imple return props; } + @Override public void memberAdded(Member member) { try { System.out.println("Received member added:"+member); @@ -62,6 +63,7 @@ public class MembersWithProperties imple } } + @Override public void memberDisappeared(Member member) { try { System.out.println("Received member disappeared:"+member); Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java Mon Sep 6 16:34:19 2010 @@ -150,10 +150,12 @@ public class TestDataIntegrity extends T public static class Listener implements ChannelListener { long count = 0; + @Override public boolean accept(Serializable s, Member m) { return (s instanceof Data); } + @Override public void messageReceived(Serializable s, Member m) { Data d = (Data)s; if ( !Data.verify(d) ) { Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java Mon Sep 6 16:34:19 2010 @@ -171,10 +171,12 @@ public class TestMulticastPackages exten public Listener() { Arrays.fill(nrs, 0); } + @Override public boolean accept(Serializable s, Member m) { return (s instanceof Data); } + @Override public void messageReceived(Serializable s, Member m) { try { Data d = (Data)s; Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java Mon Sep 6 16:34:19 2010 @@ -80,10 +80,12 @@ public class TestRemoteProcessException public static class Listener implements ChannelListener { long noErrCnt = 0; long errCnt = 0; + @Override public boolean accept(Serializable s, Member m) { return (s instanceof Data); } + @Override public void messageReceived(Serializable s, Member m) { Data d = (Data)s; if ( !Data.verify(d) ) { Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java Mon Sep 6 16:34:19 2010 @@ -214,10 +214,12 @@ public class TestUdpPackages extends Tes public Listener() { Arrays.fill(nrs, 0); } + @Override public boolean accept(Serializable s, Member m) { return (s instanceof Data); } + @Override public void messageReceived(Serializable s, Member m) { try { Data d = (Data)s; Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java Mon Sep 6 16:34:19 2010 @@ -97,6 +97,7 @@ public class TestOrderInterceptor extend final AtomicInteger value = new AtomicInteger(0); final Queue<Exception> exceptionQueue = new ConcurrentLinkedQueue<Exception>(); Runnable run = new Runnable() { + @Override public void run() { for (int i = 0; i < 100; i++) { try { @@ -153,6 +154,7 @@ public class TestOrderInterceptor extend int cnt = 0; int total = 0; boolean fail = false; + @Override public synchronized void messageReceived(Serializable msg, Member sender) { total++; Integer i = (Integer)msg; @@ -162,6 +164,7 @@ public class TestOrderInterceptor extend } + @Override public boolean accept(Serializable msg, Member sender) { return (msg instanceof Integer); } Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java Mon Sep 6 16:34:19 2010 @@ -117,11 +117,13 @@ public class TestSenderConnections exten this.name = name; } + @Override public void messageReceived(Serializable msg, Member sender) { System.out.println("["+name+"] Received message:"+msg+" from " + sender.getName()); } + @Override public boolean accept(Serializable msg, Member sender) { return true; } Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java Mon Sep 6 16:34:19 2010 @@ -99,6 +99,7 @@ public class TestDomainFilter } public ArrayList<Member> members = new ArrayList<Member>(); + @Override public void memberAdded(Member member) { if (!members.contains(member)) { members.add(member); @@ -110,6 +111,7 @@ public class TestDomainFilter } } + @Override public void memberDisappeared(Member member) { if (members.contains(member)) { members.remove(member); Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java Mon Sep 6 16:34:19 2010 @@ -96,6 +96,7 @@ public class TestMemberArrival } public ArrayList<Member> members = new ArrayList<Member>(); + @Override public void memberAdded(Member member) { if (!members.contains(member)) { members.add(member); @@ -107,6 +108,7 @@ public class TestMemberArrival } } + @Override public void memberDisappeared(Member member) { if (members.contains(member)) { members.remove(member); Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java Mon Sep 6 16:34:19 2010 @@ -141,6 +141,7 @@ public class TestTcpFailureDetector exte this.name = name; } public ArrayList<Member> members = new ArrayList<Member>(); + @Override public void memberAdded(Member member) { if ( !members.contains(member) ) { members.add(member); @@ -152,6 +153,7 @@ public class TestTcpFailureDetector exte } } + @Override public void memberDisappeared(Member member) { if ( members.contains(member) ) { members.remove(member); Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java Mon Sep 6 16:34:19 2010 @@ -69,6 +69,7 @@ public class SocketNioReceive { boolean first = true; + @Override public void messageReceived(ChannelMessage msg) { if (first) { first = false; @@ -83,6 +84,7 @@ public class SocketNioReceive { } } + @Override public boolean accept(ChannelMessage msg) { synchronized (this) {accept++;} return true; Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=993087&r1=993086&r2=993087&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original) +++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Mon Sep 6 16:34:19 2010 @@ -49,6 +49,7 @@ public class Benchmarks extends TestCase private volatile long currentMillis = 0; private volatile Date currentDate = null; + @Override public void run() { getCurrentDate(); } @@ -83,6 +84,7 @@ public class Benchmarks extends TestCase private ThreadLocal<Date> currentDateLocal = new ThreadLocal<Date>(); + @Override public void run() { getCurrentDate(); } @@ -118,6 +120,7 @@ public class Benchmarks extends TestCase private ThreadLocal<Date> currentDateLocal = new ThreadLocal<Date>(); + @Override public void run() { getCurrentDate(); } @@ -152,6 +155,7 @@ public class Benchmarks extends TestCase } }; + @Override public void run() { getCurrentDate(); } @@ -209,6 +213,7 @@ public class Benchmarks extends TestCase private SimpleDateFormat timeFormatter = new SimpleDateFormat( "hh:mm:ss"); + @Override public void run() { printDate(); } @@ -292,6 +297,7 @@ public class Benchmarks extends TestCase } }; + @Override public void run() { printDate(); } @@ -353,6 +359,7 @@ public class Benchmarks extends TestCase } }; + @Override public void run() { printDate(); } @@ -413,6 +420,7 @@ public class Benchmarks extends TestCase } }; + @Override public void run() { printDate(); } @@ -488,6 +496,7 @@ public class Benchmarks extends TestCase this.test = test; } + @Override public void run() { for (int i = 0; i < count; i++) { test.run(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org