http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/CoreObjectBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/CoreObjectBuilder.java b/juneau-core/src/main/java/org/apache/juneau/CoreObjectBuilder.java index 6bda4e1..34f3590 100644 --- a/juneau-core/src/main/java/org/apache/juneau/CoreObjectBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/CoreObjectBuilder.java @@ -99,7 +99,7 @@ public abstract class CoreObjectBuilder { /** * Adds multiple configuration properties on this object. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling {@link PropertyStore#addProperties(Map)}. @@ -117,7 +117,7 @@ public abstract class CoreObjectBuilder { /** * Sets multiple configuration properties on this object. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling {@link PropertyStore#setProperties(Map)}. @@ -135,7 +135,7 @@ public abstract class CoreObjectBuilder { /** * Adds a value to a SET property. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>PropertyStore.addToProperty(name, value);</code>. @@ -153,7 +153,7 @@ public abstract class CoreObjectBuilder { /** * Adds or overwrites a value to a MAP property. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>PropertyStore.putToProperty(name, key, value);</code>. @@ -172,7 +172,7 @@ public abstract class CoreObjectBuilder { /** * Adds or overwrites a value to a MAP property. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>PropertyStore.putToProperty(name, value);</code>. @@ -190,7 +190,7 @@ public abstract class CoreObjectBuilder { /** * Removes a value from a SET property. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>PropertyStore.removeFromProperty(name, value);</code>. @@ -220,7 +220,7 @@ public abstract class CoreObjectBuilder { * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method. * <p> * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireDefaultConstructor</jsf>, value)</code>. @@ -248,7 +248,7 @@ public abstract class CoreObjectBuilder { * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method. * <p> * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSerializable</jsf>, value)</code>. @@ -274,7 +274,7 @@ public abstract class CoreObjectBuilder { * <p> * If <jk>true</jk>, only getters that have equivalent setters will be considered as properties on a bean. * Otherwise, they will be ignored. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSettersForGetters</jsf>, value)</code>. @@ -302,7 +302,7 @@ public abstract class CoreObjectBuilder { * Otherwise, the bean will be serialized as a string using the {@link Object#toString()} method. * <p> * The {@link Bean @Bean} annotation can be used on a class to override this setting when <jk>true</jk>. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beansRequireSomeProperties</jsf>, value)</code>. @@ -332,7 +332,7 @@ public abstract class CoreObjectBuilder { * Otherwise, it returns <jk>null</jk>. * <p> * Disabled by default because it introduces a slight performance penalty. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanMapPutReturnsOldValue</jsf>, value)</code>. @@ -359,7 +359,7 @@ public abstract class CoreObjectBuilder { * Constructors not meeting this minimum visibility will be ignored. * For example, if the visibility is <code>PUBLIC</code> and the constructor is <jk>protected</jk>, then * the constructor will be ignored. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanConstructorVisibility</jsf>, value)</code>. @@ -386,7 +386,7 @@ public abstract class CoreObjectBuilder { * Classes are not considered beans unless they meet the minimum visibility requirements. * For example, if the visibility is <code>PUBLIC</code> and the bean class is <jk>protected</jk>, then * the class will not be interpreted as a bean class. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanClassVisibility</jsf>, value)</code>. @@ -413,7 +413,7 @@ public abstract class CoreObjectBuilder { * Fields are not considered bean properties unless they meet the minimum visibility requirements. * For example, if the visibility is <code>PUBLIC</code> and the bean field is <jk>protected</jk>, then * the field will not be interpreted as a bean property. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanFieldVisibility</jsf>, value)</code>. @@ -441,7 +441,7 @@ public abstract class CoreObjectBuilder { * Methods are not considered bean getters/setters unless they meet the minimum visibility requirements. * For example, if the visibility is <code>PUBLIC</code> and the bean method is <jk>protected</jk>, then * the method will not be interpreted as a bean getter or setter. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_methodVisibility</jsf>, value)</code>. @@ -467,8 +467,8 @@ public abstract class CoreObjectBuilder { * </ul> * <p> * Using the built-in Java bean introspector will not pick up fields or non-standard getters/setters. - * <p> - * <h5 class='section'>Notes:</h5> + * + * <h5 class 'section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_useJavaBeanIntrospector</jsf>, value)</code>. * <li>Most {@link Bean @Bean} annotations will be ignored if you enable this setting. @@ -494,7 +494,7 @@ public abstract class CoreObjectBuilder { * <p> * If <jk>true</jk>, then interfaces will be instantiated as proxy classes through the use of an * {@link InvocationHandler} if there is no other way of instantiating them. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_useInterfaceProxies</jsf>, value)</code>. @@ -520,7 +520,7 @@ public abstract class CoreObjectBuilder { * <p> * If <jk>true</jk>, trying to set a value on a non-existent bean property will silently be ignored. * Otherwise, a {@code BeanRuntimeException} is thrown. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreUnknownBeanProperties</jsf>, value)</code>. @@ -546,7 +546,7 @@ public abstract class CoreObjectBuilder { * <p> * If <jk>true</jk>, trying to set a <jk>null</jk> value on a non-existent bean property will silently be ignored. * Otherwise, a {@code BeanRuntimeException} is thrown. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreUnknownNullBeanProperties</jsf>, value)</code>. @@ -572,7 +572,7 @@ public abstract class CoreObjectBuilder { * <p> * If <jk>true</jk>, trying to set a value on a bean property without a setter will silently be ignored. * Otherwise, a {@code BeanRuntimeException} is thrown. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignorePropertiesWithoutSetters</jsf>, value)</code>. @@ -598,7 +598,7 @@ public abstract class CoreObjectBuilder { * <p> * If <jk>true</jk>, errors thrown when calling bean getter methods will silently be ignored. * Otherwise, a {@code BeanRuntimeException} is thrown. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreInvocationExceptionsOnGetters</jsf>, value)</code>. @@ -624,7 +624,7 @@ public abstract class CoreObjectBuilder { * <p> * If <jk>true</jk>, errors thrown when calling bean setter methods will silently be ignored. * Otherwise, a {@code BeanRuntimeException} is thrown. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_ignoreInvocationExceptionsOnSetters</jsf>, value)</code>. @@ -653,7 +653,7 @@ public abstract class CoreObjectBuilder { * JVM vendor. * On IBM JVMs, the bean properties are ordered based on their ordering in the Java file. * On Oracle JVMs, the bean properties are not ordered (which follows the offical JVM specs). - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_sortProperties</jsf>, value)</code>. @@ -695,7 +695,7 @@ public abstract class CoreObjectBuilder { * Any classes within these packages will be serialized to strings using {@link Object#toString()}. * <p> * Note that you can specify prefix patterns to include all subpackages. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_notBeanPackages</jsf>, values)</code>. @@ -724,7 +724,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Add to packages whose classes should not be considered beans. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code> @@ -754,7 +754,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Remove from packages whose classes should not be considered beans. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_notBeanPackages</jsf>, values)</code> @@ -796,7 +796,7 @@ public abstract class CoreObjectBuilder { * <p> * Not-bean classes are typically converted to <code>Strings</code> during serialization even if they * appear to be bean-like. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_notBeanClasses</jsf>, values)</code>. @@ -825,7 +825,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Add to classes that should not be considered beans. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code> @@ -857,7 +857,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Remove from classes that should not be considered beans. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_notBeanClasses</jsf>, values)</code> @@ -903,14 +903,16 @@ public abstract class CoreObjectBuilder { * <p> * There are two category of classes that can be passed in through this method: * <ul class='spaced-list'> - * <li>Subclasses of {@link BeanFilterBuilder}. + * <li> + * Subclasses of {@link BeanFilterBuilder}. * These must have a public no-arg constructor. - * <li>Bean interface classes. + * <li> + * Bean interface classes. * A shortcut for defining a {@link InterfaceBeanFilterBuilder}. * Any subclasses of an interface class will only have properties defined on the interface. * All other bean properties will be ignored. * </ul> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanFilters</jsf>, values)</code>. @@ -939,7 +941,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Add to bean filters. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_beanFilters</jsf>, values)</code> @@ -971,7 +973,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Remove from bean filters. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_beanFilters</jsf>, values)</code> @@ -1016,7 +1018,7 @@ public abstract class CoreObjectBuilder { * <li>Subclasses of {@link PojoSwap}. * <li>Surrogate classes. A shortcut for defining a {@link SurrogateSwap}. * </ul> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_pojoSwaps</jsf>, values)</code>. @@ -1045,7 +1047,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Add to POJO swaps. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code> @@ -1077,7 +1079,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Remove from POJO swaps. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_pojoSwaps</jsf>, values)</code> @@ -1120,7 +1122,7 @@ public abstract class CoreObjectBuilder { * For interfaces and abstract classes this method can be used to specify an implementation * class for the interface/abstract class so that instances of the implementation * class are used when instantiated (e.g. during a parse). - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_implClasses</jsf>, values)</code>. @@ -1136,7 +1138,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Implementation classes for interfaces and abstract classes. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_implClasses</jsf>, interfaceClass, implClass)</code> @@ -1172,7 +1174,7 @@ public abstract class CoreObjectBuilder { * <p> * For example, <code>{Bean1:<js>"foo,bar"</js>}</code> means only serialize the <code>foo</code> and <code>bar</code> * properties on the specified bean. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_includeProperties</jsf>, values)</code>. @@ -1188,7 +1190,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Explicitly specify visible bean properties. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_includeProperties</jsf>, beanClassName, properties)</code> @@ -1207,7 +1209,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Explicitly specify visible bean properties. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_includeProperties</jsf>, beanClass.getName(), properties)</code> @@ -1242,7 +1244,7 @@ public abstract class CoreObjectBuilder { * <p> * For example, <code>{Bean1:<js>"foo,bar"</js>}</code> means don't serialize the <code>foo</code> and <code>bar</code> * properties on the specified bean. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_excludeProperties</jsf>, values)</code>. @@ -1258,7 +1260,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Exclude specified properties from beans. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_excludeProperties</jsf>, beanClassName, properties)</code> @@ -1277,7 +1279,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Exclude specified properties from beans. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>putToProperty(<jsf>BEAN_excludeProperties</jsf>, beanClass.getName(), properties)</code> @@ -1312,7 +1314,7 @@ public abstract class CoreObjectBuilder { * <li>Any subclass of {@link BeanDictionaryMap} containing a mapping of type names to classes without type name * annotations. * </ul> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanDictionary</jsf>, values)</code>. @@ -1341,7 +1343,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Add to bean dictionary. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>addToProperty(<jsf>BEAN_beanDictionary</jsf>, values)</code> @@ -1373,7 +1375,7 @@ public abstract class CoreObjectBuilder { /** * <b>Configuration property:</b> Remove from bean dictionary. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>removeFromProperty(<jsf>BEAN_beanDictionary</jsf>, values)</code> @@ -1412,7 +1414,7 @@ public abstract class CoreObjectBuilder { * <li><b>Default:</b> <js>"_type"</js> * <li><b>Session-overridable:</b> <jk>false</jk> * </ul> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_beanTypePropertyName</jsf>, value)</code>. @@ -1437,7 +1439,7 @@ public abstract class CoreObjectBuilder { * </ul> * <p> * Used in the in the {@link BeanSession#convertToType(Object, Class)} method. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_defaultParser</jsf>, value)</code>. @@ -1460,7 +1462,7 @@ public abstract class CoreObjectBuilder { * <li><b>Default:</b> <code>Locale.getDefault()</code> * <li><b>Session-overridable:</b> <jk>true</jk> * </ul> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_locale</jsf>, value)</code>. @@ -1483,7 +1485,7 @@ public abstract class CoreObjectBuilder { * <li><b>Default:</b> <jk>null</jk> * <li><b>Session-overridable:</b> <jk>true</jk> * </ul> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_timeZone</jsf>, value)</code>. @@ -1508,7 +1510,7 @@ public abstract class CoreObjectBuilder { * </ul> * <p> * Specifies a default media type value for serializer and parser sessions. - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_mediaType</jsf>, value)</code>. @@ -1534,17 +1536,20 @@ public abstract class CoreObjectBuilder { * <p> * Enables the following additional information during serialization: * <ul class='spaced-list'> - * <li>When bean getters throws exceptions, the exception includes the object stack information + * <li> + * When bean getters throws exceptions, the exception includes the object stack information * in order to determine how that method was invoked. - * <li>Enables {@link SerializerContext#SERIALIZER_detectRecursions}. + * <li> + * Enables {@link SerializerContext#SERIALIZER_detectRecursions}. * </ul> * <p> * Enables the following additional information during parsing: * <ul class='spaced-list'> - * <li>When bean setters throws exceptions, the exception includes the object stack information + * <li> + * When bean setters throws exceptions, the exception includes the object stack information * in order to determine how that method was invoked. * </ul> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>This is equivalent to calling <code>property(<jsf>BEAN_debug</jsf>, value)</code>.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java b/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java index 35ef6dd..83f32ef 100644 --- a/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java +++ b/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java @@ -30,114 +30,99 @@ import org.apache.juneau.parser.*; * <p> * The hierarchy of these objects are... * <ul class='spaced-list'> - * <li>{@link PropertyStore} - A thread-safe, modifiable context property store. - * <br> - * Used to create {@link Context} objects. - * - * <li>{@link Context} - A reusable, cacheable, thread-safe, read-only context with configuration properties copied + * <li> + * {@link PropertyStore} - A thread-safe, modifiable context property store. + * <br>Used to create {@link Context} objects. + * <li> + * {@link Context} - A reusable, cacheable, thread-safe, read-only context with configuration properties copied * from the store. - * <br> - * Often used to create {@link Session} objects. - * - * <li>{@link Session} - A one-time-use non-thread-safe object. + * <br>Often used to create {@link Session} objects. + * <li> + * {@link Session} - A one-time-use non-thread-safe object. * <br>Used by serializers and parsers to retrieve context properties and to be used as scratchpads. * </ul> * * <h6 class='topic'>PropertyStore objects</h6> * <p> * Property stores can be thought of as consisting of the following: - * <ul class='spaced-list'> + * <ul> * <li>A <code>Map<String,Object></code> of context properties. * <li>A <code>Map<Class,Context></code> of context instances. * </ul> + * * <p> * Property stores are used to create and cache {@link Context} objects using the {@link #getContext(Class)} method. + * * <p> * As a general rule, {@link PropertyStore} objects are 'slow'. - * <br> - * Setting and retrieving properties on a store can involve relatively slow data conversion and synchronization. - * <br> - * However, the {@link #getContext(Class)} method is fast, and will return cached context objects if the context + * <br>Setting and retrieving properties on a store can involve relatively slow data conversion and synchronization. + * <br>However, the {@link #getContext(Class)} method is fast, and will return cached context objects if the context * properties have not changed. + * * <p> * Property stores can be used to store context properties for a variety of contexts. - * <br> - * For example, a single store can store context properties for the JSON serializer, XML serializer, HTML serializer + * <br>For example, a single store can store context properties for the JSON serializer, XML serializer, HTML serializer * etc... and can thus be used to retrieve context objects for those serializers. - * <p> * * <h6 class='topic'>Context properties</h6> * <p> * Context properties are 'settings' for serializers and parsers. - * <br> - * For example, the {@link BeanContext#BEAN_sortProperties} context property defines whether bean properties should be + * <br>For example, the {@link BeanContext#BEAN_sortProperties} context property defines whether bean properties should be * serialized in alphabetical order. + * * <p> * Each {@link Context} object should contain the context properties that apply to it as static fields * (e.g {@link BeanContext#BEAN_sortProperties}). + * * <p> * Context properties can be of the following types: * <ul class='spaced-list'> - * <li><l>SIMPLE</l> - A simple property. - * <br> - * Examples include: booleans, integers, Strings, Classes, etc... - * <br><br> - * An example of this would be the {@link BeanContext#BEAN_sortProperties} property. - * <br> - * It's name is simply <js>"BeanContext.sortProperties"</js>. - * - * <li><l>SET</l> - A sorted set of objects. - * <br> - * These are denoted by appending <js>".set"</js> to the property name. - * <br> - * Objects can be of any type, even complex types. - * <br> - * Sorted sets use tree sets to maintain the value in alphabetical order. - * <br> - * For example, the {@link BeanContext#BEAN_notBeanClasses} property is used to store classes that should not be + * <li> + * <l>SIMPLE</l> - A simple property. + * <br>Examples include: booleans, integers, Strings, Classes, etc... + * <br>An example of this would be the {@link BeanContext#BEAN_sortProperties} property. + * <br>It's name is simply <js>"BeanContext.sortProperties"</js>. + * <li> + * <l>SET</l> - A sorted set of objects. + * <br>These are denoted by appending <js>".set"</js> to the property name. + * <br>Objects can be of any type, even complex types. + * <br>Sorted sets use tree sets to maintain the value in alphabetical order. + * <br>For example, the {@link BeanContext#BEAN_notBeanClasses} property is used to store classes that should not be * treated like beans. - * <br> - * It's name is <js>"BeanContext.notBeanClasses.set"</js>. - * - * <li><l>LIST</l> - A list of unique objects. - * <br> - * These are denoted by appending <js>".list"</js> to the property name. - * <br> - * Objects can be of any type, even complex types. - * <br> - * Use lists if the ordering of the values in the set is important (similar to how the order of entries in a + * <br>It's name is <js>"BeanContext.notBeanClasses.set"</js>. + * <li> + * <l>LIST</l> - A list of unique objects. + * <br>These are denoted by appending <js>".list"</js> to the property name. + * <br>Objects can be of any type, even complex types. + * <br>Use lists if the ordering of the values in the set is important (similar to how the order of entries in a * classpath is important). - * <br> - * <br> - * For example, the {@link BeanContext#BEAN_beanFilters} property is used to store bean filters. - * <br> - * It's name is <js>"BeanContext.transforms.list"</js>. - * - * <li><l>MAP</l> - A sorted map of key-value pairs. - * <br> - * These are denoted by appending <js>".map"</js> to the property name. - * <br> - * Keys can be any type directly convertible to and from Strings. + * <br>For example, the {@link BeanContext#BEAN_beanFilters} property is used to store bean filters. + * <br>It's name is <js>"BeanContext.transforms.list"</js>. + * <li> + * <l>MAP</l> - A sorted map of key-value pairs. + * <br>These are denoted by appending <js>".map"</js> to the property name. + * <br>Keys can be any type directly convertible to and from Strings. * Values can be of any type, even complex types. - * <br> - * <br> - * For example, the {@link BeanContext#BEAN_implClasses} property is used to specify the names of implementation + * <br>For example, the {@link BeanContext#BEAN_implClasses} property is used to specify the names of implementation * classes for interfaces. - * <br> - * It's name is <js>"BeanContext.implClasses.map"</js>. + * <br>It's name is <js>"BeanContext.implClasses.map"</js>. * </ul> + * * <p> * All context properties are set using the {@link #setProperty(String, Object)} method. + * * <p> * Default values for context properties can be specified globally as system properties. - * <br> - * Example: <code>System.<jsm>setProperty</jsm>(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>);</code> + * <br>Example: <code>System.<jsm>setProperty</jsm>(<jsf>BEAN_sortProperties</jsf>, <jk>true</jk>);</code> + * * <p> * SET and LIST properties can be added to using the {@link #addToProperty(String, Object)} method and removed from * using the {@link #removeFromProperty(String, Object)} method. + * * <p> * SET and LIST properties can also be added to and removed from by appending <js>".add"</js> or <js>".remove"</js> to * the property name and using the {@link #setProperty(String, Object)} method. + * * <p> * The following shows the two different ways to append to a set or list property: * <p class='bcode'> @@ -150,6 +135,7 @@ import org.apache.juneau.parser.*; * <jc>// Append to set property using set().</jc> * ps.setProperty(<js>"BeanContext.notBeanClasses.set.add"</js>, MyNotBeanClass.<jk>class</jk>); * </p> + * * <p> * SET and LIST properties can also be set and manipulated using JSON strings. * <p class='bcode'> @@ -167,15 +153,15 @@ import org.apache.juneau.parser.*; * <jc>// Remove an array of values as a JSON array.. * ps.removeFromProperty(<js>"BeanContext.notBeanClasses.set"</js>, <js>"['com.my.MyNotBeanClass3']"</js>); * </p> + * * <p> * MAP properties can be added to using the {@link #putToProperty(String, Object, Object)} and * {@link #putToProperty(String, Object)} methods. - * <br> - * MAP property entries can be removed by setting the value to <jk>null</jk> + * <br>MAP property entries can be removed by setting the value to <jk>null</jk> * (e.g. <code>putToProperty(<js>"BEAN_implClasses"</js>, MyNotBeanClass.<jk>class</jk>, <jk>null</jk>);</code>. - * <br> - * MAP properties can also be added to by appending <js>".put"</js> to the property name and using the + * <br>MAP properties can also be added to by appending <js>".put"</js> to the property name and using the * {@link #setProperty(String, Object)} method. + * * <p> * The following shows the two different ways to append to a set property: * <p class='bcode'> @@ -189,6 +175,7 @@ import org.apache.juneau.parser.*; * Map m = <jk>new</jk> AMap().append(MyInterface.<jk>class</jk>,MyInterfaceImpl.<jk>class</jk>); * ps.setProperty(<js>"BeanContext.implClasses.map.put"</js>, m); * </p> + * * <p> * MAP properties can also be set and manipulated using JSON strings. * <p class='bcode'> @@ -205,30 +192,33 @@ import org.apache.juneau.parser.*; * <jc>// Remove from MAP using JSON object.</jc> * ps.putToProperty(<js>"BeanContext.implClasses.map"</js>, <js>"{'com.my.MyInterface2':null}"</js>); * </p> + * * <p> * Context properties are retrieved from this store using the following 3 methods: * <ul class='spaced-list'> - * <li>{@link #getProperty(String, Class, Object)} - Retrieve a SIMPLE or SET property converted to the specified + * <li> + * {@link #getProperty(String, Class, Object)} - Retrieve a SIMPLE or SET property converted to the specified * class type. - * <li>{@link #getMap(String, Class, Class, Map)} - Retrieve a MAP property with keys/values converted to the + * <li> + * {@link #getMap(String, Class, Class, Map)} - Retrieve a MAP property with keys/values converted to the * specified class types. - * <li>{@link #getPropertyMap(String)} - Retrieve a map of all context properties with the specified prefix + * <li> + * {@link #getPropertyMap(String)} - Retrieve a map of all context properties with the specified prefix * (e.g. <js>"BeanContext"</js> for {@link BeanContext} properties). * </ul> + * * <p> * As a general rule, only {@link Context} objects will use these read methods. * * <h6 class='topic'>Context objects</h6> * <p> * A Context object can be thought of as unmodifiable snapshot of a store. - * <br> - * They should be 'fast' by avoiding synchronization by using final fields whenever possible. - * <br> - * However, they MUST be thread safe. + * <br>They should be 'fast' by avoiding synchronization by using final fields whenever possible. + * <br>However, they MUST be thread safe. + * * <p> * Context objects are created using the {@link #getContext(Class)} method. - * <br> - * As long as the properties on a store have not been modified, the store will return a cached copy of a context. + * <br>As long as the properties on a store have not been modified, the store will return a cached copy of a context. * <p class='bcode'> * PropertyStore ps = PropertyStore.<jsm>create</jsm>(); * @@ -250,12 +240,10 @@ import org.apache.juneau.parser.*; * <h6 class='topic'>Session objects</h6> * <p> * Session objects are created through {@link Context} objects, typically through a <code>createContext()</code> method. - * <br> - * Unlike context objects, they are NOT reusable and NOT thread safe. - * <br> - * They are meant to be used one time and then thrown away. - * <br> - * They should NEVER need to use synchronization. + * <br>Unlike context objects, they are NOT reusable and NOT thread safe. + * <br>They are meant to be used one time and then thrown away. + * <br>They should NEVER need to use synchronization. + * * <p> * Session objects are also often used as scratchpads for information such as keeping track of call stack information * to detect recursive loops when serializing beans. @@ -406,16 +394,18 @@ public final class PropertyStore { * </tr> * </table> * - * @param name The configuration property name. - * <br>If name ends with <l>.add</l>, then the specified value is added to the existing property value as an entry - * in a SET or LIST property. - * <br>If name ends with <l>.put</l>, then the specified value is added to the existing property value as a - * key/value pair in a MAP property. - * <br>If name ends with <l>.remove</l>, then the specified value is removed from the existing property property - * value in a SET or LIST property. - * @param value The new value. - * If <jk>null</jk>, the property value is deleted. - * In general, the value type can be anything. + * @param name + * The configuration property name. + * <br>If name ends with <l>.add</l>, then the specified value is added to the existing property value as an entry + * in a SET or LIST property. + * <br>If name ends with <l>.put</l>, then the specified value is added to the existing property value as a + * key/value pair in a MAP property. + * <br>If name ends with <l>.remove</l>, then the specified value is removed from the existing property property + * value in a SET or LIST property. + * @param value + * The new value. + * If <jk>null</jk>, the property value is deleted. + * In general, the value type can be anything. * @return This object (for method chaining). */ public PropertyStore setProperty(String name, Object value) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java index ba1ede3..78b4d6d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java +++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java @@ -23,13 +23,18 @@ import org.apache.juneau.transform.*; /** * Used to tailor how beans get interpreted by the framework. + * * <p> * Can be used to do the following: * <ul class='spaced-list'> - * <li>Explicitly specify the set and order of properties on a bean. - * <li>Associate a {@link PropertyNamer} with a class. - * <li>Specify subtypes of a bean differentiated by a sub type property. + * <li> + * Explicitly specify the set and order of properties on a bean. + * <li> + * Associate a {@link PropertyNamer} with a class. + * <li> + * Specify subtypes of a bean differentiated by a sub type property. * </ul> + * * <p> * This annotation can be applied to classes and interfaces. */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java index c7b6af8..fb6a133 100644 --- a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java +++ b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanConstructor.java @@ -24,8 +24,7 @@ import org.apache.juneau.*; * <p> * This annotation can be used in the case of beans with properties whose values can only be set by passing them in * through a constructor on the class. - * <br> - * Since method parameter names are lost during compilation, this annotation essentially redefines them so that they + * <br>Since method parameter names are lost during compilation, this annotation essentially redefines them so that they * are available at runtime. * <p> * The definition of a read-only bean is a bean with properties with only getters, like shown below... http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java index c106d66..46a8d19 100644 --- a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java +++ b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java @@ -23,21 +23,32 @@ import org.apache.juneau.transform.*; /** * Used tailor how bean properties get interpreted by the framework. + * * <p> * Can be used to do the following: * <ul class='spaced-list'> - * <li>Override the name of a property. - * <li>Identify a getter or setter with a non-standard naming convention. - * <li>Identify a specific subclass for a property with a general class type. - * <li>Identify class types of elements in properties of type <code>Collection</code> or <code>Map</code>. - * <li>Hide properties during serialization. - * <li>Associate transforms with bean property values, such as a POJO swap to convert a <code>Calendar</code> field + * <li> + * Override the name of a property. + * <li> + * Identify a getter or setter with a non-standard naming convention. + * <li> + * Identify a specific subclass for a property with a general class type. + * <li> + * Identify class types of elements in properties of type <code>Collection</code> or <code>Map</code>. + * <li> + * Hide properties during serialization. + * <li> + * Associate transforms with bean property values, such as a POJO swap to convert a <code>Calendar</code> field * to a string. - * <li>Override the list of properties during serialization on child elements of a property of type + * <li> + * Override the list of properties during serialization on child elements of a property of type * <code>Collection</code> or <code>Map</code>. - * <li>Identify a property as the URL for a bean. - * <li>Identify a property as the ID for a bean. + * <li> + * Identify a property as the URL for a bean. + * <li> + * Identify a property as the ID for a bean. * </ul> + * * <p> * This annotation is applied to public fields and public getter/setter methods of beans. */ @@ -57,7 +68,7 @@ public @interface BeanProperty { * If the {@link BeanContext#BEAN_beanFieldVisibility} setting on the bean context excludes this field (e.g. the * visibility is set to PUBLIC, but the field is PROTECTED), this annotation can be used to force the field to be * identified as a property. - * <p> + * * <h6 class='topic'>Dynamic beans</h6> * The bean property named <js>"*"</js> is the designated "dynamic property" which allows for "extra" bean * properties not otherwise defined. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/annotation/NameProperty.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/NameProperty.java b/juneau-core/src/main/java/org/apache/juneau/annotation/NameProperty.java index dfd2ff8..bce8d94 100644 --- a/juneau-core/src/main/java/org/apache/juneau/annotation/NameProperty.java +++ b/juneau-core/src/main/java/org/apache/juneau/annotation/NameProperty.java @@ -29,8 +29,7 @@ import org.apache.juneau.ini.*; * <p> * A commonly-used case is when you're parsing a JSON map containing beans where one of the bean properties is the key * used in the map. - * <br> - * For example: + * <br>For example: * <p class='bcode'> * { * id1: {name: <js>'John Smith'</js>, sex:<js>'M'</js>}, @@ -44,7 +43,7 @@ import org.apache.juneau.ini.*; * <jk>public char</jk> <jf>sex</jf>; * } * </p> - * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>The annotated field or method does not need to be public. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/annotation/ParentProperty.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/ParentProperty.java b/juneau-core/src/main/java/org/apache/juneau/annotation/ParentProperty.java index cc903e7..6df9bb9 100644 --- a/juneau-core/src/main/java/org/apache/juneau/annotation/ParentProperty.java +++ b/juneau-core/src/main/java/org/apache/juneau/annotation/ParentProperty.java @@ -39,6 +39,7 @@ import org.apache.juneau.ini.*; * } * </p> * <p> + * * <h5 class='section'>Notes:</h5> * <ul> * <li>The annotated field or method does not need to be public. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java index 2d13768..aa29dc0 100644 --- a/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java +++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Produces.java @@ -27,8 +27,7 @@ import org.apache.juneau.serializer.*; * Provides a way to define the contents of {@link Serializer#getMediaTypes()} through an annotation. * <p> * The {@link Serializer#getMediaTypes()} default implementation gathers the media types by looking for this annotation. - * <br> - * It should be noted that this annotation is optional and that the {@link Serializer#getMediaTypes()} method can + * <br>It should be noted that this annotation is optional and that the {@link Serializer#getMediaTypes()} method can * be overridden by subclasses to return the media types programmatically. * * <h5 class='section'>Example:</h5> @@ -41,8 +40,7 @@ import org.apache.juneau.serializer.*; * <p> * The media types can also be <code>media-range</code> values per * <a class="doclink" href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1";>RFC2616/14.1</a>. - * <br> - * When meta-characters are used, you should specify the {@link #contentType()} value to indicate the real media type + * <br>When meta-characters are used, you should specify the {@link #contentType()} value to indicate the real media type * value that can be set on the <code>Content-Type</code> response header. * * <p class='bcode'> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/csv/CsvParserContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/csv/CsvParserContext.java b/juneau-core/src/main/java/org/apache/juneau/csv/CsvParserContext.java index 6b2e190..926c263 100644 --- a/juneau-core/src/main/java/org/apache/juneau/csv/CsvParserContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/csv/CsvParserContext.java @@ -25,10 +25,12 @@ import org.apache.juneau.parser.*; * * <h6 class='topic'>Inherited configurable properties</h6> * <ul class='doctree'> - * <li class='jc'><a class="doclink" href="../BeanContext.html#ConfigProperties">BeanContext</a> - + * <li class='jc'> + * <a class="doclink" href="../BeanContext.html#ConfigProperties">BeanContext</a> - * Properties associated with handling beans on serializers and parsers. * <ul> - * <li class='jc'><a class="doclink" href="../parser/ParserContext.html#ConfigProperties">ParserContext</a> - + * <li class='jc'> + * <a class="doclink" href="../parser/ParserContext.html#ConfigProperties">ParserContext</a> - * Configurable properties common to all parsers. * </ul> * </ul> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/csv/CsvSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/csv/CsvSerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/csv/CsvSerializerContext.java index 1a77446..fa84e3e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/csv/CsvSerializerContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/csv/CsvSerializerContext.java @@ -25,10 +25,12 @@ import org.apache.juneau.serializer.*; * * <h6 class='topic'>Inherited configurable properties</h6> * <ul class='doctree'> - * <li class='jc'><a class="doclink" href="../BeanContext.html#ConfigProperties">BeanContext</a> + * <li class='jc'> + * <a class="doclink" href="../BeanContext.html#ConfigProperties">BeanContext</a> * - Properties associated with handling beans on serializers and parsers. * <ul> - * <li class='jc'><a class="doclink" href="../serializer/SerializerContext.html#ConfigProperties">SerializerContext</a> + * <li class='jc'> + * <a class="doclink" href="../serializer/SerializerContext.html#ConfigProperties">SerializerContext</a> * - Configurable properties common to all serializers. * </ul> * </ul> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/doc-files/AddressBook.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/doc-files/AddressBook.html b/juneau-core/src/main/java/org/apache/juneau/doc-files/AddressBook.html index 10f6427..b892477 100644 --- a/juneau-core/src/main/java/org/apache/juneau/doc-files/AddressBook.html +++ b/juneau-core/src/main/java/org/apache/juneau/doc-files/AddressBook.html @@ -22,7 +22,8 @@ <body style='margin:0 20'> <p></p> <!-- ======================================================================================================== --> - <a id="AddressBookSampleSource"></a><h2 class='topic'>AddressBook sample source</h2> + <a id="AddressBookSampleSource"></a> + <h2 class='topic'>AddressBook sample source</h2> <p> Sample code use in various examples throughout the Javadocs. Represents a simple POJO model consisting of a collection (<code>LinkedList</code>), beans (<code>Address</code>, <code>Person</code>), and a type 4a transformed type (<code>Calendar</code>). http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/Link.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/Link.java b/juneau-core/src/main/java/org/apache/juneau/dto/Link.java index cd1ed55..96d025f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/Link.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/Link.java @@ -29,8 +29,7 @@ import org.apache.juneau.utils.*; * <xt><a</xt> <xa>href</xa>=<xs>'href'</xs><xt>></xt>name<xt></a></xt> * <p> * When encountered by the {@link HtmlSerializer} class, this object gets converted to a hyperlink. - * <br> - * All other serializers simply convert it to a simple bean. + * <br>All other serializers simply convert it to a simple bean. */ @HtmlLink(nameProperty = "name", hrefProperty = "href") public class Link implements Comparable<Link> { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java index d03199b..0850725 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/AtomBuilder.java @@ -38,12 +38,17 @@ import org.apache.juneau.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ public class AtomBuilder { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java index e0d0888..2922276 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java @@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomCategory</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomCategory = @@ -39,12 +39,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="category") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Common.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Common.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Common.java index 26f9965..86c28aa 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Common.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Common.java @@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomCommonAttributes</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomCommonAttributes = @@ -35,12 +35,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @SuppressWarnings("hiding") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java index 3d82327..32e34d2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/CommonEntry.java @@ -23,16 +23,20 @@ import org.apache.juneau.xml.annotation.*; /** * Parent class of {@link Entry}, {@link Feed}, and {@link Source} - * <p> * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @SuppressWarnings("hiding") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Content.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Content.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Content.java index c9c96da..5381c40 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Content.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Content.java @@ -24,7 +24,6 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomContent</code> construct in the RFC4287 specification. - * <p> * * <h6 class='figure'>Schema</h6> * <p class='bcode'> @@ -65,12 +64,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @SuppressWarnings("hiding") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java index f28f083..2bd640b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java @@ -21,7 +21,7 @@ import org.apache.juneau.transforms.*; /** * Represents an <code>atomEntry</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomEntry = @@ -45,12 +45,17 @@ import org.apache.juneau.transforms.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="entry") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java index a261320..0e00ebf 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java @@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*; * Top-level ATOM feed object. * <p> * Represents an <code>atomFeed</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomFeed = @@ -48,12 +48,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="feed") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java index 8a48a28..983d299 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java @@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomGenerator</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomGenerator = element atom:generator { @@ -37,12 +37,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="generator") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java index 964094c..e146669 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java @@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomIcon</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomIcon = element atom:icon { @@ -35,12 +35,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="icon") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java index 1732a5f..01b194e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java @@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomId</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomId = element atom:id { @@ -30,12 +30,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="id") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java index e6ea325..c3d7e4c 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java @@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomLink</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomLink = @@ -37,12 +37,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="link") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java index b392e1c..ac1fdc0 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java @@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomLogo</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomLogo = element atom:logo { @@ -35,12 +35,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @Bean(typeName="logo") @@ -54,8 +59,7 @@ public class Logo extends Common { * Normal constructor. * <p> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}. - * <br> - * Strings must be valid URIs. + * <br>Strings must be valid URIs. * <p> * URIs defined by {@link UriResolver} can be used for values. * @@ -87,8 +91,7 @@ public class Logo extends Common { * Sets the URI of the logo. * <p> * The value can be of any of the following types: {@link URI}, {@link URL}, {@link String}. - * <br> - * Strings must be valid URIs. + * <br>Strings must be valid URIs. * <p> * URIs defined by {@link UriResolver} can be used for values. * http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java index 7d0b8c4..9a30649 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Person.java @@ -23,7 +23,7 @@ import org.apache.juneau.annotation.*; /** * Represents an <code>atomPersonConstruct</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomPersonConstruct = @@ -36,12 +36,17 @@ import org.apache.juneau.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @SuppressWarnings("hiding") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java index 416c6fa..f86380b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Source.java @@ -18,7 +18,7 @@ import org.apache.juneau.annotation.*; /** * Represents an <code>atomSource</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomSource = @@ -42,12 +42,17 @@ import org.apache.juneau.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @SuppressWarnings("hiding") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java index f5ef404..fc1dd9f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Text.java @@ -19,7 +19,7 @@ import org.apache.juneau.xml.annotation.*; /** * Represents an <code>atomTextConstruct</code> construct in the RFC4287 specification. - * <p> + * * <h6 class='figure'>Schema</h6> * <p class='bcode'> * atomTextConstruct = atomPlainTextConstruct | atomXHTMLTextConstruct @@ -43,12 +43,17 @@ import org.apache.juneau.xml.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ @SuppressWarnings("hiding") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/Utils.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Utils.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Utils.java index c8d75a3..f42be90 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Utils.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Utils.java @@ -21,12 +21,17 @@ import javax.xml.bind.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> - * </ul> - * <li class='jp'><a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.Atom'>Atom</a> + * </ul> + * </li> + * <li class='jp'> + * <a class='doclink' href='package-summary.html#TOC'>org.apache.juneau.dto.atom</a> + * </li> * </ul> */ class Utils { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html index 1208216..4998a54 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html @@ -75,8 +75,7 @@ <div class='topic'> <p> Juneau supports generation and consumption of ATOM feeds through the use of DTOs (Data Transfer Objects). - <br> - It uses existing support for serializing and parsing POJOs to and from XML to define these ATOM objects. + <br>It uses existing support for serializing and parsing POJOs to and from XML to define these ATOM objects. </p> <p> The examples shown here are pulled from the <code>AtomFeedResource</code> class in the @@ -90,8 +89,7 @@ <div class='topic'> <p> The Juneau ATOM feed DTOs are simply beans with fluent-style setters. - <br> - The following code shows a feed being created programmatically using the + <br>The following code shows a feed being created programmatically using the {@link org.apache.juneau.dto.atom.AtomBuilder} class. </p> <p class='bcode'> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html index 1e8b44b..b19a781 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/package.html @@ -79,6 +79,7 @@ <li>{@code MyBean[]} <li>{@code HashMap[]} </ul> + <h6 class='topic'>Example:</h6> <p> The following example shows how to generate Cognos-XML from a POJO. @@ -148,14 +149,18 @@ <xt></c:data></xt> <xt></c:dataset></xt> </p> + <h6 class='topic'>Other data formats</h6> <p> The following shows examples of what this data structure looks like when serialized to other formats: </p> + <h6 class='figure'>HTML</h6> <img class='bordered' src='doc-files/HTML.png'> + <h6 class='figure'>JSON</h6> <img class='bordered' src='doc-files/JSON.png'> + <h6 class='figure'>RDF/XML</h6> <img class='bordered' src='doc-files/RDFXML.png'> </div> @@ -167,6 +172,7 @@ <p> The {@link org.apache.juneau.dto.cognos.DataSet} class can be reconstructed from Cognos/XML using one of the standard XML parsers. </p> + <h6 class='topic'>Example:</h6> <p class='bcode'> <jc>// Parse XML back into original DataSet</jc> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java index d9a4286..843dfb6 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/A.java @@ -25,11 +25,14 @@ import org.apache.juneau.annotation.*; * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> - * </ul> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> + * </ul> + * </li> * </ul> */ @Bean(typeName="a") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/html5/Abbr.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Abbr.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Abbr.java index 7c08fb3..510df45 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Abbr.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Abbr.java @@ -17,15 +17,17 @@ import org.apache.juneau.annotation.*; /** * DTO for an HTML <a class="doclink" * href="https://www.w3.org/TR/html5/text-level-semantics.html#the-abbr-element";><abbr></a> element. - * <p> * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> - * </ul> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> + * </ul> + * </li> * </ul> */ @Bean(typeName="abbr") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/html5/Address.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Address.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Address.java index 79900bd..91856d3 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Address.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Address.java @@ -17,15 +17,17 @@ import org.apache.juneau.annotation.*; /** * DTO for an HTML <a class="doclink" * href="https://www.w3.org/TR/html5/sections.html#the-address-element";><address></a> element. - * <p> * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> - * </ul> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> + * </ul> + * </li> * </ul> */ @Bean(typeName="address") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java index fc8591d..7b69b4e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Area.java @@ -21,15 +21,17 @@ import org.apache.juneau.annotation.*; /** * DTO for an HTML <a class="doclink" * href="https://www.w3.org/TR/html5/embedded-content-0.html#the-area-element";><area></a> element. - * <p> * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> - * </ul> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> + * </ul> + * </li> * </ul> */ @Bean(typeName="area") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/html5/Article.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Article.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Article.java index 1a5687d..2953d0d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Article.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Article.java @@ -17,15 +17,17 @@ import org.apache.juneau.annotation.*; /** * DTO for an HTML <a class="doclink" * href="https://www.w3.org/TR/html5/sections.html#the-article-element";><article></a> element. - * <p> * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> - * </ul> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> + * </ul> + * </li> * </ul> */ @Bean(typeName="article") http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/0d913b38/juneau-core/src/main/java/org/apache/juneau/dto/html5/Aside.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Aside.java b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Aside.java index 5981926..c14e239 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/html5/Aside.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/html5/Aside.java @@ -17,15 +17,17 @@ import org.apache.juneau.annotation.*; /** * DTO for an HTML <a class="doclink" * href="https://www.w3.org/TR/html5/sections.html#the-aside-element";><aside></a> element. - * <p> * * <h6 class='topic'>Additional Information</h6> * <ul class='doctree'> - * <li class='link'><a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects + * <li class='link'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs'>Juneau Data Transfer Objects * (org.apache.juneau.dto)</a> - * <ul> - * <li class='sublink'><a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> - * </ul> + * <ul> + * <li class='sublink'> + * <a class='doclink' href='../../../../../overview-summary.html#DTOs.HTML5'>HTML5</a> + * </ul> + * </li> * </ul> */ @Bean(typeName="aside")
