Merge 07a07c7 into f93ab97

src/main/java/de/cronn/jira/sync/config/JiraProjectSync.java

@@ -23,10 +23,15 @@ public class JiraProjectSync {
 	private Map<String, TransitionConfig> transitions = new LinkedHashMap<>();
 	private Map<String, String> versionMapping = new LinkedHashMap<>();
 	private Set<String> versionsToIgnore = new LinkedHashSet<>();
+	private Map<String, String> componentMapping = new LinkedHashMap<>();
+	private Set<String> componentsToIgnore = new LinkedHashSet<>();
 	private Set<String> skipUpdateInTargetWhenStatusIn = new LinkedHashSet<>();
 	private boolean copyCommentsToTarget = false;
 	private Map<String, Map<String, String>> fieldValueMappings = new LinkedHashMap<>();
 
+	public JiraProjectSync() {
+	}
+
 	public String getSourceProject() {
 		return sourceProject;
 	}
@@ -111,6 +116,22 @@ public Set<String> getVersionsToIgnore() {
 		return versionsToIgnore;
 	}
 
+	public Map<String, String> getComponentMapping() {
+		return componentMapping;
+	}
+
+	public void setComponentMapping(Map<String, String> componentMapping) {
+		this.componentMapping = componentMapping;
+	}
+
+	public void setComponentsToIgnore(Set<String> componentsToIgnore) {
+		this.componentsToIgnore = componentsToIgnore;
+	}
+
+	public Set<String> getComponentsToIgnore() {
+		return componentsToIgnore;
+	}
+
 	public void setSkipUpdateInTargetWhenStatusIn(Set<String> skipUpdateInTargetWhenStatusIn) {
 		this.skipUpdateInTargetWhenStatusIn = skipUpdateInTargetWhenStatusIn;
 	}
@@ -142,4 +163,5 @@ public String toString() {
 			.append("targetProject", targetProject)
 			.toString();
 	}
+
 }

src/main/java/de/cronn/jira/sync/domain/JiraComponent.java

@@ -0,0 +1,14 @@
+package de.cronn.jira.sync.domain;
+
+public class JiraComponent extends JiraNamedResource {
+
+	private static final long serialVersionUID = 1L;
+
+	public JiraComponent() {
+	}
+
+	public JiraComponent(String id, String name) {
+		super(id, name);
+	}
+
+}

src/main/java/de/cronn/jira/sync/domain/JiraComponentsList.java

@@ -0,0 +1,9 @@
+package de.cronn.jira.sync.domain;
+
+import java.util.ArrayList;
+
+public class JiraComponentsList extends ArrayList<JiraComponent> {
+
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/de/cronn/jira/sync/domain/JiraField.java

@@ -1,35 +1,21 @@
 package de.cronn.jira.sync.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public class JiraField extends JiraIdResource implements JiraNamedBean {
+public class JiraField extends JiraNamedResource {
 
 	private static final long serialVersionUID = 2L;
 
-	private String name;
 	private Boolean custom;
 	private JiraFieldSchema schema;
 
 	public JiraField() {
 	}
 
 	public JiraField(String id, String name, boolean custom, JiraFieldSchema schema) {
-		super(id);
-		this.name = name;
+		super(id, name);
 		this.custom = custom;
 		this.schema = schema;
 	}
 
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public Boolean isCustom() {
 		return custom;
 	}
@@ -46,12 +32,4 @@ public void setSchema(JiraFieldSchema schema) {
 		this.schema = schema;
 	}
 
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
-			.append("id", getId())
-			.append("name", getName())
-			.toString();
-	}
-
 }

src/main/java/de/cronn/jira/sync/domain/JiraFieldsBean.java

@@ -24,4 +24,8 @@ public interface JiraFieldsBean {
 
 	void setFixVersions(Set<JiraVersion> fixVersions);
 
+	Set<JiraComponent> getComponents();
+
+	void setComponents(Set<JiraComponent> components);
+
 }

src/main/java/de/cronn/jira/sync/domain/JiraFieldsUpdate.java

@@ -19,6 +19,7 @@ public class JiraFieldsUpdate implements Serializable, JiraFieldsBean {
 	private Set<String> labels;
 	private Set<JiraVersion> versions;
 	private Set<JiraVersion> fixVersions;
+	private Set<JiraComponent> components;
 	private JiraUser assignee;
 	private Map<String, Object> other = new LinkedHashMap<>();
 
@@ -79,6 +80,12 @@ public void setVersions(Set<JiraVersion> versions) {
 		this.versions = versions;
 	}
 
+	@JsonIgnore
+	public JiraFieldsUpdate withVersions(Set<JiraVersion> jiraVersions) {
+		setVersions(jiraVersions);
+		return this;
+	}
+
 	@Override
 	public Set<JiraVersion> getFixVersions() {
 		return fixVersions;
@@ -95,9 +102,19 @@ public JiraFieldsUpdate withFixVersions(Set<JiraVersion> jiraVersions) {
 		return this;
 	}
 
+	@Override
+	public Set<JiraComponent> getComponents() {
+		return components;
+	}
+
+	@Override
+	public void setComponents(Set<JiraComponent> components) {
+		this.components = components;
+	}
+
 	@JsonIgnore
-	public JiraFieldsUpdate withVersions(Set<JiraVersion> jiraVersions) {
-		setVersions(jiraVersions);
+	public JiraFieldsUpdate withComponents(Set<JiraComponent> jiraComponents) {
+		setComponents(jiraComponents);
 		return this;
 	}
 

src/main/java/de/cronn/jira/sync/domain/JiraIssue.java

@@ -12,7 +12,7 @@ public class JiraIssue extends JiraIdResource {
 	private String key;
 
 	private JiraIssueFields fields;
-	
+
 	private JiraChangeLog changelog;
 
 	public JiraIssue() {
@@ -45,17 +45,17 @@ public void setKey(String key) {
 	public JiraIssueFields getFields() {
 		return fields;
 	}
-	
+
 	public void setFields(JiraIssueFields fields) {
 		this.fields = fields;
 	}
-	
+
 	@JsonIgnore
 	public JiraIssue withFields(JiraIssueFields fields) {
 		setFields(fields);
 		return this;
 	}
-	
+
 	public JiraChangeLog getChangelog() {
 		return changelog;
 	}
@@ -71,7 +71,7 @@ public JiraIssueFields getOrCreateFields() {
 		}
 		return fields;
 	}
-	
+
 	@JsonIgnore
 	public JiraChangeLog getOrCreateChangeLog() {
 		if (changelog == null) {

src/main/java/de/cronn/jira/sync/domain/JiraIssueFields.java

@@ -34,6 +34,8 @@ public class JiraIssueFields extends JiraResource implements JiraFieldsBean {
 
 	private Set<JiraVersion> fixVersions;
 
+	private Set<JiraComponent> components;
+
 	private JiraUser assignee;
 
 	@JsonFormat(pattern = JIRA_DATE_FORMAT)
@@ -156,6 +158,16 @@ public Set<JiraVersion> getFixVersions() {
 		return fixVersions;
 	}
 
+	@Override
+	public void setComponents(Set<JiraComponent> components) {
+		this.components = components;
+	}
+
+	@Override
+	public Set<JiraComponent> getComponents() {
+		return components;
+	}
+
 	@Override
 	public JiraUser getAssignee() {
 		return assignee;

src/main/java/de/cronn/jira/sync/domain/JiraIssueStatus.java

@@ -1,56 +1,14 @@
 package de.cronn.jira.sync.domain;
 
-import java.util.Objects;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public class JiraIssueStatus extends JiraIdResource implements JiraNamedBean {
+public class JiraIssueStatus extends JiraNamedResource {
 
 	private static final long serialVersionUID = 1L;
 
-	private String name;
-
 	public JiraIssueStatus() {
 	}
 
 	public JiraIssueStatus(String id, String name) {
-		super(id);
-		this.name = name;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
-			.append("id", getId())
-			.append("name", getName())
-			.toString();
+		super(id, name);
 	}
 
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		JiraIssueStatus that = (JiraIssueStatus) o;
-		return Objects.equals(getId(), that.getId())
-			&& Objects.equals(getName(), that.getName());
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(getId(), getName());
-	}
 }

src/main/java/de/cronn/jira/sync/domain/JiraIssueType.java

@@ -1,36 +1,14 @@
 package de.cronn.jira.sync.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public class JiraIssueType extends JiraIdResource implements JiraNamedBean {
+public class JiraIssueType extends JiraNamedResource {
 
 	private static final long serialVersionUID = 1L;
 
-	private String name;
-
 	public JiraIssueType() {
 	}
 
 	public JiraIssueType(String id, String name) {
-		super(id);
-		this.name = name;
-	}
-
-	@Override
-	public String getName() {
-		return name;
+		super(id, name);
 	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
-			.append("id", getId())
-			.append("name", name)
-			.toString();
-	}
 }

src/main/java/de/cronn/jira/sync/domain/JiraNamedResource.java

@@ -0,0 +1,61 @@
+package de.cronn.jira.sync.domain;
+
+import java.util.Objects;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public abstract class JiraNamedResource extends JiraIdResource implements JiraNamedBean {
+
+	private String name;
+
+	public JiraNamedResource() {
+	}
+
+	public JiraNamedResource(String id, String name) {
+		super(id);
+		this.name = name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+			.append("id", getId())
+			.append("name", name)
+			.toString();
+	}
+
+	@Override
+	public final boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+
+		if (!(o instanceof JiraNamedResource)) {
+			return false;
+		}
+
+		JiraNamedResource that = (JiraNamedResource) o;
+
+		return new EqualsBuilder()
+			.append(getId(), that.getId())
+			.append(getName(), that.getName())
+			.isEquals();
+	}
+
+	@Override
+	public final int hashCode() {
+		return Objects.hash(getId(), getName());
+	}
+
+}