Remove redundant ContentType

nroduit · Sep 11, 2021 · 51d0052 · 51d0052
1 parent 571c842
commit 51d0052
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/src/main/java/org/weasis/dicom/web/ContentType.java b/src/main/java/org/weasis/dicom/web/ContentType.java
@@ -25,6 +25,14 @@ public enum ContentType {
  this.bulkdataTag = bulkdataTag;
  }
 
+ public String getType() {
+ return type;
+ }
+
+ public int getBulkdataTag() {
+ return bulkdataTag;
+ }
+
  static ContentType probe(Path path) {
  try {
  String type = Files.probeContentType(path);

diff --git a/src/main/java/org/weasis/dicom/web/DicomStowRS.java b/src/main/java/org/weasis/dicom/web/DicomStowRS.java
@@ -48,32 +48,11 @@ public class DicomStowRS implements AutoCloseable {
  private static final ByteArrayInputStream emptyInputStream =
  new ByteArrayInputStream(new byte[] {});
 
- public enum HttpContentType {
- DICOM("application/dicom"),
- XML("application/dicom+xml"),
- JSON("application/dicom+json");
-
- private final String type;
-
- HttpContentType(String type) {
- this.type = type;
- }
-
- public String getType() {
- return type;
- }
-
- @Override
- public String toString() {
- return type;
- }
- }
-
  private final ContentType contentType;
  private final String requestURL;
  private final String agentName;
  private final Map<String, String> headers;
- private final HttpContentType type = HttpContentType.XML;
+ private final Multipart.ContentType type = Multipart.ContentType.XML;
  private final HttpClient client;
  private final ExecutorService executorService;