Author: etnu
Date: Wed Apr 1 23:57:38 2009
New Revision: 761109
URL: http://svn.apache.org/viewvc?rev=761109&view=rev
Log:
Another URI -> Uri swap.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java?rev=761109&r1=761108&r2=761109&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
Wed Apr 1 23:57:38 2009
@@ -17,9 +17,10 @@
*/
package org.apache.shindig.gadgets;
+import org.apache.shindig.common.uri.Uri;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
@@ -28,7 +29,6 @@
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
-import java.net.URI;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
@@ -108,8 +108,7 @@
}
}
- /** {...@inheritdoc} */
- public boolean isBlacklisted(URI gadgetUri) {
+ public boolean isBlacklisted(Uri gadgetUri) {
String uriString = gadgetUri.toString().toLowerCase();
if (exactMatches.contains(uriString)) {
return true;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java?rev=761109&r1=761108&r2=761109&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetBlacklist.java
Wed Apr 1 23:57:38 2009
@@ -17,22 +17,20 @@
*/
package org.apache.shindig.gadgets;
-import com.google.inject.ImplementedBy;
+import org.apache.shindig.common.uri.Uri;
-import java.net.URI;
+import com.google.inject.ImplementedBy;
/**
* A blacklist for gadgets. Gadgets found to be blacklisted cannot be rendered.
*/
-
@ImplementedBy(BasicGadgetBlacklist.class)
-
public interface GadgetBlacklist {
/**
* @return true if {...@code gadgetUri} was found in this blacklist, false
* otherwise.
*/
- boolean isBlacklisted(URI gadgetUri);
+ boolean isBlacklisted(Uri gadgetUri);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java?rev=761109&r1=761108&r2=761109&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/process/Processor.java
Wed Apr 1 23:57:38 2009
@@ -72,7 +72,7 @@
throw new ProcessingException("Unsupported scheme (must be http or
https).");
}
- if (blacklist.isBlacklisted(context.getUrl().toJavaUri())) {
+ if (blacklist.isBlacklisted(context.getUrl())) {
LOG.info("Attempted to render blacklisted gadget: " + context.getUrl());
throw new ProcessingException("The requested gadget is unavailable");
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java?rev=761109&r1=761108&r2=761109&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
Wed Apr 1 23:57:38 2009
@@ -18,23 +18,24 @@
*/
package org.apache.shindig.gadgets;
+import org.apache.shindig.common.uri.Uri;
+
import junit.framework.TestCase;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.net.URI;
import java.util.regex.PatternSyntaxException;
public class BasicGadgetBlacklistTest extends TestCase {
- private URI someUri;
+ private Uri someUri;
@Override
protected void setUp() throws Exception {
super.setUp();
- someUri = new URI("http://bla.com/foo.xml";);
+ someUri = Uri.parse("http://bla.com/foo.xml";);
}
private GadgetBlacklist createBlacklist(String contents) throws IOException {
@@ -53,15 +54,15 @@
public void testExactMatches() throws Exception {
GadgetBlacklist bl = createBlacklist(someUri + "\nhttp://baz.com/foo.xml";);
- assertFalse(bl.isBlacklisted(new URI("http://random.com/uri.xml";)));
+ assertFalse(bl.isBlacklisted(Uri.parse("http://random.com/uri.xml";)));
assertTrue(bl.isBlacklisted(someUri));
}
public void testExactMatchesWithCaseMixture() throws Exception {
GadgetBlacklist bl = createBlacklist(someUri + "\nhttp://BAZ.com/foo.xml";);
assertTrue(bl.isBlacklisted(someUri));
- assertTrue(bl.isBlacklisted(new URI("http://BLA.com/foo.xml";)));
- assertTrue(bl.isBlacklisted(new URI("http://baz.com/foo.xml";)));
+ assertTrue(bl.isBlacklisted(Uri.parse("http://BLA.com/foo.xml";)));
+ assertTrue(bl.isBlacklisted(Uri.parse("http://baz.com/foo.xml";)));
}
public void testIgnoredCommentsAndWhitespace() throws Exception {
@@ -73,8 +74,8 @@
public void testRegexpMatches() throws Exception {
GadgetBlacklist bl = createBlacklist("REGEXP http://bla.com/.*";);
assertTrue(bl.isBlacklisted(someUri));
- assertTrue(bl.isBlacklisted(new URI("http://bla.com/bar.xml";)));
- assertFalse(bl.isBlacklisted(new URI("http://blo.com/bar.xml";)));
+ assertTrue(bl.isBlacklisted(Uri.parse("http://bla.com/bar.xml";)));
+ assertFalse(bl.isBlacklisted(Uri.parse("http://blo.com/bar.xml";)));
}
public void testInvalidRegularExpression() throws Exception {
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java?rev=761109&r1=761108&r2=761109&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
Wed Apr 1 23:57:38 2009
@@ -37,8 +37,6 @@
import org.junit.Before;
import org.junit.Test;
-import java.net.URI;
-
public class ProcessorTest {
private static final Uri SPEC_URL =
Uri.parse("http://example.org/gadget.xml";);
private static final Uri TYPE_URL_HREF =
Uri.parse("http://example.org/gadget.php";);
@@ -155,7 +153,7 @@
protected FakeBlacklist() {
}
- public boolean isBlacklisted(URI gadgetUri) {
+ public boolean isBlacklisted(Uri gadgetUri) {
wasChecked = true;
return isBlacklisted;
}
