Generalize Attribute Coercion and enable to apply multiple matching …

…Attribute Coercions in configurable order #2967
dcm4che · Dec 1, 2021 · c0ef58f · c0ef58f
1 parent 175e320
commit c0ef58f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif
@@ -3174,7 +3174,7 @@ dicomTransferRole: SCU
 dicomDeviceName: dicomDeviceName=mppsscu,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmProperty: SendingApplicationEntityTitle=MPPSSCU
 objectClass: dcmArchiveAttributeCoercion2
-dcmURI: suppl-from-device:MPPSSCU
+dcmURI: sup-from-dev:MPPSSCU
 cn: Supplement MPPS
 
 dn: dcmEntity=Instance,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
@@ -3560,7 +3560,7 @@ dicomTransferRole: SCU
 dicomDeviceName: dicomDeviceName=storescu,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
 dcmProperty: SendingApplicationEntityTitle=STORESCU
 objectClass: dcmArchiveAttributeCoercion2
-dcmURI: suppl-from-device:STORESCU
+dcmURI: sup-from-dev:STORESCU
 cn: Supplement Composite
 
 dn: dcmExporterID=QIDO-JSON,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org

diff --git a/...mpl/src/main/java/org/dcm4chee/arc/coerce/impl/SupplementFromDeviceCoercionProcessor.java b/...mpl/src/main/java/org/dcm4chee/arc/coerce/impl/SupplementFromDeviceCoercionProcessor.java
@@ -56,7 +56,7 @@
  * @since Nov 2021
  */
 @ApplicationScoped
-@Named("suppl-from-device")
+@Named("sup-from-dev")
 public class SupplementFromDeviceCoercionProcessor implements CoercionProcessor {
     static final Logger LOG = LoggerFactory.getLogger(SupplementFromDeviceCoercionProcessor.class);
     private static final ElementDictionary DICT = ElementDictionary.getStandardElementDictionary();

diff --git a/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java b/dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java
@@ -2115,15 +2115,15 @@ private static void addArchiveDeviceExtension(Device device, ConfigType configTy
 
             ext.addAttributeCoercion2(new ArchiveAttributeCoercion2()
                     .setCommonName("Supplement Composite")
-                    .setURI("suppl-from-device:STORESCU")
+                    .setURI("sup-from-dev:STORESCU")
                     .setDIMSE(Dimse.C_STORE_RQ)
                     .setRole(SCU)
                     .setSendingAETitle("STORESCU")
                     .setOtherDevice(storescu));
 
             ext.addAttributeCoercion2(new ArchiveAttributeCoercion2()
                     .setCommonName("Supplement MPPS")
-                    .setURI("suppl-from-device:MPPSSCU")
+                    .setURI("sup-from-dev:MPPSSCU")
                     .setDIMSE(Dimse.N_CREATE_RQ)
                     .setRole(SCU)
                     .setSendingAETitle("MPPSSCU")