Author: etnu
Date: Thu Nov 20 19:19:40 2008
New Revision: 719459
URL: http://svn.apache.org/viewvc?rev=719459&view=rev
Log:
Moved DomUtil into common for reuse and added tests. Also added a new utility
method for getting the last named element as well as the first.
Added:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
- copied, changed from r719366,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DomUtil.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java
Removed:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DomUtil.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
Copied:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
(from r719366,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DomUtil.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DomUtil.java&r1=719366&r2=719459&rev=719459&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DomUtil.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
Thu Nov 20 19:19:40 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.parse;
+package org.apache.shindig.common.xml;
import com.google.common.collect.Lists;
@@ -34,6 +34,9 @@
* Utility functions for navigating DOM
*/
public class DomUtil {
+
+ private DomUtil() {}
+
/**
* @return first child node matching the specified name
*/
@@ -48,6 +51,20 @@
return null;
}
+ /**
+ * @return last child node matching the specified name.
+ */
+ public static Node getLastNamedChildNode(Node root, String nodeName) {
+ Node current = root.getLastChild();
+ while (current != null) {
+ if (current.getNodeName().equalsIgnoreCase(nodeName)) {
+ return current;
+ }
+ current = current.getPreviousSibling();
+ }
+ return null;
+ }
+
public static List<Element> getElementsByTagNameCaseInsensitive(Document doc,
final Set<String> lowerCaseNames) {
final List<Element> result = Lists.newArrayList();
Added:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java?rev=719459&view=auto
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java
(added)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/xml/DomUtilTest.java
Thu Nov 20 19:19:40 2008
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shindig.common.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.apache.shindig.common.xml.DomUtil;
+import org.apache.shindig.common.xml.XmlException;
+import org.apache.shindig.common.xml.XmlUtil;
+
+import com.google.common.collect.ImmutableSet;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.List;
+
+public class DomUtilTest {
+ private static final String XML =
+ "<root>" +
+ " <other>whatever</other>" +
+ " <element>zero</element>" +
+ " <ElEmEnT>one</ElEmEnT>" +
+ " <element>two</element>" +
+ " <other>not real</other>" +
+ "</root>";
+
+ private static Element root;
+
+ @BeforeClass
+ public static void createRoot() throws XmlException {
+ root = XmlUtil.parse(XML);
+ }
+
+ @Test
+ public void getFirstNamedChildNode() {
+ assertEquals("zero", DomUtil.getFirstNamedChildNode(root,
"element").getTextContent());
+ assertEquals("whatever", DomUtil.getFirstNamedChildNode(root,
"other").getTextContent());
+ assertNull("Did not return null for missing element.",
+ DomUtil.getFirstNamedChildNode(root, "fake"));
+ }
+
+ @Test
+ public void getLastNamedChildNode() {
+ assertEquals("two", DomUtil.getLastNamedChildNode(root,
"element").getTextContent());
+ assertEquals("not real", DomUtil.getLastNamedChildNode(root,
"other").getTextContent());
+ assertNull("Did not return null for missing element.",
+ DomUtil.getLastNamedChildNode(root, "fake"));
+ }
+
+ @Test
+ public void getElementsByTagNameCaseInsensitive() {
+ Document doc = root.getOwnerDocument();
+ List<Element> elements
+ = DomUtil.getElementsByTagNameCaseInsensitive(doc,
ImmutableSet.of("element"));
+ assertEquals("zero", elements.get(0).getTextContent());
+ assertEquals("one", elements.get(1).getTextContent());
+ assertEquals("two", elements.get(2).getTextContent());
+ }
+}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java?rev=719459&r1=719458&r2=719459&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
Thu Nov 20 19:19:40 2008
@@ -20,6 +20,7 @@
import org.apache.shindig.common.cache.Cache;
import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.util.HashUtil;
+import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java?rev=719459&r1=719458&r2=719459&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java
Thu Nov 20 19:19:40 2008
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.parse.nekohtml;
+import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.parse.HtmlSerializer;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=719459&r1=719458&r2=719459&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
Thu Nov 20 19:19:40 2008
@@ -326,6 +326,7 @@
outputFormat.setPreserveEmptyAttributes(false);
}
+ @Override
public String serializeImpl(Document doc) {
StringWriter sw = createWriter(doc);
HTMLSerializer serializer = new HTMLSerializer(sw, outputFormat) {
@@ -336,7 +337,7 @@
this._printer.printText(s);
}
};
-
+
try {
serializer.serialize(doc);
return sw.toString();
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java?rev=719459&r1=719458&r2=719459&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingContentRewriter.java
Thu Nov 20 19:19:40 2008
@@ -21,6 +21,7 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.ContainerConfig;
import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
@@ -33,7 +34,6 @@
import org.apache.shindig.gadgets.UrlGenerator;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
-import org.apache.shindig.gadgets.parse.DomUtil;
import org.apache.shindig.gadgets.preload.PreloadException;
import org.apache.shindig.gadgets.preload.Preloads;
import org.apache.shindig.gadgets.rewrite.ContentRewriter;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java?rev=719459&r1=719458&r2=719459&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
Thu Nov 20 19:19:40 2008
@@ -19,10 +19,10 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.Utf8UrlCoder;
+import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
-import org.apache.shindig.gadgets.parse.DomUtil;
import org.apache.shindig.gadgets.servlet.ProxyBase;
import org.apache.shindig.gadgets.spec.View;
