You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/10/15 22:15:22 UTC
svn commit: r1632171 [20/20] - in /commons/proper/beanutils/trunk/src:
main/java/org/apache/commons/beanutils/
main/java/org/apache/commons/beanutils/converters/
main/java/org/apache/commons/beanutils/expression/
main/java/org/apache/commons/beanutils/...
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java Wed Oct 15 20:15:17 2014
@@ -58,7 +58,7 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
@@ -66,7 +66,7 @@ public class MemoryLeakTestCase extends
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
+ final WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -107,7 +107,7 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
@@ -115,7 +115,7 @@ public class MemoryLeakTestCase extends
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
+ final WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -160,10 +160,10 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
- ClassLoader loader = newClassLoader();
- Class<?> beanClass = loader.loadClass(className);
- Object bean = beanClass.newInstance();
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
+ final ClassLoader loader = newClassLoader();
+ final Class<?> beanClass = loader.loadClass(className);
+ final Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
// Sanity checks only
@@ -173,7 +173,7 @@ public class MemoryLeakTestCase extends
assertNotSame("ClassLoaders should be different..", getClass().getClassLoader(), beanClass.getClassLoader());
assertSame("BeanClass ClassLoader incorrect", beanClass.getClassLoader(), loader);
- MappedPropertyDescriptor descriptor = new MappedPropertyDescriptor("mappedProperty", beanClass);
+ final MappedPropertyDescriptor descriptor = new MappedPropertyDescriptor("mappedProperty", beanClass);
assertNotNull("1-Read Method null", descriptor.getMappedReadMethod());
assertNotNull("1-Write Method null", descriptor.getMappedWriteMethod());
assertEquals("1-Read Method name", "getMappedProperty", descriptor.getMappedReadMethod().getName());
@@ -205,7 +205,7 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
ClassLoader loader = newClassLoader();
Class<?> beanClass = loader.loadClass(className);
Object bean = beanClass.newInstance();
@@ -218,7 +218,7 @@ public class MemoryLeakTestCase extends
assertNotSame("ClassLoaders should be different..", getClass().getClassLoader(), beanClass.getClassLoader());
assertSame("BeanClass ClassLoader incorrect", beanClass.getClassLoader(), loader);
- MappedPropertyDescriptor descriptor = new MappedPropertyDescriptor("mappedProperty", beanClass);
+ final MappedPropertyDescriptor descriptor = new MappedPropertyDescriptor("mappedProperty", beanClass);
assertNotNull("1-Read Method null", descriptor.getMappedReadMethod());
assertNotNull("1-Write Method null", descriptor.getMappedWriteMethod());
assertEquals("1-Read Method name", "getMappedProperty", descriptor.getMappedReadMethod().getName());
@@ -254,7 +254,7 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
@@ -262,7 +262,7 @@ public class MemoryLeakTestCase extends
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
+ final WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -303,7 +303,7 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
@@ -312,7 +312,7 @@ public class MemoryLeakTestCase extends
WrapDynaBean wrapDynaBean = new WrapDynaBean(bean);
// -----------------------------------------------------------------------------
- WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
+ final WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -355,7 +355,7 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.CustomInteger";
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.CustomInteger";
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
@@ -363,7 +363,7 @@ public class MemoryLeakTestCase extends
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
+ final WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -402,7 +402,7 @@ public class MemoryLeakTestCase extends
// Clear All BeanUtils caches before the test
clearAllBeanUtilsCaches();
- String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.CustomInteger";
+ final String className = "org.apache.commons.beanutils.memoryleaktests.pojotests.CustomInteger";
// The classLoader will go away only when these following variables are released
ClassLoader loader = newClassLoader();
@@ -410,7 +410,7 @@ public class MemoryLeakTestCase extends
Object bean = beanClass.newInstance();
// -----------------------------------------------------------------------------
- WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
+ final WeakReference<ClassLoader> someRef = new WeakReference<ClassLoader>(loader);
// Sanity checks only
assertNotNull("ClassLoader is null", loader);
@@ -473,7 +473,7 @@ public class MemoryLeakTestCase extends
*/
private void forceGarbageCollection() throws Exception {
// Fill up memory
- SoftReference<Object> ref = new SoftReference<Object>(new Object());
+ final SoftReference<Object> ref = new SoftReference<Object>(new Object());
int count = 0;
while(ref.get() != null && count++ < 5) {
java.util.ArrayList<String> list = new java.util.ArrayList<String>();
@@ -482,7 +482,7 @@ public class MemoryLeakTestCase extends
while (true && ref.get() != null) {
list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + (i++));
}
- } catch (Throwable ignored) {
+ } catch (final Throwable ignored) {
}
list.clear();
list = null;
@@ -502,12 +502,12 @@ public class MemoryLeakTestCase extends
*/
private static URLClassLoader newClassLoader() throws MalformedURLException {
- String dataFilePath = MemoryLeakTestCase.class.getResource("pojotests").getFile();
+ final String dataFilePath = MemoryLeakTestCase.class.getResource("pojotests").getFile();
//System.out.println("dataFilePath: " + dataFilePath);
- String location = "file://" + dataFilePath.substring(0,dataFilePath.length()-"org.apache.commons.beanutils.memoryleaktests.pojotests".length());
+ final String location = "file://" + dataFilePath.substring(0,dataFilePath.length()-"org.apache.commons.beanutils.memoryleaktests.pojotests".length());
//System.out.println("location: " + location);
- StringBuilder newString = new StringBuilder();
+ final StringBuilder newString = new StringBuilder();
for (int i=0;i<location.length();i++) {
if (location.charAt(i)=='\\') {
newString.append("/");
@@ -515,10 +515,10 @@ public class MemoryLeakTestCase extends
newString.append(location.charAt(i));
}
}
- String classLocation = newString.toString();
+ final String classLocation = newString.toString();
//System.out.println("classlocation: " + classLocation);
- URLClassLoader theLoader = URLClassLoader.newInstance(new URL[]{new URL(classLocation)},null);
+ final URLClassLoader theLoader = URLClassLoader.newInstance(new URL[]{new URL(classLocation)},null);
return theLoader;
}
@@ -530,7 +530,7 @@ public class MemoryLeakTestCase extends
*
* @param className The name of the class to profile
*/
- private void profilerLeakReport(String test, String className) {
+ private void profilerLeakReport(final String test, final String className) {
/*
* If you want a report about where the leaks are... uncomment this,
* add jboss-profiler.jvmti.jar and jboss-commons.jar (for org.jboss.loggin).
@@ -546,10 +546,10 @@ public class MemoryLeakTestCase extends
* Test for JDK 1.5
*/
private boolean isPre15JVM() {
- String version = System.getProperty("java.specification.version");
- StringTokenizer tokenizer = new StringTokenizer(version,".");
+ final String version = System.getProperty("java.specification.version");
+ final StringTokenizer tokenizer = new StringTokenizer(version,".");
if (tokenizer.nextToken().equals("1")) {
- String minorVersion = tokenizer.nextToken();
+ final String minorVersion = tokenizer.nextToken();
if (minorVersion.equals("0")) {
return true;
}
@@ -574,11 +574,11 @@ public class MemoryLeakTestCase extends
* @return the total, free, used memory stats
*/
private String getMemoryStats() {
- java.text.DecimalFormat fmt = new java.text.DecimalFormat("#,##0");
- Runtime runtime = Runtime.getRuntime();
- long free = runtime.freeMemory() / 1024;
- long total = runtime.totalMemory() / 1024;
- long used = total - free;
+ final java.text.DecimalFormat fmt = new java.text.DecimalFormat("#,##0");
+ final Runtime runtime = Runtime.getRuntime();
+ final long free = runtime.freeMemory() / 1024;
+ final long total = runtime.totalMemory() / 1024;
+ final long used = total - free;
return "MEMORY - Total: " + fmt.format(total) + "k " + "Used: "
+ fmt.format(used) + "k " + "Free: "
+ fmt.format(free) + "k";
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/CustomInteger.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/CustomInteger.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/CustomInteger.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/CustomInteger.java Wed Oct 15 20:15:17 2014
@@ -36,7 +36,7 @@ public class CustomInteger extends Numbe
* Construct a new instance.
* @param i the integer value
*/
- public CustomInteger(int i) {
+ public CustomInteger(final int i) {
this.i = i;
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java Wed Oct 15 20:15:17 2014
@@ -28,7 +28,7 @@ public class SomeMappedPojo {
private HashMap<String, String> mappedProperty = null;
- public String getMappedProperty(String key) {
+ public String getMappedProperty(final String key) {
// Create the map the very first time
if (mappedProperty == null) {
mappedProperty = new HashMap<String, String>();
@@ -38,7 +38,7 @@ public class SomeMappedPojo {
return mappedProperty.get(key);
}
- public void setMappedProperty(String key, String value) {
+ public void setMappedProperty(final String key, final String value) {
// Create the map the very first time
if (mappedProperty == null) {
mappedProperty = new HashMap<String, String>();
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomePojo.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomePojo.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomePojo.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomePojo.java Wed Oct 15 20:15:17 2014
@@ -26,7 +26,7 @@ public class SomePojo {
String name = "initialValue";
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java Wed Oct 15 20:15:17 2014
@@ -60,7 +60,7 @@ class PackageBean {
}
- public void setBar(String bar) {
+ public void setBar(final String bar) {
this.bar = bar;
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java Wed Oct 15 20:15:17 2014
@@ -78,7 +78,7 @@ class PrivateBean implements PrivateDire
/**
* A method accessible via a directly implemented interface.
*/
- public String methodBar(String in) {
+ public String methodBar(final String in) {
return (in);
@@ -100,7 +100,7 @@ class PrivateBean implements PrivateDire
/**
* A method accessible via an indirectly implemented interface.
*/
- public String methodBaz(String in) {
+ public String methodBaz(final String in) {
return (in);
Modified: commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java?rev=1632171&r1=1632170&r2=1632171&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java (original)
+++ commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java Wed Oct 15 20:15:17 2014
@@ -61,7 +61,7 @@ public class PublicSubBean extends Packa
}
- public void setFoo(String foo) {
+ public void setFoo(final String foo) {
this.foo = foo;