diff options
author | donald.g.dunne | 2017-04-21 17:39:03 +0000 |
---|---|---|
committer | Donald Dunne | 2017-04-21 19:49:35 +0000 |
commit | 21ceafa068ecf89e38c408c5fd8a81c70b80d01a (patch) | |
tree | e2f633f06de4eb6192c1e5ce2810545a94f5ec22 | |
parent | a774b57bc1d40b4526ec74e9b4fcc62e72d04b53 (diff) | |
download | org.eclipse.osee-21ceafa068ecf89e38c408c5fd8a81c70b80d01a.tar.gz org.eclipse.osee-21ceafa068ecf89e38c408c5fd8a81c70b80d01a.tar.xz org.eclipse.osee-21ceafa068ecf89e38c408c5fd8a81c70b80d01a.zip |
feature[ats_ATS370497]: Improve Orcs Writer Update to not require Name
Change-Id: I0d3d50e7efddb8e863f5bbda04b07ae42a97a4aa
3 files changed, 3 insertions, 7 deletions
diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java index 350f9162794..bbeba97326d 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorValidator.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.AttributeTypeId; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -179,10 +179,6 @@ public class OrcsCollectorValidator { } private void validateCreateUpdateAttributes(OwArtifact artifact, XResultData results) { - String name = artifact.getName(); - if (!Strings.isValid(name)) { - results.errorf("Artifact [%s] does not have Name attribute.\n", artifact); - } for (OwAttribute attribute : artifact.getAttributes()) { OwAttributeType owAttrType = attribute.getType(); diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java index 1dcbe31c948..2245c39dd3f 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsCollectorWriter.java @@ -97,7 +97,7 @@ public class OrcsCollectorWriter { throw new OseeArgumentException("Artifact not found for OwArtifact %s", owArtifact); } - if (!owArtifact.getName().equals(artifact.getName())) { + if (Strings.isValid(owArtifact.getName()) && !owArtifact.getName().equals(artifact.getName())) { getTransaction().setName(artifact, owArtifact.getName()); logChange(artifact, CoreAttributeTypes.Name, artifact.getName(), owArtifact.getName()); } diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForCreateUpdate.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForCreateUpdate.java index d9a518e40c8..d0fd68f9387 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForCreateUpdate.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/writer/OrcsWriterSheetProcessorForCreateUpdate.java @@ -193,7 +193,7 @@ public class OrcsWriterSheetProcessorForCreateUpdate implements RowProcessor { } } } - if (nameColumn == colCount) { + if (nameColumn != null && nameColumn == colCount) { String value = row[colCount]; if (Strings.isValid(value)) { artifact.setName(value); |