From 0748e1ae673255c6e6e008e80b51a37e26a3fbf2 Mon Sep 17 00:00:00 2001 From: donald.g.dunne Date: Thu, 10 Apr 2014 08:54:29 -0700 Subject: feature[ats_ATS19845]: Convert IOseeBranch to Identity-Long Change-Id: I7f80ae8ef235b6c0adc91709b1b4657d1ab065c7 --- .../osee/framework/core/message/BranchCacheUpdateUtil.java | 6 ++++-- .../osee/framework/skynet/core/artifact/BranchManager.java | 4 ++-- .../osee/framework/skynet/core/event/FrameworkEventUtil.java | 2 +- .../osee/orcs/rest/model/search/branch/BranchQueryOptions.java | 6 +++--- .../orcs/rest/internal/search/branch/BranchQueryResource.java | 10 +++++----- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java index 0e884791ee7..04017aca0c0 100644 --- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java +++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java @@ -46,6 +46,7 @@ public final class BranchCacheUpdateUtil { private final BranchFactory factory; private final TransactionCache txCache; + public static final Long DEFAULT_UUID = -1L; public BranchCacheUpdateUtil(BranchFactory factory, TransactionCache txCache) { this.factory = factory; @@ -153,8 +154,9 @@ public final class BranchCacheUpdateUtil { } private static void addMergeBranches(List> srcDestMerge, MergeBranch mergeBranch) throws OseeCoreException { - Long src = mergeBranch.getSourceBranch() != null ? mergeBranch.getSourceBranch().getGuid() : null; - Long dest = mergeBranch.getDestinationBranch() != null ? mergeBranch.getDestinationBranch().getGuid() : null; + Long src = mergeBranch.getSourceBranch() != null ? mergeBranch.getSourceBranch().getGuid() : DEFAULT_UUID; + Long dest = + mergeBranch.getDestinationBranch() != null ? mergeBranch.getDestinationBranch().getGuid() : DEFAULT_UUID; Long merge = mergeBranch.getGuid(); srcDestMerge.add(new Triplet(src, dest, merge)); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java index a8a3df78f66..da2b01470fb 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java @@ -161,7 +161,7 @@ public class BranchManager { } public static long getBranchId(IOseeBranch branch) throws OseeCoreException { - return getBranch(branch).getId(); + return branch.getUuid(); } public static Branch getBranch(IOseeBranch branch) throws OseeCoreException { @@ -232,7 +232,7 @@ public class BranchManager { return getCache().get(branchToken) != null; } - public static boolean branchExists(Long id) throws OseeCoreException { + public static boolean branchExists(long id) throws OseeCoreException { return getCache().getById(id) != null; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java index 1b0d1aca60e..b29fe111a27 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkEventUtil.java @@ -216,7 +216,7 @@ public final class FrameworkEventUtil { } public static ArtifactEvent getPersistEvent(RemotePersistEvent1 remEvent) { - ArtifactEvent event = new ArtifactEvent(Long.valueOf(remEvent.getBranchGuid())); + ArtifactEvent event = new ArtifactEvent(getBranchUuidFromRemoteEvent(remEvent.getBranchGuid())); event.setNetworkSender(getNetworkSender(remEvent.getNetworkSender())); event.setTransactionId(remEvent.getTransactionId()); for (RemoteBasicGuidArtifact1 remGuidArt : remEvent.getArtifacts()) { diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java index 97d45aceffc..b476a0c6614 100644 --- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java +++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/branch/BranchQueryOptions.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.enums.BranchType; */ public class BranchQueryOptions { - private List branchIds; + private List branchIds; private List branchTypes; private List branchStates; private boolean includeDeleted; @@ -29,11 +29,11 @@ public class BranchQueryOptions { private Long isChildOf = -1L; private Long isAncestorOf = -1L; - public List getBranchIds() { + public List getBranchIds() { return branchIds; } - public void setBranchIds(List branchIds) { + public void setBranchIds(List branchIds) { this.branchIds = branchIds; } diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java index 98886b18a95..943053234ec 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/branch/BranchQueryResource.java @@ -85,9 +85,9 @@ public class BranchQueryResource { public Response searchBranchesFromQuery(@QueryParam("branchIds") String branchIds, @QueryParam("branchTypes") String branchTypes, @QueryParam("branchStates") String branchStates, @QueryParam("deleted") boolean deleted, @QueryParam("archived") boolean archived, @QueryParam("nameEquals") String nameEquals, @QueryParam("namePattern") String namePattern, @QueryParam("childOf") Long childOf, @QueryParam("ancestorOf") Long ancestorOf, @QueryParam("pretty") boolean pretty) { BranchQueryOptions options = new BranchQueryOptions(); if (Strings.isValid(branchIds)) { - List branchIdVals = new LinkedList(); + List branchIdVals = new LinkedList(); for (String branchId : branchIds.split(",")) { - branchIdVals.add(Integer.parseInt(branchId)); + branchIdVals.add(Long.parseLong(branchId)); } options.setBranchIds(branchIdVals); } @@ -169,7 +169,7 @@ public class BranchQueryResource { private List getResultsFromOptions(BranchQueryOptions options) { BranchQuery query = orcsApi.getQueryFactory(null).branchQuery(); if (Conditions.hasValues(options.getBranchIds())) { - query.andLocalIds(options.getBranchIds()); + query.andUuids(options.getBranchIds()); } List branchStates = options.getBranchStates(); @@ -182,9 +182,9 @@ public class BranchQueryResource { query.andIsOfType(branchTypes.toArray(new BranchType[branchTypes.size()])); } - List branchIds = options.getBranchIds(); + List branchIds = options.getBranchIds(); if (Conditions.hasValues(branchIds)) { - query.andLocalIds(branchIds); + query.andUuids(branchIds); } if (options.isIncludeArchived()) { -- cgit v1.2.3