[JENKINS-38978] Fix Javadoc generation errors

In the _MavenMetadataParameterDefinitionBackwardCompatibility_ class, the required getters had to be implemented manually, because otherwise Lombok copies the fields' Javadoc comment and generates the getter with broken Javadoc.
jenkinsci · Jan 4, 2018 · 4e63757 · 4e63757
1 parent 68b2aa9
commit 4e63757
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/.../markov/jenkins/plugin/mvnmeta/MavenMetadataParameterDefinitionBackwardCompatibility.java b/.../markov/jenkins/plugin/mvnmeta/MavenMetadataParameterDefinitionBackwardCompatibility.java
@@ -38,8 +38,6 @@
 import com.cloudbees.plugins.credentials.domains.Domain;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
 
-import lombok.Getter;
-
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -51,7 +49,6 @@
  *
  * @author Marc Rohlfs, Silpion IT-Solutions GmbH - <a href="mailto:rohlfs@silpion.de">rohlfs@silpion.de</a>
  */
-@Getter
 @SuppressWarnings("deprecation")
 public abstract class MavenMetadataParameterDefinitionBackwardCompatibility extends ParameterDefinition {
   private static final long serialVersionUID = -694351540106684393L;
@@ -148,4 +145,28 @@ private String createRepoBaseUrlWithImplicitUser() throws MalformedURLException
   protected abstract String getCredentialsId();
 
   protected abstract void setCredentialsId(final String credentialsId);
+
+  /**
+   * Returns the username.
+   *
+   * @return the username.
+   * @deprecated Migrated to {@link MavenMetadataParameterDefinition#credentialsId}
+   */
+  @Deprecated
+  @SuppressWarnings("all")
+  public String getUsername() {
+    return this.username;
+  }
+
+  /**
+   * Returns the password.
+   *
+   * @return the password.
+   * @deprecated Migrated to {@link MavenMetadataParameterDefinition#credentialsId}
+   */
+  @Deprecated
+  @SuppressWarnings("all")
+  public String getPassword() {
+    return this.password;
+  }
 }
diff --git a/src/main/lombok/eu/markov/jenkins/plugin/mvnmeta/MavenMetadataParameterValue.java b/src/main/lombok/eu/markov/jenkins/plugin/mvnmeta/MavenMetadataParameterValue.java
@@ -64,9 +64,6 @@ public class MavenMetadataParameterValue extends ParameterValue {
   @Exported
   private String             artifactUrl;
 
-  /**
-   * @param name
-   */
   @DataBoundConstructor
   public MavenMetadataParameterValue(String name, String description, String groupId, String artifactId, String version,
         String packaging, String classifier, String artifactUrl) {

diff --git a/src/main/lombok/eu/markov/jenkins/plugin/mvnmeta/MavenMetadataRebuildParameterProvider.java b/src/main/lombok/eu/markov/jenkins/plugin/mvnmeta/MavenMetadataRebuildParameterProvider.java
@@ -32,9 +32,8 @@
 public class MavenMetadataRebuildParameterProvider extends RebuildParameterProvider {
 
     /**
-     * Provide a view for specified {@link ParameterValue}.
-     * <p/>
-     * Return null if cannot handle specified {@link ParameterValue}.
+     * Provide a view for specified {@link ParameterValue}. Returns {@code null} if specified
+     * {@link ParameterValue} cannot be handled.
      *
      * @param value a value to be shown in a rebuild page.
      * @return page for the parameter value. null for parameter values cannot be handled.