You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/10/10 00:02:12 UTC
[incubator-nlpcraft] branch NLPCRAFT-146 updated: Update
NCBasicRestApi.scala
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-146
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-146 by this push:
new db30932 Update NCBasicRestApi.scala
db30932 is described below
commit db309320b47860c9156061d19129d156b4d21bfe
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Fri Oct 9 17:01:58 2020 -0700
Update NCBasicRestApi.scala
---
.../nlpcraft/server/rest/NCBasicRestApi.scala | 77 ++++++----------------
1 file changed, 20 insertions(+), 57 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
index f25094f..e2bc2a2 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/rest/NCBasicRestApi.scala
@@ -1865,65 +1865,28 @@ class NCBasicRestApi extends NCRestApi with LazyLogging with NCOpenCensusTrace w
RejectionHandler.newBuilder().
handle {
- case err: UnsupportedRequestContentTypeRejection ⇒
- complete(s"Unsupported request content type rejection, supported: ${err.supported.mkString(", ")}")
-
- case err: SchemeRejection ⇒
- complete(s"Scheme rejection, supported: ${err.supported.mkString(", ")}")
-
- case err: UnsatisfiableRangeRejection ⇒
- complete(s"Unsatisfiable range rejection, ranges: ${err.unsatisfiableRanges.mkString(", ")}")
-
- case err: TransformationRejection ⇒
- complete(s"Transformation rejection")
-
- case err: MalformedRequestContentRejection ⇒
- complete(s"Malformed request content rejection: ${err.message}")
-
- case err: AuthenticationFailedRejection ⇒
- complete(s"Authentication failed rejection")
-
- case err: TooManyRangesRejection ⇒
- complete(s"Too many ranges rejection, max ranges: ${err.maxRanges}")
-
- case err: MissingFormFieldRejection ⇒
- complete(s"Missing form field rejection, field: ${err.fieldName}")
-
- case err: UnacceptedResponseContentTypeRejection ⇒
- complete(s"Unaccepted response content type rejection, supported: ${err.supported.mkString(", ")}")
-
- case err: MethodRejection ⇒
- complete(s"Method rejection, supported: ${err.supported}")
-
- case err: UnacceptedResponseEncodingRejection ⇒
- complete(s"Unaccepted response encoding rejection, supported: ${err.supported.mkString(", ")}")
-
- case err: UnsupportedRequestEncodingRejection ⇒
- complete(s"Unsupported request encoding rejection, supported: ${err.supported}")
-
- case err: MissingCookieRejection ⇒
- complete(s"Missing cookie rejection, name: ${err.cookieName}")
-
- case err: InvalidRequiredValueForQueryParamRejection ⇒
- complete(s"Invalid required value for query param rejection, name: ${err.parameterName}, expected : ${err.expectedValue}, actual : ${err.actualValue}")
-
- case err: UnsupportedWebSocketSubprotocolRejection ⇒
- complete(s"Unsupported web socket subprotocol rejection, subprotocol: ${err.supportedProtocol}")
-
- case err: CircuitBreakerOpenRejection ⇒
- complete(s"Circuit breaker open rejection")
-
- case err: MissingHeaderRejection ⇒
- complete(s"Missing header rejection, name: ${err.headerName}")
-
- case err: MissingQueryParamRejection ⇒
- complete(s"Missing query param rejection, name: ${err.parameterName}")
-
- case err: InvalidOriginRejection ⇒
- complete(s"Invalid origin rejection, supported: ${err.allowedOrigins.mkString(", ")}")
+ case _: UnsupportedRequestContentTypeRejection ⇒ complete("Unsupported content type.")
+ case _: SchemeRejection ⇒ complete("Unsupported scheme.")
+ case _: UnsatisfiableRangeRejection ⇒ complete("Invalid range.")
+ case _: TransformationRejection ⇒ complete("Transformation error.")
+ case _: MalformedRequestContentRejection ⇒ complete("Malformed content.")
+ case _: AuthenticationFailedRejection ⇒ complete("Authentication error.")
+ case _: TooManyRangesRejection ⇒ complete("Too many ranges.")
+ case err: MissingFormFieldRejection ⇒ complete(s"Missing form field: ${err.fieldName}")
+ case _: UnacceptedResponseContentTypeRejection ⇒ complete(s"Unsupported response content type.")
+ case _: MethodRejection ⇒ complete(s"Invalid method.")
+ case _: UnacceptedResponseEncodingRejection ⇒ complete(s"Unsupported response encoding.")
+ case _: UnsupportedRequestEncodingRejection ⇒ complete(s"Unsupported request encoding.")
+ case err: MissingCookieRejection ⇒ complete(s"Missing cookie: ${err.cookieName}'")
+ case err: InvalidRequiredValueForQueryParamRejection ⇒ complete(s"Invalid parameter value: ${err.parameterName}")
+ case _: UnsupportedWebSocketSubprotocolRejection ⇒ complete(s"Unsupported web socket sub-protocol.")
+ case _: CircuitBreakerOpenRejection ⇒ complete(s"Circuit breaker error.")
+ case _: MissingHeaderRejection ⇒ complete(s"Missing header.")
+ case err: MissingQueryParamRejection ⇒ complete(s"Missing parameter: ${err.parameterName}")
+ case _: InvalidOriginRejection ⇒ complete(s"Invalid origin.")
// Common case.
- case err: Rejection ⇒ complete(s"Bad request: $err")
+ case err: Rejection ⇒ complete(s"Bad request.")
}.result
}