Author: aparfonov Date: 2011-01-17 06:03:16 -0500 (Mon, 17 Jan 2011) New Revision: 3814 Added: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorTest.java ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/wadl/WadlProcessorTest.java Log: EXOJCR-1152 Added: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java (rev 0) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.rest; + +import org.exoplatform.services.rest.impl.ConstructorDescriptorImpl; +import org.exoplatform.services.rest.impl.FieldInjectorImpl; +import org.exoplatform.services.rest.impl.MultivaluedMapImpl; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Modifier; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.ws.rs.core.MultivaluedMap; + +/** + * @author <a href="mailto:andrey.parfonov@exoplatform.com">Andrey Parfonov</a> + * @version $Id$ + */ +public abstract class BaseObjectModel implements ObjectModel +{ + protected final Class<?> clazz; + /** Resource class constructors. */ + protected final List<ConstructorDescriptor> constructors; + /** Resource class fields. */ + protected final List<FieldInjector> fields; + /** Optional data. */ + protected MultivaluedMapImpl properties; + + public BaseObjectModel(Class<?> clazz, ComponentLifecycleScope scope) + { + this.clazz = clazz; + this.constructors = new ArrayList<ConstructorDescriptor>(); + this.fields = new ArrayList<FieldInjector>(); + if (scope == ComponentLifecycleScope.PER_REQUEST) + { + Constructor<?>[] jConstructors = + AccessController.doPrivileged(new PrivilegedAction<Constructor<?>[]>() { + public Constructor<?>[] run() + { + return BaseObjectModel.this.clazz.getConstructors(); + } + }); + for (Constructor<?> constructor : jConstructors) + { + constructors.add(new ConstructorDescriptorImpl(clazz, constructor)); + } + if (constructors.size() == 0) + { + String msg = "Not found accepted constructors for provider class " + clazz.getName(); + throw new RuntimeException(msg); + } + // Sort constructors in number parameters order + if (constructors.size() > 1) + { + Collections.sort(constructors, ConstructorDescriptorImpl.CONSTRUCTOR_COMPARATOR); + } + // process field + java.lang.reflect.Field[] jfields = + AccessController.doPrivileged(new PrivilegedAction<java.lang.reflect.Field[]>() { + public java.lang.reflect.Field[] run() + { + return BaseObjectModel.this.clazz.getDeclaredFields(); + } + }); + for (java.lang.reflect.Field jfield : jfields) + { + fields.add(new FieldInjectorImpl(clazz, jfield)); + } + Class<?> sc = clazz.getSuperclass(); + Package _package = clazz.getPackage(); + String resourcePackageName = _package != null ? _package.getName() : null; + while (sc != Object.class) + { + for (java.lang.reflect.Field jfield : sc.getDeclaredFields()) + { + int modif = jfield.getModifiers(); + Package package1 = clazz.getPackage(); + String scPackageName = package1 != null ? package1.getName() : null; + if (!Modifier.isPrivate(modif)) + { + if (Modifier.isPublic(modif) + || Modifier.isProtected(modif) + || (!Modifier.isPrivate(modif) && ((resourcePackageName == null && scPackageName == null) || resourcePackageName + .equals(scPackageName)))) + { + FieldInjector inj = new FieldInjectorImpl(clazz, jfield); + // Skip not annotated field. They will be not injected from container. + if (inj.getAnnotation() != null) + { + fields.add(new FieldInjectorImpl(clazz, jfield)); + } + } + } + } + sc = sc.getSuperclass(); + } + } + } + + /** + * {@inheritDoc} + */ + public Class<?> getObjectClass() + { + return clazz; + } + + /** + * {@inheritDoc} + */ + public List<ConstructorDescriptor> getConstructorDescriptors() + { + return constructors; + } + + /** + * {@inheritDoc} + */ + public List<FieldInjector> getFieldInjectors() + { + return fields; + } + + /** + * {@inheritDoc} + */ + public MultivaluedMap<String, String> getProperties() + { + if (properties == null) + { + properties = new MultivaluedMapImpl(); + } + return properties; + } + + /** + * {@inheritDoc} + */ + public List<String> getProperty(String key) + { + if (properties != null) + { + return properties.get(key); + } + return null; + } +} Property changes on: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FieldInjectorImpl.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.rest.impl; -import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.rest.ApplicationContext; @@ -31,6 +30,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.lang.reflect.Type; +import java.security.AccessController; import java.security.PrivilegedAction; import java.util.List; @@ -66,8 +66,9 @@ private final Annotation annotation; /** - * Default value for this parameter, default value can be used if there is not - * found required parameter in request. See {@link javax.ws.rs.DefaultValue}. + * Default value for this parameter, default value can be used if there is + * not found required parameter in request. See + * {@link javax.ws.rs.DefaultValue}. */ private final String defaultValue; @@ -76,7 +77,6 @@ */ private final boolean encoded; - /** See {@link java.lang.reflect.Field} . */ private final java.lang.reflect.Field jfield; @@ -214,8 +214,7 @@ { if (!Modifier.isPublic(jfield.getModifiers())) { - SecurityHelper.doPrivilegedAction(new PrivilegedAction<Void>() - { + AccessController.doPrivileged(new PrivilegedAction<Void>() { public Void run() { jfield.setAccessible(true); @@ -255,9 +254,9 @@ public String toString() { StringBuffer sb = new StringBuffer("[ FieldInjectorImpl: "); - sb.append("annotation: " + getAnnotation()).append("; type: " + getParameterClass()).append( - "; generic-type : " + getGenericType()).append("; default-value: " + getDefaultValue()).append( - "; encoded: " + isEncoded()).append(" ]"); + sb.append("annotation: " + getAnnotation()).append("; type: " + getParameterClass()) + .append("; generic-type : " + getGenericType()).append("; default-value: " + getDefaultValue()) + .append("; encoded: " + isEncoded()).append(" ]"); return sb.toString(); } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/FilterDescriptorImpl.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -18,35 +18,22 @@ */ package org.exoplatform.services.rest.impl; +import org.exoplatform.services.rest.BaseObjectModel; import org.exoplatform.services.rest.ComponentLifecycleScope; -import org.exoplatform.services.rest.ConstructorDescriptor; -import org.exoplatform.services.rest.FieldInjector; import org.exoplatform.services.rest.FilterDescriptor; import org.exoplatform.services.rest.impl.resource.PathValue; import org.exoplatform.services.rest.resource.ResourceDescriptorVisitor; import org.exoplatform.services.rest.uri.UriPattern; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import javax.ws.rs.Path; -import javax.ws.rs.core.MultivaluedMap; /** * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> * @version $Id: $ */ -public class FilterDescriptorImpl implements FilterDescriptor +public class FilterDescriptorImpl extends BaseObjectModel implements FilterDescriptor { - /** - * Filter class. - */ - private final Class<?> filterClass; - - /** * @see PathValue */ private final PathValue path; @@ -57,21 +44,6 @@ private final UriPattern uriPattern; /** - * Filter class constructors. - * - * @see ConstructorDescriptor - */ - private final List<ConstructorDescriptor> constructors; - - /** - * Filter class fields. - */ - private final List<FieldInjector> fields; - - /** Optional data. */ - private MultivaluedMap<String, String> properties; - - /** * @param filterClass {@link Class} of filter */ public FilterDescriptorImpl(Class<?> filterClass) @@ -94,6 +66,7 @@ */ private FilterDescriptorImpl(Class<?> filterClass, ComponentLifecycleScope scope) { + super(filterClass, scope); final Path p = filterClass.getAnnotation(Path.class); if (p != null) { @@ -105,33 +78,6 @@ this.path = null; this.uriPattern = null; } - - this.filterClass = filterClass; - - this.constructors = new ArrayList<ConstructorDescriptor>(); - this.fields = new ArrayList<FieldInjector>(); - if (scope == ComponentLifecycleScope.PER_REQUEST) - { - for (Constructor<?> constructor : filterClass.getConstructors()) - { - constructors.add(new ConstructorDescriptorImpl(filterClass, constructor)); - } - if (constructors.size() == 0) - { - String msg = "Not found accepted constructors for filter class " + filterClass.getName(); - throw new RuntimeException(msg); - } - // Sort constructors in number parameters order - if (constructors.size() > 1) - { - Collections.sort(constructors, ConstructorDescriptorImpl.CONSTRUCTOR_COMPARATOR); - } - // process field - for (java.lang.reflect.Field jfield : filterClass.getDeclaredFields()) - { - fields.add(new FieldInjectorImpl(filterClass, jfield)); - } - } } /** @@ -145,30 +91,6 @@ /** * {@inheritDoc} */ - public List<ConstructorDescriptor> getConstructorDescriptors() - { - return constructors; - } - - /** - * {@inheritDoc} - */ - public List<FieldInjector> getFieldInjectors() - { - return fields; - } - - /** - * {@inheritDoc} - */ - public Class<?> getObjectClass() - { - return filterClass; - } - - /** - * {@inheritDoc} - */ public PathValue getPathValue() { return path; @@ -177,30 +99,6 @@ /** * {@inheritDoc} */ - public MultivaluedMap<String, String> getProperties() - { - if (properties == null) - { - properties = new MultivaluedMapImpl(); - } - return properties; - } - - /** - * {@inheritDoc} - */ - public List<String> getProperty(String key) - { - if (properties != null) - { - return properties.get(key); - } - return null; - } - - /** - * {@inheritDoc} - */ public UriPattern getUriPattern() { return uriPattern; @@ -217,5 +115,4 @@ getConstructorDescriptors() + "; ").append(getFieldInjectors()).append(" ]"); return sb.toString(); } - } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JsonEntityProvider.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -169,7 +169,6 @@ { try { - JsonGeneratorImpl generator = new JsonGeneratorImpl(); JsonValue jsonValue = null; if (t instanceof JsonValue) { @@ -178,6 +177,7 @@ } else { + JsonGeneratorImpl generator = new JsonGeneratorImpl(); Types jtype = JsonUtils.getType(type); if (jtype == Types.ARRAY_BOOLEAN || jtype == Types.ARRAY_BYTE || jtype == Types.ARRAY_SHORT || jtype == Types.ARRAY_INT || jtype == Types.ARRAY_LONG || jtype == Types.ARRAY_FLOAT Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/ProviderDescriptorImpl.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -18,51 +18,25 @@ */ package org.exoplatform.services.rest.impl.provider; +import org.exoplatform.services.rest.BaseObjectModel; import org.exoplatform.services.rest.ComponentLifecycleScope; -import org.exoplatform.services.rest.ConstructorDescriptor; -import org.exoplatform.services.rest.FieldInjector; -import org.exoplatform.services.rest.impl.ConstructorDescriptorImpl; -import org.exoplatform.services.rest.impl.FieldInjectorImpl; -import org.exoplatform.services.rest.impl.MultivaluedMapImpl; import org.exoplatform.services.rest.impl.header.MediaTypeHelper; import org.exoplatform.services.rest.provider.ProviderDescriptor; import org.exoplatform.services.rest.resource.ResourceDescriptorVisitor; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; /** * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> * @version $Id: $ */ -public class ProviderDescriptorImpl implements ProviderDescriptor +public class ProviderDescriptorImpl extends BaseObjectModel implements ProviderDescriptor { - /** - * Provider class. - */ - private final Class<?> providerClass; - - /** - * Resource class constructors. - * - * @see {@link ConstructorDescriptor} - */ - private final List<ConstructorDescriptor> constructors; - - /** - * Resource class fields. - */ - private final List<FieldInjector> fields; - - /** * List of media types which this method can consume. See * {@link javax.ws.rs.Consumes} . */ @@ -74,9 +48,6 @@ */ private final List<MediaType> produces; - /** Optional data. */ - private MultivaluedMap<String, String> properties; - /** * @param providerClass provider class */ @@ -99,33 +70,7 @@ */ private ProviderDescriptorImpl(Class<?> providerClass, ComponentLifecycleScope scope) { - this.providerClass = providerClass; - - this.constructors = new ArrayList<ConstructorDescriptor>(); - this.fields = new ArrayList<FieldInjector>(); - if (scope == ComponentLifecycleScope.PER_REQUEST) - { - for (Constructor<?> constructor : providerClass.getConstructors()) - { - constructors.add(new ConstructorDescriptorImpl(providerClass, constructor)); - } - if (constructors.size() == 0) - { - String msg = "Not found accepted constructors for provider class " + providerClass.getName(); - throw new RuntimeException(msg); - } - // Sort constructors in number parameters order - if (constructors.size() > 1) - { - Collections.sort(constructors, ConstructorDescriptorImpl.CONSTRUCTOR_COMPARATOR); - } - // process field - for (java.lang.reflect.Field jfield : providerClass.getDeclaredFields()) - { - fields.add(new FieldInjectorImpl(providerClass, jfield)); - } - } - + super(providerClass, scope); this.consumes = MediaTypeHelper.createConsumesList(providerClass.getAnnotation(Consumes.class)); this.produces = MediaTypeHelper.createProducesList(providerClass.getAnnotation(Produces.class)); } @@ -149,54 +94,6 @@ /** * {@inheritDoc} */ - public List<ConstructorDescriptor> getConstructorDescriptors() - { - return constructors; - } - - /** - * {@inheritDoc} - */ - public List<FieldInjector> getFieldInjectors() - { - return fields; - } - - /** - * {@inheritDoc} - */ - public Class<?> getObjectClass() - { - return providerClass; - } - - /** - * {@inheritDoc} - */ - public MultivaluedMap<String, String> getProperties() - { - if (properties == null) - { - properties = new MultivaluedMapImpl(); - } - return properties; - } - - /** - * {@inheritDoc} - */ - public List<String> getProperty(String key) - { - if (properties != null) - { - return properties.get(key); - } - return null; - } - - /** - * {@inheritDoc} - */ public List<MediaType> produces() { return produces; @@ -214,5 +111,4 @@ return sb.toString(); } - } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/AbstractResourceDescriptorImpl.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -18,15 +18,10 @@ */ package org.exoplatform.services.rest.impl.resource; -import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.rest.BaseObjectModel; import org.exoplatform.services.rest.ComponentLifecycleScope; -import org.exoplatform.services.rest.ConstructorDescriptor; -import org.exoplatform.services.rest.FieldInjector; -import org.exoplatform.services.rest.impl.ConstructorDescriptorImpl; -import org.exoplatform.services.rest.impl.FieldInjectorImpl; -import org.exoplatform.services.rest.impl.MultivaluedMapImpl; import org.exoplatform.services.rest.impl.header.MediaTypeHelper; import org.exoplatform.services.rest.impl.method.DefaultMethodInvoker; import org.exoplatform.services.rest.impl.method.MethodInvokerFactory; @@ -46,10 +41,10 @@ import org.exoplatform.services.rest.uri.UriPattern; import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Type; +import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Collections; @@ -71,76 +66,53 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; /** * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> * @version $Id: $ */ -public class AbstractResourceDescriptorImpl implements AbstractResourceDescriptor +public class AbstractResourceDescriptorImpl extends BaseObjectModel implements AbstractResourceDescriptor { - - /** - * Logger. - */ + /** Logger. */ private static final Log LOG = ExoLogger.getLogger("exo.ws.rest.core.AbstractResourceDescriptorImpl"); - /** - * @see PathValue - */ + /** @see PathValue */ private final PathValue path; - /** - * @see UriPattern - */ + /** @see UriPattern */ private final UriPattern uriPattern; /** - * Resource class. - */ - private final Class<?> resourceClass; - - /** * Sub-resource methods. Sub-resource method has path annotation. - * + * * @see SubResourceMethodDescriptor */ private final SubResourceMethodMap subResourceMethods; /** * Sub-resource locators. Sub-resource locator has path annotation. - * + * * @see SubResourceLocatorDescriptor */ private final SubResourceLocatorMap subResourceLocators; /** * Resource methods. Resource method has not own path annotation. - * + * * @see ResourceMethodDescriptor */ private final ResourceMethodMap<ResourceMethodDescriptor> resourceMethods; - /** - * Resource class constructors. - * - * @see ConstructorDescriptor - */ - private final List<ConstructorDescriptor> constructors; - - /** - * Resource class fields. - */ - private final List<FieldInjector> fields; - - /** Optional data. */ - private MultivaluedMap<String, String> properties; - private final MethodInvokerFactory invokerFactory; + public AbstractResourceDescriptorImpl(Class<?> resourceClass, ComponentLifecycleScope scope) + { + this(resourceClass.getAnnotation(Path.class), resourceClass, scope, null); + } + /** * Constructs new instance of AbstractResourceDescriptor. - * + * * @param resourceClass resource class * @param invokerFactory invoker factory */ @@ -151,7 +123,7 @@ /** * Constructs new instance of AbstractResourceDescriptor. - * + * * @param resource resource instance * @param invokerFactory invoker factory */ @@ -163,7 +135,7 @@ /** * Constructs new instance of AbstractResourceDescriptor. - * + * * @param resourceClass resource class */ public AbstractResourceDescriptorImpl(Class<?> resourceClass) @@ -173,7 +145,7 @@ /** * Constructs new instance of AbstractResourceDescriptor. - * + * * @param resource resource instance */ public AbstractResourceDescriptorImpl(Object resource) @@ -190,6 +162,7 @@ private AbstractResourceDescriptorImpl(Path path, final Class<?> resourceClass, ComponentLifecycleScope scope, MethodInvokerFactory invokerFactory) { + super(resourceClass, scope); if (path != null) { this.path = new PathValue(path.value()); @@ -200,65 +173,7 @@ this.path = null; uriPattern = null; } - - this.resourceClass = resourceClass; - - this.constructors = new ArrayList<ConstructorDescriptor>(); - this.fields = new ArrayList<FieldInjector>(); - if (scope == ComponentLifecycleScope.PER_REQUEST) - { - for (Constructor<?> constructor : resourceClass.getConstructors()) - { - constructors.add(new ConstructorDescriptorImpl(resourceClass, constructor)); - } - if (constructors.size() == 0) - { - String msg = "Not found accepted constructors for resource class " + resourceClass.getName(); - throw new RuntimeException(msg); - } - // Sort constructors in number parameters order - if (constructors.size() > 1) - { - Collections.sort(constructors, ConstructorDescriptorImpl.CONSTRUCTOR_COMPARATOR); - } - - // process field - java.lang.reflect.Field[] jfields = - SecurityHelper.doPrivilegedAction(new PrivilegedAction<java.lang.reflect.Field[]>() - { - public java.lang.reflect.Field[] run() - { - return resourceClass.getDeclaredFields(); - } - }); - - for (java.lang.reflect.Field jfield : jfields) - { - fields.add(new FieldInjectorImpl(resourceClass, jfield)); - } - Class<?> sc = resourceClass.getSuperclass(); - while (sc != Object.class) - { - for (java.lang.reflect.Field jfield : sc.getDeclaredFields()) - { - int modif = jfield.getModifiers(); - // TODO process fields with package visibility. - if (Modifier.isPublic(modif) || Modifier.isProtected(modif)) - { - FieldInjector inj = new FieldInjectorImpl(resourceClass, jfield); - // Skip not annotated field. They will be not injected from container. - if (inj.getAnnotation() != null) - { - fields.add(new FieldInjectorImpl(resourceClass, jfield)); - } - } - } - sc = sc.getSuperclass(); - } - } - this.invokerFactory = invokerFactory; - this.resourceMethods = new ResourceMethodMap<ResourceMethodDescriptor>(); this.subResourceMethods = new SubResourceMethodMap(); this.subResourceLocators = new SubResourceLocatorMap(); @@ -268,30 +183,6 @@ /** * {@inheritDoc} */ - public MultivaluedMap<String, String> getProperties() - { - if (properties == null) - { - properties = new MultivaluedMapImpl(); - } - return properties; - } - - /** - * {@inheritDoc} - */ - public List<String> getProperty(String key) - { - if (properties != null) - { - return properties.get(key); - } - return null; - } - - /** - * {@inheritDoc} - */ public void accept(ResourceDescriptorVisitor visitor) { visitor.visitAbstractResourceDescriptor(this); @@ -300,30 +191,6 @@ /** * {@inheritDoc} */ - public List<ConstructorDescriptor> getConstructorDescriptors() - { - return constructors; - } - - /** - * {@inheritDoc} - */ - public List<FieldInjector> getFieldInjectors() - { - return fields; - } - - /** - * {@inheritDoc} - */ - public Class<?> getObjectClass() - { - return resourceClass; - } - - /** - * {@inheritDoc} - */ public PathValue getPathValue() { return path; @@ -377,15 +244,13 @@ { final Class<?> resourceClass = getObjectClass(); - Method[] methods = SecurityHelper.doPrivilegedAction(new PrivilegedAction<Method[]>() - { + Method[] methods = AccessController.doPrivileged(new PrivilegedAction<Method[]>() { public Method[] run() { return resourceClass.getDeclaredMethods(); } }); - for (Method method : methods) { for (Annotation a : method.getAnnotations()) @@ -437,8 +302,8 @@ new ResourceMethodDescriptorImpl(method, httpMethod.value(), params, this, consumes, produces, getMethodInvoker()); ResourceMethodDescriptor exist = - findMethodResourceMediaType(resourceMethods.getList(httpMethod.value()), res.consumes(), res - .produces()); + findMethodResourceMediaType(resourceMethods.getList(httpMethod.value()), res.consumes(), + res.produces()); if (exist == null) { resourceMethods.add(httpMethod.value(), res); @@ -501,15 +366,6 @@ } } } - int resMethodCount = resourceMethods.size() + subResourceMethods.size() + subResourceLocators.size(); - if (resMethodCount == 0) - { - String msg = - "Not found any resource methods, sub-resource methods" + " or sub-resource locators in " - + resourceClass.getName(); - throw new RuntimeException(msg); - } - // End method processing. // Start HEAD and OPTIONS resolving, see JAX-RS (JSR-311) specification // section 3.3.5 @@ -523,7 +379,7 @@ /** * Create list of {@link MethodParameter} . - * + * * @param resourceClass class * @param method See {@link Method} * @return list of {@link MethodParameter} @@ -679,7 +535,7 @@ * Get all method with at least one annotation which has annotation * <i>annotation</i>. It is useful for annotation {@link javax.ws.rs.GET}, * etc. All HTTP method annotations has annotation {@link HttpMethod}. - * + * * @param <T> annotation type * @param m method * @param annotation annotation class @@ -701,19 +557,18 @@ /** * Tries to get JAX-RS annotation on method from the root resource class's * superclass or implemented interfaces. - * + * * @param <T> annotation type * @param method method for discovering * @param resourceClass class that contains discovered method * @param annotationClass annotation type what we are looking for * @param metaAnnotation false if annotation should be on method and true in - * method should contain annotations that has supplied annotation + * method should contain annotations that has supplied annotation * @return annotation from class or its ancestor or null if nothing found */ protected <T extends Annotation> T getMethodAnnotation(Method method, Class<?> resourceClass, Class<T> annotationClass, boolean metaAnnotation) { - T annotation = null; if (metaAnnotation) { @@ -726,14 +581,19 @@ if (annotation == null) { - Method inhMethod = null; - - try + Class<?> superclass = resourceClass.getSuperclass(); + if (superclass != null) { - inhMethod = resourceClass.getSuperclass().getMethod(method.getName(), method.getParameterTypes()); + try + { + inhMethod = superclass.getMethod(method.getName(), method.getParameterTypes()); + } + catch (NoSuchMethodException e) + { + } } - catch (NoSuchMethodException e) + if (inhMethod == null) { for (Class<?> intf : resourceClass.getInterfaces()) { @@ -758,7 +618,6 @@ } } } - if (inhMethod != null) { if (metaAnnotation) @@ -778,7 +637,7 @@ /** * Check is collection of {@link ResourceMethodDescriptor} already contains * ResourceMethodDescriptor with the same media types. - * + * * @param rmds {@link Set} of {@link ResourceMethodDescriptor} * @param consumes resource method consumed media type * @param produces resource method produced media type @@ -856,8 +715,8 @@ public String toString() { StringBuffer sb = new StringBuffer("[ AbstractResourceDescriptorImpl: "); - sb.append("path: " + getPathValue()).append("; isRootResource: " + isRootResource()).append( - "; class: " + getObjectClass()).append(" ]"); + sb.append("path: " + getPathValue()).append("; isRootResource: " + isRootResource()) + .append("; class: " + getObjectClass()).append(" ]"); return sb.toString(); } Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorValidator.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -112,6 +112,16 @@ checkObjectModel(ard); + int resMethodCount = + ard.getResourceMethods().size() + ard.getSubResourceMethods().size() + ard.getSubResourceLocators().size(); + if (resMethodCount == 0) + { + String msg = + "Not found any resource methods, sub-resource methods" + " or sub-resource locators in " + + ard.getObjectClass().getName(); + throw new RuntimeException(msg); + } + // check all resource methods for (List<ResourceMethodDescriptor> l : ard.getResourceMethods().values()) { @@ -167,8 +177,8 @@ /** * Validate SubResourceMethodDescriptor. SubResourceMethodDescriptor is a - * method which annotated with path annotation and has HTTP method annotation. - * This method can process the request directly. {@inheritDoc} + * method which annotated with path annotation and has HTTP method + * annotation. This method can process the request directly. {@inheritDoc} */ public void visitSubResourceMethodDescriptor(SubResourceMethodDescriptor srmd) { @@ -184,8 +194,8 @@ /** * Check method parameter for valid annotations. NOTE If a any method - * parameter is annotated with {@link FormParam} then type of entity parameter - * must be MultivalueMap&lt;String, String&gt;. + * parameter is annotated with {@link FormParam} then type of entity + * parameter must be MultivalueMap&lt;String, String&gt;. * * @param rmd See {@link ResourceMethodDescriptor} */ @@ -261,7 +271,7 @@ * @param type generic type * @see #checkGenericType(Type) */ - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private static void checkFormParam(Class clazz, Type type) { if (MultivaluedMap.class != clazz || !checkGenericType(type)) Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/wadl/WadlProcessor.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.rest.wadl; +import org.exoplatform.services.rest.ComponentLifecycleScope; import org.exoplatform.services.rest.impl.resource.AbstractResourceDescriptorImpl; import org.exoplatform.services.rest.method.MethodParameter; import org.exoplatform.services.rest.resource.AbstractResourceDescriptor; @@ -138,7 +139,7 @@ * Process sub-resource methods. * * @param wadlResource see - * {@link org.exoplatform.services.rest.wadl.research.Resource} + * {@link org.exoplatform.services.rest.wadl.research.Resource} * @param resourceDescriptor see {@link AbstractResourceDescriptor} */ private void processSubResourceMethods(org.exoplatform.services.rest.wadl.research.Resource wadlResource, @@ -207,7 +208,7 @@ * Process sub-resource locators. * * @param wadlResource see - * {@link org.exoplatform.services.rest.wadl.research.Resource} + * {@link org.exoplatform.services.rest.wadl.research.Resource} * @param resourceDescriptor see {@link AbstractResourceDescriptor} */ private void processSubResourceLocators(org.exoplatform.services.rest.wadl.research.Resource wadlResource, @@ -215,8 +216,11 @@ { for (SubResourceLocatorDescriptor srld : resourceDescriptor.getSubResourceLocators().values()) { + // Specify SINGLETON life-cycle to avoid processing constructors and fields. + // We are not interested about it since creation instance of resource is + // responsibility of sub-resource locator. AbstractResourceDescriptor subResourceDescriptor = - new AbstractResourceDescriptorImpl(srld.getMethod().getReturnType()); + new AbstractResourceDescriptorImpl(srld.getMethod().getReturnType(), ComponentLifecycleScope.SINGLETON); org.exoplatform.services.rest.wadl.research.Resource wadlSubResource = processResource(subResourceDescriptor); wadlSubResource.setPath(srld.getPathValue().getPath()); wadlResource.getMethodOrResource().add(wadlSubResource); Modified: ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorTest.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorTest.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/impl/resource/ResourceDescriptorTest.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -64,18 +64,19 @@ public class ResourceDescriptorTest extends BaseTest { - public void testFailedCreation1() - { - try + /* + public void testFailedCreation1() { - new AbstractResourceDescriptorImpl(Resource1.class); - fail("Should be failed here, resource does not contains JAX-RS methods"); + try + { + new AbstractResourceDescriptorImpl(Resource1.class).accept(ResourceDescriptorValidator.getInstance()); + fail("Should be failed here, resource does not contains JAX-RS methods"); + } + catch (RuntimeException e) + { + } } - catch (RuntimeException e) - { - } - } - + */ public void testFailedCreation2() { try Modified: ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/wadl/WadlProcessorTest.java =================================================================== --- ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/wadl/WadlProcessorTest.java 2011-01-17 10:31:47 UTC (rev 3813) +++ ws/trunk/exo.ws.rest.core/src/test/java/org/exoplatform/services/rest/wadl/WadlProcessorTest.java 2011-01-17 11:03:16 UTC (rev 3814) @@ -106,15 +106,20 @@ @Path("sub/{x}") public Resource2 m7() { - return new Resource2(); + return new Resource2Impl(); } } - public static class Resource2 + public static interface Resource2 { @GET @Produces("text/plain") + public String m0(@PathParam("x") String x); + } + + public static class Resource2Impl implements Resource2 + { public String m0(@PathParam("x") String x) { return x;