diff options
| author |   Toine Siebelink <toine.siebelink@est.tech> | 2021-01-22 15:32:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-01-22 15:32:19 +0000 |
| commit | 5fa9a9ebb6459755a4267066e23f9671b9fac5b9 (patch) | |
| tree | 200dce73493b07663d8f330bce5eb2aa48fc3e33 /cps-rest/src/main/java/org | |
| parent | d45aacaf71afbd352909f02876b86e62744fcae8 (diff) | |
| parent | 708fd6615c97756eade415a6295b1fb663e4d3ef (diff) | |
Merge "Enable log level management via actuator, /cps/api path to use for REST controllers only only"
Diffstat (limited to 'cps-rest/src/main/java/org')
| -rw-r--r-- | cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java | 2 | ||||
| -rw-r--r-- | cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java index 08020eca2a..1b6f56a211 100644 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/AdminRestController.java @@ -33,10 +33,12 @@ import org.onap.cps.spi.model.SchemaSet; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @RestController +@RequestMapping("${rest.api.base-path}") public class AdminRestController implements CpsAdminApi { @Autowired diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java index fcb8ddc1c1..2ecbd4f544 100644 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java @@ -25,10 +25,12 @@ import org.onap.cps.api.CpsAdminService; import org.onap.cps.rest.api.CpsDataApi; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @RestController +@RequestMapping("${rest.api.base-path}") public class DataRestController implements CpsDataApi { @Autowired |