Large article pages have a Table Of Contents (TOC) navigation.
", LinkTransformerManager.getInstance().getEditorLink()); + String res = LinkUtil.convertLinksFromIdentifierPattern("Large article pages have a Table Of Contents (TOC) navigation.
", LinkTransformerManager.getInstance().getEditorLink()); assertEquals("Large article pages have a Table Of Contents (TOC) navigation.
", res); } @Test public void testUUIDToRelativeLinks() throws LinkException { - String res = LinkUtil.convertLinksFromUUIDPattern(HTML_WITH_UUIDS, LinkTransformerManager.getInstance().getRelative("/parent/sub2")); + String res = LinkUtil.convertLinksFromIdentifierPattern(HTML_WITH_UUIDS, LinkTransformerManager.getInstance().getRelative("/parent/sub2")); assertEquals(StringUtils.replace(HTML_WITH_ABSOLUTE_LINK, "/parent/sub.html", "sub.html"), res); } @@ -154,7 +154,7 @@ String htmlAbsoluteWithDollar = "this is a test"; String htmlUuidWithDollar = "this is a test"; - String res = LinkUtil.convertLinksFromUUIDPattern(htmlUuidWithDollar, LinkTransformerManager.getInstance().getAbsolute(false)); + String res = LinkUtil.convertLinksFromIdentifierPattern(htmlUuidWithDollar, LinkTransformerManager.getInstance().getAbsolute(false)); assertEquals(htmlAbsoluteWithDollar, res); } @@ -164,7 +164,7 @@ @Test public void testMakeUUIDFromAbsolutePath() throws LinkException { - String uuid = LinkFactory.parseLink("/parent/sub").getUUID(); + String uuid = LinkFactory.parseLink("/parent/sub").getIdentifier(); assertEquals("2", uuid); } @@ -241,7 +241,7 @@ @Test public void testMakeAbsolutePathFromUUID() throws LinkException { - String absolutePath = LinkFactory.createLink(RepositoryConstants.WEBSITE, "2").getHandle(); + String absolutePath = LinkFactory.createLink(RepositoryConstants.WEBSITE, "2").getPath(); assertEquals("/parent/sub", absolutePath); } @@ -253,8 +253,8 @@ String url = null; try { MockSession session = new MockSession("website"); - MockContent c = new MockContent((MockNode) session.getRootNode()); - url = LinkTransformerManager.getInstance().getCompleteUrl().transform(LinkFactory.createLink(c)); + MockNode node = (MockNode) session.getRootNode(); + url = LinkTransformerManager.getInstance().getCompleteUrl().transform(LinkFactory.createLink(node)); } finally { // restore serverConfiguration.setDefaultBaseUrl(base); @@ -266,7 +266,7 @@ @Test public void testCreateUndefinedLinkIfUUIDIsNonExistentOrFallbackHandleIsEmpty() { try { - String link = LinkUtil.convertLinksFromUUIDPattern("Large article pages have a Table Of Contents
", LinkTransformerManager.getInstance().getEditorLink()); + String link = LinkUtil.convertLinksFromIdentifierPattern("Large article pages have a Table Of Contents
", LinkTransformerManager.getInstance().getEditorLink()); assertEquals("Large article pages have a Table Of Contents
", link); } catch (LinkException e) { fail("Got unexpected exception "+ e.getMessage()); Index: src/main/java/info/magnolia/link/Link.java =================================================================== --- src/main/java/info/magnolia/link/Link.java (revision 51040) +++ src/main/java/info/magnolia/link/Link.java (working copy) @@ -36,11 +36,19 @@ import info.magnolia.cms.beans.config.ServerConfiguration; import info.magnolia.cms.beans.runtime.File; import info.magnolia.cms.core.Content; -import info.magnolia.cms.core.ItemType; +import info.magnolia.cms.core.MgnlNodeType; import info.magnolia.cms.core.NodeData; +import info.magnolia.cms.security.AccessDeniedException; +import info.magnolia.cms.util.ContentUtil; +import info.magnolia.cms.util.NodeDataUtil; +import info.magnolia.exception.RuntimeRepositoryException; +import javax.jcr.Node; +import javax.jcr.PathNotFoundException; +import javax.jcr.Property; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; +import javax.jcr.ValueFormatException; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -55,18 +63,19 @@ private static final Logger log = LoggerFactory.getLogger(Link.class); - private String repository; - private String handle; - private String uuid; - private String nodeDataName; + private String workspace; + private String path; + private String identifier; + private String propertyName; private String extension; - private Content node; - private NodeData nodeData; private String fileName; - private String fallbackHandle; + private String fallbackPath; private String anchor; private String parameters; + private Node jcrNode; + private NodeData nodeData; + /** * A constructor for undefined links. (i.e linking to a nonexistent page, for instance) */ @@ -74,33 +83,56 @@ } /** - * @param content + * @deprecated since 4.5, use {@link #Link(Node)} instead. */ public Link(Content content) { - setNode(content); + this(content.getJCRNode()); + } + + /** + * @deprecated since 4.5, use {@link #Link(String, Node, Property)} instead. + */ + public Link(String repoName, Content parent, NodeData nodedata) { + setJCRNode(parent.getJCRNode()); + setWorkspace(workspace); try { - setRepository(content.getWorkspace().getName()); + setNodeData(nodedata); + setPropertyName(nodedata.getJCRProperty().getName()); } catch (RepositoryException e) { + throw new RuntimeRepositoryException(e); + } + } + + public Link(Node node) { + setJCRNode(node); + try { + setWorkspace(node.getSession().getWorkspace().getName()); + if (node.isNodeType(MgnlNodeType.MIX_REFERENCEABLE)) { + setIdentifier(node.getIdentifier()); + } + } catch (RepositoryException e) { throw new RuntimeException(e); } - // should we have Content.hasUUID()? ... DefaultContent hides the fact that some nodes might not have UUIDs (we can link to other content then just the one in website - if (content.isNodeType(ItemType.MIX_REFERENCEABLE)) { - setUUID(content.getUUID()); - } } - public Link(String repoName, Content parent, NodeData nodedata) { - setNode(parent); - setRepository(repoName); - setNodeData(nodedata); - setNodeDataName(nodedata.getName()); + public Link(String workspace, Node parent, Property property) { + setJCRNode(parent); + setWorkspace(workspace); + setProperty(property); + try { + setPropertyName(property.getName()); + } catch (RepositoryException e) { + throw new RuntimeRepositoryException(e); + } } public String getExtension() { - if(StringUtils.isEmpty(this.extension) && this.getNodeData() != null && this.getNodeData().getType() == PropertyType.BINARY){ - File binary = new File(nodeData); + if(StringUtils.isEmpty(this.extension) && getNodeData() != null && getNodeData().getType() == PropertyType.BINARY){ + //TODO fgrilli: review this. + File binary = new File(getNodeData()); extension = binary.getExtension(); } + return StringUtils.defaultIfEmpty(this.extension, ServerConfiguration.getInstance().getDefaultExtension()); } @@ -109,12 +141,12 @@ this.extension = extension; } - public String getFileName() { - if(StringUtils.isEmpty(this.fileName) && this.getNodeData() != null && this.getNodeData().getType() == PropertyType.BINARY){ - File binary = new File(nodeData); + if(StringUtils.isEmpty(this.fileName) && getNodeData() != null && getNodeData().getType() == PropertyType.BINARY){ + File binary = new File(getNodeData()); fileName = binary.getFileName(); } + return fileName; } @@ -123,76 +155,121 @@ this.fileName = fileName; } + /** + * @deprecated since 4.5, use getJCRNode() instead. + */ public Content getNode() { - return this.node; + return ContentUtil.asContent(getJCRNode()); } - + /** + * @deprecated since 4.5, use setJCRNode(Node) instead. + */ public void setNode(Content node) { - this.node = node; + setJCRNode(node.getJCRNode()); } + /** + * @deprecated since 4.5, use getProperty() instead. + */ public NodeData getNodeData() { - if(this.nodeData == null && StringUtils.isNotEmpty(this.nodeDataName) && this.getNode() != null){ - this.nodeData = this.getNode().getNodeData(this.nodeDataName); + if(this.nodeData == null && StringUtils.isNotEmpty(this.propertyName) && this.getNode() != null){ + this.nodeData = this.getNode().getNodeData(this.propertyName); } return this.nodeData; } + /** + * @deprecated since 4.5, use setProperty(Property) instead. + */ public void setNodeData(NodeData nodeData) { this.nodeData = nodeData; } + /** + * @deprecated since 4.5, use getPropertyName() instead. + */ public String getNodeDataName() { - return this.nodeDataName; + return getPropertyName(); } + /** + * @deprecated since 4.5, use setPropertyName(String) instead. + */ public void setNodeDataName(String nodeDataName) { - this.nodeDataName = nodeDataName; + setPropertyName(nodeDataName); } + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + + public String getPropertyName() { + return propertyName; + } + + /** + * @deprecated since 4.5, use getPath() instead. + */ public String getHandle() { - if(StringUtils.isEmpty(this.handle)){ - if(getNode() != null){ - handle = getNode().getHandle(); - } else { - handle = this.getFallbackHandle(); - } - } - return this.handle; + return getPath(); } + /** + * @deprecated since 4.5, use setPath(String) instead. + */ public void setHandle(String path) { - this.handle = path; + setPath(path); } + /** + * @deprecated since 4.5, use getWorkspace() instead. + */ public String getRepository() { - return this.repository; + return getWorkspace(); } + /** + * @deprecated since 4.5, use setWorkspace(String) instead. + */ public void setRepository(String repository) { - this.repository = repository; + setWorkspace(repository); } - + /** + * @deprecated since 4.5, use getIdentifier() instead. + */ public String getUUID() { - if(StringUtils.isEmpty(this.uuid) && this.getNode() != null){ - this.uuid = this.getNode().getUUID(); - } - return this.uuid; + return getIdentifier(); } + /** + * @deprecated since 4.5, use setIdentifier(String) instead. + */ public void setUUID(String uuid) { - this.uuid = uuid; + setIdentifier(uuid); } + /** + * @deprecated since 4.5, use getFallbackPath() instead. + */ public String getFallbackHandle() { - return this.fallbackHandle; + return getFallbackPath(); } - + /** + * @deprecated since 4.5, use setFallbackPath(String) instead. + */ public void setFallbackHandle(String fallbackPath) { - this.fallbackHandle = fallbackPath; + setFallbackPath(fallbackPath); } + public String getFallbackPath() { + return this.fallbackPath; + } + + public void setFallbackPath(String fallbackPath) { + this.fallbackPath = fallbackPath; + } + public String getAnchor() { return this.anchor; } @@ -208,4 +285,80 @@ public void setParameters(String parameters) { this.parameters = parameters; } + + public Node getJCRNode() { + return jcrNode; + } + + public void setJCRNode(Node jcrNode) { + this.jcrNode = jcrNode; + } + + public Property getProperty() { + try { + if(getNodeData() == null) { + return null; + } + return getNodeData().getJCRProperty(); + } catch (PathNotFoundException e) { + throw new RuntimeRepositoryException(e); + } + } + + public void setProperty(Property property) { + if(property == null) { + return; + } + try { + setNodeData(NodeDataUtil.getOrCreateAndSet(getNode(), property.getName(), property.getValue())); + } catch (AccessDeniedException e) { + throw new RuntimeRepositoryException(e); + } catch (ValueFormatException e) { + throw new RuntimeRepositoryException(e); + } catch (RepositoryException e) { + throw new RuntimeRepositoryException(e); + } + } + + public String getIdentifier() { + if(StringUtils.isEmpty(this.identifier) && this.getJCRNode() != null){ + try { + this.identifier = this.getJCRNode().getIdentifier(); + } catch (RepositoryException e) { + throw new RuntimeRepositoryException(e); + } + } + return this.identifier; + } + + public void setIdentifier(String id) { + this.identifier = id; + } + + public String getPath() { + if(StringUtils.isEmpty(this.path)){ + if(getJCRNode() != null) { + try { + this.path = getJCRNode().getPath(); + } catch (RepositoryException e) { + throw new RuntimeRepositoryException(e); + } + } else { + this.path = getFallbackPath(); + } + } + return this.path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getWorkspace() { + return this.workspace; + } + + public void setWorkspace(String workspace) { + this.workspace = workspace; + } } Index: src/main/java/info/magnolia/link/LinkUtil.java =================================================================== --- src/main/java/info/magnolia/link/LinkUtil.java (revision 51040) +++ src/main/java/info/magnolia/link/LinkUtil.java (working copy) @@ -35,9 +35,9 @@ import info.magnolia.cms.beans.config.URI2RepositoryManager; import info.magnolia.cms.core.Content; -import info.magnolia.cms.core.HierarchyManager; import info.magnolia.cms.core.NodeData; import info.magnolia.context.MgnlContext; +import info.magnolia.exception.RuntimeRepositoryException; import info.magnolia.repository.RepositoryConstants; import java.io.UnsupportedEncodingException; @@ -45,7 +45,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.jcr.Node; +import javax.jcr.PathNotFoundException; +import javax.jcr.Property; import javax.jcr.RepositoryException; +import javax.jcr.Session; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -82,27 +86,41 @@ "[^>]*" + // any attributes ">)"); // end the tag + private static final Logger log = LoggerFactory.getLogger(LinkUtil.class); + /** - * Logger. + * Transforms an identifier to a path beginning with a /. This path is used to get the page from the repository. + * The editor needs this kind of links. */ - private static final Logger log = LoggerFactory.getLogger(LinkUtil.class); + public static String convertIdentifierToPath(String identifier, String workspace) throws LinkException { + return LinkFactory.createLink(workspace, identifier).getPath(); + } + /** + * Transforms an identifier to an uri. It does not add the context path. Compared to {@link Link#getPath()}, + * this method will apply all uri to repository mappings as well as i18n. + */ + public static String convertIdentifierToURI(String identifier, String workspace) throws LinkException { + return LinkTransformerManager.getInstance().getAbsolute(false).transform(LinkFactory.createLink(workspace, identifier)); + } //-- conversions from UUID - singles /** * Transforms a uuid to a handle beginning with a /. This path is used to get the page from the repository. * The editor needs this kind of links. + * @deprecated since 4.5, use {@link #convertIdentifierToPath(String, String)} instead. */ public static String convertUUIDtoHandle(String uuid, String repository) throws LinkException { - return LinkFactory.createLink(repository, uuid).getHandle(); + return convertIdentifierToPath(uuid, repository); } /** * Transforms a uuid to an uri. It does not add the context path. In difference from {@link Link#getHandle()}, * this method will apply all uri to repository mappings as well as i18n. + * @deprecated since 4.5, use {@link #convertIdentifierToURI(String, String)} instead. */ public static String convertUUIDtoURI(String uuid, String repository) throws LinkException { - return LinkTransformerManager.getInstance().getAbsolute(false).transform(LinkFactory.createLink(repository, uuid)); + return convertIdentifierToURI(uuid, repository); } //-- conversions to UUID - bulk @@ -110,8 +128,18 @@ * Parses provided html and transforms all the links to the magnolia format. Used during storing. * @param html html code with links to be converted * @return html with changed hrefs + * @deprecated since 4.5, use {@link #convertAbsoluteLinksToIdentifiers(String)} instead. */ public static String convertAbsoluteLinksToUUIDs(String html) { + return convertAbsoluteLinksToIdentifiers(html); + } + + /** + * Parses provided html and transforms all the links to the magnolia format. Used during storing. + * @param html html code with links to be converted + * @return html with changed hrefs + */ + public static String convertAbsoluteLinksToIdentifiers(String html) { // get all link tags Matcher matcher = LINK_OR_IMAGE_PATTERN.matcher(html); StringBuffer res = new StringBuffer(); @@ -140,16 +168,15 @@ return res.toString(); } - //-- conversions from UUID - bulk - /** - * Converts provided html with links in UUID pattern format to any other kind of links based on provided link transformer. - * @param str Html with UUID links + * Converts provided html with links in identifier pattern format to any other kind of links based on provided link transformer. + * @param str Html with identifier links * @param transformer Link transformer * @return converted html with links as created by provided transformer. * @see LinkTransformerManager */ - public static String convertLinksFromUUIDPattern(String str, LinkTransformer transformer) throws LinkException { + public static String convertLinksFromIdentifierPattern(String str, LinkTransformer transformer) throws LinkException { + //TODO fgrilli: should the UUID_PATTERN now have an identifier? Matcher matcher = LinkFactory.UUID_PATTERN.matcher(str); StringBuffer res = new StringBuffer(); while (matcher.find()) { @@ -164,11 +191,30 @@ return res.toString(); } - public static String convertLinksFromUUIDPattern(String str) throws LinkException { + public static String convertLinksFromIdentifierPattern(String str) throws LinkException { LinkTransformer transformer = LinkTransformerManager.getInstance().getBrowserLink(null); - return convertLinksFromUUIDPattern(str, transformer); + return convertLinksFromIdentifierPattern(str, transformer); } + /** + * Converts provided html with links in UUID pattern format to any other kind of links based on provided link transformer. + * @param str Html with UUID links + * @param transformer Link transformer + * @return converted html with links as created by provided transformer. + * @see LinkTransformerManager + * @deprecated since 4.5, use {@link #convertLinksFromIdentifierPattern(String, LinkTransformer)} instead. + */ + public static String convertLinksFromUUIDPattern(String str, LinkTransformer transformer) throws LinkException { + return convertLinksFromIdentifierPattern(str, transformer); + } + + /** + * @deprecated since 4.5, use {@link #convertLinksFromIdentifierPattern(String)} instead. + */ + public static String convertLinksFromUUIDPattern(String str) throws LinkException { + return convertLinksFromIdentifierPattern(str); + } + /** * Determines if the given link is internal and relative. */ public static boolean isInternalRelativeLink(String href) { @@ -257,24 +303,30 @@ * @param nodedata Node data to create link for. * @return Absolute link to the provided node data. * @see AbstractI18nContentSupport + * + * @deprecated since 4.5, use {@link #createAbsoluteLink(Property)} instead. */ public static String createAbsoluteLink(NodeData nodedata) throws LinkException { if(nodedata == null || !nodedata.isExist()){ return null; } - return LinkTransformerManager.getInstance().getAbsolute().transform(LinkFactory.createLink(nodedata)); + try { + return createAbsoluteLink(nodedata.getJCRProperty()); + } catch (PathNotFoundException e) { + throw new LinkException(e); + } } /** * Creates absolute link including context path to the provided content and performing all URI2Repository mappings and applying locales. - * @param uuid UUID of content to create link to. - * @param repository Name of the repository where content is located. + * @param id UUID of content to create link to. + * @param workspace Name of the workspace where content is located. * @return Absolute link to the provided content. * @see AbstractI18nContentSupport */ - public static String createAbsoluteLink(String repository, String uuid) throws RepositoryException { - HierarchyManager hm = MgnlContext.getHierarchyManager(repository); - Content node = hm.getContentByUUID(uuid); + public static String createAbsoluteLink(String workspace, String id) throws RepositoryException { + Session session = MgnlContext.getJCRSession(workspace); + Node node = session.getNodeByIdentifier(id); return createAbsoluteLink(node); } @@ -283,24 +335,25 @@ * @param content content to create link to. * @return Absolute link to the provided content. * @see AbstractI18nContentSupport + * @deprecated since 4.5, use {@link #createAbsoluteLink(Node)} instead. */ public static String createAbsoluteLink(Content content) { if(content == null){ return null; } - return LinkTransformerManager.getInstance().getAbsolute().transform(LinkFactory.createLink(content)); + return createAbsoluteLink(content.getJCRNode()); } /** * Creates a complete url to access given content from external systems applying all the URI2Repository mappings and locales. - * @param content - * @return + * @deprecated since 4.5, use {@link #createExternalLink(Node)} instead. + * */ public static String createExternalLink(Content content) { if(content == null){ return null; } - return LinkTransformerManager.getInstance().getCompleteUrl().transform(LinkFactory.createLink(content)); + return createExternalLink(content.getJCRNode()); } /** @@ -308,12 +361,13 @@ * @param nodedata Node data to create link for. * @return Absolute link to the provided node data. * @see AbstractI18nContentSupport + * @deprecated since 4.5, use {@link #createLink(Node)} instead. */ public static String createLink(Content node) { if(node == null){ return null; } - return LinkTransformerManager.getInstance().getBrowserLink(node.getHandle()).transform(LinkFactory.createLink(node)); + return createLink(node.getJCRNode()); } /** @@ -321,28 +375,102 @@ * @param nodedata Node data to create link for. * @return Absolute link to the provided node data. * @see AbstractI18nContentSupport + * + * @deprecated since 4.5, use {@link #createLink(Property)} instead. */ public static String createLink(NodeData nodedata) throws LinkException { if(nodedata == null || !nodedata.isExist()){ return null; } try { - return LinkTransformerManager.getInstance().getBrowserLink(nodedata.getParent().getHandle()).transform(LinkFactory.createLink(nodedata)); + return createLink(nodedata.getJCRProperty()); } catch (RepositoryException e) { throw new LinkException(e.getMessage(), e); } } /** + * Creates absolute link including context path for the provided property. + * @param property Property to create link for. + * @return Absolute link to the provided node data. + * @see AbstractI18nContentSupport + */ + public static String createAbsoluteLink(Property property) throws LinkException { + if(property == null){ + return null; + } + return LinkTransformerManager.getInstance().getAbsolute().transform(LinkFactory.createLink(property)); + } + + + /** + * Creates absolute link including context path to the provided node and performing all URI2Repository mappings and applying locales. + * @param content content to create link to. + * @return Absolute link to the provided node. + * @see AbstractI18nContentSupport + */ + public static String createAbsoluteLink(Node node) { + if(node == null){ + return null; + } + return LinkTransformerManager.getInstance().getAbsolute().transform(LinkFactory.createLink(node)); + } + + /** + * Creates a complete url to access given node from external systems applying all the URI2Repository mappings and locales. + * @param node + */ + public static String createExternalLink(Node node) { + if(node == null){ + return null; + } + return LinkTransformerManager.getInstance().getCompleteUrl().transform(LinkFactory.createLink(node)); + } + + /** + * Creates link guessing best possible link format from current site and provided node. + * @param node Node to create link for. + * @return Absolute link to the provided node data. + * @see AbstractI18nContentSupport + */ + public static String createLink(Node node) { + if(node == null){ + return null; + } + try { + return LinkTransformerManager.getInstance().getBrowserLink(node.getPath()).transform(LinkFactory.createLink(node)); + } catch (RepositoryException e) { + throw new RuntimeRepositoryException(e); + } + } + + /** + * Creates link guessing best possible link format from current site and the provided property. + * @param property Property to create link for. + * @return Absolute link to the provided property. + * @see AbstractI18nContentSupport + */ + public static String createLink(Property property) throws LinkException { + if(property == null){ + return null; + } + try { + return LinkTransformerManager.getInstance().getBrowserLink(property.getParent().getPath()).transform(LinkFactory.createLink(property)); + } catch (RepositoryException e) { + throw new LinkException(e.getMessage(), e); + } + } + + /** * Creates link guessing best possible link format from current site and provided content. - * @param uuid UUID of content to create link to. + * @param id identifier of content to create link to. * @param repository Name of the repository where content is located. * @return Absolute link to the provided content. * @see AbstractI18nContentSupport */ - public static String createLink(String repository, String uuid) throws RepositoryException { - HierarchyManager hm = MgnlContext.getHierarchyManager(repository); - Content node = hm.getContentByUUID(uuid); + public static String createLink(String workspace, String id) throws RepositoryException { + Session session = MgnlContext.getJCRSession(workspace); + Node node = session.getNodeByIdentifier(id); return createLink(node); } } Index: src/test/java/info/magnolia/link/UUIDLinkTest.java =================================================================== --- src/test/java/info/magnolia/link/UUIDLinkTest.java (revision 51040) +++ src/test/java/info/magnolia/link/UUIDLinkTest.java (working copy) @@ -33,11 +33,13 @@ */ package info.magnolia.link; -import static org.easymock.classextension.EasyMock.*; +import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.classextension.EasyMock.verify; import static org.junit.Assert.assertEquals; -import info.magnolia.cms.util.ContentUtil; + +import info.magnolia.jcr.util.SessionUtil; import info.magnolia.repository.RepositoryConstants; -import info.magnolia.test.mock.MockContent; +import info.magnolia.test.mock.jcr.MockNode; import java.text.MessageFormat; @@ -89,8 +91,8 @@ public void testParseLink() throws Exception { Link link = LinkFactory.parseLink(HREF_ABSOLUTE_LINK); - assertEquals(RepositoryConstants.WEBSITE, link.getRepository()); - assertEquals(HANDLE_PARENT_SUB, link.getHandle()); + assertEquals(RepositoryConstants.WEBSITE, link.getWorkspace()); + assertEquals(HANDLE_PARENT_SUB, link.getPath()); assertEquals(UUID_PATTERN_SIMPLE, LinkFactory.toPattern(link)); } @@ -123,7 +125,7 @@ @Test public void testUUIDToAbsoluteLinksAfterRenaming() throws Exception{ - ((MockContent)ContentUtil.getContent(RepositoryConstants.WEBSITE, "/parent/sub")).setName("subRenamed"); + ((MockNode)SessionUtil.getNode(RepositoryConstants.WEBSITE, "/parent/sub")).setName("subRenamed"); Link link = LinkFactory.parseUUIDLink(UUID_PATTERN_SIMPLE); assertEquals("/parent/subRenamed.html", NOP_TRANSFORMER.transform(link)); } @@ -142,7 +144,7 @@ @Test public void testUUIDToBinaryAfterRenaming() throws Exception { // now rename the the page - ((MockContent)ContentUtil.getContent(RepositoryConstants.WEBSITE, "/parent/sub")).setName("subRenamed"); + ((MockNode)SessionUtil.getNode(RepositoryConstants.WEBSITE, "/parent/sub")).setName("subRenamed"); Link link = LinkFactory.parseUUIDLink(UUID_PATTERN_BINARY); assertEquals(StringUtils.replace(HREF_BINARY, "sub", "subRenamed"), NOP_TRANSFORMER.transform(link));