SHIBUI-2576

Updates to develop branch to enable the beacon changes
TIER · Jun 6, 2023 · 606f224 · 606f224
1 parent a20a26c
commit 606f224
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -154,8 +154,6 @@ dependencies {
     runtimeOnly "com.microsoft.sqlserver:mssql-jdbc:${project.'sqlserverVersion'}"
     //Pacj4 sub-project
     runtimeOnly project(':pac4j-module')
-    //Beacon
-    runtimeOnly project(':beacon:spring')
     // runtime libraries for later java versions
     runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:2.3.1'  // com.sun.xml.bind package
 

diff --git a/...hibboleth/admin/ui/configuration/postprocessors/BeaconConfigurationStartupProcessing.java b/...hibboleth/admin/ui/configuration/postprocessors/BeaconConfigurationStartupProcessing.java
@@ -2,14 +2,14 @@
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.BeaconConfiguration;
 import edu.internet2.tier.shibboleth.admin.ui.repository.BeaconConfigurationRepository;
+import jakarta.persistence.EntityExistsException;
+import jakarta.transaction.Transactional;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.EntityExistsException;
-import javax.transaction.Transactional;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/BeaconConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/BeaconConfiguration.java
@@ -1,12 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Transient;
 import lombok.Data;
 import lombok.Setter;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Transient;
-
 @Data
 @Entity
 public class BeaconConfiguration {

diff --git a/.../src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/UserLoginRecord.java b/.../src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/UserLoginRecord.java
@@ -1,12 +1,10 @@
 package edu.internet2.tier.shibboleth.admin.ui.security.model;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 import java.util.Date;
 
 @Data

diff --git a/...test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy b/...test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/TestConfiguration.groovy
@@ -42,6 +42,8 @@ import org.springframework.data.domain.AuditorAware
 import org.springframework.mail.javamail.JavaMailSender
 import org.springframework.mail.javamail.JavaMailSenderImpl
 
+import java.time.Duration
+
 /**
  * NOT A TEST - this is configuration FOR tests
  */
@@ -158,7 +160,7 @@ class TestConfiguration {
             @Override Set<String> getNames() { return null }
 
             @Override HealthEndpointGroup get(String name) { return null }
-        }) {
+        }, Duration.ZERO.plusSeconds(1)) {
             @Override
             HealthComponent healthForPath(@Selector(match = Selector.Match.ALL_REMAINING) String... path) {
                 return new Health(new Status(""), new HashMap<String, Object>());

diff --git a/pac4j-module/src/test/groovy/net/unicon/shibui/pac4j/AddNewUserFilterTests.groovy b/pac4j-module/src/test/groovy/net/unicon/shibui/pac4j/AddNewUserFilterTests.groovy
@@ -6,9 +6,11 @@ import edu.internet2.tier.shibboleth.admin.ui.security.repository.OwnershipRepos
 import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository
 import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository
 import edu.internet2.tier.shibboleth.admin.ui.security.service.GroupServiceForTesting
-import edu.internet2.tier.shibboleth.admin.ui.security.service.IRolesService
 import edu.internet2.tier.shibboleth.admin.ui.security.service.RolesServiceImpl
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService
+import jakarta.servlet.FilterChain
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
 import org.pac4j.core.matching.matcher.PathMatcher
 import org.pac4j.saml.profile.SAML2Profile
 import org.springframework.beans.factory.annotation.Autowired
@@ -25,10 +27,6 @@ import org.springframework.transaction.annotation.Transactional
 import spock.lang.Specification
 import spock.lang.Subject
 
-import javax.servlet.FilterChain
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-
 @DataJpaTest
 @ContextConfiguration(classes=[Pac4JTestingConfig])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])