Remove getter and setter for origin property in ExternalLoginAuthenticationManager

Author: adrianhoelzl-sap

server/src/main/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalLoginAuthenticationManager.java

@@ -92,14 +92,6 @@ public void setExternalMembershipManager(ScimGroupExternalMembershipManager exte
         this.externalMembershipManager = externalMembershipManager;
     }
 
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
     @Override
     public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher) {
         this.eventPublisher = eventPublisher;

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

@@ -15,6 +15,7 @@
 
 package org.cloudfoundry.identity.uaa.authentication.manager;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.cloudfoundry.identity.uaa.authentication.UaaAuthentication;
 import org.cloudfoundry.identity.uaa.authentication.manager.ExternalLoginAuthenticationManager.ExternalAuthenticationDetails;
 import org.cloudfoundry.identity.uaa.constants.OriginKeys;
@@ -161,7 +162,7 @@ protected boolean isAddNewShadowUser(final String origin) {
         return result;
     }
 
-    @Override
+    @VisibleForTesting
     public void setOrigin(final String origin) {
         this.origin = origin;
     }

server/src/test/java/org/cloudfoundry/identity/uaa/authentication/manager/ExternalLoginAuthenticationManagerTest.java

@@ -128,7 +128,6 @@ private UaaUser addUserToDb(String userName, String userId, String origin, Strin
     }
 
     private void setupManager() {
-        manager.setOrigin(origin);
         String beanName = "ExternalLoginAuthenticationManagerTestBean";
         manager.setBeanName(beanName);
         manager.setApplicationEventPublisher(applicationEventPublisher);
@@ -329,7 +328,6 @@ void authenticateLdapUserDetailsPrincipal() {
         manager = new LdapLoginAuthenticationManager(null);
         setupManager();
         manager.setProviderProvisioning(null);
-        manager.setOrigin(origin);
         when(user.getOrigin()).thenReturn(origin);
         when(uaaUserDatabase.retrieveUserByName(eq(userName), eq(origin))).thenReturn(user);
         when(inputAuth.getPrincipal()).thenReturn(ldapUserDetails);
@@ -358,7 +356,6 @@ protected boolean isAddNewShadowUser(final String origin) {
         };
 
         setupManager();
-        manager.setOrigin(origin);
         when(uaaUserDatabase.retrieveUserByName(eq(userName), eq(origin))).thenReturn(null);
         when(inputAuth.getPrincipal()).thenReturn(ldapUserDetails);
 
@@ -390,7 +387,6 @@ void authenticateCreateUserWithLdapUserDetailsPrincipal() {
         manager = new LdapLoginAuthenticationManager(null);
         setupManager();
         manager.setProviderProvisioning(null);
-        manager.setOrigin(origin);
         when(user.getEmail()).thenReturn(email);
         when(user.getOrigin()).thenReturn(origin);
         when(user.getExternalId()).thenReturn(dn);
@@ -421,7 +417,6 @@ void authenticateCreateUserWithUserDetailsPrincipal() {
 
         manager = new LdapLoginAuthenticationManager(null);
         setupManager();
-        manager.setOrigin(origin);
         manager.setProviderProvisioning(null);
 
         when(user.getOrigin()).thenReturn(origin);
@@ -471,7 +466,6 @@ void authenticateInvitedUserWithoutAcceptance() {
         manager = new LdapLoginAuthenticationManager(null);
         setupManager();
         manager.setProviderProvisioning(null);
-        manager.setOrigin(origin);
 
         when(uaaUserDatabase.retrieveUserByName(eq(username), eq(origin)))
                 .thenThrow(new UsernameNotFoundException(""));
@@ -495,7 +489,6 @@ void authenticateInvitedUserWithoutAcceptance() {
     void populateAttributesStoresCustomAttributesAndRoles() {
         manager = new LdapLoginAuthenticationManager(null);
         setupManager();
-        manager.setOrigin(origin);
         IdentityProvider provider = mock(IdentityProvider.class);
         ExternalIdentityProviderDefinition providerDefinition = new ExternalIdentityProviderDefinition();
         when(provider.getConfig()).thenReturn(providerDefinition);
@@ -562,7 +555,6 @@ void authenticateUserExists() {
     @Test
     void authenticateUserDoesNotExists() {
         origin = "external";
-        manager.setOrigin(origin);
 
         when(uaaUserDatabase.retrieveUserByName(eq(userName), eq(origin)))
                 .thenReturn(null)