Organize imports to put static imports back on top.

This commit is contained in:
Andreas Gudian 2015-12-18 22:47:03 +01:00
parent c0b005429a
commit 5831e824e1
139 changed files with 326 additions and 286 deletions

View File

@ -18,6 +18,10 @@
*/
package org.mapstruct.itest.testutil.runner;
import static org.apache.maven.it.util.ResourceExtractor.extractResourceToDestination;
import static org.apache.maven.shared.utils.io.FileUtils.copyURLToFile;
import static org.apache.maven.shared.utils.io.FileUtils.deleteDirectory;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
@ -46,10 +50,6 @@ import org.mapstruct.itest.testutil.runner.ProcessorSuiteRunner.ProcessorTestCas
import org.mapstruct.itest.testutil.runner.xml.Toolchains;
import org.mapstruct.itest.testutil.runner.xml.Toolchains.ProviderDescription;
import static org.apache.maven.it.util.ResourceExtractor.extractResourceToDestination;
import static org.apache.maven.shared.utils.io.FileUtils.copyURLToFile;
import static org.apache.maven.shared.utils.io.FileUtils.deleteDirectory;
/**
* Runner for processor integration tests. Requires the annotation {@link ProcessorSuite} on the test class.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Collections;
import java.util.Locale;
import java.util.Set;
@ -26,8 +28,6 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Base class for conversions between Joda-Time types and String.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Set;
@ -25,8 +27,6 @@ import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link BigDecimal} and {@link BigInteger}.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link BigDecimal} and native number types.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link BigDecimal} and {@link String}.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.util.Set;
@ -25,8 +27,6 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.NativeTypes;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link BigDecimal} and wrappers of native number types.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigInteger;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link BigInteger} and native number types.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigInteger;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link BigInteger} and {@link String}.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigInteger;
import java.util.Set;
@ -25,8 +27,6 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.NativeTypes;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link BigInteger} and wrappers of native number types.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.conversion.ReverseConversion.reverse;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
@ -32,8 +34,6 @@ import org.mapstruct.ap.internal.model.common.TypeFactory;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
import static org.mapstruct.ap.internal.conversion.ReverseConversion.reverse;
/**
* Holds built-in {@link ConversionProvider}s such as from {@code int} to {@code String}.
*

View File

@ -18,6 +18,9 @@
*/
package org.mapstruct.ap.internal.conversion;
import static java.util.Arrays.asList;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Collections;
@ -28,9 +31,6 @@ import org.mapstruct.ap.internal.model.assignment.Assignment;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static java.util.Arrays.asList;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link String} and {@link Date}.
*

View File

@ -18,13 +18,13 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link String} and {@link Enum} types.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Calendar;
import java.util.Locale;
import java.util.Set;
@ -25,8 +27,6 @@ import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@code DateTime} and {@link Calendar}.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Date;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between the following Joda types and {@link Date}:
* <ul>

View File

@ -18,6 +18,14 @@
*/
package org.mapstruct.ap.internal.model;
import java.util.Arrays;
import java.util.List;
import java.util.SortedSet;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
import org.mapstruct.ap.internal.model.common.Accessibility;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
@ -25,13 +33,6 @@ import org.mapstruct.ap.internal.option.Options;
import org.mapstruct.ap.internal.prism.DecoratedWithPrism;
import org.mapstruct.ap.internal.version.VersionInformation;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
import java.util.Arrays;
import java.util.List;
import java.util.SortedSet;
/**
* Represents a decorator applied to a generated mapper type.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.model;
import org.mapstruct.ap.internal.model.assignment.Assignment;
import org.mapstruct.ap.internal.model.common.ModelElement;
import org.mapstruct.ap.internal.model.common.Type;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.mapstruct.ap.internal.model.assignment.Assignment;
import org.mapstruct.ap.internal.model.common.ModelElement;
import org.mapstruct.ap.internal.model.common.Type;
/**
* Direct Assignment. Just a source reference
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model;
import static org.mapstruct.ap.internal.util.Collections.first;
import java.util.ArrayList;
import java.util.List;
@ -32,8 +34,6 @@ import org.mapstruct.ap.internal.prism.BeanMappingPrism;
import org.mapstruct.ap.internal.util.Message;
import org.mapstruct.ap.internal.util.Strings;
import static org.mapstruct.ap.internal.util.Collections.first;
/**
* A {@link MappingMethod} which maps one enum type to another, optionally configured by one or more
* {@link EnumMapping}s.

View File

@ -18,6 +18,9 @@
*/
package org.mapstruct.ap.internal.model;
import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
import static org.mapstruct.ap.internal.util.Strings.join;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@ -30,9 +33,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.source.Method;
import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
import static org.mapstruct.ap.internal.util.Strings.join;
/**
* A method implemented or referenced by a {@link Mapper} class.
*

View File

@ -18,6 +18,12 @@
*/
package org.mapstruct.ap.internal.model;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.DIRECT;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED_TYPE_CONVERTED;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED_MAPPED;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -48,12 +54,6 @@ import org.mapstruct.ap.internal.util.MapperConfiguration;
import org.mapstruct.ap.internal.util.Message;
import org.mapstruct.ap.internal.util.Strings;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.DIRECT;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED_TYPE_CONVERTED;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED;
import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED_MAPPED;
/**
* Represents the mapping between a source and target property, e.g. from {@code String Source#foo} to
* {@code int Target#bar}. Name and type of source and target property can differ. If they have different types, the

View File

@ -18,12 +18,12 @@
*/
package org.mapstruct.ap.internal.model;
import org.mapstruct.ap.internal.model.common.ModelElement;
import org.mapstruct.ap.internal.model.common.Type;
import java.util.Collections;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ModelElement;
import org.mapstruct.ap.internal.model.common.Type;
/**
* @author Christophe Labouisse on 14/07/2015.
*/

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.model;
import org.mapstruct.ap.internal.model.assignment.Assignment;
import org.mapstruct.ap.internal.model.common.ModelElement;
import org.mapstruct.ap.internal.model.common.Type;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.mapstruct.ap.internal.model.assignment.Assignment;
import org.mapstruct.ap.internal.model.common.ModelElement;
import org.mapstruct.ap.internal.model.common.Type;
/**
* An inline conversion between source and target type of a mapping.
*

View File

@ -18,6 +18,9 @@
*/
package org.mapstruct.ap.internal.model.assignment;
import static org.mapstruct.ap.internal.util.Strings.decapitalize;
import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@ -26,9 +29,6 @@ import java.util.Set;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Strings;
import static org.mapstruct.ap.internal.util.Strings.decapitalize;
import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
/**
* Decorates the assignment as a Map or Collection constructor
*

View File

@ -19,6 +19,7 @@
package org.mapstruct.ap.internal.model.common;
import java.util.Set;
import javax.lang.model.element.Modifier;
/**

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.internal.model.common;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
import org.mapstruct.ap.internal.util.Message;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
import org.mapstruct.ap.internal.util.Message;
/**
* Factory for {@link DateFormatValidator}. <p> Based on the types of source / target type a specific {@link
* DateFormatValidator} will be instantiated. <br /> <ul> <li>Joda Time</li> <li>Java 8 Time and</li>

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.common;
import static org.mapstruct.ap.internal.util.workarounds.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@ -57,8 +59,6 @@ import org.mapstruct.ap.internal.prism.TargetTypePrism;
import org.mapstruct.ap.internal.util.AnnotationProcessingException;
import org.mapstruct.ap.internal.util.Collections;
import static org.mapstruct.ap.internal.util.workarounds.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary;
/**
* Factory creating {@link Type} instances.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source;
import static org.mapstruct.ap.internal.util.Collections.hasNonNullElements;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -38,8 +40,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.hasNonNullElements;
/**
* SourceMethodMatcher $8.4 of the JavaLanguage specification describes a method body as such:
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.builtin;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Set;
@ -30,8 +32,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.builtin;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Set;
@ -30,8 +32,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.builtin;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Set;
import javax.xml.bind.JAXBElement;
@ -26,8 +28,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.builtin;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -33,8 +35,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.builtin;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Calendar;
import java.util.Set;
@ -27,8 +29,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.builtin;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Date;
import java.util.Set;
@ -27,8 +29,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.builtin;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Set;
@ -29,8 +31,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.common.TypeFactory;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.internal.model.source.selector;
import static org.mapstruct.ap.internal.util.Collections.first;
import java.util.ArrayList;
import java.util.List;
@ -25,8 +27,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.model.source.Method;
import static org.mapstruct.ap.internal.util.Collections.first;
/**
* Selects on inheritance distance, e.g. the amount of inheritance steps from the parameter type.
*

View File

@ -19,6 +19,7 @@
package org.mapstruct.ap.internal.model.source.selector;
import java.util.List;
import javax.lang.model.type.TypeMirror;
/**

View File

@ -19,6 +19,7 @@
package org.mapstruct.ap.internal.naming;
import java.beans.Introspector;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.DeclaredType;

View File

@ -20,9 +20,6 @@ package org.mapstruct.ap.internal.prism;
import javax.xml.bind.annotation.XmlElementDecl;
import net.java.dev.hickory.prism.GeneratePrism;
import net.java.dev.hickory.prism.GeneratePrisms;
import org.mapstruct.AfterMapping;
import org.mapstruct.BeanMapping;
import org.mapstruct.BeforeMapping;
@ -39,6 +36,9 @@ import org.mapstruct.Mappings;
import org.mapstruct.Qualifier;
import org.mapstruct.TargetType;
import net.java.dev.hickory.prism.GeneratePrism;
import net.java.dev.hickory.prism.GeneratePrisms;
/**
* Triggers the generation of prism types using <a href="https://java.net/projects/hickory">Hickory</a>.
*

View File

@ -18,11 +18,14 @@
*/
package org.mapstruct.ap.internal.processor;
import static org.mapstruct.ap.internal.util.Executables.getAllEnclosedExecutableElements;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
@ -52,8 +55,6 @@ import org.mapstruct.ap.internal.util.FormattingMessager;
import org.mapstruct.ap.internal.util.MapperConfiguration;
import org.mapstruct.ap.internal.util.Message;
import static org.mapstruct.ap.internal.util.Executables.getAllEnclosedExecutableElements;
/**
* A {@link ModelElementProcessor} which retrieves a list of {@link SourceMethod}s
* representing all the mapping methods of the given bean mapper type as well as

View File

@ -18,21 +18,22 @@
*/
package org.mapstruct.ap.internal.util;
import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism;
import org.mapstruct.ap.internal.prism.MapperConfigPrism;
import org.mapstruct.ap.internal.prism.MapperPrism;
import org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism;
import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism;
import org.mapstruct.ap.internal.prism.MapperConfigPrism;
import org.mapstruct.ap.internal.prism.MapperPrism;
import org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism;
import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism;
/**
* Provides an aggregated view to the settings given via {@link org.mapstruct.Mapper} and

View File

@ -18,13 +18,13 @@
*/
package org.mapstruct.ap.internal.util;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Helper class for dealing with strings.
*

View File

@ -21,6 +21,8 @@ package org.mapstruct.ap.internal.writer;
import java.io.Writer;
import java.util.Map;
import org.mapstruct.ap.internal.writer.Writable.Context;
import freemarker.ext.beans.BeanModel;
import freemarker.ext.beans.BeansWrapper;
import freemarker.ext.beans.SimpleMapModel;
@ -30,8 +32,6 @@ import freemarker.template.TemplateHashModel;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
import org.mapstruct.ap.internal.writer.Writable.Context;
/**
* Delegate for writing given {@link Writable}s into a {@link Writer} using
* FreeMarker templates. Any parameters passed to the

View File

@ -22,6 +22,8 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.mapstruct.ap.internal.writer.ModelWriter.DefaultModelElementWriterContext;
import freemarker.core.Environment;
import freemarker.ext.beans.BeanModel;
import freemarker.template.Configuration;
@ -30,8 +32,6 @@ import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateException;
import freemarker.template.TemplateModel;
import org.mapstruct.ap.internal.writer.ModelWriter.DefaultModelElementWriterContext;
/**
* A {@link TemplateDirectiveModel} which allows to recursively write a graph of
* {@link Writable}s, with each element using its own template. Elements are

View File

@ -18,20 +18,20 @@
*/
package org.mapstruct.ap.internal.model.common;
import org.junit.Test;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
import org.mapstruct.ap.testutil.IssueKey;
import static org.fest.assertions.Assertions.assertThat;
import java.lang.annotation.Annotation;
import java.util.List;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeVisitor;
import java.lang.annotation.Annotation;
import java.util.List;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
import org.mapstruct.ap.testutil.IssueKey;
/**
* Tests for {@link org.mapstruct.ap.internal.model.common.DateFormatValidatorFactory}.

View File

@ -18,11 +18,10 @@
*/
package org.mapstruct.ap.internal.model.common;
import org.junit.Test;
import org.mapstruct.ap.internal.util.FormattingMessager;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.Message;
import org.mapstruct.ap.testutil.IssueKey;
import static org.fest.assertions.Assertions.assertThat;
import java.lang.annotation.Annotation;
import java.util.List;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
@ -32,10 +31,11 @@ import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeVisitor;
import javax.tools.Diagnostic;
import java.lang.annotation.Annotation;
import java.util.List;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.mapstruct.ap.internal.util.FormattingMessager;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.Message;
import org.mapstruct.ap.testutil.IssueKey;
/**
* Testing DefaultConversionContext for dateFormat

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.test.abstractclass;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for the generation of implementation of abstract base classes.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.test.abstractclass.generics;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author Andreas Gudian
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.array;
import static org.fest.assertions.Assertions.assertThat;
import java.util.Arrays;
import java.util.List;
@ -29,8 +31,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
@WithClasses( { Scientist.class, ScientistDto.class, ScienceMapper.class } )
@RunWith(AnnotationProcessorTestRunner.class)
@IssueKey("108")

View File

@ -18,13 +18,13 @@
*/
package org.mapstruct.ap.test.bool;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
@WithClasses({
Person.class,
PersonDto.class,

View File

@ -19,6 +19,7 @@
package org.mapstruct.ap.test.bugs._289;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._374;
import java.util.List;
import java.util.Map;
import org.mapstruct.BeanMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;

View File

@ -18,16 +18,18 @@
*/
package org.mapstruct.ap.test.bugs._374;
import static org.fest.assertions.Assertions.assertThat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* Reproducer for https://github.com/mapstruct/mapstruct/issues/306.

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._374;
import java.util.List;
import java.util.Map;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget;

View File

@ -18,6 +18,11 @@
*/
package org.mapstruct.ap.test.bugs._394;
import static org.fest.assertions.Assertions.assertThat;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.test.bugs._394.source.AnotherCar;
@ -26,11 +31,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import java.util.HashMap;
import java.util.Map;
import static org.fest.assertions.Assertions.assertThat;
@WithClasses( {
SameNameForSourceAndTargetCarsMapper.class,
Cars.class,

View File

@ -18,6 +18,9 @@
*/
package org.mapstruct.ap.test.bugs._394;
import java.util.List;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
@ -25,10 +28,6 @@ import org.mapstruct.ap.test.bugs._394._target.AnotherCar;
import org.mapstruct.ap.test.bugs._394.source.Cars;
import org.mapstruct.factory.Mappers;
import java.util.List;
import org.mapstruct.InheritInverseConfiguration;
@Mapper
public interface SameNameForSourceAndTargetCarsMapper {

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._405;
import java.util.List;
import java.util.Map;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._513;
import java.util.Arrays;
import java.util.HashMap;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;

View File

@ -19,6 +19,7 @@
package org.mapstruct.ap.test.bugs._516;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.bugs._580;
import static org.fest.assertions.Assertions.assertThat;
import java.time.LocalDate;
import javax.xml.datatype.DatatypeConstants;
@ -33,8 +35,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author Andreas Gudian
*/

View File

@ -18,12 +18,12 @@
*/
package org.mapstruct.ap.test.bugs._581;
import java.util.List;
import org.mapstruct.Mapper;
import org.mapstruct.ap.test.bugs._581.source.Car;
import org.mapstruct.factory.Mappers;
import java.util.List;
@Mapper
public interface SourceTargetMapper {

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.bugs._625;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
@ -25,8 +27,6 @@ import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import org.mapstruct.factory.Mappers;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author Andreas Gudian
*

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._631;
import javax.tools.Diagnostic.Kind;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;

View File

@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.builtin;
import org.mapstruct.ap.test.builtin.mapper.ErroneousSourceTargetWithSqlDateMapper;
import static org.fest.assertions.Assertions.assertThat;
import java.text.DateFormat;
import java.text.ParseException;
@ -58,6 +58,7 @@ import org.mapstruct.ap.test.builtin.mapper.CalendarToStringMapper;
import org.mapstruct.ap.test.builtin.mapper.CalendarToXmlGregCalMapper;
import org.mapstruct.ap.test.builtin.mapper.DateToCalendarMapper;
import org.mapstruct.ap.test.builtin.mapper.DateToXmlGregCalMapper;
import org.mapstruct.ap.test.builtin.mapper.ErroneousSourceTargetWithSqlDateMapper;
import org.mapstruct.ap.test.builtin.mapper.IterableSourceTargetMapper;
import org.mapstruct.ap.test.builtin.mapper.JaxbListMapper;
import org.mapstruct.ap.test.builtin.mapper.JaxbMapper;
@ -78,8 +79,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for the generation of built-in mapping methods.
*

View File

@ -18,9 +18,10 @@
*/
package org.mapstruct.ap.test.builtin.bean;
import javax.xml.bind.JAXBElement;
import java.util.List;
import javax.xml.bind.JAXBElement;
public class JaxbElementListProperty {
private List<JAXBElement<String>> prop;

View File

@ -18,15 +18,14 @@
*/
package org.mapstruct.ap.test.builtin.mapper;
import org.mapstruct.ap.test.builtin._target.IterableTarget;
import org.mapstruct.ap.test.builtin.source.IterableSource;
import java.util.List;
import javax.xml.datatype.XMLGregorianCalendar;
import org.mapstruct.IterableMapping;
import org.mapstruct.Mapper;
import org.mapstruct.ap.test.builtin._target.IterableTarget;
import org.mapstruct.ap.test.builtin.source.IterableSource;
import org.mapstruct.factory.Mappers;
@Mapper

View File

@ -18,15 +18,14 @@
*/
package org.mapstruct.ap.test.builtin.mapper;
import org.mapstruct.ap.test.builtin._target.MapTarget;
import org.mapstruct.ap.test.builtin.source.MapSource;
import java.util.Map;
import javax.xml.bind.JAXBElement;
import javax.xml.datatype.XMLGregorianCalendar;
import org.mapstruct.Mapper;
import org.mapstruct.ap.test.builtin._target.MapTarget;
import org.mapstruct.ap.test.builtin.source.MapSource;
import org.mapstruct.factory.Mappers;
@Mapper

View File

@ -18,9 +18,9 @@
*/
package org.mapstruct.ap.test.builtin.mapper;
import org.mapstruct.Mapper;
import org.mapstruct.ap.test.builtin._target.TargetWithDate;
import org.mapstruct.ap.test.builtin.source.SourceWithDate;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.callbacks;
import static org.fest.assertions.Assertions.assertThat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -34,8 +36,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for callback methods that are defined using {@link BeforeMapping} / {@link AfterMapping}
*

View File

@ -18,16 +18,16 @@
*/
package org.mapstruct.ap.test.callbacks.ongeneratedmethods;
import static org.fest.assertions.Assertions.assertThat;
import java.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
*
* @author Sjaak Derksen

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.callbacks.typematching;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.test.callbacks.typematching.CarMapper.CarDto;
@ -25,8 +27,6 @@ import org.mapstruct.ap.test.callbacks.typematching.CarMapper.CarEntity;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author Andreas Gudian
*

View File

@ -18,11 +18,13 @@
*/
package org.mapstruct.ap.test.collection.adder;
import static org.fest.assertions.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.test.collection.adder._target.AdderUsageObserver;
@ -36,19 +38,15 @@ import org.mapstruct.ap.test.collection.adder._target.TargetHuman;
import org.mapstruct.ap.test.collection.adder._target.TargetOnlyGetter;
import org.mapstruct.ap.test.collection.adder._target.TargetViaTargetType;
import org.mapstruct.ap.test.collection.adder._target.TargetWithoutSetter;
import org.mapstruct.ap.test.collection.adder.source.Foo;
import org.mapstruct.ap.test.collection.adder.source.SingleElementSource;
import org.mapstruct.ap.test.collection.adder.source.Source;
import org.mapstruct.ap.test.collection.adder.source.Source2;
import org.mapstruct.ap.test.collection.adder.source.SourceTeeth;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.mapstruct.ap.test.collection.adder.source.Foo;
import org.mapstruct.ap.test.collection.adder.source.Source2;
/**
* @author Sjaak Derksen
*/

View File

@ -22,13 +22,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
import org.mapstruct.TargetType;
import org.mapstruct.ap.test.collection.adder._target.IndoorPet;
import org.mapstruct.ap.test.collection.adder._target.OutdoorPet;
import org.mapstruct.ap.test.collection.adder._target.Pet;
import com.google.common.collect.ImmutableMap;
/**
* @author Sjaak Derksen
*/

View File

@ -18,6 +18,9 @@
*/
package org.mapstruct.ap.test.collection.defaultimplementation;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@ -29,10 +32,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
/**
* @author Andreas Gudian
*

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
import java.util.Date;
import java.util.List;
import org.mapstruct.IterableMapping;
import org.mapstruct.Mapper;

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
import java.util.Date;
import java.util.Map;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;

View File

@ -64,7 +64,7 @@ public class ErroneousCollectionMappingTest {
diagnostics = {
@Diagnostic(type = EmptyItererableMappingMapper.class,
kind = Kind.ERROR,
line = 35,
line = 36,
messageRegExp = "'nullValueMappingStrategy','dateformat', 'qualifiedBy' and 'elementTargetType' are "
+ "undefined in @IterableMapping, define at least one of them.")
}
@ -80,7 +80,7 @@ public class ErroneousCollectionMappingTest {
diagnostics = {
@Diagnostic(type = EmptyMapMappingMapper.class,
kind = Kind.ERROR,
line = 34,
line = 35,
messageRegExp = "'nullValueMappingStrategy', 'keyDateFormat', 'keyQualifiedBy', 'keyTargetType', "
+ "'valueDateFormat', 'valueQualfiedBy' and 'valueTargetType' are all undefined in @MapMapping, "
+ "define at least one of them.")
@ -97,7 +97,7 @@ public class ErroneousCollectionMappingTest {
diagnostics = {
@Diagnostic(type = ErroneousCollectionNoElementMappingFound.class,
kind = Kind.ERROR,
line = 36,
line = 37,
messageRegExp = "No implementation can be generated for this method. Found no method nor implicit "
+ "conversion for mapping source element type into target element type.")
}
@ -113,7 +113,7 @@ public class ErroneousCollectionMappingTest {
diagnostics = {
@Diagnostic(type = ErroneousCollectionNoKeyMappingFound.class,
kind = Kind.ERROR,
line = 36,
line = 37,
messageRegExp = "No implementation can be generated for this method. Found no method nor implicit "
+ "conversion for mapping source key type to target key type.")
}
@ -129,7 +129,7 @@ public class ErroneousCollectionMappingTest {
diagnostics = {
@Diagnostic(type = ErroneousCollectionNoValueMappingFound.class,
kind = Kind.ERROR,
line = 36,
line = 37,
messageRegExp = "No implementation can be generated for this method. Found no method nor implicit "
+ "conversion for mapping source value type to target value type.")
}

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
import java.text.AttributedString;
import java.util.List;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
import java.text.AttributedString;
import java.util.Map;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
import java.text.AttributedString;
import java.util.Map;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -19,6 +19,8 @@
package org.mapstruct.ap.test.collection.forged;
import static org.fest.assertions.Assertions.assertThat;
import java.util.Map;
import javax.tools.Diagnostic.Kind;
@ -35,8 +37,6 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import com.google.common.collect.ImmutableMap;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for mappings between collection types,
*

View File

@ -18,6 +18,9 @@
*/
package org.mapstruct.ap.test.collection.map;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
@ -30,10 +33,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
/**
* Test for implementation of {@code Map} mapping methods.
*

View File

@ -21,10 +21,10 @@ package org.mapstruct.ap.test.collection.map;
import java.util.Date;
import java.util.Map;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.factory.Mappers;
@Mapper(uses = CustomNumberMapper.class)

View File

@ -19,8 +19,10 @@
package org.mapstruct.ap.test.collection.wildcard;
import java.math.BigDecimal;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -19,6 +19,7 @@
package org.mapstruct.ap.test.collection.wildcard;
import java.math.BigDecimal;
import javax.xml.bind.JAXBElement;
/**

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
import java.math.BigDecimal;
import java.util.List;
import org.mapstruct.Mapper;
/**

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
import java.math.BigDecimal;
import java.util.List;
import org.mapstruct.Mapper;
/**

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
import java.math.BigDecimal;
import java.util.List;
import org.mapstruct.Mapper;
/**

View File

@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
import java.math.BigDecimal;
import java.util.List;
import org.mapstruct.Mapper;
/**

View File

@ -19,6 +19,7 @@
package org.mapstruct.ap.test.collection.wildcard;
import java.math.BigDecimal;
import javax.xml.bind.JAXBElement;
/**

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.collection.wildcard;
import static org.fest.assertions.Assertions.assertThat;
import java.math.BigDecimal;
import javax.xml.bind.JAXBElement;
@ -32,8 +34,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* Reproducer for https://github.com/mapstruct/mapstruct/issues/527.
*
@ -88,7 +88,7 @@ public class WildCardTest {
diagnostics = {
@Diagnostic( type = ErroneousIterableSuperBoundSourceMapper.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 32,
line = 33,
messageRegExp = "Can't generate mapping method for a wildcard super bound source." )
}
)
@ -102,7 +102,7 @@ public class WildCardTest {
diagnostics = {
@Diagnostic( type = ErroneousIterableExtendsBoundTargetMapper.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 32,
line = 33,
messageRegExp = "Can't generate mapping method for a wildcard extends bound result." )
}
)
@ -116,7 +116,7 @@ public class WildCardTest {
diagnostics = {
@Diagnostic(type = ErroneousIterableTypeVarBoundMapperOnMethod.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 32,
line = 33,
messageRegExp = "Can't generate mapping method for a generic type variable target." )
}
)
@ -130,7 +130,7 @@ public class WildCardTest {
diagnostics = {
@Diagnostic( type = ErroneousIterableTypeVarBoundMapperOnMapper.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 32,
line = 33,
messageRegExp = "Can't generate mapping method for a generic type variable source." )
}
)

View File

@ -20,10 +20,10 @@ package org.mapstruct.ap.test.complex;
import java.util.List;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.ap.test.complex._target.CarDto;
import org.mapstruct.ap.test.complex._target.PersonDto;
import org.mapstruct.ap.test.complex.other.DateMapper;

View File

@ -18,10 +18,10 @@
*/
package org.mapstruct.ap.test.conversion;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.factory.Mappers;
@Mapper

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.conversion.java8time;
import static org.fest.assertions.Assertions.assertThat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@ -32,8 +34,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
*
*/

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.conversion.jodatime;
import static org.fest.assertions.Assertions.assertThat;
import java.util.Calendar;
import java.util.Locale;
import java.util.TimeZone;
@ -34,8 +36,6 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* Tests the conversion between Joda-Time types and String/Date/Calendar.
*

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.test.conversion.nativetypes;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
@WithClasses({
BooleanSource.class,
BooleanTarget.class,

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.test.conversion.nativetypes;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
@WithClasses({
CharSource.class,
CharTarget.class,

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.test.conversion.nativetypes;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
@WithClasses({
ByteSource.class,
ByteTarget.class,

View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.test.conversion.string;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
@WithClasses({
Source.class,
Target.class,

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.decorator.jsr330;
import static org.fest.assertions.Assertions.assertThat;
import java.util.Calendar;
import javax.inject.Inject;
@ -39,8 +41,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for the application of decorators using component model jsr330.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.decorator.spring;
import static org.fest.assertions.Assertions.assertThat;
import java.util.Calendar;
import org.junit.After;
@ -37,8 +39,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for the application of decorators using component model spring.
*

View File

@ -18,6 +18,8 @@
*/
package org.mapstruct.ap.test.defaultvalue;
import static org.fest.assertions.Assertions.assertThat;
import java.text.ParseException;
import org.junit.Test;
@ -30,8 +32,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
@IssueKey( "600" )
@RunWith( AnnotationProcessorTestRunner.class )
@WithClasses( {

Some files were not shown because too many files have changed in this diff Show More