diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework')
19 files changed, 137 insertions, 132 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java index 073fff0ea01..6c8cc5ced67 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java @@ -90,17 +90,17 @@ public class User extends Artifact { } public void toggleFavoriteBranch(Branch favoriteBranch) throws OseeCoreException { - HashSet<String> branchGuids = new HashSet<String>(); + HashSet<Long> branchUuids = new HashSet<Long>(); for (Branch branch : BranchManager.getBranches(BranchArchivedState.UNARCHIVED, BranchType.WORKING, BranchType.BASELINE)) { - branchGuids.add(branch.getGuid()); + branchUuids.add(branch.getGuid()); } boolean found = false; Collection<Attribute<String>> attributes = getAttributes(CoreAttributeTypes.FavoriteBranch); for (Attribute<String> attribute : attributes) { // Remove attributes that are no longer valid - if (!branchGuids.contains(attribute.getValue())) { + if (!branchUuids.contains(attribute.getValue())) { attribute.delete(); } else if (favoriteBranch.getGuid().equals(attribute.getValue())) { attribute.delete(); @@ -140,6 +140,12 @@ public class User extends Artifact { } + public void setSetting(String key, Long value) throws OseeCoreException { + ensureUserSettingsAreLoaded(); + userSettings.put(key, value); + + } + public void saveSettings() throws OseeCoreException { saveSettings(null); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java index 984ea298ec2..dac0bf88dc7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/UserManager.java @@ -176,6 +176,10 @@ public final class UserManager { return getUser().getSetting(key); } + public static String getSetting(Long key) throws OseeCoreException { + return getUser().getSetting(String.valueOf(key)); + } + public static boolean getBooleanSetting(String key) throws OseeCoreException { return getUser().getBooleanSetting(key); } @@ -184,4 +188,8 @@ public final class UserManager { getUser().setSetting(key, value); } + public static void setSetting(String key, Long value) throws OseeCoreException { + getUser().setSetting(key, String.valueOf(value)); + } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java index 3115d9b4800..199c65e4824 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java @@ -27,7 +27,7 @@ public class ArtifactURL { public static URL getExternalArtifactLink(final Artifact artifact) throws OseeCoreException { Map<String, String> parameters = new HashMap<String, String>(); parameters.put("guid", artifact.getGuid()); - parameters.put("branchGuid", artifact.getBranch().getGuid()); + parameters.put("branchUuid", String.valueOf(artifact.getBranch().getUuid())); String urlString = HttpUrlBuilderClient.getInstance().getPermanentLinkBaseUrl(OseeServerContext.ARTIFACT_CONTEXT, parameters); URL url = null; @@ -44,7 +44,7 @@ public class ArtifactURL { parameters.put("sessionId", ClientSessionManager.getSessionId()); parameters.put("context", "osee/loopback"); parameters.put("guid", artifact.getGuid()); - parameters.put("branchGuid", artifact.getBranch().getGuid()); + parameters.put("branchUuid", String.valueOf(artifact.getBranch().getGuid())); parameters.put("isDeleted", String.valueOf(artifact.isDeleted())); if (artifact.isHistorical()) { parameters.put("transactionId", String.valueOf(artifact.getTransactionNumber())); 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 e4f99c67be0..a8a3df78f66 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 @@ -81,7 +81,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; public class BranchManager { private static final BranchManager instance = new BranchManager(); - private static final String LAST_DEFAULT_BRANCH = "LastDefaultBranch"; + private static final String LAST_DEFAULT_BRANCH = "LastDefaultBranchUuid"; public static final String COMMIT_COMMENT = "Commit Branch "; private static final BranchFactory branchFactory = new BranchFactory(); @@ -168,29 +168,19 @@ public class BranchManager { if (branch instanceof Branch) { return (Branch) branch; } else { - return getBranchByGuid(branch.getGuid()); + return getBranchByUuid(branch.getUuid()); } } /** * Do not call this method unless absolutely neccessary due to performance impacts. */ - public static synchronized void checkAndReload(String guid) throws OseeCoreException { - if (!branchExists(guid)) { - loadBranchToCache(guid); - } - } - public static synchronized void checkAndReload(Long id) throws OseeCoreException { if (!branchExists(id)) { loadBranchToCache(id); } } - private static void loadBranchToCache(String guid) { - loadBranchToCache("select * from osee_branch where branch_guid = ?", guid); - } - private static void loadBranchToCache(long id) { loadBranchToCache("select * from osee_branch where branch_id = ?", id); } @@ -216,7 +206,7 @@ public class BranchManager { int assocArtId = chStmt.getInt("associated_art_id"); Branch created = - branchFactory.createOrUpdate(getCache(), branchGuid, branchId, branchName, branchType, branchState, + branchFactory.createOrUpdate(getCache(), branchId, branchName, branchType, branchState, archiveState.isArchived(), StorageState.LOADED); created.setBaseTransaction(TransactionManager.getTransactionId(baseTx)); created.setSourceTransaction(TransactionManager.getTransactionId(sourceTx)); @@ -229,11 +219,11 @@ public class BranchManager { } - public static Branch getBranchByGuid(String guid) throws OseeCoreException { - checkAndReload(guid); - Branch branch = getCache().getByGuid(guid); + public static Branch getBranchByGuid(Long uuid) throws OseeCoreException { + checkAndReload(uuid); + Branch branch = getCache().getByGuid(uuid); if (branch == null) { - throw new BranchDoesNotExist("Branch with guid [%s] does not exist", guid); + throw new BranchDoesNotExist("Branch with guid [%s] does not exist", uuid); } return branch; } @@ -242,10 +232,6 @@ public class BranchManager { return getCache().get(branchToken) != null; } - public static boolean branchExists(String branchGuid) throws OseeCoreException { - return getCache().getByGuid(branchGuid) != null; - } - public static boolean branchExists(Long id) throws OseeCoreException { return getCache().getById(id) != null; } @@ -335,18 +321,18 @@ public class BranchManager { Operations.executeWorkAndCheckStatus(new PurgeBranchHttpRequestOperation(branch, false)); } - public static void updateBranchType(IProgressMonitor monitor, final long branchId, String branchGuid, final BranchType type) throws OseeCoreException { - IOperation operation = new UpdateBranchTypeHttpRequestOperation(branchId, branchGuid, type); + public static void updateBranchType(IProgressMonitor monitor, final long branchId, final BranchType type) throws OseeCoreException { + IOperation operation = new UpdateBranchTypeHttpRequestOperation(branchId, type); Operations.executeWorkAndCheckStatus(operation, monitor); } - public static void updateBranchState(IProgressMonitor monitor, final long branchId, String branchGuid, final BranchState state) throws OseeCoreException { - IOperation operation = new UpdateBranchStateHttpRequestOperation(branchId, branchGuid, state); + public static void updateBranchState(IProgressMonitor monitor, final long branchId, final BranchState state) throws OseeCoreException { + IOperation operation = new UpdateBranchStateHttpRequestOperation(branchId, state); Operations.executeWorkAndCheckStatus(operation, monitor); } - public static void updateBranchArchivedState(IProgressMonitor monitor, final long branchId, String branchGuid, final BranchArchivedState state) throws OseeCoreException { - IOperation operation = new UpdateBranchArchivedStateHttpRequestOperation(branchId, branchGuid, state); + public static void updateBranchArchivedState(IProgressMonitor monitor, final long branchId, final BranchArchivedState state) throws OseeCoreException { + IOperation operation = new UpdateBranchArchivedStateHttpRequestOperation(branchId, state); Operations.executeWorkAndCheckStatus(operation, monitor); } @@ -444,7 +430,7 @@ public class BranchManager { destBranch.getName()); String branchName = "Merge " + sourceBranch.getShortName() + " <=> " + destBranch.getShortName(); mergeBranch = - (MergeBranch) createBranch(BranchType.MERGE, sourceBranch.getBaseTransaction(), branchName, null, + (MergeBranch) createBranch(BranchType.MERGE, sourceBranch.getBaseTransaction(), branchName, Lib.generateUuid(), UserManager.getUser(), creationComment, mergeAddressingQueryId, destBranch.getId()); mergeBranch.setSourceBranch(sourceBranch); mergeBranch.setDestinationBranch(destBranch); @@ -454,20 +440,19 @@ public class BranchManager { return mergeBranch; } - public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, String childBranchGuid, Artifact associatedArtifact) throws OseeCoreException { - return createWorkingBranch(parentTransactionId, childBranchName, childBranchGuid, Lib.generateUuid(), - associatedArtifact); + public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, Artifact associatedArtifact) throws OseeCoreException { + return createWorkingBranch(parentTransactionId, childBranchName, Lib.generateUuid(), associatedArtifact); } - public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, String childBranchGuid, Long childBranchUuid, Artifact associatedArtifact) throws OseeCoreException { + public static Branch createWorkingBranch(TransactionRecord parentTransactionId, String childBranchName, Long childBranchUuid, Artifact associatedArtifact) throws OseeCoreException { Conditions.notNull(childBranchUuid, "childBranchUuid"); String creationComment = String.format("New Branch from %s (%s)", parentTransactionId.getBranch().getName(), parentTransactionId.getId()); final String truncatedName = Strings.truncate(childBranchName, 195, true); - return createBranch(BranchType.WORKING, parentTransactionId, truncatedName, childBranchGuid, childBranchUuid, - associatedArtifact, creationComment, -1, -1); + return createBranch(BranchType.WORKING, parentTransactionId, truncatedName, childBranchUuid, associatedArtifact, + creationComment, -1, -1); } /** @@ -481,7 +466,7 @@ public class BranchManager { final String truncatedName = Strings.truncate(childBranchName, 195, true); CreateBranchHttpRequestOperation operation = - new CreateBranchHttpRequestOperation(BranchType.WORKING, parentTransactionId, truncatedName, null, -1, + new CreateBranchHttpRequestOperation(BranchType.WORKING, parentTransactionId, truncatedName, -1, associatedArtifact, creationComment, -1, -1); operation.setTxCopyBranchType(true); Operations.executeWorkAndCheckStatus(operation); @@ -496,7 +481,7 @@ public class BranchManager { final String truncatedName = Strings.truncate(childBranchName, 195, true); CreateBranchHttpRequestOperation operation = - new CreateBranchHttpRequestOperation(BranchType.PORT, parentTransactionId, truncatedName, null, -1, + new CreateBranchHttpRequestOperation(BranchType.PORT, parentTransactionId, truncatedName, -1, associatedArtifact, creationComment, -1, -1); operation.setTxCopyBranchType(true); Operations.executeWorkAndCheckStatus(operation); @@ -512,7 +497,7 @@ public class BranchManager { Conditions.checkNotNull(childBranchName, "Child Branch Name"); Conditions.checkNotNull(associatedArtifact, "Associated Artifact"); TransactionRecord parentTransactionId = TransactionManager.getHeadTransaction(parentBranch); - return createWorkingBranch(parentTransactionId, childBranchName, null, Lib.generateUuid(), associatedArtifact); + return createWorkingBranch(parentTransactionId, childBranchName, Lib.generateUuid(), associatedArtifact); } public static Branch createWorkingBranch(IOseeBranch parentBranch, IOseeBranch childBranch) throws OseeCoreException { @@ -521,8 +506,7 @@ public class BranchManager { public static Branch createWorkingBranch(IOseeBranch parentBranch, IOseeBranch childBranch, Artifact associatedArtifact) throws OseeCoreException { TransactionRecord parentTransactionId = TransactionManager.getHeadTransaction(parentBranch); - return createWorkingBranch(parentTransactionId, childBranch.getName(), childBranch.getGuid(), - childBranch.getUuid(), associatedArtifact); + return createWorkingBranch(parentTransactionId, childBranch.getName(), childBranch.getUuid(), associatedArtifact); } /** @@ -535,13 +519,13 @@ public class BranchManager { public static Branch createBaselineBranch(IOseeBranch parentBranch, IOseeBranch childBranch, Artifact associatedArtifact) throws OseeCoreException { TransactionRecord parentTransactionId = TransactionManager.getHeadTransaction(parentBranch); String creationComment = String.format("Branch Creation for %s", childBranch.getName()); - return createBranch(BranchType.BASELINE, parentTransactionId, childBranch.getName(), childBranch.getGuid(), - childBranch.getUuid(), associatedArtifact, creationComment, -1, -1); + return createBranch(BranchType.BASELINE, parentTransactionId, childBranch.getName(), childBranch.getUuid(), + associatedArtifact, creationComment, -1, -1); } - private static Branch createBranch(BranchType branchType, TransactionRecord parentTransaction, String branchName, String branchGuid, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) throws OseeCoreException { + private static Branch createBranch(BranchType branchType, TransactionRecord parentTransaction, String branchName, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) throws OseeCoreException { CreateBranchHttpRequestOperation operation = - new CreateBranchHttpRequestOperation(branchType, parentTransaction, branchName, branchGuid, branchUuid, + new CreateBranchHttpRequestOperation(branchType, parentTransaction, branchName, branchUuid, associatedArtifact, creationComment, mergeAddressingQueryId, destinationBranchId); Operations.executeWorkAndCheckStatus(operation); return operation.getNewBranch(); @@ -567,7 +551,7 @@ public class BranchManager { private void initializeLastBranchValue() { try { - String branchGuid = UserManager.getSetting(LAST_DEFAULT_BRANCH); + Long branchGuid = Long.valueOf(UserManager.getSetting(LAST_DEFAULT_BRANCH)); lastBranch = getBranchByGuid(branchGuid); } catch (Exception ex) { try { @@ -724,8 +708,17 @@ public class BranchManager { return ((Branch) branch).getBranchType(); } - public static Branch getBranchByUuid(Long branchUuid) { - return getBranchByGuid(BranchManager.getBranchGuidLegacy(branchUuid)); + public static Branch getBranchByUuid(Long uuid) { + checkAndReload(uuid); + Branch branch = getCache().getByGuid(uuid); + if (branch == null) { + throw new BranchDoesNotExist("Branch with guid [%s] does not exist", uuid); + } + return branch; + } + + public static Branch getBranchByGuid(String branchGuid) { + return getBranchByGuid(getBranchIdLegacy(branchGuid)); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java index 9eff7f2fe8c..e2dbd78540a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/ArtifactReferenceAttribute.java @@ -10,8 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.attribute; +import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; public class ArtifactReferenceAttribute extends IdentityReferenceAttribute<Artifact> { - // + + @Override + protected boolean subClassSetValue(Artifact value) throws OseeCoreException { + return getAttributeDataProvider().setValue(value == null ? "" : value.getGuid()); + } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java index 1e381af2364..4c24d359e49 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/BranchReferenceAttribute.java @@ -11,7 +11,12 @@ package org.eclipse.osee.framework.skynet.core.attribute; import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; public class BranchReferenceAttribute extends IdentityReferenceAttribute<IOseeBranch> { - // + @Override + protected boolean subClassSetValue(IOseeBranch value) throws OseeCoreException { + return getAttributeDataProvider().setValue(value == null ? "" : String.valueOf(value.getGuid())); + } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java index b8806212b3b..ce27f48081d 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/IdentityReferenceAttribute.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.skynet.core.attribute.service.AttributeAdapterService; import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil; -public abstract class IdentityReferenceAttribute<T extends Identity<String>> extends CharacterBackedAttribute<T> { +public abstract class IdentityReferenceAttribute<T extends Identity<?>> extends CharacterBackedAttribute<T> { @Override public T getValue() throws OseeCoreException { @@ -24,11 +24,6 @@ public abstract class IdentityReferenceAttribute<T extends Identity<String>> ext } @Override - protected boolean subClassSetValue(T value) throws OseeCoreException { - return getAttributeDataProvider().setValue(value == null ? "" : value.getGuid()); - } - - @Override protected T convertStringToValue(String value) throws OseeCoreException { AttributeAdapterService service = getAttributeAdapter(); T identity = service.adapt(this, new BaseIdentity<String>(value)); 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 50913baa78f..1b0d1aca60e 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 @@ -130,8 +130,8 @@ public final class FrameworkEventUtil { public static RemoteBranchEvent1 getRemoteBranchEvent(BranchEvent branchEvent) { RemoteBranchEvent1 event = new RemoteBranchEvent1(); event.setEventTypeGuid(branchEvent.getEventType().getGuid()); - event.setBranchGuid(branchEvent.getBranchGuid()); - event.setDestinationBranchGuid(branchEvent.getDestinationBranchGuid()); + event.setBranchGuid(String.valueOf(branchEvent.getBranchUuid())); + event.setDestinationBranchGuid(String.valueOf(branchEvent.getDestinationBranchUuid())); event.setNetworkSender(getRemoteNetworkSender(branchEvent.getNetworkSender())); return event; } @@ -140,7 +140,8 @@ public final class FrameworkEventUtil { BranchEventType branchEventType = BranchEventType.getByGuid(branchEvent.getEventTypeGuid()); if (branchEventType != null) { BranchEvent event = - new BranchEvent(branchEventType, branchEvent.getBranchGuid(), branchEvent.getDestinationBranchGuid()); + new BranchEvent(branchEventType, Long.valueOf(branchEvent.getBranchGuid()), + Long.valueOf(branchEvent.getDestinationBranchGuid())); event.setNetworkSender(getNetworkSender(branchEvent.getNetworkSender())); return event; } else { @@ -186,7 +187,7 @@ public final class FrameworkEventUtil { public static RemotePersistEvent1 getRemotePersistEvent(ArtifactEvent transEvent) { RemotePersistEvent1 event = new RemotePersistEvent1(); event.setNetworkSender(getRemoteNetworkSender(transEvent.getNetworkSender())); - event.setBranchGuid(transEvent.getBranchGuid()); + event.setBranchGuid(String.valueOf(transEvent.getBranchUuid())); event.setTransactionId(transEvent.getTransactionId()); for (EventBasicGuidArtifact guidArt : transEvent.getArtifacts()) { if (guidArt.getModType() == EventModType.Modified) { @@ -215,7 +216,7 @@ public final class FrameworkEventUtil { } public static ArtifactEvent getPersistEvent(RemotePersistEvent1 remEvent) { - ArtifactEvent event = new ArtifactEvent(remEvent.getBranchGuid()); + ArtifactEvent event = new ArtifactEvent(Long.valueOf(remEvent.getBranchGuid())); event.setNetworkSender(getNetworkSender(remEvent.getNetworkSender())); event.setTransactionId(remEvent.getTransactionId()); for (RemoteBasicGuidArtifact1 remGuidArt : remEvent.getArtifacts()) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java index 616033b11f5..5b52513c2bc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/ArtifactEvent.java @@ -36,7 +36,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender { UPDATE_ARTIFACTS; } - private final String branchGuid; + private final Long branchUuid; private int transactionId; private NetworkSender networkSender; private final List<EventBasicGuidArtifact> artifacts = new ArrayList<EventBasicGuidArtifact>(); @@ -49,21 +49,21 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender { this(branch.getGuid()); } - public ArtifactEvent(String branchGuid) { - this(branchGuid, ArtifactEventType.UPDATE_ARTIFACTS); + public ArtifactEvent(Long branchUuid) { + this(branchUuid, ArtifactEventType.UPDATE_ARTIFACTS); } - public ArtifactEvent(String branchGuid, ArtifactEventType reloadEvent) { + public ArtifactEvent(Long branchUuid, ArtifactEventType reloadEvent) { this.reloadEvent = reloadEvent; - this.branchGuid = branchGuid; + this.branchUuid = branchUuid; } public boolean isReloadEvent() { return ArtifactEventType.RELOAD_ARTIFACTS == reloadEvent; } - public String getBranchGuid() { - return branchGuid; + public Long getBranchUuid() { + return branchUuid; } public Set<DefaultBasicUuidRelationReorder> getRelationOrderRecords() { @@ -71,7 +71,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender { } public boolean isForBranch(IOseeBranch branch) { - return getBranchGuid().equals(branch.getGuid()); + return getBranchUuid().equals(branch.getGuid()); } public int getTransactionId() { @@ -263,7 +263,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender { @Override public String toString() { try { - return String.format("ArtifactEvent: BG[%s] TrId[%d] ARTS[%s] RELS[%s] Sender[%s]", branchGuid, transactionId, + return String.format("ArtifactEvent: BG[%s] TrId[%d] ARTS[%s] RELS[%s] Sender[%s]", branchUuid, transactionId, getArtifactsString(artifacts), getRelationsString(relations), networkSender); } catch (Exception ex) { return String.format("ArtifactEvent exception: " + ex.getLocalizedMessage()); @@ -287,7 +287,7 @@ public class ArtifactEvent implements FrameworkEvent, HasNetworkSender { } private boolean isOnCachedBranch() { - return BranchManager.branchExists(getBranchGuid()); + return BranchManager.branchExists(getBranchUuid()); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java index 7d575b073dc..e284623ce79 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/BranchEvent.java @@ -12,19 +12,19 @@ package org.eclipse.osee.framework.skynet.core.event.model; public class BranchEvent implements FrameworkEvent, HasNetworkSender { - private String branchGuid; - private String destinationBranchGuid; + private long branchUuid; + private long destinationBranchUuid; private BranchEventType eventType; private NetworkSender networkSender; - public BranchEvent(BranchEventType branchEventType, String branchGuid) { - this.branchGuid = branchGuid; + public BranchEvent(BranchEventType branchEventType, long branchGuid) { + this.branchUuid = branchGuid; this.eventType = branchEventType; } - public BranchEvent(BranchEventType branchEventType, String sourceBranchGuid, String destinationBranchGuid) { - this.branchGuid = sourceBranchGuid; - this.destinationBranchGuid = destinationBranchGuid; + public BranchEvent(BranchEventType branchEventType, long sourceBranchUuid, long destinationBranchUuid) { + this.branchUuid = sourceBranchUuid; + this.destinationBranchUuid = destinationBranchUuid; this.eventType = branchEventType; } @@ -33,8 +33,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { * * @return possible object is {@link String } */ - public String getBranchGuid() { - return branchGuid; + public long getBranchUuid() { + return branchUuid; } // TODO: add comment to describe purpose of destinationBranch @@ -43,8 +43,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { * * @return possible object is {@link String } */ - public String getDestinationBranchGuid() { - return destinationBranchGuid; + public long getDestinationBranchUuid() { + return destinationBranchUuid; } /** @@ -52,8 +52,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { * * @param value allowed object is {@link String } */ - public void setBranchGuid(String value) { - this.branchGuid = value; + public void setBranchUuid(long value) { + this.branchUuid = value; } /** @@ -61,8 +61,8 @@ public class BranchEvent implements FrameworkEvent, HasNetworkSender { * * @param value allowed object is {@link String } */ - public void setDestinationBranchGuid(String value) { - this.destinationBranchGuid = value; + public void setDestinationBranchUuid(long value) { + this.destinationBranchUuid = value; } /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java index c525d833fe6..00513ec7942 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/CreateBranchHttpRequestOperation.java @@ -42,7 +42,6 @@ public final class CreateBranchHttpRequestOperation extends AbstractOperation { private final BranchType branchType; private final TransactionRecord parentTransaction; private final String branchName; - private final String branchGuid; private final Artifact associatedArtifact; private final String creationComment; private final int mergeAddressingQueryId; @@ -51,12 +50,11 @@ public final class CreateBranchHttpRequestOperation extends AbstractOperation { private boolean txCopyBranchType; private final long branchUuid; - public CreateBranchHttpRequestOperation(BranchType branchType, TransactionRecord parentTransaction, String branchName, String branchGuid, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) { + public CreateBranchHttpRequestOperation(BranchType branchType, TransactionRecord parentTransaction, String branchName, long branchUuid, Artifact associatedArtifact, String creationComment, int mergeAddressingQueryId, long destinationBranchId) { super("Create branch " + branchName, Activator.PLUGIN_ID); this.branchType = branchType; this.parentTransaction = parentTransaction; this.branchName = branchName; - this.branchGuid = branchGuid; this.branchUuid = branchUuid; this.associatedArtifact = associatedArtifact; this.creationComment = creationComment; @@ -71,7 +69,7 @@ public final class CreateBranchHttpRequestOperation extends AbstractOperation { parameters.put("function", Function.CREATE_BRANCH.name()); BranchCreationRequest request = - new BranchCreationRequest(branchType, parentTransaction.getId(), parentTransaction.getBranchId(), branchGuid, + new BranchCreationRequest(branchType, parentTransaction.getId(), parentTransaction.getBranchId(), branchName, branchUuid, getAssociatedArtifactId(associatedArtifact), getAuthorId(), creationComment, mergeAddressingQueryId, destinationBranchId); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java index ebae7827ede..d537396ae89 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchArchivedStateHttpRequestOperation.java @@ -33,14 +33,12 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator; * @author Ryan D. Brooks */ public final class UpdateBranchArchivedStateHttpRequestOperation extends AbstractOperation { - private final long branchId; - private final String branchGuid; + private final long branchUuid; private final BranchArchivedState branchState; - public UpdateBranchArchivedStateHttpRequestOperation(long branchId, String branchGuid, BranchArchivedState branchState) { - super("Update branch archived state " + branchGuid, Activator.PLUGIN_ID); - this.branchId = branchId; - this.branchGuid = branchGuid; + public UpdateBranchArchivedStateHttpRequestOperation(long branchUuid, BranchArchivedState branchState) { + super("Update branch archived state " + branchUuid, Activator.PLUGIN_ID); + this.branchUuid = branchUuid; this.branchState = branchState; } @@ -49,14 +47,14 @@ public final class UpdateBranchArchivedStateHttpRequestOperation extends Abstrac Map<String, String> parameters = new HashMap<String, String>(); parameters.put("function", Function.UPDATE_ARCHIVE_STATE.name()); - ChangeBranchArchiveStateRequest requestData = new ChangeBranchArchiveStateRequest(branchId, branchState); + ChangeBranchArchiveStateRequest requestData = new ChangeBranchArchiveStateRequest(branchUuid, branchState); AcquireResult response = HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, CoreTranslatorId.CHANGE_BRANCH_ARCHIVE_STATE, requestData, null); if (response.wasSuccessful()) { BranchManager.refreshBranches(); - OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.ArchiveStateUpdated, branchGuid)); + OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.ArchiveStateUpdated, branchUuid)); } } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java index 0488535b1ff..6089719f821 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchStateHttpRequestOperation.java @@ -33,14 +33,12 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator; * @author Ryan D. Brooks */ public class UpdateBranchStateHttpRequestOperation extends AbstractOperation { - private final long branchId; - private final String branchGuid; + private final long branchUuid; private final BranchState branchState; - public UpdateBranchStateHttpRequestOperation(long branchId, String branchGuid, BranchState branchState) { - super("Update branch state " + branchGuid, Activator.PLUGIN_ID); - this.branchId = branchId; - this.branchGuid = branchGuid; + public UpdateBranchStateHttpRequestOperation(long branchUuid, BranchState branchState) { + super("Update branch state " + branchUuid, Activator.PLUGIN_ID); + this.branchUuid = branchUuid; this.branchState = branchState; } @@ -49,14 +47,14 @@ public class UpdateBranchStateHttpRequestOperation extends AbstractOperation { Map<String, String> parameters = new HashMap<String, String>(); parameters.put("function", Function.UPDATE_BRANCH_STATE.name()); - ChangeBranchStateRequest requestData = new ChangeBranchStateRequest(branchId, branchState); + ChangeBranchStateRequest requestData = new ChangeBranchStateRequest(branchUuid, branchState); AcquireResult response = HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, CoreTranslatorId.CHANGE_BRANCH_STATE, requestData, null); if (response.wasSuccessful()) { BranchManager.refreshBranches(); - OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.StateUpdated, branchGuid)); + OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.StateUpdated, branchUuid)); } } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java index a7f9baa4ced..e07af5e2780 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/httpRequests/UpdateBranchTypeHttpRequestOperation.java @@ -33,14 +33,12 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator; * @author Ryan D. Brooks */ public final class UpdateBranchTypeHttpRequestOperation extends AbstractOperation { - private final long branchId; - private final String branchGuid; + private final long branchUuid; private final BranchType type; - public UpdateBranchTypeHttpRequestOperation(long branchId, String branchGuid, BranchType type) { - super("Update branch type" + branchGuid, Activator.PLUGIN_ID); - this.branchId = branchId; - this.branchGuid = branchGuid; + public UpdateBranchTypeHttpRequestOperation(long branchUuid, BranchType type) { + super("Update branch type" + branchUuid, Activator.PLUGIN_ID); + this.branchUuid = branchUuid; this.type = type; } @@ -49,14 +47,14 @@ public final class UpdateBranchTypeHttpRequestOperation extends AbstractOperatio Map<String, String> parameters = new HashMap<String, String>(); parameters.put("function", Function.UPDATE_BRANCH_TYPE.name()); - ChangeBranchTypeRequest requestData = new ChangeBranchTypeRequest(branchId, type); + ChangeBranchTypeRequest requestData = new ChangeBranchTypeRequest(branchUuid, type); AcquireResult response = HttpClientMessage.send(OseeServerContext.BRANCH_CONTEXT, parameters, CoreTranslatorId.CHANGE_BRANCH_TYPE, requestData, null); if (response.wasSuccessful()) { BranchManager.refreshBranches(); - OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.TypeUpdated, branchGuid)); + OseeEventManager.kickBranchEvent(getClass(), new BranchEvent(BranchEventType.TypeUpdated, branchUuid)); } } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java index 8be8cfd6d6c..bcc6e93a3f4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientArtifactTypeAccessor.java @@ -38,11 +38,11 @@ import org.eclipse.osee.framework.jdk.core.type.Triplet; public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Long, ArtifactType> { private final AbstractOseeCache<Long, AttributeType> attrCache; - private final AbstractOseeCache<String, Branch> branchCache; + private final AbstractOseeCache<Long, Branch> branchCache; private final ArtifactTypeFactory artifactTypeFactory; - public ClientArtifactTypeAccessor(ArtifactTypeFactory artifactTypeFactory, AbstractOseeCache<Long, AttributeType> attrCache, AbstractOseeCache<String, Branch> branchCache) { + public ClientArtifactTypeAccessor(ArtifactTypeFactory artifactTypeFactory, AbstractOseeCache<Long, AttributeType> attrCache, AbstractOseeCache<Long, Branch> branchCache) { this.artifactTypeFactory = artifactTypeFactory; this.attrCache = attrCache; this.branchCache = branchCache; @@ -89,12 +89,12 @@ public class ClientArtifactTypeAccessor extends AbstractClientDataAccessor<Long, CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>> attrs = new CompositeKeyHashMap<ArtifactType, IOseeBranch, Collection<AttributeType>>(); - for (Triplet<Long, String, Long> entry : response.getAttributeTypes()) { + for (Triplet<Long, Long, Long> entry : response.getAttributeTypes()) { ArtifactType key1 = cache.getByGuid(entry.getFirst()); - String branchGuid = entry.getSecond(); + Long branchGuid = entry.getSecond(); IOseeBranch branchToken = branchCache.getByGuid(branchGuid); if (branchToken == null) { - branchToken = TokenFactory.createBranch(branchGuid, branchGuid); + branchToken = TokenFactory.createBranch(branchGuid, String.valueOf(branchGuid)); } Collection<AttributeType> types = attrs.get(key1, branchToken); if (types == null) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java index 7e9d8e48d53..3bb88af7a3f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/accessors/ClientBranchAccessor.java @@ -38,7 +38,7 @@ import org.eclipse.osee.framework.skynet.core.internal.Activator; /** * @author Roberto E. Escobar */ -public class ClientBranchAccessor extends AbstractClientDataAccessor<String, Branch> { +public class ClientBranchAccessor extends AbstractClientDataAccessor<Long, Branch> { private final TransactionCache transactionCache; private BranchCache branchCache; @@ -58,13 +58,13 @@ public class ClientBranchAccessor extends AbstractClientDataAccessor<String, Bra } @Override - public void load(IOseeCache<String, Branch> cache) throws OseeCoreException { + public void load(IOseeCache<Long, Branch> cache) throws OseeCoreException { transactionCache.ensurePopulated(); super.load(cache); } @Override - protected Collection<Branch> updateCache(IOseeCache<String, Branch> cache) throws OseeCoreException { + protected Collection<Branch> updateCache(IOseeCache<Long, Branch> cache) throws OseeCoreException { BranchCacheUpdateResponse response = requestUpdateMessage(cache, CoreTranslatorId.BRANCH_CACHE_UPDATE_RESPONSE); return new BranchCacheUpdateUtil(getFactory(), transactionCache).updateCache(response, cache); } @@ -74,7 +74,7 @@ public class ClientBranchAccessor extends AbstractClientDataAccessor<String, Bra store(branchCache, types); } - public void store(IOseeCache<String, Branch> cache, Collection<Branch> branches) throws OseeCoreException { + public void store(IOseeCache<Long, Branch> cache, Collection<Branch> branches) throws OseeCoreException { Map<String, String> parameters = new HashMap<String, String>(); parameters.put("function", CacheOperation.STORE.name()); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java index ef2b99e9e62..6a7b38e660c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/ArtifactEventHandler.java @@ -12,7 +12,6 @@ package org.eclipse.osee.framework.skynet.core.internal.event.handlers; import java.util.List; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.event.EventUtil; import org.eclipse.osee.framework.skynet.core.event.FrameworkEventUtil; import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter; @@ -36,7 +35,7 @@ public class ArtifactEventHandler implements EventHandlerLocal<IArtifactEventLis if (filters != null) { for (IEventFilter eventFilter : filters) { // If this branch doesn't match, don't pass events through - if (!eventFilter.isMatch(BranchManager.getBranchIdLegacy(event.getBranchGuid()))) { + if (!eventFilter.isMatch(event.getBranchUuid())) { return; } // Process artifacts and relations only if there were any in this ArtifactEvent diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java index befcac0bf1a..5fd043e90b1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchEventHandler.java @@ -34,15 +34,15 @@ public class BranchEventHandler implements EventHandlerLocal<IBranchEventListene List<? extends IEventFilter> filters = ((IEventFilteredListener) listener).getEventFilters(); if (filters != null) { for (IEventFilter eventFilter : filters) { - long branchUuid = BranchManager.getBranchIdLegacy(event.getBranchGuid()); - if (!eventFilter.isMatch(branchUuid) && !eventFilter.isMatch(BranchManager.getBranchIdLegacy(event.getDestinationBranchGuid()))) { + long branchUuid = event.getBranchUuid(); + if (!eventFilter.isMatch(branchUuid) && !eventFilter.isMatch(event.getDestinationBranchUuid())) { return; } } } if (event.getEventType() == BranchEventType.Added) { try { - BranchManager.checkAndReload(event.getBranchGuid()); + BranchManager.checkAndReload(event.getBranchUuid()); } catch (OseeCoreException ex) { EventUtil.eventLog("IEM: updateBranches", ex); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java index 786938e3249..78ed4a5bc79 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/event/handlers/BranchRemoteEventHandler.java @@ -42,7 +42,7 @@ public class BranchRemoteEventHandler implements EventHandlerRemote<RemoteBranch private void updateBranches(Sender sender, BranchEvent branchEvent) { BranchEventType eventType = branchEvent.getEventType(); - String branchGuid = branchEvent.getBranchGuid(); + Long branchGuid = branchEvent.getBranchUuid(); try { if (BranchManager.branchExists(branchGuid)) { Branch branch = BranchManager.getBranchByGuid(branchGuid); |