diff --git a/.gitignore b/.gitignore index cba934ab..de264ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ release.properties .settings/ _site/ user-manual/ -*.iml \ No newline at end of file +*.iml +.DS_Store \ No newline at end of file diff --git a/CHANGES-FORK.md b/CHANGES-FORK.md new file mode 100644 index 00000000..665446ae --- /dev/null +++ b/CHANGES-FORK.md @@ -0,0 +1,19 @@ +## Clairvoyant ModelMapper + +* Moved the java packages from org.modelmapper to org.clairvoyant.modelmapper +* Added a new method to validate the property mapping org.clairvoyant.modelmapper.ModelMapper#validatePropertyMappings() +* Added a new interface - org.clairvoyant.modelmapper.internal.EntityHolder +* Made the following classes and interfaces public. + * org.clairvoyant.modelmapper.internal.MappingContextImpl + * org.clairvoyant.modelmapper.internal.MappingImpl + * org.clairvoyant.modelmapper.internal.Mutator + * org.clairvoyant.modelmapper.internal.PropertyInfoImpl + * org.clairvoyant.modelmapper.internal.MethodAccessor + * org.clairvoyant.modelmapper.internal.PropertyMappingImpl + +* Made the following methods public. + * org.clairvoyant.modelmapper.internal.MappingContextImpl#setParentSource(Object parentSource) + * org.clairvoyant.modelmapper.internal.MappingContextImpl#getParentSource() + +* Modified the method org.clairvoyant.modelmapper.internal.MappingEngineImpl#propertyMap +* Modified the method org.clairvoyant.modelmapper.internal.MappingEngineImpl#resolveSourceValue diff --git a/README.md b/README.md index 60487c43..bc8e3eca 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ModelMapper [![CI](https://github.com/modelmapper/modelmapper/actions/workflows/ci.yml/badge.svg)](https://github.com/modelmapper/modelmapper/actions/workflows/ci.yml) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.modelmapper/modelmapper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.modelmapper/modelmapper) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.clairvoyant.modelmapper/modelmapper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.clairvoyant.modelmapper/modelmapper) [![License](http://img.shields.io/:license-apache-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) ModelMapper is an intelligent object mapping library that automatically maps objects to each other. It uses a convention based approach while providing a simple refactoring safe API for handling specific use cases. diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 18954aa6..989e0a2a 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -4,7 +4,7 @@ modelmapper-parent - org.modelmapper + org.clairvoyant 3.1.2-SNAPSHOT @@ -17,7 +17,7 @@ - org.modelmapper + org.clairvoyant.modelmapper modelmapper ${project.version} diff --git a/benchmarks/src/main/java/org/modelmapper/benchmarks/GiantModelBenchmark.java b/benchmarks/src/main/java/org/modelmapper/benchmarks/GiantModelBenchmark.java deleted file mode 100644 index f8301c19..00000000 --- a/benchmarks/src/main/java/org/modelmapper/benchmarks/GiantModelBenchmark.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.modelmapper.benchmarks; - -import org.modelmapper.ModelMapper; -import org.modelmapper.benchmarks.model.GiantDto; -import org.modelmapper.benchmarks.model.GiantEntity; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.runner.Runner; -import org.openjdk.jmh.runner.RunnerException; -import org.openjdk.jmh.runner.options.Options; -import org.openjdk.jmh.runner.options.OptionsBuilder; - -public class GiantModelBenchmark { - - @Benchmark - public void measureSubclass() { - Class sourceType = new GiantEntity() {}.getClass(); - Class destType = new GiantDto() {}.getClass(); - new ModelMapper().createTypeMap(sourceType, destType); - } - - @Benchmark - public void measure() { - new ModelMapper().createTypeMap(GiantEntity.class, GiantDto.class); - } - - public static void main(String[] args) throws RunnerException { - Options options = new OptionsBuilder() - .include(GiantModelBenchmark.class.getSimpleName()) - .forks(1) - .build(); - new Runner(options).run(); - } -} diff --git a/benchmarks/src/main/java/org/modelmapper/benchmarks/Main.java b/benchmarks/src/main/java/org/modelmapper/benchmarks/Main.java deleted file mode 100644 index aea5cf7e..00000000 --- a/benchmarks/src/main/java/org/modelmapper/benchmarks/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.modelmapper.benchmarks; - -import org.openjdk.jmh.runner.Runner; -import org.openjdk.jmh.runner.RunnerException; -import org.openjdk.jmh.runner.options.CommandLineOptionException; -import org.openjdk.jmh.runner.options.CommandLineOptions; - -public class Main { - - public static void main(String[] args) throws CommandLineOptionException, RunnerException { - new Runner(new CommandLineOptions(args)).run(); - } -} diff --git a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantDto.java b/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantDto.java deleted file mode 100644 index 0c00205d..00000000 --- a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantDto.java +++ /dev/null @@ -1,629 +0,0 @@ -package org.modelmapper.benchmarks.model; - -import java.util.List; - -public class GiantDto { - private String field1; - private String field2; - private String field3; - private String field4; - private String field5; - private String field6; - private String field7; - private String field8; - private String field9; - private String field10; - private String field11; - private String field12; - private String field13; - private String field14; - private String field15; - private String field16; - private String field17; - private String field18; - private String field19; - private String field20; - private String field21; - private String field22; - private String field23; - private String field24; - private String field25; - private String field26; - private String field27; - private String field28; - private String field29; - private String field30; - private String field31; - private String field32; - private String field33; - private String field34; - private String field35; - private String field36; - private String field37; - private String field38; - private String field39; - private String field40; - private String field41; - private String field42; - private String field43; - private String field44; - private String field45; - private String field46; - private String field47; - private String field48; - private String field49; - private String field50; - - private List fields1; - private List fields2; - private List fields3; - private List fields4; - private List fields5; - private List fields6; - private List fields7; - private List fields8; - private List fields9; - private List fields10; - private List fields11; - private List fields12; - private List fields13; - private List fields14; - private List fields15; - private List fields16; - private List fields17; - private List fields18; - private List fields19; - private List fields20; - - public String getField1() { - return field1; - } - - public void setField1(String field1) { - this.field1 = field1; - } - - public String getField2() { - return field2; - } - - public void setField2(String field2) { - this.field2 = field2; - } - - public String getField3() { - return field3; - } - - public void setField3(String field3) { - this.field3 = field3; - } - - public String getField4() { - return field4; - } - - public void setField4(String field4) { - this.field4 = field4; - } - - public String getField5() { - return field5; - } - - public void setField5(String field5) { - this.field5 = field5; - } - - public String getField6() { - return field6; - } - - public void setField6(String field6) { - this.field6 = field6; - } - - public String getField7() { - return field7; - } - - public void setField7(String field7) { - this.field7 = field7; - } - - public String getField8() { - return field8; - } - - public void setField8(String field8) { - this.field8 = field8; - } - - public String getField9() { - return field9; - } - - public void setField9(String field9) { - this.field9 = field9; - } - - public String getField10() { - return field10; - } - - public void setField10(String field10) { - this.field10 = field10; - } - - public String getField11() { - return field11; - } - - public void setField11(String field11) { - this.field11 = field11; - } - - public String getField12() { - return field12; - } - - public void setField12(String field12) { - this.field12 = field12; - } - - public String getField13() { - return field13; - } - - public void setField13(String field13) { - this.field13 = field13; - } - - public String getField14() { - return field14; - } - - public void setField14(String field14) { - this.field14 = field14; - } - - public String getField15() { - return field15; - } - - public void setField15(String field15) { - this.field15 = field15; - } - - public String getField16() { - return field16; - } - - public void setField16(String field16) { - this.field16 = field16; - } - - public String getField17() { - return field17; - } - - public void setField17(String field17) { - this.field17 = field17; - } - - public String getField18() { - return field18; - } - - public void setField18(String field18) { - this.field18 = field18; - } - - public String getField19() { - return field19; - } - - public void setField19(String field19) { - this.field19 = field19; - } - - public String getField20() { - return field20; - } - - public void setField20(String field20) { - this.field20 = field20; - } - - public String getField21() { - return field21; - } - - public void setField21(String field21) { - this.field21 = field21; - } - - public String getField22() { - return field22; - } - - public void setField22(String field22) { - this.field22 = field22; - } - - public String getField23() { - return field23; - } - - public void setField23(String field23) { - this.field23 = field23; - } - - public String getField24() { - return field24; - } - - public void setField24(String field24) { - this.field24 = field24; - } - - public String getField25() { - return field25; - } - - public void setField25(String field25) { - this.field25 = field25; - } - - public String getField26() { - return field26; - } - - public void setField26(String field26) { - this.field26 = field26; - } - - public String getField27() { - return field27; - } - - public void setField27(String field27) { - this.field27 = field27; - } - - public String getField28() { - return field28; - } - - public void setField28(String field28) { - this.field28 = field28; - } - - public String getField29() { - return field29; - } - - public void setField29(String field29) { - this.field29 = field29; - } - - public String getField30() { - return field30; - } - - public void setField30(String field30) { - this.field30 = field30; - } - - public String getField31() { - return field31; - } - - public void setField31(String field31) { - this.field31 = field31; - } - - public String getField32() { - return field32; - } - - public void setField32(String field32) { - this.field32 = field32; - } - - public String getField33() { - return field33; - } - - public void setField33(String field33) { - this.field33 = field33; - } - - public String getField34() { - return field34; - } - - public void setField34(String field34) { - this.field34 = field34; - } - - public String getField35() { - return field35; - } - - public void setField35(String field35) { - this.field35 = field35; - } - - public String getField36() { - return field36; - } - - public void setField36(String field36) { - this.field36 = field36; - } - - public String getField37() { - return field37; - } - - public void setField37(String field37) { - this.field37 = field37; - } - - public String getField38() { - return field38; - } - - public void setField38(String field38) { - this.field38 = field38; - } - - public String getField39() { - return field39; - } - - public void setField39(String field39) { - this.field39 = field39; - } - - public String getField40() { - return field40; - } - - public void setField40(String field40) { - this.field40 = field40; - } - - public String getField41() { - return field41; - } - - public void setField41(String field41) { - this.field41 = field41; - } - - public String getField42() { - return field42; - } - - public void setField42(String field42) { - this.field42 = field42; - } - - public String getField43() { - return field43; - } - - public void setField43(String field43) { - this.field43 = field43; - } - - public String getField44() { - return field44; - } - - public void setField44(String field44) { - this.field44 = field44; - } - - public String getField45() { - return field45; - } - - public void setField45(String field45) { - this.field45 = field45; - } - - public String getField46() { - return field46; - } - - public void setField46(String field46) { - this.field46 = field46; - } - - public String getField47() { - return field47; - } - - public void setField47(String field47) { - this.field47 = field47; - } - - public String getField48() { - return field48; - } - - public void setField48(String field48) { - this.field48 = field48; - } - - public String getField49() { - return field49; - } - - public void setField49(String field49) { - this.field49 = field49; - } - - public String getField50() { - return field50; - } - - public void setField50(String field50) { - this.field50 = field50; - } - - public List getFields1() { - return fields1; - } - - public void setFields1(List fields1) { - this.fields1 = fields1; - } - - public List getFields2() { - return fields2; - } - - public void setFields2(List fields2) { - this.fields2 = fields2; - } - - public List getFields3() { - return fields3; - } - - public void setFields3(List fields3) { - this.fields3 = fields3; - } - - public List getFields4() { - return fields4; - } - - public void setFields4(List fields4) { - this.fields4 = fields4; - } - - public List getFields5() { - return fields5; - } - - public void setFields5(List fields5) { - this.fields5 = fields5; - } - - public List getFields6() { - return fields6; - } - - public void setFields6(List fields6) { - this.fields6 = fields6; - } - - public List getFields7() { - return fields7; - } - - public void setFields7(List fields7) { - this.fields7 = fields7; - } - - public List getFields8() { - return fields8; - } - - public void setFields8(List fields8) { - this.fields8 = fields8; - } - - public List getFields9() { - return fields9; - } - - public void setFields9(List fields9) { - this.fields9 = fields9; - } - - public List getFields10() { - return fields10; - } - - public void setFields10(List fields10) { - this.fields10 = fields10; - } - - public List getFields11() { - return fields11; - } - - public void setFields11(List fields11) { - this.fields11 = fields11; - } - - public List getFields12() { - return fields12; - } - - public void setFields12(List fields12) { - this.fields12 = fields12; - } - - public List getFields13() { - return fields13; - } - - public void setFields13(List fields13) { - this.fields13 = fields13; - } - - public List getFields14() { - return fields14; - } - - public void setFields14(List fields14) { - this.fields14 = fields14; - } - - public List getFields15() { - return fields15; - } - - public void setFields15(List fields15) { - this.fields15 = fields15; - } - - public List getFields16() { - return fields16; - } - - public void setFields16(List fields16) { - this.fields16 = fields16; - } - - public List getFields17() { - return fields17; - } - - public void setFields17(List fields17) { - this.fields17 = fields17; - } - - public List getFields18() { - return fields18; - } - - public void setFields18(List fields18) { - this.fields18 = fields18; - } - - public List getFields19() { - return fields19; - } - - public void setFields19(List fields19) { - this.fields19 = fields19; - } -} diff --git a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantEntity.java b/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantEntity.java deleted file mode 100644 index 6fa36140..00000000 --- a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantEntity.java +++ /dev/null @@ -1,629 +0,0 @@ -package org.modelmapper.benchmarks.model; - -import java.util.List; - -public class GiantEntity { - private String field1; - private String field2; - private String field3; - private String field4; - private String field5; - private String field6; - private String field7; - private String field8; - private String field9; - private String field10; - private String field11; - private String field12; - private String field13; - private String field14; - private String field15; - private String field16; - private String field17; - private String field18; - private String field19; - private String field20; - private String field21; - private String field22; - private String field23; - private String field24; - private String field25; - private String field26; - private String field27; - private String field28; - private String field29; - private String field30; - private String field31; - private String field32; - private String field33; - private String field34; - private String field35; - private String field36; - private String field37; - private String field38; - private String field39; - private String field40; - private String field41; - private String field42; - private String field43; - private String field44; - private String field45; - private String field46; - private String field47; - private String field48; - private String field49; - private String field50; - - private List fields1; - private List fields2; - private List fields3; - private List fields4; - private List fields5; - private List fields6; - private List fields7; - private List fields8; - private List fields9; - private List fields10; - private List fields11; - private List fields12; - private List fields13; - private List fields14; - private List fields15; - private List fields16; - private List fields17; - private List fields18; - private List fields19; - private List fields20; - - public String getField1() { - return field1; - } - - public void setField1(String field1) { - this.field1 = field1; - } - - public String getField2() { - return field2; - } - - public void setField2(String field2) { - this.field2 = field2; - } - - public String getField3() { - return field3; - } - - public void setField3(String field3) { - this.field3 = field3; - } - - public String getField4() { - return field4; - } - - public void setField4(String field4) { - this.field4 = field4; - } - - public String getField5() { - return field5; - } - - public void setField5(String field5) { - this.field5 = field5; - } - - public String getField6() { - return field6; - } - - public void setField6(String field6) { - this.field6 = field6; - } - - public String getField7() { - return field7; - } - - public void setField7(String field7) { - this.field7 = field7; - } - - public String getField8() { - return field8; - } - - public void setField8(String field8) { - this.field8 = field8; - } - - public String getField9() { - return field9; - } - - public void setField9(String field9) { - this.field9 = field9; - } - - public String getField10() { - return field10; - } - - public void setField10(String field10) { - this.field10 = field10; - } - - public String getField11() { - return field11; - } - - public void setField11(String field11) { - this.field11 = field11; - } - - public String getField12() { - return field12; - } - - public void setField12(String field12) { - this.field12 = field12; - } - - public String getField13() { - return field13; - } - - public void setField13(String field13) { - this.field13 = field13; - } - - public String getField14() { - return field14; - } - - public void setField14(String field14) { - this.field14 = field14; - } - - public String getField15() { - return field15; - } - - public void setField15(String field15) { - this.field15 = field15; - } - - public String getField16() { - return field16; - } - - public void setField16(String field16) { - this.field16 = field16; - } - - public String getField17() { - return field17; - } - - public void setField17(String field17) { - this.field17 = field17; - } - - public String getField18() { - return field18; - } - - public void setField18(String field18) { - this.field18 = field18; - } - - public String getField19() { - return field19; - } - - public void setField19(String field19) { - this.field19 = field19; - } - - public String getField20() { - return field20; - } - - public void setField20(String field20) { - this.field20 = field20; - } - - public String getField21() { - return field21; - } - - public void setField21(String field21) { - this.field21 = field21; - } - - public String getField22() { - return field22; - } - - public void setField22(String field22) { - this.field22 = field22; - } - - public String getField23() { - return field23; - } - - public void setField23(String field23) { - this.field23 = field23; - } - - public String getField24() { - return field24; - } - - public void setField24(String field24) { - this.field24 = field24; - } - - public String getField25() { - return field25; - } - - public void setField25(String field25) { - this.field25 = field25; - } - - public String getField26() { - return field26; - } - - public void setField26(String field26) { - this.field26 = field26; - } - - public String getField27() { - return field27; - } - - public void setField27(String field27) { - this.field27 = field27; - } - - public String getField28() { - return field28; - } - - public void setField28(String field28) { - this.field28 = field28; - } - - public String getField29() { - return field29; - } - - public void setField29(String field29) { - this.field29 = field29; - } - - public String getField30() { - return field30; - } - - public void setField30(String field30) { - this.field30 = field30; - } - - public String getField31() { - return field31; - } - - public void setField31(String field31) { - this.field31 = field31; - } - - public String getField32() { - return field32; - } - - public void setField32(String field32) { - this.field32 = field32; - } - - public String getField33() { - return field33; - } - - public void setField33(String field33) { - this.field33 = field33; - } - - public String getField34() { - return field34; - } - - public void setField34(String field34) { - this.field34 = field34; - } - - public String getField35() { - return field35; - } - - public void setField35(String field35) { - this.field35 = field35; - } - - public String getField36() { - return field36; - } - - public void setField36(String field36) { - this.field36 = field36; - } - - public String getField37() { - return field37; - } - - public void setField37(String field37) { - this.field37 = field37; - } - - public String getField38() { - return field38; - } - - public void setField38(String field38) { - this.field38 = field38; - } - - public String getField39() { - return field39; - } - - public void setField39(String field39) { - this.field39 = field39; - } - - public String getField40() { - return field40; - } - - public void setField40(String field40) { - this.field40 = field40; - } - - public String getField41() { - return field41; - } - - public void setField41(String field41) { - this.field41 = field41; - } - - public String getField42() { - return field42; - } - - public void setField42(String field42) { - this.field42 = field42; - } - - public String getField43() { - return field43; - } - - public void setField43(String field43) { - this.field43 = field43; - } - - public String getField44() { - return field44; - } - - public void setField44(String field44) { - this.field44 = field44; - } - - public String getField45() { - return field45; - } - - public void setField45(String field45) { - this.field45 = field45; - } - - public String getField46() { - return field46; - } - - public void setField46(String field46) { - this.field46 = field46; - } - - public String getField47() { - return field47; - } - - public void setField47(String field47) { - this.field47 = field47; - } - - public String getField48() { - return field48; - } - - public void setField48(String field48) { - this.field48 = field48; - } - - public String getField49() { - return field49; - } - - public void setField49(String field49) { - this.field49 = field49; - } - - public String getField50() { - return field50; - } - - public void setField50(String field50) { - this.field50 = field50; - } - - public List getFields1() { - return fields1; - } - - public void setFields1(List fields1) { - this.fields1 = fields1; - } - - public List getFields2() { - return fields2; - } - - public void setFields2(List fields2) { - this.fields2 = fields2; - } - - public List getFields3() { - return fields3; - } - - public void setFields3(List fields3) { - this.fields3 = fields3; - } - - public List getFields4() { - return fields4; - } - - public void setFields4(List fields4) { - this.fields4 = fields4; - } - - public List getFields5() { - return fields5; - } - - public void setFields5(List fields5) { - this.fields5 = fields5; - } - - public List getFields6() { - return fields6; - } - - public void setFields6(List fields6) { - this.fields6 = fields6; - } - - public List getFields7() { - return fields7; - } - - public void setFields7(List fields7) { - this.fields7 = fields7; - } - - public List getFields8() { - return fields8; - } - - public void setFields8(List fields8) { - this.fields8 = fields8; - } - - public List getFields9() { - return fields9; - } - - public void setFields9(List fields9) { - this.fields9 = fields9; - } - - public List getFields10() { - return fields10; - } - - public void setFields10(List fields10) { - this.fields10 = fields10; - } - - public List getFields11() { - return fields11; - } - - public void setFields11(List fields11) { - this.fields11 = fields11; - } - - public List getFields12() { - return fields12; - } - - public void setFields12(List fields12) { - this.fields12 = fields12; - } - - public List getFields13() { - return fields13; - } - - public void setFields13(List fields13) { - this.fields13 = fields13; - } - - public List getFields14() { - return fields14; - } - - public void setFields14(List fields14) { - this.fields14 = fields14; - } - - public List getFields15() { - return fields15; - } - - public void setFields15(List fields15) { - this.fields15 = fields15; - } - - public List getFields16() { - return fields16; - } - - public void setFields16(List fields16) { - this.fields16 = fields16; - } - - public List getFields17() { - return fields17; - } - - public void setFields17(List fields17) { - this.fields17 = fields17; - } - - public List getFields18() { - return fields18; - } - - public void setFields18(List fields18) { - this.fields18 = fields18; - } - - public List getFields19() { - return fields19; - } - - public void setFields19(List fields19) { - this.fields19 = fields19; - } -} diff --git a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantFieldDto.java b/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantFieldDto.java deleted file mode 100644 index 6530eebe..00000000 --- a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantFieldDto.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.modelmapper.benchmarks.model; - -public class GiantFieldDto { - private String field1; - private String field2; - private String field3; - private String field4; - private String field5; - private String field6; - private String field7; - private String field8; - private String field9; - private String field10; - private String field11; - private String field12; - private String field13; - private String field14; - private String field15; - private String field16; - private String field17; - private String field18; - private String field19; - private String field20; - - public String getField1() { - return field1; - } - - public void setField1(String field1) { - this.field1 = field1; - } - - public String getField2() { - return field2; - } - - public void setField2(String field2) { - this.field2 = field2; - } - - public String getField3() { - return field3; - } - - public void setField3(String field3) { - this.field3 = field3; - } - - public String getField4() { - return field4; - } - - public void setField4(String field4) { - this.field4 = field4; - } - - public String getField5() { - return field5; - } - - public void setField5(String field5) { - this.field5 = field5; - } - - public String getField6() { - return field6; - } - - public void setField6(String field6) { - this.field6 = field6; - } - - public String getField7() { - return field7; - } - - public void setField7(String field7) { - this.field7 = field7; - } - - public String getField8() { - return field8; - } - - public void setField8(String field8) { - this.field8 = field8; - } - - public String getField9() { - return field9; - } - - public void setField9(String field9) { - this.field9 = field9; - } - - public String getField10() { - return field10; - } - - public void setField10(String field10) { - this.field10 = field10; - } - - public String getField11() { - return field11; - } - - public void setField11(String field11) { - this.field11 = field11; - } - - public String getField12() { - return field12; - } - - public void setField12(String field12) { - this.field12 = field12; - } - - public String getField13() { - return field13; - } - - public void setField13(String field13) { - this.field13 = field13; - } - - public String getField14() { - return field14; - } - - public void setField14(String field14) { - this.field14 = field14; - } - - public String getField15() { - return field15; - } - - public void setField15(String field15) { - this.field15 = field15; - } - - public String getField16() { - return field16; - } - - public void setField16(String field16) { - this.field16 = field16; - } - - public String getField17() { - return field17; - } - - public void setField17(String field17) { - this.field17 = field17; - } - - public String getField18() { - return field18; - } - - public void setField18(String field18) { - this.field18 = field18; - } - - public String getField19() { - return field19; - } - - public void setField19(String field19) { - this.field19 = field19; - } - - public String getField20() { - return field20; - } - - public void setField20(String field20) { - this.field20 = field20; - } -} diff --git a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantFieldEntity.java b/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantFieldEntity.java deleted file mode 100644 index d813f1fe..00000000 --- a/benchmarks/src/main/java/org/modelmapper/benchmarks/model/GiantFieldEntity.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.modelmapper.benchmarks.model; - -public class GiantFieldEntity { - private String field1; - private String field2; - private String field3; - private String field4; - private String field5; - private String field6; - private String field7; - private String field8; - private String field9; - private String field10; - private String field11; - private String field12; - private String field13; - private String field14; - private String field15; - private String field16; - private String field17; - private String field18; - private String field19; - private String field20; - - public String getField1() { - return field1; - } - - public void setField1(String field1) { - this.field1 = field1; - } - - public String getField2() { - return field2; - } - - public void setField2(String field2) { - this.field2 = field2; - } - - public String getField3() { - return field3; - } - - public void setField3(String field3) { - this.field3 = field3; - } - - public String getField4() { - return field4; - } - - public void setField4(String field4) { - this.field4 = field4; - } - - public String getField5() { - return field5; - } - - public void setField5(String field5) { - this.field5 = field5; - } - - public String getField6() { - return field6; - } - - public void setField6(String field6) { - this.field6 = field6; - } - - public String getField7() { - return field7; - } - - public void setField7(String field7) { - this.field7 = field7; - } - - public String getField8() { - return field8; - } - - public void setField8(String field8) { - this.field8 = field8; - } - - public String getField9() { - return field9; - } - - public void setField9(String field9) { - this.field9 = field9; - } - - public String getField10() { - return field10; - } - - public void setField10(String field10) { - this.field10 = field10; - } - - public String getField11() { - return field11; - } - - public void setField11(String field11) { - this.field11 = field11; - } - - public String getField12() { - return field12; - } - - public void setField12(String field12) { - this.field12 = field12; - } - - public String getField13() { - return field13; - } - - public void setField13(String field13) { - this.field13 = field13; - } - - public String getField14() { - return field14; - } - - public void setField14(String field14) { - this.field14 = field14; - } - - public String getField15() { - return field15; - } - - public void setField15(String field15) { - this.field15 = field15; - } - - public String getField16() { - return field16; - } - - public void setField16(String field16) { - this.field16 = field16; - } - - public String getField17() { - return field17; - } - - public void setField17(String field17) { - this.field17 = field17; - } - - public String getField18() { - return field18; - } - - public void setField18(String field18) { - this.field18 = field18; - } - - public String getField19() { - return field19; - } - - public void setField19(String field19) { - this.field19 = field19; - } - - public String getField20() { - return field20; - } - - public void setField20(String field20) { - this.field20 = field20; - } -} diff --git a/core/dependency-reduced-pom.xml b/core/dependency-reduced-pom.xml new file mode 100644 index 00000000..0880a848 --- /dev/null +++ b/core/dependency-reduced-pom.xml @@ -0,0 +1,242 @@ + + + + modelmapper-parent + org.clairvoyant + 3.1.2-SNAPSHOT + + 4.0.0 + modelmapper + ModelMapper + + + + maven-shade-plugin + 3.2.0 + + + + shade + + + + + + + net.bytebuddy + org.clairvoyant.modelmapper.internal.bytebuddy + + + org.objectweb.asm + org.clairvoyant.modelmapper.internal.asm + + + org.objenesis + org.clairvoyant.modelmapper.internal.objenesis + + + net.jodah.typetools + org.clairvoyant.modelmapper.internal.typetools + + + + + + maven-surefire-plugin + 3.0.0-M5 + + + src/test/resources/testngAll.xml + + + + + maven-javadoc-plugin + 2.9.1 + + false + *.internal + + + + org.apache.felix + maven-bundle-plugin + 3.5.0 + + + bundle-manifest + + manifest + + + + + + ${project.artifactId} + !org.clairvoyant.modelmapper.internal.*, + org.clairvoyant.modelmapper*;-noimport:=true + *;scope=runtime;inline=true + !net.bytebuddy*, + !org.objectweb*, + !net.jodah*, + !org.objenesis*, + sun.misc;resolution:=optional, + * + + + + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + + + javassist + javassist + 3.12.1.GA + test + + + org.mockito + mockito-core + 4.2.0 + test + + + byte-buddy + net.bytebuddy + + + byte-buddy-agent + net.bytebuddy + + + + + com.h2database + h2 + 2.0.206 + test + + + org.hibernate + hibernate-entitymanager + 5.6.3.Final + test + + + jboss-logging + org.jboss.logging + + + hibernate-core + org.hibernate + + + hibernate-commons-annotations + org.hibernate.common + + + javax.persistence-api + javax.persistence + + + jboss-transaction-api_1.2_spec + org.jboss.spec.javax.transaction + + + byte-buddy + net.bytebuddy + + + + + cglib + cglib + 3.3.0 + test + + + net.sf.dozer + dozer + 5.5.1 + test + + + commons-beanutils + commons-beanutils + + + commons-lang3 + org.apache.commons + + + slf4j-api + org.slf4j + + + jcl-over-slf4j + org.slf4j + + + + + ma.glasnost.orika + orika-core + 1.5.4 + test + + + javassist + org.javassist + + + paranamer + com.thoughtworks.paranamer + + + java-sizeof + com.carrotsearch + + + janino + org.codehaus.janino + + + slf4j-api + org.slf4j + + + + + org.testng + testng + 7.5 + test + + + jsr305 + com.google.code.findbugs + + + jcommander + com.beust + + + jquery + org.webjars + + + slf4j-api + org.slf4j + + + + + diff --git a/core/pom.xml b/core/pom.xml index 48114810..5b7d28ba 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.modelmapper + org.clairvoyant modelmapper-parent 3.1.2-SNAPSHOT @@ -86,19 +86,19 @@ net.bytebuddy - org.modelmapper.internal.bytebuddy + org.clairvoyant.modelmapper.internal.bytebuddy org.objectweb.asm - org.modelmapper.internal.asm + org.clairvoyant.modelmapper.internal.asm org.objenesis - org.modelmapper.internal.objenesis + org.clairvoyant.modelmapper.internal.objenesis net.jodah.typetools - org.modelmapper.internal.typetools + org.clairvoyant.modelmapper.internal.typetools @@ -139,8 +139,8 @@ ${project.artifactId} - !org.modelmapper.internal.*, - org.modelmapper*;-noimport:=true + !org.clairvoyant.modelmapper.internal.*, + org.clairvoyant.modelmapper*;-noimport:=true *;scope=runtime;inline=true diff --git a/core/src/main/java/org/modelmapper/AbstractCondition.java b/core/src/main/java/org/clairvoyant/modelmapper/AbstractCondition.java similarity index 91% rename from core/src/main/java/org/modelmapper/AbstractCondition.java rename to core/src/main/java/org/clairvoyant/modelmapper/AbstractCondition.java index 96edf254..b1c0ecee 100644 --- a/core/src/main/java/org/modelmapper/AbstractCondition.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/AbstractCondition.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; -import org.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.Assert; /** * Condition support class. diff --git a/core/src/main/java/org/modelmapper/AbstractConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/AbstractConverter.java similarity index 90% rename from core/src/main/java/org/modelmapper/AbstractConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/AbstractConverter.java index 04417ec9..a13912eb 100644 --- a/core/src/main/java/org/modelmapper/AbstractConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/AbstractConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import net.jodah.typetools.TypeResolver; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converter support class. Allows for simpler Converter implementations. diff --git a/core/src/main/java/org/modelmapper/AbstractProvider.java b/core/src/main/java/org/clairvoyant/modelmapper/AbstractProvider.java similarity index 93% rename from core/src/main/java/org/modelmapper/AbstractProvider.java rename to core/src/main/java/org/clairvoyant/modelmapper/AbstractProvider.java index 44b4e13e..0e639a49 100644 --- a/core/src/main/java/org/modelmapper/AbstractProvider.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/AbstractProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import net.jodah.typetools.TypeResolver; diff --git a/core/src/main/java/org/modelmapper/Condition.java b/core/src/main/java/org/clairvoyant/modelmapper/Condition.java similarity index 88% rename from core/src/main/java/org/modelmapper/Condition.java rename to core/src/main/java/org/clairvoyant/modelmapper/Condition.java index 03d904f6..bd5c727f 100644 --- a/core/src/main/java/org/modelmapper/Condition.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/Condition.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Condition that must apply in order for mapping to occur. diff --git a/core/src/main/java/org/modelmapper/Conditions.java b/core/src/main/java/org/clairvoyant/modelmapper/Conditions.java similarity index 94% rename from core/src/main/java/org/modelmapper/Conditions.java rename to core/src/main/java/org/clairvoyant/modelmapper/Conditions.java index 5a3badc4..c6214f5e 100644 --- a/core/src/main/java/org/modelmapper/Conditions.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/Conditions.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import java.io.Serializable; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * {@link Condition} utilities and implementations. This class can be extended by a PropertyMap to diff --git a/core/src/main/java/org/modelmapper/ConfigurationException.java b/core/src/main/java/org/clairvoyant/modelmapper/ConfigurationException.java similarity index 88% rename from core/src/main/java/org/modelmapper/ConfigurationException.java rename to core/src/main/java/org/clairvoyant/modelmapper/ConfigurationException.java index 9029db4a..3a431b4f 100644 --- a/core/src/main/java/org/modelmapper/ConfigurationException.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/ConfigurationException.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.modelmapper.internal.Errors; -import org.modelmapper.spi.ErrorMessage; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.spi.ErrorMessage; /** * Thrown when invalid configuration is detected. diff --git a/core/src/main/java/org/modelmapper/Converter.java b/core/src/main/java/org/clairvoyant/modelmapper/Converter.java similarity index 89% rename from core/src/main/java/org/modelmapper/Converter.java rename to core/src/main/java/org/clairvoyant/modelmapper/Converter.java index d7f3d480..4d80404d 100644 --- a/core/src/main/java/org/modelmapper/Converter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/Converter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts instances of source type {@code S} to instances of destination type {@code D}. diff --git a/core/src/main/java/org/modelmapper/Converters.java b/core/src/main/java/org/clairvoyant/modelmapper/Converters.java similarity index 77% rename from core/src/main/java/org/modelmapper/Converters.java rename to core/src/main/java/org/clairvoyant/modelmapper/Converters.java index ee8c7dd7..e7d9fc1c 100644 --- a/core/src/main/java/org/modelmapper/Converters.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/Converters.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; -import org.modelmapper.internal.util.MappingContextHelper; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.util.MappingContextHelper; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Provides helper methods to create converters. * - * @see org.modelmapper.Converter + * @see org.clairvoyant.modelmapper.Converter */ public class Converters { private Converters() { @@ -59,7 +59,7 @@ public interface ChainableConverter { * @param the final destination type * @return a converter */ - org.modelmapper.Converter to(Class destinationType); + org.clairvoyant.modelmapper.Converter to(Class destinationType); /** * Chains a converter of {@code S} -> {@code D1} to {@code S} -> {@code D2} with given converter. @@ -68,7 +68,7 @@ public interface ChainableConverter { * @param the final destination type * @return a converter */ - org.modelmapper.Converter map(org.modelmapper.Converter converter); + org.clairvoyant.modelmapper.Converter map(org.clairvoyant.modelmapper.Converter converter); } /** @@ -88,8 +88,8 @@ public static class Collection { * @param the destination element type * @return a Converter */ - public static org.modelmapper.Converter, java.util.Collection> map(final Converter elementConverter) { - return new org.modelmapper.Converter, java.util.Collection>() { + public static org.clairvoyant.modelmapper.Converter, java.util.Collection> map(final Converter elementConverter) { + return new org.clairvoyant.modelmapper.Converter, java.util.Collection>() { @Override public java.util.Collection convert( MappingContext, java.util.Collection> context) { @@ -118,8 +118,8 @@ public java.util.Collection convert( public static ChainableConverter, S> first() { return new ChainableConverter, S>() { @Override - public org.modelmapper.Converter, D> to(Class destinationType) { - return new org.modelmapper.Converter, D>() { + public org.clairvoyant.modelmapper.Converter, D> to(Class destinationType) { + return new org.clairvoyant.modelmapper.Converter, D>() { @Override public D convert(MappingContext, D> context) { if (context.getSource() == null || context.getSource().isEmpty()) @@ -132,9 +132,9 @@ public D convert(MappingContext, D> context) { } @Override - public org.modelmapper.Converter, D> map( - final org.modelmapper.Converter converter) { - return new org.modelmapper.Converter, D>() { + public org.clairvoyant.modelmapper.Converter, D> map( + final org.clairvoyant.modelmapper.Converter converter) { + return new org.clairvoyant.modelmapper.Converter, D>() { @Override public D convert(MappingContext, D> context) { if (context.getSource() == null || context.getSource().isEmpty()) diff --git a/core/src/main/java/org/modelmapper/ExpressionMap.java b/core/src/main/java/org/clairvoyant/modelmapper/ExpressionMap.java similarity index 91% rename from core/src/main/java/org/modelmapper/ExpressionMap.java rename to core/src/main/java/org/clairvoyant/modelmapper/ExpressionMap.java index e07bb52f..54da6cc1 100644 --- a/core/src/main/java/org/modelmapper/ExpressionMap.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/ExpressionMap.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; -import org.modelmapper.builder.ConfigurableConditionExpression; +import org.clairvoyant.modelmapper.builder.ConfigurableConditionExpression; /** * Represents an operation that accepts {@code mapping} and use functions diff --git a/core/src/main/java/org/modelmapper/MappingException.java b/core/src/main/java/org/clairvoyant/modelmapper/MappingException.java similarity index 88% rename from core/src/main/java/org/modelmapper/MappingException.java rename to core/src/main/java/org/clairvoyant/modelmapper/MappingException.java index 18818a2f..ef177a0c 100644 --- a/core/src/main/java/org/modelmapper/MappingException.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/MappingException.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.modelmapper.internal.Errors; -import org.modelmapper.spi.ErrorMessage; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.spi.ErrorMessage; /** * Indicates that an error has occurred during a mapping operation. diff --git a/core/src/main/java/org/modelmapper/ModelMapper.java b/core/src/main/java/org/clairvoyant/modelmapper/ModelMapper.java similarity index 93% rename from core/src/main/java/org/modelmapper/ModelMapper.java rename to core/src/main/java/org/clairvoyant/modelmapper/ModelMapper.java index e60f895a..62e6965d 100644 --- a/core/src/main/java/org/modelmapper/ModelMapper.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/ModelMapper.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import net.jodah.typetools.TypeResolver; import java.lang.reflect.Type; import java.util.Collection; -import org.modelmapper.config.Configuration; -import org.modelmapper.internal.Errors; -import org.modelmapper.internal.InheritingConfiguration; -import org.modelmapper.internal.MappingEngineImpl; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.internal.InheritingConfiguration; +import org.clairvoyant.modelmapper.internal.MappingEngineImpl; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.Types; /** * ModelMapper - Performs object mapping, maintains {@link Configuration} and stores {@link TypeMap @@ -563,6 +563,27 @@ public void validate() { errors.throwValidationExceptionIfErrorsExist(); } + /** + * Validates that every property for each configured TypeMap is + * mapped, or that a {@code Converter} was + * {@link TypeMap#setConverter(Converter) set} for the TypeMap. If not, a ConfigurationException + * is thrown detailing any missing mappings. + * + * @throws ValidationException if any TypeMaps contain unmapped properties + */ + public void validatePropertyMappings() { + Errors errors = new Errors(); + for (TypeMap typeMap : getTypeMaps()) { + try { + typeMap.validateRootFieldMappings(); + } catch (ValidationException e) { + errors.merge(e.getErrorMessages()); + } + } + + errors.throwValidationExceptionIfErrorsExist(); + } + /** * Register a module * diff --git a/core/src/main/java/org/modelmapper/Module.java b/core/src/main/java/org/clairvoyant/modelmapper/Module.java similarity index 86% rename from core/src/main/java/org/modelmapper/Module.java rename to core/src/main/java/org/clairvoyant/modelmapper/Module.java index 8bab6c29..fe605657 100644 --- a/core/src/main/java/org/modelmapper/Module.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/Module.java @@ -1,4 +1,4 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; /** * Simple interface for extensions that can be registered with {@link ModelMapper} diff --git a/core/src/main/java/org/modelmapper/PropertyMap.java b/core/src/main/java/org/clairvoyant/modelmapper/PropertyMap.java similarity index 93% rename from core/src/main/java/org/modelmapper/PropertyMap.java rename to core/src/main/java/org/clairvoyant/modelmapper/PropertyMap.java index ef45668a..7539aeff 100644 --- a/core/src/main/java/org/modelmapper/PropertyMap.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/PropertyMap.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import net.jodah.typetools.TypeResolver; -import org.modelmapper.builder.ConverterExpression; -import org.modelmapper.builder.MapExpression; -import org.modelmapper.builder.ProviderExpression; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.internal.ExplicitMappingBuilder; -import org.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.builder.ConverterExpression; +import org.clairvoyant.modelmapper.builder.MapExpression; +import org.clairvoyant.modelmapper.builder.ProviderExpression; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.internal.ExplicitMappingBuilder; +import org.clairvoyant.modelmapper.internal.util.Assert; /** * A PropertyMap defines mappings between properties for a particular source and destination type. @@ -99,7 +99,7 @@ * * Note: In order to populate the destination object, deep mapping requires the * {@code getCustomer} method to have a corresponding mutator, such as a {@code setCustomer} method - * or an {@link org.modelmapper.config.Configuration#setFieldAccessLevel(AccessLevel) accessible} + * or an {@link org.clairvoyant.modelmapper.config.Configuration#setFieldAccessLevel(AccessLevel) accessible} * {@code customer} field. *

* We can also mix field references into either the source or destination when deep mapping. diff --git a/core/src/main/java/org/modelmapper/Provider.java b/core/src/main/java/org/clairvoyant/modelmapper/Provider.java similarity index 94% rename from core/src/main/java/org/modelmapper/Provider.java rename to core/src/main/java/org/clairvoyant/modelmapper/Provider.java index e11001cc..0e617053 100644 --- a/core/src/main/java/org/modelmapper/Provider.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/Provider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; /** * Provides instances of type {@code T}. diff --git a/core/src/main/java/org/modelmapper/TypeMap.java b/core/src/main/java/org/clairvoyant/modelmapper/TypeMap.java similarity index 91% rename from core/src/main/java/org/modelmapper/TypeMap.java rename to core/src/main/java/org/clairvoyant/modelmapper/TypeMap.java index 8f66017e..b100ba4a 100644 --- a/core/src/main/java/org/modelmapper/TypeMap.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/TypeMap.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import java.util.List; -import org.modelmapper.spi.DestinationSetter; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.SourceGetter; -import org.modelmapper.spi.TypeSafeSourceGetter; +import org.clairvoyant.modelmapper.spi.DestinationSetter; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.SourceGetter; +import org.clairvoyant.modelmapper.spi.TypeSafeSourceGetter; /** * Encapsulates mapping configuration for a source and destination type pair. @@ -140,6 +140,8 @@ public interface TypeMap { */ List getUnmappedProperties(); + List getUnmappedRootProperties(); + /** * Maps {@code source} to an instance of type {@code D}. * @@ -232,6 +234,14 @@ public interface TypeMap { */ void validate(); + /** + * Validates that every property is mapped , or that a {@code Converter} was {@link #setConverter(Converter) set}. If not, a + * ConfigurationException is thrown detailing any missing mappings. + * + * @throws ValidationException if any TypeMaps contain unmapped properties + */ + void validateRootFieldMappings(); + /** * Adds a mapping into {@code TypeMap} by defining {@code sourceGetter} -> {@code destinationSetter} * diff --git a/core/src/main/java/org/modelmapper/TypeToken.java b/core/src/main/java/org/clairvoyant/modelmapper/TypeToken.java similarity index 95% rename from core/src/main/java/org/modelmapper/TypeToken.java rename to core/src/main/java/org/clairvoyant/modelmapper/TypeToken.java index 0be6d393..1a72dbb2 100644 --- a/core/src/main/java/org/modelmapper/TypeToken.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/TypeToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; @@ -21,8 +21,8 @@ import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.Types; /** * Represents a generic type {@code T}. Subclassing TypeToken allows for type information to be diff --git a/core/src/main/java/org/modelmapper/ValidationException.java b/core/src/main/java/org/clairvoyant/modelmapper/ValidationException.java similarity index 88% rename from core/src/main/java/org/modelmapper/ValidationException.java rename to core/src/main/java/org/clairvoyant/modelmapper/ValidationException.java index 929f8b4a..6fc3f3fe 100644 --- a/core/src/main/java/org/modelmapper/ValidationException.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/ValidationException.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.modelmapper.internal.Errors; -import org.modelmapper.spi.ErrorMessage; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.spi.ErrorMessage; /** * Indicates that an error has occurred during a validate operation. diff --git a/core/src/main/java/org/modelmapper/builder/ConditionExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConditionExpression.java similarity index 90% rename from core/src/main/java/org/modelmapper/builder/ConditionExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/ConditionExpression.java index eff3f934..4187309a 100644 --- a/core/src/main/java/org/modelmapper/builder/ConditionExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConditionExpression.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.Condition; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.PropertyMap; /** * Expresses a Condition. diff --git a/core/src/main/java/org/modelmapper/builder/ConfigurableConditionExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableConditionExpression.java similarity index 93% rename from core/src/main/java/org/modelmapper/builder/ConfigurableConditionExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableConditionExpression.java index 2ac3279b..58123918 100644 --- a/core/src/main/java/org/modelmapper/builder/ConfigurableConditionExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableConditionExpression.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.Condition; +import org.clairvoyant.modelmapper.Condition; /** * Represents mapping operations. diff --git a/core/src/main/java/org/modelmapper/builder/ConfigurableConverterExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableConverterExpression.java similarity index 87% rename from core/src/main/java/org/modelmapper/builder/ConfigurableConverterExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableConverterExpression.java index 371d229d..257bf68b 100644 --- a/core/src/main/java/org/modelmapper/builder/ConfigurableConverterExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableConverterExpression.java @@ -1,6 +1,6 @@ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.Converter; +import org.clairvoyant.modelmapper.Converter; public interface ConfigurableConverterExpression extends ReferenceMapExpression { diff --git a/core/src/main/java/org/modelmapper/builder/ConfigurableProviderExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableProviderExpression.java similarity index 86% rename from core/src/main/java/org/modelmapper/builder/ConfigurableProviderExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableProviderExpression.java index 14bf2a47..f14cbf43 100644 --- a/core/src/main/java/org/modelmapper/builder/ConfigurableProviderExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConfigurableProviderExpression.java @@ -1,6 +1,6 @@ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.Provider; public interface ConfigurableProviderExpression extends ConfigurableConverterExpression { diff --git a/core/src/main/java/org/modelmapper/builder/ConverterExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConverterExpression.java similarity index 90% rename from core/src/main/java/org/modelmapper/builder/ConverterExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/ConverterExpression.java index 6983ef96..d40ac281 100644 --- a/core/src/main/java/org/modelmapper/builder/ConverterExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/ConverterExpression.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; /** * Expresses a Converter. diff --git a/core/src/main/java/org/modelmapper/builder/MapExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/MapExpression.java similarity index 91% rename from core/src/main/java/org/modelmapper/builder/MapExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/MapExpression.java index 48e92fc5..3f537f84 100644 --- a/core/src/main/java/org/modelmapper/builder/MapExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/MapExpression.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.PropertyMap; /** * Expresses mapping. diff --git a/core/src/main/java/org/modelmapper/builder/ProviderExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/ProviderExpression.java similarity index 90% rename from core/src/main/java/org/modelmapper/builder/ProviderExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/ProviderExpression.java index cd4355d6..9c5f6b23 100644 --- a/core/src/main/java/org/modelmapper/builder/ProviderExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/ProviderExpression.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; /** * Expresses a Provider. diff --git a/core/src/main/java/org/modelmapper/builder/ReferenceMapExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/ReferenceMapExpression.java similarity index 93% rename from core/src/main/java/org/modelmapper/builder/ReferenceMapExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/ReferenceMapExpression.java index 0a02a8ad..6ff30779 100644 --- a/core/src/main/java/org/modelmapper/builder/ReferenceMapExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/ReferenceMapExpression.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.spi.DestinationSetter; -import org.modelmapper.spi.SourceGetter; +import org.clairvoyant.modelmapper.spi.DestinationSetter; +import org.clairvoyant.modelmapper.spi.SourceGetter; /** * Represents mapping actions, to set a destination property from a source property, diff --git a/core/src/main/java/org/modelmapper/builder/SkipExpression.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/SkipExpression.java similarity index 95% rename from core/src/main/java/org/modelmapper/builder/SkipExpression.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/SkipExpression.java index f69d1e32..c04bff79 100644 --- a/core/src/main/java/org/modelmapper/builder/SkipExpression.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/SkipExpression.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.PropertyMap; /** * Expresses a mapping that is skipped. diff --git a/core/src/main/java/org/modelmapper/builder/package-info.java b/core/src/main/java/org/clairvoyant/modelmapper/builder/package-info.java similarity index 56% rename from core/src/main/java/org/modelmapper/builder/package-info.java rename to core/src/main/java/org/clairvoyant/modelmapper/builder/package-info.java index adf627e5..d3627f49 100644 --- a/core/src/main/java/org/modelmapper/builder/package-info.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/builder/package-info.java @@ -1,5 +1,5 @@ /** * Expression types for building Mappings and TypeMaps */ -package org.modelmapper.builder; +package org.clairvoyant.modelmapper.builder; diff --git a/core/src/main/java/org/modelmapper/config/Configuration.java b/core/src/main/java/org/clairvoyant/modelmapper/config/Configuration.java similarity index 95% rename from core/src/main/java/org/modelmapper/config/Configuration.java rename to core/src/main/java/org/clairvoyant/modelmapper/config/Configuration.java index b23aa7ba..e1b85c86 100644 --- a/core/src/main/java/org/modelmapper/config/Configuration.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/config/Configuration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.config; +package org.clairvoyant.modelmapper.config; -import org.modelmapper.Condition; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; -import org.modelmapper.spi.*; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.spi.*; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import java.util.List; @@ -264,7 +264,7 @@ public enum AccessLevel { * Returns whether the deep copy feature is enabled. * * @see #setDeepCopyEnabled(boolean) - * @see org.modelmapper.internal.converter.AssignableConverter + * @see org.clairvoyant.modelmapper.internal.converter.AssignableConverter */ boolean isDeepCopyEnabled(); @@ -278,8 +278,8 @@ public enum AccessLevel { * in the source collection. * * @see #setCollectionsMergeEnabled(boolean) - * @see org.modelmapper.internal.converter.MergingCollectionConverter - * @see org.modelmapper.internal.converter.NonMergingCollectionConverter + * @see org.clairvoyant.modelmapper.internal.converter.MergingCollectionConverter + * @see org.clairvoyant.modelmapper.internal.converter.NonMergingCollectionConverter */ boolean isCollectionsMergeEnabled(); @@ -391,7 +391,7 @@ public enum AccessLevel { * * @param enabled enabled whether deep copy is enabled * @see #isDeepCopyEnabled() - * @see org.modelmapper.internal.converter.AssignableConverter + * @see org.clairvoyant.modelmapper.internal.converter.AssignableConverter */ Configuration setDeepCopyEnabled(boolean enabled); @@ -403,8 +403,8 @@ public enum AccessLevel { * * @param enabled * @see #isCollectionsMergeEnabled() - * @see org.modelmapper.internal.converter.MergingCollectionConverter - * @see org.modelmapper.internal.converter.NonMergingCollectionConverter + * @see org.clairvoyant.modelmapper.internal.converter.MergingCollectionConverter + * @see org.clairvoyant.modelmapper.internal.converter.NonMergingCollectionConverter */ Configuration setCollectionsMergeEnabled(boolean enabled); diff --git a/core/src/main/java/org/clairvoyant/modelmapper/config/package-info.java b/core/src/main/java/org/clairvoyant/modelmapper/config/package-info.java new file mode 100644 index 00000000..3a397816 --- /dev/null +++ b/core/src/main/java/org/clairvoyant/modelmapper/config/package-info.java @@ -0,0 +1,5 @@ +/** + * Configuration types + */ +package org.clairvoyant.modelmapper.config; + diff --git a/core/src/main/java/org/modelmapper/convention/InexactMatcher.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/InexactMatcher.java similarity index 97% rename from core/src/main/java/org/modelmapper/convention/InexactMatcher.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/InexactMatcher.java index a0dac849..43149c69 100644 --- a/core/src/main/java/org/modelmapper/convention/InexactMatcher.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/InexactMatcher.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.modelmapper.spi.PropertyNameInfo; -import org.modelmapper.spi.Tokens; +import org.clairvoyant.modelmapper.spi.PropertyNameInfo; +import org.clairvoyant.modelmapper.spi.Tokens; /** * Performs inexact matching of property tokens. diff --git a/core/src/main/java/org/modelmapper/convention/LooseMatchingStrategy.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/LooseMatchingStrategy.java similarity index 88% rename from core/src/main/java/org/modelmapper/convention/LooseMatchingStrategy.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/LooseMatchingStrategy.java index c6989003..48638bfd 100644 --- a/core/src/main/java/org/modelmapper/convention/LooseMatchingStrategy.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/LooseMatchingStrategy.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; -import org.modelmapper.spi.MatchingStrategy; -import org.modelmapper.spi.PropertyNameInfo; -import org.modelmapper.spi.Tokens; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.spi.PropertyNameInfo; +import org.clairvoyant.modelmapper.spi.Tokens; /** * See {@link MatchingStrategies#LOOSE}. diff --git a/core/src/main/java/org/modelmapper/convention/MatchingStrategies.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/MatchingStrategies.java similarity index 94% rename from core/src/main/java/org/modelmapper/convention/MatchingStrategies.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/MatchingStrategies.java index 55fd952d..bc01443e 100644 --- a/core/src/main/java/org/modelmapper/convention/MatchingStrategies.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/MatchingStrategies.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; -import org.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; /** * {@link MatchingStrategy} implementations. Matching strategies identify source to destination diff --git a/core/src/main/java/org/modelmapper/convention/NameTokenizers.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/NameTokenizers.java similarity index 89% rename from core/src/main/java/org/modelmapper/convention/NameTokenizers.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/NameTokenizers.java index f1b83c13..a556ab4b 100644 --- a/core/src/main/java/org/modelmapper/convention/NameTokenizers.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/NameTokenizers.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import java.util.regex.Pattern; -import org.modelmapper.spi.NameTokenizer; -import org.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.spi.NameTokenizer; +import org.clairvoyant.modelmapper.spi.NameableType; /** * {@link NameTokenizer} implementations. diff --git a/core/src/main/java/org/modelmapper/convention/NameTransformers.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/NameTransformers.java similarity index 90% rename from core/src/main/java/org/modelmapper/convention/NameTransformers.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/NameTransformers.java index 159301fb..8f61df5d 100644 --- a/core/src/main/java/org/modelmapper/convention/NameTransformers.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/NameTransformers.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; -import org.modelmapper.internal.util.Strings; -import org.modelmapper.spi.NameTransformer; -import org.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.internal.util.Strings; +import org.clairvoyant.modelmapper.spi.NameTransformer; +import org.clairvoyant.modelmapper.spi.NameableType; /** * {@link NameTransformer} implementations. diff --git a/core/src/main/java/org/modelmapper/convention/NamingConventions.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/NamingConventions.java similarity index 92% rename from core/src/main/java/org/modelmapper/convention/NamingConventions.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/NamingConventions.java index 66c0ab08..eaf022f0 100644 --- a/core/src/main/java/org/modelmapper/convention/NamingConventions.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/NamingConventions.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; -import org.modelmapper.spi.PropertyType; -import org.modelmapper.spi.NamingConvention; +import org.clairvoyant.modelmapper.spi.PropertyType; +import org.clairvoyant.modelmapper.spi.NamingConvention; /** * {@link NamingConvention} implementations. diff --git a/core/src/main/java/org/modelmapper/convention/StandardMatchingStrategy.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/StandardMatchingStrategy.java similarity index 90% rename from core/src/main/java/org/modelmapper/convention/StandardMatchingStrategy.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/StandardMatchingStrategy.java index 86529e41..f18d73a6 100644 --- a/core/src/main/java/org/modelmapper/convention/StandardMatchingStrategy.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/StandardMatchingStrategy.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import java.util.HashSet; import java.util.Set; -import org.modelmapper.spi.MatchingStrategy; -import org.modelmapper.spi.PropertyNameInfo; -import org.modelmapper.spi.Tokens; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.spi.PropertyNameInfo; +import org.clairvoyant.modelmapper.spi.Tokens; /** * See {@link MatchingStrategies#STANDARD}. diff --git a/core/src/main/java/org/modelmapper/convention/StrictMatchingStrategy.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/StrictMatchingStrategy.java similarity index 86% rename from core/src/main/java/org/modelmapper/convention/StrictMatchingStrategy.java rename to core/src/main/java/org/clairvoyant/modelmapper/convention/StrictMatchingStrategy.java index 369d05b8..8533fc71 100644 --- a/core/src/main/java/org/modelmapper/convention/StrictMatchingStrategy.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/StrictMatchingStrategy.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import java.util.List; -import org.modelmapper.spi.MatchingStrategy; -import org.modelmapper.spi.PropertyNameInfo; -import org.modelmapper.spi.Tokens; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.spi.PropertyNameInfo; +import org.clairvoyant.modelmapper.spi.Tokens; /** * See {@link MatchingStrategies#STRICT}. diff --git a/core/src/main/java/org/clairvoyant/modelmapper/convention/package-info.java b/core/src/main/java/org/clairvoyant/modelmapper/convention/package-info.java new file mode 100644 index 00000000..13abff87 --- /dev/null +++ b/core/src/main/java/org/clairvoyant/modelmapper/convention/package-info.java @@ -0,0 +1,4 @@ +/** + * Conventions + */ +package org.clairvoyant.modelmapper.convention; \ No newline at end of file diff --git a/core/src/main/java/org/modelmapper/internal/Accessor.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/Accessor.java similarity index 91% rename from core/src/main/java/org/modelmapper/internal/Accessor.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/Accessor.java index 205793d7..aebdacd1 100644 --- a/core/src/main/java/org/modelmapper/internal/Accessor.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/Accessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; /** * An accessor that encapsulates a property. diff --git a/core/src/main/java/org/modelmapper/internal/BridgeClassLoaderFactory.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/BridgeClassLoaderFactory.java similarity index 95% rename from core/src/main/java/org/modelmapper/internal/BridgeClassLoaderFactory.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/BridgeClassLoaderFactory.java index c9676726..a9c6733b 100644 --- a/core/src/main/java/org/modelmapper/internal/BridgeClassLoaderFactory.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/BridgeClassLoaderFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -26,7 +26,7 @@ import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; -import org.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.ModelMapper; /** * Using Bridge Class Loader approach as described in the following article: @@ -61,7 +61,7 @@ private static final class BridgeClassLoader extends ClassLoader { @Override protected Class findClass(String name) throws ClassNotFoundException { - if (name.startsWith("org.modelmapper.internal.cglib")) + if (name.startsWith("org.clairvoyant.modelmapper.internal.cglib")) return internalClassSpace.loadClass(name); for (ClassLoader additionalClassLoader : additionalClassLoaders) { diff --git a/core/src/main/java/org/modelmapper/internal/ConfigurableConditionExpressionImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ConfigurableConditionExpressionImpl.java similarity index 81% rename from core/src/main/java/org/modelmapper/internal/ConfigurableConditionExpressionImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ConfigurableConditionExpressionImpl.java index b3bf8106..7a50f6e7 100644 --- a/core/src/main/java/org/modelmapper/internal/ConfigurableConditionExpressionImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ConfigurableConditionExpressionImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; -import static org.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; -import static org.modelmapper.internal.util.Assert.notNull; +import static org.clairvoyant.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; +import static org.clairvoyant.modelmapper.internal.util.Assert.notNull; -import org.modelmapper.Condition; -import org.modelmapper.Converter; -import org.modelmapper.Provider; -import org.modelmapper.builder.ConfigurableConditionExpression; -import org.modelmapper.spi.DestinationSetter; -import org.modelmapper.spi.SourceGetter; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.builder.ConfigurableConditionExpression; +import org.clairvoyant.modelmapper.spi.DestinationSetter; +import org.clairvoyant.modelmapper.spi.SourceGetter; /** * {@link ConfigurableConditionExpression} implementation diff --git a/core/src/main/java/org/modelmapper/internal/ConstantMappingImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ConstantMappingImpl.java similarity index 81% rename from core/src/main/java/org/modelmapper/internal/ConstantMappingImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ConstantMappingImpl.java index 3a9c9188..a69c9ac7 100644 --- a/core/src/main/java/org/modelmapper/internal/ConstantMappingImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ConstantMappingImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.List; -import org.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; -import org.modelmapper.internal.util.Strings; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.ConstantMapping; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; +import org.clairvoyant.modelmapper.internal.util.Strings; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.ConstantMapping; +import org.clairvoyant.modelmapper.spi.PropertyInfo; /** * @author Jonathan Halterman diff --git a/core/src/main/java/org/clairvoyant/modelmapper/internal/EntityHolder.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/EntityHolder.java new file mode 100644 index 00000000..fb915286 --- /dev/null +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/EntityHolder.java @@ -0,0 +1,26 @@ +package org.clairvoyant.modelmapper.internal; + +import java.util.List; + +/** + * This interface will be implemented by the proxy created using ByteBuddy + * for the GraphQL DTO. + * @author satyanandana + * @param type of the Entity + * + */ +public interface EntityHolder { + + void setEntity(T t); + + T getEntity(); + + void setMappingContext(MappingContextImpl mappingContext); + + MappingContextImpl getMappingContext(); + + void setIntercepted(List getterNames); + + List getIntercepted(); + +} diff --git a/core/src/main/java/org/modelmapper/internal/Errors.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/Errors.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/Errors.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/Errors.java index 6b714897..dc3f8f2b 100644 --- a/core/src/main/java/org/modelmapper/internal/Errors.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/Errors.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.io.PrintWriter; import java.io.StringWriter; @@ -26,15 +26,15 @@ import java.util.Collections; import java.util.Formatter; import java.util.List; -import org.modelmapper.ConfigurationException; -import org.modelmapper.MappingException; -import org.modelmapper.TypeMap; -import org.modelmapper.ValidationException; -import org.modelmapper.internal.util.Strings; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.ErrorMessage; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyMapping; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.MappingException; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.ValidationException; +import org.clairvoyant.modelmapper.internal.util.Strings; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.ErrorMessage; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyMapping; public final class Errors { private List errors; @@ -283,7 +283,7 @@ Errors errorAccessingProperty(PropertyInfo propertyInfo) { return addMessage("Failed to access %s.", propertyInfo); } - Errors errorConverting(org.modelmapper.Converter converter, Class sourceType, + Errors errorConverting(org.clairvoyant.modelmapper.Converter converter, Class sourceType, Class destinationType, Throwable throwable) { return addMessage(throwable, "Converter %s failed to convert %s to %s.", converter, sourceType, destinationType); diff --git a/core/src/main/java/org/modelmapper/internal/ErrorsException.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ErrorsException.java similarity index 95% rename from core/src/main/java/org/modelmapper/internal/ErrorsException.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ErrorsException.java index 3238d15a..407ae819 100644 --- a/core/src/main/java/org/modelmapper/internal/ErrorsException.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ErrorsException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; /** * @author Jonathan Halterman diff --git a/core/src/main/java/org/modelmapper/internal/ExplicitMappingBuilder.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ExplicitMappingBuilder.java similarity index 89% rename from core/src/main/java/org/modelmapper/internal/ExplicitMappingBuilder.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ExplicitMappingBuilder.java index 595a32b7..600aa060 100644 --- a/core/src/main/java/org/modelmapper/internal/ExplicitMappingBuilder.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ExplicitMappingBuilder.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; - -import org.modelmapper.Condition; -import org.modelmapper.ConfigurationException; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; -import org.modelmapper.builder.ConditionExpression; -import org.modelmapper.internal.ExplicitMappingVisitor.VisitedMapping; -import org.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; -import org.modelmapper.internal.PropertyInfoImpl.MethodAccessor; -import org.modelmapper.internal.PropertyInfoImpl.ValueReaderPropertyInfo; -import org.modelmapper.internal.PropertyInfoImpl.ValueWriterPropertyInfo; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.internal.util.Members; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.PropertyType; -import org.modelmapper.spi.ValueReader; -import org.modelmapper.spi.ValueWriter; +package org.clairvoyant.modelmapper.internal; + +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.builder.ConditionExpression; +import org.clairvoyant.modelmapper.internal.ExplicitMappingVisitor.VisitedMapping; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.MethodAccessor; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.ValueReaderPropertyInfo; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.ValueWriterPropertyInfo; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.Members; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.PropertyType; +import org.clairvoyant.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.spi.ValueWriter; import org.objectweb.asm.ClassReader; import java.io.IOException; diff --git a/core/src/main/java/org/modelmapper/internal/ExplicitMappingVisitor.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ExplicitMappingVisitor.java similarity index 96% rename from core/src/main/java/org/modelmapper/internal/ExplicitMappingVisitor.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ExplicitMappingVisitor.java index ace21d23..be6c477b 100644 --- a/core/src/main/java/org/modelmapper/internal/ExplicitMappingVisitor.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ExplicitMappingVisitor.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.reflect.Field; import java.lang.reflect.Member; @@ -11,11 +11,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; -import org.modelmapper.internal.util.Members; -import org.modelmapper.internal.util.Primitives; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; +import org.clairvoyant.modelmapper.internal.util.Members; +import org.clairvoyant.modelmapper.internal.util.Primitives; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.NameableType; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Handle; @@ -42,7 +42,7 @@ public class ExplicitMappingVisitor extends ClassVisitor { private static final String MAP_METHOD = "map"; private static final String SKIP_METHOD = "skip"; - private static final String MAP_EXPR_OWNER_PREFIX = "org/modelmapper/builder"; + private static final String MAP_EXPR_OWNER_PREFIX = "org/clairvoyant/modelmapper/builder"; private static final String MAP_DEST_METHOD_DESC = "()Ljava/lang/Object;"; private static final String MAP_SOURCE_METHOD_DESC = "(Ljava/lang/Object;)Ljava/lang/Object;"; private static final String SKIP_DEST_METHOD_DESC = "(Ljava/lang/Object;)V"; diff --git a/core/src/main/java/org/modelmapper/internal/ImplicitMappingBuilder.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ImplicitMappingBuilder.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/ImplicitMappingBuilder.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ImplicitMappingBuilder.java index 32a59fa7..bd6c9839 100644 --- a/core/src/main/java/org/modelmapper/internal/ImplicitMappingBuilder.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ImplicitMappingBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.ArrayList; import java.util.Collections; @@ -25,21 +25,21 @@ import java.util.Map; import java.util.Set; -import org.modelmapper.Converter; -import org.modelmapper.TypeMap; -import org.modelmapper.convention.MatchingStrategies; -import org.modelmapper.internal.PropertyInfoImpl.ValueReaderPropertyInfo; -import org.modelmapper.internal.converter.ConverterStore; -import org.modelmapper.internal.util.Iterables; -import org.modelmapper.internal.util.Strings; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.ConditionalConverter.MatchResult; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.MatchingStrategy; -import org.modelmapper.spi.NameableType; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyMapping; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.ValueReaderPropertyInfo; +import org.clairvoyant.modelmapper.internal.converter.ConverterStore; +import org.clairvoyant.modelmapper.internal.util.Iterables; +import org.clairvoyant.modelmapper.internal.util.Strings; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyMapping; /** * Builds and populates implicit property mappings for a TypeMap. diff --git a/core/src/main/java/org/modelmapper/internal/InheritingConfiguration.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/InheritingConfiguration.java similarity index 91% rename from core/src/main/java/org/modelmapper/internal/InheritingConfiguration.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/InheritingConfiguration.java index ba3cec66..05a72e55 100644 --- a/core/src/main/java/org/modelmapper/internal/InheritingConfiguration.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/InheritingConfiguration.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.List; -import org.modelmapper.Condition; -import org.modelmapper.Provider; -import org.modelmapper.config.Configuration; -import org.modelmapper.convention.MatchingStrategies; -import org.modelmapper.convention.NameTokenizers; -import org.modelmapper.convention.NameTransformers; -import org.modelmapper.convention.NamingConventions; -import org.modelmapper.internal.converter.AssignableConverter; -import org.modelmapper.internal.converter.ConverterStore; -import org.modelmapper.internal.converter.MergingCollectionConverter; -import org.modelmapper.internal.converter.NonMergingCollectionConverter; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.internal.valueaccess.ValueAccessStore; -import org.modelmapper.internal.valuemutate.ValueMutateStore; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MatchingStrategy; -import org.modelmapper.spi.NameTokenizer; -import org.modelmapper.spi.NameTransformer; -import org.modelmapper.spi.NamingConvention; -import org.modelmapper.spi.ValueReader; -import org.modelmapper.spi.ValueWriter; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.convention.NameTokenizers; +import org.clairvoyant.modelmapper.convention.NameTransformers; +import org.clairvoyant.modelmapper.convention.NamingConventions; +import org.clairvoyant.modelmapper.internal.converter.AssignableConverter; +import org.clairvoyant.modelmapper.internal.converter.ConverterStore; +import org.clairvoyant.modelmapper.internal.converter.MergingCollectionConverter; +import org.clairvoyant.modelmapper.internal.converter.NonMergingCollectionConverter; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.valueaccess.ValueAccessStore; +import org.clairvoyant.modelmapper.internal.valuemutate.ValueMutateStore; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.spi.NameTokenizer; +import org.clairvoyant.modelmapper.spi.NameTransformer; +import org.clairvoyant.modelmapper.spi.NamingConvention; +import org.clairvoyant.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.spi.ValueWriter; /** * Inheritable mapping configuration implementation. diff --git a/core/src/main/java/org/modelmapper/internal/InternalMapping.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/InternalMapping.java similarity index 86% rename from core/src/main/java/org/modelmapper/internal/InternalMapping.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/InternalMapping.java index 89289627..9881e5f3 100644 --- a/core/src/main/java/org/modelmapper/internal/InternalMapping.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/InternalMapping.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.List; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.PropertyInfo; /** * An internal mappings that defines internal methods for mappings diff --git a/core/src/main/java/org/modelmapper/internal/InternalPropertyInfo.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/InternalPropertyInfo.java similarity index 89% rename from core/src/main/java/org/modelmapper/internal/InternalPropertyInfo.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/InternalPropertyInfo.java index b98182fd..fd87692a 100644 --- a/core/src/main/java/org/modelmapper/internal/InternalPropertyInfo.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/InternalPropertyInfo.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyInfo; /** * Encapsulates information for a property only be used internally. diff --git a/core/src/main/java/org/modelmapper/internal/MappingContextImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/MappingContextImpl.java similarity index 90% rename from core/src/main/java/org/modelmapper/internal/MappingContextImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/MappingContextImpl.java index a76ef914..5d2ebb7d 100644 --- a/core/src/main/java/org/modelmapper/internal/MappingContextImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/MappingContextImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -23,18 +23,18 @@ import java.util.List; import java.util.Map; -import org.modelmapper.Provider; -import org.modelmapper.Provider.ProvisionRequest; -import org.modelmapper.TypeMap; -import org.modelmapper.TypeToken; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.internal.util.Callable; -import org.modelmapper.internal.util.Objects; -import org.modelmapper.internal.util.Primitives; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.MappingContext; -import org.modelmapper.spi.MappingEngine; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.Provider.ProvisionRequest; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.Callable; +import org.clairvoyant.modelmapper.internal.util.Objects; +import org.clairvoyant.modelmapper.internal.util.Primitives; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.MappingEngine; /** * MappingContext implementation that caches destination values for an object graph by their @@ -97,7 +97,7 @@ public MappingContextImpl(S source, Class sourceType, D destination, Class * * @param inheritValues whether values from the source {@code context} should be inherited */ - MappingContextImpl(MappingContextImpl context, S source, Class sourceType, + public MappingContextImpl(MappingContextImpl context, S source, Class sourceType, D destination, Class destinationType, Type genericDestinationType, MappingImpl mapping, boolean inheritValues) { this.parent = context; @@ -214,6 +214,11 @@ public S getSource() { return source; } + @Override + public Object getParentSource() { + return parentSource; + } + @Override public Class getSourceType() { return sourceType; @@ -270,7 +275,7 @@ void setDestination(D destination, boolean trackForSource) { sourceToDestination.put(source, destination); } - void addParentSource(String path, Object parentSource) { + public void addParentSource(String path, Object parentSource) { this.parentSource.addSource(path, parentSource); } diff --git a/core/src/main/java/org/modelmapper/internal/MappingEngineImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/MappingEngineImpl.java similarity index 90% rename from core/src/main/java/org/modelmapper/internal/MappingEngineImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/MappingEngineImpl.java index 4843dc9c..15071e29 100644 --- a/core/src/main/java/org/modelmapper/internal/MappingEngineImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/MappingEngineImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.reflect.Constructor; import java.lang.reflect.Type; @@ -21,22 +21,22 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.modelmapper.Condition; -import org.modelmapper.ConfigurationException; -import org.modelmapper.Converter; -import org.modelmapper.Provider; -import org.modelmapper.TypeMap; -import org.modelmapper.TypeToken; -import org.modelmapper.internal.converter.ConverterStore; -import org.modelmapper.internal.util.Iterables; -import org.modelmapper.internal.util.Objects; -import org.modelmapper.internal.util.Primitives; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.ConstantMapping; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.MappingContext; -import org.modelmapper.spi.MappingEngine; -import org.modelmapper.spi.PropertyMapping; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.internal.converter.ConverterStore; +import org.clairvoyant.modelmapper.internal.util.Iterables; +import org.clairvoyant.modelmapper.internal.util.Objects; +import org.clairvoyant.modelmapper.internal.util.Primitives; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.ConstantMapping; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.MappingEngine; +import org.clairvoyant.modelmapper.spi.PropertyMapping; /** * MappingEngine implementation that caches ConditionalConverters by source and destination type @@ -198,6 +198,11 @@ private Object resolveSourceValue(MappingContextImpl context, Mapping mapp context.addParentSource(destPathBuilder.toString(), source); if (source == null) return null; + if (EntityHolder.class.isInstance(source)) { + EntityHolder entityHolder = (EntityHolder) source; + entityHolder.setEntity(null); + entityHolder.setMappingContext(null); + } if (!Iterables.isIterable(source.getClass())) { Object circularDest = context.sourceToDestination.get(source); if (circularDest != null) diff --git a/core/src/main/java/org/modelmapper/internal/MappingImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/MappingImpl.java similarity index 85% rename from core/src/main/java/org/modelmapper/internal/MappingImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/MappingImpl.java index ee6af695..7905587a 100644 --- a/core/src/main/java/org/modelmapper/internal/MappingImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/MappingImpl.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.ArrayList; import java.util.List; -import org.modelmapper.Condition; -import org.modelmapper.Converter; -import org.modelmapper.Provider; -import org.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; -import org.modelmapper.internal.util.Strings; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; +import org.clairvoyant.modelmapper.internal.util.Strings; +import org.clairvoyant.modelmapper.spi.PropertyInfo; /** * @author Jonathan Halterman */ -abstract class MappingImpl implements InternalMapping, Comparable { +public abstract class MappingImpl implements InternalMapping, Comparable { private final List destinationMutators; private final boolean explicit; private final String path; diff --git a/core/src/main/java/org/modelmapper/internal/Mutator.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/Mutator.java similarity index 85% rename from core/src/main/java/org/modelmapper/internal/Mutator.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/Mutator.java index 98fb3bcd..2485cc38 100644 --- a/core/src/main/java/org/modelmapper/internal/Mutator.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/Mutator.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; /** * A mutator that encapsulates a property. * * @author Jonathan Halterman */ -interface Mutator extends InternalPropertyInfo { +public interface Mutator extends InternalPropertyInfo { void setValue(Object subject, Object value); } diff --git a/core/src/main/java/org/modelmapper/internal/Pair.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/Pair.java similarity index 91% rename from core/src/main/java/org/modelmapper/internal/Pair.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/Pair.java index 25bef6d2..9cadbe6d 100644 --- a/core/src/main/java/org/modelmapper/internal/Pair.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/Pair.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; public class Pair { public static Pair of(L left, R right) { diff --git a/core/src/main/java/org/modelmapper/internal/PropertyInfoImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoImpl.java similarity index 93% rename from core/src/main/java/org/modelmapper/internal/PropertyInfoImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoImpl.java index 053ec0d9..3f312a8b 100644 --- a/core/src/main/java/org/modelmapper/internal/PropertyInfoImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -21,10 +21,10 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import net.jodah.typetools.TypeResolver; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyType; -import org.modelmapper.spi.ValueReader; -import org.modelmapper.spi.ValueWriter; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyType; +import org.clairvoyant.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.spi.ValueWriter; /** * Abstract PropertyInfo implementation that provides {@link #equals(Object)} and @@ -32,7 +32,7 @@ * * @author Jonathan Halterman */ -abstract class PropertyInfoImpl implements PropertyInfo { +public abstract class PropertyInfoImpl implements PropertyInfo { protected final Class initialType; protected final M member; protected final Class type; @@ -85,7 +85,7 @@ public TypeInfo getTypeInfo(InheritingConfiguration configuration) { } } - static class MethodAccessor extends AbstractMethodInfo implements Accessor { + public static class MethodAccessor extends AbstractMethodInfo implements Accessor { MethodAccessor(Class initialType, Method method, String name) { super(initialType, method, name); } diff --git a/core/src/main/java/org/modelmapper/internal/PropertyInfoRegistry.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoRegistry.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/PropertyInfoRegistry.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoRegistry.java index 304a70ac..c23c5659 100644 --- a/core/src/main/java/org/modelmapper/internal/PropertyInfoRegistry.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -21,10 +21,10 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import org.modelmapper.config.Configuration; -import org.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; -import org.modelmapper.internal.PropertyInfoImpl.MethodAccessor; -import org.modelmapper.internal.PropertyInfoImpl.MethodMutator; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.MethodAccessor; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.MethodMutator; /** * Statically stores and retrieves MemberInfo by member and configuration. This registry is designed diff --git a/core/src/main/java/org/modelmapper/internal/PropertyInfoResolver.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoResolver.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/PropertyInfoResolver.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoResolver.java index 1c14a285..b4fd4b17 100644 --- a/core/src/main/java/org/modelmapper/internal/PropertyInfoResolver.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoResolver.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.reflect.Field; import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.modelmapper.config.Configuration; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.spi.PropertyInfo; /** * Resolves PropertyInfo for individual members. diff --git a/core/src/main/java/org/modelmapper/internal/PropertyInfoSetResolver.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoSetResolver.java similarity index 90% rename from core/src/main/java/org/modelmapper/internal/PropertyInfoSetResolver.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoSetResolver.java index c5dcad9d..5c8c9605 100644 --- a/core/src/main/java/org/modelmapper/internal/PropertyInfoSetResolver.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyInfoSetResolver.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Member; import java.lang.reflect.Modifier; import java.util.LinkedHashMap; import java.util.Map; -import org.modelmapper.config.Configuration; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.NameTransformer; -import org.modelmapper.spi.NameableType; -import org.modelmapper.spi.NamingConvention; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyType; -import org.modelmapper.spi.ValueReader; -import org.modelmapper.spi.ValueWriter; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.NameTransformer; +import org.clairvoyant.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.spi.NamingConvention; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyType; +import org.clairvoyant.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.spi.ValueWriter; /** * Resolves sets of PropertyInfo for a type's accessors or mutators. diff --git a/core/src/main/java/org/modelmapper/internal/PropertyMappingImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyMappingImpl.java similarity index 87% rename from core/src/main/java/org/modelmapper/internal/PropertyMappingImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyMappingImpl.java index 927c7e44..9b06725a 100644 --- a/core/src/main/java/org/modelmapper/internal/PropertyMappingImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyMappingImpl.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.ArrayList; import java.util.List; -import org.modelmapper.Converter; -import org.modelmapper.Provider; -import org.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; -import org.modelmapper.internal.util.Strings; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyMapping; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; +import org.clairvoyant.modelmapper.internal.util.Strings; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyMapping; /** * @author Jonathan Halterman */ -class PropertyMappingImpl extends MappingImpl implements PropertyMapping { +public class PropertyMappingImpl extends MappingImpl implements PropertyMapping { private final List sourceAccessors; boolean cyclic; diff --git a/core/src/main/java/org/modelmapper/internal/PropertyNameInfoImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyNameInfoImpl.java similarity index 89% rename from core/src/main/java/org/modelmapper/internal/PropertyNameInfoImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyNameInfoImpl.java index f4db1d71..2187c807 100644 --- a/core/src/main/java/org/modelmapper/internal/PropertyNameInfoImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyNameInfoImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.modelmapper.config.Configuration; -import org.modelmapper.internal.util.Stack; -import org.modelmapper.internal.util.ToStringBuilder; -import org.modelmapper.spi.NameableType; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyNameInfo; -import org.modelmapper.spi.Tokens; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.internal.util.Stack; +import org.clairvoyant.modelmapper.internal.util.ToStringBuilder; +import org.clairvoyant.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyNameInfo; +import org.clairvoyant.modelmapper.spi.Tokens; /** * PropertyNameInfo implementation that tracks source and destination properties. diff --git a/core/src/main/java/org/modelmapper/internal/PropertyReferenceCollector.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyReferenceCollector.java similarity index 96% rename from core/src/main/java/org/modelmapper/internal/PropertyReferenceCollector.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyReferenceCollector.java index 884f2342..ac85c062 100644 --- a/core/src/main/java/org/modelmapper/internal/PropertyReferenceCollector.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/PropertyReferenceCollector.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.modelmapper.internal.PropertyInfoImpl.MethodAccessor; -import org.modelmapper.spi.NameableType; -import org.modelmapper.spi.TypeSafeSourceGetter; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.MethodAccessor; +import org.clairvoyant.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.spi.TypeSafeSourceGetter; /** * Produces method interceptors that collect getters/setters invoke of the diff --git a/core/src/main/java/org/modelmapper/internal/ProvisionRequestImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ProvisionRequestImpl.java similarity index 91% rename from core/src/main/java/org/modelmapper/internal/ProvisionRequestImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ProvisionRequestImpl.java index 7bc4cf30..8ac6428c 100644 --- a/core/src/main/java/org/modelmapper/internal/ProvisionRequestImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ProvisionRequestImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; -import org.modelmapper.Provider.ProvisionRequest; +import org.clairvoyant.modelmapper.Provider.ProvisionRequest; /** * @param requested type diff --git a/core/src/main/java/org/modelmapper/internal/ProxyFactory.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ProxyFactory.java similarity index 98% rename from core/src/main/java/org/modelmapper/internal/ProxyFactory.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ProxyFactory.java index f4a9e065..377f798e 100644 --- a/core/src/main/java/org/modelmapper/internal/ProxyFactory.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ProxyFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static net.bytebuddy.NamingStrategy.SuffixingRandom.NO_PREFIX; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -32,7 +32,7 @@ import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; import net.bytebuddy.implementation.InvocationHandlerAdapter; import net.bytebuddy.matcher.ElementMatcher; -import org.modelmapper.internal.util.Primitives; +import org.clairvoyant.modelmapper.internal.util.Primitives; import org.objenesis.Objenesis; import org.objenesis.ObjenesisStd; diff --git a/core/src/main/java/org/modelmapper/internal/ReferenceMapExpressionImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/ReferenceMapExpressionImpl.java similarity index 90% rename from core/src/main/java/org/modelmapper/internal/ReferenceMapExpressionImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/ReferenceMapExpressionImpl.java index 42166bdc..c9782820 100644 --- a/core/src/main/java/org/modelmapper/internal/ReferenceMapExpressionImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/ReferenceMapExpressionImpl.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static java.util.stream.Collectors.toList; -import static org.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; -import static org.modelmapper.internal.util.Assert.notNull; +import static org.clairvoyant.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; +import static org.clairvoyant.modelmapper.internal.util.Assert.notNull; import java.util.List; import net.jodah.typetools.TypeResolver; -import org.modelmapper.builder.ReferenceMapExpression; -import org.modelmapper.internal.util.Primitives; -import org.modelmapper.spi.DestinationSetter; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.SourceGetter; +import org.clairvoyant.modelmapper.builder.ReferenceMapExpression; +import org.clairvoyant.modelmapper.internal.util.Primitives; +import org.clairvoyant.modelmapper.spi.DestinationSetter; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.SourceGetter; /** * {@link ReferenceMapExpression} implementation diff --git a/core/src/main/java/org/modelmapper/internal/SourceMappingImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/SourceMappingImpl.java similarity index 82% rename from core/src/main/java/org/modelmapper/internal/SourceMappingImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/SourceMappingImpl.java index 978f03c5..35353d17 100644 --- a/core/src/main/java/org/modelmapper/internal/SourceMappingImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/SourceMappingImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.ArrayList; import java.util.List; -import org.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; -import org.modelmapper.internal.util.Strings; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.SourceMapping; +import org.clairvoyant.modelmapper.internal.ExplicitMappingBuilder.MappingOptions; +import org.clairvoyant.modelmapper.internal.util.Strings; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.SourceMapping; /** * @author Jonathan Halterman diff --git a/core/src/main/java/org/modelmapper/internal/TypeInfo.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfo.java similarity index 86% rename from core/src/main/java/org/modelmapper/internal/TypeInfo.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfo.java index ee7206b0..8103d274 100644 --- a/core/src/main/java/org/modelmapper/internal/TypeInfo.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfo.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.Map; -import org.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.config.Configuration; /** * Contains type information for a particular type and - * {@link org.modelmapper.config.Configuration}. + * {@link org.clairvoyant.modelmapper.config.Configuration}. * * @param type providing information for * diff --git a/core/src/main/java/org/modelmapper/internal/TypeInfoImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfoImpl.java similarity index 91% rename from core/src/main/java/org/modelmapper/internal/TypeInfoImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfoImpl.java index b5017051..c86d671c 100644 --- a/core/src/main/java/org/modelmapper/internal/TypeInfoImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfoImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.Map; -import org.modelmapper.config.Configuration; -import org.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.spi.NameableType; /** * A TypeInfo implementation that lazily reflects members. diff --git a/core/src/main/java/org/modelmapper/internal/TypeInfoRegistry.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfoRegistry.java similarity index 94% rename from core/src/main/java/org/modelmapper/internal/TypeInfoRegistry.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfoRegistry.java index 95ad6f3a..c371a0c3 100644 --- a/core/src/main/java/org/modelmapper/internal/TypeInfoRegistry.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeInfoRegistry.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.config.Configuration; /** * Statically stores and retrieves TypeInfo instances by type, parent type, and configuration. diff --git a/core/src/main/java/org/modelmapper/internal/TypeMapImpl.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeMapImpl.java similarity index 81% rename from core/src/main/java/org/modelmapper/internal/TypeMapImpl.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/TypeMapImpl.java index 24c8559c..bf219433 100644 --- a/core/src/main/java/org/modelmapper/internal/TypeMapImpl.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeMapImpl.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; - -import org.modelmapper.Condition; -import org.modelmapper.Converter; -import org.modelmapper.ExpressionMap; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; -import org.modelmapper.TypeMap; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.internal.util.Objects; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.DestinationSetter; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.SourceGetter; -import org.modelmapper.spi.TypeSafeSourceGetter; +package org.clairvoyant.modelmapper.internal; + +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.ExpressionMap; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.Objects; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.DestinationSetter; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.SourceGetter; +import org.clairvoyant.modelmapper.spi.TypeSafeSourceGetter; import java.util.ArrayList; import java.util.Collections; @@ -175,6 +175,21 @@ public List getUnmappedProperties() { return pathProperties.get(); } + @Override + public List getUnmappedRootProperties() { + PathProperties pathProperties = getDestinationProperties(); + + pathProperties.removeNestedPathProperties(); + + synchronized (mappings) { + for (Map.Entry entry : mappings.entrySet()) { + pathProperties.matchAndRemoveRootField(entry.getKey()); + } + } + + return pathProperties.get(); + } + @Override public D map(S source) { Class sourceType = Types.deProxy(source.getClass()); @@ -292,6 +307,19 @@ public void validate() { errors.throwValidationExceptionIfErrorsExist(); } + @Override + public void validateRootFieldMappings() { + if (converter != null) + return; + + Errors errors = new Errors(); + List unmappedProperties = getUnmappedRootProperties(); + if (!unmappedProperties.isEmpty()) + errors.errorUnmappedProperties(this, unmappedProperties); + + errors.throwValidationExceptionIfErrorsExist(); + } + @Override public TypeMap include(Class sourceType, Class

destinationType) { TypeMapImpl derivedTypeMap = new TypeMapImpl(this, sourceType, destinationType); @@ -425,6 +453,7 @@ public Property(String prefix, TypeInfo typeInfo) { } private static final class PathProperties { + public static final String DOT = "."; List pathProperties = new ArrayList(); private void matchAndRemove(String path) { @@ -447,6 +476,45 @@ private void matchAndRemove(String path) { iterator.remove(); } + private void matchAndRemoveRootField(String path){ + + PathProperty matchedPathProperty = null; + + for (PathProperty pathProperty: + pathProperties) { + + if(pathProperty.path.equals(path)){ + matchedPathProperty = pathProperty; + } + + } + + if(matchedPathProperty!=null){ + pathProperties.remove(matchedPathProperty); + } + } + + private void removeNestedPathProperties(){ + + List nestedPathProperties = new ArrayList(); + + for (PathProperty pathProperty: + pathProperties) { + + if(!containsOnce(pathProperty.path, DOT)){ + nestedPathProperties.add(pathProperty); + } + + } + pathProperties.removeAll(nestedPathProperties); + } + + private boolean containsOnce(String s, String sub) { + int firstIndex = s.indexOf(sub); + return firstIndex >=0 && firstIndex == s.lastIndexOf(sub); + } + + public List get() { List mutators = new ArrayList(pathProperties.size()); for (PathProperty pathProperty : pathProperties) diff --git a/core/src/main/java/org/modelmapper/internal/TypeMapStore.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeMapStore.java similarity index 94% rename from core/src/main/java/org/modelmapper/internal/TypeMapStore.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/TypeMapStore.java index 11172638..83d851e5 100644 --- a/core/src/main/java/org/modelmapper/internal/TypeMapStore.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeMapStore.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.TypeMap; -import org.modelmapper.internal.util.Primitives; -import org.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.internal.util.Primitives; +import org.clairvoyant.modelmapper.internal.util.Types; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/org/modelmapper/internal/TypePair.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypePair.java similarity index 94% rename from core/src/main/java/org/modelmapper/internal/TypePair.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/TypePair.java index ee9c8847..ef554f9b 100644 --- a/core/src/main/java/org/modelmapper/internal/TypePair.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypePair.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; /** * @author Jonathan Halterman diff --git a/core/src/main/java/org/modelmapper/internal/TypeResolvingList.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeResolvingList.java similarity index 91% rename from core/src/main/java/org/modelmapper/internal/TypeResolvingList.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/TypeResolvingList.java index 66970924..ec6a8a0a 100644 --- a/core/src/main/java/org/modelmapper/internal/TypeResolvingList.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/TypeResolvingList.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.util.AbstractList; import java.util.Collection; @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; import net.jodah.typetools.TypeResolver; -import org.modelmapper.internal.util.Assert; -import org.modelmapper.internal.util.CopyOnWriteLinkedHashMap; +import org.clairvoyant.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.CopyOnWriteLinkedHashMap; /** * CopyOnWriteArrayList that resolves based on given types. diff --git a/core/src/main/java/org/modelmapper/internal/converter/ArrayConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ArrayConverter.java similarity index 89% rename from core/src/main/java/org/modelmapper/internal/converter/ArrayConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ArrayConverter.java index d5594ea8..1d67598a 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/ArrayConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ArrayConverter.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; import java.util.Collection; import java.util.Iterator; -import org.modelmapper.internal.util.Iterables; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.util.Iterables; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts {@link Collection} and array instances to array instances. diff --git a/core/src/main/java/org/modelmapper/internal/converter/AssignableConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/AssignableConverter.java similarity index 82% rename from core/src/main/java/org/modelmapper/internal/converter/AssignableConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/AssignableConverter.java index 3e5a5a43..90bfa151 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/AssignableConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/AssignableConverter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.internal.MappingContextImpl; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.MappingContextImpl; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts destination objects that are assignable from the source objects. diff --git a/core/src/main/java/org/modelmapper/internal/converter/BooleanConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/BooleanConverter.java similarity index 87% rename from core/src/main/java/org/modelmapper/internal/converter/BooleanConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/BooleanConverter.java index fef7caca..1595ae5f 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/BooleanConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/BooleanConverter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.internal.Errors; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts to {@link Boolean} instances. diff --git a/core/src/main/java/org/modelmapper/internal/converter/CalendarConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/CalendarConverter.java similarity index 91% rename from core/src/main/java/org/modelmapper/internal/converter/CalendarConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/CalendarConverter.java index 98a5b4c1..f22246e7 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/CalendarConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/CalendarConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.util.Calendar; import java.util.Date; @@ -23,9 +23,9 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.modelmapper.internal.Errors; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts: diff --git a/core/src/main/java/org/modelmapper/internal/converter/CharacterConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/CharacterConverter.java similarity index 86% rename from core/src/main/java/org/modelmapper/internal/converter/CharacterConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/CharacterConverter.java index 102f14e8..a596d064 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/CharacterConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/CharacterConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts to {@link Character} instances. diff --git a/core/src/main/java/org/modelmapper/internal/converter/ConverterStore.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ConverterStore.java similarity index 93% rename from core/src/main/java/org/modelmapper/internal/converter/ConverterStore.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ConverterStore.java index e5e15407..bc9ef19b 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/ConverterStore.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ConverterStore.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/core/src/main/java/org/modelmapper/internal/converter/DateConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/DateConverter.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/converter/DateConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/DateConverter.java index 1e154e60..bc2803d0 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/DateConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/DateConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.sql.Time; import java.sql.Timestamp; @@ -24,9 +24,9 @@ import javax.xml.datatype.XMLGregorianCalendar; -import org.modelmapper.internal.Errors; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts: diff --git a/core/src/main/java/org/modelmapper/internal/converter/EnumConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/EnumConverter.java similarity index 87% rename from core/src/main/java/org/modelmapper/internal/converter/EnumConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/EnumConverter.java index 63bc8340..eb333fe5 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/EnumConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/EnumConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts {@link Enum} instances. diff --git a/core/src/main/java/org/modelmapper/internal/converter/FromOptionalConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/FromOptionalConverter.java similarity index 89% rename from core/src/main/java/org/modelmapper/internal/converter/FromOptionalConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/FromOptionalConverter.java index 218fdff6..ea6c2f44 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/FromOptionalConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/FromOptionalConverter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.util.Optional; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts {@link Optional} to {@link Object} diff --git a/core/src/main/java/org/modelmapper/internal/converter/MapConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/MapConverter.java similarity index 89% rename from core/src/main/java/org/modelmapper/internal/converter/MapConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/MapConverter.java index f216939a..e13f635a 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/MapConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/MapConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -26,11 +26,11 @@ import net.jodah.typetools.TypeResolver; import net.jodah.typetools.TypeResolver.Unknown; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.MappingContext; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyMapping; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyMapping; /** * Converts {@link Map} instances to each other. diff --git a/core/src/main/java/org/modelmapper/internal/converter/MergingCollectionConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/MergingCollectionConverter.java similarity index 86% rename from core/src/main/java/org/modelmapper/internal/converter/MergingCollectionConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/MergingCollectionConverter.java index 82c19007..3599bd80 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/MergingCollectionConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/MergingCollectionConverter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.internal.util.Iterables; -import org.modelmapper.internal.util.MappingContextHelper; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.util.Iterables; +import org.clairvoyant.modelmapper.internal.util.MappingContextHelper; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; import java.util.Collection; import java.util.Iterator; diff --git a/core/src/main/java/org/modelmapper/internal/converter/NonMergingCollectionConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/NonMergingCollectionConverter.java similarity index 88% rename from core/src/main/java/org/modelmapper/internal/converter/NonMergingCollectionConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/NonMergingCollectionConverter.java index cec8f6da..6eddb81c 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/NonMergingCollectionConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/NonMergingCollectionConverter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.internal.util.Iterables; -import org.modelmapper.internal.util.MappingContextHelper; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.util.Iterables; +import org.clairvoyant.modelmapper.internal.util.MappingContextHelper; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; import java.util.Collection; import java.util.Iterator; diff --git a/core/src/main/java/org/modelmapper/internal/converter/NumberConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/NumberConverter.java similarity index 93% rename from core/src/main/java/org/modelmapper/internal/converter/NumberConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/NumberConverter.java index a7297ff4..3c0f9440 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/NumberConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/NumberConverter.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Calendar; import java.util.Date; -import org.modelmapper.internal.Errors; -import org.modelmapper.internal.util.Primitives; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.internal.util.Primitives; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/core/src/main/java/org/modelmapper/internal/converter/OptionalConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/OptionalConverter.java similarity index 93% rename from core/src/main/java/org/modelmapper/internal/converter/OptionalConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/OptionalConverter.java index 2ca37d28..ad3b2678 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/OptionalConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/OptionalConverter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import net.jodah.typetools.TypeResolver; -import org.modelmapper.internal.util.Types; -import org.modelmapper.spi.*; +import org.clairvoyant.modelmapper.internal.util.Types; +import org.clairvoyant.modelmapper.spi.*; import java.lang.reflect.ParameterizedType; import java.util.Optional; diff --git a/core/src/main/java/org/modelmapper/internal/converter/StringConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/StringConverter.java similarity index 86% rename from core/src/main/java/org/modelmapper/internal/converter/StringConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/StringConverter.java index 81a7660b..434aac87 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/StringConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/StringConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts to {@link String} instances. diff --git a/core/src/main/java/org/modelmapper/internal/converter/ToOptionalConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ToOptionalConverter.java similarity index 84% rename from core/src/main/java/org/modelmapper/internal/converter/ToOptionalConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ToOptionalConverter.java index ef19b8d2..33a1e09c 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/ToOptionalConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/ToOptionalConverter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.internal.util.MappingContextHelper; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.util.MappingContextHelper; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; import java.util.Optional; diff --git a/core/src/main/java/org/modelmapper/internal/converter/UuidConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/UuidConverter.java similarity index 85% rename from core/src/main/java/org/modelmapper/internal/converter/UuidConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/converter/UuidConverter.java index f8b0f90c..89955e6d 100644 --- a/core/src/main/java/org/modelmapper/internal/converter/UuidConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/converter/UuidConverter.java @@ -1,8 +1,8 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.util.UUID; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts objects to UUID. diff --git a/core/src/main/java/org/modelmapper/internal/package-info.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/package-info.java similarity index 72% rename from core/src/main/java/org/modelmapper/internal/package-info.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/package-info.java index c27c1eb5..2b92a3cc 100644 --- a/core/src/main/java/org/modelmapper/internal/package-info.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/package-info.java @@ -1,4 +1,4 @@ /** * ModelMapper internals. The contents of this package are not part of the public API and are subject to change. */ -package org.modelmapper.internal; \ No newline at end of file +package org.clairvoyant.modelmapper.internal; \ No newline at end of file diff --git a/core/src/main/java/org/modelmapper/internal/util/ArrayIterator.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/ArrayIterator.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/util/ArrayIterator.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/ArrayIterator.java index aa31c878..4517b111 100644 --- a/core/src/main/java/org/modelmapper/internal/util/ArrayIterator.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/ArrayIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.lang.reflect.Array; import java.util.Iterator; diff --git a/core/src/main/java/org/modelmapper/internal/util/Assert.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Assert.java similarity index 94% rename from core/src/main/java/org/modelmapper/internal/util/Assert.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Assert.java index 0af90716..bcffe4b1 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Assert.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Assert.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; /** * @author Jonathan Halterman diff --git a/core/src/main/java/org/modelmapper/internal/util/Callable.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Callable.java similarity index 90% rename from core/src/main/java/org/modelmapper/internal/util/Callable.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Callable.java index 53cca5e7..97c4408c 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Callable.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Callable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; /** * A functional interface. diff --git a/core/src/main/java/org/modelmapper/internal/util/CopyOnWriteLinkedHashMap.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/CopyOnWriteLinkedHashMap.java similarity index 97% rename from core/src/main/java/org/modelmapper/internal/util/CopyOnWriteLinkedHashMap.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/CopyOnWriteLinkedHashMap.java index 4d7a60a0..52491e75 100644 --- a/core/src/main/java/org/modelmapper/internal/util/CopyOnWriteLinkedHashMap.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/CopyOnWriteLinkedHashMap.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/core/src/main/java/org/modelmapper/internal/util/Iterables.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Iterables.java similarity index 95% rename from core/src/main/java/org/modelmapper/internal/util/Iterables.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Iterables.java index f439593e..5de0ef81 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Iterables.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Iterables.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.lang.reflect.Array; import java.util.Collection; diff --git a/core/src/main/java/org/modelmapper/internal/util/JavaVersions.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/JavaVersions.java similarity index 89% rename from core/src/main/java/org/modelmapper/internal/util/JavaVersions.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/JavaVersions.java index 167b59b6..1a9cc28a 100644 --- a/core/src/main/java/org/modelmapper/internal/util/JavaVersions.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/JavaVersions.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; public final class JavaVersions { private JavaVersions() { diff --git a/core/src/main/java/org/modelmapper/internal/util/Lists.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Lists.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/util/Lists.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Lists.java index 8b98c5be..a4c96a5b 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Lists.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Lists.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/org/modelmapper/internal/util/MappingContextHelper.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/MappingContextHelper.java similarity index 85% rename from core/src/main/java/org/modelmapper/internal/util/MappingContextHelper.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/MappingContextHelper.java index f0d376ac..a986d4ee 100644 --- a/core/src/main/java/org/modelmapper/internal/util/MappingContextHelper.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/MappingContextHelper.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.lang.reflect.ParameterizedType; import java.util.ArrayList; @@ -8,10 +8,10 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.MappingContext; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyMapping; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyMapping; import net.jodah.typetools.TypeResolver; diff --git a/core/src/main/java/org/modelmapper/internal/util/Maps.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Maps.java similarity index 93% rename from core/src/main/java/org/modelmapper/internal/util/Maps.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Maps.java index 6b891862..7afb81c3 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Maps.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Maps.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/core/src/main/java/org/modelmapper/internal/util/Members.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Members.java similarity index 97% rename from core/src/main/java/org/modelmapper/internal/util/Members.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Members.java index 87c38566..a413eac0 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Members.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Members.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/core/src/main/java/org/modelmapper/internal/util/Objects.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Objects.java similarity index 93% rename from core/src/main/java/org/modelmapper/internal/util/Objects.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Objects.java index 1d92eac0..d01c22e8 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Objects.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Objects.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.lang.reflect.Constructor; diff --git a/core/src/main/java/org/modelmapper/internal/util/Primitives.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Primitives.java similarity index 96% rename from core/src/main/java/org/modelmapper/internal/util/Primitives.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Primitives.java index 04e7a649..454543e5 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Primitives.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Primitives.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.util.HashMap; import java.util.HashSet; diff --git a/core/src/main/java/org/modelmapper/internal/util/Stack.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Stack.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/util/Stack.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Stack.java index 9dbc5388..6e7b34d2 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Stack.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Stack.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.util.ArrayList; diff --git a/core/src/main/java/org/modelmapper/internal/util/Strings.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Strings.java similarity index 93% rename from core/src/main/java/org/modelmapper/internal/util/Strings.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Strings.java index f5d9b41f..501b782a 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Strings.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Strings.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.util.List; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyInfo; /** * @author Jonathan Halterman diff --git a/core/src/main/java/org/modelmapper/internal/util/ToStringBuilder.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/ToStringBuilder.java similarity index 96% rename from core/src/main/java/org/modelmapper/internal/util/ToStringBuilder.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/ToStringBuilder.java index 6e9588ab..400d88b3 100644 --- a/core/src/main/java/org/modelmapper/internal/util/ToStringBuilder.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/ToStringBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/core/src/main/java/org/modelmapper/internal/util/Types.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Types.java similarity index 99% rename from core/src/main/java/org/modelmapper/internal/util/Types.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/util/Types.java index f1cce4d6..e824f162 100644 --- a/core/src/main/java/org/modelmapper/internal/util/Types.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/util/Types.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/core/src/main/java/org/modelmapper/internal/valueaccess/MapValueReader.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/valueaccess/MapValueReader.java similarity index 94% rename from core/src/main/java/org/modelmapper/internal/valueaccess/MapValueReader.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/valueaccess/MapValueReader.java index 51a469f1..19596006 100644 --- a/core/src/main/java/org/modelmapper/internal/valueaccess/MapValueReader.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/valueaccess/MapValueReader.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.valueaccess; +package org.clairvoyant.modelmapper.internal.valueaccess; import java.util.Collection; import java.util.Map; -import org.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.spi.ValueReader; /** * Handles reading from java.util.Map instances. diff --git a/core/src/main/java/org/modelmapper/internal/valueaccess/ValueAccessStore.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/valueaccess/ValueAccessStore.java similarity index 86% rename from core/src/main/java/org/modelmapper/internal/valueaccess/ValueAccessStore.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/valueaccess/ValueAccessStore.java index d3d98d77..c8bf9503 100644 --- a/core/src/main/java/org/modelmapper/internal/valueaccess/ValueAccessStore.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/valueaccess/ValueAccessStore.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.valueaccess; +package org.clairvoyant.modelmapper.internal.valueaccess; import java.util.List; -import org.modelmapper.internal.TypeResolvingList; -import org.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.internal.TypeResolvingList; +import org.clairvoyant.modelmapper.spi.ValueReader; /** * Store for ValueReaders. diff --git a/core/src/main/java/org/modelmapper/internal/valuemutate/MapValueWriter.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/valuemutate/MapValueWriter.java similarity index 92% rename from core/src/main/java/org/modelmapper/internal/valuemutate/MapValueWriter.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/valuemutate/MapValueWriter.java index 67dbcd4d..77029d7a 100644 --- a/core/src/main/java/org/modelmapper/internal/valuemutate/MapValueWriter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/valuemutate/MapValueWriter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.valuemutate; +package org.clairvoyant.modelmapper.internal.valuemutate; import java.util.Collection; import java.util.Map; -import org.modelmapper.spi.ValueWriter; +import org.clairvoyant.modelmapper.spi.ValueWriter; /** * Handles writing value to java.util.Map instances. diff --git a/core/src/main/java/org/modelmapper/internal/valuemutate/ValueMutateStore.java b/core/src/main/java/org/clairvoyant/modelmapper/internal/valuemutate/ValueMutateStore.java similarity index 86% rename from core/src/main/java/org/modelmapper/internal/valuemutate/ValueMutateStore.java rename to core/src/main/java/org/clairvoyant/modelmapper/internal/valuemutate/ValueMutateStore.java index f87d7441..261ed39a 100644 --- a/core/src/main/java/org/modelmapper/internal/valuemutate/ValueMutateStore.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/internal/valuemutate/ValueMutateStore.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.valuemutate; +package org.clairvoyant.modelmapper.internal.valuemutate; import java.util.List; -import org.modelmapper.internal.TypeResolvingList; -import org.modelmapper.spi.ValueWriter; +import org.clairvoyant.modelmapper.internal.TypeResolvingList; +import org.clairvoyant.modelmapper.spi.ValueWriter; /** * Store for ValueReaders. diff --git a/core/src/main/java/org/modelmapper/package-info.java b/core/src/main/java/org/clairvoyant/modelmapper/package-info.java similarity index 76% rename from core/src/main/java/org/modelmapper/package-info.java rename to core/src/main/java/org/clairvoyant/modelmapper/package-info.java index 6350f0f0..fbb2822d 100644 --- a/core/src/main/java/org/modelmapper/package-info.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/package-info.java @@ -20,24 +20,24 @@ * The principal public APIs in this package are: * *
- *
{@link org.modelmapper.ModelMapper} + *
{@link org.clairvoyant.modelmapper.ModelMapper} *
The class you instantiate to perform object mapping, load mapping definitions and register mappers. * - *
{@link org.modelmapper.PropertyMap} + *
{@link org.clairvoyant.modelmapper.PropertyMap} *
The class you extend to define mappings between source and destination properties. * - *
{@link org.modelmapper.TypeMap} + *
{@link org.clairvoyant.modelmapper.TypeMap} *
The interface you use to perform configuration, introspection and mapping between two types. * - *
{@link org.modelmapper.Converter} + *
{@link org.clairvoyant.modelmapper.Converter} *
The interface you implement to perform custom mapping between two types or property hierarchies. * - *
{@link org.modelmapper.Provider} + *
{@link org.clairvoyant.modelmapper.Provider} *
The interface you implement to provide instances of destination types. * - *
{@link org.modelmapper.Condition} + *
{@link org.clairvoyant.modelmapper.Condition} *
The interface you implement to conditionally create a mapping. *
*/ -package org.modelmapper; +package org.clairvoyant.modelmapper; diff --git a/core/src/main/java/org/modelmapper/spi/ConditionalConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/ConditionalConverter.java similarity index 92% rename from core/src/main/java/org/modelmapper/spi/ConditionalConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/ConditionalConverter.java index 1742a5f0..5238243a 100644 --- a/core/src/main/java/org/modelmapper/spi/ConditionalConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/ConditionalConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; -import org.modelmapper.Converter; -import org.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.config.Configuration; /** * Conditionally converts matching source objects to instances of destination type {@code D}. diff --git a/core/src/main/java/org/modelmapper/spi/ConstantMapping.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/ConstantMapping.java similarity index 92% rename from core/src/main/java/org/modelmapper/spi/ConstantMapping.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/ConstantMapping.java index 912447c0..cd21aaba 100644 --- a/core/src/main/java/org/modelmapper/spi/ConstantMapping.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/ConstantMapping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * A mapping of a source constant to a destination property hierarchy. diff --git a/core/src/main/java/org/modelmapper/spi/DestinationSetter.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/DestinationSetter.java similarity index 96% rename from core/src/main/java/org/modelmapper/spi/DestinationSetter.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/DestinationSetter.java index bf0bee77..ba077684 100644 --- a/core/src/main/java/org/modelmapper/spi/DestinationSetter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/DestinationSetter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Represents an operation for setting a value into destination diff --git a/core/src/main/java/org/modelmapper/spi/ErrorMessage.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/ErrorMessage.java similarity index 94% rename from core/src/main/java/org/modelmapper/spi/ErrorMessage.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/ErrorMessage.java index 93429da1..4c94041b 100644 --- a/core/src/main/java/org/modelmapper/spi/ErrorMessage.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/ErrorMessage.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.io.Serializable; -import org.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.internal.util.Assert; /** * An error message. diff --git a/core/src/main/java/org/modelmapper/spi/Mapping.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/Mapping.java similarity index 88% rename from core/src/main/java/org/modelmapper/spi/Mapping.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/Mapping.java index 2cfbacc6..3326a291 100644 --- a/core/src/main/java/org/modelmapper/spi/Mapping.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/Mapping.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.util.List; -import org.modelmapper.Condition; -import org.modelmapper.Converter; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.Provider; /** * Mapping to a destination property hierarchy. diff --git a/core/src/main/java/org/modelmapper/spi/MappingContext.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/MappingContext.java similarity index 92% rename from core/src/main/java/org/modelmapper/spi/MappingContext.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/MappingContext.java index 93dcc209..f740bc37 100644 --- a/core/src/main/java/org/modelmapper/spi/MappingContext.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/MappingContext.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.lang.reflect.Type; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.TypeMap; /** * Maintains context during the mapping of a source object of type {@code S} to a destination object @@ -103,6 +103,11 @@ public interface MappingContext { **/ S getSource(); + /** + * Returns the parent source object being mapped from. + **/ + Object getParentSource(); + /** * Returns the source type being mapped from. */ diff --git a/core/src/main/java/org/modelmapper/spi/MappingEngine.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/MappingEngine.java similarity index 93% rename from core/src/main/java/org/modelmapper/spi/MappingEngine.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/MappingEngine.java index 1961540a..ae4c2669 100644 --- a/core/src/main/java/org/modelmapper/spi/MappingEngine.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/MappingEngine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Engine that performs mapping operations. diff --git a/core/src/main/java/org/modelmapper/spi/MatchingStrategy.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/MatchingStrategy.java similarity index 94% rename from core/src/main/java/org/modelmapper/spi/MatchingStrategy.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/MatchingStrategy.java index 7afe2873..12acf2ba 100644 --- a/core/src/main/java/org/modelmapper/spi/MatchingStrategy.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/MatchingStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Identifies source to destination property matches by comparing source and destination type, property diff --git a/core/src/main/java/org/modelmapper/spi/NameTokenizer.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/NameTokenizer.java similarity index 93% rename from core/src/main/java/org/modelmapper/spi/NameTokenizer.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/NameTokenizer.java index 724956e7..a090446a 100644 --- a/core/src/main/java/org/modelmapper/spi/NameTokenizer.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/NameTokenizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Tokenizes property and class names prior to matching. diff --git a/core/src/main/java/org/modelmapper/spi/NameTransformer.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/NameTransformer.java similarity index 93% rename from core/src/main/java/org/modelmapper/spi/NameTransformer.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/NameTransformer.java index 966bf381..bd232100 100644 --- a/core/src/main/java/org/modelmapper/spi/NameTransformer.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/NameTransformer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Transforms eligible property and class names prior to matching. diff --git a/core/src/main/java/org/modelmapper/spi/NameableType.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/NameableType.java similarity index 88% rename from core/src/main/java/org/modelmapper/spi/NameableType.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/NameableType.java index 239a025a..c8819b94 100644 --- a/core/src/main/java/org/modelmapper/spi/NameableType.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/NameableType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Nameable types. @@ -27,7 +27,7 @@ public enum NameableType { METHOD, /** A property that represents a {@link java.lang.reflect.Field} */ FIELD, - /** A nameable type obtained from a {@link org.modelmapper.spi.ValueReader} */ + /** A nameable type obtained from a {@link org.clairvoyant.modelmapper.spi.ValueReader} */ GENERIC; /** diff --git a/core/src/main/java/org/modelmapper/spi/NamingConvention.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/NamingConvention.java similarity index 93% rename from core/src/main/java/org/modelmapper/spi/NamingConvention.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/NamingConvention.java index 10958ccc..1194a828 100644 --- a/core/src/main/java/org/modelmapper/spi/NamingConvention.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/NamingConvention.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Determines which properties are eligible for matching based on their name. diff --git a/core/src/main/java/org/modelmapper/spi/PropertyInfo.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyInfo.java similarity index 95% rename from core/src/main/java/org/modelmapper/spi/PropertyInfo.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyInfo.java index d72010c4..4292189d 100644 --- a/core/src/main/java/org/modelmapper/spi/PropertyInfo.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.lang.annotation.Annotation; import java.lang.reflect.Member; diff --git a/core/src/main/java/org/modelmapper/spi/PropertyMapping.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyMapping.java similarity index 93% rename from core/src/main/java/org/modelmapper/spi/PropertyMapping.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyMapping.java index 22e294b4..86cb9957 100644 --- a/core/src/main/java/org/modelmapper/spi/PropertyMapping.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyMapping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.util.List; diff --git a/core/src/main/java/org/modelmapper/spi/PropertyNameInfo.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyNameInfo.java similarity index 94% rename from core/src/main/java/org/modelmapper/spi/PropertyNameInfo.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyNameInfo.java index 2c1e7135..0afaff48 100644 --- a/core/src/main/java/org/modelmapper/spi/PropertyNameInfo.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyNameInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.util.List; diff --git a/core/src/main/java/org/modelmapper/spi/PropertyType.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyType.java similarity index 84% rename from core/src/main/java/org/modelmapper/spi/PropertyType.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyType.java index 5392d488..3025b446 100644 --- a/core/src/main/java/org/modelmapper/spi/PropertyType.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/PropertyType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Property type. @@ -25,6 +25,6 @@ public enum PropertyType { FIELD, /** A property that represents a {@link java.lang.reflect.Method} */ METHOD, - /** A property obtained from a {@link org.modelmapper.spi.ValueReader} */ + /** A property obtained from a {@link org.clairvoyant.modelmapper.spi.ValueReader} */ GENERIC; } diff --git a/core/src/main/java/org/modelmapper/spi/SourceGetter.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/SourceGetter.java similarity index 95% rename from core/src/main/java/org/modelmapper/spi/SourceGetter.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/SourceGetter.java index 97b2cff7..8e34d8f4 100644 --- a/core/src/main/java/org/modelmapper/spi/SourceGetter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/SourceGetter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Represents an operation for getting an property from source diff --git a/core/src/main/java/org/modelmapper/spi/SourceMapping.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/SourceMapping.java similarity index 92% rename from core/src/main/java/org/modelmapper/spi/SourceMapping.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/SourceMapping.java index 9f243afa..a2001de9 100644 --- a/core/src/main/java/org/modelmapper/spi/SourceMapping.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/SourceMapping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * A mapping of a source object to a destination property hierarchy. diff --git a/core/src/main/java/org/modelmapper/spi/StrongTypeConditionalConverter.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/StrongTypeConditionalConverter.java similarity index 92% rename from core/src/main/java/org/modelmapper/spi/StrongTypeConditionalConverter.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/StrongTypeConditionalConverter.java index 3436aee2..daafab83 100644 --- a/core/src/main/java/org/modelmapper/spi/StrongTypeConditionalConverter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/StrongTypeConditionalConverter.java @@ -1,6 +1,6 @@ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; -import org.modelmapper.Converter; +import org.clairvoyant.modelmapper.Converter; public class StrongTypeConditionalConverter implements ConditionalConverter { public static ConditionalConverter wrap(Class sourceType, diff --git a/core/src/main/java/org/modelmapper/spi/Tokens.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/Tokens.java similarity index 89% rename from core/src/main/java/org/modelmapper/spi/Tokens.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/Tokens.java index 27c7dd9b..d76feb72 100644 --- a/core/src/main/java/org/modelmapper/spi/Tokens.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/Tokens.java @@ -1,4 +1,4 @@ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.util.Arrays; import java.util.Iterator; diff --git a/core/src/main/java/org/modelmapper/spi/TypeSafeSourceGetter.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/TypeSafeSourceGetter.java similarity index 92% rename from core/src/main/java/org/modelmapper/spi/TypeSafeSourceGetter.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/TypeSafeSourceGetter.java index d8be48a1..9c4111e8 100644 --- a/core/src/main/java/org/modelmapper/spi/TypeSafeSourceGetter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/TypeSafeSourceGetter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; /** * Represents an operation for getting an property from source diff --git a/core/src/main/java/org/modelmapper/spi/ValueReader.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/ValueReader.java similarity index 98% rename from core/src/main/java/org/modelmapper/spi/ValueReader.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/ValueReader.java index 66a6f140..a2a0937a 100644 --- a/core/src/main/java/org/modelmapper/spi/ValueReader.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/ValueReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.util.Collection; diff --git a/core/src/main/java/org/modelmapper/spi/ValueWriter.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/ValueWriter.java similarity index 98% rename from core/src/main/java/org/modelmapper/spi/ValueWriter.java rename to core/src/main/java/org/clairvoyant/modelmapper/spi/ValueWriter.java index a719924c..f893a62d 100644 --- a/core/src/main/java/org/modelmapper/spi/ValueWriter.java +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/ValueWriter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spi; +package org.clairvoyant.modelmapper.spi; import java.util.Collection; diff --git a/core/src/main/java/org/clairvoyant/modelmapper/spi/package-info.java b/core/src/main/java/org/clairvoyant/modelmapper/spi/package-info.java new file mode 100644 index 00000000..c6f10be2 --- /dev/null +++ b/core/src/main/java/org/clairvoyant/modelmapper/spi/package-info.java @@ -0,0 +1,4 @@ +/** + * Service Provider Interface + */ +package org.clairvoyant.modelmapper.spi; \ No newline at end of file diff --git a/core/src/main/java/org/modelmapper/config/package-info.java b/core/src/main/java/org/modelmapper/config/package-info.java deleted file mode 100644 index 8b6fb1f4..00000000 --- a/core/src/main/java/org/modelmapper/config/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Configuration types - */ -package org.modelmapper.config; - diff --git a/core/src/main/java/org/modelmapper/convention/package-info.java b/core/src/main/java/org/modelmapper/convention/package-info.java deleted file mode 100644 index 0736d2c1..00000000 --- a/core/src/main/java/org/modelmapper/convention/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Conventions - */ -package org.modelmapper.convention; \ No newline at end of file diff --git a/core/src/main/java/org/modelmapper/spi/package-info.java b/core/src/main/java/org/modelmapper/spi/package-info.java deleted file mode 100644 index 3f8499f5..00000000 --- a/core/src/main/java/org/modelmapper/spi/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Service Provider Interface - */ -package org.modelmapper.spi; \ No newline at end of file diff --git a/core/src/test/java/org/modelmapper/AbstractTest.java b/core/src/test/java/org/clairvoyant/modelmapper/AbstractTest.java similarity index 83% rename from core/src/test/java/org/modelmapper/AbstractTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/AbstractTest.java index d2a95734..b04ef7c2 100644 --- a/core/src/test/java/org/modelmapper/AbstractTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/AbstractTest.java @@ -1,4 +1,4 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import org.testng.annotations.BeforeMethod; diff --git a/core/src/test/java/org/modelmapper/Asserts.java b/core/src/test/java/org/clairvoyant/modelmapper/Asserts.java similarity index 97% rename from core/src/test/java/org/modelmapper/Asserts.java rename to core/src/test/java/org/clairvoyant/modelmapper/Asserts.java index 424bcfcb..acb9e3d6 100644 --- a/core/src/test/java/org/modelmapper/Asserts.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/Asserts.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper; +package org.clairvoyant.modelmapper; import static org.testng.Assert.assertTrue; diff --git a/core/src/test/java/org/modelmapper/Fixtures.java b/core/src/test/java/org/clairvoyant/modelmapper/Fixtures.java similarity index 87% rename from core/src/test/java/org/modelmapper/Fixtures.java rename to core/src/test/java/org/clairvoyant/modelmapper/Fixtures.java index 514fb676..c7736b1b 100644 --- a/core/src/test/java/org/modelmapper/Fixtures.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/Fixtures.java @@ -1,8 +1,8 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; -import org.modelmapper.config.Configuration; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; /** * Utilities for constructing test fixtures. diff --git a/core/src/test/java/org/modelmapper/Mappings.java b/core/src/test/java/org/clairvoyant/modelmapper/Mappings.java similarity index 83% rename from core/src/test/java/org/modelmapper/Mappings.java rename to core/src/test/java/org/clairvoyant/modelmapper/Mappings.java index de3ca71b..1078af1b 100644 --- a/core/src/test/java/org/modelmapper/Mappings.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/Mappings.java @@ -1,10 +1,10 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.Mapping; /** * Mapping related test utilities. diff --git a/core/src/test/java/org/modelmapper/ModelMapperTest.java b/core/src/test/java/org/clairvoyant/modelmapper/ModelMapperTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/ModelMapperTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/ModelMapperTest.java index 7753e2e8..aba4a499 100644 --- a/core/src/test/java/org/modelmapper/ModelMapperTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/ModelMapperTest.java @@ -1,4 +1,4 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -8,8 +8,8 @@ import static org.testng.Assert.fail; import java.util.Map; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.spi.Mapping; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/PropertyMapTest.java b/core/src/test/java/org/clairvoyant/modelmapper/PropertyMapTest.java similarity index 92% rename from core/src/test/java/org/modelmapper/PropertyMapTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/PropertyMapTest.java index 28ae88f5..1c5cce6e 100644 --- a/core/src/test/java/org/modelmapper/PropertyMapTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/PropertyMapTest.java @@ -1,4 +1,4 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import net.jodah.typetools.TypeResolver; import org.testng.Assert; diff --git a/core/src/test/java/org/modelmapper/TypeMapTest.java b/core/src/test/java/org/clairvoyant/modelmapper/TypeMapTest.java similarity index 92% rename from core/src/test/java/org/modelmapper/TypeMapTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/TypeMapTest.java index 35876607..fd590c5d 100644 --- a/core/src/test/java/org/modelmapper/TypeMapTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/TypeMapTest.java @@ -1,4 +1,4 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -8,9 +8,9 @@ import java.util.List; import java.util.Map; -import org.modelmapper.spi.ConstantMapping; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.ConstantMapping; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.PropertyInfo; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/CircularMappingBug.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/CircularMappingBug.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/CircularMappingBug.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/CircularMappingBug.java index 5ca1f6c4..bb262dc2 100644 --- a/core/src/test/java/org/modelmapper/bugs/CircularMappingBug.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/CircularMappingBug.java @@ -1,11 +1,11 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GC10.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC10.java similarity index 92% rename from core/src/test/java/org/modelmapper/bugs/GC10.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GC10.java index eccfc66d..a57560cc 100644 --- a/core/src/test/java/org/modelmapper/bugs/GC10.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC10.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GC12.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC12.java similarity index 88% rename from core/src/test/java/org/modelmapper/bugs/GC12.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GC12.java index 9d1d590e..0f8dc388 100644 --- a/core/src/test/java/org/modelmapper/bugs/GC12.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC12.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GC18.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC18.java similarity index 94% rename from core/src/test/java/org/modelmapper/bugs/GC18.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GC18.java index aad6e538..00733642 100644 --- a/core/src/test/java/org/modelmapper/bugs/GC18.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC18.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.*; import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GC19.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC19.java similarity index 92% rename from core/src/test/java/org/modelmapper/bugs/GC19.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GC19.java index 46ebc4ed..82a9ca91 100644 --- a/core/src/test/java/org/modelmapper/bugs/GC19.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC19.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GC22.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC22.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GC22.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GC22.java index 6043f956..3a87fe2c 100644 --- a/core/src/test/java/org/modelmapper/bugs/GC22.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GC22.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH101.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH101.java similarity index 92% rename from core/src/test/java/org/modelmapper/bugs/GH101.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH101.java index 4c7125a3..ad0c2766 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH101.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH101.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractConverter; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractConverter; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH104.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH104.java similarity index 86% rename from core/src/test/java/org/modelmapper/bugs/GH104.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH104.java index 745eb94b..12a91df6 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH104.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH104.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH109.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH109.java similarity index 84% rename from core/src/test/java/org/modelmapper/bugs/GH109.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH109.java index a730c12e..76ace6f3 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH109.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH109.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH11.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH11.java similarity index 87% rename from core/src/test/java/org/modelmapper/bugs/GH11.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH11.java index cd8117ed..8f109bd3 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH11.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH11.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH110.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH110.java similarity index 89% rename from core/src/test/java/org/modelmapper/bugs/GH110.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH110.java index 87bf83d5..3aad9070 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH110.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH110.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH113.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH113.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH113.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH113.java index da0a9191..c8bbf4a5 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH113.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH113.java @@ -1,7 +1,7 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH115.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH115.java similarity index 91% rename from core/src/test/java/org/modelmapper/bugs/GH115.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH115.java index 5fb478db..4b076106 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH115.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH115.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH119.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH119.java similarity index 88% rename from core/src/test/java/org/modelmapper/bugs/GH119.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH119.java index 39f28d91..ef0e8d9d 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH119.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH119.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH126.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH126.java similarity index 85% rename from core/src/test/java/org/modelmapper/bugs/GH126.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH126.java index ab6a401a..355079ad 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH126.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH126.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH129.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH129.java similarity index 85% rename from core/src/test/java/org/modelmapper/bugs/GH129.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH129.java index a97ab07c..b6f0282c 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH129.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH129.java @@ -1,6 +1,6 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH143.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH143.java similarity index 80% rename from core/src/test/java/org/modelmapper/bugs/GH143.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH143.java index 6dc440ec..dd555bd8 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH143.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH143.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.fail; import java.util.HashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.NameTokenizers; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.NameTokenizers; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH151.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH151.java similarity index 77% rename from core/src/test/java/org/modelmapper/bugs/GH151.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH151.java index 2b854a6a..9e6705ff 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH151.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH151.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH153.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH153.java similarity index 94% rename from core/src/test/java/org/modelmapper/bugs/GH153.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH153.java index 93936bb2..fbd10fb4 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH153.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH153.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import java.util.Date; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH171.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH171.java similarity index 94% rename from core/src/test/java/org/modelmapper/bugs/GH171.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH171.java index cd282748..937f89bf 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH171.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH171.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH176.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH176.java similarity index 96% rename from core/src/test/java/org/modelmapper/bugs/GH176.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH176.java index 73f88a20..a68d27c2 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH176.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH176.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertSame; -import org.modelmapper.AbstractConverter; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractConverter; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH182.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH182.java similarity index 91% rename from core/src/test/java/org/modelmapper/bugs/GH182.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH182.java index 65650d3d..e070dd41 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH182.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH182.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static java.util.Arrays.asList; import static org.testng.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH197.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH197.java similarity index 89% rename from core/src/test/java/org/modelmapper/bugs/GH197.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH197.java index be433f16..20cfeb5f 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH197.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH197.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; -import org.modelmapper.Condition; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/bugs/GH20.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH20.java similarity index 92% rename from core/src/test/java/org/modelmapper/bugs/GH20.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH20.java index d866b35c..8275bd65 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH20.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH20.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertTrue; @@ -6,9 +6,9 @@ import java.util.HashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH204.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH204.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH204.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH204.java index 205b2a6c..294fbf2c 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH204.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH204.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH22.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH22.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH22.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH22.java index 3e7686f2..60c672fd 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH22.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH22.java @@ -1,6 +1,6 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/core/src/test/java/org/modelmapper/bugs/GH220.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH220.java similarity index 92% rename from core/src/test/java/org/modelmapper/bugs/GH220.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH220.java index 9aac9b37..e836f804 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH220.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH220.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH23.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH23.java similarity index 88% rename from core/src/test/java/org/modelmapper/bugs/GH23.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH23.java index 6a5c1686..1837f15c 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH23.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH23.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH234.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH234.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GH234.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH234.java index 4eb27308..9134a3d5 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH234.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH234.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.ModelMapper; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH248.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH248.java similarity index 87% rename from core/src/test/java/org/modelmapper/bugs/GH248.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH248.java index e186e850..e533051e 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH248.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH248.java @@ -1,11 +1,11 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converters; -import org.modelmapper.Converters.Converter; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converters; +import org.clairvoyant.modelmapper.Converters.Converter; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/bugs/GH249.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH249.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GH249.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH249.java index 71a92728..652088f5 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH249.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH249.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; @@ -6,9 +6,9 @@ import java.util.HashSet; import java.util.Set; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH26.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH26.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GH26.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH26.java index d9a82f14..3b52c307 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH26.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH26.java @@ -1,14 +1,14 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH267.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH267.java similarity index 78% rename from core/src/test/java/org/modelmapper/bugs/GH267.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH267.java index 0c5c3d11..b44579dc 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH267.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH267.java @@ -1,11 +1,11 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertNotNull; -import org.modelmapper.Condition; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH27.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH27.java similarity index 88% rename from core/src/test/java/org/modelmapper/bugs/GH27.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH27.java index c36e0e28..6ee62484 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH27.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH27.java @@ -1,11 +1,11 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH283.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH283.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH283.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH283.java index 0e4c9d80..5a1a348c 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH283.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH283.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH287.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH287.java similarity index 91% rename from core/src/test/java/org/modelmapper/bugs/GH287.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH287.java index df1ecaf7..8d3391d0 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH287.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH287.java @@ -1,13 +1,13 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.ConfigurationException; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.ErrorMessage; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.ErrorMessage; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH291.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH291.java similarity index 86% rename from core/src/test/java/org/modelmapper/bugs/GH291.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH291.java index 2184ce7a..66ae949c 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH291.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH291.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH30.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH30.java similarity index 93% rename from core/src/test/java/org/modelmapper/bugs/GH30.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH30.java index b95d0807..d54522d3 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH30.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH30.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH31.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH31.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GH31.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH31.java index e1f2916c..629110cc 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH31.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH31.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.util.Date; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH336.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH336.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH336.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH336.java index 2fc2b21d..2653f35e 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH336.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH336.java @@ -1,7 +1,7 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH354.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH354.java similarity index 86% rename from core/src/test/java/org/modelmapper/bugs/GH354.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH354.java index bdbecdb3..2e3634e2 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH354.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH354.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.TypeSafeSourceGetter; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.TypeSafeSourceGetter; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH360.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH360.java similarity index 89% rename from core/src/test/java/org/modelmapper/bugs/GH360.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH360.java index 49854006..4022951e 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH360.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH360.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import java.util.Collections; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH364.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH364.java similarity index 88% rename from core/src/test/java/org/modelmapper/bugs/GH364.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH364.java index c22f23b7..d795470f 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH364.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH364.java @@ -1,7 +1,7 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH37.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH37.java similarity index 93% rename from core/src/test/java/org/modelmapper/bugs/GH37.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH37.java index c1302829..4e2b7800 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH37.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH37.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH370.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH370.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GH370.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH370.java index 6985f698..e84ced46 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH370.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH370.java @@ -1,11 +1,11 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/bugs/GH379.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH379.java similarity index 84% rename from core/src/test/java/org/modelmapper/bugs/GH379.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH379.java index 32670118..379ae98d 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH379.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH379.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.lang.reflect.Type; import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.TypeToken; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH38.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH38.java similarity index 87% rename from core/src/test/java/org/modelmapper/bugs/GH38.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH38.java index de4a15e8..1587339f 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH38.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH38.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import org.mockito.Mockito; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/bugs/GH386.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH386.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH386.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH386.java index 3301913d..c9be6382 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH386.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH386.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/bugs/GH389.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH389.java similarity index 85% rename from core/src/test/java/org/modelmapper/bugs/GH389.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH389.java index f38971d0..0d02cd89 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH389.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH389.java @@ -1,7 +1,7 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converters; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converters; import org.testng.annotations.Test; import java.util.Collections; diff --git a/core/src/test/java/org/modelmapper/bugs/GH39.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH39.java similarity index 86% rename from core/src/test/java/org/modelmapper/bugs/GH39.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH39.java index 3637a3e4..e63b3f3a 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH39.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH39.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH40.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH40.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH40.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH40.java index 100c5d5f..271a1ef8 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH40.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH40.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; @@ -6,10 +6,10 @@ import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.TypeToken; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH408.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH408.java similarity index 86% rename from core/src/test/java/org/modelmapper/bugs/GH408.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH408.java index f936c47e..3c53db9f 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH408.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH408.java @@ -1,6 +1,6 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/bugs/GH415.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH415.java similarity index 88% rename from core/src/test/java/org/modelmapper/bugs/GH415.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH415.java index 1ec81c28..1a441be8 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH415.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH415.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; -import org.modelmapper.AbstractTest; -import org.modelmapper.TypeToken; -import org.modelmapper.spi.DestinationSetter; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.spi.DestinationSetter; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/bugs/GH46.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH46.java similarity index 91% rename from core/src/test/java/org/modelmapper/bugs/GH46.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH46.java index e050b1da..98d92086 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH46.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH46.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.math.BigDecimal; import java.math.BigInteger; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH47.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH47.java similarity index 88% rename from core/src/test/java/org/modelmapper/bugs/GH47.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH47.java index 937cdbd0..c0d8fa0c 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH47.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH47.java @@ -1,11 +1,11 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.util.Date; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH521.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH521.java similarity index 87% rename from core/src/test/java/org/modelmapper/bugs/GH521.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH521.java index e73f771f..e634dea4 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH521.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH521.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertNotNull; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH547.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH547.java similarity index 85% rename from core/src/test/java/org/modelmapper/bugs/GH547.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH547.java index 551ab3d3..13c7f8a4 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH547.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH547.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; @@ -7,8 +7,8 @@ import java.util.List; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.TypeToken; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH550.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH550.java similarity index 91% rename from core/src/test/java/org/modelmapper/bugs/GH550.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH550.java index c393f9df..ee069df8 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH550.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH550.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.util.HashMap; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH565.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH565.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH565.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH565.java index d4beb73f..62a46d39 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH565.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH565.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH573.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH573.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GH573.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH573.java index 477f5887..54846c11 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH573.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH573.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH578.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH578.java similarity index 90% rename from core/src/test/java/org/modelmapper/bugs/GH578.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH578.java index af991d0f..1a7bd53d 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH578.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH578.java @@ -1,11 +1,11 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.ConfigurationException; -import org.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.ModelMapper; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH581.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH581.java similarity index 96% rename from core/src/test/java/org/modelmapper/bugs/GH581.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH581.java index 164d6afc..b85af509 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH581.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH581.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import java.util.Collection; import java.util.Collections; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH6.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH6.java similarity index 97% rename from core/src/test/java/org/modelmapper/bugs/GH6.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH6.java index 2bed4777..b3c96f2b 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH6.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH6.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH60.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH60.java similarity index 91% rename from core/src/test/java/org/modelmapper/bugs/GH60.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH60.java index b4605763..1d61589e 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH60.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH60.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH608.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH608.java similarity index 94% rename from core/src/test/java/org/modelmapper/bugs/GH608.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH608.java index 85eabe52..90299fd3 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH608.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH608.java @@ -1,10 +1,10 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractConverter; -import org.modelmapper.AbstractTest; -import org.modelmapper.spi.SourceGetter; +import org.clairvoyant.modelmapper.AbstractConverter; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.spi.SourceGetter; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH654.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH654.java similarity index 92% rename from core/src/test/java/org/modelmapper/bugs/GH654.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH654.java index fd365622..8d5cad86 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH654.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH654.java @@ -1,12 +1,12 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.ConfigurationException; -import org.modelmapper.spi.ErrorMessage; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.spi.ErrorMessage; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH74.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH74.java similarity index 83% rename from core/src/test/java/org/modelmapper/bugs/GH74.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH74.java index 4580911b..677f12fa 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH74.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH74.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/bugs/GH81.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH81.java similarity index 86% rename from core/src/test/java/org/modelmapper/bugs/GH81.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH81.java index 68373d8a..1a331896 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH81.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH81.java @@ -1,4 +1,4 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.modelmapper.bugs.GH81.FooPrime.BarPrime; +import org.clairvoyant.modelmapper.bugs.GH81.FooPrime.BarPrime; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH85.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH85.java similarity index 87% rename from core/src/test/java/org/modelmapper/bugs/GH85.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH85.java index 6c5426a6..297e74e3 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH85.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH85.java @@ -1,8 +1,8 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/bugs/GH9.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH9.java similarity index 95% rename from core/src/test/java/org/modelmapper/bugs/GH9.java rename to core/src/test/java/org/clairvoyant/modelmapper/bugs/GH9.java index 1c683464..5bf201b5 100644 --- a/core/src/test/java/org/modelmapper/bugs/GH9.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/GH9.java @@ -1,9 +1,9 @@ -package org.modelmapper.bugs; +package org.clairvoyant.modelmapper.bugs; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/clairvoyant/modelmapper/bugs/package-info.java b/core/src/test/java/org/clairvoyant/modelmapper/bugs/package-info.java new file mode 100644 index 00000000..b81262d0 --- /dev/null +++ b/core/src/test/java/org/clairvoyant/modelmapper/bugs/package-info.java @@ -0,0 +1,5 @@ +/** + * Bug reports. + */ +package org.clairvoyant.modelmapper.bugs; + diff --git a/core/src/test/java/org/modelmapper/convention/InexactMatcherTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/InexactMatcherTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/convention/InexactMatcherTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/InexactMatcherTest.java index 15fb1ef3..c20d4e03 100644 --- a/core/src/test/java/org/modelmapper/convention/InexactMatcherTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/InexactMatcherTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; -import static org.modelmapper.convention.InexactMatcher.matchTokens; +import static org.clairvoyant.modelmapper.convention.InexactMatcher.matchTokens; import static org.testng.Assert.assertEquals; -import org.modelmapper.spi.Tokens; +import org.clairvoyant.modelmapper.spi.Tokens; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/convention/InexactMatchingStrategyTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/InexactMatchingStrategyTest.java similarity index 94% rename from core/src/test/java/org/modelmapper/convention/InexactMatchingStrategyTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/InexactMatchingStrategyTest.java index 7e866ae9..415a63d4 100644 --- a/core/src/test/java/org/modelmapper/convention/InexactMatchingStrategyTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/InexactMatchingStrategyTest.java @@ -1,7 +1,7 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; -import org.modelmapper.internal.MatchingStrategyTestSupport; -import org.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.internal.MatchingStrategyTestSupport; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/convention/LooseMatchingStrategyTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/LooseMatchingStrategyTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/convention/LooseMatchingStrategyTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/LooseMatchingStrategyTest.java index 6447d438..77f80c40 100644 --- a/core/src/test/java/org/modelmapper/convention/LooseMatchingStrategyTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/LooseMatchingStrategyTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/convention/NameTokenizersTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/NameTokenizersTest.java similarity index 94% rename from core/src/test/java/org/modelmapper/convention/NameTokenizersTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/NameTokenizersTest.java index 14f404ac..35bafa52 100644 --- a/core/src/test/java/org/modelmapper/convention/NameTokenizersTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/NameTokenizersTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/convention/NameTransformersTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/NameTransformersTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/convention/NameTransformersTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/NameTransformersTest.java index 1a91f9c8..b81ead7f 100644 --- a/core/src/test/java/org/modelmapper/convention/NameTransformersTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/NameTransformersTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import static org.testng.Assert.assertEquals; -import org.modelmapper.spi.NameableType; +import org.clairvoyant.modelmapper.spi.NameableType; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/convention/NamingConventionsTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/NamingConventionsTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/convention/NamingConventionsTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/NamingConventionsTest.java index 22d3597a..66a9f250 100644 --- a/core/src/test/java/org/modelmapper/convention/NamingConventionsTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/NamingConventionsTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import static org.testng.Assert.*; -import org.modelmapper.spi.PropertyType; +import org.clairvoyant.modelmapper.spi.PropertyType; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/convention/StandardMatchingStrategyTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/StandardMatchingStrategyTest.java similarity index 92% rename from core/src/test/java/org/modelmapper/convention/StandardMatchingStrategyTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/StandardMatchingStrategyTest.java index 5b3a4ff8..4fa34d39 100644 --- a/core/src/test/java/org/modelmapper/convention/StandardMatchingStrategyTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/StandardMatchingStrategyTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/convention/StrictMatchingStrategyTest.java b/core/src/test/java/org/clairvoyant/modelmapper/convention/StrictMatchingStrategyTest.java similarity index 87% rename from core/src/test/java/org/modelmapper/convention/StrictMatchingStrategyTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/convention/StrictMatchingStrategyTest.java index 0718aa22..68fcb672 100644 --- a/core/src/test/java/org/modelmapper/convention/StrictMatchingStrategyTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/convention/StrictMatchingStrategyTest.java @@ -1,6 +1,6 @@ -package org.modelmapper.convention; +package org.clairvoyant.modelmapper.convention; -import org.modelmapper.internal.MatchingStrategyTestSupport; +import org.clairvoyant.modelmapper.internal.MatchingStrategyTestSupport; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/EnumConversion.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/EnumConversion.java similarity index 83% rename from core/src/test/java/org/modelmapper/functional/EnumConversion.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/EnumConversion.java index 01669610..5a19692d 100644 --- a/core/src/test/java/org/modelmapper/functional/EnumConversion.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/EnumConversion.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/EqualHierarchies.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/EqualHierarchies.java similarity index 89% rename from core/src/test/java/org/modelmapper/functional/EqualHierarchies.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/EqualHierarchies.java index f2d110ff..601c28a7 100644 --- a/core/src/test/java/org/modelmapper/functional/EqualHierarchies.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/EqualHierarchies.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/FieldMappingTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/FieldMappingTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/functional/FieldMappingTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/FieldMappingTest.java index 152a6233..a838b736 100644 --- a/core/src/test/java/org/modelmapper/functional/FieldMappingTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/FieldMappingTest.java @@ -1,16 +1,16 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractConverter; -import org.modelmapper.AbstractProvider; -import org.modelmapper.Conditions; -import org.modelmapper.Converter; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractConverter; +import org.clairvoyant.modelmapper.AbstractProvider; +import org.clairvoyant.modelmapper.Conditions; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/Immutable.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/Immutable.java similarity index 85% rename from core/src/test/java/org/modelmapper/functional/Immutable.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/Immutable.java index 889846d2..12d3cf40 100644 --- a/core/src/test/java/org/modelmapper/functional/Immutable.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/Immutable.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; -import org.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/JitTypeMap.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/JitTypeMap.java similarity index 83% rename from core/src/test/java/org/modelmapper/functional/JitTypeMap.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/JitTypeMap.java index 1b27c5dc..73e9a9e3 100644 --- a/core/src/test/java/org/modelmapper/functional/JitTypeMap.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/JitTypeMap.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/MismatchedProperties.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/MismatchedProperties.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/MismatchedProperties.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/MismatchedProperties.java index f24a1cc1..6dc16d04 100644 --- a/core/src/test/java/org/modelmapper/functional/MismatchedProperties.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/MismatchedProperties.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/NamedTypeMaps.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/NamedTypeMaps.java similarity index 85% rename from core/src/test/java/org/modelmapper/functional/NamedTypeMaps.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/NamedTypeMaps.java index 8a247092..d9cbd50f 100644 --- a/core/src/test/java/org/modelmapper/functional/NamedTypeMaps.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/NamedTypeMaps.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.TypeMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/NullBehavior.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/NullBehavior.java similarity index 85% rename from core/src/test/java/org/modelmapper/functional/NullBehavior.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/NullBehavior.java index cd62cad8..4730dc3b 100644 --- a/core/src/test/java/org/modelmapper/functional/NullBehavior.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/NullBehavior.java @@ -1,15 +1,15 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.Conditions; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Conditions; import org.testng.annotations.Test; /** * @author Jonathan Halterman - * @see {@link org.modelmapper.bugs.GH6} for additional null behavior tests + * @see {@link org.clairvoyant.modelmapper.bugs.GH6} for additional null behavior tests */ @Test(groups = "functional") public class NullBehavior extends AbstractTest { diff --git a/core/src/test/java/org/modelmapper/functional/PrimitiveMapping.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/PrimitiveMapping.java similarity index 90% rename from core/src/test/java/org/modelmapper/functional/PrimitiveMapping.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/PrimitiveMapping.java index 5713e31d..74fd7668 100644 --- a/core/src/test/java/org/modelmapper/functional/PrimitiveMapping.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/PrimitiveMapping.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; import java.util.Date; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/PropertyMappingTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/PropertyMappingTest.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/PropertyMappingTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/PropertyMappingTest.java index 2eaae6af..406c2e1c 100644 --- a/core/src/test/java/org/modelmapper/functional/PropertyMappingTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/PropertyMappingTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; -import org.modelmapper.AbstractTest; -import org.modelmapper.ConfigurationException; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/ProxyTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/ProxyTest.java similarity index 90% rename from core/src/test/java/org/modelmapper/functional/ProxyTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/ProxyTest.java index e2dd4da7..a58c6570 100644 --- a/core/src/test/java/org/modelmapper/functional/ProxyTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/ProxyTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; @@ -13,8 +13,8 @@ import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; -import org.modelmapper.AbstractTest; -import org.modelmapper.internal.util.JavaVersions; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.internal.util.JavaVersions; import org.testng.SkipException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/UnequalHierarchies.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/UnequalHierarchies.java similarity index 89% rename from core/src/test/java/org/modelmapper/functional/UnequalHierarchies.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/UnequalHierarchies.java index 16442c73..38d85c8e 100644 --- a/core/src/test/java/org/modelmapper/functional/UnequalHierarchies.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/UnequalHierarchies.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional; +package org.clairvoyant.modelmapper.functional; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/builder/BuilderTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/builder/BuilderTest.java similarity index 87% rename from core/src/test/java/org/modelmapper/functional/builder/BuilderTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/builder/BuilderTest.java index 5c1425d2..54a38896 100644 --- a/core/src/test/java/org/modelmapper/functional/builder/BuilderTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/builder/BuilderTest.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.builder; +package org.clairvoyant.modelmapper.functional.builder; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; -import org.modelmapper.config.Configuration; -import org.modelmapper.convention.NameTransformers; -import org.modelmapper.convention.NamingConventions; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.convention.NameTransformers; +import org.clairvoyant.modelmapper.convention.NamingConventions; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies1.java similarity index 93% rename from core/src/test/java/org/modelmapper/functional/circular/CircularDependencies1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies1.java index a4d1e38e..a3ef3eca 100644 --- a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies1.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.circular; +package org.clairvoyant.modelmapper.functional.circular; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies2.java similarity index 92% rename from core/src/test/java/org/modelmapper/functional/circular/CircularDependencies2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies2.java index 3cb9e1a7..dd990b63 100644 --- a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies2.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.circular; +package org.clairvoyant.modelmapper.functional.circular; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies3.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies3.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/circular/CircularDependencies3.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies3.java index af57ad4d..b1b7c755 100644 --- a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies3.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies3.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.circular; +package org.clairvoyant.modelmapper.functional.circular; import static org.testng.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test(groups = "functional") diff --git a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies4.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies4.java similarity index 79% rename from core/src/test/java/org/modelmapper/functional/circular/CircularDependencies4.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies4.java index cf550367..840ae2f6 100644 --- a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies4.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies4.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.circular; +package org.clairvoyant.modelmapper.functional.circular; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies5.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies5.java similarity index 94% rename from core/src/test/java/org/modelmapper/functional/circular/CircularDependencies5.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies5.java index f0c98464..448533ac 100644 --- a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies5.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies5.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.circular; +package org.clairvoyant.modelmapper.functional.circular; import static org.testng.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies6.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies6.java similarity index 94% rename from core/src/test/java/org/modelmapper/functional/circular/CircularDependencies6.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies6.java index d7f43f62..31473cf1 100644 --- a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies6.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies6.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.circular; +package org.clairvoyant.modelmapper.functional.circular; import static org.testng.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies7.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies7.java similarity index 75% rename from core/src/test/java/org/modelmapper/functional/circular/CircularDependencies7.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies7.java index de5ef185..95bfea02 100644 --- a/core/src/test/java/org/modelmapper/functional/circular/CircularDependencies7.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/circular/CircularDependencies7.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.circular; +package org.clairvoyant.modelmapper.functional.circular; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/conditional/ConditionalMapping1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalMapping1.java similarity index 82% rename from core/src/test/java/org/modelmapper/functional/conditional/ConditionalMapping1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalMapping1.java index 7866e62c..a82e19a9 100644 --- a/core/src/test/java/org/modelmapper/functional/conditional/ConditionalMapping1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalMapping1.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.conditional; +package org.clairvoyant.modelmapper.functional.conditional; import static org.testng.Assert.*; -import org.modelmapper.AbstractTest; -import org.modelmapper.Conditions; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Conditions; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/conditional/ConditionalMapping2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalMapping2.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/conditional/ConditionalMapping2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalMapping2.java index 21ee9bb6..f049bf26 100644 --- a/core/src/test/java/org/modelmapper/functional/conditional/ConditionalMapping2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalMapping2.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.conditional; +package org.clairvoyant.modelmapper.functional.conditional; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.Condition; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/conditional/ConditionalTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalTest.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/conditional/ConditionalTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalTest.java index a2f25b7f..a851bd7f 100644 --- a/core/src/test/java/org/modelmapper/functional/conditional/ConditionalTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/conditional/ConditionalTest.java @@ -1,14 +1,14 @@ -package org.modelmapper.functional.conditional; +package org.clairvoyant.modelmapper.functional.conditional; import static org.testng.Assert.assertEquals; import java.util.concurrent.atomic.AtomicBoolean; -import org.modelmapper.AbstractTest; -import org.modelmapper.Condition; -import org.modelmapper.Conditions; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Conditions; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/config/DeepCopyEnabledTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/config/DeepCopyEnabledTest.java similarity index 91% rename from core/src/test/java/org/modelmapper/functional/config/DeepCopyEnabledTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/config/DeepCopyEnabledTest.java index 1c10c04c..8a19c06d 100644 --- a/core/src/test/java/org/modelmapper/functional/config/DeepCopyEnabledTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/config/DeepCopyEnabledTest.java @@ -1,6 +1,6 @@ -package org.modelmapper.functional.config; +package org.clairvoyant.modelmapper.functional.config; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/functional/config/ImplicitMappingDisabled.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/config/ImplicitMappingDisabled.java similarity index 82% rename from core/src/test/java/org/modelmapper/functional/config/ImplicitMappingDisabled.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/config/ImplicitMappingDisabled.java index 16c200f7..d9dcc6ba 100644 --- a/core/src/test/java/org/modelmapper/functional/config/ImplicitMappingDisabled.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/config/ImplicitMappingDisabled.java @@ -1,6 +1,6 @@ -package org.modelmapper.functional.config; +package org.clairvoyant.modelmapper.functional.config; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/core/src/test/java/org/modelmapper/functional/converter/CollectionFirstElementTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/CollectionFirstElementTest.java similarity index 84% rename from core/src/test/java/org/modelmapper/functional/converter/CollectionFirstElementTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/CollectionFirstElementTest.java index 56842918..9df4c4ac 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/CollectionFirstElementTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/CollectionFirstElementTest.java @@ -1,7 +1,7 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converters; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converters; import org.testng.annotations.Test; import java.util.Collections; @@ -60,7 +60,7 @@ public void shouldConvertTo() { } public void shouldMapTo() { - final org.modelmapper.Converter converter = context -> { + final org.clairvoyant.modelmapper.Converter converter = context -> { DItem dItem = new DItem(); dItem.value = context.getSource().value.toUpperCase(); return dItem; diff --git a/core/src/test/java/org/modelmapper/functional/converter/ConvertNestedObjectTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ConvertNestedObjectTest.java similarity index 95% rename from core/src/test/java/org/modelmapper/functional/converter/ConvertNestedObjectTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ConvertNestedObjectTest.java index 5039d124..d851e13b 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/ConvertNestedObjectTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ConvertNestedObjectTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/functional/converter/ConverterTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ConverterTest1.java similarity index 92% rename from core/src/test/java/org/modelmapper/functional/converter/ConverterTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ConverterTest1.java index aa9eadb6..33c4dc5f 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/ConverterTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ConverterTest1.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/converter/CustomConversion.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/CustomConversion.java similarity index 95% rename from core/src/test/java/org/modelmapper/functional/converter/CustomConversion.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/CustomConversion.java index a9c6778d..fd3440df 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/CustomConversion.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/CustomConversion.java @@ -1,7 +1,7 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; -import org.modelmapper.*; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.*; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/converter/ExistingDestinationTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ExistingDestinationTest.java similarity index 80% rename from core/src/test/java/org/modelmapper/functional/converter/ExistingDestinationTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ExistingDestinationTest.java index d3290319..e610f082 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/ExistingDestinationTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ExistingDestinationTest.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/converter/ImplicitUnknownTypeConversionTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ImplicitUnknownTypeConversionTest.java similarity index 95% rename from core/src/test/java/org/modelmapper/functional/converter/ImplicitUnknownTypeConversionTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ImplicitUnknownTypeConversionTest.java index 0edfaa32..58065832 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/ImplicitUnknownTypeConversionTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/ImplicitUnknownTypeConversionTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; import static org.testng.Assert.fail; -import org.modelmapper.ModelMapper; -import org.modelmapper.ValidationException; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.ValidationException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/converter/PassNullSourcesToGlobalConditionalConvertersTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/PassNullSourcesToGlobalConditionalConvertersTest.java similarity index 83% rename from core/src/test/java/org/modelmapper/functional/converter/PassNullSourcesToGlobalConditionalConvertersTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/PassNullSourcesToGlobalConditionalConvertersTest.java index f6e0a72a..2b88987a 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/PassNullSourcesToGlobalConditionalConvertersTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/PassNullSourcesToGlobalConditionalConvertersTest.java @@ -1,13 +1,13 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; import static org.testng.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/converter/PreAndPostConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/PreAndPostConverterTest.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/converter/PreAndPostConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/converter/PreAndPostConverterTest.java index 4f8a3ced..a261714f 100644 --- a/core/src/test/java/org/modelmapper/functional/converter/PreAndPostConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/converter/PreAndPostConverterTest.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.converter; +package org.clairvoyant.modelmapper.functional.converter; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/DeepMappingTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/DeepMappingTest1.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/deepmapping/DeepMappingTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/DeepMappingTest1.java index d19ab237..82acae77 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/DeepMappingTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/DeepMappingTest1.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.Asserts; -import org.modelmapper.ConfigurationException; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/DeepMappingTest2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/DeepMappingTest2.java similarity index 81% rename from core/src/test/java/org/modelmapper/functional/deepmapping/DeepMappingTest2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/DeepMappingTest2.java index f6085257..faaa5bd4 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/DeepMappingTest2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/DeepMappingTest2.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest1.java similarity index 91% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest1.java index f9a437a8..8e8651bd 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest1.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest2.java similarity index 93% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest2.java index ce757f14..637d42f7 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest2.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.Asserts; -import org.modelmapper.ConfigurationException; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest3.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest3.java similarity index 93% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest3.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest3.java index fe16dd26..499c7249 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest3.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest3.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest4.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest4.java similarity index 91% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest4.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest4.java index d03cf355..2a31f3b9 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest4.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest4.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.Asserts; -import org.modelmapper.ConfigurationException; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest5.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest5.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest5.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest5.java index af7469f7..207ca285 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest5.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest5.java @@ -1,6 +1,6 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest6.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest6.java similarity index 87% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest6.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest6.java index 2e91c587..ba67eda6 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest6.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest6.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest7.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest7.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest7.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest7.java index 3047c895..a530c9cf 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest7.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest7.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest8.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest8.java similarity index 78% rename from core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest8.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest8.java index 35a04fdd..02b052bd 100644 --- a/core/src/test/java/org/modelmapper/functional/deepmapping/NestedMappingTest8.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/deepmapping/NestedMappingTest8.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.deepmapping; +package org.clairvoyant.modelmapper.functional.deepmapping; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; -import org.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; import org.testng.annotations.Test; @Test(groups = "functional") diff --git a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest1.java similarity index 82% rename from core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest1.java index c036b49c..dec75d50 100644 --- a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest1.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.disambiguation; +package org.clairvoyant.modelmapper.functional.disambiguation; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest2.java similarity index 85% rename from core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest2.java index f1ed404a..69142b76 100644 --- a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest2.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.disambiguation; +package org.clairvoyant.modelmapper.functional.disambiguation; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest3.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest3.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest3.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest3.java index c91976af..9120135c 100644 --- a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest3.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest3.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.disambiguation; +package org.clairvoyant.modelmapper.functional.disambiguation; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest4.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest4.java similarity index 78% rename from core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest4.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest4.java index 4782a8e4..c5712b11 100644 --- a/core/src/test/java/org/modelmapper/functional/disambiguation/DisambiguationTest4.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/DisambiguationTest4.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.disambiguation; +package org.clairvoyant.modelmapper.functional.disambiguation; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.Asserts; -import org.modelmapper.ConfigurationException; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/disambiguation/SameNames.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/SameNames.java similarity index 87% rename from core/src/test/java/org/modelmapper/functional/disambiguation/SameNames.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/SameNames.java index 4cda35a4..1f2483bb 100644 --- a/core/src/test/java/org/modelmapper/functional/disambiguation/SameNames.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/disambiguation/SameNames.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.disambiguation; +package org.clairvoyant.modelmapper.functional.disambiguation; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/enums/EnumConverter.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumConverter.java similarity index 78% rename from core/src/test/java/org/modelmapper/functional/enums/EnumConverter.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumConverter.java index b600324a..80b45572 100644 --- a/core/src/test/java/org/modelmapper/functional/enums/EnumConverter.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumConverter.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.enums; +package org.clairvoyant.modelmapper.functional.enums; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; @Test(groups = "functional") diff --git a/core/src/test/java/org/modelmapper/functional/enums/EnumSetMappingTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumSetMappingTest.java similarity index 91% rename from core/src/test/java/org/modelmapper/functional/enums/EnumSetMappingTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumSetMappingTest.java index 58d0f04f..d442d2b3 100644 --- a/core/src/test/java/org/modelmapper/functional/enums/EnumSetMappingTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumSetMappingTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.enums; +package org.clairvoyant.modelmapper.functional.enums; -import org.modelmapper.Converter; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; import java.util.Arrays; diff --git a/core/src/test/java/org/modelmapper/functional/enums/EnumWithAnonymousClassMapTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumWithAnonymousClassMapTest.java similarity index 80% rename from core/src/test/java/org/modelmapper/functional/enums/EnumWithAnonymousClassMapTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumWithAnonymousClassMapTest.java index 7c77f24f..198c0a0f 100644 --- a/core/src/test/java/org/modelmapper/functional/enums/EnumWithAnonymousClassMapTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/enums/EnumWithAnonymousClassMapTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.enums; +package org.clairvoyant.modelmapper.functional.enums; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/functional/inherit/MultipleInterfacesTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/MultipleInterfacesTest.java similarity index 92% rename from core/src/test/java/org/modelmapper/functional/inherit/MultipleInterfacesTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/MultipleInterfacesTest.java index 1c629348..6beddd99 100644 --- a/core/src/test/java/org/modelmapper/functional/inherit/MultipleInterfacesTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/MultipleInterfacesTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.inherit; +package org.clairvoyant.modelmapper.functional.inherit; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/inherit/TypeMapIncludeBaseTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapIncludeBaseTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/functional/inherit/TypeMapIncludeBaseTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapIncludeBaseTest.java index f43de296..0905b9be 100644 --- a/core/src/test/java/org/modelmapper/functional/inherit/TypeMapIncludeBaseTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapIncludeBaseTest.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.inherit; +package org.clairvoyant.modelmapper.functional.inherit; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/inherit/TypeMapIncludeTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapIncludeTest.java similarity index 94% rename from core/src/test/java/org/modelmapper/functional/inherit/TypeMapIncludeTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapIncludeTest.java index 478527e5..3c4baf43 100644 --- a/core/src/test/java/org/modelmapper/functional/inherit/TypeMapIncludeTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapIncludeTest.java @@ -1,15 +1,15 @@ -package org.modelmapper.functional.inherit; +package org.clairvoyant.modelmapper.functional.inherit; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import org.modelmapper.AbstractProvider; -import org.modelmapper.AbstractTest; -import org.modelmapper.Asserts; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.AbstractProvider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.TypeMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/inherit/TypeMapInheritanceDeepTypeTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapInheritanceDeepTypeTest.java similarity index 92% rename from core/src/test/java/org/modelmapper/functional/inherit/TypeMapInheritanceDeepTypeTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapInheritanceDeepTypeTest.java index 7476109c..59d855fb 100644 --- a/core/src/test/java/org/modelmapper/functional/inherit/TypeMapInheritanceDeepTypeTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/TypeMapInheritanceDeepTypeTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.inherit; +package org.clairvoyant.modelmapper.functional.inherit; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/inherit/ValueReaderInheritanceTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/ValueReaderInheritanceTest.java similarity index 92% rename from core/src/test/java/org/modelmapper/functional/inherit/ValueReaderInheritanceTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/ValueReaderInheritanceTest.java index bf62d580..2836abf8 100644 --- a/core/src/test/java/org/modelmapper/functional/inherit/ValueReaderInheritanceTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/inherit/ValueReaderInheritanceTest.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.inherit; +package org.clairvoyant.modelmapper.functional.inherit; import java.util.HashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping1.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping1.java index 526c92dd..631f8ccb 100644 --- a/core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping1.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.iterable; +package org.clairvoyant.modelmapper.functional.iterable; import static org.testng.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.TypeToken; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping2.java similarity index 93% rename from core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping2.java index 9b2ea352..562722a1 100644 --- a/core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping2.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional.iterable; +package org.clairvoyant.modelmapper.functional.iterable; import static org.testng.Assert.assertEquals; @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping3.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping3.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping3.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping3.java index 48ab2935..64e66830 100644 --- a/core/src/test/java/org/modelmapper/functional/iterable/CollectionMapping3.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionMapping3.java @@ -1,12 +1,12 @@ -package org.modelmapper.functional.iterable; +package org.clairvoyant.modelmapper.functional.iterable; import static org.testng.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/iterable/CollectionWithConverter.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionWithConverter.java similarity index 85% rename from core/src/test/java/org/modelmapper/functional/iterable/CollectionWithConverter.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionWithConverter.java index 370c9636..ad3222db 100644 --- a/core/src/test/java/org/modelmapper/functional/iterable/CollectionWithConverter.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/CollectionWithConverter.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.iterable; +package org.clairvoyant.modelmapper.functional.iterable; import java.util.Arrays; import java.util.Collection; -import org.modelmapper.AbstractConverter; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractConverter; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/core/src/test/java/org/modelmapper/functional/iterable/DifferentTypedElements.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/DifferentTypedElements.java similarity index 89% rename from core/src/test/java/org/modelmapper/functional/iterable/DifferentTypedElements.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/DifferentTypedElements.java index cb56589a..72dc8951 100644 --- a/core/src/test/java/org/modelmapper/functional/iterable/DifferentTypedElements.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/DifferentTypedElements.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.iterable; +package org.clairvoyant.modelmapper.functional.iterable; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/iterable/GenericElementMapping.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/GenericElementMapping.java similarity index 94% rename from core/src/test/java/org/modelmapper/functional/iterable/GenericElementMapping.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/GenericElementMapping.java index 781b1165..4cb8ac51 100644 --- a/core/src/test/java/org/modelmapper/functional/iterable/GenericElementMapping.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/GenericElementMapping.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.iterable; +package org.clairvoyant.modelmapper.functional.iterable; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/core/src/test/java/org/modelmapper/functional/iterable/TypedMapMapping.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/TypedMapMapping.java similarity index 87% rename from core/src/test/java/org/modelmapper/functional/iterable/TypedMapMapping.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/TypedMapMapping.java index 5974507e..85e486cb 100644 --- a/core/src/test/java/org/modelmapper/functional/iterable/TypedMapMapping.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/iterable/TypedMapMapping.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional.iterable; +package org.clairvoyant.modelmapper.functional.iterable; import static org.testng.Assert.assertEquals; @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; @Test(groups = "functional") diff --git a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaDeepMapTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaDeepMapTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaDeepMapTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaDeepMapTest.java index 1f6fb8f9..dc2e6b8c 100644 --- a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaDeepMapTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaDeepMapTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.lambda; +package org.clairvoyant.modelmapper.functional.lambda; -import org.modelmapper.AbstractTest; -import org.modelmapper.ModelMapper; -import org.modelmapper.Provider; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.TypeMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaFromConstantTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaFromConstantTest.java similarity index 80% rename from core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaFromConstantTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaFromConstantTest.java index daf61da4..06ada582 100644 --- a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaFromConstantTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaFromConstantTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.lambda; +package org.clairvoyant.modelmapper.functional.lambda; -import org.modelmapper.AbstractTest; -import org.modelmapper.ModelMapper; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.TypeMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaFromSourceTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaFromSourceTest.java similarity index 83% rename from core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaFromSourceTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaFromSourceTest.java index 533ca3bd..5fc26810 100644 --- a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaFromSourceTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaFromSourceTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.lambda; +package org.clairvoyant.modelmapper.functional.lambda; -import org.modelmapper.AbstractTest; -import org.modelmapper.ModelMapper; -import org.modelmapper.TypeMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaMultipleFieldsTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaMultipleFieldsTest.java similarity index 97% rename from core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaMultipleFieldsTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaMultipleFieldsTest.java index e698ca3e..578af8b8 100644 --- a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaMultipleFieldsTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaMultipleFieldsTest.java @@ -1,6 +1,6 @@ -package org.modelmapper.functional.lambda; +package org.clairvoyant.modelmapper.functional.lambda; -import org.modelmapper.*; +import org.clairvoyant.modelmapper.*; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaTest.java similarity index 90% rename from core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaTest.java index 16322295..9a77e8d8 100644 --- a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaTest.java @@ -1,16 +1,16 @@ -package org.modelmapper.functional.lambda; +package org.clairvoyant.modelmapper.functional.lambda; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.fail; -import org.modelmapper.AbstractTest; -import org.modelmapper.Asserts; -import org.modelmapper.Conditions; -import org.modelmapper.ConfigurationException; -import org.modelmapper.ModelMapper; -import org.modelmapper.TypeMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.Conditions; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaTypeConvertTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaTypeConvertTest.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaTypeConvertTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaTypeConvertTest.java index a8e85ccc..00b19c7f 100644 --- a/core/src/test/java/org/modelmapper/functional/lambda/TypeMapLambdaTypeConvertTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/lambda/TypeMapLambdaTypeConvertTest.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.lambda; +package org.clairvoyant.modelmapper.functional.lambda; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.ModelMapper; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.TypeMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/loosematching/LooseMappingTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/loosematching/LooseMappingTest1.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/loosematching/LooseMappingTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/loosematching/LooseMappingTest1.java index 18e2d861..6320fa20 100644 --- a/core/src/test/java/org/modelmapper/functional/loosematching/LooseMappingTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/loosematching/LooseMappingTest1.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.loosematching; +package org.clairvoyant.modelmapper.functional.loosematching; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; -import org.modelmapper.internal.MatchingStrategyTestSupport; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.internal.MatchingStrategyTestSupport; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/loosematching/LooseMappingTest2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/loosematching/LooseMappingTest2.java similarity index 85% rename from core/src/test/java/org/modelmapper/functional/loosematching/LooseMappingTest2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/loosematching/LooseMappingTest2.java index 7f72aa39..bf7ce17d 100644 --- a/core/src/test/java/org/modelmapper/functional/loosematching/LooseMappingTest2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/loosematching/LooseMappingTest2.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.loosematching; +package org.clairvoyant.modelmapper.functional.loosematching; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; -import org.modelmapper.internal.MatchingStrategyTestSupport; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.internal.MatchingStrategyTestSupport; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/merge/MergeSourcePropertiesTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/merge/MergeSourcePropertiesTest.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/merge/MergeSourcePropertiesTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/merge/MergeSourcePropertiesTest.java index 40d17df0..9e35b99b 100644 --- a/core/src/test/java/org/modelmapper/functional/merge/MergeSourcePropertiesTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/merge/MergeSourcePropertiesTest.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.merge; +package org.clairvoyant.modelmapper.functional.merge; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/merging/MergeTypeMaps.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergeTypeMaps.java similarity index 85% rename from core/src/test/java/org/modelmapper/functional/merging/MergeTypeMaps.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergeTypeMaps.java index af54bf72..0f47282e 100644 --- a/core/src/test/java/org/modelmapper/functional/merging/MergeTypeMaps.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergeTypeMaps.java @@ -1,8 +1,8 @@ -package org.modelmapper.functional.merging; +package org.clairvoyant.modelmapper.functional.merging; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/merging/MergingTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergingTest1.java similarity index 81% rename from core/src/test/java/org/modelmapper/functional/merging/MergingTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergingTest1.java index 071d4e1a..cdaeb87c 100644 --- a/core/src/test/java/org/modelmapper/functional/merging/MergingTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergingTest1.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.merging; +package org.clairvoyant.modelmapper.functional.merging; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/merging/MergingWithConverter.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergingWithConverter.java similarity index 86% rename from core/src/test/java/org/modelmapper/functional/merging/MergingWithConverter.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergingWithConverter.java index 658d9223..3fd4381c 100644 --- a/core/src/test/java/org/modelmapper/functional/merging/MergingWithConverter.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/merging/MergingWithConverter.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional.merging; +package org.clairvoyant.modelmapper.functional.merging; import static org.testng.Assert.assertEquals; @@ -8,9 +8,9 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/parallel/ParallelTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/parallel/ParallelTest1.java similarity index 57% rename from core/src/test/java/org/modelmapper/functional/parallel/ParallelTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/parallel/ParallelTest1.java index 7a0da2e5..7201f89c 100644 --- a/core/src/test/java/org/modelmapper/functional/parallel/ParallelTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/parallel/ParallelTest1.java @@ -1,6 +1,6 @@ -package org.modelmapper.functional.parallel; +package org.clairvoyant.modelmapper.functional.parallel; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/persistence/Company.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/Company.java similarity index 87% rename from core/src/test/java/org/modelmapper/functional/persistence/Company.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/Company.java index bb5b7d57..8874e134 100644 --- a/core/src/test/java/org/modelmapper/functional/persistence/Company.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/Company.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional.persistence; +package org.clairvoyant.modelmapper.functional.persistence; import java.util.List; diff --git a/core/src/test/java/org/modelmapper/functional/persistence/Employee.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/Employee.java similarity index 74% rename from core/src/test/java/org/modelmapper/functional/persistence/Employee.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/Employee.java index ea40837d..298a9b06 100644 --- a/core/src/test/java/org/modelmapper/functional/persistence/Employee.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/Employee.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional.persistence; +package org.clairvoyant.modelmapper.functional.persistence; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/core/src/test/java/org/modelmapper/functional/persistence/LazyFetching.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/LazyFetching.java similarity index 87% rename from core/src/test/java/org/modelmapper/functional/persistence/LazyFetching.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/LazyFetching.java index 9719e521..409c979a 100644 --- a/core/src/test/java/org/modelmapper/functional/persistence/LazyFetching.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/persistence/LazyFetching.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional.persistence; +package org.clairvoyant.modelmapper.functional.persistence; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -10,9 +10,9 @@ import javax.persistence.Persistence; import javax.persistence.PersistenceUnitUtil; -import org.modelmapper.AbstractTest; -import org.modelmapper.Condition; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/provider/ProviderTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/provider/ProviderTest1.java similarity index 90% rename from core/src/test/java/org/modelmapper/functional/provider/ProviderTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/provider/ProviderTest1.java index 2db647ed..86fadb65 100644 --- a/core/src/test/java/org/modelmapper/functional/provider/ProviderTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/provider/ProviderTest1.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.provider; +package org.clairvoyant.modelmapper.functional.provider; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/provider/ProviderTest2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/provider/ProviderTest2.java similarity index 90% rename from core/src/test/java/org/modelmapper/functional/provider/ProviderTest2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/provider/ProviderTest2.java index ee161301..d383c069 100644 --- a/core/src/test/java/org/modelmapper/functional/provider/ProviderTest2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/provider/ProviderTest2.java @@ -1,13 +1,13 @@ -package org.modelmapper.functional.provider; +package org.clairvoyant.modelmapper.functional.provider; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import org.modelmapper.AbstractProvider; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.AbstractProvider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.TypeMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/shading/ConditionalShading.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ConditionalShading.java similarity index 91% rename from core/src/test/java/org/modelmapper/functional/shading/ConditionalShading.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ConditionalShading.java index 44d7522a..263edfb7 100644 --- a/core/src/test/java/org/modelmapper/functional/shading/ConditionalShading.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ConditionalShading.java @@ -1,13 +1,13 @@ -package org.modelmapper.functional.shading; +package org.clairvoyant.modelmapper.functional.shading; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.Condition; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/shading/ConverterShading.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ConverterShading.java similarity index 89% rename from core/src/test/java/org/modelmapper/functional/shading/ConverterShading.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ConverterShading.java index 4b3576bd..e87960c2 100644 --- a/core/src/test/java/org/modelmapper/functional/shading/ConverterShading.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ConverterShading.java @@ -1,13 +1,13 @@ -package org.modelmapper.functional.shading; +package org.clairvoyant.modelmapper.functional.shading; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/shading/NullMapping1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/NullMapping1.java similarity index 87% rename from core/src/test/java/org/modelmapper/functional/shading/NullMapping1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/shading/NullMapping1.java index 25999063..16a12ead 100644 --- a/core/src/test/java/org/modelmapper/functional/shading/NullMapping1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/NullMapping1.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.shading; +package org.clairvoyant.modelmapper.functional.shading; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/shading/NullMapping2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/NullMapping2.java similarity index 94% rename from core/src/test/java/org/modelmapper/functional/shading/NullMapping2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/shading/NullMapping2.java index 4652e49e..c65b21e9 100644 --- a/core/src/test/java/org/modelmapper/functional/shading/NullMapping2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/NullMapping2.java @@ -1,4 +1,4 @@ -package org.modelmapper.functional.shading; +package org.clairvoyant.modelmapper.functional.shading; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/shading/ShadedNestedMapping.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ShadedNestedMapping.java similarity index 76% rename from core/src/test/java/org/modelmapper/functional/shading/ShadedNestedMapping.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ShadedNestedMapping.java index b1995a35..64115ae4 100644 --- a/core/src/test/java/org/modelmapper/functional/shading/ShadedNestedMapping.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/shading/ShadedNestedMapping.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.shading; +package org.clairvoyant.modelmapper.functional.shading; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; @Test(groups = "functional") diff --git a/core/src/test/java/org/modelmapper/functional/skip/EnableSkipNullTest.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/skip/EnableSkipNullTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/functional/skip/EnableSkipNullTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/skip/EnableSkipNullTest.java index adc10c1d..a09167cb 100644 --- a/core/src/test/java/org/modelmapper/functional/skip/EnableSkipNullTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/skip/EnableSkipNullTest.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.skip; +package org.clairvoyant.modelmapper.functional.skip; -import org.modelmapper.AbstractTest; -import org.modelmapper.Condition; -import org.modelmapper.Converter; -import org.modelmapper.PropertyMap; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/skip/SkipMappingTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/skip/SkipMappingTest1.java similarity index 83% rename from core/src/test/java/org/modelmapper/functional/skip/SkipMappingTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/skip/SkipMappingTest1.java index d253e9fd..bf21f9bb 100644 --- a/core/src/test/java/org/modelmapper/functional/skip/SkipMappingTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/skip/SkipMappingTest1.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.skip; +package org.clairvoyant.modelmapper.functional.skip; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import org.modelmapper.AbstractTest; -import org.modelmapper.Conditions; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Conditions; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/stringmapping/StringMapping.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/stringmapping/StringMapping.java similarity index 91% rename from core/src/test/java/org/modelmapper/functional/stringmapping/StringMapping.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/stringmapping/StringMapping.java index 0d2895bb..dc3e8b40 100644 --- a/core/src/test/java/org/modelmapper/functional/stringmapping/StringMapping.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/stringmapping/StringMapping.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.stringmapping; +package org.clairvoyant.modelmapper.functional.stringmapping; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.ConfigurationException; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/functional/typeresolution/GenericMapping.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/GenericMapping.java similarity index 92% rename from core/src/test/java/org/modelmapper/functional/typeresolution/GenericMapping.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/GenericMapping.java index a4e769fb..90bb7c6b 100644 --- a/core/src/test/java/org/modelmapper/functional/typeresolution/GenericMapping.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/GenericMapping.java @@ -1,10 +1,10 @@ -package org.modelmapper.functional.typeresolution; +package org.clairvoyant.modelmapper.functional.typeresolution; import static org.testng.Assert.assertEquals; import java.io.Serializable; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest1.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest1.java similarity index 95% rename from core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest1.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest1.java index 564885e2..9c4a11b1 100644 --- a/core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest1.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest1.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.typeresolution; +package org.clairvoyant.modelmapper.functional.typeresolution; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest2.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest2.java similarity index 95% rename from core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest2.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest2.java index 1e65dd98..7802c36b 100644 --- a/core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest2.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest2.java @@ -1,11 +1,11 @@ -package org.modelmapper.functional.typeresolution; +package org.clairvoyant.modelmapper.functional.typeresolution; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest3.java b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest3.java similarity index 88% rename from core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest3.java rename to core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest3.java index b95df686..fd147fb2 100644 --- a/core/src/test/java/org/modelmapper/functional/typeresolution/TypeResolutionTest3.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/functional/typeresolution/TypeResolutionTest3.java @@ -1,9 +1,9 @@ -package org.modelmapper.functional.typeresolution; +package org.clairvoyant.modelmapper.functional.typeresolution; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/DisablePreferNestedPropertiesTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/DisablePreferNestedPropertiesTest.java similarity index 96% rename from core/src/test/java/org/modelmapper/internal/DisablePreferNestedPropertiesTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/DisablePreferNestedPropertiesTest.java index ae062ae5..272330fa 100644 --- a/core/src/test/java/org/modelmapper/internal/DisablePreferNestedPropertiesTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/DisablePreferNestedPropertiesTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.TypeMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/ExplicitMappingBuilderTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/ExplicitMappingBuilderTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/internal/ExplicitMappingBuilderTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/ExplicitMappingBuilderTest.java index 5546e193..443cca48 100644 --- a/core/src/test/java/org/modelmapper/internal/ExplicitMappingBuilderTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/ExplicitMappingBuilderTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -9,17 +9,17 @@ import java.util.List; import java.util.Map; -import org.modelmapper.Asserts; -import org.modelmapper.Condition; -import org.modelmapper.Conditions; -import org.modelmapper.ConfigurationException; -import org.modelmapper.Converter; -import org.modelmapper.Mappings; -import org.modelmapper.PropertyMap; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.spi.ConstantMapping; -import org.modelmapper.spi.MappingContext; -import org.modelmapper.spi.PropertyMapping; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.Condition; +import org.clairvoyant.modelmapper.Conditions; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.Mappings; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.spi.ConstantMapping; +import org.clairvoyant.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.PropertyMapping; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/InheritingConfigurationTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/InheritingConfigurationTest.java similarity index 94% rename from core/src/test/java/org/modelmapper/internal/InheritingConfigurationTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/InheritingConfigurationTest.java index 64482112..463dae40 100644 --- a/core/src/test/java/org/modelmapper/internal/InheritingConfigurationTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/InheritingConfigurationTest.java @@ -1,10 +1,10 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import org.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/MatchingStrategyTestSupport.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/MatchingStrategyTestSupport.java similarity index 91% rename from core/src/test/java/org/modelmapper/internal/MatchingStrategyTestSupport.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/MatchingStrategyTestSupport.java index c61b4fa3..4cd1c9ad 100644 --- a/core/src/test/java/org/modelmapper/internal/MatchingStrategyTestSupport.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/MatchingStrategyTestSupport.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -7,10 +7,10 @@ import java.lang.reflect.Member; import java.lang.reflect.Type; -import org.modelmapper.config.Configuration; -import org.modelmapper.spi.MatchingStrategy; -import org.modelmapper.spi.PropertyInfo; -import org.modelmapper.spi.PropertyType; +import org.clairvoyant.modelmapper.config.Configuration; +import org.clairvoyant.modelmapper.spi.MatchingStrategy; +import org.clairvoyant.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.spi.PropertyType; /** * Provides support for testing matching strategies. diff --git a/core/src/test/java/org/modelmapper/internal/PropertyInfoRegistryTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/PropertyInfoRegistryTest.java similarity index 96% rename from core/src/test/java/org/modelmapper/internal/PropertyInfoRegistryTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/PropertyInfoRegistryTest.java index 5e7ae257..511d5f4b 100644 --- a/core/src/test/java/org/modelmapper/internal/PropertyInfoRegistryTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/PropertyInfoRegistryTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import java.io.Serializable; import java.lang.reflect.Method; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/core/src/test/java/org/modelmapper/internal/PropertyInfoSetResolverTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/PropertyInfoSetResolverTest.java similarity index 92% rename from core/src/test/java/org/modelmapper/internal/PropertyInfoSetResolverTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/PropertyInfoSetResolverTest.java index 76b974ab..ed3115fe 100644 --- a/core/src/test/java/org/modelmapper/internal/PropertyInfoSetResolverTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/PropertyInfoSetResolverTest.java @@ -1,11 +1,11 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import java.lang.reflect.Member; -import org.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/ProxyFactoryTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/ProxyFactoryTest.java similarity index 95% rename from core/src/test/java/org/modelmapper/internal/ProxyFactoryTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/ProxyFactoryTest.java index b6cd727f..931e2719 100644 --- a/core/src/test/java/org/modelmapper/internal/ProxyFactoryTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/ProxyFactoryTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertNotNull; diff --git a/core/src/test/java/org/modelmapper/internal/TypeInfoImplTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/TypeInfoImplTest.java similarity index 90% rename from core/src/test/java/org/modelmapper/internal/TypeInfoImplTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/TypeInfoImplTest.java index a4b0971b..bc6256fb 100644 --- a/core/src/test/java/org/modelmapper/internal/TypeInfoImplTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/TypeInfoImplTest.java @@ -1,11 +1,11 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertEquals; import java.util.ArrayList; import java.util.List; -import org.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/TypeInfoRegistryTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/TypeInfoRegistryTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/internal/TypeInfoRegistryTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/TypeInfoRegistryTest.java index 3d8ed251..9179f9f1 100644 --- a/core/src/test/java/org/modelmapper/internal/TypeInfoRegistryTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/TypeInfoRegistryTest.java @@ -1,10 +1,10 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertTrue; -import org.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/TypeMapImplTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/TypeMapImplTest.java similarity index 83% rename from core/src/test/java/org/modelmapper/internal/TypeMapImplTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/TypeMapImplTest.java index 3521d9f7..fdd36d5e 100644 --- a/core/src/test/java/org/modelmapper/internal/TypeMapImplTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/TypeMapImplTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal; +package org.clairvoyant.modelmapper.internal; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -7,13 +7,13 @@ import java.util.Collections; import java.util.List; -import org.modelmapper.Asserts; -import org.modelmapper.ConfigurationException; -import org.modelmapper.PropertyMap; -import org.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; -import org.modelmapper.internal.util.JavaVersions; -import org.modelmapper.spi.Mapping; -import org.modelmapper.spi.PropertyInfo; +import org.clairvoyant.modelmapper.Asserts; +import org.clairvoyant.modelmapper.ConfigurationException; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.internal.PropertyInfoImpl.FieldPropertyInfo; +import org.clairvoyant.modelmapper.internal.util.JavaVersions; +import org.clairvoyant.modelmapper.spi.Mapping; +import org.clairvoyant.modelmapper.spi.PropertyInfo; import org.testng.SkipException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/converter/AbstractConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AbstractConverterTest.java similarity index 86% rename from core/src/test/java/org/modelmapper/internal/converter/AbstractConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AbstractConverterTest.java index 251c1963..569c9e09 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/AbstractConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AbstractConverterTest.java @@ -1,14 +1,14 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.fail; -import org.modelmapper.Fixtures; -import org.modelmapper.ModelMapper; -import org.modelmapper.internal.InheritingConfiguration; -import org.modelmapper.internal.MappingContextImpl; -import org.modelmapper.internal.MappingEngineImpl; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingEngine; +import org.clairvoyant.modelmapper.Fixtures; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.internal.InheritingConfiguration; +import org.clairvoyant.modelmapper.internal.MappingContextImpl; +import org.clairvoyant.modelmapper.internal.MappingEngineImpl; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingEngine; import org.testng.annotations.BeforeMethod; /** diff --git a/core/src/test/java/org/modelmapper/internal/converter/AbstractDateConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AbstractDateConverterTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/internal/converter/AbstractDateConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AbstractDateConverterTest.java index ad407fe2..074db335 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/AbstractDateConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AbstractDateConverterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -33,9 +33,9 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.modelmapper.MappingException; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.MappingException; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/converter/ArrayConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ArrayConverterTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/internal/converter/ArrayConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ArrayConverterTest.java index c74a7b1f..6b64bb00 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/ArrayConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ArrayConverterTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/converter/AssignableConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AssignableConverterTest.java similarity index 82% rename from core/src/test/java/org/modelmapper/internal/converter/AssignableConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AssignableConverterTest.java index 97e79e1a..344c7f24 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/AssignableConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/AssignableConverterTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/converter/BooleanConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/BooleanConverterTest.java similarity index 87% rename from core/src/test/java/org/modelmapper/internal/converter/BooleanConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/BooleanConverterTest.java index 42f35aad..7ead3423 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/BooleanConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/BooleanConverterTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; -import org.modelmapper.MappingException; -import org.modelmapper.internal.converter.BooleanConverter; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.MappingException; +import org.clairvoyant.modelmapper.internal.converter.BooleanConverter; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/internal/converter/CalendarConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/CalendarConverterTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/internal/converter/CalendarConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/CalendarConverterTest.java index b952b853..b3f2dd7a 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/CalendarConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/CalendarConverterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.util.Calendar; import java.util.Date; diff --git a/core/src/test/java/org/modelmapper/internal/converter/CharacterConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/CharacterConverterTest.java similarity index 87% rename from core/src/test/java/org/modelmapper/internal/converter/CharacterConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/CharacterConverterTest.java index 69cab8f8..7f02a088 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/CharacterConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/CharacterConverterTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; -import org.modelmapper.internal.converter.CharacterConverter; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.internal.converter.CharacterConverter; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/internal/converter/ConverterStoreTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ConverterStoreTest.java similarity index 95% rename from core/src/test/java/org/modelmapper/internal/converter/ConverterStoreTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ConverterStoreTest.java index f3705a9c..42687abd 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/ConverterStoreTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ConverterStoreTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertSame; @@ -6,8 +6,8 @@ import java.util.Arrays; import java.util.Collections; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/converter/DateConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/DateConverterTest.java similarity index 95% rename from core/src/test/java/org/modelmapper/internal/converter/DateConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/DateConverterTest.java index e67de02b..61a9e9f3 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/DateConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/DateConverterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import java.sql.Time; import java.sql.Timestamp; diff --git a/core/src/test/java/org/modelmapper/internal/converter/EnumConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/EnumConverterTest.java similarity index 86% rename from core/src/test/java/org/modelmapper/internal/converter/EnumConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/EnumConverterTest.java index 124fcc87..745d9139 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/EnumConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/EnumConverterTest.java @@ -1,11 +1,11 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import java.util.Map; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/converter/FromOptionalConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/FromOptionalConverterTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/internal/converter/FromOptionalConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/FromOptionalConverterTest.java index 01b4d858..9373a8b8 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/FromOptionalConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/FromOptionalConverterTest.java @@ -1,7 +1,7 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.Converter; -import org.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.ModelMapper; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/converter/MapConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/MapConverterTest.java similarity index 91% rename from core/src/test/java/org/modelmapper/internal/converter/MapConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/MapConverterTest.java index d964e4cf..b3f7f319 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/MapConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/MapConverterTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -13,8 +13,8 @@ import java.util.SortedMap; import java.util.TreeMap; -import org.modelmapper.ModelMapper; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; /** @@ -148,7 +148,7 @@ public void shouldConvertElementsFromSortedMapModel() { public void shouldConvertWithGenericTypes() { Map numbers = Collections.singletonMap(1, BigDecimal.valueOf(2)); - Type mapType = new org.modelmapper.TypeToken>() {}.getType(); + Type mapType = new org.clairvoyant.modelmapper.TypeToken>() {}.getType(); Map mixed = new ModelMapper().map(numbers, mapType); assertFalse(mixed.isEmpty()); diff --git a/core/src/test/java/org/modelmapper/internal/converter/MergingCollectionConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/MergingCollectionConverterTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/internal/converter/MergingCollectionConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/MergingCollectionConverterTest.java index 48d80f8a..506e1794 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/MergingCollectionConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/MergingCollectionConverterTest.java @@ -1,6 +1,6 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; import java.util.*; @@ -168,7 +168,7 @@ public void testMergeBehaviourSetToFalseAndThanToTrue() { modelMapper.getConfiguration().setCollectionsMergeEnabled(true); // back to default List source = Arrays.asList(new S()); - List result = modelMapper.map(source, new org.modelmapper.TypeToken>() {}.getType()); + List result = modelMapper.map(source, new org.clairvoyant.modelmapper.TypeToken>() {}.getType()); assertTrue(result.get(0) instanceof D); } } diff --git a/core/src/test/java/org/modelmapper/internal/converter/NonMergingCollectionConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/NonMergingCollectionConverterTest.java similarity index 97% rename from core/src/test/java/org/modelmapper/internal/converter/NonMergingCollectionConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/NonMergingCollectionConverterTest.java index 05f6f933..22915369 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/NonMergingCollectionConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/NonMergingCollectionConverterTest.java @@ -1,6 +1,6 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; import java.util.*; diff --git a/core/src/test/java/org/modelmapper/internal/converter/NumberConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/NumberConverterTest.java similarity index 96% rename from core/src/test/java/org/modelmapper/internal/converter/NumberConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/NumberConverterTest.java index f7ae94c7..2e53a28b 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/NumberConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/NumberConverterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -31,8 +31,8 @@ import java.util.Date; import java.util.GregorianCalendar; -import org.modelmapper.MappingException; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.MappingException; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/converter/OptionalConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/OptionalConverterTest.java similarity index 89% rename from core/src/test/java/org/modelmapper/internal/converter/OptionalConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/OptionalConverterTest.java index 3119f4f3..339b685a 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/OptionalConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/OptionalConverterTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.Converter; -import org.modelmapper.ModelMapper; -import org.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.TypeToken; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/converter/ToOptionalConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ToOptionalConverterTest.java similarity index 87% rename from core/src/test/java/org/modelmapper/internal/converter/ToOptionalConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ToOptionalConverterTest.java index 43c66e67..1ba1c9a7 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/ToOptionalConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/ToOptionalConverterTest.java @@ -1,8 +1,8 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; -import org.modelmapper.Converter; -import org.modelmapper.ModelMapper; -import org.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.TypeToken; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/converter/UuidConverterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/UuidConverterTest.java similarity index 85% rename from core/src/test/java/org/modelmapper/internal/converter/UuidConverterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/converter/UuidConverterTest.java index 75719b9a..a56632c4 100644 --- a/core/src/test/java/org/modelmapper/internal/converter/UuidConverterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/converter/UuidConverterTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.internal.converter; +package org.clairvoyant.modelmapper.internal.converter; import static org.testng.Assert.assertEquals; import java.util.UUID; -import org.modelmapper.spi.ConditionalConverter.MatchResult; +import org.clairvoyant.modelmapper.spi.ConditionalConverter.MatchResult; import org.testng.annotations.Test; @Test diff --git a/core/src/test/java/org/modelmapper/internal/util/IterablesTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/IterablesTest.java similarity index 94% rename from core/src/test/java/org/modelmapper/internal/util/IterablesTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/util/IterablesTest.java index 6fdb4276..4218bfdb 100644 --- a/core/src/test/java/org/modelmapper/internal/util/IterablesTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/IterablesTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/util/MembersTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/MembersTest.java similarity index 98% rename from core/src/test/java/org/modelmapper/internal/util/MembersTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/util/MembersTest.java index d05981c8..4ef1912b 100644 --- a/core/src/test/java/org/modelmapper/internal/util/MembersTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/MembersTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/internal/util/PrimitivesTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/PrimitivesTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/internal/util/PrimitivesTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/util/PrimitivesTest.java index cc7f0c89..d529d34b 100644 --- a/core/src/test/java/org/modelmapper/internal/util/PrimitivesTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/PrimitivesTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/core/src/test/java/org/modelmapper/internal/util/TypesTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/TypesTest.java similarity index 93% rename from core/src/test/java/org/modelmapper/internal/util/TypesTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/util/TypesTest.java index 9e1c3824..749a2d9c 100644 --- a/core/src/test/java/org/modelmapper/internal/util/TypesTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/util/TypesTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.util; +package org.clairvoyant.modelmapper.internal.util; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/internal/valueaccess/MapValueReaderTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/valueaccess/MapValueReaderTest.java similarity index 96% rename from core/src/test/java/org/modelmapper/internal/valueaccess/MapValueReaderTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/valueaccess/MapValueReaderTest.java index 48e00f40..5fc7772a 100644 --- a/core/src/test/java/org/modelmapper/internal/valueaccess/MapValueReaderTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/valueaccess/MapValueReaderTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.valueaccess; +package org.clairvoyant.modelmapper.internal.valueaccess; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -7,8 +7,8 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/internal/valueaccess/MultiMapValueReaderTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/valueaccess/MultiMapValueReaderTest.java similarity index 88% rename from core/src/test/java/org/modelmapper/internal/valueaccess/MultiMapValueReaderTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/valueaccess/MultiMapValueReaderTest.java index a7796eaa..b28d8980 100644 --- a/core/src/test/java/org/modelmapper/internal/valueaccess/MultiMapValueReaderTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/valueaccess/MultiMapValueReaderTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.internal.valueaccess; +package org.clairvoyant.modelmapper.internal.valueaccess; import static org.testng.Assert.assertEquals; @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; -import org.modelmapper.ModelMapper; -import org.modelmapper.TypeToken; -import org.modelmapper.convention.NameTokenizers; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.convention.NameTokenizers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/modelmapper/internal/valuemutate/MapValueWriterTest.java b/core/src/test/java/org/clairvoyant/modelmapper/internal/valuemutate/MapValueWriterTest.java similarity index 76% rename from core/src/test/java/org/modelmapper/internal/valuemutate/MapValueWriterTest.java rename to core/src/test/java/org/clairvoyant/modelmapper/internal/valuemutate/MapValueWriterTest.java index 4be81ba6..db854603 100644 --- a/core/src/test/java/org/modelmapper/internal/valuemutate/MapValueWriterTest.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/internal/valuemutate/MapValueWriterTest.java @@ -1,11 +1,11 @@ -package org.modelmapper.internal.valuemutate; +package org.clairvoyant.modelmapper.internal.valuemutate; import java.util.HashMap; import java.util.Map; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; -import org.modelmapper.Provider; -import org.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.TypeToken; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/modelmapper/performance/Comparison.java b/core/src/test/java/org/clairvoyant/modelmapper/performance/Comparison.java similarity index 97% rename from core/src/test/java/org/modelmapper/performance/Comparison.java rename to core/src/test/java/org/clairvoyant/modelmapper/performance/Comparison.java index 6b554246..5b93a524 100644 --- a/core/src/test/java/org/modelmapper/performance/Comparison.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/performance/Comparison.java @@ -1,4 +1,4 @@ -package org.modelmapper.performance; +package org.clairvoyant.modelmapper.performance; import java.text.DecimalFormat; import java.util.ArrayList; @@ -11,8 +11,8 @@ import ma.glasnost.orika.metadata.ClassMapBuilder; import org.dozer.DozerBeanMapper; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.Assert; /** @@ -77,7 +77,7 @@ public OrderDTO map(Order source) { final DozerBeanMapper beanMapper; { beanMapper = new DozerBeanMapper(); - beanMapper.setMappingFiles(Arrays.asList("org/modelmapper/performance/dozerComparison.xml")); + beanMapper.setMappingFiles(Arrays.asList("org/clairvoyant/modelmapper/performance/dozerComparison.xml")); } public OrderDTO map(Order source) { diff --git a/core/src/test/java/org/modelmapper/user/Canonicalization.java b/core/src/test/java/org/clairvoyant/modelmapper/user/Canonicalization.java similarity index 81% rename from core/src/test/java/org/modelmapper/user/Canonicalization.java rename to core/src/test/java/org/clairvoyant/modelmapper/user/Canonicalization.java index 9852d6d2..1f53ef4e 100644 --- a/core/src/test/java/org/modelmapper/user/Canonicalization.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/user/Canonicalization.java @@ -1,10 +1,10 @@ -package org.modelmapper.user; +package org.clairvoyant.modelmapper.user; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Converter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/user/CharArray.java b/core/src/test/java/org/clairvoyant/modelmapper/user/CharArray.java similarity index 85% rename from core/src/test/java/org/modelmapper/user/CharArray.java rename to core/src/test/java/org/clairvoyant/modelmapper/user/CharArray.java index 750cc291..f74cf1cb 100644 --- a/core/src/test/java/org/modelmapper/user/CharArray.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/user/CharArray.java @@ -1,8 +1,8 @@ -package org.modelmapper.user; +package org.clairvoyant.modelmapper.user; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.AbstractTest; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/user/OnlyStrings.java b/core/src/test/java/org/clairvoyant/modelmapper/user/OnlyStrings.java similarity index 86% rename from core/src/test/java/org/modelmapper/user/OnlyStrings.java rename to core/src/test/java/org/clairvoyant/modelmapper/user/OnlyStrings.java index ed705f52..f9acf6af 100644 --- a/core/src/test/java/org/modelmapper/user/OnlyStrings.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/user/OnlyStrings.java @@ -1,9 +1,9 @@ -package org.modelmapper.user; +package org.clairvoyant.modelmapper.user; import static org.testng.Assert.assertEquals; -import org.modelmapper.AbstractTest; -import org.modelmapper.Conditions; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.Conditions; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/modelmapper/user/ParentToChild.java b/core/src/test/java/org/clairvoyant/modelmapper/user/ParentToChild.java similarity index 87% rename from core/src/test/java/org/modelmapper/user/ParentToChild.java rename to core/src/test/java/org/clairvoyant/modelmapper/user/ParentToChild.java index 7083a6fd..6571e4d5 100644 --- a/core/src/test/java/org/modelmapper/user/ParentToChild.java +++ b/core/src/test/java/org/clairvoyant/modelmapper/user/ParentToChild.java @@ -1,10 +1,10 @@ -package org.modelmapper.user; +package org.clairvoyant.modelmapper.user; import java.util.ArrayList; import java.util.List; -import org.modelmapper.AbstractTest; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.AbstractTest; +import org.clairvoyant.modelmapper.PropertyMap; import org.testng.annotations.Test; /** diff --git a/core/src/test/java/org/clairvoyant/modelmapper/user/package-info.java b/core/src/test/java/org/clairvoyant/modelmapper/user/package-info.java new file mode 100644 index 00000000..17476e10 --- /dev/null +++ b/core/src/test/java/org/clairvoyant/modelmapper/user/package-info.java @@ -0,0 +1,5 @@ +/** + * User questions. + */ +package org.clairvoyant.modelmapper.user; + diff --git a/core/src/test/java/org/modelmapper/bugs/package-info.java b/core/src/test/java/org/modelmapper/bugs/package-info.java deleted file mode 100644 index 2b5bab4a..00000000 --- a/core/src/test/java/org/modelmapper/bugs/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Bug reports. - */ -package org.modelmapper.bugs; - diff --git a/core/src/test/java/org/modelmapper/user/package-info.java b/core/src/test/java/org/modelmapper/user/package-info.java deleted file mode 100644 index 994320d1..00000000 --- a/core/src/test/java/org/modelmapper/user/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * User questions. - */ -package org.modelmapper.user; - diff --git a/core/src/test/resources/META-INF/persistence.xml b/core/src/test/resources/META-INF/persistence.xml index 68319373..2c63fc0f 100644 --- a/core/src/test/resources/META-INF/persistence.xml +++ b/core/src/test/resources/META-INF/persistence.xml @@ -5,8 +5,8 @@ org.hibernate.ejb.HibernatePersistence - org.modelmapper.functional.persistence.Company - org.modelmapper.functional.persistence.Employee + org.clairvoyant.modelmapper.functional.persistence.Company + org.clairvoyant.modelmapper.functional.persistence.Employee diff --git a/core/src/test/resources/org/modelmapper/performance/dozerComparison.xml b/core/src/test/resources/org/modelmapper/performance/dozerComparison.xml index e80540c6..e8a1d844 100644 --- a/core/src/test/resources/org/modelmapper/performance/dozerComparison.xml +++ b/core/src/test/resources/org/modelmapper/performance/dozerComparison.xml @@ -1,8 +1,8 @@ - org.modelmapper.performance.Comparison$Order - org.modelmapper.performance.Comparison$OrderDTO + org.clairvoyant.modelmapper.performance.Comparison$Order + org.clairvoyant.modelmapper.performance.Comparison$OrderDTO customer.name diff --git a/core/src/test/resources/testngAll.xml b/core/src/test/resources/testngAll.xml index ea9d9181..c56febec 100644 --- a/core/src/test/resources/testngAll.xml +++ b/core/src/test/resources/testngAll.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/core/src/test/resources/testngFunctional.xml b/core/src/test/resources/testngFunctional.xml index bdee057b..96b0ab46 100644 --- a/core/src/test/resources/testngFunctional.xml +++ b/core/src/test/resources/testngFunctional.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/core/src/test/resources/testngParallel.xml b/core/src/test/resources/testngParallel.xml index c0493ea7..b4925753 100644 --- a/core/src/test/resources/testngParallel.xml +++ b/core/src/test/resources/testngParallel.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml index 91708e02..9b718649 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.modelmapper + org.clairvoyant modelmapper-parent 3.1.2-SNAPSHOT @@ -12,7 +12,7 @@ - org.modelmapper + org.clairvoyant modelmapper ${project.version} diff --git a/examples/src/main/java/org/modelmapper/ComplexConversion.java b/examples/src/main/java/org/modelmapper/ComplexConversion.java index 796d7f9a..1f8c1180 100644 --- a/examples/src/main/java/org/modelmapper/ComplexConversion.java +++ b/examples/src/main/java/org/modelmapper/ComplexConversion.java @@ -1,4 +1,4 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import static org.testng.Assert.assertEquals; @@ -6,8 +6,8 @@ import java.util.Arrays; import java.util.List; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.spi.MappingContext; public class ComplexConversion { public static class PaymentInfo { diff --git a/examples/src/main/java/org/modelmapper/FieldRelocation.java b/examples/src/main/java/org/modelmapper/FieldRelocation.java index 76fd7200..c98dbe2b 100644 --- a/examples/src/main/java/org/modelmapper/FieldRelocation.java +++ b/examples/src/main/java/org/modelmapper/FieldRelocation.java @@ -1,11 +1,11 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import static org.testng.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.MappingContext; public class FieldRelocation { public static class Person { @@ -88,7 +88,7 @@ public AnotherCar convert(MappingContext context) { // Alternatively, using a provider // modelMapper.getConfiguration().setProvider(new Provider() { - // public AnotherCar get(org.modelmapper.Provider.ProvisionRequest request) { + // public AnotherCar get(org.clairvoyant.modelmapper.Provider.ProvisionRequest request) { // AnotherCar anotherCar = new AnotherCar(); // anotherCar.setPersonName(((Person) request.getSource()).getName()); // return anotherCar; diff --git a/examples/src/main/java/org/modelmapper/PropertyExtraction.java b/examples/src/main/java/org/modelmapper/PropertyExtraction.java index 7f43316e..a61bf57b 100644 --- a/examples/src/main/java/org/modelmapper/PropertyExtraction.java +++ b/examples/src/main/java/org/modelmapper/PropertyExtraction.java @@ -1,11 +1,11 @@ -package org.modelmapper; +package org.clairvoyant.modelmapper; import static org.testng.Assert.assertEquals; import java.util.UUID; -import org.modelmapper.config.Configuration.AccessLevel; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.config.Configuration.AccessLevel; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * From https://github.com/jhalterman/modelmapper/issues/90#issuecomment-32583382 diff --git a/examples/src/main/java/org/modelmapper/flattening/example1/Address.java b/examples/src/main/java/org/modelmapper/flattening/example1/Address.java index 877538ea..53cfc182 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example1/Address.java +++ b/examples/src/main/java/org/modelmapper/flattening/example1/Address.java @@ -1,4 +1,4 @@ -package org.modelmapper.flattening.example1; +package org.clairvoyant.modelmapper.flattening.example1; public class Address { private String street; diff --git a/examples/src/main/java/org/modelmapper/flattening/example1/Customer.java b/examples/src/main/java/org/modelmapper/flattening/example1/Customer.java index 430fea62..ad9dca02 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example1/Customer.java +++ b/examples/src/main/java/org/modelmapper/flattening/example1/Customer.java @@ -1,4 +1,4 @@ -package org.modelmapper.flattening.example1; +package org.clairvoyant.modelmapper.flattening.example1; public class Customer { private String name; diff --git a/examples/src/main/java/org/modelmapper/flattening/example1/FlatteningExample1.java b/examples/src/main/java/org/modelmapper/flattening/example1/FlatteningExample1.java index ac7a9e80..b529e454 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example1/FlatteningExample1.java +++ b/examples/src/main/java/org/modelmapper/flattening/example1/FlatteningExample1.java @@ -1,8 +1,8 @@ -package org.modelmapper.flattening.example1; +package org.clairvoyant.modelmapper.flattening.example1; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.ModelMapper; public class FlatteningExample1 { public static void main(String... args) { diff --git a/examples/src/main/java/org/modelmapper/flattening/example1/Order.java b/examples/src/main/java/org/modelmapper/flattening/example1/Order.java index a25b62c5..7b18f119 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example1/Order.java +++ b/examples/src/main/java/org/modelmapper/flattening/example1/Order.java @@ -1,4 +1,4 @@ -package org.modelmapper.flattening.example1; +package org.clairvoyant.modelmapper.flattening.example1; public class Order { private Customer customer; diff --git a/examples/src/main/java/org/modelmapper/flattening/example1/OrderDTO.java b/examples/src/main/java/org/modelmapper/flattening/example1/OrderDTO.java index fcbc6d35..8925f282 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example1/OrderDTO.java +++ b/examples/src/main/java/org/modelmapper/flattening/example1/OrderDTO.java @@ -1,4 +1,4 @@ -package org.modelmapper.flattening.example1; +package org.clairvoyant.modelmapper.flattening.example1; public class OrderDTO { private String customerName; diff --git a/examples/src/main/java/org/modelmapper/flattening/example2/Address.java b/examples/src/main/java/org/modelmapper/flattening/example2/Address.java index 98598962..d867978d 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example2/Address.java +++ b/examples/src/main/java/org/modelmapper/flattening/example2/Address.java @@ -1,4 +1,4 @@ -package org.modelmapper.flattening.example2; +package org.clairvoyant.modelmapper.flattening.example2; public class Address { private String street; diff --git a/examples/src/main/java/org/modelmapper/flattening/example2/FlatteningExample2.java b/examples/src/main/java/org/modelmapper/flattening/example2/FlatteningExample2.java index 358fe75d..40579192 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example2/FlatteningExample2.java +++ b/examples/src/main/java/org/modelmapper/flattening/example2/FlatteningExample2.java @@ -1,10 +1,10 @@ -package org.modelmapper.flattening.example2; +package org.clairvoyant.modelmapper.flattening.example2; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; public class FlatteningExample2 { public static void main(String... args) throws Exception { diff --git a/examples/src/main/java/org/modelmapper/flattening/example2/Person.java b/examples/src/main/java/org/modelmapper/flattening/example2/Person.java index 0095ffc6..525bc3d3 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example2/Person.java +++ b/examples/src/main/java/org/modelmapper/flattening/example2/Person.java @@ -1,4 +1,4 @@ -package org.modelmapper.flattening.example2; +package org.clairvoyant.modelmapper.flattening.example2; public class Person { private Address address; diff --git a/examples/src/main/java/org/modelmapper/flattening/example2/PersonDTO.java b/examples/src/main/java/org/modelmapper/flattening/example2/PersonDTO.java index 92d1479b..54240bae 100644 --- a/examples/src/main/java/org/modelmapper/flattening/example2/PersonDTO.java +++ b/examples/src/main/java/org/modelmapper/flattening/example2/PersonDTO.java @@ -1,4 +1,4 @@ -package org.modelmapper.flattening.example2; +package org.clairvoyant.modelmapper.flattening.example2; public class PersonDTO { String city; diff --git a/examples/src/main/java/org/modelmapper/gettingstarted/Address.java b/examples/src/main/java/org/modelmapper/gettingstarted/Address.java index c7993bda..ae26b848 100644 --- a/examples/src/main/java/org/modelmapper/gettingstarted/Address.java +++ b/examples/src/main/java/org/modelmapper/gettingstarted/Address.java @@ -1,4 +1,4 @@ -package org.modelmapper.gettingstarted; +package org.clairvoyant.modelmapper.gettingstarted; public class Address { private String street; diff --git a/examples/src/main/java/org/modelmapper/gettingstarted/Customer.java b/examples/src/main/java/org/modelmapper/gettingstarted/Customer.java index f3b491d6..924285bf 100644 --- a/examples/src/main/java/org/modelmapper/gettingstarted/Customer.java +++ b/examples/src/main/java/org/modelmapper/gettingstarted/Customer.java @@ -1,4 +1,4 @@ -package org.modelmapper.gettingstarted; +package org.clairvoyant.modelmapper.gettingstarted; public class Customer { private Name name; diff --git a/examples/src/main/java/org/modelmapper/gettingstarted/GettingStartedExample.java b/examples/src/main/java/org/modelmapper/gettingstarted/GettingStartedExample.java index 45212993..000bc402 100644 --- a/examples/src/main/java/org/modelmapper/gettingstarted/GettingStartedExample.java +++ b/examples/src/main/java/org/modelmapper/gettingstarted/GettingStartedExample.java @@ -1,9 +1,9 @@ -package org.modelmapper.gettingstarted; +package org.clairvoyant.modelmapper.gettingstarted; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; /** * http://modelmapper.org/getting-started/ diff --git a/examples/src/main/java/org/modelmapper/gettingstarted/Name.java b/examples/src/main/java/org/modelmapper/gettingstarted/Name.java index 9d4c55f1..463e7170 100644 --- a/examples/src/main/java/org/modelmapper/gettingstarted/Name.java +++ b/examples/src/main/java/org/modelmapper/gettingstarted/Name.java @@ -1,4 +1,4 @@ -package org.modelmapper.gettingstarted; +package org.clairvoyant.modelmapper.gettingstarted; public class Name { private String firstName; diff --git a/examples/src/main/java/org/modelmapper/gettingstarted/Order.java b/examples/src/main/java/org/modelmapper/gettingstarted/Order.java index 07fd1f03..1cd8fc9d 100644 --- a/examples/src/main/java/org/modelmapper/gettingstarted/Order.java +++ b/examples/src/main/java/org/modelmapper/gettingstarted/Order.java @@ -1,4 +1,4 @@ -package org.modelmapper.gettingstarted; +package org.clairvoyant.modelmapper.gettingstarted; public class Order { Customer customer; diff --git a/examples/src/main/java/org/modelmapper/gettingstarted/OrderDTO.java b/examples/src/main/java/org/modelmapper/gettingstarted/OrderDTO.java index 6df4353e..6be96b74 100644 --- a/examples/src/main/java/org/modelmapper/gettingstarted/OrderDTO.java +++ b/examples/src/main/java/org/modelmapper/gettingstarted/OrderDTO.java @@ -1,4 +1,4 @@ -package org.modelmapper.gettingstarted; +package org.clairvoyant.modelmapper.gettingstarted; public class OrderDTO { private String customerFirstName; diff --git a/examples/src/main/java/org/modelmapper/inheritance/BaseDest.java b/examples/src/main/java/org/modelmapper/inheritance/BaseDest.java index 8ffe6c37..eea98501 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/BaseDest.java +++ b/examples/src/main/java/org/modelmapper/inheritance/BaseDest.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; public class BaseDest { diff --git a/examples/src/main/java/org/modelmapper/inheritance/BaseDestA.java b/examples/src/main/java/org/modelmapper/inheritance/BaseDestA.java index 5d16894a..5858a8df 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/BaseDestA.java +++ b/examples/src/main/java/org/modelmapper/inheritance/BaseDestA.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; public class BaseDestA extends BaseDest { } diff --git a/examples/src/main/java/org/modelmapper/inheritance/BaseDestB.java b/examples/src/main/java/org/modelmapper/inheritance/BaseDestB.java index 23745884..7ec2ba99 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/BaseDestB.java +++ b/examples/src/main/java/org/modelmapper/inheritance/BaseDestB.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; public class BaseDestB extends BaseDest { } diff --git a/examples/src/main/java/org/modelmapper/inheritance/BaseSrc.java b/examples/src/main/java/org/modelmapper/inheritance/BaseSrc.java index 494e5ab9..6e28ce5e 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/BaseSrc.java +++ b/examples/src/main/java/org/modelmapper/inheritance/BaseSrc.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; public class BaseSrc { diff --git a/examples/src/main/java/org/modelmapper/inheritance/BaseSrcA.java b/examples/src/main/java/org/modelmapper/inheritance/BaseSrcA.java index 0890e33c..49b8f60e 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/BaseSrcA.java +++ b/examples/src/main/java/org/modelmapper/inheritance/BaseSrcA.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; public class BaseSrcA extends BaseSrc { } diff --git a/examples/src/main/java/org/modelmapper/inheritance/BaseSrcB.java b/examples/src/main/java/org/modelmapper/inheritance/BaseSrcB.java index 48648bda..955d4400 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/BaseSrcB.java +++ b/examples/src/main/java/org/modelmapper/inheritance/BaseSrcB.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; public class BaseSrcB extends BaseSrc { } diff --git a/examples/src/main/java/org/modelmapper/inheritance/C.java b/examples/src/main/java/org/modelmapper/inheritance/C.java index 56a6aae0..95b7c07d 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/C.java +++ b/examples/src/main/java/org/modelmapper/inheritance/C.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; import java.util.List; diff --git a/examples/src/main/java/org/modelmapper/inheritance/CcDTO.java b/examples/src/main/java/org/modelmapper/inheritance/CcDTO.java index 955b8842..b9dafe6d 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/CcDTO.java +++ b/examples/src/main/java/org/modelmapper/inheritance/CcDTO.java @@ -1,4 +1,4 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; import java.util.List; diff --git a/examples/src/main/java/org/modelmapper/inheritance/InheritanceExample1.java b/examples/src/main/java/org/modelmapper/inheritance/InheritanceExample1.java index 02120e21..dc067e11 100644 --- a/examples/src/main/java/org/modelmapper/inheritance/InheritanceExample1.java +++ b/examples/src/main/java/org/modelmapper/inheritance/InheritanceExample1.java @@ -1,8 +1,8 @@ -package org.modelmapper.inheritance; +package org.clairvoyant.modelmapper.inheritance; -import org.modelmapper.ModelMapper; -import org.modelmapper.Provider; -import org.modelmapper.TypeMap; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.TypeMap; import java.util.Arrays; @@ -12,7 +12,7 @@ public class InheritanceExample1 { public static void main(String... args) { - org.modelmapper.inheritance.C c = new org.modelmapper.inheritance.C(Arrays.asList(new BaseSrcA(), new BaseSrcB())); + org.clairvoyant.modelmapper.inheritance.C c = new org.clairvoyant.modelmapper.inheritance.C(Arrays.asList(new BaseSrcA(), new BaseSrcB())); ModelMapper modelMapper = new ModelMapper(); diff --git a/examples/src/main/java/org/modelmapper/projection/example1/Address.java b/examples/src/main/java/org/modelmapper/projection/example1/Address.java index 4c1bd6d5..3386e835 100644 --- a/examples/src/main/java/org/modelmapper/projection/example1/Address.java +++ b/examples/src/main/java/org/modelmapper/projection/example1/Address.java @@ -1,4 +1,4 @@ -package org.modelmapper.projection.example1; +package org.clairvoyant.modelmapper.projection.example1; public class Address { private String street; diff --git a/examples/src/main/java/org/modelmapper/projection/example1/Customer.java b/examples/src/main/java/org/modelmapper/projection/example1/Customer.java index 265ae64a..044161ef 100644 --- a/examples/src/main/java/org/modelmapper/projection/example1/Customer.java +++ b/examples/src/main/java/org/modelmapper/projection/example1/Customer.java @@ -1,4 +1,4 @@ -package org.modelmapper.projection.example1; +package org.clairvoyant.modelmapper.projection.example1; public class Customer { private String name; diff --git a/examples/src/main/java/org/modelmapper/projection/example1/Order.java b/examples/src/main/java/org/modelmapper/projection/example1/Order.java index be53c08f..0f184864 100644 --- a/examples/src/main/java/org/modelmapper/projection/example1/Order.java +++ b/examples/src/main/java/org/modelmapper/projection/example1/Order.java @@ -1,4 +1,4 @@ -package org.modelmapper.projection.example1; +package org.clairvoyant.modelmapper.projection.example1; public class Order { private Customer customer; diff --git a/examples/src/main/java/org/modelmapper/projection/example1/OrderInfo.java b/examples/src/main/java/org/modelmapper/projection/example1/OrderInfo.java index 1026c527..01c0f03b 100644 --- a/examples/src/main/java/org/modelmapper/projection/example1/OrderInfo.java +++ b/examples/src/main/java/org/modelmapper/projection/example1/OrderInfo.java @@ -1,4 +1,4 @@ -package org.modelmapper.projection.example1; +package org.clairvoyant.modelmapper.projection.example1; public class OrderInfo { private String customerName; diff --git a/examples/src/main/java/org/modelmapper/projection/example1/ProjectionExample1.java b/examples/src/main/java/org/modelmapper/projection/example1/ProjectionExample1.java index 0daa31f7..4ac96d22 100644 --- a/examples/src/main/java/org/modelmapper/projection/example1/ProjectionExample1.java +++ b/examples/src/main/java/org/modelmapper/projection/example1/ProjectionExample1.java @@ -1,8 +1,8 @@ -package org.modelmapper.projection.example1; +package org.clairvoyant.modelmapper.projection.example1; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.ModelMapper; public class ProjectionExample1 { public static void main(String... args) { diff --git a/examples/src/main/java/org/modelmapper/projection/example2/Address.java b/examples/src/main/java/org/modelmapper/projection/example2/Address.java index 46fc9a9c..12060473 100644 --- a/examples/src/main/java/org/modelmapper/projection/example2/Address.java +++ b/examples/src/main/java/org/modelmapper/projection/example2/Address.java @@ -1,4 +1,4 @@ -package org.modelmapper.projection.example2; +package org.clairvoyant.modelmapper.projection.example2; public class Address { private String street; diff --git a/examples/src/main/java/org/modelmapper/projection/example2/Order.java b/examples/src/main/java/org/modelmapper/projection/example2/Order.java index 35e6b641..e2b43eb8 100644 --- a/examples/src/main/java/org/modelmapper/projection/example2/Order.java +++ b/examples/src/main/java/org/modelmapper/projection/example2/Order.java @@ -1,4 +1,4 @@ -package org.modelmapper.projection.example2; +package org.clairvoyant.modelmapper.projection.example2; public class Order { Address address; diff --git a/examples/src/main/java/org/modelmapper/projection/example2/OrderDTO.java b/examples/src/main/java/org/modelmapper/projection/example2/OrderDTO.java index 791ce8dc..b19bd199 100644 --- a/examples/src/main/java/org/modelmapper/projection/example2/OrderDTO.java +++ b/examples/src/main/java/org/modelmapper/projection/example2/OrderDTO.java @@ -1,4 +1,4 @@ -package org.modelmapper.projection.example2; +package org.clairvoyant.modelmapper.projection.example2; public class OrderDTO { private String street; diff --git a/examples/src/main/java/org/modelmapper/projection/example2/ProjectionExample2.java b/examples/src/main/java/org/modelmapper/projection/example2/ProjectionExample2.java index cd55647f..b95f91d9 100644 --- a/examples/src/main/java/org/modelmapper/projection/example2/ProjectionExample2.java +++ b/examples/src/main/java/org/modelmapper/projection/example2/ProjectionExample2.java @@ -1,10 +1,10 @@ -package org.modelmapper.projection.example2; +package org.clairvoyant.modelmapper.projection.example2; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.MatchingStrategies; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.MatchingStrategies; public class ProjectionExample2 { public static void main(String... args) { diff --git a/extensions/dagger/pom.xml b/extensions/dagger/pom.xml index 6909110b..7ca86db7 100644 --- a/extensions/dagger/pom.xml +++ b/extensions/dagger/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions modelmapper-extensions 3.1.2-SNAPSHOT diff --git a/extensions/dagger/src/main/java/org/modelmapper/dagger/DaggerIntegration.java b/extensions/dagger/src/main/java/org/clairvoyant/modelmapper/dagger/DaggerIntegration.java similarity index 87% rename from extensions/dagger/src/main/java/org/modelmapper/dagger/DaggerIntegration.java rename to extensions/dagger/src/main/java/org/clairvoyant/modelmapper/dagger/DaggerIntegration.java index d7e05bfa..4cebde61 100644 --- a/extensions/dagger/src/main/java/org/modelmapper/dagger/DaggerIntegration.java +++ b/extensions/dagger/src/main/java/org/clairvoyant/modelmapper/dagger/DaggerIntegration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.dagger; +package org.clairvoyant.modelmapper.dagger; -import org.modelmapper.Provider; -import org.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.internal.util.Assert; import dagger.ObjectGraph; diff --git a/extensions/dagger/src/test/java/org/modelmapper/dagger/DaggerIntegrationTest.java b/extensions/dagger/src/test/java/org/clairvoyant/modelmapper/dagger/DaggerIntegrationTest.java similarity index 84% rename from extensions/dagger/src/test/java/org/modelmapper/dagger/DaggerIntegrationTest.java rename to extensions/dagger/src/test/java/org/clairvoyant/modelmapper/dagger/DaggerIntegrationTest.java index 057f9706..7e1ed357 100644 --- a/extensions/dagger/src/test/java/org/modelmapper/dagger/DaggerIntegrationTest.java +++ b/extensions/dagger/src/test/java/org/clairvoyant/modelmapper/dagger/DaggerIntegrationTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.dagger; +package org.clairvoyant.modelmapper.dagger; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; import dagger.Module; diff --git a/extensions/gson/pom.xml b/extensions/gson/pom.xml index 6485a669..a71bcbb6 100644 --- a/extensions/gson/pom.xml +++ b/extensions/gson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions modelmapper-extensions 3.1.2-SNAPSHOT diff --git a/extensions/gson/src/main/java/org/modelmapper/gson/JsonElementValueReader.java b/extensions/gson/src/main/java/org/clairvoyant/modelmapper/gson/JsonElementValueReader.java similarity index 94% rename from extensions/gson/src/main/java/org/modelmapper/gson/JsonElementValueReader.java rename to extensions/gson/src/main/java/org/clairvoyant/modelmapper/gson/JsonElementValueReader.java index 4980f23c..2ac6a9e4 100644 --- a/extensions/gson/src/main/java/org/modelmapper/gson/JsonElementValueReader.java +++ b/extensions/gson/src/main/java/org/clairvoyant/modelmapper/gson/JsonElementValueReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.gson; +package org.clairvoyant.modelmapper.gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -22,8 +22,8 @@ import java.util.Collection; import java.util.Set; -import org.modelmapper.internal.util.Lists; -import org.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.internal.util.Lists; +import org.clairvoyant.modelmapper.spi.ValueReader; /** * JsonElement ValueReader implementation. diff --git a/extensions/gson/src/test/java/org/modelmapper/gson/JsonElementValueReaderTest.java b/extensions/gson/src/test/java/org/clairvoyant/modelmapper/gson/JsonElementValueReaderTest.java similarity index 96% rename from extensions/gson/src/test/java/org/modelmapper/gson/JsonElementValueReaderTest.java rename to extensions/gson/src/test/java/org/clairvoyant/modelmapper/gson/JsonElementValueReaderTest.java index b7bc6baf..73344759 100644 --- a/extensions/gson/src/test/java/org/modelmapper/gson/JsonElementValueReaderTest.java +++ b/extensions/gson/src/test/java/org/clairvoyant/modelmapper/gson/JsonElementValueReaderTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.gson; +package org.clairvoyant.modelmapper.gson; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -12,9 +12,9 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.NameTokenizers; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.NameTokenizers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/extensions/guice/pom.xml b/extensions/guice/pom.xml index 1a281d0a..80a2dc2f 100644 --- a/extensions/guice/pom.xml +++ b/extensions/guice/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions modelmapper-extensions 3.1.2-SNAPSHOT diff --git a/extensions/guice/src/main/java/org/modelmapper/guice/GuiceIntegration.java b/extensions/guice/src/main/java/org/clairvoyant/modelmapper/guice/GuiceIntegration.java similarity index 87% rename from extensions/guice/src/main/java/org/modelmapper/guice/GuiceIntegration.java rename to extensions/guice/src/main/java/org/clairvoyant/modelmapper/guice/GuiceIntegration.java index 5e83bc58..e41417a6 100644 --- a/extensions/guice/src/main/java/org/modelmapper/guice/GuiceIntegration.java +++ b/extensions/guice/src/main/java/org/clairvoyant/modelmapper/guice/GuiceIntegration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.guice; +package org.clairvoyant.modelmapper.guice; -import org.modelmapper.Provider; -import org.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.internal.util.Assert; import com.google.inject.Injector; diff --git a/extensions/guice/src/test/java/org/modelmapper/guice/GuiceIntegrationTest.java b/extensions/guice/src/test/java/org/clairvoyant/modelmapper/guice/GuiceIntegrationTest.java similarity index 82% rename from extensions/guice/src/test/java/org/modelmapper/guice/GuiceIntegrationTest.java rename to extensions/guice/src/test/java/org/clairvoyant/modelmapper/guice/GuiceIntegrationTest.java index 3ce6f0fb..69ab7070 100644 --- a/extensions/guice/src/test/java/org/modelmapper/guice/GuiceIntegrationTest.java +++ b/extensions/guice/src/test/java/org/clairvoyant/modelmapper/guice/GuiceIntegrationTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.guice; +package org.clairvoyant.modelmapper.guice; import static org.testng.Assert.assertEquals; -import org.modelmapper.ModelMapper; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.Test; import com.google.inject.AbstractModule; diff --git a/extensions/jackson/pom.xml b/extensions/jackson/pom.xml index 0e5b5628..0652b0a8 100644 --- a/extensions/jackson/pom.xml +++ b/extensions/jackson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions modelmapper-extensions 3.1.2-SNAPSHOT diff --git a/extensions/jackson/src/main/java/org/modelmapper/jackson/ArrayNodeToCollectionConverter.java b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/ArrayNodeToCollectionConverter.java similarity index 85% rename from extensions/jackson/src/main/java/org/modelmapper/jackson/ArrayNodeToCollectionConverter.java rename to extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/ArrayNodeToCollectionConverter.java index 4905696e..a6ff24ec 100644 --- a/extensions/jackson/src/main/java/org/modelmapper/jackson/ArrayNodeToCollectionConverter.java +++ b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/ArrayNodeToCollectionConverter.java @@ -1,10 +1,10 @@ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import com.fasterxml.jackson.databind.node.ArrayNode; import java.util.Collection; -import org.modelmapper.internal.util.MappingContextHelper; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.util.MappingContextHelper; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; /** * Converts {@link ArrayNode} instances to {@link Collection} instances. diff --git a/extensions/jackson/src/main/java/org/modelmapper/jackson/CollectionToArrayNodeConverter.java b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/CollectionToArrayNodeConverter.java similarity index 91% rename from extensions/jackson/src/main/java/org/modelmapper/jackson/CollectionToArrayNodeConverter.java rename to extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/CollectionToArrayNodeConverter.java index 676a56ce..d2f8f1f8 100644 --- a/extensions/jackson/src/main/java/org/modelmapper/jackson/CollectionToArrayNodeConverter.java +++ b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/CollectionToArrayNodeConverter.java @@ -1,11 +1,11 @@ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.MissingNode; -import org.modelmapper.internal.Errors; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.internal.Errors; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/extensions/jackson/src/main/java/org/modelmapper/jackson/JacksonModule.java b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/JacksonModule.java similarity index 85% rename from extensions/jackson/src/main/java/org/modelmapper/jackson/JacksonModule.java rename to extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/JacksonModule.java index 8d801441..9bff8747 100644 --- a/extensions/jackson/src/main/java/org/modelmapper/jackson/JacksonModule.java +++ b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/JacksonModule.java @@ -1,8 +1,8 @@ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelmapper.ModelMapper; -import org.modelmapper.Module; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Module; /** * ModelMapper module for Jackson diff --git a/extensions/jackson/src/main/java/org/modelmapper/jackson/JsonNodeValueReader.java b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/JsonNodeValueReader.java similarity index 94% rename from extensions/jackson/src/main/java/org/modelmapper/jackson/JsonNodeValueReader.java rename to extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/JsonNodeValueReader.java index 19b17007..711ee49f 100644 --- a/extensions/jackson/src/main/java/org/modelmapper/jackson/JsonNodeValueReader.java +++ b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/JsonNodeValueReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.POJONode; @@ -21,8 +21,8 @@ import java.io.IOException; import java.util.Collection; -import org.modelmapper.internal.util.Lists; -import org.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.internal.util.Lists; +import org.clairvoyant.modelmapper.spi.ValueReader; /** * JsonNode ValueReader implementation. diff --git a/extensions/jackson/src/main/java/org/modelmapper/jackson/PrimitiveJsonNodeConverter.java b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/PrimitiveJsonNodeConverter.java similarity index 84% rename from extensions/jackson/src/main/java/org/modelmapper/jackson/PrimitiveJsonNodeConverter.java rename to extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/PrimitiveJsonNodeConverter.java index 1e332023..52c417fe 100644 --- a/extensions/jackson/src/main/java/org/modelmapper/jackson/PrimitiveJsonNodeConverter.java +++ b/extensions/jackson/src/main/java/org/clairvoyant/modelmapper/jackson/PrimitiveJsonNodeConverter.java @@ -1,9 +1,9 @@ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ContainerNode; -import org.modelmapper.spi.ConditionalConverter; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.spi.ConditionalConverter; +import org.clairvoyant.modelmapper.spi.MappingContext; public class PrimitiveJsonNodeConverter implements ConditionalConverter { @Override diff --git a/extensions/jackson/src/test/java/org/modelmapper/jackson/CollectionToJsonArrayTest.java b/extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/CollectionToJsonArrayTest.java similarity index 92% rename from extensions/jackson/src/test/java/org/modelmapper/jackson/CollectionToJsonArrayTest.java rename to extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/CollectionToJsonArrayTest.java index 264551f6..59c01b0f 100644 --- a/extensions/jackson/src/test/java/org/modelmapper/jackson/CollectionToJsonArrayTest.java +++ b/extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/CollectionToJsonArrayTest.java @@ -1,11 +1,11 @@ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.modelmapper.ModelMapper; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Provider; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/extensions/jackson/src/test/java/org/modelmapper/jackson/JsonArrayToCollectionTest.java b/extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/JsonArrayToCollectionTest.java similarity index 93% rename from extensions/jackson/src/test/java/org/modelmapper/jackson/JsonArrayToCollectionTest.java rename to extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/JsonArrayToCollectionTest.java index bc7f5579..75763fd8 100644 --- a/extensions/jackson/src/test/java/org/modelmapper/jackson/JsonArrayToCollectionTest.java +++ b/extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/JsonArrayToCollectionTest.java @@ -1,15 +1,15 @@ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import org.modelmapper.Converter; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.TypeToken; -import org.modelmapper.spi.MappingContext; +import org.clairvoyant.modelmapper.Converter; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.TypeToken; +import org.clairvoyant.modelmapper.spi.MappingContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/extensions/jackson/src/test/java/org/modelmapper/jackson/JsonNodeValueReaderTest.java b/extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/JsonNodeValueReaderTest.java similarity index 96% rename from extensions/jackson/src/test/java/org/modelmapper/jackson/JsonNodeValueReaderTest.java rename to extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/JsonNodeValueReaderTest.java index a6620e09..89c67ebe 100644 --- a/extensions/jackson/src/test/java/org/modelmapper/jackson/JsonNodeValueReaderTest.java +++ b/extensions/jackson/src/test/java/org/clairvoyant/modelmapper/jackson/JsonNodeValueReaderTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.jackson; +package org.clairvoyant.modelmapper.jackson; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -6,9 +6,9 @@ import java.util.Arrays; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.NameTokenizers; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.NameTokenizers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/extensions/jooq/pom.xml b/extensions/jooq/pom.xml index 2fc64aec..80405e50 100644 --- a/extensions/jooq/pom.xml +++ b/extensions/jooq/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions modelmapper-extensions 3.1.2-SNAPSHOT diff --git a/extensions/jooq/src/main/java/org/modelmapper/jooq/RecordValueReader.java b/extensions/jooq/src/main/java/org/clairvoyant/modelmapper/jooq/RecordValueReader.java similarity index 95% rename from extensions/jooq/src/main/java/org/modelmapper/jooq/RecordValueReader.java rename to extensions/jooq/src/main/java/org/clairvoyant/modelmapper/jooq/RecordValueReader.java index d4f33fa3..6838331e 100644 --- a/extensions/jooq/src/main/java/org/modelmapper/jooq/RecordValueReader.java +++ b/extensions/jooq/src/main/java/org/clairvoyant/modelmapper/jooq/RecordValueReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.jooq; +package org.clairvoyant.modelmapper.jooq; import java.util.ArrayList; import java.util.Collection; @@ -21,7 +21,7 @@ import org.jooq.Field; import org.jooq.Record; -import org.modelmapper.spi.ValueReader; +import org.clairvoyant.modelmapper.spi.ValueReader; /** * Record ValueReader implementation. diff --git a/extensions/jooq/src/test/java/org/modelmapper/jooq/RecordValueReaderTest.java b/extensions/jooq/src/test/java/org/clairvoyant/modelmapper/jooq/RecordValueReaderTest.java similarity index 95% rename from extensions/jooq/src/test/java/org/modelmapper/jooq/RecordValueReaderTest.java rename to extensions/jooq/src/test/java/org/clairvoyant/modelmapper/jooq/RecordValueReaderTest.java index 429bd188..f6b58ddc 100644 --- a/extensions/jooq/src/test/java/org/modelmapper/jooq/RecordValueReaderTest.java +++ b/extensions/jooq/src/test/java/org/clairvoyant/modelmapper/jooq/RecordValueReaderTest.java @@ -1,4 +1,4 @@ -package org.modelmapper.jooq; +package org.clairvoyant.modelmapper.jooq; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -11,9 +11,9 @@ import org.jooq.Result; import org.jooq.SQLDialect; import org.jooq.impl.DSL; -import org.modelmapper.ModelMapper; -import org.modelmapper.PropertyMap; -import org.modelmapper.convention.NameTokenizers; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.PropertyMap; +import org.clairvoyant.modelmapper.convention.NameTokenizers; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; diff --git a/extensions/jooq/src/test/resources/orders.xml b/extensions/jooq/src/test/resources/orders.xml index 902019b6..e2be1e7b 100644 --- a/extensions/jooq/src/test/resources/orders.xml +++ b/extensions/jooq/src/test/resources/orders.xml @@ -34,7 +34,7 @@ - org.modelmapper.jooq.test + org.clairvoyant.modelmapper.jooq.test target/generated diff --git a/extensions/pom.xml b/extensions/pom.xml index 8620557b..36c22894 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -3,13 +3,13 @@ 4.0.0 - org.modelmapper + org.clairvoyant modelmapper-parent 3.1.2-SNAPSHOT pom - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions modelmapper-extensions ModelMapper Extensions @@ -25,7 +25,7 @@ - org.modelmapper + org.clairvoyant modelmapper ${project.version} diff --git a/extensions/protobuf/pom.xml b/extensions/protobuf/pom.xml index 1fc59a83..7a451464 100644 --- a/extensions/protobuf/pom.xml +++ b/extensions/protobuf/pom.xml @@ -2,7 +2,7 @@ modelmapper-extensions - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions 3.1.2-SNAPSHOT 4.0.0 diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index a22567d3..30ac1fba 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - org.modelmapper.extensions + org.clairvoyant.modelmapper.extensions modelmapper-extensions 3.1.2-SNAPSHOT diff --git a/extensions/spring/src/main/java/org/modelmapper/spring/SpringIntegration.java b/extensions/spring/src/main/java/org/clairvoyant/modelmapper/spring/SpringIntegration.java similarity index 88% rename from extensions/spring/src/main/java/org/modelmapper/spring/SpringIntegration.java rename to extensions/spring/src/main/java/org/clairvoyant/modelmapper/spring/SpringIntegration.java index 51f58181..145a1be5 100644 --- a/extensions/spring/src/main/java/org/modelmapper/spring/SpringIntegration.java +++ b/extensions/spring/src/main/java/org/clairvoyant/modelmapper/spring/SpringIntegration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.modelmapper.spring; +package org.clairvoyant.modelmapper.spring; -import org.modelmapper.Provider; -import org.modelmapper.internal.util.Assert; +import org.clairvoyant.modelmapper.Provider; +import org.clairvoyant.modelmapper.internal.util.Assert; import org.springframework.beans.factory.BeanFactory; /** diff --git a/extensions/spring/src/test/java/org/modelmapper/spring/SpringIntegrationTest.java b/extensions/spring/src/test/java/org/clairvoyant/modelmapper/spring/SpringIntegrationTest.java similarity index 83% rename from extensions/spring/src/test/java/org/modelmapper/spring/SpringIntegrationTest.java rename to extensions/spring/src/test/java/org/clairvoyant/modelmapper/spring/SpringIntegrationTest.java index ce725dd7..a1e39315 100644 --- a/extensions/spring/src/test/java/org/modelmapper/spring/SpringIntegrationTest.java +++ b/extensions/spring/src/test/java/org/clairvoyant/modelmapper/spring/SpringIntegrationTest.java @@ -1,9 +1,9 @@ -package org.modelmapper.spring; +package org.clairvoyant.modelmapper.spring; import static org.testng.Assert.assertTrue; -import org.modelmapper.ModelMapper; -import org.modelmapper.Provider; +import org.clairvoyant.modelmapper.ModelMapper; +import org.clairvoyant.modelmapper.Provider; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.testng.annotations.Test; diff --git a/groovy/pom.xml b/groovy/pom.xml index f8ccaea1..bc06875a 100644 --- a/groovy/pom.xml +++ b/groovy/pom.xml @@ -4,13 +4,13 @@ 4.0.0 - org.modelmapper + org.clairvoyant modelmapper-parent 3.0.0-SNAPSHOT jar - org.modelmapper.groovy + org.clairvoyant.modelmapper.groovy modelmapper-groovy ModelMapper Groovy Groovy tests @@ -21,7 +21,7 @@ - org.modelmapper + org.clairvoyant modelmapper ${project.version} provided diff --git a/groovy/src/test/groovy/org/modelmapper/GroovyModelMapperTest.groovy b/groovy/src/test/groovy/org/modelmapper/GroovyModelMapperTest.groovy index 12967bd4..d3a982eb 100644 --- a/groovy/src/test/groovy/org/modelmapper/GroovyModelMapperTest.groovy +++ b/groovy/src/test/groovy/org/modelmapper/GroovyModelMapperTest.groovy @@ -1,4 +1,4 @@ -package org.modelmapper +package org.clairvoyant.modelmapper import org.testng.annotations.Test diff --git a/pom.xml b/pom.xml index be68646e..3546a441 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,9 @@ 4.0.0 - - org.sonatype.oss - oss-parent - 7 - pom - org.modelmapper + org.clairvoyant modelmapper-parent 3.1.2-SNAPSHOT ModelMapper Parent @@ -294,24 +289,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-release-plugin - - deploy nexus-staging:release - -