Author: alexsmirnov Date: 2010-11-18 19:24:09 -0500 (Thu, 18 Nov 2010) New Revision: 20109 Removed: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryResource.java Modified: branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceKey.java branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceLibrary.java branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/StaticResourceLibrary.java branches/RF-8742-1/core/impl/src/test/java/org/richfaces/resource/DynamicResourceLibrary.java branches/RF-8742-1/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryScript.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/javascript/LibraryFunctionImplementation.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/AjaxOnlyScript.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientOnlyScript.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ComponentValidatorScript.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/LibraryScriptFunction.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/NullConverterScript.java branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptRenderer.java branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/component/Script.java branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java Log: CODING IN PROGRESS - issue RF-9799: CSV code review https://jira.jboss.org/browse/RF-9799 Modified: branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceKey.java =================================================================== --- branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceKey.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceKey.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -28,21 +28,18 @@ * @author Nick Belaevski * */ -public class ResourceKey { +public final class ResourceKey { public static final Function<String, ResourceKey> FACTORY = new Function<String, ResourceKey>() { public ResourceKey apply(String from) { - return new ResourceKey(from); + return create(from); }; }; - private String resourceName; + private final String resourceName; - private String libraryName; + private final String libraryName; - public ResourceKey(String resourceQualifier) { - this(extractResourceName(resourceQualifier), extractLibraryName(resourceQualifier)); - } public ResourceKey(String resourceName, String libraryName) { super(); @@ -50,6 +47,14 @@ this.libraryName = libraryName; } + public static ResourceKey create(String resourceQualifier){ + return new ResourceKey(extractResourceName(resourceQualifier), extractLibraryName(resourceQualifier)); + } + + public static ResourceKey create(String resourceName, String libraryName){ + return new ResourceKey(resourceName,libraryName); + } + private static String extractResourceName(String resourceQualifier) { int idx = resourceQualifier.lastIndexOf(':'); if (idx < 0) { @@ -76,14 +81,7 @@ return libraryName; } - public void setResourceName(String resourceName) { - this.resourceName = resourceName; - } - public void setLibraryName(String libraryName) { - this.libraryName = libraryName; - } - @Override public int hashCode() { final int prime = 31; Modified: branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceLibrary.java =================================================================== --- branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceLibrary.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/core/api/src/main/java/org/richfaces/resource/ResourceLibrary.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -29,6 +29,6 @@ */ public interface ResourceLibrary { - public ResourceKey[] getResources(FacesContext context); + public Iterable<ResourceKey> getResources(FacesContext context); } Modified: branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java =================================================================== --- branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -114,7 +114,7 @@ } return new ExternalStaticResourceFactory( - new ResourceKey(resourceQualifier), resourceLocation, skinDependent); + ResourceKey.create(resourceQualifier), resourceLocation, skinDependent); } }; @@ -125,7 +125,7 @@ Map<String, String> params = Util.parseResourceParameters(resourceLocation); String resourceQualifier = extractParametersFromResourceName(resourceLocation); - return new MappedResourceData(new ResourceKey(resourceQualifier), params); + return new MappedResourceData(ResourceKey.create(resourceQualifier), params); } }; @@ -179,7 +179,7 @@ Map<ResourceKey, V> result = Maps.newHashMap(); for (Entry<String, String> entry : PropertiesUtil.loadProperties(mappingFileName).entrySet()) { - result.put(new ResourceKey(entry.getKey()), producer.apply(entry)); + result.put(ResourceKey.create(entry.getKey()), producer.apply(entry)); } result = Collections.unmodifiableMap(result); Modified: branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/StaticResourceLibrary.java =================================================================== --- branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/StaticResourceLibrary.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/core/impl/src/main/java/org/richfaces/resource/StaticResourceLibrary.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -23,20 +23,22 @@ import javax.faces.context.FacesContext; +import com.google.common.collect.ImmutableList; + /** * @author Nick Belaevski * */ class StaticResourceLibrary implements ResourceLibrary { - private ResourceKey[] keys; + private final ImmutableList<ResourceKey> keys; public StaticResourceLibrary(ResourceKey[] keys) { super(); - this.keys = keys; + this.keys = ImmutableList.copyOf(keys); } - public ResourceKey[] getResources(FacesContext context) { + public Iterable<ResourceKey> getResources(FacesContext context) { return keys; } Modified: branches/RF-8742-1/core/impl/src/test/java/org/richfaces/resource/DynamicResourceLibrary.java =================================================================== --- branches/RF-8742-1/core/impl/src/test/java/org/richfaces/resource/DynamicResourceLibrary.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/core/impl/src/test/java/org/richfaces/resource/DynamicResourceLibrary.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -23,17 +23,17 @@ import javax.faces.context.FacesContext; +import com.google.common.collect.ImmutableList; + /** * @author Nick Belaevski * */ public class DynamicResourceLibrary implements ResourceLibrary { - private ResourceKey[] keys = new ResourceKey[] { - new ResourceKey("skinning_classes.ecss"), new ResourceKey("jquery.js", null) - }; + private ImmutableList<ResourceKey> keys = ImmutableList.of(ResourceKey.create("skinning_classes.ecss"), ResourceKey.create("jquery.js", null)); - public ResourceKey[] getResources(FacesContext context) { + public Iterable<ResourceKey> getResources(FacesContext context) { return keys; } Modified: branches/RF-8742-1/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java =================================================================== --- branches/RF-8742-1/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/common/ui/src/main/java/org/richfaces/resource/AjaxResourceLibrary.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -27,6 +27,7 @@ import org.richfaces.application.CommonComponentsConfiguration; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; /** @@ -35,18 +36,18 @@ */ public class AjaxResourceLibrary implements ResourceLibrary { - private ResourceKey[] ajaxResourceKeys = new ResourceKey[] { - new ResourceKey("jsf.js", "javax.faces"), new ResourceKey("jquery.js", null), new ResourceKey("richfaces.js", null) - }; + private static final ImmutableList<ResourceKey> AJAX_ONLY_KEYS = ImmutableList.of( + ResourceKey.create("jsf.js", "javax.faces"), ResourceKey.create("jquery.js", null), ResourceKey.create("richfaces.js", null) + ); - private ResourceKey[] ajaxQueueResourceKeys = ObjectArrays.concat(ajaxResourceKeys, new ResourceKey("richfaces-queue.js", null)); + private static final ImmutableList<ResourceKey> AJAX_WITH_QUEUE_KEYS = ImmutableList.<ResourceKey>builder().addAll(AJAX_ONLY_KEYS).add(ResourceKey.create("richfaces-queue.js", null)).build(); - public ResourceKey[] getResources(FacesContext context) { + public Iterable<ResourceKey> getResources(FacesContext context) { if (getBooleanConfigurationValue(context, CommonComponentsConfiguration.Items.queueEnabled)) { - return ajaxQueueResourceKeys; + return AJAX_WITH_QUEUE_KEYS; } - return ajaxResourceKeys; + return AJAX_ONLY_KEYS; } } Deleted: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryResource.java =================================================================== --- branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryResource.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryResource.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -1,103 +0,0 @@ -package org.richfaces.javascript; - -import java.util.LinkedHashSet; - - -import com.google.common.collect.Sets; - -/** - * This class represent information about external JavaScript library as JSF resource - * - * @author asmirnov - * - */ -public class LibraryResource { - - private final String library; - - private final String resourceName; - - /** - * @param library - * @param resourceName - */ - public LibraryResource(String library, String resourceName) { - this.library = library; - this.resourceName = resourceName; - } - - /** - * @return the library - */ - public String getLibrary() { - return library; - } - - /** - * @return the resourceName - */ - public String getResourceName() { - return resourceName; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((library == null) ? 0 : library.hashCode()); - result = prime * result + ((resourceName == null) ? 0 : resourceName.hashCode()); - return result; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - LibraryResource other = (LibraryResource) obj; - if (library == null) { - if (other.library != null) { - return false; - } - } else if (!library.equals(other.library)) { - return false; - } - if (resourceName == null) { - if (other.resourceName != null) { - return false; - } - } else if (!resourceName.equals(other.resourceName)) { - return false; - } - return true; - } - - @Override - public String toString() { - return getLibrary()+':'+getResourceName(); - } - - public static Iterable<LibraryResource> of(Iterable<LibraryScriptString> scripts){ - LinkedHashSet<LibraryResource> resources = Sets.newLinkedHashSet(); - for (LibraryScriptString scriptString : scripts) { - resources.add(scriptString.getResource()); - } - return resources; - } -} \ No newline at end of file Modified: branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryScript.java =================================================================== --- branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryScript.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/api/src/main/java/org/richfaces/javascript/LibraryScript.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -23,6 +23,8 @@ package org.richfaces.javascript; +import org.richfaces.resource.ResourceKey; + /** * <p class="changed_added_4_0"> * This class contains information about JavaScript associated with JSF object ( converter or validator ) @@ -33,6 +35,6 @@ */ public interface LibraryScript { - LibraryResource getResource(); + ResourceKey getResource(); } Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/javascript/LibraryFunctionImplementation.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/javascript/LibraryFunctionImplementation.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/javascript/LibraryFunctionImplementation.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -1,21 +1,23 @@ package org.richfaces.javascript; +import org.richfaces.resource.ResourceKey; + final class LibraryFunctionImplementation implements LibraryFunction { - private final LibraryResource library; + private final ResourceKey library; private final String functionName; - LibraryFunctionImplementation(LibraryResource library, String functionName) { + LibraryFunctionImplementation(ResourceKey library, String functionName) { this.library = library; this.functionName = functionName; } LibraryFunctionImplementation(String library, String resource, String functionName) { - this.library = new LibraryResource(library, resource); + this.library = new ResourceKey(library, resource); this.functionName = functionName; } - public LibraryResource getResource() { + public ResourceKey getResource() { return library; } Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/AjaxOnlyScript.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/AjaxOnlyScript.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/AjaxOnlyScript.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -1,9 +1,8 @@ package org.richfaces.renderkit.html; -import java.util.Collection; import java.util.Collections; -import org.richfaces.javascript.LibraryResource; +import org.richfaces.resource.ResourceKey; public class AjaxOnlyScript extends ValidatorScriptBase { @@ -16,7 +15,7 @@ } - public Collection<LibraryResource> getResources() { + public Iterable<ResourceKey> getResources() { return Collections.emptySet(); } Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientOnlyScript.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientOnlyScript.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientOnlyScript.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.LinkedHashSet; -import org.richfaces.javascript.LibraryResource; import org.richfaces.javascript.LibraryScriptString; +import org.richfaces.resource.ResourceKey; import com.google.common.collect.Sets; @@ -25,8 +25,9 @@ } - public Collection<LibraryResource> getResources() { - LinkedHashSet<LibraryResource> resources = Sets.newLinkedHashSet(); + public Iterable<ResourceKey> getResources() { + // TODO - make immutable. + LinkedHashSet<ResourceKey> resources = Sets.newLinkedHashSet(); resources.add(converter.getResource()); for (LibraryScriptString scriptString : validators) { resources.add(scriptString.getResource()); Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ComponentValidatorScript.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ComponentValidatorScript.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ComponentValidatorScript.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -1,15 +1,13 @@ package org.richfaces.renderkit.html; -import java.util.Collection; - import org.ajax4jsf.javascript.ScriptString; -import org.richfaces.javascript.LibraryResource; +import org.richfaces.resource.ResourceKey; public interface ComponentValidatorScript extends ScriptString { String getName(); - Collection<LibraryResource> getResources(); + Iterable<ResourceKey> getResources(); /** * <p class="changed_added_4_0">Creates JavasCript that calls validator function.</p> Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/LibraryScriptFunction.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/LibraryScriptFunction.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/LibraryScriptFunction.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -25,8 +25,8 @@ import org.ajax4jsf.javascript.JSFunction; import org.richfaces.javascript.LibraryFunction; -import org.richfaces.javascript.LibraryResource; import org.richfaces.javascript.LibraryScriptString; +import org.richfaces.resource.ResourceKey; /** * <p class="changed_added_4_0"> @@ -38,13 +38,13 @@ */ public class LibraryScriptFunction extends JSFunction implements LibraryScriptString { - private final LibraryResource resource; - private String name; + private final ResourceKey resource; + private final String name; public LibraryScriptFunction(LibraryFunction libraryScript, Object... parameters) { super(libraryScript.getName(), parameters); this.resource = libraryScript.getResource(); - name = libraryScript.getName(); + this.name = libraryScript.getName(); } public String getName() { @@ -56,7 +56,7 @@ * * @see org.richfaces.renderkit.html.LibraryScriptString#getResource() */ - public LibraryResource getResource() { + public ResourceKey getResource() { return resource; } Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/NullConverterScript.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/NullConverterScript.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/NullConverterScript.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -4,8 +4,8 @@ package org.richfaces.renderkit.html; import org.ajax4jsf.javascript.JSLiteral; -import org.richfaces.javascript.LibraryResource; import org.richfaces.javascript.LibraryScriptString; +import org.richfaces.resource.ResourceKey; /** * This class represents "dummy" converter call ( just refference to "value" variable ) @@ -30,7 +30,7 @@ * * @see org.richfaces.renderkit.html.LibraryScriptString#getResource() */ - public LibraryResource getResource() { + public ResourceKey getResource() { return null; } Modified: branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptRenderer.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptRenderer.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ValidatorScriptRenderer.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -16,8 +16,9 @@ import javax.faces.render.Renderer; import org.richfaces.component.UIValidatorScript; -import org.richfaces.javascript.LibraryResource; +import org.richfaces.resource.ResourceKey; +import com.google.common.collect.Iterables; import com.google.common.collect.Sets; /** @@ -38,12 +39,12 @@ Collection<ComponentValidatorScript> scripts = validatorScript.getScripts(); // flatten all dependent resources. - LinkedHashSet<LibraryResource> resources = Sets.newLinkedHashSet(); + LinkedHashSet<ResourceKey> resources = Sets.newLinkedHashSet(); for (ComponentValidatorScript script : scripts) { - resources.addAll(script.getResources()); + Iterables.addAll(resources, script.getResources()); } // render dependencies - for (LibraryResource resource : resources) { + for (ResourceKey resource : resources) { encodeResource(context, resource); } ResponseWriter responseWriter = context.getResponseWriter(); @@ -56,9 +57,9 @@ responseWriter.endElement(SCRIPT); } - private void encodeResource(FacesContext context, LibraryResource resource) throws IOException { + private void encodeResource(FacesContext context, ResourceKey resource) throws IOException { ResourceHandler resourceHandler = context.getApplication().getResourceHandler(); - Resource jsfResource = resourceHandler.createResource(resource.getResourceName(), resource.getLibrary()); + Resource jsfResource = resourceHandler.createResource(resource.getResourceName(), resource.getLibraryName()); if (null != jsfResource) { ResponseWriter responseWriter = context.getResponseWriter(); responseWriter.startElement(SCRIPT, null); Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/component/Script.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/component/Script.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/component/Script.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -2,10 +2,9 @@ import java.io.IOException; -import org.richfaces.validator.LibraryResource; -import org.richfaces.validator.LibraryScriptString; +import org.richfaces.resource.ResourceKey; -final class Script implements LibraryScriptString { +final class Script implements org.richfaces.javascript.LibraryScriptString { private final String name; Script(String name) { @@ -28,7 +27,7 @@ } } - public LibraryResource getResource() { + public ResourceKey getResource() { return UIValidatorScriptCollectionTest.FOO_RESOURCE; } Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java 2010-11-18 23:14:43 UTC (rev 20108) +++ branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetComponentScriptTest.java 2010-11-19 00:24:09 UTC (rev 20109) @@ -31,6 +31,7 @@ import org.richfaces.javascript.LibraryResource; import org.richfaces.javascript.LibraryScriptString; import org.richfaces.javascript.ScriptNotFoundException; +import org.richfaces.resource.ResourceKey; import org.richfaces.validator.ConverterDescriptor; import org.richfaces.validator.FacesObjectDescriptor; import org.richfaces.validator.ValidatorDescriptor; @@ -219,7 +220,7 @@ return name; } - public LibraryResource getResource() { + public ResourceKey getResource() { return CLIENT_VALIDATOR_LIBRARY; } };