Rename flag to userModified - updated implies it has been updated in …

…the store.

Change some tabs to spaces

common/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/AuthEvent.java

@@ -19,18 +19,18 @@
  */
 abstract public class AuthEvent extends ApplicationEvent {
 
-	private boolean userUpdated = true;
+    private boolean userModified = true;
 
     public AuthEvent(UaaUser user, boolean userUpdated) {
         super(user);
-        this.userUpdated = userUpdated;
+        this.userModified = userUpdated;
     }
 
     public UaaUser getUser() {
         return (UaaUser) source;
     }
 
-    public boolean isUserUpdated() {
-    	return userUpdated;
+    public boolean isUserModified() {
+        return userModified;
     }
 }

common/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalGroupAuthorizationEvent.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- *     Cloud Foundry 
+ *     Cloud Foundry
  *     Copyright (c) [2009-2014] Pivotal Software, Inc. All Rights Reserved.
  *
  *     This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -13,7 +13,6 @@
 
 package org.cloudfoundry.identity.uaa.authentication.manager;
 
-import org.cloudfoundry.identity.uaa.authentication.Origin;
 import org.cloudfoundry.identity.uaa.user.UaaUser;
 import org.springframework.security.core.GrantedAuthority;
 
@@ -29,8 +28,8 @@ public Collection<? extends GrantedAuthority> getExternalAuthorities() {
 
     private boolean addGroups = false;
 
-    public ExternalGroupAuthorizationEvent(UaaUser user, boolean userUpdated, Collection<? extends GrantedAuthority> externalAuthorities, boolean addGroups) {
-        super(user, userUpdated);
+    public ExternalGroupAuthorizationEvent(UaaUser user, boolean userModified, Collection<? extends GrantedAuthority> externalAuthorities, boolean addGroups) {
+        super(user, userModified);
         this.addGroups = addGroups;
         this.externalAuthorities = externalAuthorities;
     }

common/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/LdapLoginAuthenticationManager.java

@@ -70,17 +70,17 @@ protected String getEmail(UaaUser user, LdapUserDetails details) {
 
     @Override
     protected UaaUser userAuthenticated(Authentication request, UaaUser user) {
-    	boolean userUpdated = false;
+        boolean userModified = false;
         //we must check and see if the email address has changed between authentications
         if (request.getPrincipal() !=null && request.getPrincipal() instanceof ExtendedLdapUserDetails) {
             ExtendedLdapUserDetails details = (ExtendedLdapUserDetails)request.getPrincipal();
             UaaUser fromRequest = getUser(details, getExtendedAuthorizationInfo(request));
             if (fromRequest.getEmail()!=null && !fromRequest.getEmail().equals(user.getEmail())) {
                 user = user.modifyEmail(fromRequest.getEmail());
-                userUpdated = true;
+                userModified = true;
             }
         }
-        ExternalGroupAuthorizationEvent event = new ExternalGroupAuthorizationEvent(user, userUpdated, request.getAuthorities(), isAutoAddAuthorities());
+        ExternalGroupAuthorizationEvent event = new ExternalGroupAuthorizationEvent(user, userModified, request.getAuthorities(), isAutoAddAuthorities());
         publish(event);
         return getUserDatabase().retrieveUserById(user.getId());
     }

scim/src/main/java/org/cloudfoundry/identity/uaa/scim/bootstrap/ScimUserBootstrap.java

@@ -12,12 +12,6 @@
  *******************************************************************************/
 package org.cloudfoundry.identity.uaa.scim.bootstrap;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.cloudfoundry.identity.uaa.authentication.Origin;
@@ -187,7 +181,7 @@ public void onApplicationEvent(AuthEvent event) {
                 addToGroup(exEvent.getUser().getId(), authority.getAuthority(), exEvent.getUser().getOrigin(), exEvent.isAddGroups());
             }
             //update the user itself
-            if(event.isUserUpdated()) {
+            if(event.isUserModified()) {
                 //update the user itself
                 ScimUser user = getScimUser(event.getUser());
                 updateUser(user, event.getUser(), false);