Audit services code cleanup #3262

dcm4che · Aug 22, 2024 · dce7619 · dce7619
1 parent f5a4b8e
commit dce7619
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java
@@ -94,7 +94,6 @@
 import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -1288,10 +1287,10 @@ private String getLocalHostName(AuditLogger log) {
         return log.getConnections().get(0).getHostname();
     }
 
-    private Path toDirPath(AuditLogger auditLogger) throws UnsupportedEncodingException {
+    private Path toDirPath(AuditLogger auditLogger) {
         return Paths.get(
                 StringUtils.replaceSystemProperties(getArchiveDevice().getAuditSpoolDirectory()),
-                URLEncoder.encode(auditLogger.getCommonName(), "UTF-8"));
+                URLEncoder.encode(auditLogger.getCommonName(), StandardCharsets.UTF_8));
     }
 
     private void writeSpoolFile(

diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java
@@ -43,7 +43,6 @@
 import org.dcm4che3.audit.*;
 import org.dcm4che3.hl7.HL7Segment;
 import org.dcm4che3.net.audit.AuditLogger;
-import org.dcm4che3.util.StringUtils;
 import org.dcm4chee.arc.entity.Patient;
 
 import java.text.ParsePosition;
@@ -153,22 +152,6 @@ static ParticipantObjectIdentification[] studyPatParticipants(
         return studyPatParticipants;
     }
 
-    static ParticipantObjectIdentification[] studyPatParticipants(
-            SpoolFileReader reader, AuditInfo auditInfo, AuditLogger auditLogger) {
-        ParticipantObjectIdentification[] studyPatParticipants = new ParticipantObjectIdentification[2];
-        String[] studyUIDs = StringUtils.split(auditInfo.getField(AuditInfo.STUDY_UID), ';');
-        studyPatParticipants[0] = studyPOI(studyUIDs[0])
-                                    .desc(participantObjDesc(auditInfo, reader.getInstanceLines(),
-                                            studyUIDs.length > 1 || auditInfo.getField(AuditInfo.OUTCOME) != null
-                                                    || auditLogger.isIncludeInstanceUID())
-                                            .pocsStudyUIDs(studyUIDs)
-                                            .build())
-                                    .lifeCycle(AuditMessages.ParticipantObjectDataLifeCycle.Verification)
-                                    .build();
-        studyPatParticipants[1] = patientPOIBuilder(auditInfo).build();
-        return studyPatParticipants;
-    }
-
     static ParticipantObjectIdentificationBuilder studyPOI(String uid) {
         return new ParticipantObjectIdentificationBuilder(
                 uid,