[506689] Fixed incorrect rule naming expectation1.4.11.4-maintenance

If a VEPL file was added to a package whose qualified name contains the
string 'rule', a lot of erroneous items were added to the generated
CEPFactory class.

Change-Id: Ic478467622dbdb2a5db6c1f58f4f91b41f73d43c
Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>

1 files changed, 179 insertions, 179 deletions

diff --git a/cep/plugins/org.eclipse.viatra.cep.vepl/src/org/eclipse/viatra/cep/vepl/jvmmodel/NamingProvider.xtend b/cep/plugins/org.eclipse.viatra.cep.vepl/src/org/eclipse/viatra/cep/vepl/jvmmodel/NamingProvider.xtend
index 9cd8a1d76..1757aabbf 100644
--- a/cep/plugins/org.eclipse.viatra.cep.vepl/src/org/eclipse/viatra/cep/vepl/jvmmodel/NamingProvider.xtend
+++ b/cep/plugins/org.eclipse.viatra.cep.vepl/src/org/eclipse/viatra/cep/vepl/jvmmodel/NamingProvider.xtend
@@ -1,179 +1,179 @@
-/*******************************************************************************

- * Copyright (c) 2004-2014, Istvan David, Istvan Rath and Daniel Varro

- * 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

- * 

- * Contributors:

- * Istvan David - initial API and implementation

- *******************************************************************************/

-package org.eclipse.viatra.cep.vepl.jvmmodel

-

-import com.google.inject.Inject

-import java.util.HashMap

-import org.eclipse.viatra.cep.vepl.vepl.AtomicEventPattern

-import org.eclipse.viatra.cep.vepl.vepl.ComplexEventPattern

-import org.eclipse.viatra.cep.vepl.vepl.EventModel

-import org.eclipse.viatra.cep.vepl.vepl.EventPattern

-import org.eclipse.viatra.cep.vepl.vepl.ModelElement

-import org.eclipse.viatra.cep.vepl.vepl.QueryResultChangeEventPattern

-import org.eclipse.viatra.cep.vepl.vepl.Rule

-import org.eclipse.viatra.cep.vepl.vepl.Trait

-import org.eclipse.xtext.naming.IQualifiedNameProvider

-import org.eclipse.xtext.naming.QualifiedName

-

-class NamingProvider {

-	@Inject extension IQualifiedNameProvider

-

-	public static final String TRAIT_PACKAGE_NAME_ELEMENT = "traits"

-	public static final String EVENTCLASS_PACKAGE_NAME_ELEMENT = "events"

-	public static final String QUERYRESULT_EVENTCLASS_PACKAGE_NAME_ELEMENT = "events.queryresult"

-	public static final String ATOMIC_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.atomic"

-	public static final String QUERYRESULT_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.atomic.queryresult"

-	public static final String COMPLEX_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.complex"

-	public static final String ANONYMOUS_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.complex.anonymous"

-	public static final String RULES_PACKAGE_NAME_ELEMENT = "rules"

-	public static final String JOBS_PACKAGE_NAME_ELEMENT = "jobs"

-	public static final String MAPPING_PACKAGE_NAME_ELEMENT = "mapping"

-

-	public static final String MAPPING_CLASS_NAME = "QueryEngine2ViatraCep"

-	private static final String ANONYMOUS_PATTERN_NAME = "_AnonymousPattern_"

-	private static final String EVENT_SUFFIX = "_Event"

-	private static final String QUERYRESULT_EVENT_SUFFIX = "_QueryResultEvent"

-	private static final String PATTERN_SUFFIX = "_Pattern"

-	private static final String JOB_SUFFIX = "_Job"

-

-	def getTraitInterfaceFqn(ModelElement element) {

-		val className = element.fullyQualifiedName.lastSegment

-		element.packageNames.get(NamingPurpose::TRAIT).append(className.toFirstUpper)

-	}

-

-	def getTraitSpecificationFqn(ModelElement element) {

-		val className = element.fullyQualifiedName.lastSegment

-		element.packageNames.get(NamingPurpose::TRAIT).append(className.toFirstUpper + "Specification")

-	}

-

-	def getClassFqn(ModelElement element) {

-		val className = element.fullyQualifiedName.lastSegment

-		element.packageNames.get(NamingPurpose::EVENT).append(className.toFirstUpper + EVENT_SUFFIX)

-	}

-

-	def getPatternFqn(ModelElement element) {

-		val className = element.fullyQualifiedName.lastSegment

-		element.packageNames.get(NamingPurpose::PATTERN).append(className.toFirstUpper + PATTERN_SUFFIX)

-	}

-

-	enum NamingPurpose {

-		TRAIT,

-		EVENT,

-		PATTERN,

-		RULE,

-		JOB,

-		MAPPING

-	}

-

-	def getPackageNames(ModelElement modelElement) {

-		val associatedPackages = <NamingPurpose, QualifiedName>newHashMap()

-

-		switch modelElement {

-			Trait case modelElement: {

-				associatedPackages.put(

-					NamingPurpose::TRAIT,

-					modelElement.packageName.append(TRAIT_PACKAGE_NAME_ELEMENT)

-				)

-			}

-			AtomicEventPattern case modelElement: {

-				associatedPackages.put(NamingPurpose::EVENT,

-					modelElement.packageName.append(EVENTCLASS_PACKAGE_NAME_ELEMENT))

-				associatedPackages.put(NamingPurpose::PATTERN,

-					modelElement.packageName.append(ATOMIC_PATTERN_PACKAGE_NAME_ELEMENT))

-			}

-			ComplexEventPattern case modelElement: {

-				associatedPackages.put(NamingPurpose::PATTERN,

-					modelElement.packageName.append(COMPLEX_PATTERN_PACKAGE_NAME_ELEMENT))

-			}

-			QueryResultChangeEventPattern case modelElement: {

-				associatedPackages.put(NamingPurpose::EVENT,

-					modelElement.packageName.append(QUERYRESULT_EVENTCLASS_PACKAGE_NAME_ELEMENT))

-				associatedPackages.put(NamingPurpose::PATTERN,

-					modelElement.packageName.append(QUERYRESULT_PATTERN_PACKAGE_NAME_ELEMENT))

-				associatedPackages.put(NamingPurpose::MAPPING,

-					modelElement.packageName.append(MAPPING_PACKAGE_NAME_ELEMENT))

-			}

-			Rule case modelElement: {

-				associatedPackages.put(NamingPurpose::RULE, modelElement.packageName.append(RULES_PACKAGE_NAME_ELEMENT))

-				associatedPackages.put(NamingPurpose::JOB, modelElement.packageName.append(JOBS_PACKAGE_NAME_ELEMENT))

-			}

-		}

-		associatedPackages

-	}

-

-	def getPackageName(ModelElement modelElement) {

-		modelElement.fullyQualifiedName.skipLast(1)

-	}

-

-	def static asStrings(HashMap<NamingPurpose, QualifiedName> packageNames) {

-		packageNames.mapValues[v|v.toString]

-	}

-

-	def getAnonymousName(EventPattern element, int suffix) {

-		var packageName = element.fullyQualifiedName.skipLast(1)

-

-		return packageName.append(ANONYMOUS_PATTERN_PACKAGE_NAME_ELEMENT).append(ANONYMOUS_PATTERN_NAME + suffix)

-	}

-

-	def getFqn(Rule rule) {

-		var className = rule.fullyQualifiedName.lastSegment

-		var packageName = rule.fullyQualifiedName.skipLast(1)

-		return packageName.append(RULES_PACKAGE_NAME_ELEMENT).append(className.toFirstUpper)

-	}

-

-	def getJobClassName(Rule rule) {

-		var className = rule.fullyQualifiedName.lastSegment

-		var packageName = rule.fullyQualifiedName.skipLast(1)

-		return packageName.append(JOBS_PACKAGE_NAME_ELEMENT).append(className.toFirstUpper + JOB_SUFFIX)

-	}

-

-	def getQueryEngine2CepEngineClassFqn(QueryResultChangeEventPattern pattern) {

-		var packageName = pattern.fullyQualifiedName.skipLast(1)

-		return packageName.append(MAPPING_PACKAGE_NAME_ELEMENT).append(MAPPING_CLASS_NAME)

-	}

-

-	def getPackageFqn(EventModel model) {

-		model.fullyQualifiedName

-	}

-

-	def getFactoryFqn(EventModel model) {

-		model.fullyQualifiedName.append("CepFactory")

-	}

-

-	def isEvent(QualifiedName fqn) {

-		return fqn.toString.endsWith(EVENT_SUFFIX) || fqn.toString.endsWith(QUERYRESULT_EVENT_SUFFIX)

-	}

-

-	def isRule(QualifiedName fqn) {

-		return fqn.toString.contains(RULES_PACKAGE_NAME_ELEMENT)

-	}

-

-	def getType(QualifiedName fqn) {

-		if (fqn.toString.endsWith(EVENT_SUFFIX)) {

-			"event class"

-		} else if (fqn.toString.endsWith(QUERYRESULT_EVENT_SUFFIX)) {

-			"query result event class"

-		} else if (fqn.toString.endsWith(PATTERN_SUFFIX)) {

-			if (fqn.toString.contains(ATOMIC_PATTERN_PACKAGE_NAME_ELEMENT)) {

-				if (fqn.toString.contains(QUERYRESULT_PATTERN_PACKAGE_NAME_ELEMENT)) {

-					"atomic query result event pattern"

-				} else {

-					"atomic event pattern"

-				}

-			} else {

-				"complex event pattern"

-			}

-		} else if (fqn.toString.contains(RULES_PACKAGE_NAME_ELEMENT)) {

-			"rule"

-		}

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2004-2014, Istvan David, Istvan Rath and Daniel Varro
+ * 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
+ * 
+ * Contributors:
+ * Istvan David - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.viatra.cep.vepl.jvmmodel
+
+import com.google.inject.Inject
+import java.util.HashMap
+import org.eclipse.viatra.cep.vepl.vepl.AtomicEventPattern
+import org.eclipse.viatra.cep.vepl.vepl.ComplexEventPattern
+import org.eclipse.viatra.cep.vepl.vepl.EventModel
+import org.eclipse.viatra.cep.vepl.vepl.EventPattern
+import org.eclipse.viatra.cep.vepl.vepl.ModelElement
+import org.eclipse.viatra.cep.vepl.vepl.QueryResultChangeEventPattern
+import org.eclipse.viatra.cep.vepl.vepl.Rule
+import org.eclipse.viatra.cep.vepl.vepl.Trait
+import org.eclipse.xtext.naming.IQualifiedNameProvider
+import org.eclipse.xtext.naming.QualifiedName
+
+class NamingProvider {
+	@Inject extension IQualifiedNameProvider
+
+	public static final String TRAIT_PACKAGE_NAME_ELEMENT = "traits"
+	public static final String EVENTCLASS_PACKAGE_NAME_ELEMENT = "events"
+	public static final String QUERYRESULT_EVENTCLASS_PACKAGE_NAME_ELEMENT = "events.queryresult"
+	public static final String ATOMIC_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.atomic"
+	public static final String QUERYRESULT_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.atomic.queryresult"
+	public static final String COMPLEX_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.complex"
+	public static final String ANONYMOUS_PATTERN_PACKAGE_NAME_ELEMENT = "patterns.complex.anonymous"
+	public static final String RULES_PACKAGE_NAME_ELEMENT = "rules"
+	public static final String JOBS_PACKAGE_NAME_ELEMENT = "jobs"
+	public static final String MAPPING_PACKAGE_NAME_ELEMENT = "mapping"
+
+	public static final String MAPPING_CLASS_NAME = "QueryEngine2ViatraCep"
+	private static final String ANONYMOUS_PATTERN_NAME = "_AnonymousPattern_"
+	private static final String EVENT_SUFFIX = "_Event"
+	private static final String QUERYRESULT_EVENT_SUFFIX = "_QueryResultEvent"
+	private static final String PATTERN_SUFFIX = "_Pattern"
+	private static final String JOB_SUFFIX = "_Job"
+
+	def getTraitInterfaceFqn(ModelElement element) {
+		val className = element.fullyQualifiedName.lastSegment
+		element.packageNames.get(NamingPurpose::TRAIT).append(className.toFirstUpper)
+	}
+
+	def getTraitSpecificationFqn(ModelElement element) {
+		val className = element.fullyQualifiedName.lastSegment
+		element.packageNames.get(NamingPurpose::TRAIT).append(className.toFirstUpper + "Specification")
+	}
+
+	def getClassFqn(ModelElement element) {
+		val className = element.fullyQualifiedName.lastSegment
+		element.packageNames.get(NamingPurpose::EVENT).append(className.toFirstUpper + EVENT_SUFFIX)
+	}
+
+	def getPatternFqn(ModelElement element) {
+		val className = element.fullyQualifiedName.lastSegment
+		element.packageNames.get(NamingPurpose::PATTERN).append(className.toFirstUpper + PATTERN_SUFFIX)
+	}
+
+	enum NamingPurpose {
+		TRAIT,
+		EVENT,
+		PATTERN,
+		RULE,
+		JOB,
+		MAPPING
+	}
+
+	def getPackageNames(ModelElement modelElement) {
+		val associatedPackages = <NamingPurpose, QualifiedName>newHashMap()
+
+		switch modelElement {
+			Trait case modelElement: {
+				associatedPackages.put(
+					NamingPurpose::TRAIT,
+					modelElement.packageName.append(TRAIT_PACKAGE_NAME_ELEMENT)
+				)
+			}
+			AtomicEventPattern case modelElement: {
+				associatedPackages.put(NamingPurpose::EVENT,
+					modelElement.packageName.append(EVENTCLASS_PACKAGE_NAME_ELEMENT))
+				associatedPackages.put(NamingPurpose::PATTERN,
+					modelElement.packageName.append(ATOMIC_PATTERN_PACKAGE_NAME_ELEMENT))
+			}
+			ComplexEventPattern case modelElement: {
+				associatedPackages.put(NamingPurpose::PATTERN,
+					modelElement.packageName.append(COMPLEX_PATTERN_PACKAGE_NAME_ELEMENT))
+			}
+			QueryResultChangeEventPattern case modelElement: {
+				associatedPackages.put(NamingPurpose::EVENT,
+					modelElement.packageName.append(QUERYRESULT_EVENTCLASS_PACKAGE_NAME_ELEMENT))
+				associatedPackages.put(NamingPurpose::PATTERN,
+					modelElement.packageName.append(QUERYRESULT_PATTERN_PACKAGE_NAME_ELEMENT))
+				associatedPackages.put(NamingPurpose::MAPPING,
+					modelElement.packageName.append(MAPPING_PACKAGE_NAME_ELEMENT))
+			}
+			Rule case modelElement: {
+				associatedPackages.put(NamingPurpose::RULE, modelElement.packageName.append(RULES_PACKAGE_NAME_ELEMENT))
+				associatedPackages.put(NamingPurpose::JOB, modelElement.packageName.append(JOBS_PACKAGE_NAME_ELEMENT))
+			}
+		}
+		associatedPackages
+	}
+
+	def getPackageName(ModelElement modelElement) {
+		modelElement.fullyQualifiedName.skipLast(1)
+	}
+
+	def static asStrings(HashMap<NamingPurpose, QualifiedName> packageNames) {
+		packageNames.mapValues[v|v.toString]
+	}
+
+	def getAnonymousName(EventPattern element, int suffix) {
+		var packageName = element.fullyQualifiedName.skipLast(1)
+
+		return packageName.append(ANONYMOUS_PATTERN_PACKAGE_NAME_ELEMENT).append(ANONYMOUS_PATTERN_NAME + suffix)
+	}
+
+	def getFqn(Rule rule) {
+		var className = rule.fullyQualifiedName.lastSegment
+		var packageName = rule.fullyQualifiedName.skipLast(1)
+		return packageName.append(RULES_PACKAGE_NAME_ELEMENT).append(className.toFirstUpper)
+	}
+
+	def getJobClassName(Rule rule) {
+		var className = rule.fullyQualifiedName.lastSegment
+		var packageName = rule.fullyQualifiedName.skipLast(1)
+		return packageName.append(JOBS_PACKAGE_NAME_ELEMENT).append(className.toFirstUpper + JOB_SUFFIX)
+	}
+
+	def getQueryEngine2CepEngineClassFqn(QueryResultChangeEventPattern pattern) {
+		var packageName = pattern.fullyQualifiedName.skipLast(1)
+		return packageName.append(MAPPING_PACKAGE_NAME_ELEMENT).append(MAPPING_CLASS_NAME)
+	}
+
+	def getPackageFqn(EventModel model) {
+		model.fullyQualifiedName
+	}
+
+	def getFactoryFqn(EventModel model) {
+		model.fullyQualifiedName.append("CepFactory")
+	}
+
+	def isEvent(QualifiedName fqn) {
+		return fqn.toString.endsWith(EVENT_SUFFIX) || fqn.toString.endsWith(QUERYRESULT_EVENT_SUFFIX)
+	}
+
+	def isRule(QualifiedName fqn) {
+	    return fqn.skipLast(1).toString.endsWith(RULES_PACKAGE_NAME_ELEMENT)
+	}
+
+	def getType(QualifiedName fqn) {
+		if (fqn.toString.endsWith(EVENT_SUFFIX)) {
+			"event class"
+		} else if (fqn.toString.endsWith(QUERYRESULT_EVENT_SUFFIX)) {
+			"query result event class"
+		} else if (fqn.toString.endsWith(PATTERN_SUFFIX)) {
+			if (fqn.toString.contains(ATOMIC_PATTERN_PACKAGE_NAME_ELEMENT)) {
+				if (fqn.toString.contains(QUERYRESULT_PATTERN_PACKAGE_NAME_ELEMENT)) {
+					"atomic query result event pattern"
+				} else {
+					"atomic event pattern"
+				}
+			} else {
+				"complex event pattern"
+			}
+		} else if (fqn.skipLast(1).toString.contains(RULES_PACKAGE_NAME_ELEMENT)) {
+			"rule"
+		}
+	}
+
+}