Refactored code

Author: pokki-deploy

src/main/java/in/erail/model/ResponseEvent.java

@@ -162,8 +162,13 @@ public ResponseEvent setContentType(String pContentType) {
     return this;
   }
 
-  public ResponseEvent setContentType(MediaType pMediaType) {
-    setContentType(pMediaType.toString());
+  /**
+   * Predefined Content Type
+   * @param pMediaType
+   * @return Response Event
+   */
+  public ResponseEvent setMediaType(MediaType pMediaType) {
+    ResponseEvent.this.setContentType(pMediaType.toString());
     return this;
   }
 

src/main/java/in/erail/route/LoadUserFromAccessTokenRouteBuillder.java

@@ -15,7 +15,7 @@
  */
 public class LoadUserFromAccessTokenRouteBuillder extends AbstractRouterBuilderImpl {
 
-  private Pattern AUTH_TOKEN = Pattern.compile("^Bearer\\s(?<token>.*)");
+  private final Pattern AUTH_TOKEN = Pattern.compile("^Bearer\\s(?<token>.*)");
   private UserProvider mUserProvider;
 
   @Override

src/main/java/in/erail/route/OpenAPI3RouteBuilder.java

@@ -155,7 +155,7 @@ public HttpServerResponse buildResponseFromReply(JsonObject pReplyResponse, Rout
     Optional<String> contentType = Optional.ofNullable(response.headerValue(HttpHeaders.CONTENT_TYPE));
 
     if (!contentType.isPresent()) {
-      response.setContentType(MediaType.OCTET_STREAM);
+      response.setMediaType(MediaType.OCTET_STREAM);
     }
 
     response
@@ -231,6 +231,7 @@ public Router getRouter(Router pRouter) {
                       .asList(t)
                       .stream()
                       .forEach((service) -> {
+                        getLog().debug(() -> "Adding OpenAPI service handle:" + service.getOperationId());
                         apiFactory.addHandlerByOperationId(service.getOperationId(), (routingContext) -> {
                           if (isSecurityEnable()) {
 

src/main/java/in/erail/service/RESTServiceImpl.java

@@ -20,12 +20,15 @@
  */
 public abstract class RESTServiceImpl implements RESTService {
 
+  private static final ResponseEvent DEFAULT_REPONSE_EVENT = new ResponseEvent();
+  
   private String mOperationId;
   private String mServiceUniqueId;
   private Vertx mVertx;
   private boolean mEnable = false;
   private Logger mLog;
   private Scheduler mScheduler = Schedulers.io();
+  private ResponseEvent mDefaultResponseEvent = DEFAULT_REPONSE_EVENT;
 
   @StartService
   public void start() {
@@ -39,7 +42,7 @@ public void start() {
               .doOnTerminate(() -> getLog().info(() -> String.format("%s[%s] service stopped", getServiceUniqueId(), Thread.currentThread().getName())))
               .flatMapSingle(this::handleRequest)
               .subscribe(
-                      resp -> getLog().trace(() -> resp.toString()), 
+                      resp -> getLog().trace(() -> resp.toString()),
                       err -> getLog().error(() -> String.format("Process exception:[%s],Error:[%s]", getServiceUniqueId(), ExceptionUtils.getStackTrace(err)))
               );
     }
@@ -50,13 +53,13 @@ public Single<JsonObject> handleRequest(Message<JsonObject> pMessage) {
             .just(pMessage)
             .map(m -> pMessage.body().mapTo(RequestEvent.class))
             .flatMapMaybe(req -> process(req))
-            .toSingle(new ResponseEvent())
+            .toSingle(getDefaultResponseEvent())
             .map(resp -> JsonObject.mapFrom(resp))
             .doOnSuccess(resp -> pMessage.reply(resp))
             .doOnError(err -> {
               ResponseEvent resp = new ResponseEvent()
                       .setStatusCode(HttpResponseStatus.BAD_REQUEST.code())
-                      .setContentType(MediaType.PLAIN_TEXT_UTF_8)
+                      .setMediaType(MediaType.PLAIN_TEXT_UTF_8)
                       .setBody(ExceptionUtils.getMessage(err).getBytes());
               pMessage.reply(JsonObject.mapFrom(resp));
             });
@@ -112,4 +115,12 @@ public void setScheduler(Scheduler pScheduler) {
     this.mScheduler = pScheduler;
   }
 
+  public ResponseEvent getDefaultResponseEvent() {
+    return mDefaultResponseEvent;
+  }
+
+  public void setDefaultResponseEvent(ResponseEvent pDefaultResponseEvent) {
+    this.mDefaultResponseEvent = pDefaultResponseEvent;
+  }
+
 }

src/test/java/in/erail/service/BinaryBodyService.java

@@ -27,7 +27,7 @@ public Maybe<ResponseEvent> process(RequestEvent pRequest) {
     }
 
     ResponseEvent response = new ResponseEvent();
-    response.setContentType(MediaType.PLAIN_TEXT_UTF_8);
+    response.setMediaType(MediaType.PLAIN_TEXT_UTF_8);
 
     JsonObject jsonBody = new JsonObject(Buffer.buffer(pRequest.getBody()));
 

src/test/java/in/erail/service/BroadcastService.java

@@ -35,7 +35,7 @@ public Maybe<ResponseEvent> process(RequestEvent pRequest) {
 
     ResponseEvent response = new ResponseEvent();
     response.setBody(TestConstants.Service.Message.successMessage().toString().getBytes());
-    response.setContentType(MediaType.JSON_UTF_8);
+    response.setMediaType(MediaType.JSON_UTF_8);
 
     return Maybe.just(response);
   }