import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty\r
import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject\r
import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType\r
-\r
+import java.util.ArrayList\r
+import java.util.Collections\r
\r
/**\r
* Template for generating JAVA class. \r
\r
\r
protected val GeneratedTransferObject genTO;\r
- \r
+\r
/**\r
* Creates instance of this class with concrete <code>genType</code>.\r
* \r
this.properties = genType.properties\r
this.finalProperties = GeneratorUtil.resolveReadOnlyPropertiesFromTO(genTO.properties)\r
this.parentProperties = GeneratorUtil.getPropertiesOfAllParents(genTO)\r
- this.allProperties = properties + parentProperties\r
+\r
+ var List<GeneratedProperty> sorted = new ArrayList<GeneratedProperty>();\r
+ sorted.addAll(properties);\r
+ sorted.addAll(parentProperties);\r
+ Collections.sort(sorted, new PropertyComparator());\r
+ \r
+ this.allProperties = sorted\r
this.enums = genType.enumerations\r
this.consts = genType.constantDefinitions\r
this.enclosedGeneratedTypes = genType.enclosedTypes\r
--- /dev/null
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.sal.java.api.generator;
+
+import java.util.Comparator;
+
+import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty;
+
+public class PropertyComparator implements Comparator<GeneratedProperty> {
+
+ @Override
+ public int compare(GeneratedProperty p1, GeneratedProperty p2) {
+ return p1.getName().compareTo(p2.getName());
+ }
+
+}
final String outputStr = clsGen.generate(genTO);\r
\r
assertNotNull(outputStr);\r
- assertTrue(outputStr\r
- .contains("public CompositeKeyListKey(String _Key2, "\r
- + "Byte _Key1)"));\r
+ assertTrue(outputStr.contains("public CompositeKeyListKey(Byte _Key1, String _Key2)"));\r
\r
assertEquals(2, propertyCount);\r
genTOsCount++;\r