/*
 * ProActive Parallel Suite(TM):
 * The Open Source library for parallel and distributed
 * Workflows & Scheduling, Orchestration, Cloud Automation
 * and Big Data Analysis on Enterprise Grids & Clouds.
 *
 * Copyright (c) 2007 - 2017 ActiveEon
 * Contact: contact@activeeon.com
 *
 * This library is free software: you can redistribute it and/or
 * modify it under the terms of the GNU Affero General Public License
 * as published by the Free Software Foundation: version 3 of
 * the License.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * If needed, contact us to obtain a release under GPL Version 2 or 3
 * or a different license than the AGPL.
 */
package org.ow2.proactive.catalog.rest.exceptionhandler;

import org.ow2.proactive.microservices.common.exception.ExceptionHandlerAdvice;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;

import lombok.extern.log4j.Log4j2;


/**
 * @author ActiveEon Team
 * @since 03/08/2017
 */
@Controller
@ControllerAdvice
@Log4j2
public class ExceptionHandlerController extends ExceptionHandlerAdvice {

    public ExceptionHandlerController() {
        super(log);
    }

    /**
     * Check if the binding error is a client error due to a bad session
     * @param e the exception caught
     * @return unauthorized or server error
     */
    @ExceptionHandler(DataIntegrityViolationException.class)
    public @ResponseBody ResponseEntity<Object> dataDataIntegrityException(DataIntegrityViolationException e)
            throws Exception {
        return clientErrorHandler(e);
    }
}

@@ -1270,58 +1270,8 @@
 ty;%0A
-import org.springframework.stereotype.Controller;%0A
 impo
@@ -1554,20 +1554,8 @@
  */%0A
-@Controller%0A
 @Con
@@ -1723,178 +1723,8 @@
  %7D%0A%0A
-    /**%0A     * Check if the binding error is a client error due to a bad session%0A     * @param e the exception caught%0A     * @return unauthorized or server error%0A     */%0A
     
@@ -1832,20 +1832,16 @@
 ct%3E data
-Data
 Integrit
@@ -1850,16 +1850,23 @@
 xception
+Handler
 (DataInt

remove useless annotation and bad comments in ExceptionHandlerController