Author: lindner
Date: Tue Feb 1 08:12:43 2011
New Revision: 1065946
URL: http://svn.apache.org/viewvc?rev=1065946&view=rev
Log:
more small cleanups, replace Crypto.concat with Bytes.concat
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
Tue Feb 1 08:12:43 2011
@@ -25,6 +25,7 @@ import com.google.common.collect.Iterabl
import com.google.common.collect.Maps;
import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.util.CharsetUtil;
import org.apache.shindig.common.util.TimeSource;
@@ -131,7 +132,7 @@ public class BasicBlobCrypter implements
* @return a derived key of the specified length
*/
private byte[] deriveKey(byte label, byte[] masterKey, int len) {
- byte[] base = Crypto.concat(new byte[] { label }, masterKey);
+ byte[] base = Bytes.concat(new byte[] { label }, masterKey);
byte[] hash = DigestUtils.sha(base);
if (len == 0) {
return hash;
@@ -153,7 +154,7 @@ public class BasicBlobCrypter implements
byte[] encoded = serializeAndTimestamp(in);
byte[] cipherText = Crypto.aes128cbcEncrypt(cipherKey, encoded);
byte[] hmac = Crypto.hmacSha1(hmacKey, cipherText);
- byte[] b64 = Base64.encodeBase64URLSafe(Crypto.concat(cipherText, hmac));
+ byte[] b64 = Base64.encodeBase64URLSafe(Bytes.concat(cipherText, hmac));
return new String(b64, UTF8);
} catch (UnsupportedEncodingException e) {
throw new BlobCrypterException(e);
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
Tue Feb 1 08:12:43 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.common.crypto;
+import com.google.common.primitives.Bytes;
import org.apache.commons.codec.binary.Hex;
import java.security.GeneralSecurityException;
@@ -169,7 +170,7 @@ public final class Crypto {
throws GeneralSecurityException {
Cipher cipher = Cipher.getInstance(CIPHER_TYPE);
byte iv[] = getRandomBytes(cipher.getBlockSize());
- return concat(iv, aes128cbcEncryptWithIV(key, iv, plain));
+ return Bytes.concat(iv, aes128cbcEncryptWithIV(key, iv, plain));
}
/**
@@ -231,16 +232,4 @@ public final class Crypto {
cipher.init(Cipher.DECRYPT_MODE, cipherKey, ivSpec);
return cipher.doFinal(cipherText, offset, cipherText.length-offset);
}
-
- /**
- * Concatenate two byte arrays.
- */
- public static byte[] concat(byte[] a, byte[] b) {
- byte[] out = new byte[a.length + b.length];
- int cursor = 0;
- System.arraycopy(a, 0, out, cursor, a.length);
- cursor += a.length;
- System.arraycopy(b, 0, out, cursor, b.length);
- return out;
- }
}
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
Tue Feb 1 08:12:43 2011
@@ -33,7 +33,10 @@ public class StringEncoding {
private final int SHIFT;
private final int MASK;
- /** Creates a new encoding based on the supplied set of digits. */
+ /**
+ * Creates a new encoding based on the supplied set of digits.
+ * @param userDigits set of characters to map bytes to
+ */
public StringEncoding(final char[] userDigits) {
TreeSet<Character> t = Sets.newTreeSet();
for (char c : userDigits) {
@@ -52,7 +55,11 @@ public class StringEncoding {
}
}
- /** Returns the given bytes in their encoded form. */
+ /**
+ * Returns the given bytes in their encoded form.
+ * @param data bytes to convert to string
+ * @return the encoded string
+ */
public String encode(byte[] data) {
if (data.length == 0) {
return "";
@@ -81,7 +88,11 @@ public class StringEncoding {
return result.toString();
}
- /** Decodes the given encoded string and returns the original raw bytes. */
+ /**
+ * Decodes the given encoded string and returns the original raw bytes.
+ * @param encoded String to encode
+ * @return bytes matching the string
+ */
public byte[] decode(String encoded) {
if (encoded.length() == 0) {
return ArrayUtils.EMPTY_BYTE_ARRAY;
Modified:
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
(original)
+++
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
Tue Feb 1 08:12:43 2011
@@ -50,4 +50,9 @@ public class UserAgentTest extends Asser
public void testVersionNumberParsingEmbeddedInTheMiddle() {
assertEquals(1.5, getUaEntry("beta 1.5 rc 5").getVersionNumber(), 0);
}
+
+ @Test
+ public void testVersionNumberParsingNoMatch() {
+ assertEquals(-1, getUaEntry("invalid").getVersionNumber(), 0);
+ }
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
Tue Feb 1 08:12:43 2011
@@ -28,7 +28,6 @@ import org.apache.shindig.auth.SecurityT
import org.apache.shindig.auth.SecurityTokenException;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
-import org.apache.shindig.gadgets.config.ConfigContributor;
import java.util.Map;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
Tue Feb 1 08:12:43 2011
@@ -89,7 +89,7 @@ public class MultipleResourceHttpFetcher
return httpFetcher;
}
- private class HttpFetchCallable implements Callable<RequestContext> {
+ private static class HttpFetchCallable implements Callable<RequestContext> {
private final HttpRequest httpReq;
private final RequestPipeline requestPipeline;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
Tue Feb 1 08:12:43 2011
@@ -27,7 +27,6 @@ import org.apache.shindig.gadgets.Gadget
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
-import org.apache.shindig.gadgets.rewrite.DomWalker;
import org.json.JSONArray;
import org.json.JSONException;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
Tue Feb 1 08:12:43 2011
@@ -22,7 +22,6 @@ import com.google.inject.Inject;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.rewrite.DomWalker;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor;
import org.apache.shindig.gadgets.uri.ConcatUriManager;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
Tue Feb 1 08:12:43 2011
@@ -18,8 +18,6 @@
*/
package org.apache.shindig.gadgets.rewrite;
-import org.apache.shindig.gadgets.rewrite.DomWalker;
-
/**
* Merges adjacent style tags.
*
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
Tue Feb 1 08:12:43 2011
@@ -101,7 +101,7 @@ public class BasicImageRewriter implemen
private final OptimizerConfig config;
- private class ImageResizeData {
+ private static class ImageResizeData {
private Integer requestedWidth;
private Integer requestedHeight;
private Integer widthDelta;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
Tue Feb 1 08:12:43 2011
@@ -581,7 +581,7 @@ public class GadgetsHandlerService {
fields);
}
- private class MessageImpl implements GadgetsHandlerApi.Message {
+ private static class MessageImpl implements GadgetsHandlerApi.Message {
private final GadgetsHandlerApi.MessageLevel level;
private final String message;
private final String name;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
Tue Feb 1 08:12:43 2011
@@ -19,6 +19,7 @@
package org.apache.shindig.gadgets.servlet;
+import com.google.common.base.Objects;
import org.apache.shindig.auth.AuthInfoUtil;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.uri.Uri;
@@ -73,36 +74,24 @@ public class HttpGadgetContext extends G
@Override
public String getContainer() {
- if (container == null) {
- return super.getContainer();
- }
- return container;
+ return container == null ? super.getContainer() : container;
}
@Override
public String getHost() {
String host = request.getHeader("Host");
- if (host == null) {
- return super.getHost();
- }
- return host;
+ return host == null ? super.getHost() : host;
}
@Override
public String getUserIp() {
String ip = request.getRemoteAddr();
- if (ip == null) {
- return super.getUserIp();
- }
- return ip;
+ return ip == null ? super.getUserIp() : ip;
}
@Override
public boolean getDebug() {
- if (debug == null) {
- return super.getDebug();
- }
- return debug;
+ return debug == null ? super.getDebug(): debug;
}
@Override
@@ -115,26 +104,17 @@ public class HttpGadgetContext extends G
@Override
public Locale getLocale() {
- if (locale == null) {
- return super.getLocale();
- }
- return locale;
+ return locale == null ? super.getLocale() : locale;
}
@Override
public int getModuleId() {
- if (moduleId == null) {
- return super.getModuleId();
- }
- return moduleId;
+ return moduleId == null ? super.getModuleId() : moduleId;
}
@Override
public RenderingContext getRenderingContext() {
- if (renderingContext == null) {
- return super.getRenderingContext();
- }
- return renderingContext;
+ return renderingContext == null ? super.getRenderingContext() :
renderingContext;
}
@Override
@@ -144,10 +124,7 @@ public class HttpGadgetContext extends G
@Override
public Uri getUrl() {
- if (url == null) {
- return super.getUrl();
- }
- return url;
+ return url == null ? super.getUrl() : url;
}
@Override
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
Tue Feb 1 08:12:43 2011
@@ -191,6 +191,12 @@ public interface JsUriManager {
&& Objects.equal(this.context, objUri.context))
&& Objects.equal(this.origUri, objUri.origUri);
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(this.libs, this.loadedLibs, this.onload,
this.jsload,
+ this.nohint, this.context, this.origUri);
+ }
}
public interface Versioner {
@@ -204,6 +210,7 @@ public interface JsUriManager {
/**
* @param gadgetUri Gadget for which extern Uri was generated.
+ * @param container corresponding container for this gadget.
* @param extern Collection of libs externed.
* @param version Version string generated by the Versioner.
* @return Validation status of the version.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
Tue Feb 1 08:12:43 2011
@@ -28,10 +28,7 @@ import org.apache.shindig.gadgets.http.H
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -44,7 +41,7 @@ public final class UriUtils {
public static final String CHARSET = "charset";
//class name for logging purpose
private static final String classname = UriUtils.class.getName();
- private static final Logger LOG =
Logger.getLogger(classname,MessageKeys.MESSAGES);
+ private static final Logger LOG = Logger.getLogger(classname,
MessageKeys.MESSAGES);
private UriUtils() {}
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java?rev=1065946&r1=1065945&r2=1065946&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
Tue Feb 1 08:12:43 2011
@@ -50,7 +50,7 @@ public class ActivityStreamHandler {
/**
* <p>Constructor for ActivityStreamsHandler.</p>
*
- * @param service a {@link
org.apache.shindig.extras.as.opensocial.spi.ActivityStreamService} object.
+ * @param service a {@link
org.apache.shindig.social.opensocial.spi.ActivityStreamService} object.
* @param config a {@link org.apache.shindig.config.ContainerConfig} object.
*/
@Inject
