You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/02/04 18:57:49 UTC
[25/50] [abbrv] usergrid git commit: USERGRID-1243: logging overhaul,
pt. 1
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
index 77ba756..1971d22 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
@@ -134,7 +134,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "UserResource.setUserPassword" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.setUserPassword");
+ }
if ( json == null ) {
return null;
@@ -177,7 +179,9 @@ public class UserResource extends ServiceResource {
public ApiResponse getUserCredentials(@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "UserResource.getUserCredentials" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.getUserCredentials");
+ }
final ApiResponse response = createApiResponse();
@@ -214,7 +218,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "UserResource.setUserCredentials" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.setUserCredentials");
+ }
if ( json == null ) {
return null;
@@ -284,7 +290,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "UserResource.sendPin" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.sendPin");
+ }
ApiResponse response = createApiResponse();
response.setAction( "retrieve user pin" );
@@ -320,7 +328,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "UserResource.setPin" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.setPin");
+ }
ApiResponse response = createApiResponse();
response.setAction( "set user pin" );
@@ -346,7 +356,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "UserResource.postPin" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.postPin");
+ }
ApiResponse response = createApiResponse();
response.setAction( "set user pin" );
@@ -372,7 +384,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "UserResource.jsonPin" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.jsonPin");
+ }
ApiResponse response = createApiResponse();
response.setAction( "set user pin" );
@@ -393,7 +407,9 @@ public class UserResource extends ServiceResource {
@Produces(MediaType.TEXT_HTML)
public Viewable showPasswordResetForm( @Context UriInfo ui, @QueryParam("token") String token ) {
- logger.info( "UserResource.showPasswordResetForm" );
+ if (logger.isTraceEnabled()) {
+ logger.trace( "UserResource.showPasswordResetForm" );
+ }
this.token = token;
try {
@@ -424,7 +440,9 @@ public class UserResource extends ServiceResource {
@FormParam("recaptcha_response_field") String uresponse ) {
try {
- logger.info( "UserResource.handlePasswordResetForm" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.handlePasswordResetForm");
+ }
this.token = token;
@@ -562,7 +580,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "Send activation email for user: {}", getUserUuid() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Send activation email for user: {}", getUserUuid());
+ }
ApiResponse response = createApiResponse();
@@ -581,7 +601,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "Revoking user tokens for {}" , getUserUuid() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Revoking user tokens for {}", getUserUuid());
+ }
ApiResponse response = createApiResponse();
@@ -611,7 +633,9 @@ public class UserResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback,
@QueryParam("token") String token ) throws Exception {
- logger.info( "Revoking user token for {}", getUserUuid() );
+ if (logger.isTraceEnabled()) {
+ logger.trace( "Revoking user token for {}", getUserUuid() );
+ }
ApiResponse response = createApiResponse();
@@ -639,8 +663,8 @@ public class UserResource extends ServiceResource {
public Response getAccessToken( @Context UriInfo ui, @QueryParam("ttl") long ttl,
@QueryParam("callback") @DefaultValue("") String callback ) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("UserResource.getAccessToken");
+ if (logger.isTraceEnabled()) {
+ logger.trace("UserResource.getAccessToken");
}
try {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
index 81cf59a..b8b1300 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
@@ -71,8 +71,8 @@ public class UsersResource extends ServiceResource {
public AbstractContextResource addIdParameter( @Context UriInfo ui, @PathParam("entityId") PathSegment entityId )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.addIdParameter" );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.addIdParameter" );
}
UUID itemId = UUID.fromString( entityId.getPath() );
@@ -90,9 +90,9 @@ public class UsersResource extends ServiceResource {
public AbstractContextResource addNameParameter( @Context UriInfo ui, @PathParam("itemName") PathSegment itemName )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "ServiceResource.addNameParameter" );
- logger.debug( "Current segment is " + itemName.getPath() );
+ if(logger.isTraceEnabled()){
+ logger.trace( "ServiceResource.addNameParameter" );
+ logger.trace( "Current segment is {}", itemName.getPath() );
}
if ( itemName.getPath().startsWith( "{" ) ) {
@@ -212,8 +212,8 @@ public class UsersResource extends ServiceResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- if(logger.isDebugEnabled()){
- logger.debug( "UsersResource.executePost: body = " + body);
+ if(logger.isTraceEnabled()){
+ logger.trace( "UsersResource.executePost: body = {}", body);
}
Object json = readJsonToObject( body );
@@ -226,8 +226,8 @@ public class UsersResource extends ServiceResource {
boolean activated = !( ( confRequred != null ) && confRequred );
- if(logger.isDebugEnabled()){
- logger.debug("Confirmation required: {} Activated: {}", confRequred, activated );
+ if(logger.isTraceEnabled()){
+ logger.trace("Confirmation required: {} Activated: {}", confRequred, activated );
}
if ( json instanceof Map ) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java
index b4fad57..19d35fd 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/AbstractExceptionMapper.java
@@ -71,11 +71,11 @@ public abstract class AbstractExceptionMapper<E extends java.lang.Throwable> imp
if ( status >= 500 ) {
// only log real errors as errors
- logger.error( e.getClass().getCanonicalName() + " 5XX Uncaught Exception (" + status + ")", e );
+ logger.error( "{} 5XX Uncaught Exception ({})", e.getClass().getCanonicalName(), status, e );
} else {
if (logger.isDebugEnabled()) {
- logger.debug(e.getClass().getCanonicalName() + " Following Exception Thrown (" + status + ")", e);
+ logger.debug( "{} Following Exception Thrown ({})", e.getClass().getCanonicalName(), status, e );
}
}
@@ -105,9 +105,9 @@ public abstract class AbstractExceptionMapper<E extends java.lang.Throwable> imp
private Response toResponse( int status, String jsonResponse ) {
if ( status >= 500 ) {
// only log real errors as errors
- logger.error( "Server Error (" + status + "):\n" + jsonResponse );
+ logger.error( "Server Error ({}):\n{}", status, jsonResponse );
} else if ( logger.isDebugEnabled() ) {
- logger.debug( "Client Error (" + status + "):\n" + jsonResponse );
+ logger.debug( "Client Error ({}):\n{}", status, jsonResponse );
}
String callback = httpServletRequest.getParameter( "callback" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotAllowedExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotAllowedExceptionMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotAllowedExceptionMapper.java
index a65276f..0ffd5b9 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotAllowedExceptionMapper.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotAllowedExceptionMapper.java
@@ -24,9 +24,6 @@ import javax.ws.rs.ext.Provider;
import static javax.ws.rs.core.Response.Status.METHOD_NOT_ALLOWED;
-/**
- * Created by ApigeeCorporation on 1/8/16.
- */
@Provider
public class NotAllowedExceptionMapper extends AbstractExceptionMapper<NotAllowedException> {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
index b7aae50..90629ef 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
@@ -64,7 +64,9 @@ public class ContentTypeFilter implements Filter {
*/
@Override
public void init( FilterConfig filterConfig ) throws ServletException {
- logger.info( "Starting content type filter" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Starting content type filter");
+ }
}
@@ -135,8 +137,8 @@ public class ContentTypeFilter implements Filter {
String path = origRequest.getRequestURI();
String method = origRequest.getMethod();
- if (logger.isDebugEnabled()) {
- logger.debug("Content path is '{}'", path);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Content path is '{}'", path);
}
@@ -155,9 +157,8 @@ public class ContentTypeFilter implements Filter {
// request has no body, set type to application/json
if ( ( HttpMethod.POST.equals( method ) || HttpMethod.PUT.equals( method ) )
&& !MediaType.APPLICATION_FORM_URLENCODED.equals( getContentType() ) ) {
- if (logger.isDebugEnabled()) {
- logger.debug("Setting content type to application/json " +
- "for POST or PUT with no content at path '{}'", path);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Setting content type to application/json for POST or PUT with no content at path '{}'", path);
}
setHeader( HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON );
@@ -172,9 +173,8 @@ public class ContentTypeFilter implements Filter {
&& !MediaType.APPLICATION_JSON.equals( getContentType() )) {
// request appears to be JSON so set type to application/json
- if (logger.isDebugEnabled()) {
- logger.debug("Setting content type to application/json " +
- "for POST or PUT with json content at path '{}'", path);
+ if (logger.isTraceEnabled()) {
+ logger.trace("Setting content type to application/json for POST or PUT with json content at path '{}'", path);
}
setHeader( HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON );
setHeader( HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
index 23ccdf9..cc1a943 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
@@ -44,7 +44,9 @@ public class JSONPCallbackFilter implements ContainerRequestFilter {
public JSONPCallbackFilter() {
- logger.info( "JSONPCallbackFilter is installed" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("JSONPCallbackFilter is installed");
+ }
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
index 11fd897..6088bf2 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
@@ -130,7 +130,9 @@ public class ManagementResource extends AbstractContextResource {
public ManagementResource() {
- logger.info( "ManagementResource initialized" );
+ if (logger.isTraceEnabled()) {
+ logger.trace( "ManagementResource initialized" );
+ }
}
@@ -221,7 +223,9 @@ public class ManagementResource extends AbstractContextResource {
user = SubjectUtils.getUser();
}
- logger.info( "ManagementResource.getAccessToken with username: {}", username );
+ if (logger.isTraceEnabled()) {
+ logger.trace("ManagementResource.getAccessToken with username: {}", username);
+ }
String errorDescription = "invalid username or password";
@@ -255,7 +259,9 @@ public class ManagementResource extends AbstractContextResource {
user = management.verifyAdminUserPasswordCredentials( username, password );
if ( user != null ) {
- logger.info( "found user from verify: {}", user.getUuid() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("found user from verify: {}", user.getUuid());
+ }
}
}
catch ( UnactivatedAdminUserException uaue ) {
@@ -268,7 +274,7 @@ public class ManagementResource extends AbstractContextResource {
}
catch ( UnconfirmedAdminUserException uaue ) {
errorDescription = "User must be confirmed to authenticate";
- logger.warn( "Responding with HTTP 403 forbidden response for unconfirmed user {}" , user);
+ logger.warn( "Responding with HTTP 403 forbidden response for unconfirmed user");
OAuthResponse response = OAuthResponse.errorResponse( SC_FORBIDDEN )
.setError( OAuthError.TokenResponse.INVALID_GRANT )
@@ -343,7 +349,9 @@ public class ManagementResource extends AbstractContextResource {
@QueryParam( "callback" ) @DefaultValue( "" ) String callback )
throws Exception {
- logger.info( "ManagementResource.getAccessTokenPost" );
+ if (logger.isTraceEnabled()) {
+ logger.trace("ManagementResource.getAccessTokenPost");
+ }
return getAccessTokenInternal( ui, authorization, grant_type, username, password, client_id, client_secret, ttl,
callback, false, false);
@@ -453,8 +461,8 @@ public class ManagementResource extends AbstractContextResource {
@FormParam( "username" ) String username,
@FormParam( "password" ) String password ) {
- if (logger.isDebugEnabled()) {
- logger.debug("ManagementResource /authorize: {}/{}", username, password);
+ if (logger.isTraceEnabled()) {
+ logger.trace("ManagementResource /authorize: {}", username);
}
try {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
index f777637..ddca21a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
@@ -73,16 +73,16 @@ public class OrganizationResource extends AbstractContextResource {
public OrganizationResource() {
- if (logger.isDebugEnabled()) {
- logger.debug("OrganizationResource created");
+ if (logger.isTraceEnabled()) {
+ logger.trace("OrganizationResource created");
}
}
public OrganizationResource init( OrganizationInfo organization ) {
this.organization = organization;
- if (logger.isDebugEnabled()) {
- logger.debug("OrganizationResource initialized for org {}", organization.getName());
+ if (logger.isTraceEnabled()) {
+ logger.trace("OrganizationResource initialized for org {}", organization.getName());
}
return this;
}
@@ -114,7 +114,9 @@ public class OrganizationResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "Get details for organization: " + organization.getUuid() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Get details for organization: {}", organization.getUuid());
+ }
ApiResponse response = createApiResponse();
response.setProperty( "organization", management.getOrganizationData( organization ) );
@@ -176,7 +178,7 @@ public class OrganizationResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "Send activation email for organization: " + organization.getUuid() );
+ logger.info("Send activation email for organization: {}", organization.getUuid());
ApiResponse response = createApiResponse();
@@ -263,8 +265,8 @@ public class OrganizationResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("executePut");
+ if (logger.isTraceEnabled()) {
+ logger.trace("executePut");
}
ApiResponse response = createApiResponse();
@@ -287,8 +289,8 @@ public class OrganizationResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("") String callback )
throws OAuthSystemException {
- if (logger.isDebugEnabled()) {
- logger.debug("executePostJson");
+ if (logger.isTraceEnabled()) {
+ logger.trace("executePostJson");
}
Map<String, String> uuidRet = new HashMap<>();
@@ -404,7 +406,9 @@ public class OrganizationResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- logger.info( "Get configuration for organization: " + organization.getUuid() );
+ if (logger.isTraceEnabled()) {
+ logger.trace("Get configuration for organization: {}", organization.getUuid());
+ }
ApiResponse response = createApiResponse();
response.setAction( "get organization configuration" );
@@ -436,8 +440,8 @@ public class OrganizationResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("Put configuration for organization: " + organization.getUuid());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Put configuration for organization: {}", organization.getUuid());
}
ApiResponse response = createApiResponse();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
index ee35cb1..0348c01 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
@@ -135,8 +135,8 @@ public class OrganizationsResource extends AbstractContextResource {
@QueryParam( "callback" ) @DefaultValue( "" ) String callback )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("newOrganization");
+ if (logger.isTraceEnabled()) {
+ logger.trace("newOrganization");
}
ApiResponse response = createApiResponse();
@@ -174,8 +174,8 @@ public class OrganizationsResource extends AbstractContextResource {
@QueryParam( "callback" ) @DefaultValue( "" ) String callback )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("New organization: {}", organizationNameForm);
+ if (logger.isTraceEnabled()) {
+ logger.trace("New organization: {}", organizationNameForm);
}
String organizationName = organizationNameForm != null ? organizationNameForm : organizationNameQuery;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
index dea6705..fd137a0 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -503,8 +503,8 @@ public class ApplicationResource extends AbstractContextResource {
management.deleteApplication( applicationId );
- if (logger.isDebugEnabled()) {
- logger.debug("ApplicationResource.delete() deleted appId = {}", applicationId);
+ if (logger.isTraceEnabled()) {
+ logger.trace("ApplicationResource.delete() deleted appId = {}", applicationId);
}
ApiResponse response = createApiResponse();
@@ -512,8 +512,8 @@ public class ApplicationResource extends AbstractContextResource {
response.setApplication(emf.getEntityManager( applicationId ).getApplication());
response.setParams(ui.getQueryParameters());
- if (logger.isDebugEnabled()) {
- logger.debug("ApplicationResource.delete() sending response ");
+ if (logger.isTraceEnabled()) {
+ logger.trace("ApplicationResource.delete() sending response ");
}
return response;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
index c359e30..1b999ec 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
@@ -111,8 +111,8 @@ public class ApplicationsResource extends AbstractContextResource {
@FormParam( "name" ) String applicationName )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("newApplicationForOrganizationFromForm");
+ if (logger.isTraceEnabled()) {
+ logger.trace("newApplicationForOrganizationFromForm");
}
Preconditions.checkArgument( !isEmpty( applicationName ),
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
index c6f1463..ab601fc 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
@@ -168,9 +168,9 @@ public class ImportsResource extends AbstractContextResource {
final UUID importId = UUID.fromString( entityId.getPath() );
final Import importEntity = importService.getImport( application.getId(), importId );
- if (logger.isDebugEnabled()) {
- logger.debug("Loaded import entity {}:{} with state {}",
- new Object[]{importEntity.getType(), importEntity.getUuid(), importEntity.getState()});
+ if (logger.isTraceEnabled()) {
+ logger.trace("Loaded import entity {}:{} with state {}",
+ importEntity.getType(), importEntity.getUuid(), importEntity.getState());
}
if ( importEntity == null ) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
index b8d9a73..40ba92e 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
@@ -118,7 +118,7 @@ public class UsersResource extends AbstractContextResource {
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
- logger.info( "New user for organization: " + username + " (" + email + ")");
+ logger.info( "New user for organization: {} ({})", username, email);
ApiResponse response = createApiResponse();
response.setAction( "create user" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
index 188567b..1f25a4a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
@@ -243,8 +243,8 @@ public class UserResource extends AbstractContextResource {
@FormParam( "recaptcha_challenge_field" ) String challenge,
@FormParam( "recaptcha_response_field" ) String uresponse ) {
- if (logger.isDebugEnabled()) {
- logger.debug("handlePasswordResetForm");
+ if (logger.isTraceEnabled()) {
+ logger.trace("handlePasswordResetForm");
}
final boolean externalTokensEnabled =
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
index 640a6c2..a997e18 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
@@ -61,8 +61,8 @@ public class UsersResource extends AbstractContextResource {
public UsersResource() {
- if (logger.isDebugEnabled()) {
- logger.debug("ManagementUsersResource initialized");
+ if (logger.isTraceEnabled()) {
+ logger.trace("ManagementUsersResource initialized");
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
index a071138..43867e3 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
@@ -129,8 +129,8 @@ public class OrganizationResource extends AbstractContextResource {
public ApplicationResource getApplicationByName( @PathParam("applicationName") String applicationName )
throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("getApplicationByName: " + applicationName);
+ if (logger.isTraceEnabled()) {
+ logger.trace("getApplicationByName: {}", applicationName);
}
if ( "options".equalsIgnoreCase( request.getMethod() ) ) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
index 77e3a3c..531d355 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
@@ -114,8 +114,8 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
public void configure(ResourceInfo resourceInfo, FeatureContext featureContext) {
Method am = resourceInfo.getResourceMethod();
- if (logger.isDebugEnabled()) {
- logger.debug("configure {} method {}",
+ if (logger.isTraceEnabled()) {
+ logger.trace("configure {} method {}",
resourceInfo.getResourceClass().getSimpleName(), resourceInfo.getResourceMethod().getName());
}
@@ -149,20 +149,20 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
@Override
public void filter(ContainerRequestContext request) throws IOException {
- if (logger.isDebugEnabled()) {
- logger.debug("Filtering {}", request.getUriInfo().getRequestUri().toString());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Filtering {}", request.getUriInfo().getRequestUri().toString());
}
if ( request.getMethod().equalsIgnoreCase( "OPTIONS" ) ) {
- if (logger.isDebugEnabled()) {
- logger.debug("Skipping option request");
+ if (logger.isTraceEnabled()) {
+ logger.trace("Skipping option request");
}
}
MultivaluedMap<java.lang.String, java.lang.String> params = uriInfo.getPathParameters();
- if (logger.isDebugEnabled()) {
- logger.debug("Params: {}", params.keySet());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Params: {}", params.keySet());
}
authorize( request );
@@ -182,8 +182,8 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
}
else {
String applicationName = PathingUtils.assembleAppName( uriInfo.getPathParameters() );
- if ( logger.isDebugEnabled() ) {
- logger.debug( "Pulled applicationName {}", applicationName );
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "Pulled applicationName {}", applicationName );
}
application = Identifier.fromName( applicationName );
}
@@ -238,19 +238,19 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
@Override
public void authorize( ContainerRequestContext request ) {
- if (logger.isDebugEnabled()) {
- logger.debug("OrganizationFilter.authorize");
+ if (logger.isTraceEnabled()) {
+ logger.trace("OrganizationFilter.authorize");
}
if ( !isPermittedAccessToOrganization( getOrganizationIdentifier() ) ) {
- if (logger.isDebugEnabled()) {
- logger.debug("No organization access authorized");
+ if (logger.isTraceEnabled()) {
+ logger.trace("No organization access authorized");
}
throw mappableSecurityException( "unauthorized", "No organization access authorized" );
}
- if (logger.isDebugEnabled()) {
- logger.debug("OrganizationFilter.authorize - leaving");
+ if (logger.isTraceEnabled()) {
+ logger.trace("OrganizationFilter.authorize - leaving");
}
}
}
@@ -284,8 +284,8 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
@Override
public void authorize( ContainerRequestContext request ) {
- if (logger.isDebugEnabled()) {
- logger.debug("ApplicationFilter.authorize");
+ if (logger.isTraceEnabled()) {
+ logger.trace("ApplicationFilter.authorize");
}
if ( SubjectUtils.isAnonymous() ) {
ApplicationInfo application = null;
@@ -300,8 +300,8 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
Map<String, String> roles = null;
try {
roles = em.getRoles();
- if (logger.isDebugEnabled()) {
- logger.debug("found roles {}", roles);
+ if (logger.isTraceEnabled()) {
+ logger.trace("found roles {}", roles);
}
}
catch ( Exception e ) {
@@ -332,13 +332,13 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
@Override
public void authorize(ContainerRequestContext request) {
- if (logger.isDebugEnabled()) {
- logger.debug("SystemFilter.authorize");
+ if (logger.isTraceEnabled()) {
+ logger.trace("SystemFilter.authorize");
}
try {
if (!request.getSecurityContext().isUserInRole( ROLE_SERVICE_ADMIN )) {
- if (logger.isDebugEnabled()) {
- logger.debug("You are not the system admin.");
+ if (logger.isTraceEnabled()) {
+ logger.trace("You are not the system admin.");
}
throw mappableSecurityException( "unauthorized", "No system access authorized",
SecurityException.REALM );
@@ -365,8 +365,8 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
@Override
public void authorize(ContainerRequestContext request) {
- if (logger.isDebugEnabled()) {
- logger.debug("AdminUserFilter.authorize");
+ if (logger.isTraceEnabled()) {
+ logger.trace("AdminUserFilter.authorize");
}
if (!isUser( getUserIdentifier() )) {
throw mappableSecurityException( "unauthorized", "No admin user access authorized" );
@@ -406,7 +406,7 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
@Override
public void authorize( ContainerRequestContext request ) {
- if(logger.isDebugEnabled()){
+ if(logger.isTraceEnabled()){
logger.debug( "PathPermissionsFilter.authorize" );
}
@@ -432,7 +432,7 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
boolean permitted = currentUser.isPermitted( perm );
if ( logger.isDebugEnabled() ) {
- logger.debug( PATH_MSG, new Object[] { path, operation, perm, permitted } );
+ logger.debug( PATH_MSG, path, operation, perm, permitted );
}
if(!permitted){
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/RestSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/RestSecurityManager.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/RestSecurityManager.java
index 4cc7c0e..8e27265 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/RestSecurityManager.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/RestSecurityManager.java
@@ -53,7 +53,7 @@ public class RestSecurityManager extends DefaultWebSecurityManager {
@Override
public void setSessionManager( SessionManager sessionManager ) {
if ( !( sessionManager instanceof HttpRequestSessionManager ) ) {
- logger.info( "Replacing " + sessionManager + " with HttpRequestSessionManager" );
+ logger.info( "Replacing {} with HttpRequestSessionManager", sessionManager );
sessionManager = new HttpRequestSessionManager();
}
super.setSessionManager( sessionManager );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
index e516f73..a5d7272 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
@@ -45,8 +45,8 @@ public class BasicAuthSecurityFilter extends SecurityFilter {
@Override
public void filter( ContainerRequestContext request ) {
- if(logger.isDebugEnabled()){
- logger.debug("Filtering: " + request.getUriInfo().getBaseUri());
+ if(logger.isTraceEnabled()){
+ logger.trace("Filtering: {}", request.getUriInfo().getBaseUri());
}
@@ -68,8 +68,8 @@ public class BasicAuthSecurityFilter extends SecurityFilter {
if ( name.equals( sysadmin_login_name ) && password.equals( sysadmin_login_password )
&& sysadmin_login_allowed ) {
request.setSecurityContext( new SysAdminRoleAuthenticator() );
- if (logger.isDebugEnabled()) {
- logger.debug("System administrator access allowed");
+ if (logger.isTraceEnabled()) {
+ logger.trace("System administrator access allowed");
}
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
index c15c823..83e53c1 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
@@ -51,8 +51,8 @@ public class ClientCredentialsSecurityFilter extends SecurityFilter {
@Override
public void filter( ContainerRequestContext request ) {
- if (logger.isDebugEnabled()) {
- logger.debug("Filtering: " + request.getUriInfo().getBaseUri());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Filtering: {}", request.getUriInfo().getBaseUri());
}
String clientId = httpServletRequest.getParameter( "client_id" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
index 7cb96f8..9a82b4a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
@@ -70,8 +70,8 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter implements C
@Override
public void filter(ContainerRequestContext request) throws IOException {
- if (logger.isDebugEnabled()) {
- logger.debug("Filtering: " + request.getUriInfo().getBaseUri());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Filtering: {}", request.getUriInfo().getBaseUri());
}
try {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java
index c023733..22d2c62 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java
@@ -124,9 +124,9 @@ public class ApplicationsResource extends AbstractContextResource {
try {
statusService.setStatus(applicationId, jobId, StatusService.Status.FAILED, map).toBlocking().lastOrDefault(null);//leave as subscribe if fails retry
}catch (Exception subE){
- logger.error("failed to update status "+jobId,subE);
+ logger.error("failed to update status {}",jobId,subE);
}
- logger.error( "Failed to delete appid:"+applicationId + " jobid:"+jobId+" count:"+itemsDeleted, e );
+ logger.error( "Failed to delete appid:{} jobid:{} count:{}",applicationId,jobId,itemsDeleted, e );
}
}
};
@@ -139,7 +139,7 @@ public class ApplicationsResource extends AbstractContextResource {
//should throw exception if can't start
statusService.setStatus(applicationId, jobId, StatusService.Status.STARTED, new LinkedHashMap<>()).toBlocking().lastOrDefault(null);
}catch (Exception e){
- logger.error("failed to set status for " + jobId, e);
+ logger.error("failed to set status for {}", jobId, e);
}
Map<String,Object> data = new HashMap<>();
data.put("jobId",jobId);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/system/DatabaseResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/system/DatabaseResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/system/DatabaseResource.java
index f3ce8b7..b264893 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/system/DatabaseResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/system/DatabaseResource.java
@@ -66,7 +66,7 @@ public class DatabaseResource extends AbstractContextResource {
ApiResponse response = createApiResponse();
response.setAction( "cassandra setup" );
- logger.info( "Setting up Cassandra" );
+ logger.info( "Setting up Cassandra (runDatabaseSetup)" );
emf.setup();
@@ -89,7 +89,7 @@ public class DatabaseResource extends AbstractContextResource {
ApiResponse response = createApiResponse();
response.setAction( "cassandra setup" );
- logger.info( "Setting up Cassandra" );
+ logger.info( "Setting up Cassandra (runSystemSetup)" );
emf.boostrap();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java
index 3f36bfe..4a521b3 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java
@@ -93,7 +93,9 @@ public class IndexResource extends AbstractContextResource {
throws Exception {
- logger.info("Getting status for index jobs");
+ if (logger.isTraceEnabled()) {
+ logger.trace("Getting status for index jobs");
+ }
Preconditions
.checkNotNull(jobId, "query param jobId must not be null" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java
index 87d7ccb..5bfeac9 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java
@@ -137,13 +137,13 @@ public class MigrateResource extends AbstractContextResource {
@Override
public void run() {
- logger.info( "Migrating Data for plugin: " + pluginName );
+ logger.info( "Migrating Data for plugin: {}", pluginName );
try {
getDataMigrationManager().migrate(pluginName);
}
catch ( Exception e ) {
- logger.error( "Unable to migrate data for plugin: " + pluginName, e );
+ logger.error( "Unable to migrate data for plugin: {}", pluginName, e );
}
}
};
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
index dfb4fe0..035051f 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
@@ -43,7 +43,6 @@ import static org.junit.Assert.fail;
/**
* // TODO: Document this
*
- * @author ApigeeCorporation
* @since 4.0
*/
public class GeoPagingTest extends AbstractRestIT {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
index e052264..a190526 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
@@ -33,7 +33,6 @@ import static org.junit.Assert.assertEquals;
/**
* // TODO: Document this
*
- * @author ApigeeCorporation
* @since 4.0
*/
public class OrderByTest extends QueryTestBase {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/ApiResponse.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/ApiResponse.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/ApiResponse.java
index 471cf5e..d476248 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/ApiResponse.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/ApiResponse.java
@@ -1,6 +1,3 @@
-/**
- * Created by ApigeeCorporation on 12/4/14.
- */
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/Collection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/Collection.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/Collection.java
index 5bbc0dc..c819f59 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/Collection.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/model/Collection.java
@@ -1,6 +1,3 @@
-/**
- * Created by ApigeeCorporation on 12/4/14.
- */
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
index 0aedf39..7c6a091 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
@@ -86,7 +86,7 @@ public class AccountCreationPropsImpl implements AccountCreationProps {
public String getProperty( String name ) {
String propertyValue = properties.getProperty( name );
if ( isBlank( propertyValue ) ) {
- logger.warn( "Missing value for " + name );
+ logger.warn( "Missing value for {}", name );
propertyValue = null;
}
return propertyValue;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 558b718..a3a6aa9 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -365,9 +365,7 @@ public class ManagementServiceImpl implements ManagementService {
try {
createAdminUser( null, username, "Super User", email, password, true, false );
}catch(Exception e){
- if (logger.isInfoEnabled()) {
- logger.info("resetSuperUser: auto creation of superuser failed: {}", e.getMessage());
- }
+ logger.info("resetSuperUser: auto creation of superuser failed: {}", e.getMessage());
}
}
else {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/services/src/main/java/org/apache/usergrid/services/exceptions/AwsPropertiesNotFoundException.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/exceptions/AwsPropertiesNotFoundException.java b/stack/services/src/main/java/org/apache/usergrid/services/exceptions/AwsPropertiesNotFoundException.java
index c2933b0..cfd2974 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/exceptions/AwsPropertiesNotFoundException.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/exceptions/AwsPropertiesNotFoundException.java
@@ -21,9 +21,6 @@ package org.apache.usergrid.services.exceptions;
import static org.apache.usergrid.utils.JsonUtils.mapToJsonString;
-/**
- * Created by ApigeeCorporation on 7/23/15.
- */
public class AwsPropertiesNotFoundException extends RuntimeException {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
index fa75531..2ce381d 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
@@ -26,9 +26,6 @@ import org.elasticsearch.common.primitives.Longs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * Created by ApigeeCorporation on 9/4/14.
- */
public class ApplicationQueueMessage implements Serializable {
private static final Logger log = LoggerFactory.getLogger(ApplicationQueueMessage.class);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/71fb6100/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationServiceProxy.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationServiceProxy.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationServiceProxy.java
index 7712163..0caa182 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationServiceProxy.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationServiceProxy.java
@@ -21,9 +21,6 @@ import org.apache.usergrid.persistence.entities.Notifier;
import java.util.Set;
-/**
- * Created by ApigeeCorporation on 8/6/14.
- */
public interface NotificationServiceProxy {
public void finishedBatch(Notification notification, long successes, long failures) throws Exception;