Rename loginName to username

model/tests/src/test/java/org/keycloak/model/test/AdapterTest.java

@@ -160,7 +160,7 @@ public class AdapterTest extends AbstractModelTest {
         RoleModel appRole = app.addRole("test");
         user.grantRole(appRole);
 
-        SocialLinkModel socialLink = new SocialLinkModel("google", "google1", user.getLoginName());
+        SocialLinkModel socialLink = new SocialLinkModel("google", "google1", user.getUsername());
         realmModel.addSocialLink(user, socialLink);
 
         UserCredentialModel cred = new UserCredentialModel();
@@ -312,7 +312,7 @@ public class AdapterTest extends AbstractModelTest {
         {
             ArrayList<String> users = new ArrayList<String>();
             for (UserModel u : adapter.searchUsers("ole alver", realmModel)) {
-                users.add(u.getLoginName());
+                users.add(u.getUsername());
             }
             String[] usernames = users.toArray(new String[users.size()]);
             Arrays.sort(usernames);
@@ -625,7 +625,7 @@ public class AdapterTest extends AbstractModelTest {
         realmManager.getRealmByName("JUGGLER1").addUser("user2");
         commit();
         try {
-            realmManager.getRealmByName("JUGGLER1").getUser("user2").setLoginName("user1");
+            realmManager.getRealmByName("JUGGLER1").getUser("user2").setUsername("user1");
             commit();
             Assert.fail("Expected exception");
         } catch (ModelDuplicateException e) {

model/tests/src/test/java/org/keycloak/model/test/AuthProvidersExternalModelTest.java

@@ -91,7 +91,7 @@ public class AuthProvidersExternalModelTest extends AbstractModelTest {
             Assert.assertEquals(AuthenticationManager.AuthenticationStatus.SUCCESS, am.authenticateForm(null, realm2, formData));
             UserModel john2 = realm2.getUser("john");
             Assert.assertNotNull(john2);
-            Assert.assertEquals("john", john2.getLoginName());
+            Assert.assertEquals("john", john2.getUsername());
             Assert.assertEquals("John", john2.getFirstName());
             Assert.assertEquals("Doe", john2.getLastName());
             Assert.assertEquals("john@email.org", john2.getEmail());

model/tests/src/test/java/org/keycloak/model/test/AuthProvidersLDAPTest.java

@@ -89,7 +89,7 @@ public class AuthProvidersLDAPTest extends AbstractModelTest {
         Assert.assertEquals(AuthenticationManager.AuthenticationStatus.SUCCESS, am.authenticateForm(null, realm, formData));
         UserModel john = realm.getUser("johnkeycloak");
         Assert.assertNotNull(john);
-        Assert.assertEquals("johnkeycloak", john.getLoginName());
+        Assert.assertEquals("johnkeycloak", john.getUsername());
         Assert.assertEquals("John", john.getFirstName());
         Assert.assertEquals("Doe", john.getLastName());
         Assert.assertEquals("john@email.org", john.getEmail());

model/tests/src/test/java/org/keycloak/model/test/ImportTest.java

@@ -173,7 +173,7 @@ public class ImportTest extends AbstractModelTest {
         Assert.assertTrue(facebookFound && twitterFound && googleFound);
 
         UserModel foundSocialUser = realm.getUserBySocialLink(new SocialLinkModel("facebook", "facebook1", "fbuser1"));
-        Assert.assertEquals(foundSocialUser.getLoginName(), socialUser.getLoginName());
+        Assert.assertEquals(foundSocialUser.getUsername(), socialUser.getUsername());
         Assert.assertNull(realm.getUserBySocialLink(new SocialLinkModel("facebook", "not-existing", "not-existing")));
 
         SocialLinkModel foundSocialLink = realm.getSocialLink(socialUser, "facebook");

model/tests/src/test/java/org/keycloak/model/test/MultipleRealmsTest.java

@@ -33,7 +33,7 @@ public class MultipleRealmsTest extends AbstractModelTest {
     public void testUsers() {
         UserModel r1user1 = realm1.getUser("user1");
         UserModel r2user1 = realm2.getUser("user1");
-        Assert.assertEquals(r1user1.getLoginName(), r2user1.getLoginName());
+        Assert.assertEquals(r1user1.getUsername(), r2user1.getUsername());
         Assert.assertNotEquals(r1user1.getId(), r2user1.getId());
 
         // Test password

model/tests/src/test/java/org/keycloak/model/test/UserModelTest.java

@@ -111,7 +111,7 @@ public class UserModelTest extends AbstractModelTest {
     }
 
     public static void assertEquals(UserModel expected, UserModel actual) {
-        Assert.assertEquals(expected.getLoginName(), actual.getLoginName());
+        Assert.assertEquals(expected.getUsername(), actual.getUsername());
         Assert.assertEquals(expected.getFirstName(), actual.getFirstName());
         Assert.assertEquals(expected.getLastName(), actual.getLastName());
         Assert.assertArrayEquals(expected.getRequiredActions().toArray(), actual.getRequiredActions().toArray());