mirror of
https://github.com/mapstruct/mapstruct.git
synced 2025-07-12 00:00:08 +08:00
#233 moving conversion.generics package to selection.generics
This commit is contained in:
parent
92b1e3e1c2
commit
e24d3a03e6
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ArrayWrapper<T> {
|
public class ArrayWrapper<T> {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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;
|
import static org.fest.assertions.Assertions.assertThat;
|
||||||
|
|
||||||
@ -97,9 +97,9 @@ public class ConversionTest {
|
|||||||
diagnostics = {
|
diagnostics = {
|
||||||
@Diagnostic(type = ErroneousSourceTargetMapper1.class,
|
@Diagnostic(type = ErroneousSourceTargetMapper1.class,
|
||||||
kind = javax.tools.Diagnostic.Kind.ERROR, line = 29,
|
kind = javax.tools.Diagnostic.Kind.ERROR, line = 29,
|
||||||
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.UpperBoundWrapper"
|
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics.UpperBoundWrapper"
|
||||||
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooUpperBoundFailure\" to "
|
+ "<org.mapstruct.ap.test.selection.generics.TypeA> fooUpperBoundFailure\" to "
|
||||||
+ "\"org.mapstruct.ap.test.conversion.generics.TypeA fooUpperBoundFailure\"")
|
+ "\"org.mapstruct.ap.test.selection.generics.TypeA fooUpperBoundFailure\"")
|
||||||
})
|
})
|
||||||
public void shouldFailOnUpperBound() {
|
public void shouldFailOnUpperBound() {
|
||||||
}
|
}
|
||||||
@ -111,9 +111,9 @@ public class ConversionTest {
|
|||||||
@Diagnostic(type = ErroneousSourceTargetMapper2.class,
|
@Diagnostic(type = ErroneousSourceTargetMapper2.class,
|
||||||
kind = javax.tools.Diagnostic.Kind.ERROR,
|
kind = javax.tools.Diagnostic.Kind.ERROR,
|
||||||
line = 29,
|
line = 29,
|
||||||
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics.WildCardExtendsWrapper"
|
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics.WildCardExtendsWrapper"
|
||||||
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooWildCardExtendsTypeAFailure\" to"
|
+ "<org.mapstruct.ap.test.selection.generics.TypeA> fooWildCardExtendsTypeAFailure\" to"
|
||||||
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardExtendsTypeAFailure\"")
|
+ " \"org.mapstruct.ap.test.selection.generics.TypeA fooWildCardExtendsTypeAFailure\"")
|
||||||
})
|
})
|
||||||
public void shouldFailOnWildCardBound() {
|
public void shouldFailOnWildCardBound() {
|
||||||
}
|
}
|
||||||
@ -125,9 +125,9 @@ public class ConversionTest {
|
|||||||
@Diagnostic(type = ErroneousSourceTargetMapper3.class,
|
@Diagnostic(type = ErroneousSourceTargetMapper3.class,
|
||||||
kind = javax.tools.Diagnostic.Kind.ERROR,
|
kind = javax.tools.Diagnostic.Kind.ERROR,
|
||||||
line = 29,
|
line = 29,
|
||||||
messageRegExp = "Can't map property \"org.mapstruct.ap.test.conversion.generics."
|
messageRegExp = "Can't map property \"org.mapstruct.ap.test.selection.generics."
|
||||||
+ "WildCardExtendsMBWrapper<org.mapstruct.ap.test.conversion.generics.TypeB> "
|
+ "WildCardExtendsMBWrapper<org.mapstruct.ap.test.selection.generics.TypeB> "
|
||||||
+ "fooWildCardExtendsMBTypeBFailure\" to \"org.mapstruct.ap.test.conversion.generics.TypeB "
|
+ "fooWildCardExtendsMBTypeBFailure\" to \"org.mapstruct.ap.test.selection.generics.TypeB "
|
||||||
+ "fooWildCardExtendsMBTypeBFailure\"")
|
+ "fooWildCardExtendsMBTypeBFailure\"")
|
||||||
})
|
})
|
||||||
public void shouldFailOnWildCardMultipleBounds() {
|
public void shouldFailOnWildCardMultipleBounds() {
|
||||||
@ -140,9 +140,9 @@ public class ConversionTest {
|
|||||||
@Diagnostic(type = ErroneousSourceTargetMapper4.class,
|
@Diagnostic(type = ErroneousSourceTargetMapper4.class,
|
||||||
kind = javax.tools.Diagnostic.Kind.ERROR,
|
kind = javax.tools.Diagnostic.Kind.ERROR,
|
||||||
line = 29,
|
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"
|
||||||
+ "<org.mapstruct.ap.test.conversion.generics.TypeA> fooWildCardSuperTypeAFailure\" to"
|
+ "<org.mapstruct.ap.test.selection.generics.TypeA> fooWildCardSuperTypeAFailure\" to"
|
||||||
+ " \"org.mapstruct.ap.test.conversion.generics.TypeA fooWildCardSuperTypeAFailure\"")
|
+ " \"org.mapstruct.ap.test.selection.generics.TypeA fooWildCardSuperTypeAFailure\"")
|
||||||
})
|
})
|
||||||
public void shouldFailOnSuperBounds1() {
|
public void shouldFailOnSuperBounds1() {
|
||||||
}
|
}
|
||||||
@ -154,9 +154,9 @@ public class ConversionTest {
|
|||||||
@Diagnostic(type = ErroneousSourceTargetMapper5.class,
|
@Diagnostic(type = ErroneousSourceTargetMapper5.class,
|
||||||
kind = javax.tools.Diagnostic.Kind.ERROR,
|
kind = javax.tools.Diagnostic.Kind.ERROR,
|
||||||
line = 29,
|
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"
|
||||||
+ "<org.mapstruct.ap.test.conversion.generics.TypeC> fooWildCardSuperTypeCFailure\" to"
|
+ "<org.mapstruct.ap.test.selection.generics.TypeC> fooWildCardSuperTypeCFailure\" to"
|
||||||
+ " \"org.mapstruct.ap.test.conversion.generics.TypeC fooWildCardSuperTypeCFailure\"")
|
+ " \"org.mapstruct.ap.test.selection.generics.TypeC fooWildCardSuperTypeCFailure\"")
|
||||||
})
|
})
|
||||||
public void shouldFailOnSuperBounds2() {
|
public void shouldFailOnSuperBounds2() {
|
||||||
}
|
}
|
||||||
@ -168,9 +168,9 @@ public class ConversionTest {
|
|||||||
@Diagnostic(type = ErroneousSourceTargetMapper6.class,
|
@Diagnostic(type = ErroneousSourceTargetMapper6.class,
|
||||||
kind = javax.tools.Diagnostic.Kind.ERROR,
|
kind = javax.tools.Diagnostic.Kind.ERROR,
|
||||||
line = 29,
|
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"
|
+ "<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() {
|
public void shouldFailOnNonMatchingWildCards() {
|
||||||
}
|
}
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousSource1 {
|
public class ErroneousSource1 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousSource2 {
|
public class ErroneousSource2 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousSource3 {
|
public class ErroneousSource3 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousSource4 {
|
public class ErroneousSource4 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousSource5 {
|
public class ErroneousSource5 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousSource6 {
|
public class ErroneousSource6 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousTarget1 {
|
public class ErroneousTarget1 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousTarget2 {
|
public class ErroneousTarget2 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousTarget3 {
|
public class ErroneousTarget3 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousTarget4 {
|
public class ErroneousTarget4 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousTarget5 {
|
public class ErroneousTarget5 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class ErroneousTarget6 {
|
public class ErroneousTarget6 {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author sjaak
|
* @author sjaak
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class TwoArgWrapper<T1, T2> {
|
public class TwoArgWrapper<T1, T2> {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class TypeA {
|
public class TypeA {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class TypeB extends TypeA {
|
public class TypeB extends TypeA {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author sjaak
|
* @author sjaak
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Testing Multiple Bounds
|
* Testing Multiple Bounds
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author sjaak
|
* @author sjaak
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author sjaak
|
* @author sjaak
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.conversion.generics;
|
package org.mapstruct.ap.test.selection.generics;
|
||||||
|
|
||||||
public class Wrapper<T> {
|
public class Wrapper<T> {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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;
|
import static org.fest.assertions.Assertions.assertThat;
|
||||||
|
|
||||||
@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlElementDecl;
|
|||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mapstruct.ap.test.jaxb.selection.test1.OrderType;
|
import org.mapstruct.ap.test.selection.jaxb.test1.OrderType;
|
||||||
import org.mapstruct.ap.test.jaxb.selection.test2.ObjectFactory;
|
import org.mapstruct.ap.test.selection.jaxb.test2.ObjectFactory;
|
||||||
import org.mapstruct.ap.test.jaxb.selection.test2.OrderShippingDetailsType;
|
import org.mapstruct.ap.test.selection.jaxb.test2.OrderShippingDetailsType;
|
||||||
import org.mapstruct.ap.testutil.IssueKey;
|
import org.mapstruct.ap.testutil.IssueKey;
|
||||||
import org.mapstruct.ap.testutil.WithClasses;
|
import org.mapstruct.ap.testutil.WithClasses;
|
||||||
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
|
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
|
||||||
@ -39,7 +39,7 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
|
|||||||
*/
|
*/
|
||||||
@IssueKey("135")
|
@IssueKey("135")
|
||||||
@WithClasses({
|
@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,
|
OrderDto.class, OrderShippingDetailsDto.class, OrderType.class, OrderShippingDetailsType.class,
|
||||||
OrderMapper.class
|
OrderMapper.class
|
||||||
})
|
})
|
||||||
@ -53,16 +53,16 @@ public class JaxbFactoryMethodSelectionTest {
|
|||||||
// qname and value should match for orderNumbers (distinct 1, 2)
|
// qname and value should match for orderNumbers (distinct 1, 2)
|
||||||
assertThat( target.getOrderNumber1().getValue() ).isEqualTo( 15L );
|
assertThat( target.getOrderNumber1().getValue() ).isEqualTo( 15L );
|
||||||
assertThat( target.getOrderNumber1().getName() ).isEqualTo(
|
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().getValue() ).isEqualTo( 31L );
|
||||||
assertThat( target.getOrderNumber2().getName() ).isEqualTo(
|
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
|
// qname should match for shipping details
|
||||||
assertThat( target.getShippingDetails().getName() ).isEqualTo(
|
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();
|
OrderShippingDetailsType shippingDetails = target.getShippingDetails().getValue();
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.jaxb.selection;
|
package org.mapstruct.ap.test.selection.jaxb;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sjaak Derksen
|
* @author Sjaak Derksen
|
@ -17,14 +17,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.mapstruct.ap.test.jaxb.selection;
|
package org.mapstruct.ap.test.selection.jaxb;
|
||||||
|
|
||||||
import javax.xml.bind.JAXBElement;
|
import javax.xml.bind.JAXBElement;
|
||||||
|
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.ap.test.jaxb.selection.test1.ObjectFactory;
|
import org.mapstruct.ap.test.selection.jaxb.test1.ObjectFactory;
|
||||||
import org.mapstruct.ap.test.jaxb.selection.test1.OrderType;
|
import org.mapstruct.ap.test.selection.jaxb.test1.OrderType;
|
||||||
import org.mapstruct.ap.test.jaxb.selection.test2.OrderShippingDetailsType;
|
import org.mapstruct.ap.test.selection.jaxb.test2.OrderShippingDetailsType;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -32,7 +32,7 @@ import org.mapstruct.factory.Mappers;
|
|||||||
*/
|
*/
|
||||||
@Mapper(uses = {
|
@Mapper(uses = {
|
||||||
ObjectFactory.class,
|
ObjectFactory.class,
|
||||||
org.mapstruct.ap.test.jaxb.selection.test2.ObjectFactory.class
|
org.mapstruct.ap.test.selection.jaxb.test2.ObjectFactory.class
|
||||||
})
|
})
|
||||||
public abstract class OrderMapper {
|
public abstract class OrderMapper {
|
||||||
|
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.mapstruct.ap.test.jaxb.selection;
|
package org.mapstruct.ap.test.selection.jaxb;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sjaak Derksen
|
* @author Sjaak Derksen
|
@ -16,14 +16,14 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.JAXBElement;
|
||||||
import javax.xml.bind.annotation.XmlElementDecl;
|
import javax.xml.bind.annotation.XmlElementDecl;
|
||||||
import javax.xml.bind.annotation.XmlRegistry;
|
import javax.xml.bind.annotation.XmlRegistry;
|
||||||
import javax.xml.namespace.QName;
|
import javax.xml.namespace.QName;
|
||||||
|
|
||||||
import org.mapstruct.ap.test.jaxb.selection.test2.OrderShippingDetailsType;
|
import org.mapstruct.ap.test.selection.jaxb.test2.OrderShippingDetailsType;
|
||||||
|
|
||||||
@XmlRegistry
|
@XmlRegistry
|
||||||
public class ObjectFactory {
|
public class ObjectFactory {
|
@ -17,7 +17,7 @@
|
|||||||
* limitations under the License.
|
* 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.JAXBElement;
|
||||||
import javax.xml.bind.annotation.XmlAccessType;
|
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.XmlElementRef;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
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)
|
@XmlAccessorType(XmlAccessType.FIELD)
|
@ -16,7 +16,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* 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.JAXBElement;
|
||||||
import javax.xml.bind.annotation.XmlElementDecl;
|
import javax.xml.bind.annotation.XmlElementDecl;
|
@ -17,7 +17,7 @@
|
|||||||
* limitations under the License.
|
* 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.JAXBElement;
|
||||||
import javax.xml.bind.annotation.XmlAccessType;
|
import javax.xml.bind.annotation.XmlAccessType;
|
Loading…
x
Reference in New Issue
Block a user