#233 moving conversion.generics package to selection.generics

This commit is contained in:
sjaakd 2014-06-23 14:43:44 +02:00 committed by Gunnar Morling
parent 92b1e3e1c2
commit e24d3a03e6
42 changed files with 72 additions and 72 deletions

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ArrayWrapper<T> {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import static org.fest.assertions.Assertions.assertThat;
@ -97,9 +97,9 @@ public class ConversionTest {
diagnostics = {
@Diagnostic(type = ErroneousSourceTargetMapper1.class,
kind = javax.tools.Diagnostic.Kind.ERROR, line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.UpperBoundWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooUpperBoundFailure\" to "
+ "\"org.mapstruct.ap.test.conversion.generics.TypeA fooUpperBoundFailure\"")
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics.UpperBoundWrapper"
+ "<org.mapstruct.ap.test.selection.generics.TypeA> fooUpperBoundFailure\" to "
+ "\"org.mapstruct.ap.test.selection.generics.TypeA fooUpperBoundFailure\"")
})
public void shouldFailOnUpperBound() {
}
@ -111,9 +111,9 @@ public class ConversionTest {
@Diagnostic(type = ErroneousSourceTargetMapper2.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardExtendsWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooWildCardExtendsTypeAFailure\" to"
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardExtendsTypeAFailure\"")
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics.WildCardExtendsWrapper"
+ "<org.mapstruct.ap.test.selection.generics.TypeA> fooWildCardExtendsTypeAFailure\" to"
+ " \"org.mapstruct.ap.test.selection.generics.TypeA fooWildCardExtendsTypeAFailure\"")
})
public void shouldFailOnWildCardBound() {
}
@ -125,9 +125,9 @@ public class ConversionTest {
@Diagnostic(type = ErroneousSourceTargetMapper3.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics."
+ "WildCardExtendsMBWrapper<org.mapstruct.ap.test.conversion.generics.TypeB> "
+ "fooWildCardExtendsMBTypeBFailure\" to \"org.mapstruct.ap.test.conversion.generics.TypeB "
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics."
+ "WildCardExtendsMBWrapper<org.mapstruct.ap.test.selection.generics.TypeB> "
+ "fooWildCardExtendsMBTypeBFailure\" to \"org.mapstruct.ap.test.selection.generics.TypeB "
+ "fooWildCardExtendsMBTypeBFailure\"")
})
public void shouldFailOnWildCardMultipleBounds() {
@ -140,9 +140,9 @@ public class ConversionTest {
@Diagnostic(type = ErroneousSourceTargetMapper4.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardSuperWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooWildCardSuperTypeAFailure\" to"
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardSuperTypeAFailure\"")
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics.WildCardSuperWrapper"
+ "<org.mapstruct.ap.test.selection.generics.TypeA> fooWildCardSuperTypeAFailure\" to"
+ " \"org.mapstruct.ap.test.selection.generics.TypeA fooWildCardSuperTypeAFailure\"")
})
public void shouldFailOnSuperBounds1() {
}
@ -154,9 +154,9 @@ public class ConversionTest {
@Diagnostic(type = ErroneousSourceTargetMapper5.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardSuperWrapper"
+ "<org.mapstruct.ap.test.conversion.generics.TypeC> fooWildCardSuperTypeCFailure\" to"
+ " \"org.mapstruct.ap.test.conversion.generics.TypeC fooWildCardSuperTypeCFailure\"")
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics.WildCardSuperWrapper"
+ "<org.mapstruct.ap.test.selection.generics.TypeC> fooWildCardSuperTypeCFailure\" to"
+ " \"org.mapstruct.ap.test.selection.generics.TypeC fooWildCardSuperTypeCFailure\"")
})
public void shouldFailOnSuperBounds2() {
}
@ -168,9 +168,9 @@ public class ConversionTest {
@Diagnostic(type = ErroneousSourceTargetMapper6.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 29,
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardSuperWrapper"
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics.WildCardSuperWrapper"
+ "<java.lang.String> foo\" to"
+ " \"org.mapstruct.ap.test.conversion.generics.WildCardSuperWrapper<java.lang.Integer> foo\"")
+ " \"org.mapstruct.ap.test.selection.generics.WildCardSuperWrapper<java.lang.Integer> foo\"")
})
public void shouldFailOnNonMatchingWildCards() {
}

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousSource1 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousSource2 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousSource3 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousSource4 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousSource5 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousSource6 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousTarget1 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousTarget2 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousTarget3 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousTarget4 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousTarget5 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class ErroneousTarget6 {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import java.io.Serializable;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import java.math.BigDecimal;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import java.math.BigDecimal;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
/**
* @author sjaak

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class TwoArgWrapper<T1, T2> {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class TypeA {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class TypeB extends TypeA {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
import java.io.Serializable;

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
/**
* @author sjaak

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
/**
* Testing Multiple Bounds

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
/**
* @author sjaak

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
/**
* @author sjaak

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.conversion.generics;
package org.mapstruct.ap.test.selection.generics;
public class Wrapper<T> {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection;
package org.mapstruct.ap.test.selection.jaxb;
import static org.fest.assertions.Assertions.assertThat;
@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlElementDecl;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.test.jaxb.selection.test1.OrderType;
import org.mapstruct.ap.test.jaxb.selection.test2.ObjectFactory;
import org.mapstruct.ap.test.jaxb.selection.test2.OrderShippingDetailsType;
import org.mapstruct.ap.test.selection.jaxb.test1.OrderType;
import org.mapstruct.ap.test.selection.jaxb.test2.ObjectFactory;
import org.mapstruct.ap.test.selection.jaxb.test2.OrderShippingDetailsType;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
@ -39,7 +39,7 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
*/
@IssueKey("135")
@WithClasses({
org.mapstruct.ap.test.jaxb.selection.test1.ObjectFactory.class, ObjectFactory.class,
org.mapstruct.ap.test.selection.jaxb.test1.ObjectFactory.class, ObjectFactory.class,
OrderDto.class, OrderShippingDetailsDto.class, OrderType.class, OrderShippingDetailsType.class,
OrderMapper.class
})
@ -53,16 +53,16 @@ public class JaxbFactoryMethodSelectionTest {
// qname and value should match for orderNumbers (distinct 1, 2)
assertThat( target.getOrderNumber1().getValue() ).isEqualTo( 15L );
assertThat( target.getOrderNumber1().getName() ).isEqualTo(
org.mapstruct.ap.test.jaxb.selection.test1.ObjectFactory.ORDER_TYPE_ORDER_NUMBER1_QNAME
org.mapstruct.ap.test.selection.jaxb.test1.ObjectFactory.ORDER_TYPE_ORDER_NUMBER1_QNAME
);
assertThat( target.getOrderNumber2().getValue() ).isEqualTo( 31L );
assertThat( target.getOrderNumber2().getName() ).isEqualTo(
org.mapstruct.ap.test.jaxb.selection.test1.ObjectFactory.ORDER_TYPE_ORDER_NUMBER2_QNAME
org.mapstruct.ap.test.selection.jaxb.test1.ObjectFactory.ORDER_TYPE_ORDER_NUMBER2_QNAME
);
// qname should match for shipping details
assertThat( target.getShippingDetails().getName() ).isEqualTo(
org.mapstruct.ap.test.jaxb.selection.test1.ObjectFactory.ORDER_TYPE_SHIPPING_DETAILS_QNAME
org.mapstruct.ap.test.selection.jaxb.test1.ObjectFactory.ORDER_TYPE_SHIPPING_DETAILS_QNAME
);
OrderShippingDetailsType shippingDetails = target.getShippingDetails().getValue();

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection;
package org.mapstruct.ap.test.selection.jaxb;
/**
* @author Sjaak Derksen

View File

@ -17,14 +17,14 @@
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection;
package org.mapstruct.ap.test.selection.jaxb;
import javax.xml.bind.JAXBElement;
import org.mapstruct.Mapper;
import org.mapstruct.ap.test.jaxb.selection.test1.ObjectFactory;
import org.mapstruct.ap.test.jaxb.selection.test1.OrderType;
import org.mapstruct.ap.test.jaxb.selection.test2.OrderShippingDetailsType;
import org.mapstruct.ap.test.selection.jaxb.test1.ObjectFactory;
import org.mapstruct.ap.test.selection.jaxb.test1.OrderType;
import org.mapstruct.ap.test.selection.jaxb.test2.OrderShippingDetailsType;
import org.mapstruct.factory.Mappers;
/**
@ -32,7 +32,7 @@ import org.mapstruct.factory.Mappers;
*/
@Mapper(uses = {
ObjectFactory.class,
org.mapstruct.ap.test.jaxb.selection.test2.ObjectFactory.class
org.mapstruct.ap.test.selection.jaxb.test2.ObjectFactory.class
})
public abstract class OrderMapper {

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection;
package org.mapstruct.ap.test.selection.jaxb;
/**
* @author Sjaak Derksen

View File

@ -16,14 +16,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection.test1;
package org.mapstruct.ap.test.selection.jaxb.test1;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
import org.mapstruct.ap.test.jaxb.selection.test2.OrderShippingDetailsType;
import org.mapstruct.ap.test.selection.jaxb.test2.OrderShippingDetailsType;
@XmlRegistry
public class ObjectFactory {

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection.test1;
package org.mapstruct.ap.test.selection.jaxb.test1;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlType;
import org.mapstruct.ap.test.jaxb.selection.test2.OrderShippingDetailsType;
import org.mapstruct.ap.test.selection.jaxb.test2.OrderShippingDetailsType;
@XmlAccessorType(XmlAccessType.FIELD)

View File

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection.test2;
package org.mapstruct.ap.test.selection.jaxb.test2;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.mapstruct.ap.test.jaxb.selection.test2;
package org.mapstruct.ap.test.selection.jaxb.test2;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;