Skip to content

Commit

Permalink
refactor(openapi): move OpenAPI Schema from openapi to openapi.v3._0_0
Browse files Browse the repository at this point in the history 
#185
  • Loading branch information
@Pakisan
Pakisan committed Apr 20, 2024
1 parent 2fbcbf9 commit 5138ac3
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 33 deletions.
2 changes: 1 addition & 1 deletion ...com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAdditionalPropertiesDeserializer.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asyncapi.v3.jackson.schema.openapi;

import com.asyncapi.v3.schema.openapi.OpenAPISchema;
import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.ObjectCodec;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/asyncapi/v3/jackson/schema/openapi/OpenAPISchemaAnyValueDeserializer.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asyncapi.v3.jackson.schema.openapi;

import com.asyncapi.v3.jackson.schema.SchemaAnyValueDeserializer;
import com.asyncapi.v3.schema.openapi.OpenAPISchema;
import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema;

/**
* @author Pavel Bodiachevskii
Expand Down
2 changes: 1 addition & 1 deletion asyncapi-core/src/main/java/com/asyncapi/v3/schema/multiformat/OpenAPIFormatSchema.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asyncapi.v3.schema.multiformat;

import com.asyncapi.v3.schema.AsyncAPISchema;
import com.asyncapi.v3.schema.openapi.OpenAPISchema;
import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
Expand Down
10 changes: 5 additions & 5 deletions ...capi/v3/schema/openapi/OpenAPISchema.java → ...schema/openapi/v3/_0_0/OpenAPISchema.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.asyncapi.v3.schema.openapi;
package com.asyncapi.v3.schema.openapi.v3._0_0;

import com.asyncapi.v3.jackson.schema.openapi.OpenAPISchemaAdditionalPropertiesDeserializer;
import com.asyncapi.v3.jackson.schema.openapi.OpenAPISchemaAnyValueDeserializer;
import com.asyncapi.v3.schema.openapi.properties.Discriminator;
import com.asyncapi.v3.schema.openapi.properties.Extensions;
import com.asyncapi.v3.schema.openapi.properties.ExternalDocumentation;
import com.asyncapi.v3.schema.openapi.properties.XML;
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.Discriminator;
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.Extensions;
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.ExternalDocumentation;
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.XML;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import lombok.*;
Expand Down
2 changes: 1 addition & 1 deletion ...ema/openapi/properties/Discriminator.java → ...api/v3/_0_0/properties/Discriminator.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asyncapi.v3.schema.openapi.properties;
package com.asyncapi.v3.schema.openapi.v3._0_0.properties;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
Expand Down
2 changes: 1 addition & 1 deletion ...schema/openapi/properties/Extensions.java → ...penapi/v3/_0_0/properties/Extensions.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asyncapi.v3.schema.openapi.properties;
package com.asyncapi.v3.schema.openapi.v3._0_0.properties;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
Expand Down
2 changes: 1 addition & 1 deletion ...api/properties/ExternalDocumentation.java → ...0_0/properties/ExternalDocumentation.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asyncapi.v3.schema.openapi.properties;
package com.asyncapi.v3.schema.openapi.v3._0_0.properties;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
Expand Down
2 changes: 1 addition & 1 deletion ...api/v3/schema/openapi/properties/XML.java → ...chema/openapi/v3/_0_0/properties/XML.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asyncapi.v3.schema.openapi.properties;
package com.asyncapi.v3.schema.openapi.v3._0_0.properties;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
Expand Down
2 changes: 1 addition & 1 deletion asyncapi-core/src/test/kotlin/com/asyncapi/v3/schema/SchemaProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.asyncapi.v3.schema

import com.asyncapi.v3.schema.multiformat.AsyncAPIFormatSchema
import com.asyncapi.v3.schema.multiformat.JsonFormatSchema
import com.asyncapi.v3.schema.openapi.OpenAPISchema
import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema

interface SchemaProvider {

Expand Down
2 changes: 1 addition & 1 deletion ...c/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_0Test.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asyncapi.v3.schema.multiformat.openapi

import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema
import com.asyncapi.v3.schema.openapi.SchemaTest
import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest
import org.junit.jupiter.api.extension.ExtensionContext
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments
Expand Down
4 changes: 1 addition & 3 deletions ...c/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_1Test.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.asyncapi.v3.schema.multiformat.openapi

import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema
import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test.JsonFormat
import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test.YamlFormat
import com.asyncapi.v3.schema.openapi.SchemaTest
import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest
import org.junit.jupiter.api.extension.ExtensionContext
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments
Expand Down
4 changes: 1 addition & 3 deletions ...c/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_2Test.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.asyncapi.v3.schema.multiformat.openapi

import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema
import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test.JsonFormat
import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test.YamlFormat
import com.asyncapi.v3.schema.openapi.SchemaTest
import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest
import org.junit.jupiter.api.extension.ExtensionContext
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments
Expand Down
4 changes: 1 addition & 3 deletions ...c/test/kotlin/com/asyncapi/v3/schema/multiformat/openapi/OpenAPIFormatSchemaV3_0_3Test.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.asyncapi.v3.schema.multiformat.openapi

import com.asyncapi.v3.schema.multiformat.OpenAPIFormatSchema
import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test.JsonFormat
import com.asyncapi.v3.schema.multiformat.openapi.OpenAPIFormatSchemaV3_0_0Test.YamlFormat
import com.asyncapi.v3.schema.openapi.SchemaTest
import com.asyncapi.v3.schema.openapi.v3._0_0.SchemaTest
import org.junit.jupiter.api.extension.ExtensionContext
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments
Expand Down
4 changes: 2 additions & 2 deletions ...pi/v3/schema/openapi/OpenAPISchemaTest.kt → ...hema/openapi/v3/_0_0/OpenAPISchemaTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.asyncapi.v3.schema.openapi
package com.asyncapi.v3.schema.openapi.v3._0_0

import com.asyncapi.v3.ClasspathUtils
import com.asyncapi.v3.schema.SchemaProvider
import com.asyncapi.v3.schema.openapi.properties.*
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.*
import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.databind.ObjectMapper
import org.junit.jupiter.api.Assertions
Expand Down
8 changes: 4 additions & 4 deletions .../asyncapi/v3/schema/openapi/SchemaTest.kt → ...i/v3/schema/openapi/v3/_0_0/SchemaTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.asyncapi.v3.schema.openapi
package com.asyncapi.v3.schema.openapi.v3._0_0

import com.asyncapi.v3.schema.SchemaProvider
import com.asyncapi.v3.schema.openapi.properties.Discriminator
import com.asyncapi.v3.schema.openapi.properties.ExternalDocumentation
import com.asyncapi.v3.schema.openapi.properties.XML
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.Discriminator
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.ExternalDocumentation
import com.asyncapi.v3.schema.openapi.v3._0_0.properties.XML
import java.math.BigDecimal

class SchemaTest: SchemaProvider {
Expand Down
4 changes: 2 additions & 2 deletions ...properties/ExampleEnumDefaultArrayTest.kt → ...properties/ExampleEnumDefaultArrayTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asyncapi.v3.schema.openapi.properties
package com.asyncapi.v3.schema.openapi.v3._0_0.properties

import com.asyncapi.v3.schema.SchemaProvider
import com.asyncapi.v3.schema.openapi.OpenAPISchema
import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema

class ExampleEnumDefaultArrayTest: SchemaProvider {

Expand Down
4 changes: 2 additions & 2 deletions .../properties/ExampleEnumDefaultNullTest.kt → .../properties/ExampleEnumDefaultNullTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asyncapi.v3.schema.openapi.properties
package com.asyncapi.v3.schema.openapi.v3._0_0.properties

import com.asyncapi.v3.schema.SchemaProvider
import com.asyncapi.v3.schema.openapi.OpenAPISchema
import com.asyncapi.v3.schema.openapi.v3._0_0.OpenAPISchema

class ExampleEnumDefaultNullTest: SchemaProvider {

Expand Down

0 comments on commit 5138ac3

Please sign in to comment.