diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java
index 5d1d2b65..970b1f25 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java
@@ -27,8 +27,6 @@ import org.springframework.context.annotation.Import;
 
 /**
  * @author Dave Syer
- * @author
- *
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceJsonEncryptor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceJsonEncryptor.java
index 456802ea..cca1b4d3 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceJsonEncryptor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceJsonEncryptor.java
@@ -26,9 +26,10 @@ import org.springframework.cloud.config.environment.Environment;
 import org.springframework.stereotype.Component;
 
 /**
- * @{link org.springframework.cloud.config.server.encryption.ResourceEncryptor}
+ * {@link org.springframework.cloud.config.server.encryption.ResourceEncryptor}
  * implementation that can decrypt property values prefixed with {cipher} marker in a JSON
  * file.
+ *
  * @author Sean Stiglitz
  */
 @Component
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourcePropertiesEncryptor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourcePropertiesEncryptor.java
index d5f6b95f..b7487e6f 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourcePropertiesEncryptor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourcePropertiesEncryptor.java
@@ -28,9 +28,10 @@ import org.springframework.cloud.config.environment.Environment;
 import org.springframework.stereotype.Component;
 
 /**
- * @{link org.springframework.cloud.config.server.encryption.ResourceEncryptor}
+ * {@link org.springframework.cloud.config.server.encryption.ResourceEncryptor}
  * implementation that can decrypt property values prefixed with {cipher} marker in a
  * Properties file.
+ *
  * @author Sean Stiglitz
  */
 @Component
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceYamlEncryptor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceYamlEncryptor.java
index c8e6763c..dda984e5 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceYamlEncryptor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/CipherResourceYamlEncryptor.java
@@ -26,9 +26,10 @@ import org.springframework.cloud.config.environment.Environment;
 import org.springframework.stereotype.Component;
 
 /**
- * @{link org.springframework.cloud.config.server.encryption.ResourceEncryptor}
+ * {@link org.springframework.cloud.config.server.encryption.ResourceEncryptor}
  * implementation that can decrypt property values prefixed with {cipher} marker in a YAML
  * file.
+ *
  * @author Sean Stiglitz
  */
 @Component
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java
index 747e824e..46d6b02a 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/GenericResourceRepository.java
@@ -182,6 +182,8 @@ public class GenericResourceRepository
 	 * <li>Any combination of leading slash and control characters (00-1F and 7F) with a
 	 * single "/" or "". For example {@code "  / // foo/bar"} becomes {@code "/foo/bar"}.
 	 * </ul>
+	 * @param path path to process
+	 * @return the processed path
 	 * @since 3.2.12
 	 */
 	protected String processPath(String path) {
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GoogleCloudSourceSupport.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GoogleCloudSourceSupport.java
index fe3f6809..f0bd5115 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GoogleCloudSourceSupport.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/GoogleCloudSourceSupport.java
@@ -33,11 +33,9 @@ import static java.util.stream.Collectors.toMap;
 
 /**
  * Provides credentials for Google Cloud Source repositories by adding a
- * {@code Authenticate} http header.
- * <p/>
- * It does so by acting as a transport configurer. If a transport instance targets a
- * Google Cloud Source repository, this implementation retrieves Google Cloud application
- * default credentials and adds them as a http header.
+ * {@code Authenticate} http header. It does so by acting as a transport configurer. If a
+ * transport instance targets a Google Cloud Source repository, this implementation
+ * retrieves Google Cloud application default credentials and adds them as a http header.
  *
  * @author Eduard Wirch
  * @see <a href=
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/PassphraseCredentialsProvider.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/PassphraseCredentialsProvider.java
index 31496b48..6955f379 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/PassphraseCredentialsProvider.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/PassphraseCredentialsProvider.java
@@ -46,7 +46,6 @@ public class PassphraseCredentialsProvider extends CredentialsProvider {
 
 	/**
 	 * {@inheritDoc}
-	 * @return
 	 */
 	@Override
 	public boolean isInteractive() {
@@ -55,7 +54,6 @@ public class PassphraseCredentialsProvider extends CredentialsProvider {
 
 	/**
 	 * {@inheritDoc}
-	 * @return
 	 */
 	@Override
 	public boolean supports(CredentialItem... items) {