From f49708d8b79c05de692e655d04677a88ab462363 Mon Sep 17 00:00:00 2001
From: Konrad Malawski <ktoso@project13.pl>
Date: Fri, 3 Jun 2016 14:57:12 +0200
Subject: [PATCH] +htp #20705 allows javadsl creating custom rejections

---
 .../server/directives/BasicDirectivesExamplesTest.java       | 2 +-
 .../src/main/scala/akka/http/javadsl/server/Rejections.scala | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
index fa5a520460..21d7fcc471 100644
--- a/akka-docs/rst/java/code/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
+++ b/akka-docs/rst/java/code/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
@@ -544,7 +544,7 @@ public class BasicDirectivesExamplesTest extends JUnitRouteTest {
     //#mapRouteResult
   }
 
-  public static final class MyCustomRejection implements akka.http.scaladsl.server.Rejection {}
+  public static final class MyCustomRejection implements CustomRejection {}
 
   @Test
   public void testMapRouteResultPF() {
diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala b/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala
index a9cbe31da9..95d2e3b011 100644
--- a/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala
+++ b/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala
@@ -27,9 +27,14 @@ import scala.collection.JavaConverters._
  * A rejection encapsulates a specific reason why a Route was not able to handle a request. Rejections are gathered
  * up over the course of a Route evaluation and finally converted to [[akka.http.scaladsl.model.HttpResponse]]s by the
  * `handleRejections` directive, if there was no way for the request to be completed.
+ *
+ * If providing custom rejections, extend [[CustomRejection]] instead.
  */
 trait Rejection
 
+/** To be extended by user-provided custom rejections, such that they may be consumed in either Java or Scala DSLs. */
+trait CustomRejection extends akka.http.scaladsl.server.Rejection
+
 /**
  * Rejection created by method filters.
  * Signals that the request was rejected because the HTTP method is unsupported.