brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject [10/13] git commit: Fix serialisation and persistence issues
Date Sun, 05 Oct 2014 22:44:34 GMT
Fix serialisation and persistence issues


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

Branch: refs/heads/master
Commit: af5c83108c08ecf7b54db8e21ebf618900360e69
Parents: 3fb2ef5
Author: Andrew Kennedy <grkvlt@apache.org>
Authored: Sat Sep 27 01:58:42 2014 +0100
Committer: Andrew Kennedy <grkvlt@apache.org>
Committed: Sun Oct 5 19:45:54 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/spi/dsl/methods/BrooklynDslCommon.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/af5c8310/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
index a9a80a6..e5534b3 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
@@ -182,7 +182,7 @@ public class BrooklynDslCommon {
      *
      * @see DependentConfiguration#formatString(String, Object...)
      */
-    protected static final class DslFormatString extends BrooklynDslDeferredSupplier<String>
{
+    protected static class DslFormatString extends BrooklynDslDeferredSupplier<String>
{
 
         private static final long serialVersionUID = -4849297712650560863L;
 
@@ -205,10 +205,18 @@ public class BrooklynDslCommon {
         }
     }
 
+    /** @deprecated since 0.7.0; use {@link DslFormatString} */
+    @Deprecated
+    protected static class FormatString extends DslFormatString {
+        public FormatString(String pattern, Object[] args) {
+            super(pattern, args);
+        }
+    }
+
     /** Deferred execution of Object creation. */
-    protected static final class DslObject extends BrooklynDslDeferredSupplier<Object>
{
+    protected static class DslObject extends BrooklynDslDeferredSupplier<Object> {
 
-        private static final long serialVersionUID = -1;
+        private static final long serialVersionUID = 8878388748085419L;
 
         private Class<?> type;
         private Map<String,?> fields;


Mime
View raw message