mirror of https://github.com/apache/jclouds.git
reverted accidental checkin
git-svn-id: http://jclouds.googlecode.com/svn/trunk@2608 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
parent
83ff721365
commit
1661ff18fd
|
@ -1,4 +1,4 @@
|
||||||
i/**
|
/**
|
||||||
*
|
*
|
||||||
* Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
|
* Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
|
||||||
*
|
*
|
||||||
|
@ -18,8 +18,6 @@ i/**
|
||||||
*/
|
*/
|
||||||
package org.jclouds.demo.tweetstore.controller;
|
package org.jclouds.demo.tweetstore.controller;
|
||||||
|
|
||||||
import static com.google.common.base.Preconditions.checkNotNull;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -31,7 +29,6 @@ import javax.annotation.Resource;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Singleton;
|
import javax.inject.Singleton;
|
||||||
import javax.servlet.RequestDispatcher;
|
import javax.servlet.RequestDispatcher;
|
||||||
import javax.servlet.ServletContext;
|
|
||||||
import javax.servlet.ServletException;
|
import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServlet;
|
import javax.servlet.http.HttpServlet;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
@ -41,7 +38,6 @@ import org.jclouds.blobstore.BlobStoreContext;
|
||||||
import org.jclouds.demo.tweetstore.domain.StoredTweetStatus;
|
import org.jclouds.demo.tweetstore.domain.StoredTweetStatus;
|
||||||
import org.jclouds.demo.tweetstore.functions.ServiceToStoredTweetStatuses;
|
import org.jclouds.demo.tweetstore.functions.ServiceToStoredTweetStatuses;
|
||||||
import org.jclouds.logging.Logger;
|
import org.jclouds.logging.Logger;
|
||||||
import org.springframework.web.context.ServletContextAware;
|
|
||||||
|
|
||||||
import com.google.appengine.repackaged.com.google.common.collect.Lists;
|
import com.google.appengine.repackaged.com.google.common.collect.Lists;
|
||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
|
@ -54,7 +50,7 @@ import com.google.common.collect.Iterables;
|
||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
public class AddTweetsController extends HttpServlet implements
|
public class AddTweetsController extends HttpServlet implements
|
||||||
Function<Set<String>, List<StoredTweetStatus>>, ServletContextAware {
|
Function<Set<String>, List<StoredTweetStatus>> {
|
||||||
|
|
||||||
/** The serialVersionUID */
|
/** The serialVersionUID */
|
||||||
private static final long serialVersionUID = 3888348023150822683L;
|
private static final long serialVersionUID = 3888348023150822683L;
|
||||||
|
@ -64,10 +60,8 @@ public class AddTweetsController extends HttpServlet implements
|
||||||
@Resource
|
@Resource
|
||||||
protected Logger logger = Logger.NULL;
|
protected Logger logger = Logger.NULL;
|
||||||
|
|
||||||
private ServletContext servletContext;
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public AddTweetsController(Map<String, BlobStoreContext<?, ?>> contexts,
|
AddTweetsController(Map<String, BlobStoreContext<?, ?>> contexts,
|
||||||
ServiceToStoredTweetStatuses blobStoreContextToContainerResult) {
|
ServiceToStoredTweetStatuses blobStoreContextToContainerResult) {
|
||||||
this.contexts = contexts;
|
this.contexts = contexts;
|
||||||
this.blobStoreContextToContainerResult = blobStoreContextToContainerResult;
|
this.blobStoreContextToContainerResult = blobStoreContextToContainerResult;
|
||||||
|
@ -99,14 +93,4 @@ public class AddTweetsController extends HttpServlet implements
|
||||||
}
|
}
|
||||||
return statuses;
|
return statuses;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setServletContext(ServletContext context) {
|
|
||||||
this.servletContext = context;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ServletContext getServletContext() {
|
|
||||||
return checkNotNull(servletContext, "servletContext");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue