Repository: syncope Updated Branches: refs/heads/master c8ebb3479 -> dfc6a0620
SYNCOPE-701 removed and refined some logs on wicket resources Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dfc6a062 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dfc6a062 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dfc6a062 Branch: refs/heads/master Commit: dfc6a062061f6e436d2f1e2c8f8fedcdc823ca91 Parents: c8ebb34 Author: Andrea Patricelli <[email protected]> Authored: Fri Oct 30 12:48:45 2015 +0100 Committer: Andrea Patricelli <[email protected]> Committed: Fri Oct 30 12:48:45 2015 +0100 ---------------------------------------------------------------------- .../enduser/SyncopeEnduserApplication.java | 14 +----- .../client/enduser/SyncopeEnduserSession.java | 6 --- .../client/enduser/adapters/UserTOAdapter.java | 1 - .../client/enduser/resources/ErrorResource.java | 50 -------------------- .../client/enduser/resources/LoginResource.java | 2 +- .../enduser/resources/SchemaResource.java | 4 +- .../resources/SecurityQuestionResource.java | 4 +- .../resources/UserSelfCreateResource.java | 2 +- .../enduser/resources/UserSelfReadResource.java | 7 +-- .../resources/UserSelfUpdateResource.java | 11 +++-- 10 files changed, 17 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java index 4acc756..7d014d7 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java @@ -24,7 +24,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Locale; -import org.apache.syncope.client.enduser.resources.ErrorResource; import org.apache.syncope.client.enduser.resources.LoginResource; import org.apache.syncope.client.enduser.resources.LogoutResource; import org.apache.syncope.client.enduser.resources.SchemaResource; @@ -57,8 +56,6 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali protected void init() { super.init(); - LOG.debug("init SyncopeEnduserApplication"); - // resource to provide login functionality managed by wicket mountResource("/api/login", new ResourceReference("login") { @@ -123,7 +120,7 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali return new SchemaResource(); } }); - + mountResource("/api/securityQuestions", new ResourceReference("securityQuestions") { private static final long serialVersionUID = -128426276529456602L; @@ -134,15 +131,6 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali } }); - mountResource("/api/error", new ResourceReference("error") { - - private static final long serialVersionUID = -128426276529456602L; - - @Override - public IResource getResource() { - return new ErrorResource(); - } - }); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java index c5abc1d..f91a4d6 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java @@ -20,10 +20,8 @@ package org.apache.syncope.client.enduser; import java.io.File; import java.text.DateFormat; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Properties; @@ -54,9 +52,6 @@ public class SyncopeEnduserSession extends WebSession { private static final Logger LOG = LoggerFactory.getLogger(SyncopeEnduserSession.class); - public static final List<Locale> SUPPORTED_LOCALES = Arrays.asList(new Locale[] { - Locale.ENGLISH, Locale.ITALIAN, new Locale("pt", "BR") }); - protected static final String ENDUSER_PROPERTIES = "enduser.properties"; private String username; @@ -262,7 +257,6 @@ public class SyncopeEnduserSession extends WebSession { } } catch (Exception e) { LOG.error("Error loading {} file", ENDUSER_PROPERTIES, e); -// throw new WicketRuntimeException("Could not read " + ENDUSER_PROPERTIES, e); } this.scheme = properties.getProperty("scheme"); http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/adapters/UserTOAdapter.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/adapters/UserTOAdapter.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/adapters/UserTOAdapter.java index 551555f..f27ac85 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/adapters/UserTOAdapter.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/adapters/UserTOAdapter.java @@ -29,7 +29,6 @@ public class UserTOAdapter { public UserTO fromUserTORequest(final UserTORequest userTORequest, final String oldSelfPassword) { - // adapter code, to be moved in a new utility class final UserTO userTO = new UserTO(); // set key if in update mode final Long key = userTORequest.getKey(); http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/ErrorResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/ErrorResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/ErrorResource.java deleted file mode 100644 index bfceeab..0000000 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/ErrorResource.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.client.enduser.resources; - -import javax.ws.rs.core.MediaType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Mirror REST resource for obtaining user self operations. - * - * @see org.apache.syncope.common.rest.api - */ -public class ErrorResource extends AbstractBaseResource { - - private static final long serialVersionUID = -9184809392631523912L; - - /** - * Logger. - */ - private static final Logger LOG = LoggerFactory.getLogger(ErrorResource.class); - - @Override - protected ResourceResponse newResourceResponse(final Attributes attributes) { - - ResourceResponse response = new ResourceResponse(); - response.disableCaching(); - response.setContentType(MediaType.APPLICATION_JSON); - - response.setStatusCode(403); - - return response; - } -} http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LoginResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LoginResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LoginResource.java index fa6fa8c..8c03e50 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LoginResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/LoginResource.java @@ -54,8 +54,8 @@ public class LoginResource extends AbstractBaseResource { LOG.debug("Enduser login, user: {}", username); if (StringUtils.isBlank(username)) { - LOG.error("Could not read credentials from request: username is blank!"); responseMessage = "Could not read credentials from request: username is blank!"; + LOG.error(responseMessage); responseStatus = 400; } else { // authenticate user http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java index 544138b..501a32f 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java @@ -59,6 +59,8 @@ public class SchemaResource extends AbstractBaseResource { @Override protected AbstractResource.ResourceResponse newResourceResponse(final IResource.Attributes attributes) { + LOG.debug("Search all {} any type kind related schemas", AnyTypeKind.USER.name()); + AbstractResource.ResourceResponse response = new AbstractResource.ResourceResponse(); int responseStatus = 200; @@ -93,7 +95,7 @@ public class SchemaResource extends AbstractBaseResource { }); } catch (Exception e) { - LOG.error("Error retrieving " + AnyTypeKind.USER.name() + " class schemas", e); + LOG.error("Error retrieving {} any type kind related schemas", AnyTypeKind.USER.name(), e); responseStatus = 400; } http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java index f1ab6c8..f31cba5 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java @@ -43,14 +43,14 @@ public class SecurityQuestionResource extends AbstractBaseResource { @Override protected AbstractResource.ResourceResponse newResourceResponse(final IResource.Attributes attributes) { + LOG.debug("List available security questions"); + AbstractResource.ResourceResponse response = new AbstractResource.ResourceResponse(); int responseStatus = 200; try { - LOG.debug("List available security questions"); - final List<SecurityQuestionTO> securityQuestionTOs = securityQuestionService.list(); response.setWriteCallback(new AbstractResource.WriteCallback() { http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java index 61734a7..08cedb2 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java @@ -79,6 +79,7 @@ public class UserSelfCreateResource extends AbstractBaseResource { }); } catch (final Exception e) { + LOG.error("Could not read userTO from request", e); responseStatus = 400; response.setWriteCallback(new WriteCallback() { @@ -87,7 +88,6 @@ public class UserSelfCreateResource extends AbstractBaseResource { attributes.getResponse().write(e.getMessage()); } }); - LOG.error("Could not read userTO from request", e); } response.setStatusCode(responseStatus); http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java index 3519e78..824aa76 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfReadResource.java @@ -26,11 +26,6 @@ import org.apache.wicket.request.resource.AbstractResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * Mirror REST resource for obtaining user self operations. - * - * @see org.apache.syncope.common.rest.api - */ public class UserSelfReadResource extends AbstractResource { private static final long serialVersionUID = -9184809392631523912L; @@ -49,6 +44,8 @@ public class UserSelfReadResource extends AbstractResource { @Override protected ResourceResponse newResourceResponse(final Attributes attributes) { + LOG.debug("Requested user self information"); + ResourceResponse response = new ResourceResponse(); final String selfTOJson = POJOHelper.serialize(userTOAdapter.toUserTORequest(SyncopeEnduserSession.get(). getSelfTO())); http://git-wip-us.apache.org/repos/asf/syncope/blob/dfc6a062/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java index 5fc9c82..8befc00 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java @@ -20,6 +20,7 @@ package org.apache.syncope.client.enduser.resources; import java.io.IOException; import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.core.Response; import org.apache.syncope.client.enduser.SyncopeEnduserSession; import org.apache.syncope.client.enduser.adapters.UserTOAdapter; import org.apache.syncope.client.enduser.model.UserTORequest; @@ -58,15 +59,17 @@ public class UserSelfUpdateResource extends AbstractBaseResource { final UserTORequest userTOResponse = POJOHelper.deserialize(IOUtils.toString(request.getInputStream()), UserTORequest.class); - LOG.debug("userTOResponse: {}", userTOResponse); + LOG.trace("userTOResponse: {}", userTOResponse); // adapt user, change self password only value passed is not null and has changed UserTO userTO = userTOAdapter.fromUserTORequest(userTOResponse, SyncopeEnduserSession.get().getPassword()); - LOG.debug("Enduser user self update, user: {}", userTO.toString()); + LOG.debug("User {} id updating himself", userTO.getUsername()); // update user - userSelfService.update(userTO); + Response res = userSelfService.update(userTO); + responseStatus = res.getStatus(); + responseMessage = "User updated successfully"; response.setWriteCallback(new WriteCallback() { @@ -78,6 +81,7 @@ public class UserSelfUpdateResource extends AbstractBaseResource { }); } catch (final Exception e) { + LOG.error("Error while updating user", e); responseStatus = 400; response.setWriteCallback(new WriteCallback() { @@ -86,7 +90,6 @@ public class UserSelfUpdateResource extends AbstractBaseResource { attributes.getResponse().write(e.getMessage()); } }); - LOG.error("Could not read userTO from request", e); } response.setStatusCode(responseStatus);
