SHIBUI-2262

Changes to work with SQLServer

backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy

@@ -14,7 +14,6 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetad
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.TemplateScheme
-import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.domain.EntityScan
@@ -269,7 +268,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         when:
         ResourceBackedMetadataResolver resolver = new ResourceBackedMetadataResolver(name: 'rbmr').with {
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes(taskTimerRef: 'taskTimerRef')
-            it.classpathMetadataResource = new ClasspathMetadataResource(file: 'metadata.xml')
+            it.classpathMetadataResource = new ClasspathMetadataResource(setFileResource: 'metadata.xml')
             it
         }
 
@@ -291,7 +290,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         when:
         resolver.name = 'rbmrUPDATED'
         resolver.reloadableMetadataResolverAttributes.taskTimerRef = 'taskTimerRefUPDATED'
-        resolver.classpathMetadataResource.file = 'metadataUPDATED.xml'
+        resolver.classpathMetadataResource.fileResource = 'metadataUPDATED.xml'
 
         resolverHistory = updateAndGetRevisionHistoryOfMetadataResolver(resolver,
                 metadataResolverRepository,
@@ -315,4 +314,4 @@ class MetadataResolverEnversVersioningTests extends Specification {
         getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L
     }
-}
+}

backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy

@@ -419,7 +419,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 MetadataResource(
                         'xmlns:resource': 'urn:mace:shibboleth:2.0:resource',
                         'xsi:type': 'resource:ClasspathResource',
-                        'file': resolver.classpathMetadataResource.file)
+                        'file': resolver.classpathMetadataResource.fileResource)
             }
 
             childNodes()

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java

@@ -42,13 +42,13 @@ public abstract class AbstractAuditable implements Auditable {
 
     @CreationTimestamp
     @CreatedDate
-    @Column(nullable = false, updatable = false, columnDefinition = "DATETIME(6)")
+    @Column(nullable = false, updatable = false, columnDefinition = "DATETIME")
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
     private LocalDateTime createdDate;
 
     @UpdateTimestamp
     @LastModifiedDate
-    @Column(nullable = false, columnDefinition = "DATETIME(6)")
+    @Column(nullable = false, columnDefinition = "DATETIME")
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
     private LocalDateTime modifiedDate;
 
@@ -134,4 +134,4 @@ private static ZonedDateTime toZonedDateTime(LocalDateTime localDateTime) {
                 .toZonedDateTime()
                 .truncatedTo(ChronoUnit.MILLIS);
     }
-}
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ClasspathMetadataResource.java

@@ -15,6 +15,6 @@
 @Setter
 @EqualsAndHashCode
 public class ClasspathMetadataResource {
-
-    private String file;
-}
+    // renamed from "file" to work with SQLServer
+    private String fileResource;
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java

@@ -99,7 +99,7 @@ private OpenSamlResourceBackedMetadataResolver convertToOpenSamlRepresentation(R
                 break;
             case CLASSPATH:
                 resource = ResourceHelper.of(new ClassPathResource(placeholderResolverService()
-                        .resolveValueFromPossibleTokenPlaceholder(resolver.getClasspathMetadataResource().getFile())));
+                        .resolveValueFromPossibleTokenPlaceholder(resolver.getClasspathMetadataResource().getFileResource())));
                 break;
             default:
                 throw new RuntimeException("Unsupported resource type!");
@@ -153,4 +153,4 @@ public boolean isDirectory() {
             return true;
         }
     }
-}
+}

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/OpenSamlResourceBackedMetadataResolverTests.groovy

@@ -15,10 +15,10 @@ class OpenSamlResourceBackedMetadataResolverTests extends Specification {
     def 'test refresh'() {
         when:
         def rbmr = new ResourceBackedMetadataResolver(name: 'test', xmlId: 'test', classpathMetadataResource: new ClasspathMetadataResource('metadata/metadata.xml'))
-        def x = new OpenSamlResourceBackedMetadataResolver(openSamlObjects.parserPool, null, rbmr, ResourceHelper.of(new ClassPathResource(rbmr.classpathMetadataResource.file)))
+        def x = new OpenSamlResourceBackedMetadataResolver(openSamlObjects.parserPool, null, rbmr, ResourceHelper.of(new ClassPathResource(rbmr.classpathMetadataResource.fileResource)))
         x.refilter()
 
         then:
         noExceptionThrown()
     }
-}
+}

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy

@@ -109,7 +109,7 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest {
             it.resourceId = "testme"
             it.name = "testme"
             it.classpathMetadataResource = new ClasspathMetadataResource().with {
-                it.file = "metadata/aggregate.xml"
+                it.fileResource = "metadata/aggregate.xml"
                 it
             }
             it.metadataFilters.add(new EntityAttributesFilter().with {
@@ -274,7 +274,7 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest {
         def resolver = new edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver().with {
             it.xmlId = 'ClasspathResourceMetadata'
             it.classpathMetadataResource = new ClasspathMetadataResource().with {
-                it.file = '/path/to/a/classpath/location/metadata.xml'
+                it.fileResource = '/path/to/a/classpath/location/metadata.xml'
                 it
             }
             it

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy

@@ -30,7 +30,6 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataQueryProt
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.SvnMetadataResource
 import edu.internet2.tier.shibboleth.admin.util.AttributeUtility
 import edu.internet2.tier.shibboleth.admin.util.MDDCConstants
 import edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions
@@ -607,7 +606,7 @@ class TestObjectGenerator {
             it.name = 'ClasspathResourceMetadata'
             it.xmlId = 'ClasspathResourceMetadata'
             it.classpathMetadataResource = new ClasspathMetadataResource().with {
-                it.file = 'metadata/metadata.xml'
+                it.fileResource = 'metadata/metadata.xml'
                 it
             }
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {