From 6a9fb738c0f36aded125723333fdaeb0ebb40a35 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 16 Sep 2016 10:06:20 +0000
Subject: [PATCH] Prep work for OPENDJ-3246: Make all request handlers inherit from AbstractRequestHandler

---
 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java  |    6 ++----
 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceSingleton.java   |    3 +--
 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractRequestHandler.java |    6 ++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractRequestHandler.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractRequestHandler.java
index 338a155..4b02050 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractRequestHandler.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractRequestHandler.java
@@ -12,7 +12,6 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- *
  */
 package org.forgerock.opendj.rest2ldap;
 
@@ -20,6 +19,7 @@
 import org.forgerock.json.resource.ActionResponse;
 import org.forgerock.json.resource.CreateRequest;
 import org.forgerock.json.resource.DeleteRequest;
+import org.forgerock.json.resource.NotSupportedException;
 import org.forgerock.json.resource.PatchRequest;
 import org.forgerock.json.resource.QueryRequest;
 import org.forgerock.json.resource.QueryResourceHandler;
@@ -93,5 +93,7 @@
      *         The request.
      * @return A {@code Promise} containing the result of the operation.
      */
-    protected abstract <V> Promise<V, ResourceException> handleRequest(final Context context, final Request request);
+    protected <V> Promise<V, ResourceException> handleRequest(final Context context, final Request request) {
+        return new NotSupportedException().asPromise();
+    }
 }
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java
index 3cfe97a..df9efba 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java
@@ -12,7 +12,6 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- *
  */
 package org.forgerock.opendj.rest2ldap;
 
@@ -43,7 +42,6 @@
 import org.forgerock.json.resource.QueryResponse;
 import org.forgerock.json.resource.ReadRequest;
 import org.forgerock.json.resource.Request;
-import org.forgerock.json.resource.RequestHandler;
 import org.forgerock.json.resource.ResourceException;
 import org.forgerock.json.resource.ResourceResponse;
 import org.forgerock.json.resource.Router;
@@ -388,7 +386,7 @@
      * URL template /collection/{parent}/{child} then this handler processes requests against {parent} since it is
      * both an instance within /collection and also a collection of {child}.
      */
-    private final class InstanceHandler implements RequestHandler {
+    private final class InstanceHandler extends AbstractRequestHandler {
         @Override
         public Promise<ActionResponse, ResourceException> handleAction(final Context context,
                                                                        final ActionRequest request) {
@@ -452,7 +450,7 @@
      * Responsible for routing requests to sub-resources of instances within this collection. More specifically, given
      * the URL template /collection/{id} then this handler processes all requests beneath /collection/{id}.
      */
-    private final class SubResourceHandler implements RequestHandler {
+    private final class SubResourceHandler extends AbstractRequestHandler {
         @Override
         public Promise<ActionResponse, ResourceException> handleAction(final Context context,
                                                                        final ActionRequest request) {
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceSingleton.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceSingleton.java
index 1fe6eb4..96d75c9 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceSingleton.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceSingleton.java
@@ -12,7 +12,6 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- *
  */
 package org.forgerock.opendj.rest2ldap;
 
@@ -214,7 +213,7 @@
      * Responsible for routing requests to sub-resources of this singleton. More specifically, given
      * the URL template /singleton then this handler processes all requests beneath /singleton.
      */
-    private final class SubResourceHandler implements RequestHandler {
+    private final class SubResourceHandler extends AbstractRequestHandler {
         @Override
         public Promise<ActionResponse, ResourceException> handleAction(final Context context,
                                                                        final ActionRequest request) {

--
Gitblit v1.10.0