From 96d252765f6dbffce4cbf5355a5a257af7a5c342 Mon Sep 17 00:00:00 2001 From: eparovyshnaya Date: Thu, 15 Feb 2024 10:30:34 +0300 Subject: [PATCH] [#953] Operator: error on creating top-level aggregators --- .../internal/agreements/core/AgreementDomainRegistry.java | 4 ++-- .../loc/internal/features/core/FeatureDomainRegistry.java | 6 +++--- .../loc/internal/licenses/core/LicenseDomainRegistry.java | 2 +- .../loc/internal/products/core/ProductDomainRegistry.java | 8 ++++---- .../loc/internal/users/core/UserDomainRegistry.java | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java b/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java index 4a6b2bc5a..8daaf366b 100644 --- a/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java +++ b/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java @@ -143,7 +143,7 @@ protected DomainContentAdapter crea public void registerFeatureSet(FeatureSetDescriptor featureSet) { String identifier = featureSet.getIdentifier(); FeatureSetDescriptor existing = featureSetIndex.put(identifier, featureSet); - if (existing != null) { + if ((existing != null) && (existing != featureSet)) { String msg = NLS.bind(FeaturesCoreMessages.FeatureDomain_instance_duplication_message, existing, featureSet); Platform.getLog(getClass()).warn(msg); @@ -198,7 +198,7 @@ public void registerFeatureSet(FeatureSetDescriptor featureSet) { public void registerFeature(FeatureDescriptor feature) { String identifier = feature.getIdentifier(); FeatureDescriptor existing = featureIndex.put(identifier, feature); - if (existing != null) { + if ((existing != null) && (existing != feature)) { String msg = NLS.bind(FeaturesCoreMessages.FeatureDomain_instance_duplication_message, existing, feature); Platform.getLog(getClass()).warn(msg); } @@ -216,7 +216,7 @@ public void registerFeatureVersion(FeatureDescriptor feature, FeatureVersionDesc key -> new HashMap<>()); String version = featureVersion.getVersion(); FeatureVersionDescriptor existing = map.put(version, featureVersion); - if (existing != null) { + if ((existing != null) && (existing != featureVersion)) { String msg = NLS.bind(FeaturesCoreMessages.FeatureDomain_instance_duplication_message, existing, featureVersion); Platform.getLog(getClass()).warn(msg); diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java index e794a4913..a9fd3c941 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java @@ -115,7 +115,7 @@ public LicensePlanDescriptor getLicensePlan(String identifier) { public void registerLicensePlan(LicensePlanDescriptor licensePlan) { String identifier = licensePlan.getIdentifier(); LicensePlanDescriptor existing = licensePlanIndex.put(identifier, licensePlan); - if (existing != null) { + if ((existing != null) && (existing != licensePlan)) { String msg = NLS.bind(LicensesCoreMessages.LicenseDomain_instance_duplication_message, existing, licensePlan); Platform.getLog(getClass()).warn(msg); diff --git a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java index a880b50cd..2de2a5b68 100644 --- a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java +++ b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java @@ -211,7 +211,7 @@ protected DomainContentAdapter cre public void registerProductLine(ProductLineDescriptor productLine) { String identifier = productLine.getIdentifier(); ProductLineDescriptor existing = productLineIndex.put(identifier, productLine); - if (existing != null) { + if ((existing != null) && (existing != productLine)) { String msg = NLS.bind(ProductsCoreMessages.ProductDomain_instance_duplication_message, existing, productLine); Platform.getLog(getClass()).warn(msg); @@ -224,7 +224,7 @@ public void registerProductLine(ProductLineDescriptor productLine) { public void registerProduct(ProductDescriptor product) { String identifier = product.getIdentifier(); ProductDescriptor existing = productIndex.put(identifier, product); - if (existing != null) { + if ((existing != null) && (existing != product)) { String msg = NLS.bind(ProductsCoreMessages.ProductDomain_instance_duplication_message, existing, product); Platform.getLog(getClass()).warn(msg); } @@ -239,7 +239,7 @@ public void registerProductVersion(ProductDescriptor product, ProductVersionDesc key -> new HashMap<>()); String version = productVersion.getVersion(); ProductVersionDescriptor existing = versions.put(version, productVersion); - if (existing != null) { + if ((existing != null) && (existing != productVersion)) { String msg = NLS.bind(ProductsCoreMessages.ProductDomain_instance_duplication_message, existing, productVersion); Platform.getLog(getClass()).warn(msg); @@ -258,7 +258,7 @@ public void registerProductVersionFeature(ProductDescriptor product, ProductVers key -> new HashMap<>()); String featureIdentifier = productVersionFeature.getFeatureIdentifier(); ProductVersionFeatureDescriptor existing = features.put(featureIdentifier, productVersionFeature); - if (existing != null) { + if ((existing != null) && (existing != productVersionFeature)) { String msg = NLS.bind(ProductsCoreMessages.ProductDomain_instance_duplication_message, existing, productVersionFeature); Platform.getLog(getClass()).warn(msg); diff --git a/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java b/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java index cec41794d..c0166372f 100644 --- a/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java +++ b/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java @@ -141,7 +141,7 @@ protected DomainContentAdapter createC public void registerUserOrigin(UserOriginDescriptor userOrigin) { String identifier = userOrigin.getIdentifier(); UserOriginDescriptor existing = userOriginIndex.put(identifier, userOrigin); - if (existing != null) { + if ((existing != null) && (existing != userOrigin)) { String msg = NLS.bind(UsersCoreMessages.UserDomain_instance_duplication_message, existing, userOrigin); Platform.getLog(getClass()).warn(msg); } @@ -152,7 +152,7 @@ public void registerUserOrigin(UserOriginDescriptor userOrigin) { public void registerUser(UserDescriptor user) { String identifier = user.getContact().getEmail(); UserDescriptor existing = userIndex.put(identifier, user); - if (existing != null) { + if ((existing != null) && (existing != user)) { String msg = NLS.bind(UsersCoreMessages.UserDomain_instance_duplication_message, existing, user); Platform.getLog(getClass()).warn(msg); }