-
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
9 changed files
with
77 additions
and
50 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
2 changes: 1 addition & 1 deletion
2
...end/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/FilterController.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
1 change: 1 addition & 0 deletions
1
...d/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributesFilter.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
43 changes: 0 additions & 43 deletions
43
backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/MetadataFilter.java
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/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
33 changes: 33 additions & 0 deletions
33
...java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityRoleWhiteListFilter.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.filters; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
|
|
||
| import javax.persistence.CollectionTable; | ||
| import javax.persistence.Column; | ||
| import javax.persistence.ElementCollection; | ||
| import javax.persistence.Entity; | ||
| import javax.persistence.JoinColumn; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| @Entity | ||
| @EqualsAndHashCode(callSuper = true) | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Setter | ||
| @ToString | ||
| public class EntityRoleWhiteListFilter extends MetadataFilter { | ||
|
|
||
| private Boolean removeRolelessEntityDescriptors = true; | ||
|
|
||
| private Boolean removeEmptyEntitiesDescriptors = true; | ||
|
|
||
| @ElementCollection | ||
| @CollectionTable(name="RETAINED_ROLES", joinColumns=@JoinColumn(name="ENTITY_ROLE_WHITELIST_FILTER_ID")) | ||
| @Column(name="RETAINED_ROLE") | ||
| private List<String> retainedRoles = new ArrayList<>(); | ||
| } |
38 changes: 38 additions & 0 deletions
38
...d/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.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,38 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.domain.filters; | ||
|
|
||
| import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; | ||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
|
|
||
| import javax.persistence.Column; | ||
| import javax.persistence.Entity; | ||
| import javax.persistence.Inheritance; | ||
| import javax.persistence.InheritanceType; | ||
| import javax.persistence.Transient; | ||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * Domain class to store information about {@link org.opensaml.saml.metadata.resolver.filter.MetadataFilter} | ||
| */ | ||
| @Entity | ||
| @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) | ||
| @EqualsAndHashCode(callSuper = true, exclude={"version"}) | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Setter | ||
| @ToString | ||
| public class MetadataFilter extends AbstractAuditable { | ||
|
|
||
| private String name; | ||
|
|
||
| @Column(unique=true) | ||
| private String resourceId = UUID.randomUUID().toString(); | ||
|
|
||
| private boolean filterEnabled; | ||
|
|
||
| @Transient | ||
| private int version; | ||
| } |
2 changes: 1 addition & 1 deletion
2
...end/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/FilterRepository.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