Author: lindner
Date: Mon Jun 22 17:09:25 2009
New Revision: 787316
URL: http://svn.apache.org/viewvc?rev=787316&view=rev
Log:
SHINDIG-700 | Upgade to guice 2.0, minimally
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibTestsGuiceModule.java
incubator/shindig/trunk/pom.xml
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java?rev=787316&r1=787315&r2=787316&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
Mon Jun 22 17:09:25 2009
@@ -19,6 +19,7 @@
package org.apache.shindig.common.cache;
import com.google.common.collect.MapMaker;
+import com.google.inject.ConfigurationException;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -61,15 +62,19 @@
if (injector != null && name != null) {
String key = "shindig.cache.lru." + name + ".capacity";
Key<String> guiceKey = Key.get(String.class, Names.named(key));
- if (injector.getBinding(guiceKey) == null) {
- LOG.warning("No LRU capacity configured for " + name);
- } else {
- String value = injector.getInstance(guiceKey);
- try {
- return Integer.parseInt(value);
- } catch (NumberFormatException e) {
- LOG.warning("Invalid LRU capacity configured for " + name);
+ try {
+ if (injector.getBinding(guiceKey) == null) {
+ LOG.warning("No LRU capacity configured for " + name);
+ } else {
+ String value = injector.getInstance(guiceKey);
+ try {
+ return Integer.parseInt(value);
+ } catch (NumberFormatException e) {
+ LOG.warning("Invalid LRU capacity configured for " + name);
+ }
}
+ } catch ( ConfigurationException e ) {
+ return defaultCapacity;
}
}
return defaultCapacity;
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibTestsGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibTestsGuiceModule.java?rev=787316&r1=787315&r2=787316&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibTestsGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibTestsGuiceModule.java
Mon Jun 22 17:09:25 2009
@@ -43,7 +43,6 @@
bind(Map.class).to(HashMap.class);
bind(List.class).to(ArrayList.class);
- bind(Map[].class).to(HashMap[].class);
bind(JsonConfig.class).annotatedWith(Names.named("ShindigJsonConfig")).to(
TestJsonLibConfig.class);
}
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=787316&r1=787315&r2=787316&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Mon Jun 22 17:09:25 2009
@@ -1155,6 +1155,10 @@
<id>oauth</id>
<url>http://oauth.googlecode.com/svn/code/maven</url>
</repository>
+ <repository>
+ <id>guice</id>
+ <url>http://guice-maven.googlecode.com/svn/trunk/</url>
+ </repository>
<!-- for jstl-1.2 for now.. -->
<repository>
<id>java.net</id>
@@ -1248,7 +1252,7 @@
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
</dependency>
<!-- dependency not declared in guice pom -->
<dependency>
