Added a 'clear container' admin function to cf-tweetstore-spring

This commit is contained in:
Andrew Phillips 2012-05-22 02:41:27 -04:00
parent dabfcb839d
commit 4c5ac30341
4 changed files with 179 additions and 0 deletions

View File

@ -48,6 +48,7 @@ import org.jclouds.demo.paas.PlatformServices;
import org.jclouds.demo.paas.service.taskqueue.TaskQueue; import org.jclouds.demo.paas.service.taskqueue.TaskQueue;
import org.jclouds.demo.tweetstore.config.util.CredentialsCollector; import org.jclouds.demo.tweetstore.config.util.CredentialsCollector;
import org.jclouds.demo.tweetstore.controller.AddTweetsController; import org.jclouds.demo.tweetstore.controller.AddTweetsController;
import org.jclouds.demo.tweetstore.controller.ClearTweetsController;
import org.jclouds.demo.tweetstore.controller.EnqueueStoresController; import org.jclouds.demo.tweetstore.controller.EnqueueStoresController;
import org.jclouds.demo.tweetstore.controller.StoreTweetsController; import org.jclouds.demo.tweetstore.controller.StoreTweetsController;
import org.jclouds.demo.tweetstore.functions.ServiceToStoredTweetStatuses; import org.jclouds.demo.tweetstore.functions.ServiceToStoredTweetStatuses;
@ -173,6 +174,11 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
return new EnqueueStoresController(providerTypeToBlobStoreMap, queue, baseUrl); return new EnqueueStoresController(providerTypeToBlobStoreMap, queue, baseUrl);
} }
@Bean
public ClearTweetsController clearTweetsController() {
return new ClearTweetsController(providerTypeToBlobStoreMap, container);
}
private void injectServletConfig(Servlet servlet) { private void injectServletConfig(Servlet servlet) {
LOGGER.trace("About to inject servlet config '%s'", servletConfig); LOGGER.trace("About to inject servlet config '%s'", servletConfig);
try { try {
@ -195,6 +201,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
urlMap.put("/store/*", storeTweetsController()); urlMap.put("/store/*", storeTweetsController());
urlMap.put("/tweets/*", addTweetsController()); urlMap.put("/tweets/*", addTweetsController());
urlMap.put("/stores/*", enqueueStoresController()); urlMap.put("/stores/*", enqueueStoresController());
urlMap.put("/clear/*", clearTweetsController());
mapping.setUrlMap(urlMap); mapping.setUrlMap(urlMap);
/* /*
* "/store", "/tweets" and "/stores" are part of the servlet mapping and thus * "/store", "/tweets" and "/stores" are part of the servlet mapping and thus

View File

@ -0,0 +1,96 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds 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.jclouds.demo.tweetstore.controller;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Strings.nullToEmpty;
import java.io.IOException;
import java.util.Map;
import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.MediaType;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.demo.tweetstore.reference.TweetStoreConstants;
import org.jclouds.logging.Logger;
import com.google.common.annotations.VisibleForTesting;
/**
* Grab tweets related to me and store them into blobstores
*
* @author Adrian Cole
*/
@Singleton
public class ClearTweetsController extends HttpServlet {
/** The serialVersionUID */
private static final long serialVersionUID = 7215420527854203714L;
private final Map<String, BlobStoreContext> contexts;
private final String container;
@Resource
protected Logger logger = Logger.NULL;
@Inject
@VisibleForTesting
public ClearTweetsController(Map<String, BlobStoreContext> contexts,
@Named(TweetStoreConstants.PROPERTY_TWEETSTORE_CONTAINER) String container) {
this.container = container;
this.contexts = contexts;
}
@VisibleForTesting
public void clearContainer(String contextName) {
BlobStoreContext context = checkNotNull(contexts.get(contextName),
"no context for %s in %s", contextName, contexts.keySet());
try {
context.getBlobStore().clearContainer(container);
} catch (Exception e) {
logger.error(e, "Error clearing tweets in %s/%s", container, context);
}
}
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
if (nullToEmpty(request.getHeader("X-Originator")).equals("admin")) {
try {
String contextName = checkNotNull(request.getHeader("context"), "missing header context");
logger.info("clearing tweets in %s/%s", container, contextName);
clearContainer(contextName);
logger.debug("done clearing tweets");
response.setContentType(MediaType.TEXT_PLAIN);
response.getWriter().println("Done!");
} catch (Exception e) {
logger.error(e, "Error clearing tweets");
throw new ServletException(e);
}
} else {
response.sendError(401);
}
}
}

View File

@ -67,6 +67,10 @@
<servlet-name>dispatcher</servlet-name> <servlet-name>dispatcher</servlet-name>
<url-pattern>/stores/*</url-pattern> <url-pattern>/stores/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>dispatcher</servlet-name>
<url-pattern>/clear/*</url-pattern>
</servlet-mapping>
<welcome-file-list> <welcome-file-list>
<welcome-file>index.jsp</welcome-file> <welcome-file>index.jsp</welcome-file>

View File

@ -0,0 +1,72 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds 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.jclouds.demo.tweetstore.controller;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.TransientApiMetadata;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.demo.tweetstore.reference.TweetStoreConstants;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;
/**
* Tests behavior of {@code AddTweetsController}
*
* @author Adrian Cole
*/
@Test(groups = "unit")
public class ClearTweetsControllerTest {
Map<String, BlobStoreContext> createBlobStores(String container) throws InterruptedException, ExecutionException {
TransientApiMetadata transientApiMetadata = TransientApiMetadata.builder().build();
Map<String, BlobStoreContext> contexts = ImmutableMap.<String, BlobStoreContext>of(
"test1", ContextBuilder.newBuilder(transientApiMetadata).build(BlobStoreContext.class),
"test2", ContextBuilder.newBuilder(transientApiMetadata).build(BlobStoreContext.class));
for (BlobStoreContext blobstore : contexts.values()) {
blobstore.getBlobStore().createContainerInLocation(null, container);
Blob blob = blobstore.getAsyncBlobStore().blobBuilder("1").build();
blob.getMetadata().getUserMetadata().put(TweetStoreConstants.SENDER_NAME, "frank");
blob.setPayload("I love beans!");
blobstore.getBlobStore().putBlob(container, blob);
}
return contexts;
}
public void testClearTweets() throws IOException, InterruptedException, ExecutionException {
String container = ClearTweetsControllerTest.class.getName() + "#container";
Map<String, BlobStoreContext> contexts = createBlobStores(container);
ClearTweetsController controller = new ClearTweetsController(contexts,
container);
controller.clearContainer("test1");
controller.clearContainer("test2");
for (BlobStoreContext context : contexts.values()) {
assertEquals(context.getBlobStore().countBlobs(container), 0, context.toString());
}
}
}