@Override
protected String buildDefaultBeanName(final BeanDefinition definition) {
- if (definition.getBeanClassName() != null) {
- return ClassUtils.getShortName(definition.getBeanClassName());
+ final String beanClassName = definition.getBeanClassName();
+ if (beanClassName != null) {
+ return ClassUtils.getShortName(beanClassName);
}
logger.warn("Bean class name is not specified...");
return null;
import javax.ws.rs.core.MediaType;
import org.onap.so.cnfm.lcm.lifecycle.AsLcmOperationOccurrenceManager;
import org.onap.so.cnfm.lcm.model.AsLcmOpOcc;
-import org.onap.so.cnfm.lcm.model.ErrorDetails;
+import org.onap.so.cnfm.lcm.rest.exceptions.AsLcmOpOccStatusNotFoundException;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@GetMapping(value = "/as_lcm_op_occs/{asLcmOpOccId}",
produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public ResponseEntity<?> getOperationStatus(@PathVariable("asLcmOpOccId") final String asLcmOpOccId) {
+ public ResponseEntity<AsLcmOpOcc> getOperationStatus(@PathVariable("asLcmOpOccId") final String asLcmOpOccId) {
logger.info("Received request to retrieve operation status for asLcmOpOccId: {}", asLcmOpOccId);
final Optional<AsLcmOpOcc> optionalAsLcmOpOccs =
asLcmOperationOccurrenceManager.getAsLcmOperationOccurrence(asLcmOpOccId);
final String errorMessage = "Unable to retrieve operation occurrence status for asLcmOpOccId: " + asLcmOpOccId;
logger.error(errorMessage);
- return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorDetails().detail(errorMessage));
+ throw new AsLcmOpOccStatusNotFoundException(errorMessage);
}
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.cnfm.lcm.rest.exceptions;
+
+import org.onap.so.cnfm.lcm.bpmn.flows.exceptions.AsRequestProcessingException;
+import org.onap.so.cnfm.lcm.model.ErrorDetails;
+import org.onap.so.cnfm.lcm.rest.AsLifecycleManagementController;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+@ControllerAdvice(assignableTypes = AsLifecycleManagementController.class)
+public class AsLcmControllerExceptionHandler {
+
+ @ExceptionHandler(AsRequestProcessingException.class)
+ public ResponseEntity<ErrorDetails> handleAsRequestProcessingException(
+ final AsRequestProcessingException asRequestProcessingException) {
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+ .body(getErrorDetails(asRequestProcessingException));
+ }
+
+ @ExceptionHandler(Exception.class)
+ public ResponseEntity<ErrorDetails> handleAsRequestProcessingException(final Exception exception) {
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(
+ new ErrorDetails().status(HttpStatus.INTERNAL_SERVER_ERROR.value()).detail(exception.getMessage()));
+ }
+
+ private ErrorDetails getErrorDetails(AsRequestProcessingException asRequestProcessingException) {
+ if (asRequestProcessingException.getErrorDetails() != null) {
+ return asRequestProcessingException.getErrorDetails();
+ }
+ return new ErrorDetails().status(HttpStatus.INTERNAL_SERVER_ERROR.value())
+ .detail(asRequestProcessingException.getMessage());
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.cnfm.lcm.rest.exceptions;
+
+import org.onap.so.cnfm.lcm.model.ErrorDetails;
+import org.onap.so.cnfm.lcm.rest.AsLcmOperationOccurrencesController;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+@ControllerAdvice(assignableTypes = AsLcmOperationOccurrencesController.class)
+public class AsLcmOpOccControllerExceptionHandler {
+
+ @ExceptionHandler(AsLcmOpOccStatusNotFoundException.class)
+ public ResponseEntity<ErrorDetails> handleAsLcmOpOccStatusNotFoundException(
+ final AsLcmOpOccStatusNotFoundException exception) {
+ return ResponseEntity.status(HttpStatus.NOT_FOUND)
+ .body(new ErrorDetails().status(HttpStatus.NOT_FOUND.value()).detail(exception.getMessage()));
+ }
+
+ @ExceptionHandler(Exception.class)
+ public ResponseEntity<ErrorDetails> handleAsLcmOpOccException(final Exception exception) {
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(
+ new ErrorDetails().status(HttpStatus.INTERNAL_SERVER_ERROR.value()).detail(exception.getMessage()));
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2023 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.cnfm.lcm.rest.exceptions;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR)
+public class AsLcmOpOccStatusNotFoundException extends RuntimeException {
+
+ private static final long serialVersionUID = 1706676614379799737L;
+
+ public AsLcmOpOccStatusNotFoundException(String message) {
+ super(message);
+ }
+
+ @Override
+ public synchronized Throwable fillInStackTrace() {
+ return this;
+ }
+
+}
import org.onap.so.cnfm.lcm.database.beans.State;
import org.onap.so.cnfm.lcm.database.service.DatabaseServiceProvider;
import org.onap.so.cnfm.lcm.model.AsLcmOpOcc;
+import org.onap.so.cnfm.lcm.model.ErrorDetails;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
@ActiveProfiles("test")
public class AsLcmOperationOccurrencesControllerTest {
+ private static final String RANDOM_UUID = UUID.randomUUID().toString();
+
private static final String AS_LCM_OP_OCCS = "/as_lcm_op_occs/";
@LocalServerPort
assertNotNull(responseEntity.getBody());
}
+ @Test
+ public void testGetOperationStatus_invalidAsLcmOpOccId_returnsErrorDetails() {
+ final String baseUrl = getAsLcmBaseUrl() + AS_LCM_OP_OCCS + "123";
+ final HttpEntity<?> request = new HttpEntity<>(new HttpHeaders());
+ final ResponseEntity<ErrorDetails> responseEntity =
+ testRestTemplate.exchange(baseUrl, HttpMethod.GET, request, ErrorDetails.class);
+ assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
+ assertTrue(responseEntity.hasBody());
+ assertNotNull(responseEntity.getBody());
+ }
private String getAsLcmBaseUrl() {
return "http://localhost:" + port + Constants.AS_LIFE_CYCLE_MANAGEMENT_BASE_URL;
}
-
private String addDummyAsLcmOpOccToDatabase() {
final LocalDateTime now = LocalDateTime.now();
- final AsInst asInst = new AsInst().name("name").asdId(UUID.randomUUID().toString())
- .status(State.NOT_INSTANTIATED).asdInvariantId(UUID.randomUUID().toString()).statusUpdatedTime(now)
- .asApplicationName("asApplicationName").asApplicationVersion("asApplicationVersion")
- .asProvider("asProvider").serviceInstanceId(UUID.randomUUID().toString())
+ final AsInst asInst = new AsInst().name("name").asdId(RANDOM_UUID).status(State.NOT_INSTANTIATED)
+ .asdInvariantId(RANDOM_UUID).statusUpdatedTime(now).asApplicationName("asApplicationName")
+ .asApplicationVersion("asApplicationVersion").asProvider("asProvider").serviceInstanceId(RANDOM_UUID)
.serviceInstanceName("serviceInstanceName").cloudOwner("cloudOwner").cloudRegion("cloudRegion")
.tenantId("tenantId");
Code Review / so / adapters / so-cnf-adapter.git / commitdiff