diff --git a/README.md b/README.md index 90b1f9463..02ca1293e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![License](https://img.shields.io/hexpm/l/plug.svg?maxAge=2592000)]() # Dozer + ## Project Activity The project is currently not active and will more than likely be deprecated in the future. If you are looking to use Dozer on a greenfield project, we would discourage that. If you have been using Dozer for a while, we would suggest you start to think about migrating diff --git a/bom-dependencies/pom.xml b/bom-dependencies/pom.xml index 2d82dafc7..69ea45206 100644 --- a/bom-dependencies/pom.xml +++ b/bom-dependencies/pom.xml @@ -38,14 +38,14 @@ 1.9.4 3.7 2.7 - 3.0.0 + 4.0.0 5.6.8 - 2.4.0-b180830.0438 + 4.0.3 22.0 1.3 5.6.8.Final 2.10.1 - 1 + 2.0.1 3.24.0-GA 1.19 5.1.0 @@ -65,6 +65,13 @@ + + org.glassfish.jaxb + jaxb-bom + ${jaxb.version} + pom + import + cglib cglib-nodep @@ -96,26 +103,16 @@ commons-io ${commons-io.version} - - javax.el - javax.el-api - ${javax.el.version} - org.glassfish - javax.el - ${javax.el.version} + jakarta.el + ${jakarta.el.version} org.apache.felix org.apache.felix.framework ${felix.version} - - org.glassfish.jaxb - jaxb-runtime - ${jaxb-runtime.version} - org.hamcrest hamcrest-all @@ -147,9 +144,9 @@ ${jackson-dataformat.version} - javax.inject - javax.inject - ${javax.inject.version} + jakarta.inject + jakarta.inject-api + ${jakarta.inject.version} org.javassist diff --git a/building-tools/src/main/resources/loose-checkstyle.xml b/building-tools/src/main/resources/loose-checkstyle.xml index b8ba34a13..7379e50cc 100644 --- a/building-tools/src/main/resources/loose-checkstyle.xml +++ b/building-tools/src/main/resources/loose-checkstyle.xml @@ -69,7 +69,7 @@ - + diff --git a/building-tools/src/main/resources/strict-checkstyle.xml b/building-tools/src/main/resources/strict-checkstyle.xml index b751e58f3..93d819812 100644 --- a/building-tools/src/main/resources/strict-checkstyle.xml +++ b/building-tools/src/main/resources/strict-checkstyle.xml @@ -69,7 +69,7 @@ - + diff --git a/core/pom.xml b/core/pom.xml index d6a5a74e5..9f3d191e4 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -43,7 +43,8 @@ com.github.dozermapper.core.* - osgi.serviceloader; filter:="(osgi.serviceloader=com.github.dozermapper.core.DozerModule)";cardinality:=multiple;resolution:=optional, + osgi.serviceloader; + filter:="(osgi.serviceloader=com.github.dozermapper.core.DozerModule)";cardinality:=multiple;resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional * @@ -86,21 +87,27 @@ lombok provided - - + - javax.el - javax.el-api - provided - true + jakarta.xml.bind + jakarta.xml.bind-api + + org.glassfish.jaxb + jaxb-runtime + runtime + + + org.glassfish.jaxb + jaxb-xjc + + org.glassfish - javax.el + jakarta.el provided true - com.fasterxml.jackson.dataformat @@ -277,52 +284,10 @@ - jdk8-build - - 1.8 - - - - - org.codehaus.mojo - jaxb2-maven-plugin - - - schemagen - generate-resources - - schemagen - - - ${project.build.directory}/generated-resources/schemagen - - com/github/dozermapper/core/builder/model/jaxb/** - - - - http://dozermapper.github.io/schema/bean-mapping - bean-mapping.xsd - - - - - - - - - - - jdk9-and-above-build + jdk11-and-above-build - [9,) + [11,) - - - - javax.xml.bind;version="[2.2,3)", - javax.xml.bind.annotation;version="[2.2,3)" - - org.glassfish.jaxb @@ -342,10 +307,13 @@ schemagen - ${project.build.directory}/generated-resources/schemagen - - com/github/dozermapper/core/builder/model/jaxb/** - + ${project.build.directory}/generated-resources/schemagen + + + + src/main/java/com/github/dozermapper/core/builder/model/jaxb + + @@ -353,7 +321,7 @@ org.glassfish.jaxb jaxb-runtime - 2.4.0-b180830.0438 + 4.0.3 @@ -367,9 +335,10 @@ Copying XSD schema to be included in JAR - + diff --git a/core/src/main/java/com/github/dozermapper/core/MappingProcessor.java b/core/src/main/java/com/github/dozermapper/core/MappingProcessor.java index 1239885dc..b1066395a 100644 --- a/core/src/main/java/com/github/dozermapper/core/MappingProcessor.java +++ b/core/src/main/java/com/github/dozermapper/core/MappingProcessor.java @@ -255,9 +255,9 @@ private T createByCreationDirectiveAndMap(BeanCreationDirective creationDire */ private void mapToDestObject(ClassMap classMap, Object srcObj, Object destObj, boolean bypassSuperMappings, String mapId) { Object result = destObj; - if (javax.xml.bind.JAXBElement.class.isAssignableFrom(destObj.getClass())) { - classMap = getClassMap(srcObj.getClass(), javax.xml.bind.JAXBElement.class.cast(destObj).getDeclaredType(), mapId); - result = javax.xml.bind.JAXBElement.class.cast(destObj).getValue(); + if (jakarta.xml.bind.JAXBElement.class.isAssignableFrom(destObj.getClass())) { + classMap = getClassMap(srcObj.getClass(), jakarta.xml.bind.JAXBElement.class.cast(destObj).getDeclaredType(), mapId); + result = jakarta.xml.bind.JAXBElement.class.cast(destObj).getValue(); } map(classMap, srcObj, result, bypassSuperMappings, new ArrayList<>(), mapId); diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/AllowedExceptionsDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/AllowedExceptionsDefinition.java index c20bc490c..866a7b8de 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/AllowedExceptionsDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/AllowedExceptionsDefinition.java @@ -17,24 +17,17 @@ import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.config.BeanContainer; import com.github.dozermapper.core.util.MappingUtils; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -88,4 +81,16 @@ public List> build(BeanContainer beanContainer) { public ConfigurationDefinition end() { return parent; } + + public ConfigurationDefinition getParent() { + return parent; + } + + public List getExceptions() { + return exceptions; + } + + protected void setExceptions(List exceptions) { + this.exceptions = exceptions; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ClassDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ClassDefinition.java index 02d9c3661..cb813082d 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ClassDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ClassDefinition.java @@ -15,19 +15,15 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import com.github.dozermapper.core.classmap.DozerClass; import com.github.dozermapper.core.config.BeanContainer; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; /** @@ -59,8 +55,6 @@ * is-accessible Indicates whether Dozer bypasses getter/setter methods and accesses the field directly. This will typically be set to "false". The default value is * "false". If set to "true", the getter/setter methods will NOT be invoked. You would want to set this to "true" if the field is lacking a getter or setter method. */ -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -197,4 +191,92 @@ public DozerClass build(BeanContainer beanContainer) { return dozerClass; } + + public MappingDefinition getParentMappingDefinition() { + return parentMappingDefinition; + } + + public ConverterTypeDefinition getParentConverterTypeDefinition() { + return parentConverterTypeDefinition; + } + + public String getClazz() { + return clazz; + } + + protected void setClazz(String clazz) { + this.clazz = clazz; + } + + public String getBeanFactory() { + return beanFactory; + } + + protected void setBeanFactory(String beanFactory) { + this.beanFactory = beanFactory; + } + + public String getFactoryBeanId() { + return factoryBeanId; + } + + protected void setFactoryBeanId(String factoryBeanId) { + this.factoryBeanId = factoryBeanId; + } + + public String getMapSetMethod() { + return mapSetMethod; + } + + protected void setMapSetMethod(String mapSetMethod) { + this.mapSetMethod = mapSetMethod; + } + + public String getMapGetMethod() { + return mapGetMethod; + } + + protected void setMapGetMethod(String mapGetMethod) { + this.mapGetMethod = mapGetMethod; + } + + public String getCreateMethod() { + return createMethod; + } + + protected void setCreateMethod(String createMethod) { + this.createMethod = createMethod; + } + + public Boolean getMapNull() { + return mapNull; + } + + protected void setMapNull(Boolean mapNull) { + this.mapNull = mapNull; + } + + public Boolean getMapEmptyString() { + return mapEmptyString; + } + + protected void setMapEmptyString(Boolean mapEmptyString) { + this.mapEmptyString = mapEmptyString; + } + + public Boolean getIsAccessible() { + return isAccessible; + } + + protected void setIsAccessible(Boolean accessible) { + isAccessible = accessible; + } + + public Boolean getSkipConstructor() { + return skipConstructor; + } + + protected void setSkipConstructor(Boolean skipConstructor) { + this.skipConstructor = skipConstructor; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConfigurationDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConfigurationDefinition.java index 6a66aa286..b939f240b 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConfigurationDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConfigurationDefinition.java @@ -16,23 +16,18 @@ package com.github.dozermapper.core.builder.model.jaxb; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.classmap.Configuration; import com.github.dozermapper.core.classmap.CopyByReference; import com.github.dozermapper.core.classmap.RelationshipType; import com.github.dozermapper.core.config.BeanContainer; import com.github.dozermapper.core.util.DozerConstants; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; /** @@ -69,8 +64,6 @@ *

* copy-by-references Indicates which class types should always be copied by reference */ -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -251,4 +244,112 @@ public Configuration build(BeanContainer beanContainer) { return config; } + + public MappingsDefinition getParent() { + return parent; + } + + public Boolean getStopOnErrors() { + return stopOnErrors; + } + + protected void setStopOnErrors(Boolean stopOnErrors) { + this.stopOnErrors = stopOnErrors; + } + + public String getDateFormat() { + return dateFormat; + } + + protected void setDateFormat(String dateFormat) { + this.dateFormat = dateFormat; + } + + public Boolean getWildcard() { + return wildcard; + } + + protected void setWildcard(Boolean wildcard) { + this.wildcard = wildcard; + } + + public Boolean getWildcardCaseInsensitive() { + return wildcardCaseInsensitive; + } + + protected void setWildcardCaseInsensitive(Boolean wildcardCaseInsensitive) { + this.wildcardCaseInsensitive = wildcardCaseInsensitive; + } + + public Boolean getTrimStrings() { + return trimStrings; + } + + protected void setTrimStrings(Boolean trimStrings) { + this.trimStrings = trimStrings; + } + + public Boolean getMapNull() { + return mapNull; + } + + protected void setMapNull(Boolean mapNull) { + this.mapNull = mapNull; + } + + public Boolean getMapEmptyString() { + return mapEmptyString; + } + + protected void setMapEmptyString(Boolean mapEmptyString) { + this.mapEmptyString = mapEmptyString; + } + + public String getBeanFactory() { + return beanFactory; + } + + protected void setBeanFactory(String beanFactory) { + this.beanFactory = beanFactory; + } + + public Relationship getRelationshipType() { + return relationshipType; + } + + protected void setRelationshipType(Relationship relationshipType) { + this.relationshipType = relationshipType; + } + + public CustomConvertersDefinition getCustomConverters() { + return customConverters; + } + + protected void setCustomConverters(CustomConvertersDefinition customConverters) { + this.customConverters = customConverters; + } + + public CopyByReferencesDefinition getCopyByReferences() { + return copyByReferences; + } + + protected void setCopyByReferences(CopyByReferencesDefinition copyByReferences) { + this.copyByReferences = copyByReferences; + } + + public AllowedExceptionsDefinition getAllowedExceptions() { + return allowedExceptions; + } + + protected void setAllowedExceptions(AllowedExceptionsDefinition allowedExceptions) { + this.allowedExceptions = allowedExceptions; + } + + public VariablesDefinition getVariables() { + return variables; + } + + protected void setVariables(VariablesDefinition variables) { + this.variables = variables; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConverterTypeDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConverterTypeDefinition.java index 4c8aa8f57..632516f7c 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConverterTypeDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/ConverterTypeDefinition.java @@ -15,26 +15,19 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.config.BeanContainer; import com.github.dozermapper.core.converters.CustomConverterDescription; import com.github.dozermapper.core.util.MappingUtils; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; - import org.apache.commons.lang3.builder.ToStringBuilder; -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -104,4 +97,32 @@ public String toString() { .append("type", type) .toString(); } + + public CustomConvertersDefinition getParent() { + return parent; + } + + public ClassDefinition getClassA() { + return classA; + } + + protected void setClassA(ClassDefinition classA) { + this.classA = classA; + } + + public ClassDefinition getClassB() { + return classB; + } + + protected void setClassB(ClassDefinition classB) { + this.classB = classB; + } + + public String getType() { + return type; + } + + protected void setType(String type) { + this.type = type; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CopyByReferencesDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CopyByReferencesDefinition.java index 146947a36..40cb6e63d 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CopyByReferencesDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CopyByReferencesDefinition.java @@ -17,23 +17,16 @@ import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.classmap.CopyByReference; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -79,4 +72,16 @@ public List build() { public ConfigurationDefinition end() { return parent; } + + public ConfigurationDefinition getParent() { + return parent; + } + + public List getCopyByReference() { + return copyByReference; + } + + protected void setCopyByReference(List copyByReference) { + this.copyByReference = copyByReference; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CustomConvertersDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CustomConvertersDefinition.java index 72ea88b86..7ee6ae12b 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CustomConvertersDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/CustomConvertersDefinition.java @@ -17,24 +17,17 @@ import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.config.BeanContainer; import com.github.dozermapper.core.converters.CustomConverterDescription; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -83,4 +76,16 @@ public List build(BeanContainer beanContainer) { public ConfigurationDefinition end() { return parent; } + + public ConfigurationDefinition getParent() { + return parent; + } + + public List getConverter() { + return converter; + } + + protected void setConverter(List converter) { + this.converter = converter; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinition.java index a2e0f9673..13e76f3c7 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinition.java @@ -15,14 +15,13 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.MappingException; import com.github.dozermapper.core.classmap.ClassMap; import com.github.dozermapper.core.classmap.MappingDirection; @@ -36,12 +35,8 @@ import com.github.dozermapper.core.fieldmap.HintContainer; import com.github.dozermapper.core.fieldmap.MapFieldMap; import com.github.dozermapper.core.propertydescriptor.PropertyDescriptorFactory; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; - import org.apache.commons.lang3.StringUtils; /** @@ -75,8 +70,6 @@ * custom-converter Indicates that a specific custom converter should be used for mapping this field. Typically * this will not be specified. */ -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -313,4 +306,124 @@ private HintContainer getHintContainer(String hint, BeanContainer beanContainer) return hintContainer; } + + public MappingDefinition getParentMappingDefinition() { + return parentMappingDefinition; + } + + public FieldExcludeDefinition getParentFieldExclude() { + return parentFieldExclude; + } + + public FieldDefinitionDefinition getA() { + return a; + } + + protected void setA(FieldDefinitionDefinition a) { + this.a = a; + } + + public FieldDefinitionDefinition getB() { + return b; + } + + protected void setB(FieldDefinitionDefinition b) { + this.b = b; + } + + public String getAHint() { + return aHint; + } + + protected void setAHint(String aHint) { + this.aHint = aHint; + } + + public String getBHint() { + return bHint; + } + + protected void setBHint(String bHint) { + this.bHint = bHint; + } + + public String getADeepIndexHint() { + return aDeepIndexHint; + } + + protected void setADeepIndexHint(String aDeepIndexHint) { + this.aDeepIndexHint = aDeepIndexHint; + } + + public String getBDeepIndexHint() { + return bDeepIndexHint; + } + + protected void setBDeepIndexHint(String bDeepIndexHint) { + this.bDeepIndexHint = bDeepIndexHint; + } + + public Relationship getRelationshipType() { + return relationshipType; + } + + protected void setRelationshipType(Relationship relationshipType) { + this.relationshipType = relationshipType; + } + + public Boolean getRemoveOrphans() { + return removeOrphans; + } + + protected void setRemoveOrphans(Boolean removeOrphans) { + this.removeOrphans = removeOrphans; + } + + public Type getType() { + return type; + } + + protected void setType(Type type) { + this.type = type; + } + + public String getMapId() { + return mapId; + } + + protected void setMapId(String mapId) { + this.mapId = mapId; + } + + public Boolean getCopyByReference() { + return copyByReference; + } + + protected void setCopyByReference(Boolean copyByReference) { + this.copyByReference = copyByReference; + } + + public String getCustomConverter() { + return customConverter; + } + + protected void setCustomConverter(String customConverter) { + this.customConverter = customConverter; + } + + public String getCustomConverterId() { + return customConverterId; + } + + protected void setCustomConverterId(String customConverterId) { + this.customConverterId = customConverterId; + } + + public String getCustomConverterParam() { + return customConverterParam; + } + + protected void setCustomConverterParam(String customConverterParam) { + this.customConverterParam = customConverterParam; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinitionDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinitionDefinition.java index fa3db035a..17efdf7fc 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinitionDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldDefinitionDefinition.java @@ -15,22 +15,17 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import com.github.dozermapper.core.MappingException; import com.github.dozermapper.core.fieldmap.DozerField; import com.github.dozermapper.core.util.MappingUtils; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; - import org.apache.commons.lang3.StringUtils; /** @@ -54,8 +49,6 @@ * getter/setter methods will NOT be invoked. You would want to set this to "true" if the field is lacking a getter or setter method * skip-constructor Indicates whether Dozer bypasses constructors and instantiates an object with a no-arg constructor. */ -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -236,4 +229,92 @@ private String getFieldNameOfIndexedField(String fieldName) { private int getIndexOfIndexedField(String fieldName) { return Integer.parseInt(fieldName.replaceAll(".*\\[", "").replaceAll("\\]", "")); } + + public FieldExcludeDefinition getFieldExcludeParent() { + return fieldExcludeParent; + } + + public FieldDefinition getFieldParent() { + return fieldParent; + } + + public String getName() { + return name; + } + + protected void setName(String name) { + this.name = name; + } + + public String getDateFormat() { + return dateFormat; + } + + protected void setDateFormat(String dateFormat) { + this.dateFormat = dateFormat; + } + + public FieldType getType() { + return type; + } + + protected void setType(FieldType type) { + this.type = type; + } + + public String getSetMethod() { + return setMethod; + } + + protected void setSetMethod(String setMethod) { + this.setMethod = setMethod; + } + + public String getGetMethod() { + return getMethod; + } + + protected void setGetMethod(String getMethod) { + this.getMethod = getMethod; + } + + public String getKey() { + return key; + } + + protected void setKey(String key) { + this.key = key; + } + + public String getMapSetMethod() { + return mapSetMethod; + } + + protected void setMapSetMethod(String mapSetMethod) { + this.mapSetMethod = mapSetMethod; + } + + public String getMapGetMethod() { + return mapGetMethod; + } + + protected void setMapGetMethod(String mapGetMethod) { + this.mapGetMethod = mapGetMethod; + } + + public Boolean getIsAccessible() { + return isAccessible; + } + + protected void setIsAccessible(Boolean accessible) { + isAccessible = accessible; + } + + public String getCreateMethod() { + return createMethod; + } + + protected void setCreateMethod(String createMethod) { + this.createMethod = createMethod; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldExcludeDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldExcludeDefinition.java index 0228a674b..4c88f8b95 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldExcludeDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldExcludeDefinition.java @@ -15,14 +15,13 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.classmap.ClassMap; import com.github.dozermapper.core.classmap.MappingDirection; import com.github.dozermapper.core.config.BeanContainer; @@ -31,17 +30,12 @@ import com.github.dozermapper.core.fieldmap.ExcludeFieldMap; import com.github.dozermapper.core.fieldmap.FieldMap; import com.github.dozermapper.core.propertydescriptor.PropertyDescriptorFactory; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; /** * Exclude a particular field from being mapped */ -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -108,4 +102,32 @@ public FieldMap build(ClassMap classMap, BeanContainer beanContainer, DestBeanCr return fieldMap; } + + public MappingDefinition getParent() { + return parent; + } + + public FieldDefinitionDefinition getA() { + return a; + } + + protected void setA(FieldDefinitionDefinition a) { + this.a = a; + } + + public FieldDefinitionDefinition getB() { + return b; + } + + protected void setB(FieldDefinitionDefinition b) { + this.b = b; + } + + public Type getType() { + return type; + } + + protected void setType(Type type) { + this.type = type; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldType.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldType.java index 287d3da68..7899586f5 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldType.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/FieldType.java @@ -15,9 +15,9 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; import lombok.ToString; diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingDefinition.java index 7e02e4d5b..403a510cb 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingDefinition.java @@ -17,16 +17,14 @@ import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.classmap.ClassMap; import com.github.dozermapper.core.classmap.Configuration; import com.github.dozermapper.core.classmap.MappingDirection; @@ -35,10 +33,7 @@ import com.github.dozermapper.core.factory.DestBeanCreator; import com.github.dozermapper.core.fieldmap.FieldMap; import com.github.dozermapper.core.propertydescriptor.PropertyDescriptorFactory; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; /** @@ -84,8 +79,6 @@ *

* non-cumulative indicates the element will be added or an existing entry will be updated. */ -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -330,4 +323,136 @@ private List convertFieldMap(ClassMap classMap, BeanContainer beanCont return answer; } + + public MappingsDefinition getParent() { + return parent; + } + + public ClassDefinition getClassA() { + return classA; + } + + protected void setClassA(ClassDefinition classA) { + this.classA = classA; + } + + public ClassDefinition getClassB() { + return classB; + } + + protected void setClassB(ClassDefinition classB) { + this.classB = classB; + } + + public List getFieldOrFieldExclude() { + return fieldOrFieldExclude; + } + + protected void setFieldOrFieldExclude(List fieldOrFieldExclude) { + this.fieldOrFieldExclude = fieldOrFieldExclude; + } + + public List getFields() { + return fields; + } + + protected void setFields(List fields) { + this.fields = fields; + } + + public List getFieldExcludes() { + return fieldExcludes; + } + + protected void setFieldExcludes(List fieldExcludes) { + this.fieldExcludes = fieldExcludes; + } + + public String getDateFormat() { + return dateFormat; + } + + protected void setDateFormat(String dateFormat) { + this.dateFormat = dateFormat; + } + + public Boolean getStopOnErrors() { + return stopOnErrors; + } + + protected void setStopOnErrors(Boolean stopOnErrors) { + this.stopOnErrors = stopOnErrors; + } + + public Boolean getWildcard() { + return wildcard; + } + + protected void setWildcard(Boolean wildcard) { + this.wildcard = wildcard; + } + + public Boolean getWildcardCaseInsensitive() { + return wildcardCaseInsensitive; + } + + protected void setWildcardCaseInsensitive(Boolean wildcardCaseInsensitive) { + this.wildcardCaseInsensitive = wildcardCaseInsensitive; + } + + public Boolean getTrimStrings() { + return trimStrings; + } + + protected void setTrimStrings(Boolean trimStrings) { + this.trimStrings = trimStrings; + } + + public Boolean getMapNull() { + return mapNull; + } + + protected void setMapNull(Boolean mapNull) { + this.mapNull = mapNull; + } + + public Boolean getMapEmptyString() { + return mapEmptyString; + } + + protected void setMapEmptyString(Boolean mapEmptyString) { + this.mapEmptyString = mapEmptyString; + } + + public String getBeanFactory() { + return beanFactory; + } + + protected void setBeanFactory(String beanFactory) { + this.beanFactory = beanFactory; + } + + public Type getType() { + return type; + } + + protected void setType(Type type) { + this.type = type; + } + + public Relationship getRelationshipType() { + return relationshipType; + } + + protected void setRelationshipType(Relationship relationshipType) { + this.relationshipType = relationshipType; + } + + public String getMapId() { + return mapId; + } + + protected void setMapId(String mapId) { + this.mapId = mapId; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingsDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingsDefinition.java index 6cf42ae69..cbe7b239b 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingsDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/MappingsDefinition.java @@ -17,31 +17,24 @@ import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import com.github.dozermapper.core.classmap.ClassMap; import com.github.dozermapper.core.classmap.Configuration; import com.github.dozermapper.core.config.BeanContainer; import com.github.dozermapper.core.factory.DestBeanCreator; import com.github.dozermapper.core.propertydescriptor.PropertyDescriptorFactory; -import lombok.AccessLevel; import lombok.EqualsAndHashCode; -import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; import lombok.ToString; /** * The document root. */ -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @NoArgsConstructor @@ -91,4 +84,28 @@ public List build(Configuration configuration, BeanContainer beanConta return answer; } + + public String getSchemaLocation() { + return schemaLocation; + } + + protected void setSchemaLocation(String schemaLocation) { + this.schemaLocation = schemaLocation; + } + + public ConfigurationDefinition getConfiguration() { + return configuration; + } + + protected void setConfiguration(ConfigurationDefinition configuration) { + this.configuration = configuration; + } + + public List getMapping() { + return mapping; + } + + protected void setMapping(List mapping) { + this.mapping = mapping; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Relationship.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Relationship.java index c7894c4fd..e8eb028a8 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Relationship.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Relationship.java @@ -15,9 +15,9 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; import lombok.ToString; diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Type.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Type.java index 17eaa1c74..d2648a133 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Type.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/Type.java @@ -15,9 +15,9 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; import lombok.ToString; diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariableDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariableDefinition.java index 0340597bc..1f69d2497 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariableDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariableDefinition.java @@ -15,21 +15,15 @@ */ package com.github.dozermapper.core.builder.model.jaxb; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; - -import lombok.AccessLevel; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -74,4 +68,24 @@ public VariablesDefinition end() { public void build() { //NOOP } + + public VariablesDefinition getParent() { + return parent; + } + + public String getClazz() { + return clazz; + } + + protected void setClazz(String clazz) { + this.clazz = clazz; + } + + public String getName() { + return name; + } + + protected void setName(String name) { + this.name = name; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariablesDefinition.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariablesDefinition.java index aa595f331..646748f83 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariablesDefinition.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/VariablesDefinition.java @@ -17,22 +17,15 @@ import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; - -import lombok.AccessLevel; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; -@Getter -@Setter(AccessLevel.PROTECTED) @ToString @EqualsAndHashCode @XmlAccessorType(XmlAccessType.FIELD) @@ -78,4 +71,16 @@ public void build() { } } } + + public ConfigurationDefinition getParent() { + return parent; + } + + public List getVariables() { + return variables; + } + + protected void setVariables(List variables) { + this.variables = variables; + } } diff --git a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/package-info.java b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/package-info.java index dd5303fb1..4d0757631 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/package-info.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/model/jaxb/package-info.java @@ -16,5 +16,5 @@ /** * JAXB model that describes the mapping definitions */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://dozermapper.github.io/schema/bean-mapping", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://dozermapper.github.io/schema/bean-mapping", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package com.github.dozermapper.core.builder.model.jaxb; diff --git a/core/src/main/java/com/github/dozermapper/core/builder/xml/DefaultJAXBModelParser.java b/core/src/main/java/com/github/dozermapper/core/builder/xml/DefaultJAXBModelParser.java index 187cb05e6..c7ef180aa 100644 --- a/core/src/main/java/com/github/dozermapper/core/builder/xml/DefaultJAXBModelParser.java +++ b/core/src/main/java/com/github/dozermapper/core/builder/xml/DefaultJAXBModelParser.java @@ -18,11 +18,12 @@ import java.io.IOException; import java.io.StringReader; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; + import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; diff --git a/core/src/main/java/com/github/dozermapper/core/converters/CalendarConverter.java b/core/src/main/java/com/github/dozermapper/core/converters/CalendarConverter.java index 9b5d09d54..32cfd82e6 100644 --- a/core/src/main/java/com/github/dozermapper/core/converters/CalendarConverter.java +++ b/core/src/main/java/com/github/dozermapper/core/converters/CalendarConverter.java @@ -20,9 +20,7 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; - import javax.xml.datatype.XMLGregorianCalendar; - import org.apache.commons.beanutils.Converter; /** diff --git a/core/src/main/java/com/github/dozermapper/core/converters/PrimitiveOrWrapperConverter.java b/core/src/main/java/com/github/dozermapper/core/converters/PrimitiveOrWrapperConverter.java index 96c503160..3a0b18038 100644 --- a/core/src/main/java/com/github/dozermapper/core/converters/PrimitiveOrWrapperConverter.java +++ b/core/src/main/java/com/github/dozermapper/core/converters/PrimitiveOrWrapperConverter.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.datatype.XMLGregorianCalendar; import com.github.dozermapper.core.config.BeanContainer; diff --git a/core/src/main/java/com/github/dozermapper/core/el/DefaultELEngine.java b/core/src/main/java/com/github/dozermapper/core/el/DefaultELEngine.java index 13fda0b76..d28dda0b8 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/DefaultELEngine.java +++ b/core/src/main/java/com/github/dozermapper/core/el/DefaultELEngine.java @@ -17,18 +17,18 @@ import java.lang.reflect.Method; -import javax.el.ArrayELResolver; -import javax.el.BeanELResolver; -import javax.el.CompositeELResolver; -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.ExpressionFactory; -import javax.el.FunctionMapper; -import javax.el.ListELResolver; -import javax.el.MapELResolver; -import javax.el.ResourceBundleELResolver; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ArrayELResolver; +import jakarta.el.BeanELResolver; +import jakarta.el.CompositeELResolver; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; +import jakarta.el.ExpressionFactory; +import jakarta.el.FunctionMapper; +import jakarta.el.ListELResolver; +import jakarta.el.MapELResolver; +import jakarta.el.ResourceBundleELResolver; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; import com.github.dozermapper.core.el.contexts.SimpleELContext; diff --git a/core/src/main/java/com/github/dozermapper/core/el/ELEngine.java b/core/src/main/java/com/github/dozermapper/core/el/ELEngine.java index abfe16767..9790ba384 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/ELEngine.java +++ b/core/src/main/java/com/github/dozermapper/core/el/ELEngine.java @@ -18,7 +18,7 @@ import java.lang.reflect.Method; /** - * javax.el engine to resolve variables and functions + * jakarta.el engine to resolve variables and functions * See: expression language */ public interface ELEngine { diff --git a/core/src/main/java/com/github/dozermapper/core/el/ELExpressionFactory.java b/core/src/main/java/com/github/dozermapper/core/el/ELExpressionFactory.java index 3603df3b2..020ec7cda 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/ELExpressionFactory.java +++ b/core/src/main/java/com/github/dozermapper/core/el/ELExpressionFactory.java @@ -15,7 +15,7 @@ */ package com.github.dozermapper.core.el; -import javax.el.ExpressionFactory; +import jakarta.el.ExpressionFactory; import com.github.dozermapper.core.util.MappingUtils; @@ -36,28 +36,28 @@ private ELExpressionFactory() { } /** - * Checks whether javax.el is on the classpath and a {@link ExpressionFactory} can be constructed + * Checks whether jakarta.el is on the classpath and a {@link ExpressionFactory} can be constructed * - * @return if javax.el can be used + * @return if jakarta.el can be used */ public static Boolean isSupported() { return isSupported(ELExpressionFactory.class.getClassLoader()); } /** - * Checks whether javax.el is on the classpath and a {@link ExpressionFactory} can be constructed + * Checks whether jakarta.el is on the classpath and a {@link ExpressionFactory} can be constructed * * @param classLoader class loader to resolve {@link ExpressionFactory} - * @return if javax.el can be used + * @return if jakarta.el can be used */ public static Boolean isSupported(ClassLoader classLoader) { if (isJavaxEL == null) { try { isJavaxEL = newInstance(classLoader) != null; - LOG.info("javax.el support is {}", isJavaxEL); + LOG.info("jakarta.el support is {}", isJavaxEL); } catch (IllegalStateException ex) { - LOG.info("javax.el is not supported; {}", ex.getMessage()); + LOG.info("jakarta.el is not supported; {}", ex.getMessage()); isJavaxEL = false; } @@ -72,7 +72,7 @@ public static Boolean isSupported(ClassLoader classLoader) { * * @param classLoader class loader to resolve {@link ExpressionFactory} * @return {@link ExpressionFactory} instance - * @throws IllegalStateException if javax.el is not on the class path or a {@link ExpressionFactory} instance could not be constructed + * @throws IllegalStateException if jakarta.el is not on the class path or a {@link ExpressionFactory} instance could not be constructed */ public static ExpressionFactory newInstance(ClassLoader classLoader) throws IllegalStateException { resolveClassForName(); @@ -81,7 +81,7 @@ public static ExpressionFactory newInstance(ClassLoader classLoader) throws Ille } private static void resolveClassForName() throws IllegalStateException { - String expressionFactoryProperty = System.getProperty("javax.el.ExpressionFactory"); + String expressionFactoryProperty = System.getProperty("jakarta.el.ExpressionFactory"); String expressionFactoryClass = MappingUtils.isBlankOrNull(expressionFactoryProperty) ? "com.sun.el.ExpressionFactoryImpl" : expressionFactoryProperty; diff --git a/core/src/main/java/com/github/dozermapper/core/el/NoopELEngine.java b/core/src/main/java/com/github/dozermapper/core/el/NoopELEngine.java index 7a34c08b0..5bfc6b310 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/NoopELEngine.java +++ b/core/src/main/java/com/github/dozermapper/core/el/NoopELEngine.java @@ -19,7 +19,7 @@ /** * ELEngine implementation that has no implementation logic. - * Use when javax.el dependency is not on the class path. + * Use when jakarta.el dependency is not on the class path. */ public class NoopELEngine implements ELEngine { diff --git a/core/src/main/java/com/github/dozermapper/core/el/TcclELEngine.java b/core/src/main/java/com/github/dozermapper/core/el/TcclELEngine.java index 96a3c6811..0864a1b3f 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/TcclELEngine.java +++ b/core/src/main/java/com/github/dozermapper/core/el/TcclELEngine.java @@ -15,8 +15,8 @@ */ package com.github.dozermapper.core.el; -import javax.el.ExpressionFactory; -import javax.el.ValueExpression; +import jakarta.el.ExpressionFactory; +import jakarta.el.ValueExpression; /** * ELEngine extension of {@link DefaultELEngine} which uses ContextClassLoader when resolving expressions. diff --git a/core/src/main/java/com/github/dozermapper/core/el/contexts/SimpleELContext.java b/core/src/main/java/com/github/dozermapper/core/el/contexts/SimpleELContext.java index 96fad5ea7..852b47aa2 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/contexts/SimpleELContext.java +++ b/core/src/main/java/com/github/dozermapper/core/el/contexts/SimpleELContext.java @@ -15,10 +15,10 @@ */ package com.github.dozermapper.core.el.contexts; -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.FunctionMapper; -import javax.el.VariableMapper; +import jakarta.el.ELContext; +import jakarta.el.ELResolver; +import jakarta.el.FunctionMapper; +import jakarta.el.VariableMapper; import com.github.dozermapper.core.el.mappers.FunctionsMapper; import com.github.dozermapper.core.el.mappers.VariablesMapper; diff --git a/core/src/main/java/com/github/dozermapper/core/el/contexts/package-info.java b/core/src/main/java/com/github/dozermapper/core/el/contexts/package-info.java index a0d2e0af9..b53727ea9 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/contexts/package-info.java +++ b/core/src/main/java/com/github/dozermapper/core/el/contexts/package-info.java @@ -14,6 +14,6 @@ * limitations under the License. */ /** - * Default {@link javax.el.ELContext} implementations + * Default {@link jakarta.el.ELContext} implementations */ package com.github.dozermapper.core.el.contexts; diff --git a/core/src/main/java/com/github/dozermapper/core/el/mappers/FunctionsMapper.java b/core/src/main/java/com/github/dozermapper/core/el/mappers/FunctionsMapper.java index 01bf7166d..99693129e 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/mappers/FunctionsMapper.java +++ b/core/src/main/java/com/github/dozermapper/core/el/mappers/FunctionsMapper.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import javax.el.FunctionMapper; +import jakarta.el.FunctionMapper; /** * Maps between EL function names and methods. diff --git a/core/src/main/java/com/github/dozermapper/core/el/mappers/VariablesMapper.java b/core/src/main/java/com/github/dozermapper/core/el/mappers/VariablesMapper.java index 8aabfe6df..b1f22c9e3 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/mappers/VariablesMapper.java +++ b/core/src/main/java/com/github/dozermapper/core/el/mappers/VariablesMapper.java @@ -18,8 +18,8 @@ import java.util.HashMap; import java.util.Map; -import javax.el.ValueExpression; -import javax.el.VariableMapper; +import jakarta.el.ValueExpression; +import jakarta.el.VariableMapper; /** * Maps between EL variables and the EL expressions diff --git a/core/src/main/java/com/github/dozermapper/core/el/mappers/package-info.java b/core/src/main/java/com/github/dozermapper/core/el/mappers/package-info.java index d5c517d83..23a65909a 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/mappers/package-info.java +++ b/core/src/main/java/com/github/dozermapper/core/el/mappers/package-info.java @@ -14,6 +14,6 @@ * limitations under the License. */ /** - * EL Mapper extensions for {@link javax.el.FunctionMapper} and {@link javax.el.VariableMapper} + * EL Mapper extensions for {@link jakarta.el.FunctionMapper} and {@link jakarta.el.VariableMapper} */ package com.github.dozermapper.core.el.mappers; diff --git a/core/src/main/java/com/github/dozermapper/core/el/package-info.java b/core/src/main/java/com/github/dozermapper/core/el/package-info.java index 30b1d212b..baf324ada 100644 --- a/core/src/main/java/com/github/dozermapper/core/el/package-info.java +++ b/core/src/main/java/com/github/dozermapper/core/el/package-info.java @@ -14,6 +14,6 @@ * limitations under the License. */ /** - * Extensions for {@link javax.el} + * Extensions for {@link jakarta.el} */ package com.github.dozermapper.core.el; diff --git a/core/src/main/java/com/github/dozermapper/core/factory/ConstructionStrategies.java b/core/src/main/java/com/github/dozermapper/core/factory/ConstructionStrategies.java index 5db49988c..1b8d26f53 100644 --- a/core/src/main/java/com/github/dozermapper/core/factory/ConstructionStrategies.java +++ b/core/src/main/java/com/github/dozermapper/core/factory/ConstructionStrategies.java @@ -321,7 +321,7 @@ static class JAXBBeansBased implements BeanCreationStrategy { this.jaxbBeanFactory = jaxbBeanFactory; this.beanContainer = beanContainer; try { - jaxbObjectType = Class.forName("javax.xml.bind.JAXBElement"); + jaxbObjectType = Class.forName("jakarta.xml.bind.JAXBElement"); jaxbBeansAvailable = true; } catch (ClassNotFoundException e) { jaxbBeansAvailable = false; diff --git a/core/src/test/java/com/github/dozermapper/core/converters/JAXBElementConverterTest.java b/core/src/test/java/com/github/dozermapper/core/converters/JAXBElementConverterTest.java index a21b10bc6..9d97bd953 100644 --- a/core/src/test/java/com/github/dozermapper/core/converters/JAXBElementConverterTest.java +++ b/core/src/test/java/com/github/dozermapper/core/converters/JAXBElementConverterTest.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.GregorianCalendar; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; @@ -58,7 +58,7 @@ public void stringToJAXBElementConversion() { Object conversion = converter.convert(JAXBElement.class, "dummy"); assertNotNull(conversion); - assertEquals("javax.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); + assertEquals("jakarta.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); assertEquals("java.lang.String", JAXBElement.class.cast(conversion).getDeclaredType().getCanonicalName()); assertEquals("dummy", JAXBElement.class.cast(conversion).getValue()); } @@ -72,7 +72,7 @@ public void xmlgregoriancalendarToJAXBElementConversion() throws Exception { Object conversion = converter.convert(JAXBElement.class, calendar); assertNotNull(conversion); - assertEquals("javax.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); + assertEquals("jakarta.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); assertEquals("javax.xml.datatype.XMLGregorianCalendar", JAXBElement.class.cast(conversion).getDeclaredType().getCanonicalName()); assertEquals(calendar.toString(), JAXBElement.class.cast(conversion).getValue().toString()); } @@ -85,7 +85,7 @@ public void calendarToJAXBElementConversion() throws Exception { Object conversion = converter.convert(JAXBElement.class, calendar); assertNotNull(conversion); - assertEquals("javax.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); + assertEquals("jakarta.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); assertEquals("javax.xml.datatype.XMLGregorianCalendar", JAXBElement.class.cast(conversion).getDeclaredType().getCanonicalName()); DatatypeFactory instance = DatatypeFactory.newInstance(); @@ -102,7 +102,7 @@ public void dateToJAXBElementConversion() throws Exception { Object conversion = converter.convert(JAXBElement.class, calendar); assertNotNull(conversion); - assertEquals("javax.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); + assertEquals("jakarta.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); assertEquals("javax.xml.datatype.XMLGregorianCalendar", JAXBElement.class.cast(conversion).getDeclaredType().getCanonicalName()); DatatypeFactory instance = DatatypeFactory.newInstance(); @@ -119,7 +119,7 @@ public void dateToJAXBElementStringConversion() { Object conversion = converter.convert(JAXBElement.class, calendar); assertNotNull(conversion); - assertEquals("javax.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); + assertEquals("jakarta.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); assertEquals("java.lang.String", JAXBElement.class.cast(conversion).getDeclaredType().getCanonicalName()); assertEquals("01.02.2001", JAXBElement.class.cast(conversion).getValue()); } @@ -132,7 +132,7 @@ public void calendarToJAXBElementStringConversion() { Object conversion = converter.convert(JAXBElement.class, calendar); assertNotNull(conversion); - assertEquals("javax.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); + assertEquals("jakarta.xml.bind.JAXBElement", conversion.getClass().getCanonicalName()); assertEquals("java.lang.String", JAXBElement.class.cast(conversion).getDeclaredType().getCanonicalName()); assertEquals("01.02.2001", JAXBElement.class.cast(conversion).getValue()); } diff --git a/docs/asciidoc/documentation/expressionlanguage.adoc b/docs/asciidoc/documentation/expressionlanguage.adoc index d452ddcec..6fa2fc979 100644 --- a/docs/asciidoc/documentation/expressionlanguage.adoc +++ b/docs/asciidoc/documentation/expressionlanguage.adoc @@ -1,12 +1,12 @@ == Expression Language === Usage -Dozer provides optional support for standard java expression language (javax.el). +Dozer provides optional support for standard java expression language (jakarta.el). Current support for expressions is start-up time only. Expressions are *not* resolved during each mapping, but rather during mapping loading time. Each attribute or node value can contain a valid EL expression ${}. -Dozer supports any EL implementation written against javax.el standard API. +Dozer supports any EL implementation written against jakarta.el standard API. Functionality is tested with 'glassfish' internally, but other EL providers should work as well. You can define global variables for the mapper in *variables* configuration block. @@ -32,14 +32,9 @@ To enable it, you must add the below dependencies to your classpath: [source,xml,prettyprint] ---- - javax.el - javax.el-api - 3.0.0 - - - org.glassfish - javax.el - 3.0.0 + org.glassfish + jakarta.el + 4.0.0 ---- diff --git a/plugins-parent/pom.xml b/plugins-parent/pom.xml index 6f36676b1..1ad01d047 100644 --- a/plugins-parent/pom.xml +++ b/plugins-parent/pom.xml @@ -53,7 +53,7 @@ 3.0.0 1.6.0 - 1.6 + 3.1.0 3.1.8 @@ -260,7 +260,9 @@ org.apache.maven.plugins maven-javadoc-plugin - com.github.dozermapper.core.vo.jaxb.employee:com.github.dozermapper.protobuf.vo.proto + + com.github.dozermapper.core.vo.jaxb.employee:com.github.dozermapper.protobuf.vo.proto + true -Xdoclint:all @@ -281,7 +283,9 @@ ${project.groupId}.${project.artifactId}.source ${osgi.version.clean} - ${project.groupId}.${project.artifactId};version="${osgi.version.clean}" + + ${project.groupId}.${project.artifactId};version="${osgi.version.clean}" + @@ -437,75 +441,18 @@ - - jdk8-build - - 1.8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${project.java.version} - ${project.java.version} - ${project.build.sourceEncoding} - - -Xdiags:verbose - -Xlint:all - -Xlint:-processing - - - - - - - - - between-jdk9-and-jdk10-build - - [9,11) - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${project.java.version} - ${project.java.version} - ${project.build.sourceEncoding} - - -Xdiags:verbose - -Xlint:all - -Xlint:-processing - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - --add-modules java.xml.bind,java.activation - --add-opens java.base/java.lang=ALL-UNNAMED - --add-exports=java.xml.bind/com.sun.xml.internal.bind=ALL-UNNAMED - --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2=ALL-UNNAMED - --add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime.reflect=ALL-UNNAMED - - - - - - jdk11-and-above-build [11,) + + + org.glassfish.jaxb + jaxb-runtime + + + diff --git a/tests/dozer-osgi-tests/pom.xml b/tests/dozer-osgi-tests/pom.xml index 56ec0026d..4fccf11e5 100644 --- a/tests/dozer-osgi-tests/pom.xml +++ b/tests/dozer-osgi-tests/pom.xml @@ -103,15 +103,10 @@ test - - - javax.el - javax.el-api - test - + org.glassfish - javax.el + jakarta.el test @@ -184,8 +179,8 @@ test - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api test diff --git a/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/BundleOptions.java b/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/BundleOptions.java index 225b8e28c..89bd4c52f 100644 --- a/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/BundleOptions.java +++ b/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/BundleOptions.java @@ -67,8 +67,7 @@ public static Option optionalBundles() { localBundle("javassist.link"), // Optional; EL - localBundle("javax.el-api.link"), - localBundle("com.sun.el.javax.el.link"), + localBundle("org.glassfish.jakarta.el.link"), // Optional; Hibernate features(maven().groupId("org.apache.karaf.features") diff --git a/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/PaxExamTestSupport.java b/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/PaxExamTestSupport.java index fae6c4fbc..8a7e586db 100644 --- a/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/PaxExamTestSupport.java +++ b/tests/dozer-osgi-tests/src/test/java/com/github/dozermapper/osgitests/support/PaxExamTestSupport.java @@ -21,7 +21,7 @@ import java.io.InputStream; import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.After; import org.junit.Before; diff --git a/tests/pom.xml b/tests/pom.xml index 5a5a8116a..6eac9b0b3 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -37,8 +37,8 @@ dozer-wildfly-tests + --> dozer-jmh-tests