Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions api-project-component-v0/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@
</goals>
<configuration>
<generatorName>spring</generatorName>
<output>${project.basedir}</output>
<output>${project.basedir}/target/generated-sources/openapi</output>
<library>spring-boot</library>
<inputSpec>${project.basedir}/openapi/api-project-component-v0.yaml</inputSpec>
<apiPackage>org.opendevstack.apiservice.project.api</apiPackage>
<modelPackage>org.opendevstack.apiservice.project.model</modelPackage>
<invokerPackage>org.opendevstack.apiservice.project</invokerPackage>
<apiPackage>org.opendevstack.apiservice.projectcomponent.client.api</apiPackage>
<modelPackage>org.opendevstack.apiservice.projectcomponent.client.model</modelPackage>
<invokerPackage>org.opendevstack.apiservice.projectcomponent.client</invokerPackage>
<skipOverwrite>false</skipOverwrite>
<generateApiTests>false</generateApiTests>
<generateModelTests>false</generateModelTests>
Expand All @@ -168,12 +168,12 @@
</goals>
<configuration>
<generatorName>spring</generatorName>
<output>${project.basedir}</output>
<output>${project.basedir}/target/generated-sources/openapi</output>
<library>spring-boot</library>
<inputSpec>${project.basedir}/openapi/api-project-component-v0-internal.yaml</inputSpec>
<apiPackage>org.opendevstack.apiservice.project.api</apiPackage>
<modelPackage>org.opendevstack.apiservice.project.model</modelPackage>
<invokerPackage>org.opendevstack.apiservice.project</invokerPackage>
<apiPackage>org.opendevstack.apiservice.projectcomponent.client.api</apiPackage>
<modelPackage>org.opendevstack.apiservice.projectcomponent.client.model</modelPackage>
<invokerPackage>org.opendevstack.apiservice.projectcomponent.client</invokerPackage>
<skipOverwrite>false</skipOverwrite>
<generateApiTests>false</generateApiTests>
<generateModelTests>false</generateModelTests>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.config;
package org.opendevstack.apiservice.projectcomponent.config;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opendevstack.apiservice.project.controller;
package org.opendevstack.apiservice.projectcomponent.controller;

import org.opendevstack.apiservice.project.exception.ComponentErrorKey;
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentErrorKey;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
import org.springframework.http.HttpStatus;

public final class ComponentsResponseFactory {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.opendevstack.apiservice.project.controller;
package org.opendevstack.apiservice.projectcomponent.controller;

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.opendevstack.apiservice.project.api.ProjectComponentsApi;
import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.project.facade.ComponentsFacade;
import org.opendevstack.apiservice.project.mapper.ComponentResponseMapper;
import org.opendevstack.apiservice.project.model.Component;
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
import org.opendevstack.apiservice.projectcomponent.client.api.ProjectComponentsApi;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
import org.opendevstack.apiservice.projectcomponent.mapper.ComponentResponseMapper;
import org.opendevstack.apiservice.projectcomponent.client.model.Component;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.opendevstack.apiservice.project.controller;
package org.opendevstack.apiservice.projectcomponent.controller;

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.opendevstack.apiservice.project.api.ProjectComponentsInternalApi;
import org.opendevstack.apiservice.project.facade.ComponentsFacade;
import org.opendevstack.apiservice.projectcomponent.client.api.ProjectComponentsInternalApi;
import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package org.opendevstack.apiservice.project.controller.advice;
package org.opendevstack.apiservice.projectcomponent.controller.advice;

import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.opendevstack.apiservice.project.controller.ComponentsResponseFactory;
import org.opendevstack.apiservice.project.controller.ProjectComponentsController;
import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
import org.opendevstack.apiservice.project.exception.ComponentBadRequestException;
import org.opendevstack.apiservice.project.exception.ComponentCreationException;
import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
import org.opendevstack.apiservice.project.exception.ComponentErrorKey;
import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
import org.opendevstack.apiservice.project.exception.ComponentRetrievalException;
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
import org.opendevstack.apiservice.projectcomponent.controller.ComponentsResponseFactory;
import org.opendevstack.apiservice.projectcomponent.controller.ProjectComponentsController;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentBadRequestException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentErrorKey;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentRegistrationException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentRetrievalException;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.HttpMessageNotReadableException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class CatalogItemNotFoundException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentAlreadyExistsException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentBadRequestException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentCreationException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentDeletionException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public enum ComponentErrorKey {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentErrorMessage {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentNotFoundException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.opendevstack.apiservice.project.exception;
public class ComponentRegistrationException extends RuntimeException {
public ComponentRegistrationException(String message) {
super(message);
}
public ComponentRegistrationException(String message, Exception e) {
super(message, e);
}
}
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentRegistrationException extends RuntimeException {

public ComponentRegistrationException(String message) {
super(message);
}

public ComponentRegistrationException(String message, Exception e) {
super(message, e);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.exception;
package org.opendevstack.apiservice.projectcomponent.exception;

public class ComponentRetrievalException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.facade;
package org.opendevstack.apiservice.projectcomponent.facade;

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -9,17 +9,17 @@
import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisioningStatusUpdateRequestAllOfParameters;
import org.opendevstack.apiservice.externalservice.marketplace.service.CatalogItemOperations;
import org.opendevstack.apiservice.externalservice.marketplace.service.MarketplaceService;
import org.opendevstack.apiservice.project.exception.CatalogItemNotFoundException;
import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
import org.opendevstack.apiservice.project.exception.ComponentBadRequestException;
import org.opendevstack.apiservice.project.exception.ComponentCreationException;
import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
import org.opendevstack.apiservice.project.exception.ComponentRetrievalException;
import org.opendevstack.apiservice.project.mapper.MarketplaceMapper;
import org.opendevstack.apiservice.project.model.Component;
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
import org.opendevstack.apiservice.projectcomponent.exception.CatalogItemNotFoundException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentBadRequestException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentRegistrationException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentRetrievalException;
import org.opendevstack.apiservice.projectcomponent.mapper.MarketplaceMapper;
import org.opendevstack.apiservice.projectcomponent.client.model.Component;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
import org.springframework.stereotype.Service;
import org.springframework.web.client.HttpClientErrorException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opendevstack.apiservice.project.mapper;
package org.opendevstack.apiservice.projectcomponent.mapper;

import org.mapstruct.Mapper;
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.mapper;
package org.opendevstack.apiservice.projectcomponent.mapper;

import org.mapstruct.Mapper;
import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException;
Expand All @@ -8,9 +8,9 @@
import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProjectComponentExtendedInfo;
import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisionActionParameter;
import org.opendevstack.apiservice.externalservice.marketplace.client.model.ProvisioningStatusUpdateRequestAllOfParameters;
import org.opendevstack.apiservice.project.model.Component;
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
import org.opendevstack.apiservice.project.model.EnvironmentsDTO;
import org.opendevstack.apiservice.projectcomponent.client.model.Component;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
import org.opendevstack.apiservice.projectcomponent.client.model.EnvironmentsDTO;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.opendevstack.apiservice.project.mapper;
package org.opendevstack.apiservice.projectcomponent.mapper;

import org.opendevstack.apiservice.project.model.ComponentsStatusDTO;
import org.opendevstack.apiservice.projectcomponent.client.model.ComponentsStatusDTO;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opendevstack.apiservice.project.controller;
package org.opendevstack.apiservice.projectcomponent.controller;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -7,12 +7,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.opendevstack.apiservice.externalservice.marketplace.exception.MarketplaceException;
import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.project.facade.ComponentsFacade;
import org.opendevstack.apiservice.project.mapper.ComponentResponseMapper;
import org.opendevstack.apiservice.project.model.Component;
import org.opendevstack.apiservice.project.model.CreateComponentRequest;
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
import org.opendevstack.apiservice.projectcomponent.mapper.ComponentResponseMapper;
import org.opendevstack.apiservice.projectcomponent.client.model.Component;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentRequest;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

Expand All @@ -23,8 +23,8 @@
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestComponent;
import static org.opendevstack.apiservice.project.util.TestObjectsBuilder.buildTestCreateComponentRequest;
import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestComponent;
import static org.opendevstack.apiservice.projectcomponent.util.TestObjectsBuilder.buildTestCreateComponentRequest;

class ProjectComponentsControllerTest {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.opendevstack.apiservice.project.controller;
package org.opendevstack.apiservice.projectcomponent.controller;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.opendevstack.apiservice.project.exception.ComponentDeletionException;
import org.opendevstack.apiservice.project.facade.ComponentsFacade;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentDeletionException;
import org.opendevstack.apiservice.projectcomponent.facade.ComponentsFacade;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package org.opendevstack.apiservice.project.controller.advice;
package org.opendevstack.apiservice.projectcomponent.controller.advice;

import jakarta.servlet.http.HttpServletRequest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.opendevstack.apiservice.project.exception.ComponentAlreadyExistsException;
import org.opendevstack.apiservice.project.exception.ComponentCreationException;
import org.opendevstack.apiservice.project.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.project.exception.ComponentRegistrationException;
import org.opendevstack.apiservice.project.model.CreateComponentResponse;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentAlreadyExistsException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentCreationException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentNotFoundException;
import org.opendevstack.apiservice.projectcomponent.exception.ComponentRegistrationException;
import org.opendevstack.apiservice.projectcomponent.client.model.CreateComponentResponse;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down
Loading
Loading