[jboss-cvs] JBossCache/tests/compat/org/jboss/tools ...
Manik Surtani
manik at jboss.org
Wed May 23 06:28:53 EDT 2007
User: msurtani
Date: 07/05/23 06:28:53
Modified: tests/compat/org/jboss/tools ClassVersionInfo.java
SerialVersionUID.java
Log:
Initiated a bunch of performance fixes, including replacing CopyOnWriteArraySets with org.jboss.cache.util.concurrent.ConcurrentHashSet.
Also ran an imports optimiser on the code base - there were a lot of unused imports floating about.
Revision Changes Path
1.3 +24 -18 JBossCache/tests/compat/org/jboss/tools/ClassVersionInfo.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClassVersionInfo.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/compat/org/jboss/tools/ClassVersionInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ClassVersionInfo.java 24 Dec 2006 16:00:16 -0000 1.2
+++ ClassVersionInfo.java 23 May 2007 10:28:53 -0000 1.3
@@ -6,39 +6,45 @@
*/
package org.jboss.tools;
-import java.io.ObjectStreamClass;
-import java.io.Serializable;
import java.io.FileInputStream;
import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
import java.util.Map;
/**
* Encapsulates a class serialVersionUID and codebase.
*
* @author Scott.Stark at jboss.org
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ClassVersionInfo implements Serializable
{
static final long serialVersionUID = 2036506209171911437L;
- /** The named class serialVersionUID as returned by ObjectStreamClass */
+ /**
+ * The named class serialVersionUID as returned by ObjectStreamClass
+ */
private long serialVersion;
- /** The binary class name */
+ /**
+ * The binary class name
+ */
private String name;
private boolean hasExplicitSerialVersionUID;
- public ClassVersionInfo() {}
+ public ClassVersionInfo()
+ {
+ }
public ClassVersionInfo(String name, ClassLoader loader)
throws ClassNotFoundException
{
this.name = name;
Class c = loader.loadClass(name);
- if( c.isInterface() == false )
+ if (c.isInterface() == false)
{
ObjectStreamClass osc = ObjectStreamClass.lookup(c);
- if( osc != null )
+ if (osc != null)
{
serialVersion = osc.getSerialVersionUID();
try
@@ -46,7 +52,7 @@
c.getDeclaredField("serialVersionUID");
hasExplicitSerialVersionUID = true;
}
- catch(NoSuchFieldException e)
+ catch (NoSuchFieldException e)
{
hasExplicitSerialVersionUID = false;
}
@@ -109,7 +115,7 @@
public static void main(String[] args)
throws Exception
{
- if( args.length != 2 )
+ if (args.length != 2)
{
throw new IllegalArgumentException("Usage ClassVersionInfo map.ser [-list|cvi_fqn]");
}
@@ -118,16 +124,16 @@
Map cvis = (Map) ois.readObject();
ois.close();
- if( args[1].equals("-list") )
+ if (args[1].equals("-list"))
{
System.out.println(cvis.keySet());
System.exit(0);
}
String fqn = args[1];
- if( cvis.containsKey(fqn) == false )
+ if (cvis.containsKey(fqn) == false)
{
- System.err.println("No entry found for: "+fqn);
+ System.err.println("No entry found for: " + fqn);
System.exit(1);
}
ClassVersionInfo cvi = (ClassVersionInfo) cvis.get(fqn);
1.3 +44 -43 JBossCache/tests/compat/org/jboss/tools/SerialVersionUID.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SerialVersionUID.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/compat/org/jboss/tools/SerialVersionUID.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SerialVersionUID.java 24 Dec 2006 16:00:16 -0000 1.2
+++ SerialVersionUID.java 23 May 2007 10:28:53 -0000 1.3
@@ -8,27 +8,26 @@
import java.beans.XMLEncoder;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.io.ObjectOutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.Enumeration;
-import java.util.TreeMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.LinkedHashSet;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.util.jar.JarFile;
+import java.util.TreeMap;
import java.util.jar.JarEntry;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.util.jar.JarFile;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-/** A tool that builds a databaase of serialVersionUIDs for a given set
+/**
+ * A tool that builds a databaase of serialVersionUIDs for a given set
* of classes.
*
* @author Scott.Stark at jboss.org
@@ -94,18 +93,19 @@
throws MalformedURLException
{
File[] files = dir.listFiles();
- for(int n = 0; n < files.length; n ++)
+ for (int n = 0; n < files.length; n++)
{
File child = files[n];
- if(child.isDirectory())
+ if (child.isDirectory())
buildJarSet(child, jarFiles);
- else if( child.getName().endsWith(".jar") )
+ else if (child.getName().endsWith(".jar"))
jarFiles.add(child.toURL());
}
}
/**
* Build a TreeMap of the class name to ClassVersionInfo
+ *
* @param jar
* @param classVersionMap TreeMap<String, ClassVersionInfo> for serializable
* classes
@@ -118,43 +118,43 @@
String jarName = jar.getFile();
JarFile jf = new JarFile(jarName);
Enumeration entries = jf.entries();
- while( entries.hasMoreElements() )
+ while (entries.hasMoreElements())
{
JarEntry entry = (JarEntry) entries.nextElement();
String name = entry.getName();
- if( name.endsWith(".class") && name.startsWith(pkgPrefix) )
+ if (name.endsWith(".class") && name.startsWith(pkgPrefix))
{
name = name.substring(0, name.length() - 6);
String classname = name.replace('/', '.');
try
{
- log.fine("Creating ClassVersionInfo for: "+classname);
+ log.fine("Creating ClassVersionInfo for: " + classname);
ClassVersionInfo cvi = new ClassVersionInfo(classname, cl);
- if( cvi.getSerialVersion() != 0 )
+ if (cvi.getSerialVersion() != 0)
{
ClassVersionInfo prevCVI = (ClassVersionInfo)
classVersionMap.put(classname, cvi);
- if( prevCVI != null )
+ if (prevCVI != null)
{
- if( prevCVI.getSerialVersion() != cvi.getSerialVersion() )
+ if (prevCVI.getSerialVersion() != cvi.getSerialVersion())
{
log.severe("Found inconsistent classes, "
- +prevCVI+" != "+cvi+", jar: "+jarName);
+ + prevCVI + " != " + cvi + ", jar: " + jarName);
}
}
- if( cvi.getHasExplicitSerialVersionUID() == false )
+ if (cvi.getHasExplicitSerialVersionUID() == false)
{
- log.warning("No explicit serialVersionUID: "+cvi);
+ log.warning("No explicit serialVersionUID: " + cvi);
}
}
}
- catch(OutOfMemoryError e)
+ catch (OutOfMemoryError e)
{
log.log(Level.SEVERE, "Check the MaxPermSize", e);
}
- catch(Throwable e)
+ catch (Throwable e)
{
- log.log(Level.FINE, "While loading: "+name, e);
+ log.log(Level.FINE, "While loading: " + name, e);
}
}
}
@@ -165,8 +165,8 @@
* Create a Map<String, ClassVersionInfo> for the dist jars.
*
* @return Map<String, ClassVersionInfo>
- * @throws IOException
- . */
+ * @throws IOException .
+ */
public static Map processJars() throws IOException
{
LinkedHashSet jarFiles = new LinkedHashSet();
@@ -186,16 +186,16 @@
TreeMap classVersionMap = new TreeMap();
Iterator jarIter = jarFiles.iterator();
- while( jarIter.hasNext() )
+ while (jarIter.hasNext())
{
URL jar = (URL) jarIter.next();
try
{
generateJarSerialVersionUIDs(jar, classVersionMap, completeClasspath, "");
}
- catch(IOException e)
+ catch (IOException e)
{
- log.info("Failed to process jar: "+jar);
+ log.info("Failed to process jar: " + jar);
}
}
@@ -205,6 +205,7 @@
/**
* Generate a mapping of the serial version UIDs for the serializable classes
* under the dist directory (as specified by the dist.dir property).
+ *
* @throws Exception
*/
public static void main(String[] args) throws Exception
More information about the jboss-cvs-commits
mailing list