diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f4dc79cd..3d88843b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -4,6 +4,7 @@ name: Java CI with Maven on: + push: pull_request: jobs: diff --git a/.gitignore b/.gitignore index 4daf7213..24ebc651 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /target/ .idea *.iml +*.ipr +*.iws +.java-version diff --git a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSecurityService.java b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSecurityService.java index e8baa66e..7e9aec34 100644 --- a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSecurityService.java +++ b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSecurityService.java @@ -21,9 +21,6 @@ import org.sakaiproject.authz.api.SecurityAdvisor; import org.sakaiproject.authz.api.SecurityService; -import org.sakaiproject.exception.IdUnusedException; -import org.sakaiproject.exception.SakaiException; -import org.sakaiproject.site.api.Site; import org.sakaiproject.user.api.User; /** @@ -33,11 +30,6 @@ public class MockSecurityService implements SecurityService { - @Override - public void changeToRoleViewOnSite( Site site, String role ) throws SakaiException - { - } - @Override public void clearAdvisors() { @@ -68,8 +60,7 @@ public boolean isSuperUser( String userId ) } @Override - public boolean isUserRoleSwapped() throws IdUnusedException - { + public boolean isUserRoleSwapped() { return false; } diff --git a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockServerConfigurationService.java b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockServerConfigurationService.java index 3b41c310..d0a7d531 100644 --- a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockServerConfigurationService.java +++ b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockServerConfigurationService.java @@ -264,4 +264,19 @@ public Set getCommaSeparatedListAsSet(String key) { throw new UnsupportedOperationException( "Not supported yet." ); } + @Override + public String getSmtpServer() { + return ""; + } + + @Override + public String getSmtpFrom() { + return ""; + } + + @Override + public String getSmtpPort() { + return ""; + } + } diff --git a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java index 0d78c3ea..448afd3a 100644 --- a/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java +++ b/scorm-impl/service/src/java/org/sakaiproject/scorm/service/sakai/impl/mocks/MockSiteService.java @@ -19,7 +19,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Set; @@ -33,6 +32,7 @@ import org.sakaiproject.exception.IdUnusedException; import org.sakaiproject.exception.IdUsedException; import org.sakaiproject.exception.PermissionException; +import org.sakaiproject.exception.SakaiException; import org.sakaiproject.javax.PagingPosition; import org.sakaiproject.site.api.AllowedJoinableAccount; import org.sakaiproject.site.api.Group; @@ -511,6 +511,11 @@ public String merge( String toSiteId, Element e, String creatorId ) return ""; } + @Override + public void activateRoleViewOnSite(String s, String s1) throws SakaiException { + + } + @Override public String merge( String siteId, Element root, String archivePath, String fromSiteId, Map attachmentNames, Map userIdTrans, Set userListAllowImport ) {