diff --git a/.gitignore b/.gitignore index 3ca4b1fa5..cb264df74 100644 --- a/.gitignore +++ b/.gitignore @@ -17,13 +17,15 @@ nosetests.xml # Mr Developer .mr.developer.cfg -.project + +**/.project .pydevproject *.iml .idea .settings .DS_Store -.classpath +**/.classpath +**/.checkstyle # Built documentation docs/ diff --git a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java index 4d5775c65..0777c8b92 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java +++ b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google LLC. * * Licensed 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 @@ -38,15 +38,14 @@ import javax.net.ssl.X509TrustManager; /** - * JSON Web Signature - * (JWS). + * JSON Web Signature(JWS). * *

Sample usage: * *

  * public static void printPayload(JsonFactory jsonFactory, String tokenString) throws IOException {
- * JsonWebSignature jws = JsonWebSignature.parse(jsonFactory, tokenString);
- * System.out.println(jws.getPayload());
+ *   JsonWebSignature jws = JsonWebSignature.parse(jsonFactory, tokenString);
+ *   System.out.println(jws.getPayload());
  * }
  * 
* @@ -67,7 +66,7 @@ public class JsonWebSignature extends JsonWebToken { * @param header header * @param payload payload * @param signatureBytes bytes of the signature - * @param signedContentBytes bytes of the signature content + * @param signedContentBytes bytes of the signed content */ public JsonWebSignature( Header header, Payload payload, byte[] signatureBytes, byte[] signedContentBytes) { @@ -77,8 +76,8 @@ public JsonWebSignature( } /** - * Header as specified in Reserved + * Header as specified in + * Reserved * Header Parameter Names. */ public static class Header extends JsonWebToken.Header { @@ -406,11 +405,11 @@ public final boolean verifySignature(PublicKey publicKey) throws GeneralSecurity * *

The leaf certificate of the certificate chain must be an SSL server certificate. * - * @param trustManager Trust manager used to verify the X509 certificate chain embedded in this - * message. - * @return The signature certificate if the signature could be verified, null otherwise. + * @param trustManager trust manager used to verify the X509 certificate chain embedded in this + * message + * @return the signature certificate if the signature could be verified, null otherwise * @throws GeneralSecurityException - * @since 1.19.1. + * @since 1.19.1 */ @Beta public final X509Certificate verifySignature(X509TrustManager trustManager) @@ -441,7 +440,7 @@ public final X509Certificate verifySignature(X509TrustManager trustManager) * *

The leaf certificate of the certificate chain must be an SSL server certificate. * - * @return The signature certificate if the signature could be verified, null otherwise. + * @return the signature certificate if the signature could be verified, null otherwise * @throws GeneralSecurityException * @since 1.19.1. */ diff --git a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java index f7c19d543..f68450190 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java +++ b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Google Inc. + * Copyright 2012 Google LLC * * Licensed 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 @@ -22,7 +22,7 @@ import java.util.List; /** - * JSON Web Token (JWT). + * JSON Web Token (JWT). * *

Implementation is not thread-safe. * @@ -47,8 +47,8 @@ public JsonWebToken(Header header, Payload payload) { } /** - * Header as specified in JWT Header. + * Header as specified in + * JWT Header. */ public static class Header extends GenericJson { @@ -115,8 +115,8 @@ public Header clone() { } /** - * Payload as specified in Reserved Claim + * Payload as specified in + * Reserved Claim * Names. */ public static class Payload extends GenericJson { diff --git a/samples/dailymotion-simple-cmdline-sample/.classpath b/samples/dailymotion-simple-cmdline-sample/.classpath deleted file mode 100644 index f3de25032..000000000 --- a/samples/dailymotion-simple-cmdline-sample/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/samples/dailymotion-simple-cmdline-sample/.project b/samples/dailymotion-simple-cmdline-sample/.project deleted file mode 100644 index 1d87e91e0..000000000 --- a/samples/dailymotion-simple-cmdline-sample/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - dailymotion-simple-cmdline-sample - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - -