Merge remote-tracking branch 'upstream/master' into mavenize

# Conflicts:
#	opengrok-indexer/src/main/java/org/opengrok/indexer/web/constraints/PositiveDuration.java
#	opengrok-indexer/src/main/java/org/opengrok/indexer/web/constraints/PositiveDurationValidator.java
#	opengrok-indexer/src/main/java/org/opengrok/indexer/web/messages/Message.java
#	opengrok-indexer/src/test/java/org/opengrok/indexer/web/constraints/PositiveDurationValidatorTest.java
#	opengrok-web/src/main/java/org/opengrok/web/api/v1/RestApp.java
#	opengrok-web/src/main/java/org/opengrok/web/constraints/ValidationExceptionMapper.java
#	src/org/opensolaris/opengrok/web/api/constraints/PositiveDuration.java
#	src/org/opensolaris/opengrok/web/api/constraints/PositiveDurationValidator.java
#	src/org/opensolaris/opengrok/web/api/error/ValidationExceptionMapper.java
#	src/org/opensolaris/opengrok/web/constraints/PositiveDuration.java
#	src/org/opensolaris/opengrok/web/constraints/PositiveDurationValidator.java
#	src/org/opensolaris/opengrok/web/constraints/ValidationExceptionMapper.java
#	test/org/opensolaris/opengrok/web/api/constraint/PositiveDurationValidatorTest.java
#	test/org/opensolaris/opengrok/web/constraint/PositiveDurationValidatorTest.java

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/web/messages/Message.java

@@ -32,7 +32,7 @@
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
-import org.opengrok.indexer.web.constraints.PositiveDuration;
+import org.opengrok.indexer.web.api.constraints.PositiveDuration;
 
 import java.io.IOException;
 import java.time.Duration;

opengrok-web/src/main/java/org/opengrok/web/api/v1/RestApp.java

@@ -32,7 +32,8 @@ public class RestApp extends ResourceConfig {
     public static final String API_PATH = "/api/v1";
 
     public RestApp() {
-        packages("org.opengrok.web.api.v1.controller", "org.opengrok.web.api.v1.filter");
+        packages("org.opengrok.web.api.constraints", "org.opengrok.web.api.error");
+        packages(true, "org.opengrok.web.api.v1");
     }
 
 }

opengrok-indexer/src/main/java/org/opengrok/indexer/web/constraints/PositiveDuration.java renamed to src/org/opensolaris/opengrok/web/api/constraints/PositiveDuration.java

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
  */
-package org.opengrok.indexer.web.constraints;
+package org.opensolaris.opengrok.web.api.constraints;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
@@ -37,7 +37,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PositiveDuration {
 
-    String message() default "{org.opengrok.indexer.web.constraints.PositiveDuration.message}";
+    String message() default "{org.opensolaris.opengrok.web.constraints.PositiveDuration.message}";
 
     Class<?>[] groups() default {};
 

opengrok-indexer/src/main/java/org/opengrok/indexer/web/constraints/PositiveDurationValidator.java renamed to src/org/opensolaris/opengrok/web/api/constraints/PositiveDurationValidator.java

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
  */
-package org.opengrok.indexer.web.constraints;
+package org.opensolaris.opengrok.web.api.constraints;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;

src/org/opensolaris/opengrok/web/api/error/ExceptionMapperUtils.java

@@ -0,0 +1,63 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opensolaris.opengrok.web.api.error;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+public class ExceptionMapperUtils {
+
+    private ExceptionMapperUtils() {
+    }
+
+    /**
+     * Turns the exception into JSON format and embeds it into the response with the provided status.
+     * @param status status of the created response
+     * @param e exception to embed into the response
+     * @return response with the {@code status} and JSON media type with encoded {@code e} in the body
+     */
+    public static Response toResponse(final Response.Status status, final Exception e) {
+        return Response.status(status)
+                .entity(new ExceptionModel(e.getMessage()))
+                .type(MediaType.APPLICATION_JSON)
+                .build();
+    }
+
+    private static class ExceptionModel {
+
+        private String message;
+
+        ExceptionModel(final String message) {
+            this.message = message;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void setMessage(final String message) {
+            this.message = message;
+        }
+    }
+
+}

src/org/opensolaris/opengrok/web/api/error/GenericExceptionMapper.java

@@ -0,0 +1,45 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opensolaris.opengrok.web.api.error;
+
+import org.opensolaris.opengrok.logger.LoggerFactory;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@Provider
+public class GenericExceptionMapper implements ExceptionMapper<Exception> {
+
+    private static final Logger logger = LoggerFactory.getLogger(GenericExceptionMapper.class);
+
+    @Override
+    public Response toResponse(final Exception e) {
+        logger.log(Level.WARNING, "Exception while processing request", e);
+
+        return ExceptionMapperUtils.toResponse(Response.Status.INTERNAL_SERVER_ERROR, e);
+    }
+
+}

opengrok-web/src/main/java/org/opengrok/web/constraints/ValidationExceptionMapper.java renamed to src/org/opensolaris/opengrok/web/api/error/ValidationExceptionMapper.java

@@ -20,10 +20,9 @@
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
  */
-package org.opengrok.web.constraints;
+package org.opensolaris.opengrok.web.api.error;
 
 import javax.validation.ValidationException;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -33,10 +32,7 @@ public class ValidationExceptionMapper implements ExceptionMapper<ValidationExce
 
     @Override
     public Response toResponse(final ValidationException e) {
-        return Response.status(Response.Status.BAD_REQUEST)
-                .entity(e.getMessage())
-                .type(MediaType.TEXT_PLAIN)
-                .build();
+        return ExceptionMapperUtils.toResponse(Response.Status.BAD_REQUEST, e);
     }
 
 }

src/org/opensolaris/opengrok/web/api/error/WebApplicationExceptionMapper.java

@@ -0,0 +1,38 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opensolaris.opengrok.web.api.error;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class WebApplicationExceptionMapper implements ExceptionMapper<WebApplicationException> {
+
+    @Override
+    public Response toResponse(final WebApplicationException e) {
+        return e.getResponse();
+    }
+
+}

opengrok-indexer/src/test/java/org/opengrok/indexer/web/constraints/PositiveDurationValidatorTest.java renamed to test/org/opensolaris/opengrok/web/api/constraint/PositiveDurationValidatorTest.java

@@ -20,9 +20,10 @@
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
  */
-package org.opengrok.indexer.web.constraints;
+package org.opensolaris.opengrok.web.api.constraint;
 
 import org.junit.Test;
+import org.opensolaris.opengrok.web.api.constraints.PositiveDurationValidator;
 
 import java.time.Duration;