Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Respond with 400 status on request with empty path segments
- Loading branch information
Showing
6 changed files
with
115 additions
and
8 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
46 changes: 46 additions & 0 deletions
46
...a/org/fcrepo/http/commons/exceptionhandlers/InvalidResourceIdentifierExceptionMapper.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,46 @@ | ||
| /** | ||
| * Copyright 2015 DuraSpace, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.fcrepo.http.commons.exceptionhandlers; | ||
|
|
||
| import org.fcrepo.kernel.api.exception.InvalidResourceIdentifierException; | ||
| import org.slf4j.Logger; | ||
|
|
||
| import javax.ws.rs.core.Response; | ||
| import javax.ws.rs.ext.ExceptionMapper; | ||
| import javax.ws.rs.ext.Provider; | ||
|
|
||
| import static javax.ws.rs.core.Response.Status.BAD_REQUEST; | ||
| import static javax.ws.rs.core.Response.status; | ||
| import static org.slf4j.LoggerFactory.getLogger; | ||
|
|
||
| /** | ||
| * The class translates {@link org.fcrepo.kernel.api.exception.InvalidResourceIdentifierException}s to its proper | ||
| * response code. | ||
| * | ||
| * @author awoods | ||
| * @since July 14, 2015. | ||
| */ | ||
| @Provider | ||
| public class InvalidResourceIdentifierExceptionMapper implements ExceptionMapper<InvalidResourceIdentifierException> { | ||
|
|
||
| private static final Logger LOGGER = getLogger(InvalidResourceIdentifierExceptionMapper.class); | ||
|
|
||
| @Override | ||
| public Response toResponse(final InvalidResourceIdentifierException e) { | ||
| LOGGER.debug("InvalidResourceIdentifierExceptionMapper caught exception: {}", e.getMessage()); | ||
| return status(BAD_REQUEST).entity(e.getMessage()).build(); | ||
| } | ||
| } |
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
39 changes: 39 additions & 0 deletions
39
...api/src/main/java/org/fcrepo/kernel/api/exception/InvalidResourceIdentifierException.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 @@ | ||
| /** | ||
| * Copyright 2015 DuraSpace, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.fcrepo.kernel.api.exception; | ||
|
|
||
| /** | ||
| * This exception is used for invalid resource identifiers, such as when a resource path has empty segments. | ||
| * Note: This exception is *not* used for valid identifiers that point to non-existent resources. | ||
| * Additionally, the notion of "valid" will depend on the {@link org.fcrepo.kernel.api.identifiers.IdentifierConverter} | ||
| * chain in use. | ||
| * | ||
| * @author awoods | ||
| * @since July 14, 2015 | ||
| */ | ||
| public class InvalidResourceIdentifierException extends RepositoryRuntimeException { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| /** | ||
| * Constructor | ||
| * | ||
| * @param msg root cause | ||
| */ | ||
| public InvalidResourceIdentifierException(final String msg) { | ||
| super(msg); | ||
| } | ||
| } |