Bump version. Improve MediaType.

noboomu · Aug 14, 2019 · b6ca5ec · b6ca5ec
1 parent b243c60
commit b6ca5ec
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 7 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
-        <version>0.4.1</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/src/main/java/io/sinistral/proteus/server/MediaType.java b/core/src/main/java/io/sinistral/proteus/server/MediaType.java
@@ -9,6 +9,8 @@
  */
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -966,6 +968,7 @@ public class MediaType
     public static final MediaType IMAGE_GIF = create("image/gif", "gif");
     public static final MediaType IMAGE_IEF = create("image/ief", "ief");
     public static final MediaType IMAGE_JPEG = create("image/jpeg", "jpeg", "jpg", "jpe");
+    public static final MediaType IMAGE_JBIG = create("image/jbig", "jbig", "jbg");
     public static final MediaType IMAGE_KTX = create("image/ktx", "ktx");
     public static final MediaType IMAGE_PCX = create("image/pcx", "pcx");
     public static final MediaType IMAGE_PNG = create("image/png", "png");
@@ -1230,11 +1233,11 @@ public static MediaType of(String contentType)
         return new MediaType(contentType);
     }
 
+
     private final byte[] bytes;
 
     private final String contentType;
 
-
     private MediaType(String contentType)
     {
         this.bytes = contentType.getBytes();
@@ -1245,7 +1248,6 @@ private MediaType(String name, String[] attributes)
     {
         this.bytes = join(name, attributes).getBytes();
         this.contentType = new String(this.bytes);
-
     }
 
     private String join(String name, String[] attributes)
@@ -1261,6 +1263,7 @@ public byte[] getBytes()
         return bytes;
     }
 
+    @JsonProperty("contentType")
     public String contentType()
     {
         return this.contentType;
@@ -1272,8 +1275,35 @@ public String toString()
         return this.contentType;
     }
 
+    public String getFileExtension()
+    {
+        return Optional.ofNullable(EXTENSION_MAP.get(this)).map( fe -> fe.get(0)).orElse(null);
+    }
+
+    public List<String> getFileExtensions()
+    {
+        return Optional.ofNullable(EXTENSION_MAP.get(this)).orElse(null);
+    }
+
+    public String subType()
+    {
+        return this.contentType.substring(this.contentType.lastIndexOf("/") + 1, Math.max(this.contentType.lastIndexOf(";"),this.contentType.length()));
+    }
+
     private static final Map<String,MediaType> TYPE_MAP = new HashMap<>();
 
+    private static final Map<MediaType,List<String>> EXTENSION_MAP = new HashMap<>();
+
+    public static Map<MediaType,List<String>> getFileExtensionMap()
+    {
+        if(EXTENSION_MAP.size() == 0) {
+
+            EXTENSION_MAP.putAll(FILE_EXTENSIONS.entrySet().stream().collect(Collectors.groupingBy(Map.Entry::getValue, Collectors.mapping(Map.Entry::getKey, Collectors.toList()))));
+        }
+
+        return EXTENSION_MAP;
+    }
+
     public static Map<String,MediaType> getTypeMap()
     {
         if(TYPE_MAP.size() == 0) {
@@ -1289,7 +1319,7 @@ public static Map<String,MediaType> getTypeMap()
                     TYPE_MAP.put(mt.contentType,mt);
                 } catch( Exception e )
                 {
-                    e.printStackTrace();
+
                 }
             });
         }

diff --git a/openapi/pom.xml b/openapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
-        <version>0.4.1</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>io.sinistral</groupId>
     <artifactId>proteus-project</artifactId>
     <packaging>pom</packaging>
-    <version>0.4.1</version>
+    <version>0.4.2-SNAPSHOT</version>
 
     <description>Proteus is an extremely light, fast, and flexible Java REST API framework built atop Undertow.</description>
     <url>http://github.com/noboomu/proteus</url>

diff --git a/swagger/pom.xml b/swagger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>proteus-project</artifactId>
         <groupId>io.sinistral</groupId>
-        <version>0.4.1</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>