import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.HttpStatusCodeException;
import com.fasterxml.jackson.databind.JsonNode;
* gateway.</blockquote>
*/
@RestController
-@RequestMapping(value = DashboardConstants.ENDPOINT_PREFIX + "/xapp/ac", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(value = AcXappController.CONTROLLER_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
public class AcXappController {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ // Publish paths in constants so tests are easy to write
+ public static final String CONTROLLER_PATH = DashboardConstants.ENDPOINT_PREFIX + "/xapp/ac";
+ // Endpoints
+ public static final String ADMCTRL_METHOD = "/admctrl";
+ public static final String VERSION_METHOD = DashboardConstants.VERSION_METHOD;
+
// A "control" is an element in the XApp descriptor
private static final String AC_CONTROL_NAME = "admission_control_policy";
}
@ApiOperation(value = "Gets the A1 client library MANIFEST.MF property Implementation-Version.", response = SuccessTransport.class)
- @RequestMapping(value = DashboardConstants.VERSION_PATH, method = RequestMethod.GET)
+ @GetMapping(VERSION_METHOD)
public SuccessTransport getA1MediatorClientVersion() {
return new SuccessTransport(200, DashboardApplication.getImplementationVersion(A1MediatorApi.class));
}
* GET policy is not supported at present by A1 Mediator! Always returns 501.
*/
@ApiOperation(value = "Gets the admission control policy for AC xApp via the A1 Mediator")
- @RequestMapping(value = "admctrl", method = RequestMethod.GET)
+ @GetMapping(ADMCTRL_METHOD)
public Object getAdmissionControlPolicy(HttpServletResponse response) {
logger.debug("getAdmissionControlPolicy");
response.setStatus(HttpServletResponse.SC_NOT_IMPLEMENTED);
* fields are defined in the ACAdmissionIntervalControl Typescript interface.
*/
@ApiOperation(value = "Sets the admission control policy for AC xApp via the A1 Mediator")
- @RequestMapping(value = "catime", method = RequestMethod.PUT)
- public Object setAdmissionControlPolicy(
- @ApiParam(value = "Admission control policy") @RequestBody JsonNode acPolicy, //
+ @PutMapping(ADMCTRL_METHOD)
+ public void setAdmissionControlPolicy(@ApiParam(value = "Admission control policy") @RequestBody JsonNode acPolicy, //
HttpServletResponse response) {
logger.debug("setAdmissionControlPolicy {}", acPolicy);
- try {
- a1MediatorApi.a1ControllerPutHandler(AC_CONTROL_NAME, acPolicy);
- response.setStatus(a1MediatorApi.getApiClient().getStatusCode().value());
- return null;
- } catch (HttpStatusCodeException ex) {
- logger.warn("setAdmissionControlPolicy failed: {}", ex.toString());
- return ResponseEntity.status(HttpServletResponse.SC_BAD_GATEWAY).body(ex.getResponseBodyAsString());
- }
+ a1MediatorApi.a1ControllerPutHandler(AC_CONTROL_NAME, acPolicy);
+ response.setStatus(a1MediatorApi.getApiClient().getStatusCode().value());
}
}