Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean: Remove legacy flat models #211

Merged
merged 1 commit into from
Oct 2, 2023
Merged
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
69 changes: 0 additions & 69 deletions src/main/resources/interface-specification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1575,41 +1575,6 @@ components:
- certified
- declared
- verified
FlatEService:
type: object
required:
- id
- producerId
- producerName
- name
- description
- certifiedAttributes
properties:
id:
type: string
format: uuid
producerId:
type: string
format: uuid
producerName:
type: string
name:
type: string
version:
type: string
description:
type: string
state:
$ref: '#/components/schemas/EServiceDescriptorState'
descriptorId:
type: string
agreement:
$ref: '#/components/schemas/FlatAgreement'
certifiedAttributes:
description: 'contains a flat version of the certified attribute identifiers of this e-service'
type: array
items:
$ref: '#/components/schemas/FlatAttributes'
EServiceTechnology:
type: string
description: API Technology
Expand All @@ -1631,40 +1596,6 @@ components:
enum:
- INTERFACE
- DOCUMENT
FlatEServices:
type: array
items:
$ref: '#/components/schemas/FlatEService'
FlatAgreement:
type: object
properties:
id:
type: string
format: uuid
state:
$ref: '#/components/schemas/AgreementState'
required:
- id
- state
FlatAttributes:
type: object
properties:
attributes:
type: array
items:
type: array
items:
$ref: '#/components/schemas/FlatAttribute'
required:
- attributes
FlatAttribute:
type: object
properties:
id:
type: string
format: uuid
required:
- id
AgreementState:
type: string
description: Agreement State
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ package object impl extends SprayJsonSupport with DefaultJsonProtocol {
)
implicit val riskAnalysisSeedFormat: RootJsonFormat[EServiceRiskAnalysisSeed] = jsonFormat2(EServiceRiskAnalysisSeed)

implicit val flatAgreementFormat: RootJsonFormat[FlatAgreement] = jsonFormat2(FlatAgreement)
implicit val flatAttributeFormat: RootJsonFormat[FlatAttribute] = jsonFormat1(FlatAttribute)
implicit val flatAttributesFormat: RootJsonFormat[FlatAttributes] = jsonFormat1(FlatAttributes)
implicit val flatEServiceFormat: RootJsonFormat[FlatEService] = jsonFormat10(FlatEService)

implicit val eServiceConsumerFormat: RootJsonFormat[EServiceConsumer] = jsonFormat5(EServiceConsumer)
implicit val eServiceConsumersFormat: RootJsonFormat[EServiceConsumers] = jsonFormat2(EServiceConsumers)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ object CatalogProcessErrors {
s"Descriptor $descriptorId has a not valid status for this operation $descriptorStatus"
)

final case object FlattenedEServicesRetrievalError
extends ComponentError("0005", s"Unexpected error while retrieving flattened E-Services")

final case class DescriptorDocumentNotFound(eServiceId: String, descriptorId: String, documentId: String)
extends ComponentError(
"0006",
Expand Down
Loading