Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java?rev=747092&r1=747091&r2=747092&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java Mon Feb 23 17:58:08 2009 @@ -64,8 +64,7 @@ return null; // null below is for the callbackUrl, which we don't have in the db OAuthConsumer consumer = new OAuthConsumer(null, consumerKey, consumerSecret, SERVICE_PROVIDER); - if (consumer != null) - consumer.setProperty("samplecontainer-attribute", "value"); + consumer.setProperty("samplecontainer-attribute", "value"); return consumer;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java?rev=747092&r1=747091&r2=747092&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java Mon Feb 23 17:58:08 2009 @@ -75,7 +75,7 @@ } else if (path.endsWith("accessToken")) { createAccessToken(servletRequest, servletResponse); } else { - servletResponse.sendError(servletResponse.SC_NOT_FOUND, "unknown Url"); + servletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown Url"); } } catch (OAuthException e) { handleException(e, servletRequest, servletResponse, true); @@ -120,7 +120,8 @@ OAuthEntry entry = dataStore.getEntry(requestMessage.getToken()); if (entry == null) { - servletResponse.sendError(servletResponse.SC_NOT_FOUND, "Authentication Token not found"); + servletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "Authentication Token not found"); + return; } OAuthConsumer consumer = dataStore.getConsumer(entry.consumerKey); Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=747092&r1=747091&r2=747092&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Mon Feb 23 17:58:08 2009 @@ -252,7 +252,7 @@ result.add(filterFields(person, fields, Person.class)); } - if (GroupId.Type.self.equals(groupId.getType()) && 0 == result.size()) { + if (GroupId.Type.self == groupId.getType() && result.isEmpty()) { throw new SocialSpiException(ResponseError.BAD_REQUEST, "Person not found"); } @@ -261,7 +261,7 @@ Collections.sort(result, NAME_COMPARATOR); } - if (options.getSortOrder().equals(SortOrder.descending)) { + if (options.getSortOrder() == SortOrder.descending) { Collections.reverse(result); } Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=747092&r1=747091&r2=747092&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Mon Feb 23 17:58:08 2009 @@ -49,6 +49,9 @@ import java.util.List; import java.util.Map; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertTrue; + public abstract class AbstractLargeRestfulTests extends EasyMockTestCase { protected static final String XMLSCHEMA = " xmlns=\"http://ns.opensocial.org/2008/opensocial\"; \n" + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; \n" @@ -79,7 +82,6 @@ @Override protected void setUp() throws Exception { super.setUp(); - super.setUp(); Injector injector = Guice.createInjector(new SocialApiTestsGuiceModule()); servlet = new DataServiceServlet(); Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java?rev=747092&r1=747091&r2=747092&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java Mon Feb 23 17:58:08 2009 @@ -215,8 +215,8 @@ // } /** - * @param endOutput - * @param startOutput + * @param end + * @param start * @param testSize * @return */
