You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/01/10 09:44:36 UTC
[4/5] brooklyn-server git commit: Updated list mutability
Updated list mutability
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fdae5858
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fdae5858
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fdae5858
Branch: refs/heads/master
Commit: fdae5858e5f971e3ef7acfe568b213ee653a3890
Parents: b8f9a58
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Mon Jan 9 14:34:10 2017 +0000
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Mon Jan 9 14:36:36 2017 +0000
----------------------------------------------------------------------
.../core/mgmt/persist/DeserializingClassRenamesProvider.java | 7 ++-----
.../mgmt/persist/DeserializingJcloudsRenamesProvider.java | 6 ++----
.../brooklyn/core/mgmt/persist/DeserializingProvider.java | 6 ++++--
3 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fdae5858/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingClassRenamesProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingClassRenamesProvider.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingClassRenamesProvider.java
index 8f830e6..49f4bce 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingClassRenamesProvider.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingClassRenamesProvider.java
@@ -18,9 +18,8 @@
*/
package org.apache.brooklyn.core.mgmt.persist;
-import java.util.Arrays;
-
import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableList;
import org.apache.brooklyn.util.javalang.Reflections;
/*
@@ -44,9 +43,7 @@ public class DeserializingClassRenamesProvider extends DeserializingProvider{
public static final DeserializingClassRenamesProvider INSTANCE = new DeserializingClassRenamesProvider();
private DeserializingClassRenamesProvider(){
- super(Arrays.asList(new ConfigLoader[]{
- new PropertiesConfigLoader(DESERIALIZING_CLASS_RENAMES_PROPERTIES_PATH)
- }));
+ super(ImmutableList.of(new PropertiesConfigLoader(DESERIALIZING_CLASS_RENAMES_PROPERTIES_PATH)));
}
/**
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fdae5858/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingJcloudsRenamesProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingJcloudsRenamesProvider.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingJcloudsRenamesProvider.java
index 3311894..8dbcb67 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingJcloudsRenamesProvider.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingJcloudsRenamesProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.brooklyn.core.mgmt.persist;
-import java.util.Arrays;
+import com.google.common.collect.ImmutableList;
public class DeserializingJcloudsRenamesProvider extends DeserializingProvider{
@@ -27,9 +27,7 @@ public class DeserializingJcloudsRenamesProvider extends DeserializingProvider{
public static final DeserializingJcloudsRenamesProvider INSTANCE = new DeserializingJcloudsRenamesProvider();
private DeserializingJcloudsRenamesProvider(){
- super(Arrays.asList(new ConfigLoader[]{
- new PropertiesConfigLoader(JCLOUDS_PROVIDER_RENAMES_PROPERTIES_PATH)
- }));
+ super(ImmutableList.of(new PropertiesConfigLoader(JCLOUDS_PROVIDER_RENAMES_PROPERTIES_PATH)));
}
public String applyJcloudsRenames(String jcloudsProvider){
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fdae5858/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingProvider.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingProvider.java
index 15f8c63..dd497d6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingProvider.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/DeserializingProvider.java
@@ -19,10 +19,12 @@
package org.apache.brooklyn.core.mgmt.persist;
import com.google.common.annotations.Beta;
+import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.MutableMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,8 +48,8 @@ public class DeserializingProvider {
private List<ConfigLoader> loaders;
- protected DeserializingProvider(List<ConfigLoader> loaders){
- this.loaders = loaders;
+ protected DeserializingProvider(List<? extends ConfigLoader> loaders){
+ this.loaders = new ArrayList<>(loaders);
}
private volatile Map<String, String> cache;