From ac46bd32d1bb8b8deaf31a409b3cdf2bf1bdb701 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 30 Sep 2024 14:58:13 +0100 Subject: [PATCH] Update MediaTypes.java --- .../pekko/http/javadsl/model/MediaTypes.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/MediaTypes.java b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/MediaTypes.java index dcae80ca8..d5cf09bee 100644 --- a/http-core/src/main/java/org/apache/pekko/http/javadsl/model/MediaTypes.java +++ b/http-core/src/main/java/org/apache/pekko/http/javadsl/model/MediaTypes.java @@ -467,7 +467,7 @@ public static MediaType.Binary applicationBinary( : org.apache.pekko.http.scaladsl.model.MediaType.NotCompressible$.MODULE$; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.applicationBinary(subType, comp, fileEx); } @@ -478,7 +478,7 @@ public static MediaType.Binary applicationBinary( (org.apache.pekko.http.scaladsl.model.MediaType.Compressibility) compressibility; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.applicationBinary(subType, comp, fileEx); } @@ -489,7 +489,7 @@ public static MediaType.WithFixedCharset applicationWithFixedCharset( (org.apache.pekko.http.scaladsl.model.HttpCharset) charset; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.applicationWithFixedCharset( subType, cs, fileEx); @@ -498,7 +498,7 @@ public static MediaType.WithFixedCharset applicationWithFixedCharset( public static MediaType.WithOpenCharset applicationWithOpenCharset( String subType, String... fileExtensions) { scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.applicationWithOpenCharset( subType, fileEx); @@ -512,7 +512,7 @@ public static MediaType.Binary audio( : org.apache.pekko.http.scaladsl.model.MediaType.NotCompressible$.MODULE$; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.audio(subType, comp, fileEx); } @@ -523,7 +523,7 @@ public static MediaType.Binary audio( (org.apache.pekko.http.scaladsl.model.MediaType.Compressibility) compressibility; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.audio(subType, comp, fileEx); } @@ -536,7 +536,7 @@ public static MediaType.Binary image( : org.apache.pekko.http.scaladsl.model.MediaType.NotCompressible$.MODULE$; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.image(subType, comp, fileEx); } @@ -547,7 +547,7 @@ public static MediaType.Binary image( (org.apache.pekko.http.scaladsl.model.MediaType.Compressibility) compressibility; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.image(subType, comp, fileEx); } @@ -560,7 +560,7 @@ public static MediaType.Binary message( : org.apache.pekko.http.scaladsl.model.MediaType.NotCompressible$.MODULE$; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.message(subType, comp, fileEx); } @@ -571,14 +571,14 @@ public static MediaType.Binary message( (org.apache.pekko.http.scaladsl.model.MediaType.Compressibility) compressibility; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.message(subType, comp, fileEx); } public static MediaType.WithOpenCharset text(String subType, String... fileExtensions) { scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.text(subType, fileEx); } @@ -591,7 +591,7 @@ public static MediaType.Binary video( : org.apache.pekko.http.scaladsl.model.MediaType.NotCompressible$.MODULE$; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.video(subType, comp, fileEx); } @@ -602,7 +602,7 @@ public static MediaType.Binary video( (org.apache.pekko.http.scaladsl.model.MediaType.Compressibility) compressibility; scala.collection.immutable.Seq fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)); + Util.convertIterable(java.util.Arrays.asList(fileExtensions)); return org.apache.pekko.http.scaladsl.model.MediaType.video(subType, comp, fileEx); } @@ -638,7 +638,7 @@ public static MediaType.Binary customBinary( : org.apache.pekko.http.scaladsl.model.MediaType.NotCompressible$.MODULE$; scala.collection.immutable.List fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)) + Util.convertIterable(java.util.Arrays.asList(fileExtensions)) .toList(); scala.collection.immutable.Map p = Util.convertMapToScala(params); @@ -658,7 +658,7 @@ public static MediaType.Binary customBinary( (org.apache.pekko.http.scaladsl.model.MediaType.Compressibility) compressibility; scala.collection.immutable.List fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)) + Util.convertIterable(java.util.Arrays.asList(fileExtensions)) .toList(); scala.collection.immutable.Map p = Util.convertMapToScala(params); @@ -678,7 +678,7 @@ public static MediaType.WithFixedCharset customWithFixedCharset( (org.apache.pekko.http.scaladsl.model.HttpCharset) charset; scala.collection.immutable.List fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)) + Util.convertIterable(java.util.Arrays.asList(fileExtensions)) .toList(); scala.collection.immutable.Map p = Util.convertMapToScala(params); @@ -694,7 +694,7 @@ public static MediaType.WithOpenCharset customWithOpenCharset( boolean allowArbitrarySubtypes, String... fileExtensions) { scala.collection.immutable.List fileEx = - org.apache.pekko.japi.Util.immutableSeq(java.util.Arrays.asList(fileExtensions)) + Util.convertIterable(java.util.Arrays.asList(fileExtensions)) .toList(); scala.collection.immutable.Map p = Util.convertMapToScala(params);