refactoring

MaibornWolff · May 29, 2019 · f17e850 · f17e850
1 parent 011f0a3
commit f17e850
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/sources/acmi-analyzer/src/collector/java-source/AnnotationAnalyzer.service.ts b/sources/acmi-analyzer/src/collector/java-source/AnnotationAnalyzer.service.ts
@@ -86,27 +86,16 @@ function transformEachElement(system: System, service: MicroService, fileContent
     const elementValues = getAllPatternMatches<string>(elementRegExp, annotationBody,
       (matchArray: RegExpExecArray) => matchArray[1])
 
-    elementValues.forEach(value => transformElementValue(system, service, fileContent,
+    elementValues.forEach(value => transformElementValueExpression(system, service, fileContent,
       elementMapping, value))
   }
 }
 
-function transformElementValue(system: System, service: MicroService, fileContent: string,
-  elementMapping: ElementMapping, elementValue: string) {
-
-  let nodeName = ''
-  if (elementValue) {
-    if (elementValue.startsWith('"')) {
-      nodeName = elementValue.substr(1, elementValue.length - 2)
-    } else {
-      // TODO: skip if defined in comment
-      const assignmentPattern = elementValue + '\\s*=\\s*"([^"]*)"'
-      const assignmentRegExp = new RegExp(assignmentPattern, 'g')
-      const assignmentValues = getAllPatternMatches<string>(assignmentRegExp, fileContent,
-        (matchArray: RegExpExecArray) => matchArray[1])
-      nodeName = assignmentValues[0]
-    }
-  }
+function transformElementValueExpression(system: System, service: MicroService, fileContent: string,
+  elementMapping: ElementMapping, valueExpression: string) {
+
+  const nodeName = getActualValue(valueExpression, fileContent)
+  if (!nodeName) return
 
   // TODO: better use system.addOrExtendNamedNode() but without type annotations
   const payload = { name: nodeName }
@@ -124,6 +113,21 @@ function transformElementValue(system: System, service: MicroService, fileConten
     // TODO: log error
   }
 }
+
+function getActualValue(valueExpression: string, fileContent: string): string {
+  if (valueExpression.startsWith('"')) {
+    return valueExpression.substr(1, valueExpression.length - 2)
+  } else {
+    // search variable assignment
+    // TODO: skip if defined in comment
+    const assignmentPattern = valueExpression + '\\s*=\\s*"([^"]*)"'
+    const assignmentRegExp = new RegExp(assignmentPattern, 'g')
+    const assignmentValues = getAllPatternMatches<string>(assignmentRegExp, fileContent,
+      (matchArray: RegExpExecArray) => matchArray[1])
+    return assignmentValues.length > 0 ? assignmentValues[0] : undefined
+  }
+}
+
 function getAllPatternMatches<MatchType>(pattern: RegExp, content: string,
   matchTransformer: ((matchArray: RegExpExecArray) => MatchType)): MatchType[] {
   const allMatches: MatchType[] = []