Author: doll
Date: Wed Apr 30 05:57:21 2008
New Revision: 652382
URL: http://svn.apache.org/viewvc?rev=652382&view=rev
Log:
SHINDIG-208
Patch from Brian Eaton - fixes various build warnings.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Auth.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicContentCache.java
Wed Apr 30 05:57:21 2008
@@ -169,7 +169,7 @@
/**
* Default TTL for an entry in the cache that does not have any
* cache controlling headers
- * @return
+ * @return default TTL for cache entries
*/
protected long getDefaultTTL() {
// 5 mins
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
Wed Apr 30 05:57:21 2008
@@ -93,6 +93,7 @@
/**
* @return The token associated with this request
*/
+ @SuppressWarnings("unused")
public GadgetToken getToken() throws GadgetException {
return null;
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java
Wed Apr 30 05:57:21 2008
@@ -52,6 +52,7 @@
* @param context
* @throws GadgetException
*/
+ @SuppressWarnings("unused")
public void process(Gadget gadget, GadgetContext context)
throws GadgetException {
// By default we do nothing.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java
Wed Apr 30 05:57:21 2008
@@ -57,6 +57,7 @@
}
}
+ @SuppressWarnings("unused")
@Override
protected void doPost(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
Wed Apr 30 05:57:21 2008
@@ -112,8 +112,8 @@
*
* @param gadgetUrl the URL of the gadget
* @param spec the parsed GadgetSpec of the gadget.
- * @throws OAuthStoreAccessException if there is a problem talking to the
- * backend store.
+ * @throws OAuthStoreException if there is a problem talking to the
+ * backend store.
* @throws GadgetException if the gadget spec doesn't require oauth, or if
* there are other problems processing the gadget
* spec.
@@ -140,8 +140,8 @@
* @param gadgetUrl the URL of the gadget
* @param serviceName the service provider with whom we have negotiated a
* consumer key and secret.
- * @throws OAuthStoreAccessException if there is a problem talking to the
- * backend store.
+ * @throws OAuthStoreException if there is a problem talking to the
+ * backend store.
* @throws OAuthNoDataException if there is no data about this service
* provider stored for this gadget.
*/
@@ -193,8 +193,8 @@
* passed to an OAuthMessage.sign method), as well as httpMethod and
* signatureType fields.
* @throws OAuthNoDataException if the token couldn't be found
- * @throws OAuthStoreAccessException if an error occurred accessing the data
- * store.
+ * @throws OAuthStoreException if an error occurred accessing the data
+ * store.
*/
public OAuthStore.AccessorInfo getOAuthAccessor(OAuthStore.TokenKey tokenKey)
throws OAuthNoDataException, OAuthStoreException {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
Wed Apr 30 05:57:21 2008
@@ -126,9 +126,7 @@
* client.
* @param nextFetcher fetcher to use for actually making requests
* @param authToken user's gadget security token
- * @param serviceName gadget's nickname for the service being accessed
- * @param tokenName gadget's nickname for the token to be used
- * @param origClientState state sent in from the client
+ * @param params OAuth fetch parameters sent from makeRequest
* @param tokenStore storage for long lived tokens.
*/
public OAuthFetcher(
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Auth.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Auth.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Auth.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Auth.java
Wed Apr 30 05:57:21 2008
@@ -46,8 +46,9 @@
/**
* Use lowercase as toString form
- * @return
+ * @return string value of Auth type
*/
+ @Override
public String toString() {
return super.toString().toLowerCase();
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicContentCacheTest.java
Wed Apr 30 05:57:21 2008
@@ -45,6 +45,7 @@
cache = new BasicContentCache();
}
+ @Override
protected void tearDown() throws Exception {
cache = null;
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java?rev=652382&r1=652381&r2=652382&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/OpenSocialDataHandler.java
Wed Apr 30 05:57:21 2008
@@ -23,9 +23,6 @@
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.IdSpec;
-import org.apache.shindig.social.samplecontainer.BasicActivitiesService;
-import org.apache.shindig.social.samplecontainer.BasicDataService;
-import org.apache.shindig.social.samplecontainer.BasicPeopleService;
import org.json.JSONArray;
import org.json.JSONException;
