Remove Archive Device Attribute Query/Retrieve View ID fix dcm4che#1577

dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif

@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on September 7, 2018 8:46:58 AM
+# Generated by Apache Directory Studio on September 7, 2018 11:29:20 AM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -3601,7 +3601,7 @@ m-description: DICOM Archive Device related information
 m-supObjectClass: top
 m-typeObjectClass: AUXILIARY
 m-must: dcmFuzzyAlgorithmClass
-m-must: dcmQueryRetrieveViewID
+m-may: dcmQueryRetrieveViewID
 m-may: dcmRetrieveAET
 m-may: dcmDefaultCharacterSet
 m-may: dcmStorageID

dcm4chee-arc-assembly/src/main/resources/ldap/default-config.ldif

@@ -58,7 +58,6 @@ dcmOverwritePolicy: SAME_SOURCE
 dcmDiffTaskProgressUpdateInterval: PT10S
 dcmSendPendingCGet: TRUE
 hl7OutgoingPatientUpdateTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/hl7-dcm2adt.xsl
-dcmQueryRetrieveViewID: hideRejected
 dcmAudit2JsonFhirTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/audit2json+fhir.xsl
 dicomDeviceName: dcm4chee-arc
 dcmPurgeStgCmtPollingInterval: PT1H

dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif

@@ -1192,9 +1192,9 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
   MUST (
-    dcmFuzzyAlgorithmClass $
-    dcmQueryRetrieveViewID )
+    dcmFuzzyAlgorithmClass )
   MAY (
+    dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmDefaultCharacterSet $
     dcmStorageID $

dcm4chee-arc-assembly/src/main/resources/ldap/sample-config.ldif

@@ -134,7 +134,6 @@ dcmExportTaskPollingInterval: PT1M
 dcmKeyStoreType: JKS
 dcmRejectExpiredStudiesAETitle: DCM4CHEE
 dcmKeyStoreURL: ${jboss.server.config.url}/dcm4chee-arc/key.jks
-dcmAuditSpoolDirectory: ${jboss.server.data.dir}/audit-spool
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.40
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.73
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.65
@@ -153,6 +152,7 @@ dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.71
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.79.1
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.88.59
 dcmWadoSupportedSRClasses: 1.2.840.10008.5.1.4.1.1.78.6
+dcmAuditSpoolDirectory: ${jboss.server.data.dir}/audit-spool
 objectClass: dicomDevice
 objectClass: dcmDevice
 objectClass: dcmArchiveDevice
@@ -167,7 +167,6 @@ dcmOverwritePolicy: SAME_SOURCE
 dcmDiffTaskProgressUpdateInterval: PT10S
 dcmSendPendingCGet: TRUE
 hl7OutgoingPatientUpdateTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/hl7-dcm2adt.xsl
-dcmQueryRetrieveViewID: hideRejected
 dcmAudit2JsonFhirTemplateURI: ${jboss.server.temp.url}/dcm4chee-arc/audit2json+fhir.xsl
 dicomDeviceName: dcm4chee-arc
 dcmPurgeStgCmtPollingInterval: PT1H

dcm4chee-arc-assembly/src/main/resources/ldap/schema/dcm4chee-archive.schema

@@ -1429,9 +1429,9 @@ objectclass ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
   MUST (
-    dcmFuzzyAlgorithmClass $
-    dcmQueryRetrieveViewID )
+    dcmFuzzyAlgorithmClass )
   MAY (
+    dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmDefaultCharacterSet $
     dcmStorageID $

dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive-modify.ldif

@@ -1198,9 +1198,9 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
   MUST (
-    dcmFuzzyAlgorithmClass $
-    dcmQueryRetrieveViewID )
+    dcmFuzzyAlgorithmClass )
   MAY (
+    dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmDefaultCharacterSet $
     dcmStorageID $

dcm4chee-arc-assembly/src/main/resources/ldap/slapd/dcm4chee-archive.ldif

@@ -1191,9 +1191,9 @@ olcObjectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
   MUST (
-    dcmFuzzyAlgorithmClass $
-    dcmQueryRetrieveViewID )
+    dcmFuzzyAlgorithmClass )
   MAY (
+    dcmQueryRetrieveViewID $
     dcmRetrieveAET $
     dcmDefaultCharacterSet $
     dcmStorageID $

dcm4chee-arc-conf-json/src/main/java/org/dcm4chee/arc/conf/json/JsonArchiveConfiguration.java

@@ -92,7 +92,6 @@ protected void storeTo(Device device, JsonWriter writer) {
                 arcDev.getPurgeInstanceRecordsPollingInterval(), null);
         writer.writeNotDef("dcmPurgeInstanceRecordsFetchSize",
                 arcDev.getPurgeInstanceRecordsFetchSize(), 100);
-        writer.writeNotNullOrDef("dcmQueryRetrieveViewID", arcDev.getQueryRetrieveViewID(), null);
         writer.writeNotNullOrDef("dcmOverwritePolicy", arcDev.getOverwritePolicy(), OverwritePolicy.NEVER);
         writer.writeNotNullOrDef("dcmBulkDataSpoolDirectory",
                 arcDev.getBulkDataSpoolDirectory(), ArchiveDeviceExtension.JBOSS_SERVER_TEMP_DIR);
@@ -757,9 +756,6 @@ private void loadFrom(ArchiveDeviceExtension arcDev, JsonReader reader, Configur
                 case "dcmOverwritePolicy":
                     arcDev.setOverwritePolicy(OverwritePolicy.valueOf(reader.stringValue()));
                     break;
-                case "dcmQueryRetrieveViewID":
-                    arcDev.setQueryRetrieveViewID(reader.stringValue());
-                    break;
                 case "dcmBulkDataSpoolDirectory":
                     arcDev.setBulkDataSpoolDirectory(reader.stringValue());
                     break;

dcm4chee-arc-conf-ldap/src/main/java/org/dcm4chee/arc/conf/ldap/LdapArchiveConfiguration.java

@@ -96,7 +96,6 @@ protected void storeTo(ConfigurationChanges.ModifiedObject ldapObj, Device devic
         LdapUtils.storeNotNullOrDef(ldapObj, attrs, "dcmOverwritePolicy", ext.getOverwritePolicy(), OverwritePolicy.NEVER);
         LdapUtils.storeNotNullOrDef(ldapObj, attrs, "dcmBulkDataSpoolDirectory",
                 ext.getBulkDataSpoolDirectory(), ArchiveDeviceExtension.JBOSS_SERVER_TEMP_DIR);
-        LdapUtils.storeNotNullOrDef(ldapObj, attrs, "dcmQueryRetrieveViewID", ext.getQueryRetrieveViewID(), null);
         LdapUtils.storeNotDef(ldapObj, attrs, "dcmPersonNameComponentOrderInsensitiveMatching",
                 ext.isPersonNameComponentOrderInsensitiveMatching(), false);
         LdapUtils.storeNotDef(ldapObj, attrs, "dcmSendPendingCGet", ext.isSendPendingCGet(), false);
@@ -276,7 +275,6 @@ protected void loadFrom(Device device, Attributes attrs) throws NamingException
         ext.setOverwritePolicy(LdapUtils.enumValue(OverwritePolicy.class, attrs.get("dcmOverwritePolicy"), OverwritePolicy.NEVER));
         ext.setBulkDataSpoolDirectory(
                 LdapUtils.stringValue(attrs.get("dcmBulkDataSpoolDirectory"), ArchiveDeviceExtension.JBOSS_SERVER_TEMP_DIR));
-        ext.setQueryRetrieveViewID(LdapUtils.stringValue(attrs.get("dcmQueryRetrieveViewID"), null));
         ext.setPersonNameComponentOrderInsensitiveMatching(
                 LdapUtils.booleanValue(attrs.get("dcmPersonNameComponentOrderInsensitiveMatching"), false));
         ext.setSendPendingCGet(LdapUtils.booleanValue(attrs.get("dcmSendPendingCGet"), false));
@@ -487,7 +485,6 @@ protected void storeDiffs(ConfigurationChanges.ModifiedObject ldapObj, Device pr
                 aa.getBulkDataSpoolDirectory(),
                 bb.getBulkDataSpoolDirectory(),
                 ArchiveDeviceExtension.JBOSS_SERVER_TEMP_DIR);
-        LdapUtils.storeDiffObject(ldapObj, mods, "dcmQueryRetrieveViewID", aa.getQueryRetrieveViewID(), bb.getQueryRetrieveViewID(), null);
         LdapUtils.storeDiff(ldapObj, mods, "dcmPersonNameComponentOrderInsensitiveMatching",
                 aa.isPersonNameComponentOrderInsensitiveMatching(),
                 bb.isPersonNameComponentOrderInsensitiveMatching(),

dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java

@@ -1395,7 +1395,6 @@ private static void addArchiveDeviceExtension(Device device, ConfigType configTy
         device.addDeviceExtension(ext);
         ext.setFuzzyAlgorithmClass("org.dcm4che3.soundex.ESoundex");
         ext.setOverwritePolicy(OverwritePolicy.SAME_SOURCE);
-        ext.setQueryRetrieveViewID(HIDE_REJECTED_VIEW.getViewID());
         ext.setExternalRetrieveAEDestination(AE_TITLE);
         ext.setXDSiImagingDocumentSourceAETitle(AE_TITLE);
         ext.addQueryRetrieveView(HIDE_REJECTED_VIEW);

dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/Assert.java

@@ -92,7 +92,6 @@ static void assertEqualsArchiveDeviceExtension(ArchiveDeviceExtension expected,
         assertNotNull(actual);
         assertEquals(expected.getFuzzyAlgorithmClass(), actual.getFuzzyAlgorithmClass());
         assertEquals(expected.getOverwritePolicy(), actual.getOverwritePolicy());
-        assertEquals(expected.getQueryRetrieveViewID(), actual.getQueryRetrieveViewID());
         assertEquals(expected.getBulkDataSpoolDirectory(), actual.getBulkDataSpoolDirectory());
         assertEquals(expected.isPersonNameComponentOrderInsensitiveMatching(), actual.isPersonNameComponentOrderInsensitiveMatching());
         assertEquals(expected.isSendPendingCGet(), actual.isSendPendingCGet());

dcm4chee-arc-conf/src/main/java/org/dcm4chee/arc/conf/ArchiveAEExtension.java

@@ -270,12 +270,6 @@ public void setQueryRetrieveViewID(String queryRetrieveViewID) {
         this.queryRetrieveViewID = queryRetrieveViewID;
     }
 
-    public String queryRetrieveViewID() {
-        return queryRetrieveViewID != null
-                ? queryRetrieveViewID
-                : getArchiveDeviceExtension().getQueryRetrieveViewID();
-    }
-
     public Boolean getValidateCallingAEHostname() {
         return validateCallingAEHostname;
     }
@@ -711,7 +705,7 @@ public Pattern storePermissionServiceErrorCodePattern() {
     }
 
     public QueryRetrieveView getQueryRetrieveView() {
-        return getArchiveDeviceExtension().getQueryRetrieveViewNotNull(queryRetrieveViewID());
+        return getArchiveDeviceExtension().getQueryRetrieveViewNotNull(getQueryRetrieveViewID());
     }
 
     public AllowRejectionForDataRetentionPolicyExpired getAllowRejectionForDataRetentionPolicyExpired() {

dcm4chee-arc-conf/src/main/java/org/dcm4chee/arc/conf/ArchiveDeviceExtension.java

@@ -83,7 +83,6 @@ public class ArchiveDeviceExtension extends DeviceExtension {
     private ShowPatientInfo showPatientInfoInSystemLog = ShowPatientInfo.PLAIN_TEXT;
     private ShowPatientInfo showPatientInfoInAuditLog = ShowPatientInfo.PLAIN_TEXT;
     private String bulkDataSpoolDirectory = JBOSS_SERVER_TEMP_DIR;
-    private String queryRetrieveViewID;
     private boolean validateCallingAEHostname = false;
     private boolean sendPendingCGet = false;
     private Duration sendPendingCMoveInterval;
@@ -385,14 +384,6 @@ public void setPurgeInstanceRecordsFetchSize(int purgeInstanceRecordsFetchSize)
         this.purgeInstanceRecordsFetchSize =  greaterZero(purgeInstanceRecordsFetchSize, "purgeInstanceRecordsFetchSize");
     }
 
-    public String getQueryRetrieveViewID() {
-        return queryRetrieveViewID;
-    }
-
-    public void setQueryRetrieveViewID(String queryRetrieveViewID) {
-        this.queryRetrieveViewID = queryRetrieveViewID;
-    }
-
     public boolean isPersonNameComponentOrderInsensitiveMatching() {
         return personNameComponentOrderInsensitiveMatching;
     }
@@ -1952,7 +1943,6 @@ public void reconfigure(DeviceExtension from) {
         showPatientInfoInSystemLog = arcdev.showPatientInfoInSystemLog;
         showPatientInfoInAuditLog = arcdev.showPatientInfoInAuditLog;
         bulkDataSpoolDirectory = arcdev.bulkDataSpoolDirectory;
-        queryRetrieveViewID = arcdev.queryRetrieveViewID;
         personNameComponentOrderInsensitiveMatching = arcdev.personNameComponentOrderInsensitiveMatching;
         validateCallingAEHostname = arcdev.validateCallingAEHostname;
         sendPendingCGet = arcdev.sendPendingCGet;

dcm4chee-arc-ui2/src/assets/schema/archiveDevice.schema.json

@@ -4,7 +4,6 @@
   "type": "object",
   "required": [
     "dcmFuzzyAlgorithmClass",
-    "dcmQueryRetrieveViewID",
     "dcmSeriesMetadataFetchSize",
     "dcmPurgeInstanceRecords",
     "dcmPurgeInstanceRecordsFetchSize",
@@ -127,12 +126,6 @@
       "minimum": 0,
       "exclusiveMinimum": true
     },
-    "dcmQueryRetrieveViewID": {
-      "title": "Query/Retrieve View ID",
-      "description": "Query/Retrieve View Identifier. May be overwritten by configured values for particular Archive Network AEs.",
-      "type": "string",
-      "format": "dcmQueryRetrieveViewID"
-    },
     "dcmOverwritePolicy": {
       "title": "Overwrite Policy",
       "description": "Overwrite Policy. May be overwritten by configured values for particular Archive Network AEs.",

dcm4chee-arc-ui2/src/assets/schema/archiveNetworkAE.schema.json

@@ -3,6 +3,7 @@
   "description": "DICOM Archive Network AE related information",
   "type": "object",
   "required": [
+    "dcmQueryRetrieveViewID",
     "dcmObjectStorageCount"
   ],
   "properties": {
@@ -96,7 +97,7 @@
     },
     "dcmQueryRetrieveViewID": {
       "title": "Query/Retrieve View ID",
-      "description": "Query/Retrieve View Identifier. Overwrites value specified on Device level.",
+      "description": "Query/Retrieve View Identifier.",
       "type": "string",
       "format": "dcmQueryRetrieveViewID"
     },