remove namespace declarations from attributes

richard-jones · richard-jones · commit 4666e89a9f87 · 2013-05-14T08:33:43.000+01:00
diff --git a/src/main/java/org/openarchives/resourcesync/ResourceSyncDocument.java b/src/main/java/org/openarchives/resourcesync/ResourceSyncDocument.java
@@ -120,14 +120,14 @@ protected void populateDocument(Element element)
         if (mdElement != null)
         {
             // - capability
-            String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);
+            String capability = mdElement.getAttributeValue("capability");
             if (!"".equals(capability))
             {
                 this.capability = capability;
             }
 
             // - modified
-            String modified = mdElement.getAttributeValue("modified", ResourceSync.NS_ATOM);
+            String modified = mdElement.getAttributeValue("modified");
             if (modified != null && !"".equals(modified))
             {
                 Date lastMod = ResourceSync.DATE_FORMAT.parse(modified);
@@ -139,8 +139,8 @@ protected void populateDocument(Element element)
         List<Element> lns = element.getChildren("ln", ResourceSync.NS_RS);
         for (Element ln : lns)
         {
-            String rel = ln.getAttributeValue("rel", ResourceSync.NS_ATOM);
-            String href = ln.getAttributeValue("href", ResourceSync.NS_ATOM);
+            String rel = ln.getAttributeValue("rel");
+            String href = ln.getAttributeValue("href");
             if (rel != null && !"".equals(rel) && href != null && !"".equals(href))
             {
                 this.addLn(rel, href);
@@ -156,24 +156,23 @@ protected void populateDocument(Element element)
     public Element getElement()
     {
         Element root = new Element(this.root, ResourceSync.NS_SITEMAP);
-        root.addNamespaceDeclaration(ResourceSync.NS_ATOM);
         root.addNamespaceDeclaration(ResourceSync.NS_RS);
 
         // set the capability of the document in the rs:md
         Element md = new Element("md", ResourceSync.NS_RS);
-        md.setAttribute("capability", this.capability, ResourceSync.NS_RS);
+        md.setAttribute("capability", this.capability);
         if (this.lastModified != null)
         {
-            md.setAttribute("modified", ResourceSync.DATE_FORMAT.format(this.lastModified), ResourceSync.NS_ATOM);
+            md.setAttribute("modified", ResourceSync.DATE_FORMAT.format(this.lastModified));
         }
         root.addContent(md);
 
         // serialise the rs:ln elements
         for (ResourceSyncLn ln : this.lns)
         {
             Element lnEl = new Element("ln", ResourceSync.NS_RS);
-            lnEl.setAttribute("rel", ln.getRel(), ResourceSync.NS_ATOM);
-            lnEl.setAttribute("href", ln.getHref(), ResourceSync.NS_ATOM);
+            lnEl.setAttribute("rel", ln.getRel());
+            lnEl.setAttribute("href", ln.getHref());
             root.addContent(lnEl);
         }
 
diff --git a/src/main/java/org/openarchives/resourcesync/ResourceSyncEntry.java b/src/main/java/org/openarchives/resourcesync/ResourceSyncEntry.java
@@ -195,50 +195,50 @@ public void populateObject(Element element)
         if (mdElement != null)
         {
             // - capability
-            String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);
+            String capability = mdElement.getAttributeValue("capability");
             if (capability != null && !"".equals(capability))
             {
                 this.setCapability(capability);
             }
 
             // - change
-            String change = mdElement.getAttributeValue("change", ResourceSync.NS_RS);
+            String change = mdElement.getAttributeValue("change");
             if (change != null && !"".equals(change))
             {
                 this.setChange(change);
             }
 
             // - hash
-            String hashAttr = mdElement.getAttributeValue("hash", ResourceSync.NS_ATOM);
+            String hashAttr = mdElement.getAttributeValue("hash");
             if (hashAttr != null && !"".equals(hashAttr))
             {
                 this.addHashesFromAttr(hashAttr);
             }
 
             // - length
-            String length = mdElement.getAttributeValue("length", ResourceSync.NS_ATOM);
+            String length = mdElement.getAttributeValue("length");
             if (length != null && !"".equals(length))
             {
                 long l = Long.parseLong(length);
                 this.setLength(l);
             }
 
             // - path
-            String path = mdElement.getAttributeValue("path", ResourceSync.NS_RS);
+            String path = mdElement.getAttributeValue("path");
             if (path != null && !"".equals(path))
             {
                 this.setPath(path);
             }
 
             // - type
-            String type = mdElement.getAttributeValue("type", ResourceSync.NS_ATOM);
+            String type = mdElement.getAttributeValue("type");
             if (type != null && !"".equals(type))
             {
                 this.setType(type);
             }
 
             // -encoding
-            String encoding = mdElement.getAttributeValue("encoding"); // FIXME: namespace?
+            String encoding = mdElement.getAttributeValue("encoding");
             if (encoding != null && !"".equals(encoding))
             {
                 this.setEncoding(encoding);
@@ -249,14 +249,14 @@ public void populateObject(Element element)
         List<Element> lns = element.getChildren("ln", ResourceSync.NS_RS);
         for (Element ln : lns)
         {
-            String rel = ln.getAttributeValue("rel", ResourceSync.NS_ATOM);
-            String href = ln.getAttributeValue("href", ResourceSync.NS_ATOM);
+            String rel = ln.getAttributeValue("rel");
+            String href = ln.getAttributeValue("href");
             if (rel != null && !"".equals(rel) && href != null && !"".equals(href))
             {
                 ResourceSyncLn link = this.addLn(rel, href);
 
                 // hash
-                String lnHashAttr = ln.getAttributeValue("hash", ResourceSync.NS_ATOM);
+                String lnHashAttr = ln.getAttributeValue("hash");
                 if (lnHashAttr != null && !"".equals(lnHashAttr))
                 {
                     Map<String, String> hashMap = this.getHashesFromAttr(lnHashAttr);
@@ -267,44 +267,44 @@ public void populateObject(Element element)
                 }
 
                 // length
-                String lnLength = ln.getAttributeValue("length", ResourceSync.NS_ATOM);
+                String lnLength = ln.getAttributeValue("length");
                 if (lnLength != null && !"".equals(length))
                 {
                     long lnl = Long.parseLong(lnLength);
                     link.setLength(lnl);
                 }
 
                 // modified
-                String modified = ln.getAttributeValue("modified", ResourceSync.NS_ATOM);
+                String modified = ln.getAttributeValue("modified");
                 if (modified != null && !"".equals(modified))
                 {
                     Date modDate = ResourceSync.DATE_FORMAT.parse(modified);
                     link.setModified(modDate);
                 }
 
                 // path
-                String lnPath = ln.getAttributeValue("path", ResourceSync.NS_RS);
+                String lnPath = ln.getAttributeValue("path");
                 if (lnPath != null && !"".equals(lnPath))
                 {
                     link.setPath(lnPath);
                 }
 
                 // pri
-                String pri = ln.getAttributeValue("pri"); // FIXME: namespace?
+                String pri = ln.getAttributeValue("pri");
                 if (pri != null && !"".equals(pri))
                 {
                     link.setPri(Integer.parseInt(pri));
                 }
 
                 // type
-                String lnType = ln.getAttributeValue("type", ResourceSync.NS_ATOM);
+                String lnType = ln.getAttributeValue("type");
                 if (lnType != null && !"".equals(lnType))
                 {
                     link.setType(lnType);
                 }
 
                 // encoding
-                String lnEncoding = ln.getAttributeValue("encoding"); // FIXME: namespace?
+                String lnEncoding = ln.getAttributeValue("encoding");
                 if (lnEncoding != null && !"".equals(lnEncoding))
                 {
                     link.setEncoding(lnEncoding);
@@ -343,38 +343,38 @@ public Element getElement()
         boolean trip = false;
         if (this.capability != null)
         {
-            md.setAttribute("capability", this.capability, ResourceSync.NS_RS);
+            md.setAttribute("capability", this.capability);
             trip = true;
         }
         if (this.change != null)
         {
-            md.setAttribute("change", this.change, ResourceSync.NS_RS);
+            md.setAttribute("change", this.change);
             trip = true;
         }
         String hashAttr = this.getHashAttr(this.hashes);
         if (!"".equals(hashAttr))
         {
-            md.setAttribute("hash", hashAttr, ResourceSync.NS_ATOM);
+            md.setAttribute("hash", hashAttr);
             trip = true;
         }
         if (this.length > -1)
         {
-            md.setAttribute("length", Long.toString(this.length), ResourceSync.NS_ATOM);
+            md.setAttribute("length", Long.toString(this.length));
             trip = true;
         }
         if (this.path != null)
         {
-            md.setAttribute("path", this.path, ResourceSync.NS_RS);
+            md.setAttribute("path", this.path);
             trip = true;
         }
         if (this.type != null)
         {
-            md.setAttribute("type", this.type, ResourceSync.NS_ATOM);
+            md.setAttribute("type", this.type);
             trip = true;
         }
         if (this.encoding != null)
         {
-            md.setAttribute("encoding", this.encoding); // FIXME: namespace?  This comes from the HTTP spec
+            md.setAttribute("encoding", this.encoding);
             trip = true;
         }
         if (trip)
@@ -390,47 +390,47 @@ public Element getElement()
             String lnHash = this.getHashAttr(ln.getHashes());
             if (!"".equals(lnHash))
             {
-                link.setAttribute("hash", lnHash, ResourceSync.NS_ATOM);
+                link.setAttribute("hash", lnHash);
                 trip = true;
             }
             if (ln.getHref() != null)
             {
-                link.setAttribute("href", ln.getHref(), ResourceSync.NS_ATOM);
+                link.setAttribute("href", ln.getHref());
                 trip = true;
             }
             if (ln.getLength() > -1)
             {
-                link.setAttribute("length", Long.toString(ln.getLength()), ResourceSync.NS_ATOM);
+                link.setAttribute("length", Long.toString(ln.getLength()));
                 trip = true;
             }
             if (ln.getModified() != null)
             {
-                link.setAttribute("modified", ResourceSync.DATE_FORMAT.format(ln.getModified()), ResourceSync.NS_ATOM);
+                link.setAttribute("modified", ResourceSync.DATE_FORMAT.format(ln.getModified()));
                 trip = true;
             }
             if (ln.getPath() != null)
             {
-                link.setAttribute("path", ln.getPath(), ResourceSync.NS_RS);
+                link.setAttribute("path", ln.getPath());
                 trip = true;
             }
             if (ln.getRel() != null)
             {
-                link.setAttribute("rel", ln.getRel(), ResourceSync.NS_ATOM);
+                link.setAttribute("rel", ln.getRel());
                 trip = true;
             }
             if (ln.getPri() > 0)
             {
-                link.setAttribute("pri", Integer.toString(ln.getPri())); // FIXME: namespace?
+                link.setAttribute("pri", Integer.toString(ln.getPri()));
                 trip = true;
             }
             if (ln.getType() != null)
             {
-                link.setAttribute("type", ln.getType(), ResourceSync.NS_ATOM);
+                link.setAttribute("type", ln.getType());
                 trip = true;
             }
             if (ln.getEncoding() != null)
             {
-                link.setAttribute("encoding", ln.getEncoding()); // FIXME: namespace?
+                link.setAttribute("encoding", ln.getEncoding());
                 trip = true;
             }
             if (trip)
diff --git a/src/test/java/org/openarchives/resourcesync/test/TestBaseClasses.java b/src/test/java/org/openarchives/resourcesync/test/TestBaseClasses.java
@@ -174,25 +174,25 @@ public void resourceSyncEntry()
 
         Element md = element.getChild("md", ResourceSync.NS_RS);
 
-        String cap = md.getAttributeValue("capability", ResourceSync.NS_RS);
+        String cap = md.getAttributeValue("capability");
         assert cap.equals(ResourceSync.CAPABILITY_RESOURCELIST);
 
-        String change = md.getAttributeValue("change", ResourceSync.NS_RS);
+        String change = md.getAttributeValue("change");
         assert change.equals(ResourceSync.CHANGE_CREATED);
 
-        String length = md.getAttributeValue("length", ResourceSync.NS_ATOM);
+        String length = md.getAttributeValue("length");
         assert length.equals("987");
 
-        String path = md.getAttributeValue("path", ResourceSync.NS_RS);
+        String path = md.getAttributeValue("path");
         assert path.equals("/path/to/file");
 
-        String type = md.getAttributeValue("type", ResourceSync.NS_ATOM);
+        String type = md.getAttributeValue("type");
         assert type.equals("application/pdf");
 
         String encoding = md.getAttributeValue("encoding");
         assert encoding.equals("utf-8");
 
-        String hashAttr = md.getAttributeValue("hash", ResourceSync.NS_ATOM);
+        String hashAttr = md.getAttributeValue("hash");
         String[] hashParts = hashAttr.split(" ");
         assert hashParts.length == 2;
         seenMd5 = false;
@@ -220,19 +220,19 @@ public void resourceSyncEntry()
         collection = false;
         for (Element linkEl : linkEls)
         {
-            if (linkEl.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://describes"))
+            if (linkEl.getAttributeValue("href").equals("http://describes"))
             {
-                assert linkEl.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_DESCRIBES);
-                assert linkEl.getAttributeValue("type", ResourceSync.NS_ATOM).equals("text/html");
-                assert linkEl.getAttributeValue("length", ResourceSync.NS_ATOM).equals("543");
+                assert linkEl.getAttributeValue("rel").equals(ResourceSync.REL_DESCRIBES);
+                assert linkEl.getAttributeValue("type").equals("text/html");
+                assert linkEl.getAttributeValue("length").equals("543");
                 describes = true;
             }
-            if (linkEl.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://other.collection/"))
+            if (linkEl.getAttributeValue("href").equals("http://other.collection/"))
             {
-                assert linkEl.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_COLLECTION);
+                assert linkEl.getAttributeValue("rel").equals(ResourceSync.REL_COLLECTION);
                 other_collection = true;
             }
-            if (linkEl.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://collection"))
+            if (linkEl.getAttributeValue("href").equals("http://collection"))
             {
                 collection = true;
             }
@@ -317,10 +317,10 @@ public void resourceSyncDocument()
 
         Element md = element.getChild("md", ResourceSync.NS_RS);
 
-        String cap = md.getAttributeValue("capability", ResourceSync.NS_RS);
+        String cap = md.getAttributeValue("capability");
         assert cap.equals(ResourceSync.CAPABILITY_CHANGEDUMP);
 
-        String mod = md.getAttributeValue("modified", ResourceSync.NS_ATOM);
+        String mod = md.getAttributeValue("modified");
         assert mod.equals(nowStr);
 
         List<Element> linkEls = element.getChildren("ln", ResourceSync.NS_RS);
@@ -329,14 +329,14 @@ public void resourceSyncDocument()
         desc = false;
         for (Element link : linkEls)
         {
-            if (link.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_DESCRIBED_BY))
+            if (link.getAttributeValue("rel").equals(ResourceSync.REL_DESCRIBED_BY))
             {
-                assert link.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://describedby");
+                assert link.getAttributeValue("href").equals("http://describedby");
                 descby = true;
             }
-            if (link.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_DESCRIBES))
+            if (link.getAttributeValue("rel").equals(ResourceSync.REL_DESCRIBES))
             {
-                assert link.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://describes");
+                assert link.getAttributeValue("href").equals("http://describes");
                 desc = true;
             }
         }
@@ -352,13 +352,13 @@ public void resourceSyncDocument()
             if (entry.getChild("loc", ResourceSync.NS_SITEMAP).getText().equals("http://entry1"))
             {
                 Element m = entry.getChild("md", ResourceSync.NS_RS);
-                assert m.getAttributeValue("type", ResourceSync.NS_ATOM).equals("text/xml");
+                assert m.getAttributeValue("type").equals("text/xml");
                 saw1 = true;
             }
             if (entry.getChild("loc", ResourceSync.NS_SITEMAP).getText().equals("http://entry2"))
             {
                 Element m = entry.getChild("md", ResourceSync.NS_RS);
-                assert m.getAttributeValue("change", ResourceSync.NS_RS).equals(ResourceSync.CHANGE_UPDATED);
+                assert m.getAttributeValue("change").equals(ResourceSync.CHANGE_UPDATED);
                 saw2 = true;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -120,14 +120,14 @@ protected void populateDocument(Element element)`
`120`	`120`	`if (mdElement != null)`
`121`	`121`	`{`
`122`	`122`	`// - capability`
`123`		`- String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);`
	`123`	`+ String capability = mdElement.getAttributeValue("capability");`
`124`	`124`	`if (!"".equals(capability))`
`125`	`125`	`{`
`126`	`126`	`this.capability = capability;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// - modified`
`130`		`- String modified = mdElement.getAttributeValue("modified", ResourceSync.NS_ATOM);`
	`130`	`+ String modified = mdElement.getAttributeValue("modified");`
`131`	`131`	`if (modified != null && !"".equals(modified))`
`132`	`132`	`{`
`133`	`133`	`Date lastMod = ResourceSync.DATE_FORMAT.parse(modified);`
`@@ -139,8 +139,8 @@ protected void populateDocument(Element element)`
`139`	`139`	`List<Element> lns = element.getChildren("ln", ResourceSync.NS_RS);`
`140`	`140`	`for (Element ln : lns)`
`141`	`141`	`{`
`142`		`- String rel = ln.getAttributeValue("rel", ResourceSync.NS_ATOM);`
`143`		`- String href = ln.getAttributeValue("href", ResourceSync.NS_ATOM);`
	`142`	`+ String rel = ln.getAttributeValue("rel");`
	`143`	`+ String href = ln.getAttributeValue("href");`
`144`	`144`	`if (rel != null && !"".equals(rel) && href != null && !"".equals(href))`
`145`	`145`	`{`
`146`	`146`	`this.addLn(rel, href);`
`@@ -156,24 +156,23 @@ protected void populateDocument(Element element)`
`156`	`156`	`public Element getElement()`
`157`	`157`	`{`
`158`	`158`	`Element root = new Element(this.root, ResourceSync.NS_SITEMAP);`
`159`		`- root.addNamespaceDeclaration(ResourceSync.NS_ATOM);`
`160`	`159`	`root.addNamespaceDeclaration(ResourceSync.NS_RS);`
`161`	`160`
`162`	`161`	`// set the capability of the document in the rs:md`
`163`	`162`	`Element md = new Element("md", ResourceSync.NS_RS);`
`164`		`- md.setAttribute("capability", this.capability, ResourceSync.NS_RS);`
	`163`	`+ md.setAttribute("capability", this.capability);`
`165`	`164`	`if (this.lastModified != null)`
`166`	`165`	`{`
`167`		`- md.setAttribute("modified", ResourceSync.DATE_FORMAT.format(this.lastModified), ResourceSync.NS_ATOM);`
	`166`	`+ md.setAttribute("modified", ResourceSync.DATE_FORMAT.format(this.lastModified));`
`168`	`167`	`}`
`169`	`168`	`root.addContent(md);`
`170`	`169`
`171`	`170`	`// serialise the rs:ln elements`
`172`	`171`	`for (ResourceSyncLn ln : this.lns)`
`173`	`172`	`{`
`174`	`173`	`Element lnEl = new Element("ln", ResourceSync.NS_RS);`
`175`		`- lnEl.setAttribute("rel", ln.getRel(), ResourceSync.NS_ATOM);`
`176`		`- lnEl.setAttribute("href", ln.getHref(), ResourceSync.NS_ATOM);`
	`174`	`+ lnEl.setAttribute("rel", ln.getRel());`
	`175`	`+ lnEl.setAttribute("href", ln.getHref());`
`177`	`176`	`root.addContent(lnEl);`
`178`	`177`	`}`
`179`	`178`
Original file line number	Diff line number	Diff line change
`@@ -195,50 +195,50 @@ public void populateObject(Element element)`
`195`	`195`	`if (mdElement != null)`
`196`	`196`	`{`
`197`	`197`	`// - capability`
`198`		`- String capability = mdElement.getAttributeValue("capability", ResourceSync.NS_RS);`
	`198`	`+ String capability = mdElement.getAttributeValue("capability");`
`199`	`199`	`if (capability != null && !"".equals(capability))`
`200`	`200`	`{`
`201`	`201`	`this.setCapability(capability);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`// - change`
`205`		`- String change = mdElement.getAttributeValue("change", ResourceSync.NS_RS);`
	`205`	`+ String change = mdElement.getAttributeValue("change");`
`206`	`206`	`if (change != null && !"".equals(change))`
`207`	`207`	`{`
`208`	`208`	`this.setChange(change);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`// - hash`
`212`		`- String hashAttr = mdElement.getAttributeValue("hash", ResourceSync.NS_ATOM);`
	`212`	`+ String hashAttr = mdElement.getAttributeValue("hash");`
`213`	`213`	`if (hashAttr != null && !"".equals(hashAttr))`
`214`	`214`	`{`
`215`	`215`	`this.addHashesFromAttr(hashAttr);`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`// - length`
`219`		`- String length = mdElement.getAttributeValue("length", ResourceSync.NS_ATOM);`
	`219`	`+ String length = mdElement.getAttributeValue("length");`
`220`	`220`	`if (length != null && !"".equals(length))`
`221`	`221`	`{`
`222`	`222`	`long l = Long.parseLong(length);`
`223`	`223`	`this.setLength(l);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`// - path`
`227`		`- String path = mdElement.getAttributeValue("path", ResourceSync.NS_RS);`
	`227`	`+ String path = mdElement.getAttributeValue("path");`
`228`	`228`	`if (path != null && !"".equals(path))`
`229`	`229`	`{`
`230`	`230`	`this.setPath(path);`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`// - type`
`234`		`- String type = mdElement.getAttributeValue("type", ResourceSync.NS_ATOM);`
	`234`	`+ String type = mdElement.getAttributeValue("type");`
`235`	`235`	`if (type != null && !"".equals(type))`
`236`	`236`	`{`
`237`	`237`	`this.setType(type);`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`// -encoding`
`241`		`- String encoding = mdElement.getAttributeValue("encoding"); // FIXME: namespace?`
	`241`	`+ String encoding = mdElement.getAttributeValue("encoding");`
`242`	`242`	`if (encoding != null && !"".equals(encoding))`
`243`	`243`	`{`
`244`	`244`	`this.setEncoding(encoding);`
`@@ -249,14 +249,14 @@ public void populateObject(Element element)`
`249`	`249`	`List<Element> lns = element.getChildren("ln", ResourceSync.NS_RS);`
`250`	`250`	`for (Element ln : lns)`
`251`	`251`	`{`
`252`		`- String rel = ln.getAttributeValue("rel", ResourceSync.NS_ATOM);`
`253`		`- String href = ln.getAttributeValue("href", ResourceSync.NS_ATOM);`
	`252`	`+ String rel = ln.getAttributeValue("rel");`
	`253`	`+ String href = ln.getAttributeValue("href");`
`254`	`254`	`if (rel != null && !"".equals(rel) && href != null && !"".equals(href))`
`255`	`255`	`{`
`256`	`256`	`ResourceSyncLn link = this.addLn(rel, href);`
`257`	`257`
`258`	`258`	`// hash`
`259`		`- String lnHashAttr = ln.getAttributeValue("hash", ResourceSync.NS_ATOM);`
	`259`	`+ String lnHashAttr = ln.getAttributeValue("hash");`
`260`	`260`	`if (lnHashAttr != null && !"".equals(lnHashAttr))`
`261`	`261`	`{`
`262`	`262`	`Map<String, String> hashMap = this.getHashesFromAttr(lnHashAttr);`
`@@ -267,44 +267,44 @@ public void populateObject(Element element)`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`// length`
`270`		`- String lnLength = ln.getAttributeValue("length", ResourceSync.NS_ATOM);`
	`270`	`+ String lnLength = ln.getAttributeValue("length");`
`271`	`271`	`if (lnLength != null && !"".equals(length))`
`272`	`272`	`{`
`273`	`273`	`long lnl = Long.parseLong(lnLength);`
`274`	`274`	`link.setLength(lnl);`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`// modified`
`278`		`- String modified = ln.getAttributeValue("modified", ResourceSync.NS_ATOM);`
	`278`	`+ String modified = ln.getAttributeValue("modified");`
`279`	`279`	`if (modified != null && !"".equals(modified))`
`280`	`280`	`{`
`281`	`281`	`Date modDate = ResourceSync.DATE_FORMAT.parse(modified);`
`282`	`282`	`link.setModified(modDate);`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`// path`
`286`		`- String lnPath = ln.getAttributeValue("path", ResourceSync.NS_RS);`
	`286`	`+ String lnPath = ln.getAttributeValue("path");`
`287`	`287`	`if (lnPath != null && !"".equals(lnPath))`
`288`	`288`	`{`
`289`	`289`	`link.setPath(lnPath);`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`// pri`
`293`		`- String pri = ln.getAttributeValue("pri"); // FIXME: namespace?`
	`293`	`+ String pri = ln.getAttributeValue("pri");`
`294`	`294`	`if (pri != null && !"".equals(pri))`
`295`	`295`	`{`
`296`	`296`	`link.setPri(Integer.parseInt(pri));`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`// type`
`300`		`- String lnType = ln.getAttributeValue("type", ResourceSync.NS_ATOM);`
	`300`	`+ String lnType = ln.getAttributeValue("type");`
`301`	`301`	`if (lnType != null && !"".equals(lnType))`
`302`	`302`	`{`
`303`	`303`	`link.setType(lnType);`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`// encoding`
`307`		`- String lnEncoding = ln.getAttributeValue("encoding"); // FIXME: namespace?`
	`307`	`+ String lnEncoding = ln.getAttributeValue("encoding");`
`308`	`308`	`if (lnEncoding != null && !"".equals(lnEncoding))`
`309`	`309`	`{`
`310`	`310`	`link.setEncoding(lnEncoding);`
`@@ -343,38 +343,38 @@ public Element getElement()`
`343`	`343`	`boolean trip = false;`
`344`	`344`	`if (this.capability != null)`
`345`	`345`	`{`
`346`		`- md.setAttribute("capability", this.capability, ResourceSync.NS_RS);`
	`346`	`+ md.setAttribute("capability", this.capability);`
`347`	`347`	`trip = true;`
`348`	`348`	`}`
`349`	`349`	`if (this.change != null)`
`350`	`350`	`{`
`351`		`- md.setAttribute("change", this.change, ResourceSync.NS_RS);`
	`351`	`+ md.setAttribute("change", this.change);`
`352`	`352`	`trip = true;`
`353`	`353`	`}`
`354`	`354`	`String hashAttr = this.getHashAttr(this.hashes);`
`355`	`355`	`if (!"".equals(hashAttr))`
`356`	`356`	`{`
`357`		`- md.setAttribute("hash", hashAttr, ResourceSync.NS_ATOM);`
	`357`	`+ md.setAttribute("hash", hashAttr);`
`358`	`358`	`trip = true;`
`359`	`359`	`}`
`360`	`360`	`if (this.length > -1)`
`361`	`361`	`{`
`362`		`- md.setAttribute("length", Long.toString(this.length), ResourceSync.NS_ATOM);`
	`362`	`+ md.setAttribute("length", Long.toString(this.length));`
`363`	`363`	`trip = true;`
`364`	`364`	`}`
`365`	`365`	`if (this.path != null)`
`366`	`366`	`{`
`367`		`- md.setAttribute("path", this.path, ResourceSync.NS_RS);`
	`367`	`+ md.setAttribute("path", this.path);`
`368`	`368`	`trip = true;`
`369`	`369`	`}`
`370`	`370`	`if (this.type != null)`
`371`	`371`	`{`
`372`		`- md.setAttribute("type", this.type, ResourceSync.NS_ATOM);`
	`372`	`+ md.setAttribute("type", this.type);`
`373`	`373`	`trip = true;`
`374`	`374`	`}`
`375`	`375`	`if (this.encoding != null)`
`376`	`376`	`{`
`377`		`- md.setAttribute("encoding", this.encoding); // FIXME: namespace? This comes from the HTTP spec`
	`377`	`+ md.setAttribute("encoding", this.encoding);`
`378`	`378`	`trip = true;`
`379`	`379`	`}`
`380`	`380`	`if (trip)`
`@@ -390,47 +390,47 @@ public Element getElement()`
`390`	`390`	`String lnHash = this.getHashAttr(ln.getHashes());`
`391`	`391`	`if (!"".equals(lnHash))`
`392`	`392`	`{`
`393`		`- link.setAttribute("hash", lnHash, ResourceSync.NS_ATOM);`
	`393`	`+ link.setAttribute("hash", lnHash);`
`394`	`394`	`trip = true;`
`395`	`395`	`}`
`396`	`396`	`if (ln.getHref() != null)`
`397`	`397`	`{`
`398`		`- link.setAttribute("href", ln.getHref(), ResourceSync.NS_ATOM);`
	`398`	`+ link.setAttribute("href", ln.getHref());`
`399`	`399`	`trip = true;`
`400`	`400`	`}`
`401`	`401`	`if (ln.getLength() > -1)`
`402`	`402`	`{`
`403`		`- link.setAttribute("length", Long.toString(ln.getLength()), ResourceSync.NS_ATOM);`
	`403`	`+ link.setAttribute("length", Long.toString(ln.getLength()));`
`404`	`404`	`trip = true;`
`405`	`405`	`}`
`406`	`406`	`if (ln.getModified() != null)`
`407`	`407`	`{`
`408`		`- link.setAttribute("modified", ResourceSync.DATE_FORMAT.format(ln.getModified()), ResourceSync.NS_ATOM);`
	`408`	`+ link.setAttribute("modified", ResourceSync.DATE_FORMAT.format(ln.getModified()));`
`409`	`409`	`trip = true;`
`410`	`410`	`}`
`411`	`411`	`if (ln.getPath() != null)`
`412`	`412`	`{`
`413`		`- link.setAttribute("path", ln.getPath(), ResourceSync.NS_RS);`
	`413`	`+ link.setAttribute("path", ln.getPath());`
`414`	`414`	`trip = true;`
`415`	`415`	`}`
`416`	`416`	`if (ln.getRel() != null)`
`417`	`417`	`{`
`418`		`- link.setAttribute("rel", ln.getRel(), ResourceSync.NS_ATOM);`
	`418`	`+ link.setAttribute("rel", ln.getRel());`
`419`	`419`	`trip = true;`
`420`	`420`	`}`
`421`	`421`	`if (ln.getPri() > 0)`
`422`	`422`	`{`
`423`		`- link.setAttribute("pri", Integer.toString(ln.getPri())); // FIXME: namespace?`
	`423`	`+ link.setAttribute("pri", Integer.toString(ln.getPri()));`
`424`	`424`	`trip = true;`
`425`	`425`	`}`
`426`	`426`	`if (ln.getType() != null)`
`427`	`427`	`{`
`428`		`- link.setAttribute("type", ln.getType(), ResourceSync.NS_ATOM);`
	`428`	`+ link.setAttribute("type", ln.getType());`
`429`	`429`	`trip = true;`
`430`	`430`	`}`
`431`	`431`	`if (ln.getEncoding() != null)`
`432`	`432`	`{`
`433`		`- link.setAttribute("encoding", ln.getEncoding()); // FIXME: namespace?`
	`433`	`+ link.setAttribute("encoding", ln.getEncoding());`
`434`	`434`	`trip = true;`
`435`	`435`	`}`
`436`	`436`	`if (trip)`
Original file line number	Diff line number	Diff line change
`@@ -174,25 +174,25 @@ public void resourceSyncEntry()`
`174`	`174`
`175`	`175`	`Element md = element.getChild("md", ResourceSync.NS_RS);`
`176`	`176`
`177`		`- String cap = md.getAttributeValue("capability", ResourceSync.NS_RS);`
	`177`	`+ String cap = md.getAttributeValue("capability");`
`178`	`178`	`assert cap.equals(ResourceSync.CAPABILITY_RESOURCELIST);`
`179`	`179`
`180`		`- String change = md.getAttributeValue("change", ResourceSync.NS_RS);`
	`180`	`+ String change = md.getAttributeValue("change");`
`181`	`181`	`assert change.equals(ResourceSync.CHANGE_CREATED);`
`182`	`182`
`183`		`- String length = md.getAttributeValue("length", ResourceSync.NS_ATOM);`
	`183`	`+ String length = md.getAttributeValue("length");`
`184`	`184`	`assert length.equals("987");`
`185`	`185`
`186`		`- String path = md.getAttributeValue("path", ResourceSync.NS_RS);`
	`186`	`+ String path = md.getAttributeValue("path");`
`187`	`187`	`assert path.equals("/path/to/file");`
`188`	`188`
`189`		`- String type = md.getAttributeValue("type", ResourceSync.NS_ATOM);`
	`189`	`+ String type = md.getAttributeValue("type");`
`190`	`190`	`assert type.equals("application/pdf");`
`191`	`191`
`192`	`192`	`String encoding = md.getAttributeValue("encoding");`
`193`	`193`	`assert encoding.equals("utf-8");`
`194`	`194`
`195`		`- String hashAttr = md.getAttributeValue("hash", ResourceSync.NS_ATOM);`
	`195`	`+ String hashAttr = md.getAttributeValue("hash");`
`196`	`196`	`String[] hashParts = hashAttr.split(" ");`
`197`	`197`	`assert hashParts.length == 2;`
`198`	`198`	`seenMd5 = false;`
`@@ -220,19 +220,19 @@ public void resourceSyncEntry()`
`220`	`220`	`collection = false;`
`221`	`221`	`for (Element linkEl : linkEls)`
`222`	`222`	`{`
`223`		`- if (linkEl.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://describes"))`
	`223`	`+ if (linkEl.getAttributeValue("href").equals("http://describes"))`
`224`	`224`	`{`
`225`		`- assert linkEl.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_DESCRIBES);`
`226`		`- assert linkEl.getAttributeValue("type", ResourceSync.NS_ATOM).equals("text/html");`
`227`		`- assert linkEl.getAttributeValue("length", ResourceSync.NS_ATOM).equals("543");`
	`225`	`+ assert linkEl.getAttributeValue("rel").equals(ResourceSync.REL_DESCRIBES);`
	`226`	`+ assert linkEl.getAttributeValue("type").equals("text/html");`
	`227`	`+ assert linkEl.getAttributeValue("length").equals("543");`
`228`	`228`	`describes = true;`
`229`	`229`	`}`
`230`		`- if (linkEl.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://other.collection/"))`
	`230`	`+ if (linkEl.getAttributeValue("href").equals("http://other.collection/"))`
`231`	`231`	`{`
`232`		`- assert linkEl.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_COLLECTION);`
	`232`	`+ assert linkEl.getAttributeValue("rel").equals(ResourceSync.REL_COLLECTION);`
`233`	`233`	`other_collection = true;`
`234`	`234`	`}`
`235`		`- if (linkEl.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://collection"))`
	`235`	`+ if (linkEl.getAttributeValue("href").equals("http://collection"))`
`236`	`236`	`{`
`237`	`237`	`collection = true;`
`238`	`238`	`}`
`@@ -317,10 +317,10 @@ public void resourceSyncDocument()`
`317`	`317`
`318`	`318`	`Element md = element.getChild("md", ResourceSync.NS_RS);`
`319`	`319`
`320`		`- String cap = md.getAttributeValue("capability", ResourceSync.NS_RS);`
	`320`	`+ String cap = md.getAttributeValue("capability");`
`321`	`321`	`assert cap.equals(ResourceSync.CAPABILITY_CHANGEDUMP);`
`322`	`322`
`323`		`- String mod = md.getAttributeValue("modified", ResourceSync.NS_ATOM);`
	`323`	`+ String mod = md.getAttributeValue("modified");`
`324`	`324`	`assert mod.equals(nowStr);`
`325`	`325`
`326`	`326`	`List<Element> linkEls = element.getChildren("ln", ResourceSync.NS_RS);`
`@@ -329,14 +329,14 @@ public void resourceSyncDocument()`
`329`	`329`	`desc = false;`
`330`	`330`	`for (Element link : linkEls)`
`331`	`331`	`{`
`332`		`- if (link.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_DESCRIBED_BY))`
	`332`	`+ if (link.getAttributeValue("rel").equals(ResourceSync.REL_DESCRIBED_BY))`
`333`	`333`	`{`
`334`		`- assert link.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://describedby");`
	`334`	`+ assert link.getAttributeValue("href").equals("http://describedby");`
`335`	`335`	`descby = true;`
`336`	`336`	`}`
`337`		`- if (link.getAttributeValue("rel", ResourceSync.NS_ATOM).equals(ResourceSync.REL_DESCRIBES))`
	`337`	`+ if (link.getAttributeValue("rel").equals(ResourceSync.REL_DESCRIBES))`
`338`	`338`	`{`
`339`		`- assert link.getAttributeValue("href", ResourceSync.NS_ATOM).equals("http://describes");`
	`339`	`+ assert link.getAttributeValue("href").equals("http://describes");`
`340`	`340`	`desc = true;`
`341`	`341`	`}`
`342`	`342`	`}`
`@@ -352,13 +352,13 @@ public void resourceSyncDocument()`
`352`	`352`	`if (entry.getChild("loc", ResourceSync.NS_SITEMAP).getText().equals("http://entry1"))`
`353`	`353`	`{`
`354`	`354`	`Element m = entry.getChild("md", ResourceSync.NS_RS);`
`355`		`- assert m.getAttributeValue("type", ResourceSync.NS_ATOM).equals("text/xml");`
	`355`	`+ assert m.getAttributeValue("type").equals("text/xml");`
`356`	`356`	`saw1 = true;`
`357`	`357`	`}`
`358`	`358`	`if (entry.getChild("loc", ResourceSync.NS_SITEMAP).getText().equals("http://entry2"))`
`359`	`359`	`{`
`360`	`360`	`Element m = entry.getChild("md", ResourceSync.NS_RS);`
`361`		`- assert m.getAttributeValue("change", ResourceSync.NS_RS).equals(ResourceSync.CHANGE_UPDATED);`
	`361`	`+ assert m.getAttributeValue("change").equals(ResourceSync.CHANGE_UPDATED);`
`362`	`362`	`saw2 = true;`
`363`	`363`	`}`
`364`	`364`	`}`