diff --git a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/AbstractCallbackServlet.java b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/AbstractCallbackServlet.java
index f69d8e669..8fcf92339 100644
--- a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/AbstractCallbackServlet.java
+++ b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/AbstractCallbackServlet.java
@@ -99,13 +99,19 @@ protected final HttpTransport getHttpTransport() {
    */
   protected abstract PersistenceManagerFactory getPersistenceManagerFactory();
 
-  /** @return Specific ThreeLeggedFlow type that this callback should retreieve and complete. */
+  /**
+   * @return Specific ThreeLeggedFlow type that this callback should retreieve and complete.
+   */
   protected abstract Class<? extends ThreeLeggedFlow> getConcreteFlowType();
 
-  /** @return Url to redirect the user to upon a successful credential exchange. */
+  /**
+   * @return Url to redirect the user to upon a successful credential exchange.
+   */
   protected abstract String getSuccessRedirectUrl();
 
-  /** @return Url to redirect the user to upon failure. */
+  /**
+   * @return Url to redirect the user to upon failure.
+   */
   protected abstract String getDeniedRedirectUrl();
 
   /**
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/AbstractOAuthGetToken.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/AbstractOAuthGetToken.java
index 1a6cf4da5..751bd0d8a 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/AbstractOAuthGetToken.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/AbstractOAuthGetToken.java
@@ -50,7 +50,9 @@ public abstract class AbstractOAuthGetToken extends GenericUrl {
   /** {@code true} for POST request or the default {@code false} for GET request. */
   protected boolean usePost;
 
-  /** @param authorizationServerUrl encoded authorization server URL */
+  /**
+   * @param authorizationServerUrl encoded authorization server URL
+   */
   protected AbstractOAuthGetToken(String authorizationServerUrl) {
     super(authorizationServerUrl);
   }
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthAuthorizeTemporaryTokenUrl.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthAuthorizeTemporaryTokenUrl.java
index acc9e10f3..28a5ceb02 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthAuthorizeTemporaryTokenUrl.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthAuthorizeTemporaryTokenUrl.java
@@ -43,7 +43,9 @@ public class OAuthAuthorizeTemporaryTokenUrl extends GenericUrl {
   @Key("oauth_token")
   public String temporaryToken;
 
-  /** @param encodedUserAuthorizationUrl encoded user authorization URL */
+  /**
+   * @param encodedUserAuthorizationUrl encoded user authorization URL
+   */
   public OAuthAuthorizeTemporaryTokenUrl(String encodedUserAuthorizationUrl) {
     super(encodedUserAuthorizationUrl);
   }
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetAccessToken.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetAccessToken.java
index cdbb3eced..d11973f49 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetAccessToken.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetAccessToken.java
@@ -43,7 +43,9 @@ public class OAuthGetAccessToken extends AbstractOAuthGetToken {
    */
   public String verifier;
 
-  /** @param authorizationServerUrl encoded authorization server URL */
+  /**
+   * @param authorizationServerUrl encoded authorization server URL
+   */
   public OAuthGetAccessToken(String authorizationServerUrl) {
     super(authorizationServerUrl);
   }
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetTemporaryToken.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetTemporaryToken.java
index 00ebc0f75..9e08a8d74 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetTemporaryToken.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth/OAuthGetTemporaryToken.java
@@ -38,7 +38,9 @@ public class OAuthGetTemporaryToken extends AbstractOAuthGetToken {
    */
   public String callback;
 
-  /** @param authorizationServerUrl encoded authorization server URL */
+  /**
+   * @param authorizationServerUrl encoded authorization server URL
+   */
   public OAuthGetTemporaryToken(String authorizationServerUrl) {
     super(authorizationServerUrl);
   }
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java
index 6f85e8ba3..0d08a82aa 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java
@@ -83,7 +83,9 @@ public class AuthorizationCodeResponseUrl extends GenericUrl {
   @Key("error_uri")
   private String errorUri;
 
-  /** @param encodedResponseUrl encoded authorization code response URL */
+  /**
+   * @param encodedResponseUrl encoded authorization code response URL
+   */
   public AuthorizationCodeResponseUrl(String encodedResponseUrl) {
     super(encodedResponseUrl);
     // either error or code but not both
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/StoredCredential.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/StoredCredential.java
index 2dace28dd..70252fcc1 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/StoredCredential.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/StoredCredential.java
@@ -55,7 +55,9 @@ public final class StoredCredential implements Serializable {
 
   public StoredCredential() {}
 
-  /** @param credential existing credential to copy from */
+  /**
+   * @param credential existing credential to copy from
+   */
   public StoredCredential(Credential credential) {
     setAccessToken(credential.getAccessToken());
     setRefreshToken(credential.getRefreshToken());
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java
index 6f97418b2..2bf712d7c 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenVerifier.java
@@ -74,7 +74,9 @@ public IdTokenVerifier() {
     this(new Builder());
   }
 
-  /** @param builder builder */
+  /**
+   * @param builder builder
+   */
   protected IdTokenVerifier(Builder builder) {
     clock = builder.clock;
     acceptableTimeSkewSeconds = builder.acceptableTimeSkewSeconds;
diff --git a/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/DailyMotionUrl.java b/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/DailyMotionUrl.java
index 55376cb00..a4a5b9795 100644
--- a/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/DailyMotionUrl.java
+++ b/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/DailyMotionUrl.java
@@ -30,12 +30,16 @@ public DailyMotionUrl(String encodedUrl) {
     super(encodedUrl);
   }
 
-  /** @return the fields */
+  /**
+   * @return the fields
+   */
   public String getFields() {
     return fields;
   }
 
-  /** @param fields the fields to set */
+  /**
+   * @param fields the fields to set
+   */
   public void setFields(String fields) {
     this.fields = fields;
   }
diff --git a/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/Video.java b/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/Video.java
index 7bbf169ed..6481f983d 100644
--- a/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/Video.java
+++ b/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/Video.java
@@ -17,7 +17,9 @@
 import com.google.api.client.util.Key;
 import java.util.List;
 
-/** @author Yaniv Inbar */
+/**
+ * @author Yaniv Inbar
+ */
 public class Video {
 
   @Key public String id;
diff --git a/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/VideoFeed.java b/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/VideoFeed.java
index 91a4c606e..a68173ef8 100644
--- a/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/VideoFeed.java
+++ b/samples/dailymotion-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/VideoFeed.java
@@ -17,7 +17,9 @@
 import com.google.api.client.util.Key;
 import java.util.List;
 
-/** @author Yaniv Inbar */
+/**
+ * @author Yaniv Inbar
+ */
 public class VideoFeed {
 
   @Key public List<Video> list;