Allow Spring configRoot to be null

PalladioSimulator · Dec 13, 2023 · 25b5012 · 25b5012
1 parent cdf816b
commit 25b5012
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...analyzer.rules.impl/src/org/palladiosimulator/somox/analyzer/rules/impl/SpringRules.xtend b/...analyzer.rules.impl/src/org/palladiosimulator/somox/analyzer/rules/impl/SpringRules.xtend
@@ -54,9 +54,15 @@ class SpringRules implements Rule {
 
 		var applicationName = SpringHelper.getFromYamlOrProperties("spring.application.name", bootstrapYaml,
 			applicationProperties)
-		val projectConfigYaml = yamlMappers.get(
-			SpringHelper.findFile(yamlMappers.keySet, configRoot.resolve("src/main/resources/shared"),
-				Set.of(applicationName + ".yaml", applicationName + ".yml")))
+		if (applicationName === null) {
+			applicationName = "UNKNOWN-spring-application"
+		}
+
+		val projectConfigYaml = configRoot === null
+				? null
+				: yamlMappers.get(
+				SpringHelper.findFile(yamlMappers.keySet, configRoot.resolve("src/main/resources/shared"),
+					Set.of(applicationName + ".yaml", applicationName + ".yml")))
 		val contextPathOption = Optional.ofNullable(projectConfigYaml).flatMap[x|x.apply("server.servlet.context-path")]
 		var contextPath = contextPathOption.orElse("/")
 

diff --git a/...yzer.rules.impl/src/org/palladiosimulator/somox/analyzer/rules/impl/SpringZuulRules.xtend b/...yzer.rules.impl/src/org/palladiosimulator/somox/analyzer/rules/impl/SpringZuulRules.xtend
@@ -36,6 +36,10 @@ class SpringZuulRules implements Rule {
 
 		val projectRoot = SpringHelper.findProjectRoot(path, poms)
 		val configRoot = SpringHelper.findConfigRoot(poms)
+
+		if (configRoot === null) {
+			return
+		}
 
 		var routeMap = blackboard.getPartition(RULE_ID) as Map<Path, List<GatewayRoute>>
 		if (routeMap === null) {