You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2014/01/21 06:31:04 UTC

git commit: The metadata needs to be ordered for this implementation.

Updated Branches:
  refs/heads/master 55aadf858 -> d76a9d921


The metadata needs to be ordered for this implementation.


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

Branch: refs/heads/master
Commit: d76a9d921e08f686486b58d08ba8a7bac6784441
Parents: 55aadf8
Author: Zack Shoylev <za...@rackspace.com>
Authored: Mon Jan 20 18:53:37 2014 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Mon Jan 20 23:03:26 2014 -0600

----------------------------------------------------------------------
 .../rackspace/cloudloadbalancers/v1/domain/Metadata.java       | 6 +++---
 .../v1/features/LoadBalancerApiExpectTest.java                 | 2 +-
 .../cloudloadbalancers/v1/features/NodeApiExpectTest.java      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/d76a9d92/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java
index aa79076..72661b9 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Metadata.java
@@ -19,7 +19,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
 import java.util.Map;
 
 import com.google.common.collect.ForwardingMap;
-import static com.google.common.collect.Maps.newHashMap;
+import static com.google.common.collect.Maps.newLinkedHashMap;
 import static com.google.common.collect.Sets.newHashSet;
 
 /**
@@ -30,8 +30,8 @@ import static com.google.common.collect.Sets.newHashSet;
  * @author Everett Toews
  */
 public class Metadata extends ForwardingMap<String, String> {
-   private final Map<String, String> metadata = newHashMap();
-   private final Map<String, Integer> keyToId = newHashMap();
+   private final Map<String, String> metadata = newLinkedHashMap(); // Implementing class must be sorted.
+   private final Map<String, Integer> keyToId = newLinkedHashMap();
    
    public Metadata(Metadata metadata) {
       super();

http://git-wip-us.apache.org/repos/asf/jclouds/blob/d76a9d92/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
index 0fbb7d7..51ba5b3 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
@@ -219,9 +219,9 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
 
    private Metadata getExpectedMetadata() {
       Metadata metadata = new Metadata();
+      metadata.put("os", "ubuntu");
       metadata.put("color", "red");
       metadata.put("label", "web-load-balancer");
-      metadata.put("os", "ubuntu");
 
       return metadata;
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/d76a9d92/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java
index 2c41fbf..0b3dcef 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java
@@ -214,9 +214,9 @@ public class NodeApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<CloudL
 
    private Metadata getExpectedMetadata() {
       Metadata metadata = new Metadata();
+      metadata.put("os", "ubuntu");
       metadata.put("color", "red");
       metadata.put("label", "web-load-balancer");
-      metadata.put("os", "ubuntu");
 
       return metadata;
    }