From 17736d8cc5fc12bc12f3acb73e6e8f030dcb27e9 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Fri, 7 Jul 2023 13:21:04 -0700 Subject: [PATCH] SHIBUI-2576 Updates to develop branch to enable the beacon changes --- .../shibboleth/admin/ui/domain/beacon/BeaconEvent.java | 8 ++++---- .../admin/ui/BaseDataJpaTestConfiguration.groovy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/beacon/BeaconEvent.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/beacon/BeaconEvent.java index 74eb6cf40..c664bd0b8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/beacon/BeaconEvent.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/beacon/BeaconEvent.java @@ -1,11 +1,11 @@ package edu.internet2.tier.shibboleth.admin.ui.domain.beacon; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; import java.util.Date; @Entity diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy index 3b96ccc82..7bb1f209d 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/BaseDataJpaTestConfiguration.groovy @@ -156,7 +156,7 @@ class BaseDataJpaTestConfiguration { @Bean HealthEndpoint getHealthEndpoint() { - return new HealthEndpoint(new DefaultHealthContributorRegistry(), new HealthEndpointGroups() {} { + return new HealthEndpoint(new DefaultHealthContributorRegistry(), new HealthEndpointGroups() { @Override HealthEndpointGroup getPrimary() { return null } @Override Set getNames() { return null }