1 files changed, 11 insertions, 49 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
index 8edf07d7ee..24646e94e7 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
@@ -20,44 +20,34 @@
  */
 package org.apache.qpid.messaging;
 
-import static org.apache.qpid.messaging.util.PyPrint.pprint;
-
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.apache.qpid.messaging.address.Link;
 import org.apache.qpid.messaging.address.Node;
 import org.apache.qpid.messaging.util.AddressParser;
 
-
 /**
  * Address
  *
  */
-
 public class Address
 {
+    private final String _name;
+    private final String _subject;
+    private final Node _node;
+    private final Link _link;
+    private final String _toString;
 
-    private String _name;
-    private String _subject;
-    private Map _options;
-    private final String _myToString;
-
-    private Node _node;
-    private Link _link;
-    private AtomicBoolean readOnly = new AtomicBoolean(false);
-
-    public static Address parse(String address)
+    public static AddressRaw parse(String address)
     {
         return new AddressParser(address).parse();
     }
 
-    public Address(String name, String subject, Map options)
+    public Address (String name, String subject, Node node, Link link)
     {
         this._name = name;
         this._subject = subject;
-        this._options = options;
-        this._myToString = String.format("%s/%s; %s", pprint(_name), pprint(_subject), pprint(_options));
+        this._node = node;
+        this._link = link;
+        this._toString = null; // TODO
     }
 
     public String getName()
@@ -70,14 +60,9 @@ public class Address
         return _subject;
     }
 
-    public Map getOptions()
-    {
-        return _options;
-    }
-
     public String toString()
     {
-        return _myToString;
+        return _toString;
     }
 
     public Node getNode()
@@ -85,31 +70,8 @@ public class Address
         return _node;
     }
 
-    public void setNode(Node n)
-    {
-        if (readOnly.get())
-        {
-            throw new IllegalArgumentException("Once initialized the address object is immutable");
-        }
-        this._node = n;
-    }
-
     public Link getLink()
     {
         return _link;
     }
-
-    public void setLink(Link l)
-    {
-        if (readOnly.get())
-        {
-            throw new IllegalArgumentException("Once initialized the address object is immutable");
-        }
-        this._link = l;
-    }
-
-    public void markReadOnly()
-    {
-        readOnly.set(true);
-    }
 }