diff --git a/src/org/atriasoft/exml/builder/IntrospectionModelComplex.java b/src/org/atriasoft/exml/builder/IntrospectionModelComplex.java index e0e227f..e9a7dc1 100644 --- a/src/org/atriasoft/exml/builder/IntrospectionModelComplex.java +++ b/src/org/atriasoft/exml/builder/IntrospectionModelComplex.java @@ -59,7 +59,7 @@ public class IntrospectionModelComplex extends IntrospectionModel { // } // return false; // } - private boolean checkIfOneIsNull(String[] values, int offset) { + private boolean checkIfOneIsNull(final String[] values, final int offset) { for (int iii=offset; iii unmanaged (missing names description)"); + Log.verbose(" ==> unmanaged (missing names description: " + Arrays.toString(names) + ")"); } else { this.constructors.add(new ConstructorModel(names, isAttributes, elem)); } @@ -149,7 +149,7 @@ public class IntrospectionModelComplex extends IntrospectionModel { isAttributes[iii] = ReflectTools.getIsAttribute(elem, paramElem, null); String[] namesParam = ReflectTools.getNames(elem, paramElem, null); if (namesParam != null && namesParam.length != 0 ) { - // TODO: maybe do something id name is already set ??? + // TODO maybe do something id name is already set ??? names[iii] = namesParam[0]; } } @@ -915,7 +915,12 @@ public class IntrospectionModelComplex extends IntrospectionModel { class OrderData { public Method getter = null; public final String name; + public String[] names = null; public Method setter = null; + public Field field = null; + public Boolean isAttribute = null; + public Boolean isOptionnal = null; + public Boolean isManaged = null; public OrderData(final String name) { this.name = name; diff --git a/src/org/atriasoft/exml/generator/GeneratorIntrospection.java b/src/org/atriasoft/exml/generator/GeneratorIntrospection.java index f82704e..d21946a 100644 --- a/src/org/atriasoft/exml/generator/GeneratorIntrospection.java +++ b/src/org/atriasoft/exml/generator/GeneratorIntrospection.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.Map; import org.atriasoft.etk.util.ArraysTools; - -import org.atriasoft.eStringSerialize.StringSerializer; import org.atriasoft.exml.builder.IntrospectionModel; import org.atriasoft.exml.builder.IntrospectionModelFactory; import org.atriasoft.exml.builder.IntrospectionProperty; diff --git a/test/src/test/atriasoft/exml/ExmlTestIntrospectionDecorator.java b/test/src/test/atriasoft/exml/ExmlTestIntrospectionDecorator.java index 5248c38..658c68d 100644 --- a/test/src/test/atriasoft/exml/ExmlTestIntrospectionDecorator.java +++ b/test/src/test/atriasoft/exml/ExmlTestIntrospectionDecorator.java @@ -5,13 +5,12 @@ */ package test.atriasoft.exml; -import java.util.List; import org.atriasoft.exml.Exml; import org.atriasoft.exml.annotation.XmlAttribute; import org.atriasoft.exml.annotation.XmlDefaultAttibute; -import org.atriasoft.exml.annotation.XmlList; import org.atriasoft.exml.annotation.XmlName; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -26,11 +25,11 @@ public class ExmlTestIntrospectionDecorator { // ** Attribute // ************************************************************ - @XmlDefaultAttibute() + @XmlDefaultAttibute public class TestNodeObject { public int valueA; - @XmlAttribute() + @XmlAttribute public int valueB; @XmlAttribute(true) public int valueC; @@ -47,7 +46,7 @@ public class ExmlTestIntrospectionDecorator { public final int finalValueM; - @XmlAttribute() + @XmlAttribute public final int finalValueN; @XmlAttribute(true) public final int finalValueO; @@ -69,9 +68,9 @@ public class ExmlTestIntrospectionDecorator { "finalValueQ", "finalValueR", "finalValueS", "finalValueT", "pFinalValueQ", "pFinalValueR", "pFinalValueS", "pFinalValueT"}) public TestNodeObject( - int finalValueM, int finalValueN, int finalValueO, int finalValueP, - int finalValueQ, @XmlAttribute() int finalValueR, @XmlAttribute(true) int finalValueS, @XmlAttribute(false) int finalValueT, - int pFinalValueQ, int pFinalValueR, int pFinalValueS, int pFinalValueT) { + final int finalValueM, final int finalValueN, final int finalValueO, final int finalValueP, + final int finalValueQ, @XmlAttribute final int finalValueR, @XmlAttribute(true) final int finalValueS, @XmlAttribute(false) final int finalValueT, + final int pFinalValueQ, final int pFinalValueR, final int pFinalValueS, final int pFinalValueT) { this.finalValueM = finalValueM; this.finalValueN = finalValueN; this.finalValueO = finalValueO; @@ -87,71 +86,71 @@ public class ExmlTestIntrospectionDecorator { } public int getValueE() { - return valueE; + return this.valueE; } - public void setValueE(int valueE) { + public void setValueE(final int valueE) { this.valueE = valueE; } - @XmlAttribute() + @XmlAttribute public int getValueF() { - return valueF; + return this.valueF; } - public void setValueF(int valueF) { + public void setValueF(final int valueF) { this.valueF = valueF; } public int getValueG() { - return valueG; + return this.valueG; } - @XmlAttribute() - public void setValueG(int valueG) { + @XmlAttribute + public void setValueG(final int valueG) { this.valueG = valueG; } @XmlAttribute(true) public int getValueH() { - return valueH; + return this.valueH; } - public void setValueH(int valueH) { + public void setValueH(final int valueH) { this.valueH = valueH; } public int getValueI() { - return valueI; + return this.valueI; } @XmlAttribute(true) - public void setValueI(int valueI) { + public void setValueI(final int valueI) { this.valueI = valueI; } @XmlAttribute(false) public int getValueJ() { - return valueJ; + return this.valueJ; } - public void setValueJ(int valueJ) { + public void setValueJ(final int valueJ) { this.valueJ = valueJ; } public int getValueK() { - return valueK; + return this.valueK; } @XmlAttribute(false) - public void setValueK(int valueK) { + public void setValueK(final int valueK) { this.valueK = valueK; } public int getPFinalValueQ() { - return pFinalValueQ; + return this.pFinalValueQ; } - @XmlAttribute() + @XmlAttribute public int getPFinalValueR() { - return pFinalValueR; + return this.pFinalValueR; } @XmlAttribute(true) public int getPFinalValueS() { - return pFinalValueS; + return this.pFinalValueS; } @XmlAttribute(false) public int getPFinalValueT() { - return pFinalValueT; + return this.pFinalValueT; } } @@ -212,7 +211,7 @@ public class ExmlTestIntrospectionDecorator { @XmlDefaultAttibute(true) public class TestNodeObjectTrue { public int valueA; - @XmlAttribute() + @XmlAttribute public int valueB; @XmlAttribute(true) public int valueC; @@ -228,51 +227,51 @@ public class ExmlTestIntrospectionDecorator { private int valueK; public int getValueE() { - return valueE; + return this.valueE; } - public void setValueE(int valueE) { + public void setValueE(final int valueE) { this.valueE = valueE; } - @XmlAttribute() + @XmlAttribute public int getValueF() { - return valueF; + return this.valueF; } - public void setValueF(int valueF) { + public void setValueF(final int valueF) { this.valueF = valueF; } public int getValueG() { - return valueG; + return this.valueG; } - @XmlAttribute() - public void setValueG(int valueG) { + @XmlAttribute + public void setValueG(final int valueG) { this.valueG = valueG; } @XmlAttribute(true) public int getValueH() { - return valueH; + return this.valueH; } - public void setValueH(int valueH) { + public void setValueH(final int valueH) { this.valueH = valueH; } public int getValueI() { - return valueI; + return this.valueI; } @XmlAttribute(true) - public void setValueI(int valueI) { + public void setValueI(final int valueI) { this.valueI = valueI; } @XmlAttribute(false) public int getValueJ() { - return valueJ; + return this.valueJ; } - public void setValueJ(int valueJ) { + public void setValueJ(final int valueJ) { this.valueJ = valueJ; } public int getValueK() { - return valueK; + return this.valueK; } @XmlAttribute(false) - public void setValueK(int valueK) { + public void setValueK(final int valueK) { this.valueK = valueK; } @@ -320,7 +319,7 @@ public class ExmlTestIntrospectionDecorator { @XmlDefaultAttibute(false) public class TestNodeObjectFalse { public int valueA; - @XmlAttribute() + @XmlAttribute public int valueB; @XmlAttribute(true) public int valueC; @@ -336,51 +335,51 @@ public class ExmlTestIntrospectionDecorator { private int valueK; public int getValueE() { - return valueE; + return this.valueE; } - public void setValueE(int valueE) { + public void setValueE(final int valueE) { this.valueE = valueE; } - @XmlAttribute() + @XmlAttribute public int getValueF() { - return valueF; + return this.valueF; } - public void setValueF(int valueF) { + public void setValueF(final int valueF) { this.valueF = valueF; } public int getValueG() { - return valueG; + return this.valueG; } - @XmlAttribute() - public void setValueG(int valueG) { + @XmlAttribute + public void setValueG(final int valueG) { this.valueG = valueG; } @XmlAttribute(true) public int getValueH() { - return valueH; + return this.valueH; } - public void setValueH(int valueH) { + public void setValueH(final int valueH) { this.valueH = valueH; } public int getValueI() { - return valueI; + return this.valueI; } @XmlAttribute(true) - public void setValueI(int valueI) { + public void setValueI(final int valueI) { this.valueI = valueI; } @XmlAttribute(false) public int getValueJ() { - return valueJ; + return this.valueJ; } - public void setValueJ(int valueJ) { + public void setValueJ(final int valueJ) { this.valueJ = valueJ; } public int getValueK() { - return valueK; + return this.valueK; } @XmlAttribute(false) - public void setValueK(int valueK) { + public void setValueK(final int valueK) { this.valueK = valueK; }