merge cleanup

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java

@@ -2,8 +2,6 @@
 
 import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean;
-import edu.harvard.iq.dataverse.api.util.FailedPIDResolutionLoggingServiceBean;
-import edu.harvard.iq.dataverse.api.util.FailedPIDResolutionLoggingServiceBean.FailedPIDResolutionEntry;
 
 import static edu.harvard.iq.dataverse.api.Datasets.handleVersion;
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
@@ -27,8 +25,8 @@
 import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
 import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.pidproviders.FailedPIDResolutionLoggingServiceBean;
-import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.pidproviders.FailedPIDResolutionLoggingServiceBean.FailedPIDResolutionEntry;
+import edu.harvard.iq.dataverse.pidproviders.PidUtil;
 import edu.harvard.iq.dataverse.locality.StorageSiteServiceBean;
 import edu.harvard.iq.dataverse.metrics.MetricsServiceBean;
 import edu.harvard.iq.dataverse.search.savedsearch.SavedSearchServiceBean;

src/main/java/edu/harvard/iq/dataverse/api/util/FailedPIDResolutionLoggingServiceBean.java

@@ -110,7 +110,8 @@ public OAuth2UserRecord(String aServiceId,
             String anIdInService,
             String aUsername,
             String shibUniquePersistentIdentifier,
-            String shibIdp,
+            String idp,
+            String oidcUserId,
             OAuth2TokenData someTokenData,
             AuthenticatedUserDisplayInfo aDisplayInfo,
             List<String> someAvailableEmailAddresses,
@@ -120,7 +121,8 @@ public OAuth2UserRecord(String aServiceId,
         idInService = anIdInService;
         username = aUsername;
         this.shibUniquePersistentIdentifier = shibUniquePersistentIdentifier;
-        this.shibIdp = shibIdp;
+        this.idp = idp;
+        this.oidcUserId = oidcUserId;
         tokenData = someTokenData;
         displayInfo = aDisplayInfo;
         availableEmailAddresses = someAvailableEmailAddresses;

src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2UserRecord.java

@@ -298,7 +298,7 @@ private OAuth2UserRecord setupOidcUserRecordBasics() throws ParseException, IOEx
 
         // Stub the OIDCAuthProvider to return a mock OAuth2UserRecord
         OAuth2UserRecord oAuth2UserRecordStub = Mockito.mock(OAuth2UserRecord.class);
-        Mockito.when(oidcAuthProviderStub.getUserRecord(userInfoStub)).thenReturn(oAuth2UserRecordStub);
+        Mockito.when(oidcAuthProviderStub.getUserRecord(userInfoStub, 0)).thenReturn(oAuth2UserRecordStub);
 
         // Stub the common, basic user identifiers
         UserRecordIdentifier userRecordIdentifierStub = Mockito.mock(UserRecordIdentifier.class);