WIP2

.gitignore

@@ -398,3 +398,5 @@ rdurable
 
 #Local build with no tests script wrapper
 build-no-tests
+
+beacon/spring/out

backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerVersionEndpointsIntegrationTests.groovy

@@ -111,7 +111,7 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi
         edv2.body.serviceProviderName == 'SP2'
     }
 
-    @DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
+    //@DirtiesContext(methodMode = DirtiesContext.MethodMode.AFTER_METHOD)
     def 'SHIBUI-1414'() {
         given:
         def ed = new EntityDescriptor(entityID: 'testme', serviceProviderName: 'testme').with {
@@ -125,15 +125,14 @@ class EntityDescriptorControllerVersionEndpointsIntegrationTests extends Specifi
             })
             entityDescriptorRepository.save(it)
         }
-
         when:
         def headers = new HttpHeaders().with {
             it.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
             it
         }
 
         def allVersions = getAllEntityDescriptorVersions(ed.resourceId, List)
-        def edv1 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[0].id, String).body
+        String edv1 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[0].id, String).body
         def tedv2 = getEntityDescriptorForVersion(ed.resourceId, allVersions.body[1].id, EntityDescriptorRepresentation).body
 
         def aedv1 = new JsonSlurper().parseText(edv1).with {

backend/src/enversTest/resources/application.properties

@@ -1,3 +1,5 @@
+spring.main.allow-bean-definition-overriding=true
+
 spring.liquibase.enabled=false
 
 #Needed in the latest versions of Spring Boot when doing manual transaction management like we do in envers versioning code

backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/jsonschema/EntityDescriptorSchemaValidatingControllerAdvice.groovy

@@ -21,7 +21,7 @@ import static edu.internet2.tier.shibboleth.admin.ui.jsonschema.LowLevelJsonSche
  *
  * @author Dmitriy Kopylenko
  */
-@ControllerAdvice
+//@ControllerAdvice
 class EntityDescriptorSchemaValidatingControllerAdvice extends RequestBodyAdviceAdapter {
 
     @Autowired

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerIntegrationTests.groovy

@@ -17,6 +17,7 @@ import org.springframework.core.io.ClassPathResource
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.reactive.server.WebTestClient
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers
+import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.util.DefaultUriBuilderFactory
 import org.xmlunit.builder.DiffBuilder
 import org.xmlunit.builder.Input
@@ -35,7 +36,11 @@ class EntitiesControllerIntegrationTests extends Specification {
     private WebTestClient webClient
 
     def setup() {
+        //DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory()
+        //factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE)
+
         // yeah, don't ask... this is just shenanigans
+        this.webClient = WebTestClient.builder().uriBuilderFactory(factory).build()
         this.webClient.webClient.uriBuilderFactory.encodingMode = DefaultUriBuilderFactory.EncodingMode.NONE
     }
 
@@ -60,7 +65,11 @@ class EntitiesControllerIntegrationTests extends Specification {
         when:
         def result = this.webClient
                 .get()
-                .uri("/api/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1")
+                .uri {
+                    it.path("/api/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1")
+                    it.build()
+                }
+                //.uri("/api/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1")
                 .exchange() // someday, I'd like to know why IntelliJ "cannot resolve symbol 'exchange'"
 
         then:

beacon/spring/src/main/java/edu/internet2/tap/beacon/configuration/BeaconPublishingConfiguration.java

@@ -49,7 +49,7 @@ public BeaconPublishingTask(DefaultBeaconPublisher beaconPublisher) {
         }
 
         //Cron is based on the spec defined here: https://spaces.at.internet2.edu/display/TWGH/TIER+Instrumentation+-+The+TIER+Beacon
-        @Scheduled(cron = "0 ${random.int[0,59]} ${random.int[0,3]} ? * *}")
+        @Scheduled(cron = "0 ${random.int[0,59]} ${random.int[0,3]} ? * *")
         @Async
         void publish() {
             logger.debug("Publishing payload: {} to beacon endpoint: {}",