Avoid com.thoughtworks.xstream.annotations

jglick · jglick · commit c1c7c6d3bd52 · 2020-10-08T16:37:59.000-04:00
diff --git a/src/main/java/org/jenkinsci/plugins/github/config/GitHubPluginConfig.java b/src/main/java/org/jenkinsci/plugins/github/config/GitHubPluginConfig.java
@@ -82,6 +82,7 @@ public class GitHubPluginConfig extends GlobalConfiguration {
     private transient InstanceIdentity identity;
 
     public GitHubPluginConfig() {
+        getConfigFile().getXStream().alias("github-server-config", GitHubServerConfig.class);
         load();
     }
 
diff --git a/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java b/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java
@@ -7,7 +7,6 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.Util;
@@ -59,7 +58,6 @@
  * @author lanwen (Merkushev Kirill)
  * @since 1.13.0
  */
-@XStreamAlias("github-server-config")
 public class GitHubServerConfig extends AbstractDescribableImpl<GitHubServerConfig> {
     private static final Logger LOGGER = LoggerFactory.getLogger(GitHubServerConfig.class);
 

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public class GitHubPluginConfig extends GlobalConfiguration {`
`82`	`82`	`private transient InstanceIdentity identity;`
`83`	`83`
`84`	`84`	`public GitHubPluginConfig() {`
	`85`	`+ getConfigFile().getXStream().alias("github-server-config", GitHubServerConfig.class);`
`85`	`86`	`load();`
`86`	`87`	`}`
`87`	`88`