SHIBUI-517[532]

TIER · Jun 8, 2018 · 478c23e · 478c23e
1 parent 546daeb
commit 478c23e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -138,15 +138,41 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     }
 
     void constructXmlNodeFor(FileBackedHttpMetadataResolver resolver, def markupBuilderDelegate) {
-        def attributes = [id: "${resolver.name}",
-                      'xsi:type': 'FileBackedHTTPMetadataProvider',
-                      backingFile: resolver.backingFile,
-                      metadataURL: resolver.metadataURL,
-                      minRefreshDelay: resolver.reloadableMetadataResolverAttributes?.minRefreshDelay,
-                      maxRefreshDelay: resolver.reloadableMetadataResolverAttributes?.maxRefreshDelay,
-                      refreshDelayFactor: resolver.reloadableMetadataResolverAttributes?.refreshDelayFactor]
-
-        markupBuilderDelegate.MetadataProvider(attributes)
+        markupBuilderDelegate.MetadataProvider(id: resolver.name,
+                'xsi:type': 'FileBackedHTTPMetadataProvider',
+                backingFile: resolver.backingFile,
+                metadataURL: resolver.metadataURL,
+                initializeFromBackupFile: !resolver.initializeFromBackupFile ?: null,
+                backupFileInitNextRefreshDelay: resolver.backupFileInitNextRefreshDelay,
+                requireValidMetadata: !resolver.requireValidMetadata ?: null,
+                failFastInitialization: !resolver.failFastInitialization ?: null,
+                sortKey: resolver.sortKey,
+                criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef,
+                useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null,
+                satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null,
+
+                parserPoolRef: resolver.reloadableMetadataResolverAttributes?.parserPoolRef,
+                minRefreshDelay: resolver.reloadableMetadataResolverAttributes?.minRefreshDelay,
+                maxRefreshDelay: resolver.reloadableMetadataResolverAttributes?.maxRefreshDelay,
+                refreshDelayFactor: resolver.reloadableMetadataResolverAttributes?.refreshDelayFactor,
+                indexesRef: resolver.reloadableMetadataResolverAttributes?.indexesRef,
+                resolveViaPredicatesOnly: resolver.reloadableMetadataResolverAttributes?.resolveViaPredicatesOnly ?: null,
+                expirationWarningThreshold: resolver.reloadableMetadataResolverAttributes?.expirationWarningThreshold,
+
+                httpClientRef: resolver.httpMetadataResolverAttributes?.httpClientRef,
+                connectionRequestTimeout: resolver.httpMetadataResolverAttributes?.connectionRequestTimeout,
+                connectionTimeout: resolver.httpMetadataResolverAttributes?.connectionTimeout,
+                socketTimeout: resolver.httpMetadataResolverAttributes?.socketTimeout,
+                disregardTLSCertificate: resolver.httpMetadataResolverAttributes?.disregardTLSCertificate ?: null,
+                httpClientSecurityParametersRef: resolver.httpMetadataResolverAttributes?.httpClientSecurityParametersRef,
+                proxyHost: resolver.httpMetadataResolverAttributes?.proxyHost,
+                proxyPort: resolver.httpMetadataResolverAttributes?.proxyHost,
+                proxyUser: resolver.httpMetadataResolverAttributes?.proxyUser,
+                proxyPassword: resolver.httpMetadataResolverAttributes?.proxyPassword,
+                httpCaching: resolver.httpMetadataResolverAttributes?.httpCaching,
+                httpCacheDirectory: resolver.httpMetadataResolverAttributes?.httpCacheDirectory,
+                httpMaxCacheEntries: resolver.httpMetadataResolverAttributes?.httpMaxCacheEntries,
+                httpMaxCacheEntrySize: resolver.httpMetadataResolverAttributes?.httpMaxCacheEntrySize)
     }
 
 }
diff --git a/...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java b/...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java
@@ -21,7 +21,7 @@ public class FileBackedHttpMetadataResolver extends MetadataResolver {
 
     private String backingFile;
 
-    private Boolean initializeFromBackupFile;
+    private Boolean initializeFromBackupFile = true;
 
     private String backupFileInitNextRefreshDelay;
 

diff --git a/...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/HttpMetadataResolverAttributes.java b/...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/HttpMetadataResolverAttributes.java
@@ -24,7 +24,7 @@ public class HttpMetadataResolverAttributes {
 
     private String connectionRequestTimeout;
 
-    private String requestTimeout;
+    private String connectionTimeout;
 
     private String socketTimeout;
 

diff --git a/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
@@ -36,15 +36,15 @@ public class MetadataResolver extends AbstractAuditable {
     @Column(unique=true)
     private String resourceId = UUID.randomUUID().toString();
 
-    private Boolean requireValidMetadata;
+    private Boolean requireValidMetadata = true;
 
-    private Boolean failFastInitialization;
+    private Boolean failFastInitialization = true;
 
     private Integer sortKey;
 
     private String criterionPredicateRegistryRef;
 
-    private Boolean useDefaultPredicateRegistry;
+    private Boolean useDefaultPredicateRegistry = true;
 
     private Boolean satisfyAnyPredicates;