Author: lindner
Date: Fri Jan 23 00:31:13 2009
New Revision: 736970
URL: http://svn.apache.org/viewvc?rev=736970&view=rev
Log:
SHINDIG-808 | Modified Patch from Vincent Siveton | Remove duplicate
EasyMockTestCase, also get rid of hamcrest dependency, use Objects.equal,
Objects.hashCode in various places
Added:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
(contents, props changed)
- copied, changed from r736834,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java
Removed:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Check.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CheckTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/EasyMockTestCase.java
Modified:
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Fri Jan 23 00:31:13 2009
@@ -93,10 +93,6 @@
<groupId>commons-lang</groupId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
Fri Jan 23 00:31:13 2009
@@ -28,15 +28,11 @@
* Utilities for dealing with character set encoding.
*/
public class CharsetUtil {
-
+
/**
* UTF-8 Charset.
*/
- public static final Charset UTF8;
-
- static {
- UTF8 = Charset.forName("UTF-8");
- }
+ public static final Charset UTF8 = Charset.forName("UTF-8");
/**
* @return UTF-8 byte array for the input string.
@@ -47,5 +43,6 @@
}
ByteBuffer bb = UTF8.encode(s);
return ArrayUtils.subarray(bb.array(), 0, bb.limit());
+
}
}
Copied:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
(from r736834,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java?p2=incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java&r1=736834&r2=736970&rev=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
Fri Jan 23 00:31:13 2009
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.gadgets;
+package org.apache.shindig.common;
import com.google.common.collect.Lists;
@@ -23,6 +23,7 @@
import org.easymock.classextension.EasyMock;
+import java.lang.reflect.Method;
import java.util.List;
@@ -64,6 +65,37 @@
}
/**
+ * Creates a nice mock object for the given class, adds it to the internal
+ * list of all mocks, and returns it.
+ *
+ * @param clazz Class to be mocked.
+ * @return A mock instance of the given type.
+ **/
+
+
+ protected <T> T mock(Class<T> clazz, Method[] methods) {
+ return mock(clazz, methods, false);
+ }
+
+
+ /**
+ * Creates a strict mock object for the given class, adds it to the internal
+ * list of all mocks, and returns it.
+ *
+ * @param clazz Class to be mocked.
+ * @return A mock instance of the given type.
+ **/
+
+ protected <T> T mock(Class<T> clazz, Method[] methods, boolean strict) {
+ T m = strict ? EasyMock.createMock(clazz, methods)
+ : EasyMock.createNiceMock(clazz, methods);
+ mocks.add(m);
+
+ return m;
+ }
+
+ /**
+ /**
* Sets each mock to replay mode in the order they were created. Call this
after setting
* all of the mock expectations for a test.
*/
Propchange:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/EasyMockTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Fri Jan 23 00:31:13 2009
@@ -60,17 +60,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <!-- A common distribution of hamcrest library includes .java
files that are newer than the corresponding
- .class files. Because sourcepath defaults to classpath, if we do
not set this, then we end up with some
- of hamcrest's classes in our jar. This is silly and not what we
want, so we explicitly set sourcepath
- to something that is not a directory. If you have a directory
on your machine that is called
- /not_a_directory and contains .java files that are newer than
.class files with a similar name that are
- imported by our code, then you will probably experience trouble.
-->
- <sourcepath>/not_a_directory</sourcepath>
- </compilerArguments>
- </configuration>
</plugin>
</plugins>
<resources>
@@ -168,5 +157,11 @@
<artifactId>jetty</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
Fri Jan 23 00:31:13 2009
@@ -23,7 +23,6 @@
import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.cache.SoftExpiringCache;
import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.common.util.Check;
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -32,6 +31,7 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
+import com.google.common.base.Preconditions;
import java.net.URI;
import java.util.logging.Logger;
@@ -98,7 +98,7 @@
// Enforce negative caching.
if (cached != null) {
spec = cached.obj;
- Check.notNull(spec);
+ Preconditions.checkNotNull(spec);
} else {
// We create this dummy spec to avoid the cost of re-parsing when a
remote site is out.
spec = new GadgetSpec(uri, ERROR_SPEC);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
Fri Jan 23 00:31:13 2009
@@ -20,13 +20,13 @@
package org.apache.shindig.gadgets.oauth;
import com.google.common.collect.Lists;
+import com.google.common.base.Preconditions;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.Pair;
import org.apache.shindig.common.Pairs;
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypterException;
-import org.apache.shindig.common.util.Check;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
@@ -248,10 +248,8 @@
* Create an exception and record information about the exception to be
returned to the gadget.
*/
public OAuthRequestException oauthRequestException(String error, String
errorText) {
- Check.notNull(error);
- Check.notNull(errorText);
- this.error = error;
- this.errorText = errorText;
+ this.error = Preconditions.checkNotNull(error);
+ this.errorText = Preconditions.checkNotNull(errorText);
return new OAuthRequestException('[' + error + ',' + errorText + ']');
}
@@ -260,10 +258,8 @@
*/
public OAuthRequestException oauthRequestException(String error, String
errorText,
Throwable cause) {
- Check.notNull(error);
- Check.notNull(errorText);
- this.error = error;
- this.errorText = errorText;
+ this.error = Preconditions.checkNotNull(error);
+ this.errorText = Preconditions.checkNotNull(errorText);
return new OAuthRequestException('[' + error + ',' + errorText + ']',
cause);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
Fri Jan 23 00:31:13 2009
@@ -19,7 +19,6 @@
package org.apache.shindig.gadgets.render;
import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.common.util.Check;
import com.google.common.base.Preconditions;
@@ -63,7 +62,7 @@
* @return The content to render. Only available when status is OK.
*/
public String getContent() {
- Check.eq(status, Status.OK, "Only available when status is OK.");
+ Preconditions.checkState(status == Status.OK, "Only available when status
is OK.");
return content;
}
@@ -71,7 +70,7 @@
* @return The error message for rendering. Only available when status is
ERROR.
*/
public String getErrorMessage() {
- Check.eq(status, Status.ERROR, "Only available when status is ERROR.");
+ Preconditions.checkState(status == Status.ERROR, "Only available when
status is ERROR.");
return errorMessage;
}
@@ -79,7 +78,7 @@
* @return The error message for rendering. Only available when status is
ERROR.
*/
public Uri getRedirect() {
- Check.eq(status, Status.MUST_REDIRECT, "Only available when status is
MUST_REDIRECT.");
+ Preconditions.checkState(status == Status.MUST_REDIRECT, "Only available
when status is MUST_REDIRECT.");
return redirect;
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java
Fri Jan 23 00:31:13 2009
@@ -23,6 +23,7 @@
import static org.easymock.EasyMock.isA;
import org.apache.shindig.common.ContainerConfig;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
Fri Jan 23 00:31:13 2009
@@ -25,6 +25,7 @@
import static org.easymock.EasyMock.isA;
import org.apache.shindig.common.ContainerConfig;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
Fri Jan 23 00:31:13 2009
@@ -21,6 +21,7 @@
import static org.easymock.EasyMock.expect;
import org.apache.shindig.common.ContainerConfig;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpRequest;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
Fri Jan 23 00:31:13 2009
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets;
import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherConfigTest.java
Fri Jan 23 00:31:13 2009
@@ -19,7 +19,7 @@
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.common.util.TimeSource;
-import org.apache.shindig.gadgets.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.gadgets.http.HttpCache;
import org.junit.Test;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
Fri Jan 23 00:31:13 2009
@@ -18,8 +18,8 @@
package org.apache.shindig.gadgets.rewrite;
import org.apache.shindig.common.PropertiesModule;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.gadgets.EasyMockTestCase;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
Fri Jan 23 00:31:13 2009
@@ -20,7 +20,7 @@
import static org.easymock.EasyMock.expect;
-import org.apache.shindig.gadgets.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import javax.servlet.http.HttpServletRequest;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
Fri Jan 23 00:31:13 2009
@@ -23,7 +23,7 @@
import org.apache.shindig.common.util.DateUtil;
import org.apache.shindig.common.util.FakeTimeSource;
-import org.apache.shindig.gadgets.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.gadgets.LockedDomainService;
import org.apache.shindig.gadgets.http.RequestPipeline;
import org.apache.shindig.gadgets.rewrite.CaptureRewriter;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
Fri Jan 23 00:31:13 2009
@@ -19,8 +19,8 @@
import java.util.Date;
-import org.apache.commons.lang.StringUtils;
import org.apache.shindig.social.opensocial.service.RequestItem;
+import com.google.common.base.Objects;
public class CollectionOptions {
private String sortBy;
@@ -107,7 +107,7 @@
* filter. The exception is the isFriendsWith filter where this contains the
value of the id who
* the all the results need to be friends with.
*
- * @return
+ * @return the filter value
*/
public String getFilterValue() {
return filterValue;
@@ -119,7 +119,7 @@
/**
* When paginating, the index of the first item to fetch.
- * @return
+ * @return the value of first
*/
public int getFirst() {
return first;
@@ -129,12 +129,12 @@
this.first = first;
}
-
+
/**
* The maximum number of items to fetch; defaults to 20. If set to a larger
* number, a container may honor the request, or may limit the number to a
* container-specified limit of at least 20.
- * @return
+ * @return the value of max
*/
public int getMax() {
return max;
@@ -161,23 +161,18 @@
}
CollectionOptions actual = (CollectionOptions) o;
- return StringUtils.equals(this.sortBy, actual.sortBy)
+ return Objects.equal(this.sortBy, actual.sortBy)
&& this.sortOrder == actual.sortOrder
- && StringUtils.equals(this.filter, actual.filter)
+ && Objects.equal(this.filter, actual.filter)
&& this.filterOperation == actual.filterOperation
- && StringUtils.equals(this.filterValue, actual.filterValue)
+ && Objects.equal(this.filterValue, actual.filterValue)
&& this.first == actual.first
&& this.max == actual.max;
}
@Override
public int hashCode() {
- return getHashCode(this.sortBy) + getHashCode(this.sortOrder) +
getHashCode(this.filter)
- + getHashCode(this.filterOperation) + getHashCode(this.filterValue)
- + getHashCode(this.first) + getHashCode(this.max);
- }
-
- private int getHashCode(Object o) {
- return o == null ? 0 : o.hashCode();
+ return Objects.hashCode(this.sortBy, this.sortOrder, this.filter,
+ this.filterOperation, this.filterValue, this.first, this.max);
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
Fri Jan 23 00:31:13 2009
@@ -17,9 +17,8 @@
*/
package org.apache.shindig.social.opensocial.spi;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.base.Objects;
import java.util.Map;
@@ -28,14 +27,21 @@
all, friends, self, deleted, groupId;
/** A map of JSON strings to Type objects */
- private static final Map<String, Type> jsonTypeMap = Maps.newHashMap();
+ private static final Map<String, Type> jsonTypeMap;
static {
+ ImmutableMap.Builder<String,Type> builder = ImmutableMap.builder();
for (Type type : Type.values()) {
- jsonTypeMap.put('@' + type.name(), type);
+ builder.put('@' + type.name(), type);
}
+ jsonTypeMap = builder.build();
}
- /** Return the Type enum value given a specific jsonType **/
+ /**
+ * Return the Type enum value given a specific jsonType such as @all,
@friends, etc.
+ *
+ * @param jsonType the type string to convert
+ * @return A Type Enum value or null if no value exists
+ **/
public static Type jsonValueOf(String jsonType) {
return jsonTypeMap.get(jsonType);
}
@@ -75,20 +81,16 @@
}
GroupId actual = (GroupId) o;
- return this.type == actual.type
- && StringUtils.equals(this.groupId, actual.groupId);
+ return this.type == actual.type && Objects.equal(this.groupId,
actual.groupId);
}
@Override
public int hashCode() {
- int groupHashCode = 0;
- if (this.groupId != null) {
- groupHashCode = this.groupId.hashCode();
- }
- return this.type.hashCode() + groupHashCode;
+ return Objects.hashCode(this.groupId, this.type);
}
- @Override public String toString() {
+ @Override
+ public String toString() {
switch (type) {
case all:
return "ALL";
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
Fri Jan 23 00:31:13 2009
@@ -19,9 +19,8 @@
import org.apache.shindig.auth.SecurityToken;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.base.Objects;
import java.util.Map;
@@ -30,12 +29,14 @@
me, viewer, owner, userId;
/** A map of JSON strings to Type objects */
- private static final Map<String, Type> jsonTypeMap = Maps.newHashMap();
+ private static final Map<String, Type> jsonTypeMap;
static {
+ ImmutableMap.Builder<String,Type> builder = ImmutableMap.builder();
for (Type type : Type.values()) {
- jsonTypeMap.put('@' + type.name(), type);
+ builder.put('@' + type.name(), type);
}
+ jsonTypeMap = builder.build();
}
/** Return the Type enum value given a specific jsonType **/
public static Type jsonValueOf(String jsonType) {
@@ -91,13 +92,12 @@
UserId actual = (UserId) o;
return this.type == actual.type
- && StringUtils.equals(this.userId, actual.userId);
+ && Objects.equal(this.userId, actual.userId);
}
@Override
public int hashCode() {
- int userHashCode = this.userId == null ? 0 : this.userId.hashCode();
- return this.type.hashCode() + userHashCode;
+ return Objects.hashCode(this.userId, this.type);
}
@Override
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=736970&r1=736969&r2=736970&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
Fri Jan 23 00:31:13 2009
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.SocialApiTestsGuiceModule;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
@@ -288,7 +288,7 @@
}
/**
- * @param personNode
+ * @param n
* @return
*/
protected Map<String, List<Node>> childNodesToNodeMap(Node n) {
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
Fri Jan 23 00:31:13 2009
@@ -22,7 +22,7 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.core.model.ActivityImpl;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.ContainerConf;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
Fri Jan 23 00:31:13 2009
@@ -22,7 +22,7 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.ContainerConf;
import org.apache.shindig.social.core.util.JsonContainerConf;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
Fri Jan 23 00:31:13 2009
@@ -20,7 +20,7 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.testing.FakeHttpServletRequest;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.SocialApiTestsGuiceModule;
import org.apache.shindig.social.core.util.BeanJsonConverter;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
Fri Jan 23 00:31:13 2009
@@ -19,7 +19,7 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Fri Jan 23 00:31:13 2009
@@ -19,7 +19,7 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.core.model.PersonImpl;
import org.apache.shindig.social.core.util.ContainerConf;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
Fri Jan 23 00:31:13 2009
@@ -18,7 +18,7 @@
package org.apache.shindig.social.opensocial.service;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.PersonService;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
Fri Jan 23 00:31:13 2009
@@ -20,7 +20,7 @@
import com.google.inject.Provider;
-import org.apache.shindig.social.EasyMockTestCase;
+import org.apache.shindig.common.EasyMockTestCase;
import org.easymock.classextension.IMocksControl;
import org.easymock.classextension.EasyMock;
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=736970&r1=736969&r2=736970&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Fri Jan 23 00:31:13 2009
@@ -1209,11 +1209,6 @@
<version>20070829</version>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>caja</groupId>
<artifactId>caja</artifactId>
<version>r3164</version>
