summaryrefslogtreecommitdiffstats
path: root/gui-server
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2022-09-29 08:27:12 +0000
committerGerrit Code Review <gerrit@onap.org>2022-09-29 08:27:12 +0000
commit0b581c7d7d06b4f0715797b43e17d8c8f8f4263a (patch)
tree6d3f4e144b4b3898214284fdb79afe45d48e890b /gui-server
parentde2ad7a4ea79a0d23c225cdd2c1ff7150b3fa728 (diff)
parentea764f9f6dfefd2706ff668a88fb9b8f4a75ede6 (diff)
Merge "Amend GUI to work directly towards ACM runtime"
Diffstat (limited to 'gui-server')
-rw-r--r--gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java1
-rw-r--r--gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java2
-rw-r--r--gui-server/src/test/resources/application_http.yaml19
3 files changed, 21 insertions, 1 deletions
diff --git a/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java b/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java
index 3d7b49f..a4b92ef 100644
--- a/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java
+++ b/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java
@@ -33,7 +33,6 @@ public class ApexEditorRestController {
/**
* Strip /apex-editor prefix from Apex Editor rest calls.
*/
- @SuppressWarnings("java:S3752") // Suppress warning about RequestMapping without HTTP method.
@RequestMapping("/**")
public ModelAndView forwardApexEditorRest(ModelMap model, HttpServletRequest request) {
String targetUrl = request.getRequestURI().replaceFirst("^/apex-editor", "");
diff --git a/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java b/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java
index a4aabb8..6df8318 100644
--- a/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java
+++ b/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java
@@ -81,6 +81,8 @@ public class KeyStoreHelper {
* Exception class for KeyStoreHelper methods.
*/
public static class CouldNotLoadCertificateException extends java.lang.Exception {
+ private static final long serialVersionUID = 4858081258043045085L;
+
protected CouldNotLoadCertificateException(String errorMessage) {
super(errorMessage);
}
diff --git a/gui-server/src/test/resources/application_http.yaml b/gui-server/src/test/resources/application_http.yaml
new file mode 100644
index 0000000..24f3e8e
--- /dev/null
+++ b/gui-server/src/test/resources/application_http.yaml
@@ -0,0 +1,19 @@
+server:
+ port: 2443
+ ssl:
+ enabled: false
+
+clamp:
+ url: http://localhost:30258
+ disable-ssl-validation: true
+ disable-ssl-hostname-check: true
+
+apex-editor:
+ upload-url:
+ upload-userid:
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: health, metrics, prometheus