Author: tchemit Date: 2011-01-08 15:53:40 +0100 (Sat, 08 Jan 2011) New Revision: 453 Url: http://nuiton.org/repositories/revision/sandbox/453 Log: fix export order : export order is exactly the insert order to use in the import process Modified: orion-import-export/src/main/java/fr/orion/io/OrionEntityVisitorXmlWriter.java orion-import-export/src/test/java/fr/orion/io/OrionXmlExporterTest.java Modified: orion-import-export/src/main/java/fr/orion/io/OrionEntityVisitorXmlWriter.java =================================================================== --- orion-import-export/src/main/java/fr/orion/io/OrionEntityVisitorXmlWriter.java 2011-01-08 14:42:14 UTC (rev 452) +++ orion-import-export/src/main/java/fr/orion/io/OrionEntityVisitorXmlWriter.java 2011-01-08 14:53:40 UTC (rev 453) @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Stack; @@ -134,7 +135,8 @@ prefix = prefix0; - // on ajoute au modele toutes les entites qu'il utilise + // on ajoute au modele toutes les entites qu'il utilise dans leur ordre de création + Collections.reverse(modelChilds); for (String s : modelChilds) { builder.append(s); } Modified: orion-import-export/src/test/java/fr/orion/io/OrionXmlExporterTest.java =================================================================== --- orion-import-export/src/test/java/fr/orion/io/OrionXmlExporterTest.java 2011-01-08 14:42:14 UTC (rev 452) +++ orion-import-export/src/test/java/fr/orion/io/OrionXmlExporterTest.java 2011-01-08 14:53:40 UTC (rev 453) @@ -211,13 +211,22 @@ " <id>0</id>\n" + " <id>1</id>\n" + " </property>\n" + - " <QuestionEntity id=\"00\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name00\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + + " <AuditEntity id=\"1\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name1\"/>\n" + + " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + + " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"0\" reverse=\"true\"/>\n" + + " <property name=\"question\" type=\"fr.orion.entities.impl.QuestionEntity\">\n" + + " <id>10</id>\n" + + " <id>11</id>\n" + + " </property>\n" + + " </AuditEntity>\n" + + " <QuestionEntity id=\"11\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + - " <QuestionEntity id=\"01\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name01\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + + " <QuestionEntity id=\"10\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name10\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + " <AuditEntity id=\"0\">\n" + " <property name=\"name\" type=\"java.lang.String\" value=\"name0\"/>\n" + @@ -231,23 +240,14 @@ " <id>1</id>\n" + " </property>\n" + " </AuditEntity>\n" + - " <QuestionEntity id=\"10\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name10\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + + " <QuestionEntity id=\"01\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name01\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + - " <QuestionEntity id=\"11\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + + " <QuestionEntity id=\"00\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name00\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + - " <AuditEntity id=\"1\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name1\"/>\n" + - " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + - " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"0\" reverse=\"true\"/>\n" + - " <property name=\"question\" type=\"fr.orion.entities.impl.QuestionEntity\">\n" + - " <id>10</id>\n" + - " <id>11</id>\n" + - " </property>\n" + - " </AuditEntity>\n" + " </ModelEntity>\n" + " <ModelEntity id=\"1\">\n" + " <property name=\"name\" type=\"java.lang.String\" value=\"name1\"/>\n" + @@ -256,6 +256,11 @@ " <id>10</id>\n" + " <id>11</id>\n" + " </property>\n" + + " <AuditEntity id=\"11\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + + " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + + " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"1\" reverse=\"true\"/>\n" + + " </AuditEntity>\n" + " <AuditEntity id=\"10\">\n" + " <property name=\"name\" type=\"java.lang.String\" value=\"name10\"/>\n" + " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + @@ -265,11 +270,6 @@ " <id>1</id>\n" + " </property>\n" + " </AuditEntity>\n" + - " <AuditEntity id=\"11\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + - " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + - " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"1\" reverse=\"true\"/>\n" + - " </AuditEntity>\n" + " </ModelEntity>\n" + "</export>"; @@ -316,13 +316,22 @@ " <id>0</id>\n" + " <id>1</id>\n" + " </property>\n" + - " <QuestionEntity id=\"00\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name00\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + + " <AuditEntity id=\"1\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name1\"/>\n" + + " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + + " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"0\" reverse=\"true\"/>\n" + + " <property name=\"question\" type=\"fr.orion.entities.impl.QuestionEntity\">\n" + + " <id>10</id>\n" + + " <id>11</id>\n" + + " </property>\n" + + " </AuditEntity>\n" + + " <QuestionEntity id=\"11\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + - " <QuestionEntity id=\"01\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name01\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + + " <QuestionEntity id=\"10\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name10\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + " <AuditEntity id=\"0\">\n" + " <property name=\"name\" type=\"java.lang.String\" value=\"name0\"/>\n" + @@ -336,23 +345,14 @@ " <id>1</id>\n" + " </property>\n" + " </AuditEntity>\n" + - " <QuestionEntity id=\"10\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name10\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + + " <QuestionEntity id=\"01\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name01\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + - " <QuestionEntity id=\"11\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + - " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"1\" reverse=\"true\"/>\n" + + " <QuestionEntity id=\"00\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name00\"/>\n" + + " <property name=\"audit\" type=\"fr.orion.entities.impl.AuditEntity\" id=\"0\" reverse=\"true\"/>\n" + " </QuestionEntity>\n" + - " <AuditEntity id=\"1\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name1\"/>\n" + - " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + - " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"0\" reverse=\"true\"/>\n" + - " <property name=\"question\" type=\"fr.orion.entities.impl.QuestionEntity\">\n" + - " <id>10</id>\n" + - " <id>11</id>\n" + - " </property>\n" + - " </AuditEntity>\n" + " </ModelEntity>\n" + " <ModelEntity id=\"1\">\n" + " <property name=\"name\" type=\"java.lang.String\" value=\"name1\"/>\n" + @@ -361,6 +361,11 @@ " <id>10</id>\n" + " <id>11</id>\n" + " </property>\n" + + " <AuditEntity id=\"11\">\n" + + " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + + " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + + " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"1\" reverse=\"true\"/>\n" + + " </AuditEntity>\n" + " <AuditEntity id=\"10\">\n" + " <property name=\"name\" type=\"java.lang.String\" value=\"name10\"/>\n" + " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + @@ -370,11 +375,6 @@ " <id>1</id>\n" + " </property>\n" + " </AuditEntity>\n" + - " <AuditEntity id=\"11\">\n" + - " <property name=\"name\" type=\"java.lang.String\" value=\"name11\"/>\n" + - " <property name=\"date\" type=\"java.util.Date\" value=\"$date$\"/>\n" + - " <property name=\"model\" type=\"fr.orion.entities.impl.ModelEntity\" id=\"1\" reverse=\"true\"/>\n" + - " </AuditEntity>\n" + " </ModelEntity>\n" + "</export>";
participants (1)
-
tchemit＠users.nuiton.org