brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [01/11] incubator-brooklyn git commit: Location is not serializable
Date Fri, 13 Nov 2015 02:08:50 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 94605444c -> 6665cc66b


Location is not serializable

Deletes “extends Serializable” from location interface, and removes
all declared serialVersionUID from location implementations.

Location was not really serialisable anyway - for example it had 
non-transient references to ManagementContext. The declaration of
“Serializable” was a throwback to very old days when persistence 
was imagined to be very different.

Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/055940f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/055940f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/055940f2

Branch: refs/heads/master
Commit: 055940f2127fbfd52dd6b48251901fc45e39736b
Parents: 443ed5e
Author: Aled Sage <aled.sage@gmail.com>
Authored: Thu Nov 12 14:17:12 2015 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Thu Nov 12 14:17:12 2015 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/brooklyn/api/location/Location.java | 3 +--
 .../org/apache/brooklyn/core/location/AbstractLocation.java  | 2 --
 .../location/AggregatingMachineProvisioningLocation.java     | 2 --
 .../core/location/access/PortForwardManagerClient.java       | 2 --
 .../apache/brooklyn/entity/stock/EffectorStartableImpl.java  | 2 --
 .../location/byon/SingleMachineProvisioningLocation.java     | 1 -
 .../localhost/LocalhostMachineProvisioningLocation.java      | 2 --
 .../org/apache/brooklyn/location/multi/MultiLocation.java    | 2 --
 .../apache/brooklyn/core/location/AbstractLocationTest.java  | 1 -
 .../brooklyn/core/location/LocationExtensionsTest.java       | 2 --
 .../org/apache/brooklyn/core/location/SimulatedLocation.java | 2 --
 .../apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java | 8 --------
 .../brooklyn/location/jclouds/JcloudsSshMachineLocation.java | 1 -
 .../brooklyn/location/jclouds/BailOutJcloudsLocation.java    | 3 ---
 .../brooklyn/policy/jclouds/os/CreateUserPolicyTest.java     | 2 --
 .../brooklyn/entity/machine/pool/ServerPoolLocation.java     | 2 --
 .../software/base/SoftwareProcessEntityRebindTest.java       | 2 --
 .../entity/software/base/SoftwareProcessEntityTest.java      | 2 --
 .../software/base/lifecycle/StartStopSshDriverTest.java      | 2 --
 .../base/test/core/mgmt/usage/LocationUsageTrackingTest.java | 2 --
 .../camp/brooklyn/catalog/CatalogParametersTest.java         | 1 -
 .../apache/brooklyn/rest/resources/UsageResourceTest.java    | 2 --
 22 files changed, 1 insertion(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/api/src/main/java/org/apache/brooklyn/api/location/Location.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/location/Location.java b/api/src/main/java/org/apache/brooklyn/api/location/Location.java
index 3ef9251..ea43bfd 100644
--- a/api/src/main/java/org/apache/brooklyn/api/location/Location.java
+++ b/api/src/main/java/org/apache/brooklyn/api/location/Location.java
@@ -18,7 +18,6 @@
  */
 package org.apache.brooklyn.api.location;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.Map;
 
@@ -30,7 +29,7 @@ import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
  * A location that an entity can be in. Examples of locations include a single machine
  * or a pool of machines, or a region within a given cloud. 
  */
-public interface Location extends Serializable, BrooklynObject {
+public interface Location extends BrooklynObject {
 
     /**
      * A unique id for this location.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java b/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
index c14472d..dc48862 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
@@ -96,8 +96,6 @@ import com.google.common.reflect.TypeToken;
  */
 public abstract class AbstractLocation extends AbstractBrooklynObject implements LocationInternal,
HasHostGeoInfo, Configurable {
     
-    private static final long serialVersionUID = -7495805474138619830L;
-
     /** @deprecated since 0.7.0 shouldn't be public */
     @Deprecated
     public static final Logger LOG = LoggerFactory.getLogger(AbstractLocation.class);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java
b/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java
index c8e7a6e..6fc9920 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java
@@ -42,8 +42,6 @@ import com.google.common.collect.Maps;
 public class AggregatingMachineProvisioningLocation<T extends MachineLocation> extends
AbstractLocation 
         implements MachineProvisioningLocation<T>, Closeable {
 
-    private static final long serialVersionUID = -8818006672883481775L;
-
     private Object lock;
     
     @SetFromFlag

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
index f2b9662..b0baa01 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java
@@ -39,8 +39,6 @@ import com.google.common.net.HostAndPort;
 @Deprecated
 public class PortForwardManagerClient implements PortForwardManager {
 
-    private static final long serialVersionUID = -295204304305332895L;
-    
     protected final Supplier<PortForwardManager> delegateSupplier;
     private transient volatile PortForwardManager _delegate;
     

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/main/java/org/apache/brooklyn/entity/stock/EffectorStartableImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/stock/EffectorStartableImpl.java
b/core/src/main/java/org/apache/brooklyn/entity/stock/EffectorStartableImpl.java
index 93cb677..b628ec3 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/stock/EffectorStartableImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/stock/EffectorStartableImpl.java
@@ -42,8 +42,6 @@ import com.google.common.reflect.TypeToken;
  * (and same for stop and restart) */
 public class EffectorStartableImpl extends AbstractEntity implements BasicStartable {
 
-    private static final long serialVersionUID = -7109357808001370568L;
-    
     private static final Logger log = LoggerFactory.getLogger(EffectorStartableImpl.class);
 
     public static class StartParameters { 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/main/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocation.java
b/core/src/main/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocation.java
index 3338da5..eb8c4f9 100644
--- a/core/src/main/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocation.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.ImmutableMap;
 
 public class SingleMachineProvisioningLocation<T extends MachineLocation> extends FixedListMachineProvisioningLocation<T>
{
-    private static final long serialVersionUID = -4216528515792151062L;
 
     private static final Logger log = LoggerFactory.getLogger(SingleMachineProvisioningLocation.class);
     

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
index 46adbe0..ab7ad01 100644
--- a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
@@ -71,8 +71,6 @@ import com.google.common.collect.Sets;
  */
 public class LocalhostMachineProvisioningLocation extends FixedListMachineProvisioningLocation<SshMachineLocation>
implements AddressableLocation, LocationWithObjectStore {
 
-    private static final long serialVersionUID = -7791239672433897762L;
-
     /** @deprecated since 0.9.0; shouldn't be public */
     @Deprecated
     public static final Logger LOG = LoggerFactory.getLogger(LocalhostMachineProvisioningLocation.class);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocation.java b/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocation.java
index 3b0ffdf..f78d0d6 100644
--- a/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/multi/MultiLocation.java
@@ -55,8 +55,6 @@ import com.google.common.reflect.TypeToken;
  * is used, it may stripe across each of the locations.  See notes at {@link AvailabilityZoneExtension}.
*/
 public class MultiLocation<T extends MachineLocation> extends AbstractLocation implements
MachineProvisioningLocation<T> {
 
-    private static final long serialVersionUID = 7993091317970457862L;
-    
     @SuppressWarnings("serial")
     @SetFromFlag("subLocations")
     public static final ConfigKey<List<MachineProvisioningLocation<?>>>
SUB_LOCATIONS = ConfigKeys.newConfigKey(

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/test/java/org/apache/brooklyn/core/location/AbstractLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/AbstractLocationTest.java
b/core/src/test/java/org/apache/brooklyn/core/location/AbstractLocationTest.java
index 389ecb6..93f74c2 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/AbstractLocationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/AbstractLocationTest.java
@@ -46,7 +46,6 @@ import com.google.common.collect.ImmutableMap;
 public class AbstractLocationTest {
 
     public static class ConcreteLocation extends AbstractLocation {
-        private static final long serialVersionUID = 3954199300889119970L;
         @SetFromFlag(defaultVal="mydefault")
         String myfield;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/test/java/org/apache/brooklyn/core/location/LocationExtensionsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/LocationExtensionsTest.java
b/core/src/test/java/org/apache/brooklyn/core/location/LocationExtensionsTest.java
index d0f72be..dc25b9c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/LocationExtensionsTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/LocationExtensionsTest.java
@@ -36,8 +36,6 @@ import org.testng.annotations.Test;
 public class LocationExtensionsTest {
 
     public static class ConcreteLocation extends AbstractLocation {
-        private static final long serialVersionUID = 2407231019435442876L;
-
         public ConcreteLocation() {
             super();
         }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java b/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java
index c10f376..b1c0204 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java
@@ -49,8 +49,6 @@ import com.google.common.collect.Sets;
  */
 public class SimulatedLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>,
MachineLocation, PortSupplier {
 
-    private static final long serialVersionUID = 1L;
-    
     private static final InetAddress address;
     static {
         address = Networking.getLocalHost();

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
index 6b2d8c5..7d13672 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
@@ -286,8 +286,6 @@ public class RebindLocationTest extends RebindTestFixtureWithApp {
     }
     
     public static class MyOldStyleLocation extends AbstractLocation {
-        private static final long serialVersionUID = 1L;
-        
         @SetFromFlag
         String myfield;
 
@@ -297,8 +295,6 @@ public class RebindLocationTest extends RebindTestFixtureWithApp {
     }
     
     public static class MyLocation extends AbstractLocation {
-        private static final long serialVersionUID = 1L;
-        
         @SetFromFlag
         public static final ConfigKey<String> MY_CONFIG_WITH_SETFROMFLAG_NO_SHORT_NAME
= ConfigKeys.newStringConfigKey("myconfig.withSetfromflag.noShortName");
 
@@ -335,8 +331,6 @@ public class RebindLocationTest extends RebindTestFixtureWithApp {
     }
     
     public static class MyLocationReffingOthers extends AbstractLocation {
-        private static final long serialVersionUID = 1L;
-        
         @SetFromFlag(defaultVal="a")
         String myfield;
 
@@ -355,8 +349,6 @@ public class RebindLocationTest extends RebindTestFixtureWithApp {
     }
     
     public static class MyLocationCustomProps extends AbstractLocation {
-        private static final long serialVersionUID = 1L;
-        
         String myfield;
         boolean rebound;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
index 606f062..2db43d1 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
@@ -68,7 +68,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 public class JcloudsSshMachineLocation extends SshMachineLocation implements JcloudsMachineLocation
{
     
     private static final Logger LOG = LoggerFactory.getLogger(JcloudsSshMachineLocation.class);
-    private static final long serialVersionUID = -443866395634771659L;
 
     @SetFromFlag
     JcloudsLocation jcloudsParent;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
index 10a32b4..28d1c7b 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/BailOutJcloudsLocation.java
@@ -61,8 +61,6 @@ public class BailOutJcloudsLocation extends JcloudsLocation {
     public static final ConfigKey<Boolean> BUILD_TEMPLATE = ConfigKeys.newBooleanConfigKey(
             "buildtemplate");
 
-    private static final long serialVersionUID = -3373789512935057842L;
-
     ConfigBag lastConfigBag;
     Template template;
 
@@ -149,7 +147,6 @@ public class BailOutJcloudsLocation extends JcloudsLocation {
 
     /** As {@link BailOutJcloudsLocation}, counting the number of {@link #buildTemplate}
calls. */
     public static class CountingBailOutJcloudsLocation extends BailOutJcloudsLocation {
-        private static final long serialVersionUID = 2433684033045735773L;
         int buildTemplateCount = 0;
         @Override
         public Template buildTemplate(ComputeService computeService, ConfigBag config) {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicyTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicyTest.java
b/locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicyTest.java
index 82b6dfa..33e0ed9 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicyTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicyTest.java
@@ -51,8 +51,6 @@ public class CreateUserPolicyTest extends BrooklynAppUnitTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(CreateUserPolicyTest.class);
 
     public static class RecordingSshMachineLocation extends SshMachineLocation {
-        private static final long serialVersionUID = 1641930081769106380L;
-        
         public static List<List<String>> execScriptCalls = Lists.newArrayList();
 
         @Override 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java
b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java
index c59af7f..bc1e2dd 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLocation.java
@@ -40,8 +40,6 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag;
 public class ServerPoolLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>,
         DynamicLocation<ServerPool, ServerPoolLocation> {
 
-    private static final long serialVersionUID = -6771844611899475409L;
-
     private static final Logger LOG = LoggerFactory.getLogger(ServerPoolLocation.class);
 
     @SetFromFlag("owner")

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java
index 4b6e9ce..76cb5c1 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityRebindTest.java
@@ -145,8 +145,6 @@ public class SoftwareProcessEntityRebindTest extends BrooklynAppUnitTestSupport
     }
     
     public static class MyProvisioningLocation extends AbstractLocation implements MachineProvisioningLocation<SshMachineLocation>
{
-        private static final long serialVersionUID = 1L;
-        
         @SetFromFlag(defaultVal="0")
         AtomicInteger inUseCount;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java
index 3af7fe5..017179b 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityTest.java
@@ -742,8 +742,6 @@ public class SoftwareProcessEntityTest extends BrooklynAppUnitTestSupport
{
     }
 
     public static class ReleaseLatchLocation extends SimulatedLocation {
-        private static final long serialVersionUID = 1L;
-        
         private CountDownLatch lock = new CountDownLatch(1);
         private volatile boolean isBlocked;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
index f7af97b..b8455b3 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
@@ -83,8 +83,6 @@ public class StartStopSshDriverTest {
 
     @SuppressWarnings("rawtypes")
     protected static class SshMachineLocationWithSshTool extends SshMachineLocation {
-        private static final long serialVersionUID = 1L;
-
         SshTool lastTool;
         public SshMachineLocationWithSshTool(Map flags) { super(flags); }
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/LocationUsageTrackingTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/LocationUsageTrackingTest.java
b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/LocationUsageTrackingTest.java
index 13b1c54..f877261 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/LocationUsageTrackingTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/core/mgmt/usage/LocationUsageTrackingTest.java
@@ -130,8 +130,6 @@ public class LocationUsageTrackingTest extends BrooklynAppUnitTestSupport
{
     }
 
     public static class DynamicLocalhostMachineProvisioningLocation extends LocalhostMachineProvisioningLocation
{
-        private static final long serialVersionUID = 4822009936654077946L;
-
         @Override
         public SshMachineLocation obtain(Map<?, ?> flags) throws NoMachinesAvailableException
{
             System.out.println("called DynamicLocalhostMachineProvisioningLocation.obtain");

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogParametersTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogParametersTest.java
b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogParametersTest.java
index 6407d4a..810c117 100644
--- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogParametersTest.java
+++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogParametersTest.java
@@ -59,7 +59,6 @@ public class CatalogParametersTest extends AbstractYamlTest {
         public static final ConfigKey<String> SAMPLE_CONFIG = SHARED_CONFIG;
     }
     public static class ConfigLocationForTest extends AbstractLocation {
-        private static final long serialVersionUID = 1L;
         public static final ConfigKey<String> SAMPLE_CONFIG = SHARED_CONFIG;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/055940f2/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
index 697ae10..72392fe 100644
--- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
+++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
@@ -420,8 +420,6 @@ public class UsageResourceTest extends BrooklynRestResourceTest {
     }
     
     public static class DynamicLocalhostMachineProvisioningLocation extends LocalhostMachineProvisioningLocation
{
-        private static final long serialVersionUID = 2163357613938738967L;
-
         @Override
         public SshMachineLocation obtain(Map<?, ?> flags) throws NoMachinesAvailableException
{
             return super.obtain(flags);


Mime
View raw message