Fix conflicts

playframework · Jan 12, 2023 · 1806493 · 1806493
1 parent f6f1b86
commit 1806493
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/core/play-java/src/test/java/play/mvc/RequestBuilderTest.java b/core/play-java/src/test/java/play/mvc/RequestBuilderTest.java
@@ -4,28 +4,15 @@
 
 package play.mvc;
 
-<<<<<<< HEAD
-import akka.stream.javadsl.Source;
-=======
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
 
 import akka.stream.javadsl.FileIO;
 import akka.stream.javadsl.Source;
 import akka.util.ByteString;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
 import org.hamcrest.CoreMatchers;
->>>>>>> 8e787dd65c (Escape Content-Disposition params according to WHATWG HTML living standard)
 import org.junit.Test;
 import play.api.Application;
 import play.api.Play;

diff --git a/core/play/src/main/scala/play/api/http/Writeable.scala b/core/play/src/main/scala/play/api/http/Writeable.scala
@@ -9,6 +9,7 @@ import play.api.libs.Files.TemporaryFile
 import play.api.mvc._
 import play.api.libs.json._
 import play.api.mvc.MultipartFormData.FilePart
+import play.core.formatters.Multipart
 
 import scala.annotation._
 
@@ -145,12 +146,8 @@ trait DefaultWriteables extends LowPriorityWriteables {
         .flatMap {
           case (name, values) =>
             values.map { value =>
-<<<<<<< HEAD
-              s"--$boundary\r\n${HeaderNames.CONTENT_DISPOSITION}: form-data; name=$name\r\n\r\n$value\r\n"
-=======
-              s"""--$resolvedBoundary\r\n${HeaderNames.CONTENT_DISPOSITION}: form-data; name="${Multipart
-                .escapeParamWithHTML5Strategy(name)}"\r\n\r\n$value\r\n"""
->>>>>>> 8e787dd65c (Escape Content-Disposition params according to WHATWG HTML living standard)
+              s"--$boundary\r\n${HeaderNames.CONTENT_DISPOSITION}: form-data; name=${Multipart
+                .escapeParamWithHTML5Strategy(name)}\r\n\r\n$value\r\n"
             }
         }
         .mkString("")

diff --git a/core/play/src/test/scala/play/api/http/WriteableSpec.scala b/core/play/src/test/scala/play/api/http/WriteableSpec.scala
@@ -59,7 +59,6 @@ class WriteableSpec extends Specification {
         val multipartFormData =
           createMultipartFormData[String](
             "file part value",
-            data => Some(ByteString.fromString(data)),
             dataPartKey = "ab\"cd\nef\rgh\"ij\rk\nl",
             filePartKey = "mn\"op\nqr\rst\"uv\rw\nx",
             filePartFilename = "fo\"o\no\rb\"a\ra\nar.p\"df"
@@ -100,17 +99,12 @@ class WriteableSpec extends Specification {
     }
   }
 
-<<<<<<< HEAD
-  def createMultipartFormData[A](ref: A): MultipartFormData[A] = {
-=======
   def createMultipartFormData[A](
       ref: A,
-      refToBytes: A => Option[ByteString] = (a: A) => None,
       dataPartKey: String = "name",
       filePartKey: String = "thefile",
       filePartFilename: String = "something.text"
   ): MultipartFormData[A] = {
->>>>>>> 8e787dd65c (Escape Content-Disposition params according to WHATWG HTML living standard)
     MultipartFormData[A](
       dataParts = Map(
         dataPartKey -> Seq("value")