Author: johnh
Date: Mon May 24 21:32:33 2010
New Revision: 947820
URL: http://svn.apache.org/viewvc?rev=947820&view=rev
Log:
Misc minor syntactical and IDE tweaks.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=947820&r1=947819&r2=947820&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
Mon May 24 21:32:33 2010
@@ -138,6 +138,7 @@ public class DefaultProxyUriManager impl
return uri.toUri();
}
+ @SuppressWarnings("deprecation")
public ProxyUri process(Uri uriIn) throws GadgetException {
UriStatus status = UriStatus.BAD_URI;
Uri uri = null;
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java?rev=947820&r1=947819&r2=947820&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
Mon May 24 21:32:33 2010
@@ -68,7 +68,7 @@ public class FeatureRegistryTest {
private static int resourceIdx = 0;
private FeatureResourceLoader resourceLoader;
private ResourceMock resourceMock;
- FeatureRegistry registry;
+ private FeatureRegistry registry;
private Map<String, String> lastAttribs;
@Before
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java?rev=947820&r1=947819&r2=947820&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
Mon May 24 21:32:33 2010
@@ -43,11 +43,9 @@ public abstract class AbstractParsingTes
protected String loadFile(String path) throws IOException {
InputStream is =
this.getClass().getClassLoader().getResourceAsStream(path);
// ENABLE THIS if you have troubles in your IDE loading resources.
- /*
- if (is == null) {
- is = new FileInputStream(new
File("/shindig/base/java/gadgets/src/test/resources/" + path));
- }
- */
+ /*if (is == null) {
+ is = new FileInputStream(new File("/path/to/your/files/" + path));
+ }*/
return IOUtils.toString(is);
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=947820&r1=947819&r2=947820&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
Mon May 24 21:32:33 2010
@@ -63,8 +63,6 @@ public class HttpPreloaderTest extends P
}
return oauthFetcher.fetch(request);
}
-
- public void normalizeProtocol(HttpRequest request) {}
};
private void checkRequest(HttpRequest request) {
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java?rev=947820&r1=947819&r2=947820&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
Mon May 24 21:32:33 2010
@@ -29,7 +29,6 @@ import org.apache.shindig.config.Contain
import org.apache.shindig.expressions.Expressions;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetELResolver;
-import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
@@ -508,7 +507,5 @@ public class PipelinedDataPreloaderTest
requests.add(request);
return response;
}
-
- public void normalizeProtocol(HttpRequest request) throws GadgetException
{}
}
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java?rev=947820&r1=947819&r2=947820&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/ProxyRendererTest.java
Mon May 24 21:32:33 2010
@@ -316,8 +316,6 @@ public class ProxyRendererTest {
public HttpRequest getLastHttpRequest() {
return lastHttpRequest;
}
-
- public void normalizeProtocol(HttpRequest request) throws GadgetException
{ }
}
private static class FakePipelineExecutor extends PipelineExecutor {
Modified:
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=947820&r1=947819&r2=947820&view=diff
==============================================================================
---
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
(original)
+++
shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
Mon May 24 21:32:33 2010
@@ -39,7 +39,6 @@ import org.json.JSONObject;
import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -195,7 +194,7 @@ public class EndToEndTest {
@Test
public void testCajaFailUrlGadgets() throws Exception {
try {
- HtmlPage page = executePageTest("failCajaUrlTest", null, /* caja */
true);
+ executePageTest("failCajaUrlTest", null, /* caja */ true);
} catch (FailingHttpStatusCodeException e) {
assertEquals(HttpServletResponse.SC_BAD_REQUEST, e.getStatusCode());
}
