You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/09/01 17:16:28 UTC

[05/28] incubator-brooklyn git commit: Tighten-up generics in concrete implementations.

Tighten-up generics in concrete implementations.


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

Branch: refs/heads/master
Commit: 7474be1f1674a83a2339d5cc88dae321d9a505a1
Parents: 0d401f7
Author: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Authored: Thu Aug 6 14:14:23 2015 +0100
Committer: Alasdair Hodge <gi...@alasdairhodge.co.uk>
Committed: Tue Aug 25 11:51:20 2015 +0100

----------------------------------------------------------------------
 .../config/external/InPlaceExternalConfigSupplier.java         | 6 +++---
 .../config/external/PropertiesFileExternalConfigSupplier.java  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7474be1f/core/src/main/java/brooklyn/config/external/InPlaceExternalConfigSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/external/InPlaceExternalConfigSupplier.java b/core/src/main/java/brooklyn/config/external/InPlaceExternalConfigSupplier.java
index 697bc89..a5a3015 100644
--- a/core/src/main/java/brooklyn/config/external/InPlaceExternalConfigSupplier.java
+++ b/core/src/main/java/brooklyn/config/external/InPlaceExternalConfigSupplier.java
@@ -37,15 +37,15 @@ import brooklyn.management.ManagementContext;
  */
 public class InPlaceExternalConfigSupplier extends AbstractExternalConfigSupplier {
 
-    private final Map<?,?> config;
+    private final Map<String, String> config;
 
-    public InPlaceExternalConfigSupplier(ManagementContext managementContext, String name, Map<?, ?> config) {
+    public InPlaceExternalConfigSupplier(ManagementContext managementContext, String name, Map<String, String> config) {
         super(managementContext, name);
         this.config = config;
     }
 
     public String get(String key) {
-        return (String) config.get(key);
+        return config.get(key);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7474be1f/core/src/main/java/brooklyn/config/external/PropertiesFileExternalConfigSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/external/PropertiesFileExternalConfigSupplier.java b/core/src/main/java/brooklyn/config/external/PropertiesFileExternalConfigSupplier.java
index 34a67c4..66d72e3 100644
--- a/core/src/main/java/brooklyn/config/external/PropertiesFileExternalConfigSupplier.java
+++ b/core/src/main/java/brooklyn/config/external/PropertiesFileExternalConfigSupplier.java
@@ -43,9 +43,9 @@ public class PropertiesFileExternalConfigSupplier extends AbstractExternalConfig
 
     private final Properties properties;
 
-    public PropertiesFileExternalConfigSupplier(ManagementContext managementContext, String name, Map<?, ?> config) throws IOException {
+    public PropertiesFileExternalConfigSupplier(ManagementContext managementContext, String name, Map<String, String> config) throws IOException {
         super(managementContext, name);
-        this.properties = loadProperties((String) config.get(PROPERTIES_URL));
+        this.properties = loadProperties(config.get(PROPERTIES_URL));
     }
 
     public String get(String key) {