This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.hapi-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-hapi.git
commit d9e56c65b61f3a366a31ba01bf94163d2adb49e4 Author: Carsten Ziegeler <[email protected]> AuthorDate: Mon Feb 1 13:26:59 2016 +0000 Minor code clean up git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/hapi/core@1727933 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/hapi/HApiException.java | 3 ++ src/main/java/org/apache/sling/hapi/HApiUse.java | 13 +++--- src/main/java/org/apache/sling/hapi/HApiUtil.java | 17 ++++---- .../sling/hapi/MicrodataAttributeHelper.java | 2 - .../org/apache/sling/hapi/impl/HApiUtilImpl.java | 46 +++++++++++++++------- 5 files changed, 48 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/apache/sling/hapi/HApiException.java b/src/main/java/org/apache/sling/hapi/HApiException.java index b9922e0..67cc5ec 100644 --- a/src/main/java/org/apache/sling/hapi/HApiException.java +++ b/src/main/java/org/apache/sling/hapi/HApiException.java @@ -22,6 +22,9 @@ package org.apache.sling.hapi; * A Hypermedia API exception */ public class HApiException extends RuntimeException { + + private static final long serialVersionUID = 2626376214501558054L; + public HApiException() { } diff --git a/src/main/java/org/apache/sling/hapi/HApiUse.java b/src/main/java/org/apache/sling/hapi/HApiUse.java index 1dfe348..112bd1a 100644 --- a/src/main/java/org/apache/sling/hapi/HApiUse.java +++ b/src/main/java/org/apache/sling/hapi/HApiUse.java @@ -19,18 +19,18 @@ package org.apache.sling.hapi; -import org.apache.sling.scripting.sightly.pojo.Use; +import java.util.Map; + +import javax.script.Bindings; + import org.apache.sling.api.SlingHttpServletRequest; -import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.scripting.SlingBindings; import org.apache.sling.api.scripting.SlingScriptHelper; +import org.apache.sling.scripting.sightly.pojo.Use; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.script.Bindings; -import java.util.Map; - /** * Sightly use class helper to provide the hypermedia API microdata attributes for the type configured throught the 'type' binding. * <p>The type can be a JCR path or a fully qualified domain name like in @@ -44,7 +44,6 @@ public class HApiUse implements Use { private MicrodataAttributeHelper helper; private SlingHttpServletRequest request; private SlingScriptHelper sling; - private Resource resource; private ResourceResolver resourceResolver; private String typeId; private Map<String, String> itemTypeAttr; @@ -55,10 +54,10 @@ public class HApiUse implements Use { * {@inheritDoc} * @param bindings */ + @Override public void init(Bindings bindings) { request = (SlingHttpServletRequest) bindings.get(SlingBindings.REQUEST); sling = (SlingScriptHelper) bindings.get(SlingBindings.SLING); - resource = (Resource)bindings.get(SlingBindings.RESOURCE); resourceResolver = request.getResourceResolver(); typeId = (String) bindings.get("type"); LOG.debug("init type: {}", typeId); diff --git a/src/main/java/org/apache/sling/hapi/HApiUtil.java b/src/main/java/org/apache/sling/hapi/HApiUtil.java index c262b74..b1cebdd 100644 --- a/src/main/java/org/apache/sling/hapi/HApiUtil.java +++ b/src/main/java/org/apache/sling/hapi/HApiUtil.java @@ -19,17 +19,14 @@ package org.apache.sling.hapi; -import org.apache.sling.api.resource.ResourceResolver; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.apache.sling.api.resource.ResourceResolver; + public interface HApiUtil { - public static final Logger LOG = LoggerFactory.getLogger(HApiUtil.class); - public static final String DEFAULT_RESOURCE_TYPE = "sling/hapi/components/type"; + String DEFAULT_RESOURCE_TYPE = "sling/hapi/components/type"; /** * <p>Get a HApi type object from a type identifier.</p> @@ -43,7 +40,7 @@ public interface HApiUtil { * @return The first node that matches that type or null if none is found. * @throws RepositoryException */ - public Node getTypeNode(ResourceResolver resolver, String type) throws RepositoryException; + Node getTypeNode(ResourceResolver resolver, String type) throws RepositoryException; /** @@ -59,7 +56,7 @@ public interface HApiUtil { * @return The HApiType resolved from the type identifier * @throws javax.jcr.RepositoryException */ - public HApiType fromPath(ResourceResolver resolver, String type) throws RepositoryException; + HApiType fromPath(ResourceResolver resolver, String type) throws RepositoryException; /** * <p>Get a HApi type object from the {@link javax.jcr.Node}.</p> @@ -89,7 +86,7 @@ public interface HApiUtil { * @return The HApiType * @throws RepositoryException */ - public HApiType fromNode(ResourceResolver resolver, Node typeNode) throws RepositoryException; + HApiType fromNode(ResourceResolver resolver, Node typeNode) throws RepositoryException; /** * Get a new instance of AttributeHelper for the type identified by 'type' @@ -99,5 +96,5 @@ public interface HApiUtil { * @return * @throws RepositoryException */ - public MicrodataAttributeHelper getHelper(ResourceResolver resolver, String type) throws RepositoryException; + MicrodataAttributeHelper getHelper(ResourceResolver resolver, String type) throws RepositoryException; } diff --git a/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java b/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java index c52f068..e3f21d3 100644 --- a/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java +++ b/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java @@ -18,8 +18,6 @@ ******************************************************************************/ package org.apache.sling.hapi; -import org.apache.sling.api.resource.ResourceResolver; - import java.util.Map; public interface MicrodataAttributeHelper { diff --git a/src/main/java/org/apache/sling/hapi/impl/HApiUtilImpl.java b/src/main/java/org/apache/sling/hapi/impl/HApiUtilImpl.java index c6810ea..eac29e5 100644 --- a/src/main/java/org/apache/sling/hapi/impl/HApiUtilImpl.java +++ b/src/main/java/org/apache/sling/hapi/impl/HApiUtilImpl.java @@ -18,31 +18,45 @@ ******************************************************************************/ package org.apache.sling.hapi.impl; -import org.apache.sling.hapi.HApiProperty; -import org.apache.sling.hapi.HApiType; -import org.apache.sling.hapi.MicrodataAttributeHelper; -import org.apache.sling.hapi.HApiUtil; -import org.apache.felix.scr.annotations.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.jcr.Node; +import javax.jcr.NodeIterator; +import javax.jcr.RepositoryException; +import javax.jcr.Session; +import javax.jcr.Value; +import javax.jcr.query.Query; +import javax.jcr.query.QueryManager; +import javax.jcr.query.QueryResult; + +import org.apache.felix.scr.annotations.Activate; +import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Property; -import org.apache.sling.api.resource.ResourceResolver; +import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.resource.Resource; +import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.commons.osgi.PropertiesUtil; +import org.apache.sling.hapi.HApiProperty; +import org.apache.sling.hapi.HApiType; +import org.apache.sling.hapi.HApiUtil; +import org.apache.sling.hapi.MicrodataAttributeHelper; import org.osgi.service.component.ComponentContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jcr.*; -import javax.jcr.query.Query; -import javax.jcr.query.QueryManager; -import javax.jcr.query.QueryResult; -import java.util.*; - @Component(label = "Apache Sling Hypermedia API tools", metatype = true) -@Service() - +@Service(value = HApiUtil.class) public class HApiUtilImpl implements HApiUtil { + private final Logger LOG = LoggerFactory.getLogger(HApiUtil.class); + @Property(label = "HApi Resource Type", cardinality = 0, value = DEFAULT_RESOURCE_TYPE) public static final String HAPI_RESOURCE_TYPE = "org.apache.sling.hapi.tools.resourcetype"; @@ -69,6 +83,7 @@ public class HApiUtilImpl implements HApiUtil { /** * {@inheritDoc} */ + @Override public Node getTypeNode(ResourceResolver resolver, String type) throws RepositoryException { Session session = resolver.adaptTo(Session.class); @@ -112,6 +127,7 @@ public class HApiUtilImpl implements HApiUtil { /** * {@inheritDoc} */ + @Override public HApiType fromPath(ResourceResolver resolver, String type) throws RepositoryException { Node typeNode = this.getTypeNode(resolver, type); LOG.debug("typeNode=" + typeNode); @@ -125,6 +141,7 @@ public class HApiUtilImpl implements HApiUtil { /** * {@inheritDoc} */ + @Override public HApiType fromNode(ResourceResolver resolver, Node typeNode) throws RepositoryException { if (null == typeNode) return null; String name = typeNode.getProperty("name").getValue().getString(); @@ -186,6 +203,7 @@ public class HApiUtilImpl implements HApiUtil { /** * {@inheritDoc} */ + @Override public MicrodataAttributeHelper getHelper(ResourceResolver resolver, String type) throws RepositoryException { return new MicrodataAttributeHelperImpl(resolver, TypesCache.getInstance(this).getType(resolver, type)); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
