You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/08/31 21:33:29 UTC
svn commit: r1621618 - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration/
main/java/org/apache/commons/configuration/plist/
test/java/org/apache/commons/configuration/
test/java/org/apache/commons/configuration/buil...
Author: oheger
Date: Sun Aug 31 19:33:29 2014
New Revision: 1621618
URL: http://svn.apache.org/r1621618
Log:
[CONFIGURATION-590] Removed implements Serializable clause.
Unnecessary serialVersionUID fields were removed, too.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/INIConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java Sun Aug 31 19:33:29 2014
@@ -17,7 +17,6 @@
package org.apache.commons.configuration;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -53,13 +52,8 @@ import org.apache.commons.lang3.ObjectUt
* @version $Id$
*/
public class BaseHierarchicalConfiguration extends AbstractHierarchicalConfiguration<ImmutableNode>
- implements Serializable, Cloneable, InMemoryNodeModelSupport
+ implements Cloneable, InMemoryNodeModelSupport
{
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = 3373812230395363192L;
-
/** A listener for reacting on changes caused by sub configurations. */
private final EventListener<ConfigurationEvent> changeListener;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java Sun Aug 31 19:33:29 2014
@@ -194,11 +194,6 @@ public class CombinedConfiguration exten
new EventType<ConfigurationEvent>(ConfigurationEvent.ANY,
"COMBINED_INVALIDATE");
- /**
- * The serial version ID.
- */
- private static final long serialVersionUID = 8338574525528692307L;
-
/** Constant for the expression engine for parsing the at path. */
private static final DefaultExpressionEngine AT_ENGINE = DefaultExpressionEngine.INSTANCE;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DataConfiguration.java Sun Aug 31 19:33:29 2014
@@ -98,7 +98,7 @@ import org.apache.commons.lang3.StringUt
* @version $Id$
* @since 1.1
*/
-public class DataConfiguration extends AbstractConfiguration implements Serializable
+public class DataConfiguration extends AbstractConfiguration
{
/** The key of the property storing the user defined date format. */
public static final String DATE_FORMAT_KEY = "org.apache.commons.configuration.format.date";
@@ -106,11 +106,6 @@ public class DataConfiguration extends A
/** The default format for dates. */
public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = -69011336405718640L;
-
/** Stores temporary date formats. */
private static final ThreadLocal<String> TEMP_DATE_FORMAT = new ThreadLocal<String>();
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java Sun Aug 31 19:33:29 2014
@@ -65,8 +65,6 @@ import org.apache.commons.logging.LogFac
*/
public class DynamicCombinedConfiguration extends CombinedConfiguration
{
- private static final long serialVersionUID = 680097981171908142L;
-
/**
* Stores the current configuration for each involved thread. This value is
* set at the beginning of an operation and removed at the end.
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/INIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/INIConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/INIConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/INIConfiguration.java Sun Aug 31 19:33:29 2014
@@ -230,11 +230,6 @@ public class INIConfiguration extends Ba
protected static final String SEPARATOR_CHARS = "=:";
/**
- * The serial version UID.
- */
- private static final long serialVersionUID = 2548006161386850670L;
-
- /**
* Constant for the line separator.
*/
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java Sun Aug 31 19:33:29 2014
@@ -48,8 +48,6 @@ import org.apache.commons.configuration.
public class PatternSubtreeConfigurationWrapper extends BaseHierarchicalConfiguration
implements FileBasedConfiguration
{
- private static final long serialVersionUID = 7456061169617014189L;
-
/** The wrapped configuration */
private final HierarchicalConfiguration<ImmutableNode> config;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java Sun Aug 31 19:33:29 2014
@@ -108,11 +108,6 @@ import org.apache.commons.configuration.
*/
public class SubnodeConfiguration extends BaseHierarchicalConfiguration
{
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = 3105734147019386480L;
-
/** Stores the parent configuration. */
private final BaseHierarchicalConfiguration parent;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java Sun Aug 31 19:33:29 2014
@@ -183,12 +183,8 @@ import org.xml.sax.helpers.DefaultHandle
* @version $Id$
*/
public class XMLConfiguration extends BaseHierarchicalConfiguration implements
- FileBasedConfiguration, FileLocatorAware, InputStreamSupport {
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = 2453781111653383552L;
-
+ FileBasedConfiguration, FileLocatorAware, InputStreamSupport
+{
/** Constant for the default root element name. */
private static final String DEFAULT_ROOT_NAME = "configuration";
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java Sun Aug 31 19:33:29 2014
@@ -113,9 +113,6 @@ public class PropertyListConfiguration e
/** Constant for the ID prefix for GMT time zones. */
private static final String TIME_ZONE_PREFIX = "GMT";
- /** The serial version UID. */
- private static final long serialVersionUID = 3227248503779092127L;
-
/** Constant for the milliseconds of a minute.*/
private static final int MILLIS_PER_MINUTE = 1000 * 60;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java Sun Aug 31 19:33:29 2014
@@ -126,11 +126,6 @@ import org.xml.sax.helpers.DefaultHandle
public class XMLPropertyListConfiguration extends BaseHierarchicalConfiguration
implements FileBasedConfiguration, FileLocatorAware
{
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = -3162063751042475985L;
-
/** Size of the indentation for the generated file. */
private static final int INDENT_SIZE = 4;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java Sun Aug 31 19:33:29 2014
@@ -956,8 +956,6 @@ public class TestCombinedConfiguration
BaseHierarchicalConfiguration childEx =
new BaseHierarchicalConfiguration()
{
- private static final long serialVersionUID = 1L;
-
@Override
public NodeModel<ImmutableNode> getModel() {
throw testEx;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java?rev=1621618&r1=1621617&r2=1621618&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java Sun Aug 31 19:33:29 2014
@@ -1444,10 +1444,6 @@ public class TestCombinedConfigurationBu
public static class CombinedConfigurationTestImpl extends
CombinedConfiguration
{
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = 20121216L;
}
/**