Remove XStream dependency (#742)

yahavi · web-flow · commit 2730aeb815cd · 2023-06-28T11:36:27.000+03:00
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/Agent.java b/build-info-api/src/main/java/org/jfrog/build/api/Agent.java
@@ -1,6 +1,5 @@
 package org.jfrog.build.api;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -10,7 +9,6 @@
  *
  * @author Noam Y. Tenne
  */
-@XStreamAlias("agent")
 public class Agent implements Serializable {
 
     private String name;
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/Artifact.java b/build-info-api/src/main/java/org/jfrog/build/api/Artifact.java
@@ -1,14 +1,12 @@
 package org.jfrog.build.api;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 /**
  * Contains the build deployed artifact information
  *
  * @author Noam Y. Tenne
  */
-@XStreamAlias(BuildBean.ARTIFACT)
 public class Artifact extends BaseBuildFileBean {
 
     private String name;
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/Build.java b/build-info-api/src/main/java/org/jfrog/build/api/Build.java
@@ -1,7 +1,6 @@
 package org.jfrog.build.api;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.jfrog.build.api.dependency.BuildDependency;
 import org.jfrog.build.api.release.PromotionStatus;
 
@@ -10,13 +9,10 @@
 import java.util.Date;
 import java.util.List;
 
-import static org.jfrog.build.api.BuildBean.ROOT;
-
 /**
  * Represents pure (without logic) schema of build info which contains the build info properties of a typical build.
  * Convert org.jfrog.build.extractor.ci.BuildInfo to this class before sending the build info.
  */
-@XStreamAlias(ROOT)
 @JsonIgnoreProperties(ignoreUnknown = true, value = {"project", "startedMillis"})
 public class Build extends BaseBuildBean {
 
@@ -44,10 +40,8 @@ public class Build extends BaseBuildBean {
 
     private BuildRetention buildRetention;
 
-    @XStreamAlias(RUN_PARAMETERS)
     private List<MatrixParameter> runParameters;
 
-    @XStreamAlias(MODULES)
     private List<Module> modules;
 
     private List<PromotionStatus> statuses;
@@ -240,7 +234,6 @@ public long getStartedMillis() {
 
     /**
      * Sets the started time of the build in a unit of milliseconds
-     *
      */
     public void setStartedMillis(long startedMillis) {
         this.startedMillis = startedMillis;
@@ -468,6 +461,7 @@ public void setBuildDependencies(List<BuildDependency> buildDependencies) {
     public Issues getIssues() {
         return issues;
     }
+
     public void setIssues(Issues issues) {
         this.issues = issues;
     }
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/BuildAgent.java b/build-info-api/src/main/java/org/jfrog/build/api/BuildAgent.java
@@ -2,7 +2,6 @@
 
 package org.jfrog.build.api;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -12,7 +11,6 @@
  *
  * @author Tomer Cohen
  */
-@XStreamAlias("buildagent")
 public class BuildAgent implements Serializable {
 
     private String name;
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/BuildBean.java b/build-info-api/src/main/java/org/jfrog/build/api/BuildBean.java
@@ -11,16 +11,6 @@
  * @author Noam Y. Tenne
  */
 public interface BuildBean extends Serializable {
-    String ROOT = "build";
-    String MODULES = "modules";
-    String MODULE = "module";
-    String ARTIFACTS = "artifacts";
-    String EXCLUDED_ARTIFACTS = "excludedArtifacts";
-    String ARTIFACT = "artifact";
-    String DEPENDENCIES = "dependencies";
-    String DEPENDENCY = "dependency";
-    String RUN_PARAMETERS = "runParameters";
-
     /**
      * Returns the properties of the bean
      *
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/BuildRetention.java b/build-info-api/src/main/java/org/jfrog/build/api/BuildRetention.java
@@ -1,7 +1,6 @@
 package org.jfrog.build.api;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -11,7 +10,6 @@
 /**
  * @author Tomer Cohen
  */
-@XStreamAlias("buildretention")
 public class BuildRetention implements Serializable {
 
     private int count = -1;
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/Dependency.java b/build-info-api/src/main/java/org/jfrog/build/api/Dependency.java
@@ -1,6 +1,5 @@
 package org.jfrog.build.api;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -13,7 +12,6 @@
  *
  * @author Noam Y. Tenne
  */
-@XStreamAlias(BuildBean.DEPENDENCY)
 public class Dependency extends BaseBuildFileBean {
 
     public static final String SCOPE_BUILD = "_build_";
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/MatrixParameter.java b/build-info-api/src/main/java/org/jfrog/build/api/MatrixParameter.java
@@ -1,9 +1,6 @@
 package org.jfrog.build.api;
 
-//import com.thoughtworks.xstream.annotations.XStreamAlias;
-
 import java.io.Serializable;
-//import static org.jfrog.build.api.BuildBean.RUN_PARAMETERS;
 
 /**
  * @author Lior Hasson
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/Module.java b/build-info-api/src/main/java/org/jfrog/build/api/Module.java
@@ -1,20 +1,16 @@
 package org.jfrog.build.api;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Objects;
 
-import static org.jfrog.build.api.BuildBean.MODULE;
-
 /**
  * Contains the build module information
  *
  * @author Noam Y. Tenne
  */
-@XStreamAlias(MODULE)
 public class Module extends BaseBuildBean {
 
     private String type;
@@ -27,13 +23,10 @@ public class Module extends BaseBuildBean {
 
     private String sha1;
 
-    @XStreamAlias(ARTIFACTS)
     private List<Artifact> artifacts;
 
-    @XStreamAlias(EXCLUDED_ARTIFACTS)
     private List<Artifact> excludedArtifacts;
 
-    @XStreamAlias(DEPENDENCIES)
     private List<Dependency> dependencies;
 
     /**
diff --git a/build-info-api/src/main/java/org/jfrog/build/api/Vcs.java b/build-info-api/src/main/java/org/jfrog/build/api/Vcs.java
@@ -1,13 +1,11 @@
 package org.jfrog.build.api;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.Objects;
 
-@XStreamAlias(BuildInfoFields.VCS)
 public class Vcs implements Serializable {
     private String revision = "";
     private String message = "";
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Agent.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Agent.java
@@ -1,15 +1,12 @@
 package org.jfrog.build.extractor.ci;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 
 /**
  * Information about the agent that triggered the build (e.g. Jenkins, TeamCity etc.).
- *
  */
-@XStreamAlias("agent")
 public class Agent implements Serializable {
 
     private String name;
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Artifact.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Artifact.java
@@ -1,12 +1,10 @@
 package org.jfrog.build.extractor.ci;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 /**
  * Contains the build deployed artifact information
  */
-@XStreamAlias(BuildBean.ARTIFACT)
 public class Artifact extends BaseBuildFileBean {
 
     private String name;
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/BuildAgent.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/BuildAgent.java
@@ -2,15 +2,13 @@
 
 package org.jfrog.build.extractor.ci;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 
 /**
  * Information about the agent that executed the build (e.g. Maven, Ant/Ivy, Gradle etc.)
  */
-@XStreamAlias("buildagent")
 public class BuildAgent implements Serializable {
 
     private String name;
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/BuildInfo.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/BuildInfo.java
@@ -2,7 +2,6 @@
 package org.jfrog.build.extractor.ci;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 import org.jfrog.build.api.Build;
 import org.jfrog.build.api.builder.ModuleType;
@@ -18,13 +17,10 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import static org.jfrog.build.extractor.ci.BuildBean.ROOT;
-
 /**
  * A temporary build-info for CI use (e.g. Artifactory jenkins plugin, Maven plugin, etc.).
- *  BuildInfo class should be converted to {@link org.jfrog.build.api.Build} before publishing / getting build-info from Artifactory.
+ * BuildInfo class should be converted to {@link org.jfrog.build.api.Build} before publishing / getting build-info from Artifactory.
  */
-@XStreamAlias(ROOT)
 @JsonIgnoreProperties(ignoreUnknown = true, value = {"project", "startedMillis"})
 public class BuildInfo extends BaseBuildBean {
 
@@ -52,10 +48,8 @@ public class BuildInfo extends BaseBuildBean {
 
     private BuildRetention buildRetention;
 
-    @XStreamAlias(RUN_PARAMETERS)
     private List<MatrixParameter> runParameters;
 
-    @XStreamAlias(MODULES)
     private List<Module> modules;
 
     private List<PromotionStatus> statuses;
@@ -620,10 +614,9 @@ public Build ToBuild() {
         return builder.build();
     }
 
-    public static BuildInfo ToBuildInfo( org.jfrog.build.api.Build build) {
+    public static BuildInfo ToBuildInfo(org.jfrog.build.api.Build build) {
         BuildInfoBuilder builder = new BuildInfoBuilder(build.getName());
-                 builder
-                .number(build.getNumber())
+        builder.number(build.getNumber())
                 .setProject(build.getProject())
                 .agent(build.getAgent() == null ? null : new Agent(build.getAgent().getName(), build.getAgent().getVersion()))
                 .buildAgent(build.getBuildAgent() == null ? null : new BuildAgent(build.getBuildAgent().getName(), build.getBuildAgent().getVersion()))
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/BuildRetention.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/BuildRetention.java
@@ -1,14 +1,12 @@
 package org.jfrog.build.extractor.ci;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-@XStreamAlias("buildretention")
 public class BuildRetention implements Serializable {
 
     private int count = -1;
@@ -82,7 +80,7 @@ public org.jfrog.build.api.BuildRetention ToBuildRetention() {
     }
 
     public static BuildRetention ToBuildInfoRetention(org.jfrog.build.api.BuildRetention br) {
-       BuildRetention result = new BuildRetention();
+        BuildRetention result = new BuildRetention();
         result.setDeleteBuildArtifacts(br.isDeleteBuildArtifacts());
         result.setCount(br.getCount());
         result.setMinimumBuildDate(br.getMinimumBuildDate());
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Dependency.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Dependency.java
@@ -1,6 +1,5 @@
 package org.jfrog.build.extractor.ci;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -11,7 +10,6 @@
 /**
  * Contains the build info module dependency information
  */
-@XStreamAlias(BuildBean.DEPENDENCY)
 public class Dependency extends BaseBuildFileBean {
 
     public static final String SCOPE_BUILD = "_build_";
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Module.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Module.java
@@ -1,25 +1,17 @@
 package org.jfrog.build.extractor.ci;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.jfrog.build.extractor.ci.BuildBean.MODULE;
-
 /**
  * Contains the build module information
  *
  * @author Noam Y. Tenne
  */
-@XStreamAlias(MODULE)
 public class Module extends BaseBuildBean {
 
     private String type;
@@ -32,13 +24,10 @@ public class Module extends BaseBuildBean {
 
     private String sha1;
 
-    @XStreamAlias(ARTIFACTS)
     private List<Artifact> artifacts;
 
-    @XStreamAlias(EXCLUDED_ARTIFACTS)
     private List<Artifact> excludedArtifacts;
 
-    @XStreamAlias(DEPENDENCIES)
     private List<Dependency> dependencies;
 
     /**
diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Vcs.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/ci/Vcs.java
@@ -1,13 +1,11 @@
 package org.jfrog.build.extractor.ci;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.Objects;
 
-@XStreamAlias(BuildInfoFields.VCS)
 public class Vcs implements Serializable {
     private String revision = "";
     private String message = "";
@@ -100,6 +98,6 @@ public org.jfrog.build.api.Vcs ToBuildVcs() {
     }
 
     public static Vcs ToBuildInfoVcs(org.jfrog.build.api.Vcs vcs) {
-        return new Vcs(vcs.getUrl(),vcs.getRevision() ,vcs.getBranch() ,vcs.getMessage());
+        return new Vcs(vcs.getUrl(), vcs.getRevision(), vcs.getBranch(), vcs.getMessage());
     }
 }
diff --git a/build.gradle b/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`	`1`	`package org.jfrog.build.extractor.ci;`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonIgnore;`
`4`		`-import com.thoughtworks.xstream.annotations.XStreamAlias;`
`5`	`4`	`import org.apache.commons.lang3.StringUtils;`
`6`	`5`
`7`	`6`	`import java.io.Serializable;`
`8`	`7`	`import java.util.Objects;`
`9`	`8`
`10`		`-@XStreamAlias(BuildInfoFields.VCS)`
`11`	`9`	`public class Vcs implements Serializable {`
`12`	`10`	`private String revision = "";`
`13`	`11`	`private String message = "";`
`@@ -100,6 +98,6 @@ public org.jfrog.build.api.Vcs ToBuildVcs() {`
`100`	`98`	`}`
`101`	`99`
`102`	`100`	`public static Vcs ToBuildInfoVcs(org.jfrog.build.api.Vcs vcs) {`
`103`		`- return new Vcs(vcs.getUrl(),vcs.getRevision() ,vcs.getBranch() ,vcs.getMessage());`
	`101`	`+ return new Vcs(vcs.getUrl(), vcs.getRevision(), vcs.getBranch(), vcs.getMessage());`
`104`	`102`	`}`
`105`	`103`	`}`