You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/11/22 00:35:31 UTC
svn commit: r1715591 - in /zookeeper/branches/branch-3.5: ./
src/java/main/org/apache/zookeeper/
src/java/main/org/apache/zookeeper/server/
src/java/main/org/apache/zookeeper/server/admin/
src/java/main/org/apache/zookeeper/server/util/
Author: rgs
Date: Sat Nov 21 23:35:31 2015
New Revision: 1715591
URL: http://svn.apache.org/viewvc?rev=1715591&view=rev
Log:
ZOOKEEPER-2329: Clear javac and javadoc warning from zookeeper
(Arshad Mohammad via rgs)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/AdminServer.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1715591&r1=1715590&r2=1715591&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Nov 21 23:35:31 2015
@@ -62,6 +62,9 @@ BUGFIXES:
ZOOKEEPER-1371: Remove dependency on log4j in the source code
(Arshad Mohammad via rgs)
+ ZOOKEEPER-2329: Clear javac and javadoc warning from zookeeper
+ (Arshad Mohammad via rgs)
+
IMPROVEMENTS:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=1715591&r1=1715590&r2=1715591&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Sat Nov 21 23:35:31 2015
@@ -38,7 +38,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.data.Stat;
-import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -223,7 +222,7 @@ public class ZooKeeperMain {
public boolean parseCommand( String cmdstring ) {
Matcher matcher = ARGS_PATTERN.matcher(cmdstring);
- List args = new LinkedList();
+ List<String> args = new LinkedList<String>();
while (matcher.find()) {
String value = matcher.group(1);
if (QUOTED_PATTERN.matcher(value).matches()) {
@@ -235,7 +234,7 @@ public class ZooKeeperMain {
if (args.isEmpty()){
return false;
}
- command = (String)args.get(0);
+ command = args.get(0);
cmdArgs = args;
return true;
}
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java?rev=1715591&r1=1715590&r2=1715591&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java Sat Nov 21 23:35:31 2015
@@ -167,7 +167,7 @@ public class PurgeTxnLog {
* error and usage and then exits
*
* @param number
- * @return
+ * @return count
*/
private static int validateAndGetCount(String number) {
int result = 0;
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/AdminServer.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/AdminServer.java?rev=1715591&r1=1715590&r2=1715591&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/AdminServer.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/AdminServer.java Sat Nov 21 23:35:31 2015
@@ -31,6 +31,7 @@ public interface AdminServer {
public void setZooKeeperServer(ZooKeeperServer zkServer);
public class AdminServerException extends Exception {
+ private static final long serialVersionUID = 1L;
public AdminServerException(String message, Throwable cause) {
super(message, cause);
}
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java?rev=1715591&r1=1715590&r2=1715591&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java Sat Nov 21 23:35:31 2015
@@ -140,6 +140,8 @@ public class JettyAdminServer implements
}
private class CommandServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// Capture the command name from the URL
String cmd = request.getPathInfo();
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java?rev=1715591&r1=1715590&r2=1715591&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java Sat Nov 21 23:35:31 2015
@@ -36,10 +36,10 @@ public class KerberosUtil {
} else {
classRef = Class.forName("sun.security.krb5.Config");
}
- getInstanceMethod = classRef.getMethod("getInstance", new Class[0]);
+ getInstanceMethod = classRef.getMethod("getInstance", new Class<?>[0]);
kerbConf = getInstanceMethod.invoke(classRef, new Object[0]);
getDefaultRealmMethod = classRef.getDeclaredMethod("getDefaultRealm",
- new Class[0]);
+ new Class<?>[0]);
return (String)getDefaultRealmMethod.invoke(kerbConf, new Object[0]);
}
}
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java?rev=1715591&r1=1715590&r2=1715591&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java Sat Nov 21 23:35:31 2015
@@ -86,7 +86,7 @@ public class OSMXBean
classRef = Class.forName("com.sun.management.UnixOperatingSystemMXBean");
if (classRef.isInstance(osMbean)) {
mBeanMethod = classRef.getDeclaredMethod(mBeanMethodName,
- new Class[0]);
+ new Class<?>[0]);
unixos = classRef.cast(osMbean);
return (Long)mBeanMethod.invoke(unixos);
}