You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ie...@apache.org on 2008/08/21 12:51:03 UTC
svn commit: r687705 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/cache/
common/src/test/java/org/apache/shindig/common/cache/
gadgets/src/main/java/org/apache/shindig/gadgets/
gadgets/src/main/java/org/apache/shind...
Author: ieb
Date: Thu Aug 21 03:51:01 2008
New Revision: 687705
URL: http://svn.apache.org/viewvc?rev=687705&view=rev
Log:
SHINDIG-279
Abstracted Cache behind a CacheProvider Interface so that alternative implementations
can be injected by Guice.
The default implementation of the CacheProvider uses the exisitng LruCache which implements the Cache interface
The reson for not using a Guice provide is the consumers of the CacheProvider need to specify configuration
settings, there may be a better way of doing this, but this approach appears workable and simple.
There are no configuration changes required in the deployment so where guice has been used to inject the cache
this change should be transparent. Where the cache was manually injected a new default cache provider needs to be
manually created, hence the patces to the various Tests.
Added:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/DefaultCacheProvider.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/DefaultCacheProviderTest.java
- copied, changed from r687235, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
Added: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java?rev=687705&view=auto
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java (added)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java Thu Aug 21 03:51:01 2008
@@ -0,0 +1,57 @@
+/*
+ * 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.cache;
+
+import com.google.inject.ImplementedBy;
+
+/**
+ *
+ */
+@ImplementedBy(DefaultCacheProvider.class)
+public interface CacheProvider {
+ /**
+ * Create a named single instance cache in this cache manager, if the cache
+ * already exists, return it if the name is null, a new anonymous cache is
+ * created
+ *
+ * @param <K>
+ * The Key type for the cache
+ * @param <V>
+ * The pay-load type
+ * @param capacity
+ * the initial size of the cache
+ * @param name
+ * the name of the cache.
+ * @return a Cache configured to the required specification
+ */
+ public <K, V> Cache<K, V> createCache(int capacity, String name);
+
+ /**
+ * Create an anonymous cache.
+ *
+ * @param <K>
+ * The Key type for the cache
+ * @param <V>
+ * The pay-load type
+ * @param capacity
+ * the size of the cache
+ * @return a Cache configured to the required specification.
+ */
+ public <K, V> Cache<K, V> createCache(int capacity);
+
+}
Added: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/DefaultCacheProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/DefaultCacheProvider.java?rev=687705&view=auto
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/DefaultCacheProvider.java (added)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/DefaultCacheProvider.java Thu Aug 21 03:51:01 2008
@@ -0,0 +1,64 @@
+/*
+ * 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.cache;
+
+import com.google.inject.Singleton;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A default Cache Manager generates LruCache Cache implementations, where no cache
+ * manager is defined this implementation is used.
+ */
+@Singleton
+public class DefaultCacheProvider implements CacheProvider {
+
+ Map<String, Cache<?, ?>> cacheInstances = new HashMap<String, Cache<?, ?>>();
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.shindig.common.cache.CacheProvider#createCache(int)
+ */
+ public <K, V> Cache<K, V> createCache(int capacity, String name) {
+ if (name == null) {
+ return new LruCache<K, V>(capacity);
+ } else {
+ // creation of caches is likely to be rare, so synchronized is Ok
+ synchronized (cacheInstances) {
+ Cache<K, V> c = (Cache<K, V>) cacheInstances.get(name);
+ if (c == null) {
+ c = new LruCache<K, V>(capacity);
+ cacheInstances.put(name, c);
+ }
+ return c;
+ }
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.shindig.common.cache.CacheProvider#createCache(int)
+ */
+ public <K, V> Cache<K, V> createCache(int capacity) {
+ return createCache(capacity, null);
+ }
+
+}
Copied: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/DefaultCacheProviderTest.java (from r687235, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/DefaultCacheProviderTest.java?p2=incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/DefaultCacheProviderTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java&r1=687235&r2=687705&rev=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/cache/DefaultCacheProviderTest.java Thu Aug 21 03:51:01 2008
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -7,7 +7,7 @@
* "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
+ * 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
@@ -15,15 +15,30 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.common.cache;
-import org.junit.Before;
+import org.junit.Test;
+import org.junit.Assert;
-public class BasicHttpFetcherTest extends AbstractHttpFetcherTest {
+/**
+ *
+ */
+public class DefaultCacheProviderTest {
- @Before
- public void setUp() {
- HttpCache cache = new BasicHttpCache(10);
- fetcher = new BasicHttpFetcher(cache, Integer.MAX_VALUE);
+ @Test
+ public void getAnonCache() {
+ CacheProvider defaultProvider = new DefaultCacheProvider();
+ Cache<String, String> cache = defaultProvider.createCache(100);
+ Assert.assertNotNull(cache);
+ }
+
+ @Test
+ public void getNamedCache() {
+ CacheProvider defaultProvider = new DefaultCacheProvider();
+ Cache<String, String> cache = defaultProvider.createCache(100, "testcache");
+ Cache<String, String> cache2 = defaultProvider.createCache(100, "testcache");
+ Assert.assertNotNull(cache);
+ Assert.assertEquals(cache, cache2);
}
-}
\ No newline at end of file
+
+}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java Thu Aug 21 03:51:01 2008
@@ -19,6 +19,7 @@
package org.apache.shindig.gadgets;
import org.apache.shindig.common.cache.Cache;
+import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.cache.LruCache;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.http.HttpFetcher;
@@ -31,6 +32,7 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
+import com.sun.jmx.remote.util.CacheMap;
import java.net.URI;
import java.util.ArrayList;
@@ -167,6 +169,7 @@
@Inject
public BasicGadgetSpecFactory(HttpFetcher fetcher,
+ CacheProvider cacheProvider,
ContentRewriter rewriter,
Executor executor,
@Named("shindig.gadget-spec.cache.capacity")int gadgetSpecCacheCapacity,
@@ -175,7 +178,7 @@
this.fetcher = fetcher;
this.rewriter = rewriter;
this.executor = executor;
- this.cache = new LruCache<URI, TimeoutPair>(gadgetSpecCacheCapacity);
+ this.cache = cacheProvider.createCache(gadgetSpecCacheCapacity);
this.minTtl = minTtl;
this.maxTtl = maxTtl;
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicMessageBundleFactory.java Thu Aug 21 03:51:01 2008
@@ -19,6 +19,7 @@
package org.apache.shindig.gadgets;
import org.apache.shindig.common.cache.Cache;
+import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.cache.LruCache;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.http.HttpFetcher;
@@ -121,11 +122,12 @@
@Inject
public BasicMessageBundleFactory(HttpFetcher fetcher,
+ CacheProvider cacheProvider,
@Named("shindig.message-bundle.cache.capacity")int capacity,
@Named("shindig.message-bundle.cache.minTTL")long minTtl,
@Named("shindig.message-bundle.cache.maxTTL")long maxTtl) {
this.fetcher = fetcher;
- this.cache = new LruCache<URI, TimeoutPair>(capacity);
+ this.cache = cacheProvider.createCache(capacity);
this.minTtl = minTtl;
this.maxTtl = maxTtl;
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpCache.java Thu Aug 21 03:51:01 2008
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets.http;
import org.apache.shindig.common.cache.Cache;
+import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.cache.LruCache;
import com.google.inject.Inject;
@@ -46,7 +47,7 @@
}
@Inject
- public BasicHttpCache(@Named("shindig.cache.capacity") int capacity) {
- cache = LruCache.create(capacity);
+ public BasicHttpCache(CacheProvider cacheProvider, @Named("shindig.cache.capacity") int capacity) {
+ cache = cacheProvider.createCache(capacity);
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetSpecFactoryTest.java Thu Aug 21 03:51:01 2008
@@ -24,6 +24,8 @@
import static org.junit.Assert.assertTrue;
import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.common.cache.CacheProvider;
+import org.apache.shindig.common.cache.DefaultCacheProvider;
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -89,9 +91,11 @@
private final HttpFetcher fetcher = EasyMock.createNiceMock(HttpFetcher.class);
private final CaptureRewriter rewriter = new CaptureRewriter();
+
+ private final CacheProvider cacheProvider = new DefaultCacheProvider();
private final BasicGadgetSpecFactory specFactory
- = new BasicGadgetSpecFactory(fetcher, rewriter, FAKE_EXECUTOR, 5, -1000, 1000);
+ = new BasicGadgetSpecFactory(fetcher, cacheProvider, rewriter, FAKE_EXECUTOR, 5, -1000, 1000);
@Test
public void specFetched() throws Exception {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicMessageBundleFactoryTest.java Thu Aug 21 03:51:01 2008
@@ -24,6 +24,8 @@
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
+import org.apache.shindig.common.cache.CacheProvider;
+import org.apache.shindig.common.cache.DefaultCacheProvider;
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -68,9 +70,11 @@
private final HttpFetcher fetcher = EasyMock.createNiceMock(HttpFetcher.class);
private final MessageBundleFactory bundleFactory;
+ private final CacheProvider cacheProvider;
public BasicMessageBundleFactoryTest() {
- bundleFactory = new BasicMessageBundleFactory(fetcher, 5, -1000, 1000);
+ cacheProvider = new DefaultCacheProvider();
+ bundleFactory = new BasicMessageBundleFactory(fetcher, cacheProvider, 5, -1000, 1000);
}
@Test
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java Thu Aug 21 03:51:01 2008
@@ -21,6 +21,8 @@
import org.apache.shindig.common.ContainerConfig;
import org.apache.shindig.common.SecurityTokenDecoder;
+import org.apache.shindig.common.cache.CacheProvider;
+import org.apache.shindig.common.cache.DefaultCacheProvider;
import org.apache.shindig.gadgets.http.ContentFetcherFactory;
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.rewrite.NoOpContentRewriter;
@@ -40,8 +42,9 @@
= mock(ContentFetcherFactory.class);
public final HttpFetcher fetcher = mock(HttpFetcher.class);
public final GadgetBlacklist blacklist = mock(GadgetBlacklist.class);
+ private final CacheProvider cacheProvider = new DefaultCacheProvider();
public final MessageBundleFactory bundleFactory =
- new BasicMessageBundleFactory(fetcher, 0, 0L, 0L);
+ new BasicMessageBundleFactory(fetcher, cacheProvider, 0, 0L, 0L);
public GadgetFeatureRegistry registry;
public ContainerConfig containerConfig = mock(ContainerConfig.class);
public final Executor executor = new Executor() {
@@ -50,7 +53,7 @@
}
};
public final GadgetSpecFactory specFactory = new BasicGadgetSpecFactory(
- fetcher, new NoOpContentRewriter(), executor, 0, 0L, 0L);
+ fetcher, cacheProvider, new NoOpContentRewriter(), executor, 0, 0L, 0L);
public GadgetTestFixture() {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java Thu Aug 21 03:51:01 2008
@@ -22,6 +22,8 @@
import org.apache.shindig.common.BasicSecurityToken;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
+import org.apache.shindig.common.cache.CacheProvider;
+import org.apache.shindig.common.cache.DefaultCacheProvider;
import org.apache.shindig.gadgets.http.BasicHttpCache;
import org.apache.shindig.gadgets.http.HttpCache;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -76,6 +78,7 @@
private InterceptingContentFetcher interceptor;
private HttpCache cache;
+ private CacheProvider cacheProvider;
private SigningFetcher signer;
private BasicSecurityToken authToken;
private OAuthAccessor accessor;
@@ -83,7 +86,8 @@
@Before
public void setUp() throws Exception {
- cache = new BasicHttpCache(10);
+ cacheProvider = new DefaultCacheProvider();
+ cache = new BasicHttpCache(cacheProvider,10);
interceptor = new InterceptingContentFetcher();
authToken = new BasicSecurityToken("o", "v", "a", "d", "u", "m");
signer = SigningFetcher.makeFromB64PrivateKey(cache,
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java Thu Aug 21 03:51:01 2008
@@ -19,6 +19,9 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.DateUtil;
+import org.apache.shindig.common.cache.CacheProvider;
+import org.apache.shindig.common.cache.DefaultCacheProvider;
+import org.apache.shindig.common.util.DateUtil;
import org.apache.commons.lang.ArrayUtils;
@@ -36,11 +39,13 @@
public class BasicHttpCacheTest extends TestCase {
private HttpCache cache;
+ private CacheProvider cacheProvider;
@Override
public void setUp() throws Exception {
super.setUp();
- cache = new BasicHttpCache(10);
+ cacheProvider = new DefaultCacheProvider();
+ cache = new BasicHttpCache(cacheProvider,10);
}
@Override
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java Thu Aug 21 03:51:01 2008
@@ -17,13 +17,17 @@
*/
package org.apache.shindig.gadgets.http;
+import org.apache.shindig.common.cache.CacheProvider;
+import org.apache.shindig.common.cache.DefaultCacheProvider;
+
import org.junit.Before;
public class BasicHttpFetcherTest extends AbstractHttpFetcherTest {
@Before
public void setUp() {
- HttpCache cache = new BasicHttpCache(10);
+ CacheProvider cacheProvider = new DefaultCacheProvider();
+ HttpCache cache = new BasicHttpCache(cacheProvider,10);
fetcher = new BasicHttpFetcher(cache, Integer.MAX_VALUE);
}
}
\ No newline at end of file
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java?rev=687705&r1=687704&r2=687705&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java Thu Aug 21 03:51:01 2008
@@ -23,6 +23,7 @@
import org.apache.shindig.common.BasicSecurityToken;
import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.common.cache.DefaultCacheProvider;
import org.apache.shindig.common.crypto.BasicBlobCrypter;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.FakeGadgetSpecFactory;
@@ -59,7 +60,7 @@
fetcherConfig = new OAuthFetcherConfig(
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
getOAuthStore(),
- new BasicHttpCache(10));
+ new BasicHttpCache(new DefaultCacheProvider(),10));
}
/**