diff options
author | donald.g.dunne | 2021-01-19 01:22:22 +0000 |
---|---|---|
committer | donald.g.dunne | 2021-01-19 15:38:19 +0000 |
commit | a7d8a81be3c9c483ad45a0c4a825b42f6f7db520 (patch) | |
tree | f7fccb2e8d2e576055a0500ff4d368c50f3f15e6 | |
parent | 1fd26c08dfdc0cb5c729c93975dcdbc52be9a644 (diff) | |
download | org.eclipse.osee-a7d8a81be3c9c483ad45a0c4a825b42f6f7db520.tar.gz org.eclipse.osee-a7d8a81be3c9c483ad45a0c4a825b42f6f7db520.tar.xz org.eclipse.osee-a7d8a81be3c9c483ad45a0c4a825b42f6f7db520.zip |
refinement[TW18092]: Remove IPT and Color Team attribute types
Change-Id: Id5e0974626b1b5705f9c6460578467a788cedb8f
30 files changed, 12 insertions, 672 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactTypes.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactTypes.java index 551ec713dd2..6f077aceeb2 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactTypes.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsArtifactTypes.java @@ -65,7 +65,6 @@ public interface AtsArtifactTypes { .zeroOrOne(Description)); ArtifactTypeToken Country = ats.add(ats.artifactType(4955822638391722788L, "Country", false, AtsConfigArtifact)); ArtifactTypeToken Insertion = ats.add(ats.artifactType(1735587136604728792L, "Insertion", false, AtsConfigArtifact) - .zeroOrOne(ColorTeam, ColorTeam.Unspecified) .zeroOrOne(Description) .zeroOrOne(EndDate) .zeroOrOne(PointsNumeric) @@ -205,13 +204,11 @@ public interface AtsArtifactTypes { .zeroOrOne(BaselineBranchId) .zeroOrOne(BranchMetrics) .zeroOrOne(ChangeType, ChangeType.Improvement) - .zeroOrOne(ColorTeam, ColorTeam.Unspecified) .any(CommitOverride) .zeroOrOne(Condition) .zeroOrOne(DuplicatedPcrId) .zeroOrOne(EstimateAssumptions) .zeroOrOne(Information) - .zeroOrOne(IPT, IPT.Software) .zeroOrOne(LegacyPcrId) .zeroOrOne(NeedBy) .zeroOrOne(OperationalImpact) @@ -262,12 +259,10 @@ public interface AtsArtifactTypes { .zeroOrOne(ActivityName) .zeroOrOne(CAM) .zeroOrOne(CognosUniqueId) - .zeroOrOne(ColorTeam, ColorTeam.Unspecified) .zeroOrOne(ControlAccount) .zeroOrOne(Description) .zeroOrOne(EndDate) .zeroOrOne(EstimatedHours) - .zeroOrOne(IPT, IPT.Software) .any(Notes) .zeroOrOne(PercentComplete) .zeroOrOne(PointsNumeric) diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java index eb7cea6ddad..d5aeb4185a7 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/AtsAttributeTypes.java @@ -20,8 +20,6 @@ import org.eclipse.osee.ats.api.data.enums.token.ApplicableToProgramAttributeTyp import org.eclipse.osee.ats.api.data.enums.token.CancelledReasonEnumAttributeType; import org.eclipse.osee.ats.api.data.enums.token.ChangeTypeAttributeType; import org.eclipse.osee.ats.api.data.enums.token.ClosureStateAttributeType; -import org.eclipse.osee.ats.api.data.enums.token.ColorTeamAttributeType; -import org.eclipse.osee.ats.api.data.enums.token.IptAttributeType; import org.eclipse.osee.ats.api.data.enums.token.PointAttributeType; import org.eclipse.osee.ats.api.data.enums.token.PriorityAttributeType; import org.eclipse.osee.ats.api.data.enums.token.ReviewBlocksAttributeType; @@ -83,7 +81,6 @@ public interface AtsAttributeTypes { AttributeTypeBoolean ClosureActive = ats.createBoolean(1152921875139002555L, "ats.Closure Active", MediaType.TEXT_PLAIN, "Closure Active status of Program"); ClosureStateAttributeType ClosureState = ats.createEnum(new ClosureStateAttributeType()); AttributeTypeString CognosUniqueId = ats.createString(72063457009467630L, "ats.Cognos Unique Id", MediaType.TEXT_PLAIN, ""); - ColorTeamAttributeType ColorTeam = ats.createEnum(new ColorTeamAttributeType()); AttributeTypeString CommitOverride = ats.createString(104739333325561L, "ats.Commit Override", MediaType.TEXT_PLAIN, "Commit was overridden by user."); AttributeTypeString CompletedBy = ats.createString(1152921504606847167L, "ats.Completed By", MediaType.TEXT_PLAIN, "UserId of the user who completed workflow."); AttributeTypeDate CompletedDate = ats.createDate(1152921504606847166L, "ats.Completed Date", AttributeTypeToken.TEXT_CALENDAR, "Date the workflow was completed."); @@ -108,7 +105,6 @@ public interface AtsAttributeTypes { AttributeTypeString GoalOrderVote = ats.createString(1152921504606847211L, "ats.Goal Order Vote", MediaType.TEXT_PLAIN, "Vote for order item belongs to within goal."); AttributeTypeDate Holiday = ats.createDate(72064629481881851L, "ats.Holiday", AttributeTypeToken.TEXT_CALENDAR, ""); AttributeTypeDouble HoursPerWorkDay = ats.createDouble(1152921504606847187L, "ats.Hours Per Work Day", MediaType.TEXT_PLAIN, ""); - IptAttributeType IPT = ats.createEnum(new IptAttributeType()); AttributeTypeBoolean IsDcs = ats.createBoolean(3199233956221339044L, "ats.Is DCS", MediaType.TEXT_PLAIN, "Is Direct Commercial Sale"); AttributeTypeString KanbanIgnoreStates = ats.createString(726700946264587643L, "ats.kb.Ignore States", MediaType.TEXT_PLAIN, ""); AttributeTypeString KanbanStoryName = ats.createString(72645877009467643L, "ats.kb.Story Name", MediaType.TEXT_PLAIN, ""); diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/enums/token/ColorTeamAttributeType.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/enums/token/ColorTeamAttributeType.java deleted file mode 100644 index 83e9d967147..00000000000 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/enums/token/ColorTeamAttributeType.java +++ /dev/null @@ -1,56 +0,0 @@ -/********************************************************************* - * Copyright (c) 2019 Boeing - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Boeing - initial API and implementation - **********************************************************************/ - -package org.eclipse.osee.ats.api.data.enums.token; - -import javax.ws.rs.core.MediaType; -import org.eclipse.osee.ats.api.data.AtsTypeTokenProvider; -import org.eclipse.osee.ats.api.data.enums.token.ColorTeamAttributeType.ColorTeamEnum; -import org.eclipse.osee.framework.core.data.AttributeTypeEnum; -import org.eclipse.osee.framework.core.data.NamespaceToken; -import org.eclipse.osee.framework.core.data.TaggerTypeToken; -import org.eclipse.osee.framework.core.enums.EnumToken; - -/** - * @author Stephen J. Molaro - */ -public class ColorTeamAttributeType extends AttributeTypeEnum<ColorTeamEnum> { - - public final ColorTeamEnum BloodRedTeam = new ColorTeamEnum(0, "Blood Red Team"); - public final ColorTeamEnum BlueCrewTeam = new ColorTeamEnum(1, "Blue Crew Team"); - public final ColorTeamEnum MeanGreenTeam = new ColorTeamEnum(2, "Mean Green Team"); - public final ColorTeamEnum PurpleTeam = new ColorTeamEnum(3, "Purple Team"); - public final ColorTeamEnum BurntOrangeTeam = new ColorTeamEnum(4, "Burnt Orange Team"); - public final ColorTeamEnum BronzeTeam = new ColorTeamEnum(5, "Bronze Team"); - public final ColorTeamEnum SilverTeam = new ColorTeamEnum(6, "Silver Team"); - public final ColorTeamEnum PirateBlackTeam = new ColorTeamEnum(7, "Pirate Black Team"); - public final ColorTeamEnum GoldTeam = new ColorTeamEnum(8, "Gold Team"); - public final ColorTeamEnum PlaidTeam = new ColorTeamEnum(9, "Plaid Team"); - public final ColorTeamEnum Unspecified = new ColorTeamEnum(10, "Unspecified"); - - public ColorTeamAttributeType(NamespaceToken namespace, int enumCount) { - super(1364016837443371647L, namespace, "ats.Color Team", MediaType.TEXT_PLAIN, "", - TaggerTypeToken.PlainTextTagger, enumCount); - } - - public ColorTeamAttributeType() { - this(AtsTypeTokenProvider.ATS, 11); - } - - public class ColorTeamEnum extends EnumToken { - public ColorTeamEnum(int ordinal, String name) { - super(ordinal, name); - addEnum(this); - } - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/enums/token/IptAttributeType.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/enums/token/IptAttributeType.java deleted file mode 100644 index dd5c7f5c455..00000000000 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/data/enums/token/IptAttributeType.java +++ /dev/null @@ -1,51 +0,0 @@ -/********************************************************************* - * Copyright (c) 2019 Boeing - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Boeing - initial API and implementation - **********************************************************************/ - -package org.eclipse.osee.ats.api.data.enums.token; - -import javax.ws.rs.core.MediaType; -import org.eclipse.osee.ats.api.data.AtsTypeTokenProvider; -import org.eclipse.osee.ats.api.data.enums.token.IptAttributeType.IptEnum; -import org.eclipse.osee.framework.core.data.AttributeTypeEnum; -import org.eclipse.osee.framework.core.data.NamespaceToken; -import org.eclipse.osee.framework.core.data.TaggerTypeToken; -import org.eclipse.osee.framework.core.enums.EnumToken; - -/** - * @author Stephen J. Molaro - */ -public class IptAttributeType extends AttributeTypeEnum<IptEnum> { - - public final IptEnum CommNavAse = new IptEnum(0, "Comm/Nav/Ase"); - public final IptEnum CrewSystems = new IptEnum(1, "Crew Systems"); - public final IptEnum Integration = new IptEnum(2, "Integration"); - public final IptEnum Software = new IptEnum(3, "Software"); - public final IptEnum WeaponsSights = new IptEnum(4, "Weapons/Sights"); - public final IptEnum ProcessorsDisplays = new IptEnum(5, "Processors/Displays"); - - public IptAttributeType(NamespaceToken namespace, int enumCount) { - super(6025996821081174931L, namespace, "ats.IPT", MediaType.TEXT_PLAIN, "", TaggerTypeToken.PlainTextTagger, - enumCount); - } - - public IptAttributeType() { - this(AtsTypeTokenProvider.ATS, 9); - } - - public class IptEnum extends EnumToken { - public IptEnum(int ordinal, String name) { - super(ordinal, name); - addEnum(this); - } - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ev/IAtsEarnedValueService.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ev/IAtsEarnedValueService.java index 3aee4d3863d..142c5211ddf 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ev/IAtsEarnedValueService.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/ev/IAtsEarnedValueService.java @@ -38,8 +38,6 @@ public interface IAtsEarnedValueService { public IAtsWorkPackage getWorkPackage(ArtifactId artifact); - public Collection<String> getColorTeams(); - public Collection<IAtsWorkPackage> getWorkPackages(IAtsInsertionActivity insertionActivity); double getEstimatedHoursFromArtifact(IAtsWorkItem workItem); diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java index 384b8c88b55..ad9caeab3d6 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/IAtsQuery.java @@ -99,8 +99,6 @@ public interface IAtsQuery { IAtsQuery andWorkPackage(Long workPackageId); - IAtsQuery andColorTeam(String colorTeam); - IAtsQuery andActionableItem(IAtsActionableItem actionableItem); Collection<ArtifactId> getItemIds(); diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java index 237a4be939c..8886bb73e48 100644 --- a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java +++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/workflow/AttributeKey.java @@ -23,9 +23,7 @@ import org.eclipse.osee.ats.api.data.AtsAttributeTypes; public enum AttributeKey { Title("N/A"), Priority("/ats/attr/" + AtsAttributeTypes.Priority.getIdString()), - ColorTeam("/ats/attr/" + AtsAttributeTypes.ColorTeam.getIdString()), Assignee("/ats/attr/Assignee"), - IPT("/ats/attr/" + AtsAttributeTypes.IPT.getIdString()), Originator("/ats/attr/Originator"), Version("/ats/action/{id}/UnrelasedVersions"), assocArt("/ats/action/{id}/assocArt/{attrTypeId}"), diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java index 94e37c612c7..c23b5658548 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AtsCore_Column_JT_Suite.java @@ -31,8 +31,7 @@ import org.junit.runners.Suite; InsertionActivityColumnTest.class, ParentTopTeamColumnTest.class, ProgramColumnTest.class, - TeamColumnUtilityTest.class, - ColorTeamColumnTest.class}) + TeamColumnUtilityTest.class}) /** * This test suite contains tests that can be run as stand-alone JUnit tests (JT) * diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ColorTeamColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ColorTeamColumnTest.java deleted file mode 100644 index 297c76637cd..00000000000 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ColorTeamColumnTest.java +++ /dev/null @@ -1,129 +0,0 @@ -/********************************************************************* - * Copyright (c) 2015 Boeing - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Boeing - initial API and implementation - **********************************************************************/ - -package org.eclipse.osee.ats.core.column; - -import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.when; -import org.eclipse.osee.ats.api.AtsApi; -import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.query.IAtsQueryService; -import org.eclipse.osee.ats.api.review.IAtsPeerToPeerReview; -import org.eclipse.osee.ats.api.workdef.IAttributeResolver; -import org.eclipse.osee.ats.api.workflow.IAtsTask; -import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.ats.core.workflow.TeamWorkflow; -import org.eclipse.osee.framework.core.data.ArtifactId; -import org.eclipse.osee.framework.core.data.ArtifactToken; -import org.eclipse.osee.framework.core.enums.CoreUserGroups; -import org.eclipse.osee.framework.jdk.core.type.Pair; -import org.junit.Before; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -/** - * Test Case for {@link ColorTeamColumn} - * - * @author Donald G. Dunne - */ -public class ColorTeamColumnTest { - - // @formatter:off - @Mock private IAtsTask childWorkItem; - @Mock private IAtsPeerToPeerReview peerReview; - @Mock private AtsApi atsServices; - @Mock private IAtsQueryService queryService; - @Mock private IAttributeResolver attributeResolver; - // @formatter:on - - public static final ArtifactToken workPackageArt = ArtifactToken.valueOf(5, "Work Package", COMMON); - private final IAtsTeamWorkflow teamWf1 = new TeamWorkflow(null, null, CoreUserGroups.Everyone); - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - - when(atsServices.getAttributeResolver()).thenReturn(attributeResolver); - when(atsServices.getQueryService()).thenReturn(queryService); - } - - @org.junit.Test - public void testTeamWorkflow() throws Exception { - when(attributeResolver.getSoleAttributeValue(teamWf1, AtsAttributeTypes.WorkPackageReference, - ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); - - Pair<String, Boolean> result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(teamWf1, AtsAttributeTypes.WorkPackageReference, - ArtifactId.SENTINEL)).thenReturn(workPackageArt); - - result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("", result.getFirst()); - - when(queryService.getArtifactById("id")).thenReturn(workPackageArt); - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn(""); - - result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn("red"); - - result = ColorTeamColumn.getWorkItemColorTeam(teamWf1, atsServices); - assertEquals("red", result.getFirst()); - } - - @org.junit.Test - public void testTask() throws Exception { - testChildWorkItem(childWorkItem); - } - - @org.junit.Test - public void testReview() throws Exception { - testChildWorkItem(peerReview); - } - - private void testChildWorkItem(IAtsWorkItem childWorkItem) { - when(attributeResolver.getSoleAttributeValue(childWorkItem, AtsAttributeTypes.WorkPackageReference, - ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); - - Pair<String, Boolean> result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(childWorkItem.getParentTeamWorkflow()).thenReturn(teamWf1); - when(attributeResolver.getSoleAttributeValue(teamWf1, AtsAttributeTypes.WorkPackageReference, - ArtifactId.SENTINEL)).thenReturn(ArtifactId.SENTINEL); - - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(teamWf1, AtsAttributeTypes.WorkPackageReference, - ArtifactId.SENTINEL)).thenReturn(workPackageArt); - - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn(""); - - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("", result.getFirst()); - - when(attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, "")).thenReturn("red"); - - result = ColorTeamColumn.getWorkItemColorTeam(childWorkItem, atsServices); - assertEquals("red", result.getFirst()); - } - -} diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java index 9baa1afac5c..afcad45996e 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/config/WorkPackageUtilityTest.java @@ -13,7 +13,6 @@ package org.eclipse.osee.ats.core.config; -import static org.eclipse.osee.ats.core.column.ColorTeamColumnTest.workPackageArt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.when; @@ -34,6 +33,7 @@ import org.eclipse.osee.ats.api.workflow.IAtsTask; import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.ArtifactToken; +import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.junit.Before; import org.junit.Test; @@ -47,6 +47,8 @@ import org.mockito.MockitoAnnotations; */ public class WorkPackageUtilityTest { + public static final ArtifactToken workPackageArt = ArtifactToken.valueOf(5, "Work Package", CoreBranches.COMMON); + // @formatter:off @Mock private IAtsGoal goal; @Mock private IAtsTeamWorkflow teamWf; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ColorTeamColumn.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ColorTeamColumn.java deleted file mode 100644 index 3f0c40dd1ce..00000000000 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/ColorTeamColumn.java +++ /dev/null @@ -1,80 +0,0 @@ -/********************************************************************* - * Copyright (c) 2015 Boeing - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Boeing - initial API and implementation - **********************************************************************/ - -package org.eclipse.osee.ats.core.column; - -import org.eclipse.osee.ats.api.AtsApi; -import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.util.ColorColumn; -import org.eclipse.osee.ats.api.workdef.IAttributeResolver; -import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; -import org.eclipse.osee.framework.core.data.ArtifactId; -import org.eclipse.osee.framework.jdk.core.type.Pair; - -/** - * @author Donald G. Dunne - */ -public class ColorTeamColumn { - - private static final String WHITE_HEX = "#FFFFFF"; - private static final String BLACK_HEX = "#000000"; - public static final String ATS_COLOR_TEAM_COLUMN_ID = "ats.Color Team"; - - public static Pair<String, Boolean> getWorkItemColorTeam(IAtsWorkItem workItem, AtsApi atsServices) { - Pair<String, Boolean> result = new Pair<>(null, false); - IAttributeResolver attributeResolver = atsServices.getAttributeResolver(); - String colorTeam = ""; - result.setFirst(""); - ArtifactId workPackageArt = - attributeResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.WorkPackageReference, ArtifactId.SENTINEL); - if (workPackageArt.isInvalid()) { - if (!workItem.isTeamWorkflow()) { - IAtsTeamWorkflow teamWf = workItem.getParentTeamWorkflow(); - if (teamWf != null) { - workPackageArt = attributeResolver.getSoleAttributeValue(teamWf, AtsAttributeTypes.WorkPackageReference, - ArtifactId.SENTINEL); - result.setSecond(true); - } - } - } - if (workPackageArt.isValid()) { - colorTeam = attributeResolver.getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, ""); - result.setFirst(colorTeam); - } - if (result.getFirst() == null || colorTeam.isEmpty()) { - colorTeam = attributeResolver.getSoleAttributeValue(workItem, AtsAttributeTypes.ColorTeam, ""); - result.setFirst(colorTeam); - } - if (result.getFirst() == null) { - result.setFirst(""); - } - return result; - } - - public static ColorColumn getColor() { - ColorColumn color = new ColorColumn(); - color.setColumnId(ATS_COLOR_TEAM_COLUMN_ID); - color.setColor("Blood Red Team", WHITE_HEX, "#CC0000"); - color.setColor("Blue Crew Team", WHITE_HEX, "#0000CC"); - color.setColor("Mean Green Team", WHITE_HEX, "#003300"); - color.setColor("Purple Team", WHITE_HEX, "#2E002E"); - color.setColor("Burnt Orange Team", BLACK_HEX, "#CC5200"); - color.setColor("Bronze Team", BLACK_HEX, "#754719"); - color.setColor("Silver Team", BLACK_HEX, "#828268"); - color.setColor("Pirate Black Team", WHITE_HEX, BLACK_HEX); - color.setColor("Gold Team", BLACK_HEX, "#CC9900"); - color.setColor("Plaid Team", BLACK_HEX, "#33CCFF"); - return color; - } -} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java index 320a9a2fdac..80f9fc70ae5 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AbstractAtsQueryImpl.java @@ -54,7 +54,6 @@ import org.eclipse.osee.framework.core.enums.QueryOption; import org.eclipse.osee.framework.jdk.core.type.ResultSet; import org.eclipse.osee.framework.jdk.core.type.ResultSets; import org.eclipse.osee.framework.jdk.core.util.Conditions; -import org.eclipse.osee.framework.jdk.core.util.Strings; /** * @author Donald G. Dunne @@ -73,7 +72,6 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { protected Collection<Long> aiIds; protected Long versionId; protected String stateName; - protected String colorTeam; protected Long programId; protected Long insertionId; protected Long insertionActivityId; @@ -418,8 +416,6 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { } private void addEvConfigCriteria() { - addColorTeamCriteria(); - addWorkPackageCriteria(); addInsertionActivityCriteria(); @@ -437,10 +433,6 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { return insertionId != null && insertionId > 0; } - protected boolean isColorTeamSpecified() { - return Strings.isValid(colorTeam); - } - protected boolean isVersionSpecified() { return versionId != null && versionId > 0; } @@ -765,12 +757,6 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { return this; } - @Override - public IAtsQuery andColorTeam(String colorTeam) { - this.colorTeam = colorTeam; - return this; - } - private void getBaseSearchCriteria(Collection<ArtifactTypeToken> artTypes, boolean withIds, Set<ArtifactTypeToken> allArtTypes) { createQueryBuilder(); @@ -792,35 +778,13 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { public abstract void queryAndIsOfType(Collection<ArtifactTypeToken> artTypes); - /** - * Color Team is handled through workpackage, insertion, activity and program if specified. Otherwise, use color team - * to find all workpackages and add those as work package criteria. - */ - private void addColorTeamCriteria() { - if (Strings.isValid( - colorTeam) && !isWorkPackageSpecified() && !isInsertionActivitySpecified() && !isInsertionSpecified() && !isProgramSpecified()) { - List<String> workPackageIds = org.eclipse.osee.framework.jdk.core.util.Collections.transform( - getWorkPackagesForColorTeam(colorTeam), ArtifactId::getIdString); - queryAnd(AtsAttributeTypes.WorkPackageReference, workPackageIds); - } - } - - public abstract List<ArtifactId> getWorkPackagesForColorTeam(String colorTeam); - private void addWorkPackageCriteria() { if (isWorkPackageSpecified()) { ArtifactId workPackArt = atsApi.getQueryService().getArtifact(workPackageId); - if (isColorTeamMatch(workPackArt)) { - queryAnd(AtsAttributeTypes.WorkPackageReference, workPackArt.getIdString()); - } + queryAnd(AtsAttributeTypes.WorkPackageReference, workPackArt.getIdString()); } } - private boolean isColorTeamMatch(ArtifactId workPackArt) { - return !isColorTeamSpecified() || isColorTeamSpecified() && colorTeam.equals( - atsApi.getAttributeResolver().getSoleAttributeValue(workPackArt, AtsAttributeTypes.ColorTeam, "")); - } - public abstract void queryAnd(AttributeTypeId attrType, String value); private void addVersionCriteria() { @@ -919,9 +883,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { AtsRelationTypes.InsertionToInsertionActivity_InsertionActivity)) { for (ArtifactId workPackageArt : atsApi.getRelationResolver().getRelated(insertionActivityArt, AtsRelationTypes.InsertionActivityToWorkPackage_WorkPackage)) { - if (isColorTeamMatch(workPackageArt)) { - workPackageIds.add(workPackageArt.getIdString()); - } + workPackageIds.add(workPackageArt.getIdString()); } } } @@ -941,9 +903,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { AtsRelationTypes.InsertionToInsertionActivity_InsertionActivity)) { for (ArtifactId workPackageArt : atsApi.getRelationResolver().getRelated(insertionActivityArt, AtsRelationTypes.InsertionActivityToWorkPackage_WorkPackage)) { - if (isColorTeamMatch(workPackageArt)) { - workPackageIds.add(workPackageArt.getIdString()); - } + workPackageIds.add(workPackageArt.getIdString()); } } if (!workPackageIds.isEmpty()) { @@ -972,9 +932,7 @@ public abstract class AbstractAtsQueryImpl implements IAtsQuery { ArtifactId insertionActivityArt = atsApi.getQueryService().getArtifact(insertionActivityId); for (ArtifactId workPackageArt : atsApi.getRelationResolver().getRelated(insertionActivityArt, AtsRelationTypes.InsertionActivityToWorkPackage_WorkPackage)) { - if (isColorTeamMatch(workPackageArt)) { - ids.add(workPackageArt.getIdString()); - } + ids.add(workPackageArt.getIdString()); } } return ids; diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AtsSearchDataSearch.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AtsSearchDataSearch.java index 3014cb884d8..a84bef58d11 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AtsSearchDataSearch.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/query/AtsSearchDataSearch.java @@ -139,9 +139,6 @@ public class AtsSearchDataSearch { if (data.getWorkPackageId() > 0L) { query.andWorkPackage(data.getWorkPackageId()); } - if (Strings.isValid(data.getColorTeam())) { - query.andColorTeam(data.getColorTeam()); - } if (criteriaProvider != null) { criteriaProvider.andCriteria(query); } diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java index 148dfa0804d..978415e9f10 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsActionEndpointImplTest.java @@ -520,16 +520,6 @@ public class AtsActionEndpointImplTest extends AbstractRestTest { } @Test - public void testSetActionColorTeamByKey() { - testSetActionByKey("", "Red Team", AtsAttributeTypes.ColorTeam, AttributeKey.ColorTeam); - } - - @Test - public void testSetActionIptByKey() { - testSetActionByKey("", "My IPT", AtsAttributeTypes.IPT, AttributeKey.IPT); - } - - @Test public void testSetActionVersionByKey() { TeamWorkFlowArtifact teamWf = DemoUtil.getSawCodeCommittedWf(); @@ -633,8 +623,6 @@ public class AtsActionEndpointImplTest extends AbstractRestTest { IAtsActionableItem ai = AtsApiService.get().getActionableItemService().getActionableItemById(DemoArtifactToken.SAW_Code_AI); data.setAiIds(Arrays.asList(ai.getIdString())); - data.addAttrValue(AtsAttributeTypes.ColorTeam, "Blue Team"); - data.addAttrValue(AtsAttributeTypes.IPT, "My IPT"); NewActionResult result = AtsApiService.get().getServerEndpoints().getActionEndpoint().createAction(data); Assert.assertFalse(result.getResults().toString(), result.getResults().isErrors()); Assert.assertNotNull(result.getAction()); @@ -655,10 +643,6 @@ public class AtsActionEndpointImplTest extends AbstractRestTest { Assert.assertEquals(ai, teamWf.getActionableItems().iterator().next()); Assert.assertEquals(needBy, AtsApiService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.NeedBy, "")); - Assert.assertEquals("Blue Team", - AtsApiService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.ColorTeam, "")); - Assert.assertEquals("My IPT", - AtsApiService.get().getAttributeResolver().getSoleAttributeValue(teamWf, AtsAttributeTypes.IPT, "")); AtsDeleteManager.handleDeletePurgeAtsObject( Arrays.asList(AtsApiService.get().getQueryServiceIde().getArtifact(teamWf)), true, DeleteOption.Delete); @@ -746,7 +730,8 @@ public class AtsActionEndpointImplTest extends AbstractRestTest { Assert.assertNotNull(teamArt); // Cleanup test - AtsApiService.get().getQueryServiceIde().getArtifact(teamArt.getParentAction()).deleteAndPersist(getClass().getSimpleName()); + AtsApiService.get().getQueryServiceIde().getArtifact(teamArt.getParentAction()).deleteAndPersist( + getClass().getSimpleName()); teamArt.deleteAndPersist(getClass().getSimpleName()); } diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsAttributeEndpointImplTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsAttributeEndpointImplTest.java index 21ce3f341d4..48bb284c959 100644 --- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsAttributeEndpointImplTest.java +++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/resource/AtsAttributeEndpointImplTest.java @@ -51,14 +51,6 @@ public class AtsAttributeEndpointImplTest extends AbstractRestTest { } @Test - public void testGetValidColorTeams() throws Exception { - getFirstAndCount(AttributeKey.ColorTeam.getUrl(), 11); - - Object object = getFirstAndCount("ats/attr/" + AtsAttributeTypes.ColorTeam.getName(), 11); - Assert.assertEquals("Blood Red Team", object); - } - - @Test public void testGetValidPriority() throws Exception { getFirstAndCount(AttributeKey.Priority.getUrl(), 5); Object object = getFirstAndCount("ats/attr/" + AtsAttributeTypes.Priority.getName(), 5); @@ -66,13 +58,6 @@ public class AtsAttributeEndpointImplTest extends AbstractRestTest { } @Test - public void testGetValidIPT() throws Exception { - getFirstAndCount(AttributeKey.IPT.getUrl(), 6); - Object object = getFirstAndCount("ats/attr/" + AtsAttributeTypes.IPT.getName(), 6); - Assert.assertEquals("Comm/Nav/Ase", object); - } - - @Test public void testEnumeration() throws Exception { Object object = getFirstAndCount("ats/attr/" + AtsAttributeTypes.ChangeType.getIdString(), 4); Assert.assertEquals(ChangeType.Improvement.name(), object); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/column/ColorTeamColumnUI.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/column/ColorTeamColumnUI.java deleted file mode 100644 index dffb4a7cac1..00000000000 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/column/ColorTeamColumnUI.java +++ /dev/null @@ -1,91 +0,0 @@ -/********************************************************************* - * Copyright (c) 2015 Boeing - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Boeing - initial API and implementation - **********************************************************************/ - -package org.eclipse.osee.ats.ide.column; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import org.eclipse.nebula.widgets.xviewer.IXViewerPreComputedColumn; -import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType; -import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign; -import org.eclipse.osee.ats.api.IAtsObject; -import org.eclipse.osee.ats.api.IAtsWorkItem; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.core.column.ColorTeamColumn; -import org.eclipse.osee.ats.ide.internal.AtsApiService; -import org.eclipse.osee.ats.ide.util.xviewer.column.XViewerAtsAttributeValueColumn; -import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.type.Pair; -import org.eclipse.osee.framework.ui.skynet.util.LogUtil; - -/** - * @author Donald G. Dunne - */ -public class ColorTeamColumnUI extends XViewerAtsAttributeValueColumn implements IXViewerPreComputedColumn { - - public static final Integer DEFAULT_WIDTH = 45; - Map<Long, String> workItemIdToColorTeam = new HashMap<>(100); - public static ColorTeamColumnUI instance = new ColorTeamColumnUI(); - - public static ColorTeamColumnUI getInstance() { - return instance; - } - - public ColorTeamColumnUI() { - super(AtsAttributeTypes.ColorTeam, ColorTeamColumn.ATS_COLOR_TEAM_COLUMN_ID, "Color Team", 45, XViewerAlign.Left, - false, SortDataType.String, true, "Color Team associated by related Work Package"); - } - - /** - * XViewer uses copies of column definitions so originals that are registered are not corrupted. Classes extending - * XViewerValueColumn MUST extend this constructor so the correct sub-class is created - */ - @Override - public ColorTeamColumnUI copy() { - ColorTeamColumnUI newXCol = new ColorTeamColumnUI(); - super.copy(this, newXCol); - return newXCol; - } - - @Override - public Long getKey(Object obj) { - Long result = 0L; - if (obj instanceof IAtsObject) { - result = ((IAtsObject) obj).getId(); - } - return result; - } - - @Override - public String getText(Object obj, Long key, String cachedValue) { - return cachedValue; - } - - @Override - public void populateCachedValues(Collection<?> objects, Map<Long, String> preComputedValueMap) { - for (Object element : objects) { - try { - if (element instanceof IAtsWorkItem) { - IAtsWorkItem workItem = (IAtsWorkItem) element; - Pair<String, Boolean> result = - ColorTeamColumn.getWorkItemColorTeam(workItem, AtsApiService.get()); - preComputedValueMap.put(workItem.getId(), result.getFirst()); - } - } catch (OseeCoreException ex) { - LogUtil.getCellExceptionString(ex); - } - } - } - -} diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/WorkPackageConfigLoader.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/WorkPackageConfigLoader.java index 20629d1f4e8..e8448217363 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/WorkPackageConfigLoader.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/WorkPackageConfigLoader.java @@ -76,17 +76,15 @@ public class WorkPackageConfigLoader { } } - data.setColorTeam(workPackageArt.getSoleAttributeValueAsString(AtsAttributeTypes.ColorTeam, "")); data.setWorkPackageProgram( workPackageArt.getSoleAttributeValueAsString(AtsAttributeTypes.WorkPackageProgram, "")); data.setWorkPackageIdStr(workPackageArt.getSoleAttributeValue(AtsAttributeTypes.WorkPackageId, "")); data.setActivityId(workPackageArt.getSoleAttributeValue(AtsAttributeTypes.ActivityId, "")); - data.setWorkPackageIpt(workPackageArt.getSoleAttributeValue(AtsAttributeTypes.IPT, "")); data.setWorkPackageType(workPackageArt.getSoleAttributeValue(AtsAttributeTypes.WorkPackageType, "")); data.setWorkPackageNotes(workPackageArt.getSoleAttributeValue(CoreAttributeTypes.Notes, "")); data.setWorkPackageAnnotation(workPackageArt.getSoleAttributeValue(CoreAttributeTypes.Annotation, "")); - data.setTeamNames( - Collections.toString("; ", workPackageArt.getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToWorkPackage_AtsTeamDefOrAi))); + data.setTeamNames(Collections.toString("; ", + workPackageArt.getRelatedArtifacts(AtsRelationTypes.TeamDefinitionToWorkPackage_AtsTeamDefOrAi))); data.setWorkPackageActive(workPackageArt.getSoleAttributeValue(AtsAttributeTypes.Active, false)); data.setWorkPackageStartDate(workPackageArt.getSoleAttributeValue(AtsAttributeTypes.StartDate, null)); data.setWorkPackageEndDate(workPackageArt.getSoleAttributeValue(AtsAttributeTypes.EndDate, null)); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/internal/AtsEarnedValueImpl.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/internal/AtsEarnedValueImpl.java index a158e758aca..9109e8f266a 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/internal/AtsEarnedValueImpl.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/ev/internal/AtsEarnedValueImpl.java @@ -98,11 +98,6 @@ public class AtsEarnedValueImpl extends AtsAbstractEarnedValueImpl { } @Override - public Collection<String> getColorTeams() { - return AtsAttributeTypes.ColorTeam.getEnumStrValues(); - } - - @Override public double getEstimatedHoursFromTasks(IAtsWorkItem workItem, IStateToken relatedToState) { return 0; } diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/AtsSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/AtsSearchWorkflowSearchItem.java index 571a6137c48..825eea78451 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/AtsSearchWorkflowSearchItem.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/AtsSearchWorkflowSearchItem.java @@ -161,9 +161,6 @@ public class AtsSearchWorkflowSearchItem extends WorldEditorParameterSearchItem if (showWorkPackageWidgets() && getWorkPackage() != null && getWorkPackage().get() != null) { data.setWorkPackageId(getWorkPackage().get().getId()); } - if (getColorTeam() != null && Strings.isValid(getColorTeam().get())) { - data.setColorTeam(getColorTeam().get()); - } if (data.getWorkItemTypes().isEmpty()) { for (WorkItemType type : WorkItemType.values()) { data.getWorkItemTypes().add(type); @@ -198,7 +195,6 @@ public class AtsSearchWorkflowSearchItem extends WorldEditorParameterSearchItem getInsertionActivity().set(data); getWorkPackage().set(data); } - getColorTeam().set(data); getReviewType().set(data); } catch (Exception ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryImpl.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryImpl.java index ee1eb9650af..68a9ab96e23 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryImpl.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/internal/query/AtsQueryImpl.java @@ -18,7 +18,6 @@ import java.util.Collection; import java.util.List; import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.query.AbstractAtsQueryImpl; import org.eclipse.osee.ats.core.query.AtsAttributeQuery; import org.eclipse.osee.ats.ide.internal.AtsApiService; @@ -29,7 +28,6 @@ import org.eclipse.osee.framework.core.data.AttributeTypeId; import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.RelationTypeSide; import org.eclipse.osee.framework.core.enums.QueryOption; -import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.artifact.search.QueryBuilderArtifact; @@ -122,12 +120,6 @@ public class AtsQueryImpl extends AbstractAtsQueryImpl { } @Override - public List<ArtifactId> getWorkPackagesForColorTeam(String colorTeam) { - return Collections.castAll(ArtifactQuery.getArtifactListFromTypeAndAttribute(AtsArtifactTypes.WorkPackage, - AtsAttributeTypes.ColorTeam, colorTeam, AtsApiService.get().getAtsBranch())); - } - - @Override public List<ArtifactId> getRelatedTeamWorkflowIdsBasedOnTeamDefsAisAndVersions(List<AtsAttributeQuery> teamWorkflowAttr) { AtsQueryImpl search = new AtsQueryImpl(atsApi); search.isOfType(AtsArtifactTypes.TeamWorkflow); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/widget/ColorTeamSearchWidget.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/widget/ColorTeamSearchWidget.java deleted file mode 100644 index 5a8ba79512f..00000000000 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/search/widget/ColorTeamSearchWidget.java +++ /dev/null @@ -1,53 +0,0 @@ -/********************************************************************* - * Copyright (c) 2015 Boeing - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Boeing - initial API and implementation - **********************************************************************/ - -package org.eclipse.osee.ats.ide.search.widget; - -import java.util.Arrays; -import java.util.Collection; -import org.eclipse.osee.ats.api.query.AtsSearchData; -import org.eclipse.osee.ats.ide.internal.AtsApiService; -import org.eclipse.osee.ats.ide.world.WorldEditorParameterSearchItem; -import org.eclipse.osee.framework.jdk.core.util.Collections; -import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; - -/** - * @author Donald G. Dunne - */ -public class ColorTeamSearchWidget extends AbstractXComboViewerSearchWidget<String> { - - public static final String COLOR_TEAM = "Color Team"; - - public ColorTeamSearchWidget(WorldEditorParameterSearchItem searchItem) { - super(COLOR_TEAM, searchItem); - } - - @Override - public void set(AtsSearchData data) { - if (getWidget() != null) { - setup(getWidget()); - String colorTeam = data.getColorTeam(); - XComboViewer combo = getWidget(); - if (Strings.isValid(colorTeam)) { - combo.setSelected(Arrays.asList(colorTeam)); - } - } - } - - @Override - public Collection<String> getInput() { - return Collections.castAll(AtsApiService.get().getEarnedValueService().getColorTeams()); - } - -} diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldEditorParameterSearchItem.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldEditorParameterSearchItem.java index 0968943673a..52642e18083 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldEditorParameterSearchItem.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldEditorParameterSearchItem.java @@ -29,7 +29,6 @@ import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workflow.WorkItemType; import org.eclipse.osee.ats.ide.internal.Activator; import org.eclipse.osee.ats.ide.search.widget.ActionableItemSearchWidget; -import org.eclipse.osee.ats.ide.search.widget.ColorTeamSearchWidget; import org.eclipse.osee.ats.ide.search.widget.InsertionActivitySearchWidget; import org.eclipse.osee.ats.ide.search.widget.InsertionSearchWidget; import org.eclipse.osee.ats.ide.search.widget.ProgramSearchWidget; @@ -89,7 +88,6 @@ public abstract class WorldEditorParameterSearchItem extends WorldSearchItem imp private InsertionSearchWidget insertion; private InsertionActivitySearchWidget insertionFeature; private WorkPackageSearchWidget workPackage; - private ColorTeamSearchWidget colorTeam; private UserTypeSearchWidget userType; private ReviewTypeSearchWidget reviewType; @@ -222,8 +220,6 @@ public abstract class WorldEditorParameterSearchItem extends WorldSearchItem imp } else if (widget.getLabel().equals(WorkPackageSearchWidget.WORK_PACKAGE)) { getWorkPackage().setup(widget); getWorkPackage().setInsertionActivityWidget(getInsertionActivity()); - } else if (widget.getLabel().equals(ColorTeamSearchWidget.COLOR_TEAM)) { - getColorTeam().setup(widget); } else if (widget.getLabel().equals(UserSearchWidget.USER)) { getUser().setup(widget); } else if (widget.getLabel().equals(UserTypeSearchWidget.USER_TYPE)) { @@ -266,8 +262,6 @@ public abstract class WorldEditorParameterSearchItem extends WorldSearchItem imp widget.setUseToStringSorter(true); } else if (widget.getLabel().equals(WorkPackageSearchWidget.WORK_PACKAGE)) { widget.setUseToStringSorter(true); - } else if (widget.getLabel().equals(ColorTeamSearchWidget.COLOR_TEAM)) { - widget.setUseToStringSorter(true); } else if (widget.getLabel().equals(UserSearchWidget.USER)) { widget.setUseToStringSorter(true); } @@ -388,13 +382,6 @@ public abstract class WorldEditorParameterSearchItem extends WorldSearchItem imp return workPackage; } - public ColorTeamSearchWidget getColorTeam() { - if (colorTeam == null) { - colorTeam = new ColorTeamSearchWidget(this); - } - return colorTeam; - } - public UserTypeSearchWidget getUserType() { if (userType == null) { userType = new UserTypeSearchWidget(this); diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java index 996a9522dba..e1d90a56343 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java @@ -190,7 +190,6 @@ public class WorldXViewerFactory extends SkynetXViewerFactory { ProgramColumnUI.getInstance(), getColumnServiceColumn(AtsColumnToken.InsertionColumn), getColumnServiceColumn(AtsColumnToken.InsertionActivityColumn), - ColorTeamColumnUI.getInstance(), RelatedArtifactChangedColumn.getInstance(), RelatedArtifactLastModifiedByColumn.getInstance(), RelatedArtifactLastModifiedDateColumn.getInstance(), diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/search/AtsSearchReviewSearchItem.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/search/AtsSearchReviewSearchItem.java index 42dd275373b..dd7e5ce44c8 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/search/AtsSearchReviewSearchItem.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/search/AtsSearchReviewSearchItem.java @@ -78,7 +78,6 @@ public class AtsSearchReviewSearchItem extends AtsSearchWorkflowSearchItem { getStateType().addWidget(); getUser().addWidget(); getUserType().addWidget(); - getColorTeam().addWidget(4); getStateName().addWidget(); getProgram().addWidget(8); getInsertion().addWidget(); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java index 041555ef60d..efc4a8c299e 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/config/UpdateAtsConfiguration.java @@ -23,7 +23,6 @@ import org.eclipse.osee.ats.api.config.AtsAttributeValueColumn; import org.eclipse.osee.ats.api.config.AtsViews; import org.eclipse.osee.ats.api.config.IAtsConfigurationViewsProvider; import org.eclipse.osee.ats.api.util.ColorColumns; -import org.eclipse.osee.ats.core.column.ColorTeamColumn; import org.eclipse.osee.framework.core.data.UserId; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -61,7 +60,6 @@ public class UpdateAtsConfiguration { public XResultData createUpdateConfig(XResultData rd) { UserId user = SystemUser.OseeSystem; ArtifactReadable atsConfigArt = (ArtifactReadable) AtsDbConfigBase.getOrCreateAtsConfig(atsApi); - createUpdateColorColumnAttributes(); createUpdateConfigAttributes(atsConfigArt, user, rd); try { createUpdateValidStateAttributes(); @@ -138,13 +136,6 @@ public class UpdateAtsConfiguration { return VIEWS_EQUAL_KEY + JsonUtil.toJson(defaultViews); } - private void createUpdateColorColumnAttributes() { - ColorColumns columns = new ColorColumns(); - columns.addColumn(ColorTeamColumn.getColor()); - String colorColumnsJson = JsonUtil.toJson(columns); - atsApi.setConfigValue(COLOR_COLUMN_KEY, colorColumnsJson); - } - private void createUpdateValidStateAttributes() throws Exception { Collection<String> validStateNames = atsApi.getWorkDefinitionService().getAllValidStateNames(new XResultData()); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java index a80c8ee1093..5e48ef1c0a6 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/query/AtsQueryImpl.java @@ -15,11 +15,9 @@ package org.eclipse.osee.ats.rest.internal.query; import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; import java.util.List; import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; -import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.query.AbstractAtsQueryImpl; import org.eclipse.osee.ats.core.query.AtsAttributeQuery; import org.eclipse.osee.framework.core.data.ArtifactId; @@ -30,7 +28,6 @@ import org.eclipse.osee.framework.core.data.AttributeTypeToken; import org.eclipse.osee.framework.core.data.RelationTypeSide; import org.eclipse.osee.framework.core.enums.QueryOption; import org.eclipse.osee.orcs.OrcsApi; -import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.search.QueryBuilder; /** @@ -123,16 +120,6 @@ public class AtsQueryImpl extends AbstractAtsQueryImpl { } @Override - public List<ArtifactId> getWorkPackagesForColorTeam(String colorTeam) { - List<ArtifactId> workPackageIds = new LinkedList<>(); - for (ArtifactReadable workPackageArt : query.andTypeEquals(AtsArtifactTypes.WorkPackage).andAttributeIs( - AtsAttributeTypes.ColorTeam, colorTeam).getResults()) { - workPackageIds.add(workPackageArt); - } - return workPackageIds; - } - - @Override public List<ArtifactId> getRelatedTeamWorkflowIdsBasedOnTeamDefsAisAndVersions(List<AtsAttributeQuery> teamWorkflowAttr) { AtsQueryImpl search = new AtsQueryImpl(atsApi, orcsApi); search.isOfType(AtsArtifactTypes.TeamWorkflow); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsEarnedValueImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsEarnedValueImpl.java index 9b105f78c1f..0a751b95241 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsEarnedValueImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/util/AtsEarnedValueImpl.java @@ -41,11 +41,6 @@ public class AtsEarnedValueImpl extends AtsAbstractEarnedValueImpl { } @Override - public Collection<String> getColorTeams() { - throw new UnsupportedOperationException("operation not supported on server"); - } - - @Override public double getEstimatedHoursFromTasks(IAtsWorkItem workItem, IStateToken relatedToState) { return 0; } diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java index b24fe1d0576..41555edc0ca 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsActionEndpointImpl.java @@ -302,12 +302,6 @@ public final class AtsActionEndpointImpl implements AtsActionEndpointApi { } else if (attrTypeIdOrKey.equals(AttributeKey.Priority.name())) { changes.setSoleAttributeValue(workItem, AtsAttributeTypes.Priority, values.iterator().next()); attrTypeId = AtsAttributeTypes.Priority; - } else if (attrTypeIdOrKey.equals(AttributeKey.ColorTeam.name())) { - changes.setSoleAttributeValue(workItem, AtsAttributeTypes.ColorTeam, values.iterator().next()); - attrTypeId = AtsAttributeTypes.ColorTeam; - } else if (attrTypeIdOrKey.equals(AttributeKey.IPT.name())) { - changes.setSoleAttributeValue(workItem, AtsAttributeTypes.IPT, values.iterator().next()); - attrTypeId = AtsAttributeTypes.IPT; } else if (attrTypeIdOrKey.equals(AttributeKey.State.name())) { String state = values.iterator().next(); TransitionHelper helper = new TransitionHelper("Transition Workflow", Arrays.asList(workItem), state, @@ -494,8 +488,6 @@ public final class AtsActionEndpointImpl implements AtsActionEndpointApi { query.andName(entry.getValue().iterator().next(), QueryOption.CONTAINS_MATCH_OPTIONS); } else if (entry.getKey().equals("Priority")) { query.andAttr(AtsAttributeTypes.Priority, entry.getValue()); - } else if (entry.getKey().equals("ColorTeam")) { - query.andColorTeam(entry.getValue().iterator().next()); } else if (entry.getKey().equals("Assignee")) { Collection<AtsUser> assignees = new LinkedList<>(); for (String userId : entry.getValue()) { @@ -505,8 +497,6 @@ public final class AtsActionEndpointImpl implements AtsActionEndpointApi { } } query.andAssignee(assignees.toArray(new AtsUser[assignees.size()])); - } else if (entry.getKey().equals("IPT")) { - query.andAttr(AtsAttributeTypes.IPT, entry.getValue().iterator().next()); } else if (entry.getKey().equals("Team")) { for (String teamId : entry.getValue()) { IAtsTeamDefinition team = atsApi.getQueryService().getConfigItem(Long.valueOf(teamId)); diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java index 3f59e93fcea..754697ffe5d 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/AtsWorkPackageEndpointImpl.java @@ -26,11 +26,9 @@ import javax.ws.rs.core.MediaType; import org.eclipse.osee.ats.api.AtsApi; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; -import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.ev.AtsWorkPackageEndpointApi; import org.eclipse.osee.ats.api.ev.JaxWorkPackageData; import org.eclipse.osee.ats.api.user.AtsUser; -import org.eclipse.osee.ats.api.util.ColorTeam; import org.eclipse.osee.ats.api.util.ColorTeams; import org.eclipse.osee.ats.api.util.IAtsChangeSet; import org.eclipse.osee.ats.api.workflow.WorkItemType; @@ -97,7 +95,6 @@ public class AtsWorkPackageEndpointImpl implements AtsWorkPackageEndpointApi { workItem.getArtifactTypeName()); } changes.setSoleAttributeValue(workItem, AtsAttributeTypes.WorkPackageReference, workPackageArt); - autoAddWorkItemToColorTeamGoals(getColorTeams(), workPackageArt, workPackageId, workItem, changes); rd.getIds().add(workItemId.toString()); } if (!changes.isEmpty()) { @@ -106,37 +103,6 @@ public class AtsWorkPackageEndpointImpl implements AtsWorkPackageEndpointApi { return rd; } - private void autoAddWorkItemToColorTeamGoals(ColorTeams colorTeams, ArtifactReadable workPackageArt, long workPackageId, IAtsWorkItem workItem, IAtsChangeSet changes) { - try { - String workPackageColorTeam = - atsApi.getAttributeResolver().getSoleAttributeValue(workPackageArt, AtsAttributeTypes.ColorTeam, null); - if (Strings.isValid(workPackageColorTeam)) { - for (ColorTeam colorTeam : colorTeams.getTeams()) { - if (!colorTeam.getGoalIds().isEmpty() && colorTeam.getName().equals(workPackageColorTeam)) { - for (Long id : colorTeam.getGoalIds()) { - ArtifactReadable goalArt = (ArtifactReadable) atsApi.getQueryService().getArtifact(id); - if (goalArt != null) { - IAtsWorkItem goalWorkItem = atsApi.getWorkItemService().getWorkItem(goalArt); - if (!atsApi.getRelationResolver().areRelated(goalWorkItem, AtsRelationTypes.Goal_Member, - workItem)) { - changes.relate(goalWorkItem, AtsRelationTypes.Goal_Member, workItem); - } - } else { - logger.error( - "Goal Id [%d] invalid in Color Team [%s] for Work Package [%s] Work Item [%s]; Skipping...", - id, colorTeam, workPackageArt.toStringWithId(), workItem.toStringWithId()); - } - } - } - } - } - } catch (Exception ex) { - logger.error(ex, - "Error adding Work ITem to Color Team goals. Color Teams [%s] Work Package [%s] Work Item [%s]", colorTeams, - workPackageArt.toStringWithId(), workItem.toStringWithId()); - } - } - @Override @GET @Path("colorteam") diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java index f3a8bc64a12..b814ccd5e53 100644 --- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java +++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/workitem/operations/ActionOperations.java @@ -72,12 +72,6 @@ public class ActionOperations { } else if (attrTypeIdOrKey.equals(AttributeKey.Priority.name())) { changes.setSoleAttributeValue(workItem, AtsAttributeTypes.Priority, values.iterator().next()); attrTypeId = AtsAttributeTypes.Priority; - } else if (attrTypeIdOrKey.equals(AttributeKey.ColorTeam.name())) { - changes.setSoleAttributeValue(workItem, AtsAttributeTypes.ColorTeam, values.iterator().next()); - attrTypeId = AtsAttributeTypes.ColorTeam; - } else if (attrTypeIdOrKey.equals(AttributeKey.IPT.name())) { - changes.setSoleAttributeValue(workItem, AtsAttributeTypes.IPT, values.iterator().next()); - attrTypeId = AtsAttributeTypes.IPT; } else if (attrTypeIdOrKey.equals(AttributeKey.State.name())) { String state = values.iterator().next(); TransitionHelper helper = new TransitionHelper("Transition Workflow", Arrays.asList(workItem), state, |