-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
173 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 0 additions & 53 deletions
53
backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/MetadataResolver.java
This file was deleted.
Oops, something went wrong.
26 changes: 26 additions & 0 deletions
26
...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/FileBackedHttpMetadataResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
|
|
||
| import javax.persistence.Embedded; | ||
| import javax.persistence.Entity; | ||
|
|
||
| @Entity | ||
| @EqualsAndHashCode(callSuper = true) | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Setter | ||
| @ToString | ||
| public class FileBackedHttpMetadataResolver extends MetadataResolver { | ||
|
|
||
| @Embedded | ||
| private ReloadableMetadataResolverAttributes reloadableMetadataResolverAttributes; | ||
|
|
||
| @Embedded | ||
| private HttpMetadataResolverAttributes httpMetadataResolverAttributes; | ||
|
|
||
| } |
56 changes: 56 additions & 0 deletions
56
...u/internet2/tier/shibboleth/admin/ui/domain/resolvers/HttpMetadataResolverAttributes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
|
|
||
| import javax.persistence.Column; | ||
| import javax.persistence.Embeddable; | ||
| import javax.persistence.Enumerated; | ||
|
|
||
| import static javax.persistence.EnumType.STRING; | ||
|
|
||
| @Embeddable | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| @Getter | ||
| @Setter | ||
| public class HttpMetadataResolverAttributes { | ||
|
|
||
| private String httpClientRef; | ||
|
|
||
| private String connectionRequestTimeout; | ||
|
|
||
| private String requestTimeout; | ||
|
|
||
| private String socketTimeout; | ||
|
|
||
| private Boolean disregardTLSCertificate; | ||
|
|
||
| private String tlsTrustEngineRef; | ||
|
|
||
| private String httpClientSecurityParametersRef; | ||
|
|
||
| private String proxyHost; | ||
|
|
||
| private String proxyPort; | ||
|
|
||
| private String proxyUser; | ||
|
|
||
| private String proxyPassword; | ||
|
|
||
| @Enumerated(STRING) | ||
| @Column(length = 5) | ||
| private HttpCachingType httpCaching; | ||
|
|
||
| private String httpCacheDirectory; | ||
|
|
||
| private Integer httpMaxCacheEntries; | ||
|
|
||
| private Integer httpMaxCacheEntrySize; | ||
|
|
||
| private enum HttpCachingType { | ||
| none,file,memory | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
...c/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; | ||
|
|
||
| import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.MetadataFilter; | ||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
|
|
||
| import javax.persistence.CascadeType; | ||
| import javax.persistence.Entity; | ||
| import javax.persistence.Inheritance; | ||
| import javax.persistence.InheritanceType; | ||
|
|
||
| import javax.persistence.OneToMany; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| @Entity | ||
| @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) | ||
| @EqualsAndHashCode(callSuper = true) | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Setter | ||
| @ToString | ||
| public class MetadataResolver extends AbstractAuditable { | ||
|
|
||
| private String name; | ||
|
|
||
| private String resourceId = UUID.randomUUID().toString(); | ||
|
|
||
| private Boolean requireValidMetadata; | ||
|
|
||
| private Boolean failFastInitialization; | ||
|
|
||
| private Integer sortKey; | ||
|
|
||
| private String criterionPredicateRegistryRef; | ||
|
|
||
| private Boolean useDefaultPredicateRegistry; | ||
|
|
||
| private Boolean satisfyAnyPredicates; | ||
|
|
||
| @OneToMany(cascade = CascadeType.ALL) | ||
| private List<MetadataFilter> metadataFilters = new ArrayList<>(); | ||
| } |
33 changes: 33 additions & 0 deletions
33
...rnet2/tier/shibboleth/admin/ui/domain/resolvers/ReloadableMetadataResolverAttributes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
|
|
||
| import javax.persistence.Embeddable; | ||
|
|
||
| @Embeddable | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| @Getter | ||
| @Setter | ||
| public class ReloadableMetadataResolverAttributes { | ||
|
|
||
| private String parserPoolRef; | ||
|
|
||
| private String taskTimerRef; | ||
|
|
||
| private String minRefreshDelay; | ||
|
|
||
| private String maxRefreshDelay; | ||
|
|
||
| private Double refreshDelayFactor; | ||
|
|
||
| private String indexesRef; | ||
|
|
||
| private Boolean resolveViaPredicatesOnly; | ||
|
|
||
| private String expirationWarningThreshold; | ||
|
|
||
| } |
4 changes: 2 additions & 2 deletions
4
...in/java/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters