Merge remote changes

WDAqua · Jan 16, 2024 · f6dd5c0 · f6dd5c0
2 parents e1baaec + 60743b1
commit f6dd5c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/..._component-template/src/main/java/eu/wdaqua/qanary/component/QanaryServiceController.java b/..._component-template/src/main/java/eu/wdaqua/qanary/component/QanaryServiceController.java
@@ -135,7 +135,7 @@ public String showDescriptionOnGetRequestOnRoot(HttpServletResponse response, Mo
     		String sessionDataValue = env.getProperty(name, "This text is shown as the property " + name + " is not defined (e.g., in application.properties).");
 	    	session.setAttribute(sessionDataName, sessionDataValue);
     		logger.info("session | {} -> {}={}", name, sessionDataName, session.getAttribute(sessionDataName));
-		}
+	}
 
     	Map<String,String> envImportantPropertyNameValue = new HashMap<>();
     	envImportantPropertyNameValue.put("component_description_url", QanaryConfiguration.description);
@@ -157,16 +157,16 @@ public String showDescriptionOnGetRequestOnRoot(HttpServletResponse response, Mo
         envImportantPropertyNameValue.put("componentImplementationVendor", extendingComponent.getPackage().getSpecificationVendor());
 
     } catch (Exception e) {
-        logger.debug("No class implementing QanaryComponent could be found during runtime!");
-        logger.debug(e.getMessage());
+        logger.warn("No class implementing QanaryComponent could be found during runtime!");
+        logger.warn(e.getMessage());
     }
 
     	for (Map.Entry<String, String> entry : envImportantPropertyNameValue.entrySet()) {
-			String key = entry.getKey();
-			String val = entry.getValue();
+		String key = entry.getKey();
+		String val = entry.getValue();
 	    	session.setAttribute(key, val);
     		logger.info("session | {}={}", key, session.getAttribute(key));
-		}
+	}
 
     	return QanaryConfiguration.description_file;
     }

diff --git a/qanary_component-template/src/main/resources/templates/description.html b/qanary_component-template/src/main/resources/templates/description.html
@@ -20,7 +20,7 @@
 </head>
 <body>
 	<h1>Qanary component: <span th:text=${session.spring_application_name} th:unless="${session == null}" style="font-style: italic"></span><span th:unless="${session == null}">, v<span th:text=${session.componentImplementationVersion} th:unless="${session.componentImplementationVersion == null}" ></span></span></h1>
-	<h2>(<span th:unless="${session == null}"><span th:text=${session.ImplementationTitle}></span> v<span th:text=${session.ImplementationVersion} th:unless="${session.ImplementationVersion == null}" ></span></span>)</h2>
+	<h2>(<span th:unless="${session == null}">based on <span th:text=${session.ImplementationTitle}></span> v<span th:text=${session.ImplementationVersion} th:unless="${session.ImplementationVersion == null}" ></span></span>)</h2>
     <p th:text=${session.spring_application_description} th:unless="${session == null}"/>
     <p>Given the current configuration, this component should connect to a Qanary system at <a th:text="${session.spring_boot_admin_url}" th:href="${session.spring_boot_admin_url}"></a>.</p>
     <p>API docs (OpenAPI/Swagger) are available at <a th:text="${session.springdoc_swagger_ui_path}" th:href="${session.springdoc_swagger_ui_path}" th:unless="${session == null}"></a>.</p>