Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move modeshape-specific code out of the kernel-api
Related to: https://jira.duraspace.org/browse/FCREPO-1824
- Loading branch information
Showing
8 changed files
with
95 additions
and
128 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
111 changes: 0 additions & 111 deletions
111
fcrepo-kernel-api/src/main/java/org/fcrepo/kernel/api/utils/NamespaceTools.java
This file was deleted.
Oops, something went wrong.
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
86 changes: 86 additions & 0 deletions
86
fcrepo-kernel-modeshape/src/main/java/org/fcrepo/kernel/modeshape/utils/NamespaceTools.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,86 @@ | ||
| /** | ||
| * 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.modeshape.utils; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| import javax.jcr.NamespaceException; | ||
| import javax.jcr.NamespaceRegistry; | ||
| import javax.jcr.RepositoryException; | ||
| import javax.jcr.Session; | ||
|
|
||
| import org.fcrepo.kernel.api.exception.FedoraInvalidNamespaceException; | ||
| import org.fcrepo.kernel.api.exception.RepositoryRuntimeException; | ||
|
|
||
| /** | ||
| * Tools for working with the JCR Namespace Registry | ||
| * @author Benjamin Armintor | ||
| * @author acoburn | ||
| * @author ajs6f | ||
| * @since May 13, 2013 | ||
| */ | ||
| public final class NamespaceTools { | ||
|
|
||
| private NamespaceTools() { | ||
| } | ||
|
|
||
| /** | ||
| * Return the {@link NamespaceRegistry} associated with the arg session. | ||
| * | ||
| * @param session containing the NamespaceRegistry | ||
| * @return NamespaceRegistry | ||
| */ | ||
| public static NamespaceRegistry getNamespaceRegistry(final Session session) { | ||
| try { | ||
| return requireNonNull(session.getWorkspace().getNamespaceRegistry(), | ||
| "Couldn't find namespace registry in repository!"); | ||
| } catch (final RepositoryException e) { | ||
| throw new RepositoryRuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Validate resource path for unregistered namespace prefixes | ||
| * | ||
| * @param session the JCR session to use | ||
| * @param path the absolute path to the object | ||
| * @throws org.fcrepo.kernel.api.exception.FedoraInvalidNamespaceException on unregistered namespaces | ||
| * @throws org.fcrepo.kernel.api.exception.RepositoryRuntimeException if repository runtime exception occurred | ||
| */ | ||
| public static void validatePath(final Session session, final String path) { | ||
|
|
||
| final NamespaceRegistry namespaceRegistry = getNamespaceRegistry(session); | ||
| final String[] pathSegments = path.replaceAll("^/+", "").replaceAll("/+$", "").split("/"); | ||
| for (final String segment : pathSegments) { | ||
| final int colonPosition = segment.indexOf(':'); | ||
| if (segment.length() > 0 && colonPosition > -1) { | ||
| final String prefix = segment.substring(0, colonPosition); | ||
| if (!prefix.equals("fedora")) { | ||
| if (prefix.length() == 0) { | ||
| throw new FedoraInvalidNamespaceException("Empty namespace in " + segment); | ||
| } | ||
| try { | ||
| namespaceRegistry.getURI(prefix); | ||
| } catch (final NamespaceException e) { | ||
| throw new FedoraInvalidNamespaceException("Prefix " + prefix + " has not been registered", e); | ||
| } catch (final RepositoryException e) { | ||
| throw new RepositoryRuntimeException(e); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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