-
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.
First pass at entity, repository, and controller for DynamicHttpMetadataProvider/Resolver
- Loading branch information
Bill Smith
committed
Jun 7, 2018
1 parent
c086702
commit 8011845
Showing
6 changed files
with
488 additions
and
1 deletion.
There are no files selected for viewing
111 changes: 111 additions & 0 deletions
111
.../internet2/tier/shibboleth/admin/ui/controller/DynamicHttpMetadataProviderController.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,111 @@ | ||
package edu.internet2.tier.shibboleth.admin.ui.controller; | ||
|
||
import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver; | ||
import edu.internet2.tier.shibboleth.admin.ui.repository.DynamicHttpMetadataResolverRepository; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.transaction.annotation.Transactional; | ||
import org.springframework.web.bind.annotation.DeleteMapping; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PathVariable; | ||
import org.springframework.web.bind.annotation.PostMapping; | ||
import org.springframework.web.bind.annotation.PutMapping; | ||
import org.springframework.web.bind.annotation.RequestBody; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RestController; | ||
import org.springframework.web.servlet.support.ServletUriComponentsBuilder; | ||
|
||
import java.net.URI; | ||
|
||
/** | ||
* @author Bill Smith (wsmith@unicon.net) | ||
*/ | ||
@RestController | ||
@RequestMapping("/api/MetadataProvider/DynamicHttp") | ||
public class DynamicHttpMetadataProviderController { | ||
private static final Logger logger = LoggerFactory.getLogger(DynamicHttpMetadataProviderController.class); | ||
|
||
@Autowired | ||
DynamicHttpMetadataResolverRepository repository; | ||
|
||
@DeleteMapping("/{resourceId}") | ||
public ResponseEntity<?> deleteByResourceId(@PathVariable String resourceId) { | ||
if (repository.deleteByResourceId(resourceId)) { | ||
return ResponseEntity.accepted().build(); | ||
} else { | ||
return ResponseEntity.notFound().build(); | ||
} | ||
} | ||
|
||
@GetMapping("/name/{metadataProviderName}") | ||
@Transactional(readOnly = true) | ||
public ResponseEntity<?> getOneByName(@PathVariable String metadataProviderName) { | ||
DynamicHttpMetadataResolver resolver = repository.findByName(metadataProviderName); | ||
if (resolver == null) { | ||
return ResponseEntity.notFound().build(); | ||
} else { | ||
resolver.setVersion(resolver.hashCode()); | ||
return ResponseEntity.ok(resolver); | ||
} | ||
} | ||
|
||
@GetMapping("/{resourceId}") | ||
@Transactional(readOnly = true) | ||
public ResponseEntity<?> getOneByResourceId(@PathVariable String resourceId) { | ||
DynamicHttpMetadataResolver resolver = repository.findByResourceId(resourceId); | ||
if (resolver == null) { | ||
return ResponseEntity.notFound().build(); | ||
} else { | ||
resolver.setVersion(resolver.hashCode()); | ||
return ResponseEntity.ok(resolver); | ||
} | ||
} | ||
|
||
@PostMapping | ||
public ResponseEntity<?> create(@RequestBody DynamicHttpMetadataResolver resolver) { | ||
if (repository.findByName(resolver.getName()) != null) { | ||
return ResponseEntity.status(HttpStatus.CONFLICT).build(); | ||
} | ||
|
||
DynamicHttpMetadataResolver persistedResolver = repository.save(resolver); | ||
persistedResolver.setVersion(persistedResolver.hashCode()); | ||
|
||
return ResponseEntity | ||
.created(getResourceUriFor(persistedResolver)) | ||
.body(persistedResolver); | ||
} | ||
|
||
@PutMapping | ||
public ResponseEntity<?> update(@RequestBody DynamicHttpMetadataResolver resolver) { | ||
DynamicHttpMetadataResolver existingResolver = repository.findByResourceId(resolver.getResourceId()); | ||
|
||
if (existingResolver == null) { | ||
return ResponseEntity.notFound().build(); | ||
} | ||
|
||
if (existingResolver.hashCode() != resolver.getVersion()) { | ||
logger.info("Comparing: " + existingResolver.hashCode() + " with " + resolver.getVersion()); | ||
return ResponseEntity.status(HttpStatus.CONFLICT).build(); | ||
} | ||
|
||
resolver.setAudId(existingResolver.getAudId()); | ||
//TODO: Do we need to set anything else? dates? | ||
|
||
DynamicHttpMetadataResolver updatedResolver = repository.save(resolver); | ||
updatedResolver.setVersion(updatedResolver.hashCode()); | ||
|
||
return ResponseEntity.ok(updatedResolver); | ||
} | ||
|
||
private static URI getResourceUriFor(DynamicHttpMetadataResolver resolver) { | ||
return ServletUriComponentsBuilder | ||
.fromCurrentServletMapping().path("/api/MetadataProvider/DynamicHttp/") | ||
.pathSegment(resolver.getResourceId()) | ||
.build() | ||
.toUri(); | ||
} | ||
|
||
} |
39 changes: 39 additions & 0 deletions
39
.../edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/DynamicHttpMetadataResolver.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,39 @@ | ||
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.ElementCollection; | ||
import javax.persistence.Embedded; | ||
import javax.persistence.Entity; | ||
import javax.persistence.OrderColumn; | ||
import java.util.List; | ||
|
||
/** | ||
* @author Bill Smith (wsmith@unicon.net) | ||
*/ | ||
@Entity | ||
@EqualsAndHashCode(callSuper = true) | ||
@NoArgsConstructor | ||
@Getter | ||
@Setter | ||
@ToString | ||
public class DynamicHttpMetadataResolver extends MetadataResolver { | ||
|
||
@Embedded | ||
private DynamicMetadataResolverAttributes dynamicMetadataResolverAttributes; | ||
|
||
@Embedded | ||
private HttpMetadataResolverAttributes httpMetadataResolverAttributes; | ||
|
||
private int maxConnectionsTotal; | ||
|
||
private int maxConnectionsPerRoute; | ||
|
||
@ElementCollection | ||
@OrderColumn | ||
private List<String> supportedContentTypes; | ||
} |
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
18 changes: 18 additions & 0 deletions
18
.../internet2/tier/shibboleth/admin/ui/repository/DynamicHttpMetadataResolverRepository.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,18 @@ | ||
package edu.internet2.tier.shibboleth.admin.ui.repository; | ||
|
||
import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver; | ||
import org.springframework.data.repository.CrudRepository; | ||
|
||
/** | ||
* Spring Data CRUD repository for instances of {@link DynamicHttpMetadataResolver}s. | ||
* | ||
* @author Bill Smith (wsmith@unicon.net) | ||
*/ | ||
public interface DynamicHttpMetadataResolverRepository extends CrudRepository<DynamicHttpMetadataResolver, Long> { | ||
|
||
DynamicHttpMetadataResolver findByName(String name); | ||
|
||
boolean deleteByResourceId(String resourceId); | ||
|
||
DynamicHttpMetadataResolver findByResourceId(String resourceId); | ||
} |
Oops, something went wrong.