Merged master into SHIBUI-1863

TIER · May 7, 2021 · c926041 · c926041
2 parents 05d6582 + f1b4274
commit c926041
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/...d/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesController.java b/...d/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesController.java
@@ -5,12 +5,9 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.io.MarshallingException;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,7 +20,6 @@
 import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository;
 import edu.internet2.tier.shibboleth.admin.ui.service.EntityDescriptorService;
 import lombok.extern.slf4j.Slf4j;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 @Controller
@@ -49,8 +45,7 @@ public ResponseEntity<?> getOne(final @PathVariable String entityId, HttpServlet
             return ResponseEntity.notFound().build();
         }
         EntityDescriptorRepresentation entityDescriptorRepresentation = entityDescriptorService.createRepresentationFromDescriptor(entityDescriptor);
-        ResponseEntity result =  ResponseEntity.ok(entityDescriptorRepresentation);
-        return result;
+        return ResponseEntity.ok(entityDescriptorRepresentation);
     }
 
     @RequestMapping(value = "/{entityId:.*}", produces = "application/xml")