You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by hs...@apache.org on 2011/10/05 00:56:24 UTC
svn commit: r1179003 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/admin/
test/java/org/apache/shindig/gadgets/admin/
Author: hsaputra
Date: Tue Oct 4 22:56:23 2011
New Revision: 1179003
URL: http://svn.apache.org/viewvc?rev=1179003&view=rev
Log:
Inject ServerAdminData in the BasicGadgetAdminStore to allow extension of the class. CR: https://reviews.apache.org/r/2179/
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java?rev=1179003&r1=1179002&r2=1179003&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStore.java Tue Oct 4 22:56:23 2011
@@ -76,8 +76,8 @@ public class BasicGadgetAdminStore imple
*/
@Inject
public BasicGadgetAdminStore(FeatureRegistryProvider featureRegistryProvider,
- ContainerConfig config) {
- this.serverAdminData = new ServerAdminData();
+ ContainerConfig config, ServerAdminData serverAdminData) {
+ this.serverAdminData = serverAdminData;
this.featureRegistryProvider = featureRegistryProvider;
this.config = config;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java?rev=1179003&r1=1179002&r2=1179003&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/admin/ServerAdminData.java Tue Oct 4 22:56:23 2011
@@ -22,6 +22,8 @@ import java.util.Map;
import com.google.caja.util.Maps;
import com.google.common.base.Objects;
+import com.google.inject.Inject;
+import org.apache.shindig.common.Nullable;
/**
* Administration data for the server.
@@ -34,6 +36,7 @@ public class ServerAdminData {
/**
* Constructor.
*/
+ @Inject
public ServerAdminData() {
this(null);
}
@@ -44,11 +47,9 @@ public class ServerAdminData {
* @param containerAdminMap
* a map of container IDs to container.
*/
- public ServerAdminData(Map<String, ContainerAdminData> containerAdminMap) {
- if (containerAdminMap == null) {
- containerAdminMap = Maps.newHashMap();
- }
- this.containerAdminDataMap = containerAdminMap;
+ public ServerAdminData(@Nullable Map<String, ContainerAdminData> containerAdminMap) {
+ this.containerAdminDataMap = (containerAdminMap != null) ? containerAdminMap :
+ Maps.<String, ContainerAdminData>newHashMap();
}
/**
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java?rev=1179003&r1=1179002&r2=1179003&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/admin/BasicGadgetAdminStoreTest.java Tue Oct 4 22:56:23 2011
@@ -101,10 +101,12 @@ public class BasicGadgetAdminStoreTest e
return mockRegistry;
}
};
- enabledStore = new BasicGadgetAdminStore(featureRegistryProvider, enabledConfig);
+ enabledStore = new BasicGadgetAdminStore(featureRegistryProvider, enabledConfig,
+ new ServerAdminData());
enabledStore.init(SAMPLE_STORE);
- disabledStore = new BasicGadgetAdminStore(featureRegistryProvider, disabledConfig);
+ disabledStore = new BasicGadgetAdminStore(featureRegistryProvider, disabledConfig,
+ new ServerAdminData());
horoscopeAdminData = new GadgetAdminData(new FeatureAdminData(HOROSCOPE_FEATURES,
Type.WHITELIST));