diff --git a/core-common/src/main/java/org/mapstruct/factory/Mappers.java b/core-common/src/main/java/org/mapstruct/factory/Mappers.java index 5905f8c7f..aae005c22 100644 --- a/core-common/src/main/java/org/mapstruct/factory/Mappers.java +++ b/core-common/src/main/java/org/mapstruct/factory/Mappers.java @@ -54,7 +54,7 @@ public class Mappers { * Returns an instance of the given mapper type. * * @param clazz The type of the mapper to return. - * + * @param The type of the mapper to create. * @return An instance of the given mapper type. */ public static T getMapper(Class clazz) { diff --git a/core-jdk8/src/main/java/org/mapstruct/Mapping.java b/core-jdk8/src/main/java/org/mapstruct/Mapping.java index 60ce8795c..225d8ea44 100644 --- a/core-jdk8/src/main/java/org/mapstruct/Mapping.java +++ b/core-jdk8/src/main/java/org/mapstruct/Mapping.java @@ -40,7 +40,7 @@ public @interface Mapping { * The source to use for this Mapping. This can either be: *
    *
  1. The source name of the configured property as defined by the JavaBeans specification.
    2. - *
  2. When used to map an enum constant, the name of the constant member is to be given<./li>. + *
  3. When used to map an enum constant, the name of the constant member is to be given.
    4. *
* Either this attribute or {@link #constant()} or {@link #expression()} may be specified for a given mapping, * but not two at the same time. If this attribute is given, the target property must be specified via diff --git a/core/src/main/java/org/mapstruct/Mapping.java b/core/src/main/java/org/mapstruct/Mapping.java index e968d51b4..48d4583f0 100644 --- a/core/src/main/java/org/mapstruct/Mapping.java +++ b/core/src/main/java/org/mapstruct/Mapping.java @@ -38,7 +38,7 @@ public @interface Mapping { * The source to use for this Mapping. This can either be: *
    *
  1. The source name of the configured property as defined by the JavaBeans specification.
    2. - *
  2. When used to map an enum constant, the name of the constant member is to be given<./li>. + *
  3. When used to map an enum constant, the name of the constant member is to be given.
    4. *
* Either this attribute or {@link #constant()} or {@link #expression()} may be specified for a given mapping, * but not two at the same time. If this attribute is given, the target property must be specified via diff --git a/distribution/pom.xml b/distribution/pom.xml index 42e9c2f83..651f735af 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -60,7 +60,7 @@ ${basedir}/../processor/src/main/java - http://docs.oracle.com/javase/6/docs/api + http://docs.oracle.com/javase/7/docs/api/ MapStruct Packages MapStruct ${project.version} diff --git a/parent/pom.xml b/parent/pom.xml index 91256f271..c18d2e544 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -303,7 +303,7 @@ maven-javadoc-plugin 2.9 - -Xdoclint:none + org.mapstruct.ap.prism;org.mapstruct.itest.jaxb.xsd.* diff --git a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java index 7dd6dd8f0..2feb87429 100644 --- a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java @@ -39,6 +39,7 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.util.ElementKindVisitor6; import javax.tools.Diagnostic.Kind; +import org.mapstruct.ap.model.Mapper; import org.mapstruct.ap.option.Options; import org.mapstruct.ap.option.ReportingPolicy; import org.mapstruct.ap.processor.DefaultModelElementProcessorContext; diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java b/processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java index 06a007c21..3d8ba9fc8 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java +++ b/processor/src/main/java/org/mapstruct/ap/conversion/ConversionProvider.java @@ -19,6 +19,7 @@ package org.mapstruct.ap.conversion; import org.mapstruct.ap.model.Assignment; +import org.mapstruct.ap.model.assignment.TypeConversion; import org.mapstruct.ap.model.common.ConversionContext; /** diff --git a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java index ba49309c3..5bbfa5a6e 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java @@ -20,6 +20,7 @@ package org.mapstruct.ap.model; import java.util.Set; +import org.mapstruct.ap.model.assignment.TypeConversion; import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.source.SourceMethod; diff --git a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java index 6eda0960e..449290aa0 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java @@ -20,6 +20,7 @@ package org.mapstruct.ap.model; import java.util.Set; +import org.mapstruct.ap.model.assignment.TypeConversion; import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.source.SourceMethod; diff --git a/processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java b/processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java index 5751aa02c..c28d66051 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java +++ b/processor/src/main/java/org/mapstruct/ap/model/assignment/package-info.java @@ -17,15 +17,12 @@ * limitations under the License. */ /** - *

- * Meta-model of assignments. There are currently three types of assignment + * Meta-model of assignments. There are currently three types of assignment: *

    *
  • Simple
    • *
  • TypeConversion
    • *
  • MethodReference
    • - * - * The assignments can be wrapped. E.g. in a collection or map constructor, a null check, a try-catch, etc. *
- *

+ * The assignments can be wrapped. E.g. in a collection or map constructor, a null check, a try-catch, etc. */ package org.mapstruct.ap.model.assignment; diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java b/processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java index 434873959..f811443df 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java +++ b/processor/src/main/java/org/mapstruct/ap/model/common/ConversionContext.java @@ -18,6 +18,8 @@ */ package org.mapstruct.ap.model.common; +import java.util.Date; + /** * Context object passed to conversion providers and built-in methods. * diff --git a/processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java index d1a037078..1f8009e61 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java +++ b/processor/src/main/java/org/mapstruct/ap/model/common/TypeFactory.java @@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentNavigableMap; import java.util.concurrent.ConcurrentSkipListMap; + import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; @@ -180,14 +181,14 @@ public class TypeFactory { /** * Returns the Type that represents the declared Class type of the given type. For primitive types, the boxed class - * will be used.
- * Examples:
- * If type represents {@code java.lang.Integer}, it will return the type that represents {@code Class}. - *
- * If type represents {@code int}, it will return the type that represents {@code Class}. + * will be used. Examples: + *
    + *
  • If type represents {@code java.lang.Integer}, it will return the type that represents {@code Class}. + *
    • + *
  • If type represents {@code int}, it will return the type that represents {@code Class}.
    • + *
* * @param type the type to return the declared class type for - * * @return the type representing {@code Class}. */ public Type classTypeOf(Type type) { diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java b/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java index a1652f82b..f7cb01c5f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/MethodMatcher.java @@ -21,6 +21,7 @@ package org.mapstruct.ap.model.source; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeParameterElement; import javax.lang.model.element.VariableElement; @@ -45,7 +46,7 @@ import org.mapstruct.ap.util.TypeUtilsJDK6Fix; * SourceMethodHeader: SourceMethodModifiers TypeParameters Result SourceMethodDeclarator Throws * SourceMethodDeclarator: Identifier ( FormalParameterList ) * - * example <T extends String & Serializable> T getResult(? extends T) throws Exception + * example <T extends String & Serializable> T getResult(? extends T) throws Exception * \-------------------------------/ \-/ \---------/ * TypeParameters Result ParameterList * @@ -55,8 +56,10 @@ import org.mapstruct.ap.util.TypeUtilsJDK6Fix; * For more info on java-generics: http://www.javacodegeeks.com/2011/04/java-generics-quick-tutorial.html * http://www.angelikalanger.com/GenericsFAQ/FAQSections/ParameterizedTypes.html *

- * The following situations is not supported / tested:
- * 1) Multiple bounds were the bound itself is again a generic type. + * The following situations is not supported / tested: + *

    + *
  1. Multiple bounds were the bound itself is again a generic type.
    2. + *
* * @author Sjaak Derksen */ diff --git a/processor/src/main/java/org/mapstruct/ap/processor/ModelElementProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/ModelElementProcessor.java index 364f42bea..12b9829d0 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/ModelElementProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/processor/ModelElementProcessor.java @@ -98,7 +98,7 @@ public interface ModelElementProcessor { * order from highest to lowest priority, starting with the mapping method * retrieval processor (priority 1) and finishing with the code generation * processor (priority 10000). Processors working on the built - * {@code Mapper} model must have a priority > 1000. + * {@code Mapper} model must have a priority > 1000. * * @return The priority value of this processor. */ diff --git a/processor/src/main/java/org/mapstruct/ap/util/TypeUtilsJDK6Fix.java b/processor/src/main/java/org/mapstruct/ap/util/TypeUtilsJDK6Fix.java index 15280119d..37893d582 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/TypeUtilsJDK6Fix.java +++ b/processor/src/main/java/org/mapstruct/ap/util/TypeUtilsJDK6Fix.java @@ -23,7 +23,7 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Types; /** - * + * Work-around for a bug related to sub-typing in the Eclipse JSR 269 implementation. * @author Sjaak Derksen */ public class TypeUtilsJDK6Fix { @@ -31,16 +31,14 @@ public class TypeUtilsJDK6Fix { private TypeUtilsJDK6Fix() { } /** - * Tests whether one type is a subtype of another. - * Any type is considered to be a subtype of itself. + * Tests whether one type is a subtype of another. Any type is considered to be a subtype of itself. Also see JLS section 4.10, Subtyping. * * @param types the type utils - * @param t1 the first type - * @param t2 the second type - * @return {@code true} if and only if the first type is a subtype - * of the second + * @param t1 the first type + * @param t2 the second type + * @return {@code true} if and only if the first type is a subtype of the second * @throws IllegalArgumentException if given an executable or package type - * @jls 4.10 Subtyping */ public static boolean isSubType(Types types, TypeMirror t1, TypeMirror t2) { return types.isSubtype( types.erasure( t1 ), types.erasure( t2 ) );