commit | a35df8e7d563e3252a11e51b0de4da9f573bfa14 | [log] [tgz] |
---|---|---|
author | Jad El-khoury <jad@kth.se> | Fri May 25 22:57:51 2018 +0200 |
committer | Jad El-khoury <jad@kth.se> | Fri May 25 22:59:40 2018 +0200 |
tree | c073960546f27c71ea7bbc4f17419d27197b909f | |
parent | 84bcda7e986fa6ce7396f4964d473966524ee8d1 [diff] |
Bug 535059 - method ordering keeps changing in generated Manager and Factory classes Sort the resources (for which the methods are being produced) by their name to produce a consistent ordered list. Change-Id: Ia96e25076c164bd629693377131c3d7625a40b6f Signed-off-by: Jad El-khoury <jad@kth.se>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl index d0fb085..c2cc06f 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
@@ -233,7 +233,7 @@ [/for] - [for (aResource: Resource | servicedResources(anAdaptorInterface))] + [for (aResource: Resource | servicedResources(anAdaptorInterface)->sortedBy(name))] public static String [getResourceETagMethodName(aResource)/](final [javaClassName(aResource)/] aResource) { String eTag = null;
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl index e69395c..0dc020c 100644 --- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl +++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorResourcesFactory.mtl
@@ -34,7 +34,7 @@ import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -[for (aResource: Resource | relevantResources(anAdaptorInterface))] +[for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name))] import [javaClassFullName(aResource, anAdaptorInterface, null) /]; [/for] @@ -116,7 +116,7 @@ // [protected ('class_methods')] // [/protected] - [for (aResource: Resource | servicedResources(anAdaptorInterface))] + [for (aResource: Resource | servicedResources(anAdaptorInterface)->sortedBy(name))] //methods for [aResource.javaClassName()/] resource [aResource.generateFactoryMethods(anAdaptorInterface) /]