diff --git a/README.md b/README.md index 9f804609b..48346f606 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,9 @@ try { This project uses Java Service Provider Inteface (SPI) so additional extensions can be added. -To build your own extension, you simply need to create a `src/main/resources/META-INF/services/com.qdesrame.openapi.diff.core.compare.ExtensionDiff` file with the full classname of your implementation. Your class must also implement the `com.qdesrame.openapi.diff.core.compare.ExtensionDiff` interface. Then, including your library with the `openapi-diff` module will cause it to be triggered automatically. +To build your own extension, you simply need to create a `src/main/resources/META-INF/services/org.openapitools.openapidiff.core.compare.ExtensionDiff` file with the full classname of your implementation. +Your class must also implement the `org.openapitools.openapidiff.core.compare.ExtensionDiff` interface. +Then, including your library with the `openapi-diff` module will cause it to be triggered automatically. # Examples diff --git a/cli/pom.xml b/cli/pom.xml index c6c287709..5bed4b12b 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -52,7 +52,7 @@ all - com.qdesrame.openapi.diff.cli.Main + org.openapitools.openapidiff.cli.Main diff --git a/cli/src/main/java/com/qdesrame/openapi/diff/cli/Main.java b/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java similarity index 95% rename from cli/src/main/java/com/qdesrame/openapi/diff/cli/Main.java rename to cli/src/main/java/org/openapitools/openapidiff/cli/Main.java index f84517c4e..7367ee0b4 100644 --- a/cli/src/main/java/com/qdesrame/openapi/diff/cli/Main.java +++ b/cli/src/main/java/org/openapitools/openapidiff/cli/Main.java @@ -1,10 +1,5 @@ -package com.qdesrame.openapi.diff.cli; +package org.openapitools.openapidiff.cli; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.output.ConsoleRender; -import com.qdesrame.openapi.diff.core.output.HtmlRender; -import com.qdesrame.openapi.diff.core.output.MarkdownRender; import java.io.File; import java.io.IOException; import org.apache.commons.cli.CommandLine; @@ -18,6 +13,11 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.log4j.Level; import org.apache.log4j.LogManager; +import org.openapitools.openapidiff.core.OpenApiCompare; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.output.ConsoleRender; +import org.openapitools.openapidiff.core.output.HtmlRender; +import org.openapitools.openapidiff.core.output.MarkdownRender; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/output/Render.java b/core/src/main/java/com/qdesrame/openapi/diff/core/output/Render.java deleted file mode 100644 index 9e2368480..000000000 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/output/Render.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.qdesrame.openapi.diff.core.output; - -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; - -public interface Render { - - String render(ChangedOpenApi diff); -} diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/OpenApiCompare.java b/core/src/main/java/org/openapitools/openapidiff/core/OpenApiCompare.java similarity index 95% rename from core/src/main/java/com/qdesrame/openapi/diff/core/OpenApiCompare.java rename to core/src/main/java/org/openapitools/openapidiff/core/OpenApiCompare.java index a48f5d7dd..db5a24887 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/OpenApiCompare.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/OpenApiCompare.java @@ -1,13 +1,13 @@ -package com.qdesrame.openapi.diff.core; +package org.openapitools.openapidiff.core; -import com.qdesrame.openapi.diff.core.compare.OpenApiDiff; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.parser.core.models.AuthorizationValue; import io.swagger.v3.parser.core.models.ParseOptions; import java.io.File; import java.util.List; +import org.openapitools.openapidiff.core.compare.OpenApiDiff; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; public class OpenApiCompare { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ApiResponseDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ApiResponseDiff.java similarity index 82% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ApiResponseDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ApiResponseDiff.java index b64913a23..bc96c02fb 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ApiResponseDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ApiResponseDiff.java @@ -1,16 +1,16 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedApiResponse; -import com.qdesrame.openapi.diff.core.model.ChangedResponse; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedApiResponse; +import org.openapitools.openapidiff.core.model.ChangedResponse; +import org.openapitools.openapidiff.core.model.DiffContext; /** Created by adarsh.sharma on 04/01/18. */ public class ApiResponseDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/CacheKey.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/CacheKey.java similarity index 91% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/CacheKey.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/CacheKey.java index 8300270e8..254338e9e 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/CacheKey.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/CacheKey.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import com.qdesrame.openapi.diff.core.model.DiffContext; import java.util.Objects; +import org.openapitools.openapidiff.core.model.DiffContext; public final class CacheKey { private final String left; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/Comparable.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/Comparable.java similarity index 58% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/Comparable.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/Comparable.java index 34133e0fc..bfcba8fac 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/Comparable.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/Comparable.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; public interface Comparable { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ContentDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ContentDiff.java similarity index 80% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ContentDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ContentDiff.java index ecaff7781..77b7df302 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ContentDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ContentDiff.java @@ -1,14 +1,14 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isUnchanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isUnchanged; -import com.qdesrame.openapi.diff.core.model.ChangedContent; -import com.qdesrame.openapi.diff.core.model.ChangedMediaType; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.media.Content; import io.swagger.v3.oas.models.media.MediaType; import java.util.*; +import org.openapitools.openapidiff.core.model.ChangedContent; +import org.openapitools.openapidiff.core.model.ChangedMediaType; +import org.openapitools.openapidiff.core.model.DiffContext; public class ContentDiff implements Comparable { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ExtensionDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ExtensionDiff.java similarity index 58% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ExtensionDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ExtensionDiff.java index 485d965d0..89305997d 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ExtensionDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ExtensionDiff.java @@ -1,8 +1,8 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import com.qdesrame.openapi.diff.core.model.Change; -import com.qdesrame.openapi.diff.core.model.Changed; -import com.qdesrame.openapi.diff.core.model.DiffContext; +import org.openapitools.openapidiff.core.model.Change; +import org.openapitools.openapidiff.core.model.Changed; +import org.openapitools.openapidiff.core.model.DiffContext; public interface ExtensionDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ExtensionsDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ExtensionsDiff.java similarity index 87% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ExtensionsDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ExtensionsDiff.java index 7a27c0862..dbf92972c 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ExtensionsDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ExtensionsDiff.java @@ -1,14 +1,14 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; -import static com.qdesrame.openapi.diff.core.utils.Copy.copyMap; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.Copy.copyMap; -import com.qdesrame.openapi.diff.core.model.Change; -import com.qdesrame.openapi.diff.core.model.Changed; -import com.qdesrame.openapi.diff.core.model.ChangedExtensions; -import com.qdesrame.openapi.diff.core.model.DiffContext; import java.util.*; import java.util.function.Function; +import org.openapitools.openapidiff.core.model.Change; +import org.openapitools.openapidiff.core.model.Changed; +import org.openapitools.openapidiff.core.model.ChangedExtensions; +import org.openapitools.openapidiff.core.model.DiffContext; public class ExtensionsDiff { private final OpenApiDiff openApiDiff; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/HeaderDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/HeaderDiff.java similarity index 88% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/HeaderDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/HeaderDiff.java index b7e391033..85f130aad 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/HeaderDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/HeaderDiff.java @@ -1,16 +1,16 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedHeader; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.headers.Header; import java.util.HashSet; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedHeader; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; /** Created by adarsh.sharma on 28/12/17. */ public class HeaderDiff extends ReferenceDiffCache { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/HeadersDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/HeadersDiff.java similarity index 79% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/HeadersDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/HeadersDiff.java index e78d4eba5..09d7a94ef 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/HeadersDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/HeadersDiff.java @@ -1,15 +1,15 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedHeader; -import com.qdesrame.openapi.diff.core.model.ChangedHeaders; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.headers.Header; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedHeader; +import org.openapitools.openapidiff.core.model.ChangedHeaders; +import org.openapitools.openapidiff.core.model.DiffContext; /** Created by adarsh.sharma on 28/12/17. */ public class HeadersDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ListDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ListDiff.java similarity index 87% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ListDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ListDiff.java index db794db4f..433adecbc 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ListDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ListDiff.java @@ -1,6 +1,6 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import com.qdesrame.openapi.diff.core.model.ChangedList; +import org.openapitools.openapidiff.core.model.ChangedList; public class ListDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/MapKeyDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/MapKeyDiff.java similarity index 96% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/MapKeyDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/MapKeyDiff.java index d63de1278..592703920 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/MapKeyDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/MapKeyDiff.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/MetadataDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/MetadataDiff.java similarity index 75% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/MetadataDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/MetadataDiff.java index 684a8442b..175241399 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/MetadataDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/MetadataDiff.java @@ -1,11 +1,11 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedMetadata; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.Components; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedMetadata; +import org.openapitools.openapidiff.core.model.DiffContext; public class MetadataDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OAuthFlowDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/OAuthFlowDiff.java similarity index 86% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/OAuthFlowDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/OAuthFlowDiff.java index 264419bb6..3925cd3fd 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OAuthFlowDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/OAuthFlowDiff.java @@ -1,13 +1,13 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; import static java.util.Optional.ofNullable; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedOAuthFlow; import io.swagger.v3.oas.models.security.OAuthFlow; import java.util.Map; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedOAuthFlow; /** Created by adarsh.sharma on 12/01/18. */ public class OAuthFlowDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OAuthFlowsDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/OAuthFlowsDiff.java similarity index 89% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/OAuthFlowsDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/OAuthFlowsDiff.java index 49c6ce7fe..c90bf7cbd 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OAuthFlowsDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/OAuthFlowsDiff.java @@ -1,12 +1,12 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; import static java.util.Optional.ofNullable; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedOAuthFlows; import io.swagger.v3.oas.models.security.OAuthFlows; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedOAuthFlows; /** Created by adarsh.sharma on 12/01/18. */ public class OAuthFlowsDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OpenApiDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/OpenApiDiff.java similarity index 93% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/OpenApiDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/OpenApiDiff.java index 10a30eca4..7b110769d 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OpenApiDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/OpenApiDiff.java @@ -1,14 +1,7 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.compare.PathsDiff.valOrEmpty; +import static org.openapitools.openapidiff.core.compare.PathsDiff.valOrEmpty; -import com.qdesrame.openapi.diff.core.model.ChangedExtensions; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.model.ChangedOperation; -import com.qdesrame.openapi.diff.core.model.ChangedPath; -import com.qdesrame.openapi.diff.core.model.ChangedPaths; -import com.qdesrame.openapi.diff.core.model.Endpoint; -import com.qdesrame.openapi.diff.core.utils.EndpointUtils; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.security.SecurityRequirement; @@ -17,6 +10,13 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import org.openapitools.openapidiff.core.model.ChangedExtensions; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.model.ChangedOperation; +import org.openapitools.openapidiff.core.model.ChangedPath; +import org.openapitools.openapidiff.core.model.ChangedPaths; +import org.openapitools.openapidiff.core.model.Endpoint; +import org.openapitools.openapidiff.core.utils.EndpointUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OperationDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/OperationDiff.java similarity index 90% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/OperationDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/OperationDiff.java index 9ad0ba6e0..0655438f9 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/OperationDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/OperationDiff.java @@ -1,15 +1,15 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedOperation; -import com.qdesrame.openapi.diff.core.model.ChangedParameters; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.parameters.Parameter; import java.util.List; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedOperation; +import org.openapitools.openapidiff.core.model.ChangedParameters; +import org.openapitools.openapidiff.core.model.DiffContext; /** Created by adarsh.sharma on 04/01/18. */ public class OperationDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ParameterDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ParameterDiff.java similarity index 89% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ParameterDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ParameterDiff.java index 14c4fca0e..880008543 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ParameterDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ParameterDiff.java @@ -1,16 +1,16 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedParameter; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.parameters.Parameter; import java.util.HashSet; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedParameter; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; public class ParameterDiff extends ReferenceDiffCache { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ParametersDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java similarity index 86% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ParametersDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java index 98097ce68..aa260d9e8 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ParametersDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java @@ -1,17 +1,17 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedParameters; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.parameters.Parameter; import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedParameters; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; /** * compare two parameter diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/PathDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/PathDiff.java similarity index 86% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/PathDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/PathDiff.java index 5017dac7f..5ddab55d7 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/PathDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/PathDiff.java @@ -1,14 +1,14 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedPath; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import java.util.List; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedPath; +import org.openapitools.openapidiff.core.model.DiffContext; public class PathDiff { private OpenApiDiff openApiDiff; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/PathsDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/PathsDiff.java similarity index 91% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/PathsDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/PathsDiff.java index 2f0a25632..a921a19da 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/PathsDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/PathsDiff.java @@ -1,14 +1,14 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedPaths; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.Paths; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.openapitools.openapidiff.core.model.ChangedPaths; +import org.openapitools.openapidiff.core.model.DiffContext; public class PathsDiff { private static final String REGEX_PATH = "\\{([^/]+)\\}"; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ReferenceDiffCache.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ReferenceDiffCache.java similarity index 93% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ReferenceDiffCache.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ReferenceDiffCache.java index a8ff0eac6..3e9f233df 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ReferenceDiffCache.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ReferenceDiffCache.java @@ -1,10 +1,10 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import com.qdesrame.openapi.diff.core.model.DiffContext; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.DiffContext; /** Created by adarsh.sharma on 07/01/18. */ public abstract class ReferenceDiffCache { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/RequestBodyDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/RequestBodyDiff.java similarity index 89% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/RequestBodyDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/RequestBodyDiff.java index fb9be20fe..9d793f74b 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/RequestBodyDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/RequestBodyDiff.java @@ -1,17 +1,17 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; import static java.util.Optional.ofNullable; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedRequestBody; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.media.Content; import io.swagger.v3.oas.models.parameters.RequestBody; import java.util.HashSet; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedRequestBody; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; /** Created by adarsh.sharma on 28/12/17. */ public class RequestBodyDiff extends ReferenceDiffCache { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ResponseDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ResponseDiff.java similarity index 85% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/ResponseDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/ResponseDiff.java index 4a87865ba..a4c63a1d6 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/ResponseDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ResponseDiff.java @@ -1,15 +1,15 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedResponse; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.responses.ApiResponse; import java.util.HashSet; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedResponse; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; /** Created by adarsh.sharma on 28/12/17. */ public class ResponseDiff extends ReferenceDiffCache { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SchemaDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/SchemaDiff.java similarity index 95% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/SchemaDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/SchemaDiff.java index f88c1bf54..51fbac8cd 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SchemaDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/SchemaDiff.java @@ -1,14 +1,7 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; import static java.util.Optional.ofNullable; -import com.qdesrame.openapi.diff.core.compare.schemadiffresult.ArraySchemaDiffResult; -import com.qdesrame.openapi.diff.core.compare.schemadiffresult.ComposedSchemaDiffResult; -import com.qdesrame.openapi.diff.core.compare.schemadiffresult.SchemaDiffResult; -import com.qdesrame.openapi.diff.core.model.ChangedSchema; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.media.ArraySchema; @@ -23,6 +16,13 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.compare.schemadiffresult.ArraySchemaDiffResult; +import org.openapitools.openapidiff.core.compare.schemadiffresult.ComposedSchemaDiffResult; +import org.openapitools.openapidiff.core.compare.schemadiffresult.SchemaDiffResult; +import org.openapitools.openapidiff.core.model.ChangedSchema; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; public class SchemaDiff extends ReferenceDiffCache { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityDiffInfo.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityDiffInfo.java similarity index 96% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityDiffInfo.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityDiffInfo.java index c0c82461a..9e0ef6a8c 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityDiffInfo.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityDiffInfo.java @@ -1,10 +1,10 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import com.qdesrame.openapi.diff.core.model.ChangedList; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; import java.util.List; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedList; public class SecurityDiffInfo { private String ref; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityRequirementDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityRequirementDiff.java similarity index 91% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityRequirementDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityRequirementDiff.java index 74607ccd9..7d62850bc 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityRequirementDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityRequirementDiff.java @@ -1,14 +1,14 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedSecurityRequirement; -import com.qdesrame.openapi.diff.core.model.ChangedSecurityScheme; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; import java.util.*; +import org.openapitools.openapidiff.core.model.ChangedSecurityRequirement; +import org.openapitools.openapidiff.core.model.ChangedSecurityScheme; +import org.openapitools.openapidiff.core.model.DiffContext; /** Created by adarsh.sharma on 07/01/18. */ public class SecurityRequirementDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityRequirementsDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityRequirementsDiff.java similarity index 90% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityRequirementsDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityRequirementsDiff.java index cdb5ae31d..ea06a45bb 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecurityRequirementsDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecurityRequirementsDiff.java @@ -1,12 +1,7 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedSecurityRequirement; -import com.qdesrame.openapi.diff.core.model.ChangedSecurityRequirements; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; @@ -17,6 +12,11 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import org.openapitools.openapidiff.core.model.ChangedSecurityRequirement; +import org.openapitools.openapidiff.core.model.ChangedSecurityRequirements; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; /** Created by adarsh.sharma on 07/01/18. */ public class SecurityRequirementsDiff { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecuritySchemeDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecuritySchemeDiff.java similarity index 93% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecuritySchemeDiff.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/SecuritySchemeDiff.java index e4270c530..7cde1608e 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/SecuritySchemeDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/SecuritySchemeDiff.java @@ -1,16 +1,16 @@ -package com.qdesrame.openapi.diff.core.compare; +package org.openapitools.openapidiff.core.compare; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.model.ChangedSecurityScheme; -import com.qdesrame.openapi.diff.core.model.ChangedSecuritySchemeScopes; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.security.SecurityScheme; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.model.ChangedSecurityScheme; +import org.openapitools.openapidiff.core.model.ChangedSecuritySchemeScopes; +import org.openapitools.openapidiff.core.model.DiffContext; /** Created by adarsh.sharma on 11/01/18. */ public class SecuritySchemeDiff extends ReferenceDiffCache { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/ArraySchemaDiffResult.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/ArraySchemaDiffResult.java similarity index 81% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/ArraySchemaDiffResult.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/ArraySchemaDiffResult.java index 34bdb7e34..cefa18e3f 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/ArraySchemaDiffResult.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/ArraySchemaDiffResult.java @@ -1,13 +1,13 @@ -package com.qdesrame.openapi.diff.core.compare.schemadiffresult; +package org.openapitools.openapidiff.core.compare.schemadiffresult; -import com.qdesrame.openapi.diff.core.compare.OpenApiDiff; -import com.qdesrame.openapi.diff.core.model.ChangedSchema; -import com.qdesrame.openapi.diff.core.model.DiffContext; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import java.util.HashSet; import java.util.Optional; +import org.openapitools.openapidiff.core.compare.OpenApiDiff; +import org.openapitools.openapidiff.core.model.ChangedSchema; +import org.openapitools.openapidiff.core.model.DiffContext; /** Created by adarsh.sharma on 18/12/17. */ public class ArraySchemaDiffResult extends SchemaDiffResult { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/ComposedSchemaDiffResult.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/ComposedSchemaDiffResult.java similarity index 90% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/ComposedSchemaDiffResult.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/ComposedSchemaDiffResult.java index 163581570..7eb90b6d8 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/ComposedSchemaDiffResult.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/ComposedSchemaDiffResult.java @@ -1,12 +1,5 @@ -package com.qdesrame.openapi.diff.core.compare.schemadiffresult; +package org.openapitools.openapidiff.core.compare.schemadiffresult; -import com.qdesrame.openapi.diff.core.compare.MapKeyDiff; -import com.qdesrame.openapi.diff.core.compare.OpenApiDiff; -import com.qdesrame.openapi.diff.core.model.ChangedOneOfSchema; -import com.qdesrame.openapi.diff.core.model.ChangedSchema; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Discriminator; @@ -17,6 +10,13 @@ import java.util.Optional; import java.util.stream.Collectors; import org.apache.commons.collections4.CollectionUtils; +import org.openapitools.openapidiff.core.compare.MapKeyDiff; +import org.openapitools.openapidiff.core.compare.OpenApiDiff; +import org.openapitools.openapidiff.core.model.ChangedOneOfSchema; +import org.openapitools.openapidiff.core.model.ChangedSchema; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; /** Created by adarsh.sharma on 20/12/17. */ public class ComposedSchemaDiffResult extends SchemaDiffResult { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/SchemaDiffResult.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/SchemaDiffResult.java similarity index 91% rename from core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/SchemaDiffResult.java rename to core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/SchemaDiffResult.java index 164e6697e..1daf97097 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/compare/schemadiffresult/SchemaDiffResult.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/schemadiffresult/SchemaDiffResult.java @@ -1,18 +1,18 @@ -package com.qdesrame.openapi.diff.core.compare.schemadiffresult; +package org.openapitools.openapidiff.core.compare.schemadiffresult; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isChanged; import static java.util.Optional.ofNullable; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isChanged; -import com.qdesrame.openapi.diff.core.compare.ListDiff; -import com.qdesrame.openapi.diff.core.compare.MapKeyDiff; -import com.qdesrame.openapi.diff.core.compare.OpenApiDiff; -import com.qdesrame.openapi.diff.core.model.Change; -import com.qdesrame.openapi.diff.core.model.ChangedSchema; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.model.schema.*; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.media.Schema; import java.util.*; +import org.openapitools.openapidiff.core.compare.ListDiff; +import org.openapitools.openapidiff.core.compare.MapKeyDiff; +import org.openapitools.openapidiff.core.compare.OpenApiDiff; +import org.openapitools.openapidiff.core.model.Change; +import org.openapitools.openapidiff.core.model.ChangedSchema; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.model.schema.*; public class SchemaDiffResult { protected ChangedSchema changedSchema; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/Change.java b/core/src/main/java/org/openapitools/openapidiff/core/model/Change.java similarity index 96% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/Change.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/Change.java index adfb64802..604aaffe9 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/Change.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/Change.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import java.util.Objects; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/Changed.java b/core/src/main/java/org/openapitools/openapidiff/core/model/Changed.java similarity index 91% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/Changed.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/Changed.java index bc5bc828f..3e6cdb3e7 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/Changed.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/Changed.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import java.util.Optional; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedApiResponse.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedApiResponse.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedApiResponse.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedApiResponse.java index 970319960..e496f7a71 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedApiResponse.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedApiResponse.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedContent.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedContent.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedContent.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedContent.java index 676030869..5bc6ddf2a 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedContent.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedContent.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.media.Content; import io.swagger.v3.oas.models.media.MediaType; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedExtensions.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedExtensions.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedExtensions.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedExtensions.java index d678f82bb..cde3b1511 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedExtensions.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedExtensions.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import java.util.*; import java.util.stream.Collectors; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedHeader.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedHeader.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedHeader.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedHeader.java index b1573fb9b..8ec56568f 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedHeader.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedHeader.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.headers.Header; import java.util.Arrays; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedHeaders.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedHeaders.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedHeaders.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedHeaders.java index 4b125d958..451e94f1e 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedHeaders.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedHeaders.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.headers.Header; import java.util.ArrayList; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedList.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedList.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedList.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedList.java index e891718ef..57367235c 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedList.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedList.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedMediaType.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedMediaType.java similarity index 97% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedMediaType.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedMediaType.java index 1f635d6cc..7136dea04 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedMediaType.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedMediaType.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.media.Schema; import java.util.Collections; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedMetadata.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedMetadata.java similarity index 95% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedMetadata.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedMetadata.java index 3df729a2b..facbed19d 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedMetadata.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedMetadata.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import java.util.Objects; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOAuthFlow.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOAuthFlow.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOAuthFlow.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOAuthFlow.java index 8ced9ed81..5409d1d99 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOAuthFlow.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOAuthFlow.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.security.OAuthFlow; import java.util.Collections; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOAuthFlows.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOAuthFlows.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOAuthFlows.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOAuthFlows.java index 5f521a45c..b0e6fc22b 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOAuthFlows.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOAuthFlows.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.security.OAuthFlows; import java.util.Arrays; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOneOfSchema.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOneOfSchema.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOneOfSchema.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOneOfSchema.java index 1d5832e12..ebf07d2b7 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOneOfSchema.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOneOfSchema.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.media.Schema; import java.util.ArrayList; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOpenApi.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOpenApi.java similarity index 97% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOpenApi.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOpenApi.java index d8edcb870..99c6a387d 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOpenApi.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOpenApi.java @@ -1,11 +1,11 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; -import com.qdesrame.openapi.diff.core.utils.EndpointUtils; import io.swagger.v3.oas.models.OpenAPI; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.openapitools.openapidiff.core.utils.EndpointUtils; public class ChangedOpenApi implements ComposedChanged { private OpenAPI oldSpecOpenApi; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOperation.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOperation.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOperation.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOperation.java index 5992fd036..7af8a3a1b 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedOperation.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedOperation.java @@ -1,6 +1,6 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; -import static com.qdesrame.openapi.diff.core.model.Changed.result; +import static org.openapitools.openapidiff.core.model.Changed.result; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedParameter.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedParameter.java similarity index 99% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedParameter.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedParameter.java index a0f862b0c..998570186 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedParameter.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedParameter.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.parameters.Parameter; import java.util.Arrays; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedParameters.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedParameters.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedParameters.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedParameters.java index f113a73f6..16bb1f660 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedParameters.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedParameters.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.parameters.Parameter; import java.util.ArrayList; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedPath.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedPath.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedPath.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedPath.java index d55f7b28e..e9fa4093a 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedPath.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedPath.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedPaths.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedPaths.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedPaths.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedPaths.java index d5116a537..96af52785 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedPaths.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedPaths.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.PathItem; import java.util.*; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedRequestBody.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedRequestBody.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedRequestBody.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedRequestBody.java index 7de801ecb..83fadd407 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedRequestBody.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedRequestBody.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.parameters.RequestBody; import java.util.Arrays; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedResponse.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedResponse.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedResponse.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedResponse.java index 9704ce981..8f7755e7b 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedResponse.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedResponse.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.responses.ApiResponse; import java.util.Arrays; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSchema.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSchema.java similarity index 96% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSchema.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSchema.java index 8ed33b9f4..09a337156 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSchema.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSchema.java @@ -1,10 +1,5 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; -import com.qdesrame.openapi.diff.core.model.schema.ChangedEnum; -import com.qdesrame.openapi.diff.core.model.schema.ChangedMaxLength; -import com.qdesrame.openapi.diff.core.model.schema.ChangedReadOnly; -import com.qdesrame.openapi.diff.core.model.schema.ChangedRequired; -import com.qdesrame.openapi.diff.core.model.schema.ChangedWriteOnly; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.media.Schema; import java.util.LinkedHashMap; @@ -13,6 +8,11 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.openapitools.openapidiff.core.model.schema.ChangedEnum; +import org.openapitools.openapidiff.core.model.schema.ChangedMaxLength; +import org.openapitools.openapidiff.core.model.schema.ChangedReadOnly; +import org.openapitools.openapidiff.core.model.schema.ChangedRequired; +import org.openapitools.openapidiff.core.model.schema.ChangedWriteOnly; public class ChangedSchema implements ComposedChanged { protected DiffContext context; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityRequirement.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityRequirement.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityRequirement.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityRequirement.java index 28a94fa6b..f8e61f7dc 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityRequirement.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityRequirement.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.security.SecurityRequirement; import java.util.ArrayList; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityRequirements.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityRequirements.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityRequirements.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityRequirements.java index 2a119c2bd..d8f813801 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityRequirements.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityRequirements.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.security.SecurityRequirement; import java.util.ArrayList; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityScheme.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityScheme.java similarity index 99% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityScheme.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityScheme.java index 23d99790d..b0beb3a90 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecurityScheme.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecurityScheme.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.security.SecurityScheme; import java.util.Arrays; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecuritySchemeScopes.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecuritySchemeScopes.java similarity index 86% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecuritySchemeScopes.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecuritySchemeScopes.java index 82a216c53..314ede39d 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ChangedSecuritySchemeScopes.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ChangedSecuritySchemeScopes.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import java.util.List; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ComposedChanged.java b/core/src/main/java/org/openapitools/openapidiff/core/model/ComposedChanged.java similarity index 93% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/ComposedChanged.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/ComposedChanged.java index cd338a3f0..262a18b65 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/ComposedChanged.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/ComposedChanged.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/DiffContext.java b/core/src/main/java/org/openapitools/openapidiff/core/model/DiffContext.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/DiffContext.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/DiffContext.java index 391be8a53..02474cfdb 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/DiffContext.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/DiffContext.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.PathItem; import java.util.HashMap; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/DiffResult.java b/core/src/main/java/org/openapitools/openapidiff/core/model/DiffResult.java similarity index 95% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/DiffResult.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/DiffResult.java index ff707bfca..482a386b8 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/DiffResult.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/DiffResult.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import static java.lang.String.format; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/Endpoint.java b/core/src/main/java/org/openapitools/openapidiff/core/model/Endpoint.java similarity index 97% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/Endpoint.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/Endpoint.java index 13015c450..3358fe39a 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/Endpoint.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/Endpoint.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.model; +package org.openapitools.openapidiff.core.model; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedEnum.java b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedEnum.java similarity index 65% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedEnum.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedEnum.java index 8d5480a85..0dcd5e6e9 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedEnum.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedEnum.java @@ -1,9 +1,9 @@ -package com.qdesrame.openapi.diff.core.model.schema; +package org.openapitools.openapidiff.core.model.schema; -import com.qdesrame.openapi.diff.core.model.ChangedList; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.model.DiffResult; import java.util.List; +import org.openapitools.openapidiff.core.model.ChangedList; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.model.DiffResult; public class ChangedEnum extends ChangedList { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedMaxLength.java b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedMaxLength.java similarity index 88% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedMaxLength.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedMaxLength.java index b7e21ab56..8bb5933da 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedMaxLength.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedMaxLength.java @@ -1,9 +1,9 @@ -package com.qdesrame.openapi.diff.core.model.schema; +package org.openapitools.openapidiff.core.model.schema; -import com.qdesrame.openapi.diff.core.model.Changed; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.model.DiffResult; import java.util.Objects; +import org.openapitools.openapidiff.core.model.Changed; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.model.DiffResult; public final class ChangedMaxLength implements Changed { private final Integer oldValue; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedReadOnly.java b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedReadOnly.java similarity index 81% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedReadOnly.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedReadOnly.java index 433684ac9..25d86af8f 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedReadOnly.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedReadOnly.java @@ -1,10 +1,10 @@ -package com.qdesrame.openapi.diff.core.model.schema; +package org.openapitools.openapidiff.core.model.schema; -import com.qdesrame.openapi.diff.core.model.Changed; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.model.DiffResult; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.model.Changed; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.model.DiffResult; public class ChangedReadOnly implements Changed { private final DiffContext context; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedRequired.java b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedRequired.java similarity index 66% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedRequired.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedRequired.java index bd4756dad..d6b41f3cd 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedRequired.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedRequired.java @@ -1,9 +1,9 @@ -package com.qdesrame.openapi.diff.core.model.schema; +package org.openapitools.openapidiff.core.model.schema; -import com.qdesrame.openapi.diff.core.model.ChangedList; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.model.DiffResult; import java.util.List; +import org.openapitools.openapidiff.core.model.ChangedList; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.model.DiffResult; public class ChangedRequired extends ChangedList { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedWriteOnly.java b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedWriteOnly.java similarity index 81% rename from core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedWriteOnly.java rename to core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedWriteOnly.java index 358fb3622..91d19a644 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/model/schema/ChangedWriteOnly.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedWriteOnly.java @@ -1,10 +1,10 @@ -package com.qdesrame.openapi.diff.core.model.schema; +package org.openapitools.openapidiff.core.model.schema; -import com.qdesrame.openapi.diff.core.model.Changed; -import com.qdesrame.openapi.diff.core.model.DiffContext; -import com.qdesrame.openapi.diff.core.model.DiffResult; import java.util.Objects; import java.util.Optional; +import org.openapitools.openapidiff.core.model.Changed; +import org.openapitools.openapidiff.core.model.DiffContext; +import org.openapitools.openapidiff.core.model.DiffResult; public class ChangedWriteOnly implements Changed { private final DiffContext context; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/output/ConsoleRender.java b/core/src/main/java/org/openapitools/openapidiff/core/output/ConsoleRender.java similarity index 97% rename from core/src/main/java/com/qdesrame/openapi/diff/core/output/ConsoleRender.java rename to core/src/main/java/org/openapitools/openapidiff/core/output/ConsoleRender.java index 499dff44e..fb9255f3d 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/output/ConsoleRender.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/output/ConsoleRender.java @@ -1,10 +1,7 @@ -package com.qdesrame.openapi.diff.core.output; +package org.openapitools.openapidiff.core.output; -import static com.qdesrame.openapi.diff.core.model.Changed.result; +import static org.openapitools.openapidiff.core.model.Changed.result; -import com.qdesrame.openapi.diff.core.model.*; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; @@ -14,6 +11,9 @@ import java.util.Optional; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.lang3.StringUtils; +import org.openapitools.openapidiff.core.model.*; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; public class ConsoleRender implements Render { private static final int LINE_LENGTH = 74; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/output/HtmlRender.java b/core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/output/HtmlRender.java rename to core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java index cc585e446..6b816dbd5 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/output/HtmlRender.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java @@ -1,11 +1,8 @@ -package com.qdesrame.openapi.diff.core.output; +package org.openapitools.openapidiff.core.output; -import static com.qdesrame.openapi.diff.core.model.Changed.result; import static j2html.TagCreator.*; +import static org.openapitools.openapidiff.core.model.Changed.result; -import com.qdesrame.openapi.diff.core.model.*; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.MediaType; import io.swagger.v3.oas.models.media.Schema; @@ -15,6 +12,9 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.openapitools.openapidiff.core.model.*; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; public class HtmlRender implements Render { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/output/MarkdownRender.java b/core/src/main/java/org/openapitools/openapidiff/core/output/MarkdownRender.java similarity index 98% rename from core/src/main/java/com/qdesrame/openapi/diff/core/output/MarkdownRender.java rename to core/src/main/java/org/openapitools/openapidiff/core/output/MarkdownRender.java index 30491cb2a..e1970fda9 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/output/MarkdownRender.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/output/MarkdownRender.java @@ -1,12 +1,9 @@ -package com.qdesrame.openapi.diff.core.output; +package org.openapitools.openapidiff.core.output; -import static com.qdesrame.openapi.diff.core.model.Changed.result; -import static com.qdesrame.openapi.diff.core.utils.ChangedUtils.isUnchanged; import static java.lang.String.format; +import static org.openapitools.openapidiff.core.model.Changed.result; +import static org.openapitools.openapidiff.core.utils.ChangedUtils.isUnchanged; -import com.qdesrame.openapi.diff.core.model.*; -import com.qdesrame.openapi.diff.core.utils.RefPointer; -import com.qdesrame.openapi.diff.core.utils.RefType; import io.swagger.v3.oas.models.headers.Header; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; @@ -18,6 +15,9 @@ import java.util.Map; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.lang3.StringUtils; +import org.openapitools.openapidiff.core.model.*; +import org.openapitools.openapidiff.core.utils.RefPointer; +import org.openapitools.openapidiff.core.utils.RefType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/openapitools/openapidiff/core/output/Render.java b/core/src/main/java/org/openapitools/openapidiff/core/output/Render.java new file mode 100644 index 000000000..4a48ebcfa --- /dev/null +++ b/core/src/main/java/org/openapitools/openapidiff/core/output/Render.java @@ -0,0 +1,8 @@ +package org.openapitools.openapidiff.core.output; + +import org.openapitools.openapidiff.core.model.ChangedOpenApi; + +public interface Render { + + String render(ChangedOpenApi diff); +} diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/ChangedUtils.java b/core/src/main/java/org/openapitools/openapidiff/core/utils/ChangedUtils.java similarity index 81% rename from core/src/main/java/com/qdesrame/openapi/diff/core/utils/ChangedUtils.java rename to core/src/main/java/org/openapitools/openapidiff/core/utils/ChangedUtils.java index f392d2bea..f9bd5b7a6 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/ChangedUtils.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/utils/ChangedUtils.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.diff.core.utils; +package org.openapitools.openapidiff.core.utils; -import com.qdesrame.openapi.diff.core.model.Changed; import java.util.Optional; +import org.openapitools.openapidiff.core.model.Changed; public class ChangedUtils { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/Copy.java b/core/src/main/java/org/openapitools/openapidiff/core/utils/Copy.java similarity index 83% rename from core/src/main/java/com/qdesrame/openapi/diff/core/utils/Copy.java rename to core/src/main/java/org/openapitools/openapidiff/core/utils/Copy.java index 0704413ce..461938146 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/Copy.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/utils/Copy.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.utils; +package org.openapitools.openapidiff.core.utils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/EndpointUtils.java b/core/src/main/java/org/openapitools/openapidiff/core/utils/EndpointUtils.java similarity index 95% rename from core/src/main/java/com/qdesrame/openapi/diff/core/utils/EndpointUtils.java rename to core/src/main/java/org/openapitools/openapidiff/core/utils/EndpointUtils.java index f1b5b57ae..92a2b3143 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/EndpointUtils.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/utils/EndpointUtils.java @@ -1,12 +1,12 @@ -package com.qdesrame.openapi.diff.core.utils; +package org.openapitools.openapidiff.core.utils; -import com.qdesrame.openapi.diff.core.model.Endpoint; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import org.openapitools.openapidiff.core.model.Endpoint; /** Created by adarsh.sharma on 26/12/17. */ public class EndpointUtils { diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/RefPointer.java b/core/src/main/java/org/openapitools/openapidiff/core/utils/RefPointer.java similarity index 97% rename from core/src/main/java/com/qdesrame/openapi/diff/core/utils/RefPointer.java rename to core/src/main/java/org/openapitools/openapidiff/core/utils/RefPointer.java index 8eda2b800..7b99d29ef 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/RefPointer.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/utils/RefPointer.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.utils; +package org.openapitools.openapidiff.core.utils; import io.swagger.v3.oas.models.Components; import java.util.Map; diff --git a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/RefType.java b/core/src/main/java/org/openapitools/openapidiff/core/utils/RefType.java similarity index 87% rename from core/src/main/java/com/qdesrame/openapi/diff/core/utils/RefType.java rename to core/src/main/java/org/openapitools/openapidiff/core/utils/RefType.java index 564e309da..b9c4322b1 100644 --- a/core/src/main/java/com/qdesrame/openapi/diff/core/utils/RefType.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/utils/RefType.java @@ -1,4 +1,4 @@ -package com.qdesrame.openapi.diff.core.utils; +package org.openapitools.openapidiff.core.utils; public enum RefType { REQUEST_BODIES("requestBodies"), diff --git a/core/src/test/java/com/qdesrame/openapi/test/AddPropDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/AddPropDiffTest.java similarity index 67% rename from core/src/test/java/com/qdesrame/openapi/test/AddPropDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/AddPropDiffTest.java index 68d939664..89bc40eb8 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/AddPropDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/AddPropDiffTest.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiBackwardIncompatible; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/AddPropPutDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/AddPropPutDiffTest.java similarity index 67% rename from core/src/test/java/com/qdesrame/openapi/test/AddPropPutDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/AddPropPutDiffTest.java index 70852e888..d42d1716f 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/AddPropPutDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/AddPropPutDiffTest.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiBackwardIncompatible; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/AllOfDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/AllOfDiffTest.java similarity index 78% rename from core/src/test/java/com/qdesrame/openapi/test/AllOfDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/AllOfDiffTest.java index 5255f34d3..df646aa0b 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/AllOfDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/AllOfDiffTest.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiChangedEndpoints; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/ArrayDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/ArrayDiffTest.java similarity index 66% rename from core/src/test/java/com/qdesrame/openapi/test/ArrayDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/ArrayDiffTest.java index 56a64cd24..86515e8c4 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/ArrayDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/ArrayDiffTest.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiChangedEndpoints; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/BackwardCompatibilityTest.java b/core/src/test/java/org/openapitools/openapidiff/core/BackwardCompatibilityTest.java similarity index 85% rename from core/src/test/java/com/qdesrame/openapi/test/BackwardCompatibilityTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/BackwardCompatibilityTest.java index cb0ca2e1c..cd5a55002 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/BackwardCompatibilityTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/BackwardCompatibilityTest.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardCompatible; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiBackwardCompatible; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiBackwardIncompatible; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/ConsoleRenderTest.java b/core/src/test/java/org/openapitools/openapidiff/core/ConsoleRenderTest.java similarity index 66% rename from core/src/test/java/com/qdesrame/openapi/test/ConsoleRenderTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/ConsoleRenderTest.java index 705897c50..329fea054 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/ConsoleRenderTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/ConsoleRenderTest.java @@ -1,11 +1,10 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.output.ConsoleRender; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.output.ConsoleRender; public class ConsoleRenderTest { @Test diff --git a/core/src/test/java/com/qdesrame/openapi/test/ContentDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/ContentDiffTest.java similarity index 85% rename from core/src/test/java/com/qdesrame/openapi/test/ContentDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/ContentDiffTest.java index e0ca1c549..ac3dbd9f0 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/ContentDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/ContentDiffTest.java @@ -1,10 +1,9 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; public class ContentDiffTest { diff --git a/core/src/test/java/com/qdesrame/openapi/test/HtmlRenderTest.java b/core/src/test/java/org/openapitools/openapidiff/core/HtmlRenderTest.java similarity index 66% rename from core/src/test/java/com/qdesrame/openapi/test/HtmlRenderTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/HtmlRenderTest.java index c0b29c6e4..6273ef243 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/HtmlRenderTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/HtmlRenderTest.java @@ -1,11 +1,10 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.output.HtmlRender; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.output.HtmlRender; public class HtmlRenderTest { @Test diff --git a/core/src/test/java/com/qdesrame/openapi/test/MarkdownRenderTest.java b/core/src/test/java/org/openapitools/openapidiff/core/MarkdownRenderTest.java similarity index 66% rename from core/src/test/java/com/qdesrame/openapi/test/MarkdownRenderTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/MarkdownRenderTest.java index 54e6978f1..c92a1cd8c 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/MarkdownRenderTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/MarkdownRenderTest.java @@ -1,11 +1,10 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.output.MarkdownRender; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.output.MarkdownRender; public class MarkdownRenderTest { @Test diff --git a/core/src/test/java/com/qdesrame/openapi/test/OneOfDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/OneOfDiffTest.java similarity index 84% rename from core/src/test/java/com/qdesrame/openapi/test/OneOfDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/OneOfDiffTest.java index 16a4eb5c4..236faa717 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/OneOfDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/OneOfDiffTest.java @@ -1,8 +1,8 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiBackwardIncompatible; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiChangedEndpoints; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/OpenApiDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/OpenApiDiffTest.java similarity index 87% rename from core/src/test/java/com/qdesrame/openapi/test/OpenApiDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/OpenApiDiffTest.java index 896c38bcd..bcf96443a 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/OpenApiDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/OpenApiDiffTest.java @@ -1,18 +1,17 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; import static org.assertj.core.api.Assertions.assertThat; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.model.ChangedOperation; -import com.qdesrame.openapi.diff.core.model.Endpoint; -import com.qdesrame.openapi.diff.core.output.HtmlRender; -import com.qdesrame.openapi.diff.core.output.MarkdownRender; import java.io.FileWriter; import java.io.IOException; import java.util.List; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.model.ChangedOperation; +import org.openapitools.openapidiff.core.model.Endpoint; +import org.openapitools.openapidiff.core.output.HtmlRender; +import org.openapitools.openapidiff.core.output.MarkdownRender; public class OpenApiDiffTest { diff --git a/core/src/test/java/com/qdesrame/openapi/test/ParameterDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/ParameterDiffTest.java similarity index 73% rename from core/src/test/java/com/qdesrame/openapi/test/ParameterDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/ParameterDiffTest.java index cc054b542..1281066f6 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/ParameterDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/ParameterDiffTest.java @@ -1,6 +1,6 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiChangedEndpoints; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/PathDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/PathDiffTest.java similarity index 82% rename from core/src/test/java/com/qdesrame/openapi/test/PathDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/PathDiffTest.java index 5422f2057..71fbc938b 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/PathDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/PathDiffTest.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/RecursiveSchemaTest.java b/core/src/test/java/org/openapitools/openapidiff/core/RecursiveSchemaTest.java similarity index 68% rename from core/src/test/java/com/qdesrame/openapi/test/RecursiveSchemaTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/RecursiveSchemaTest.java index 9e70469af..5d93c61dc 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/RecursiveSchemaTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/RecursiveSchemaTest.java @@ -1,7 +1,7 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiBackwardIncompatible; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/ReferenceDiffCacheTest.java b/core/src/test/java/org/openapitools/openapidiff/core/ReferenceDiffCacheTest.java similarity index 69% rename from core/src/test/java/com/qdesrame/openapi/test/ReferenceDiffCacheTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/ReferenceDiffCacheTest.java index 93fe063df..e318a8f68 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/ReferenceDiffCacheTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/ReferenceDiffCacheTest.java @@ -1,6 +1,6 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/RequestDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/RequestDiffTest.java similarity index 72% rename from core/src/test/java/com/qdesrame/openapi/test/RequestDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/RequestDiffTest.java index 53de142fb..c133b8a0c 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/RequestDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/RequestDiffTest.java @@ -1,6 +1,6 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiChangedEndpoints; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/ResponseAddedContentSchemaTest.java b/core/src/test/java/org/openapitools/openapidiff/core/ResponseAddedContentSchemaTest.java similarity index 80% rename from core/src/test/java/com/qdesrame/openapi/test/ResponseAddedContentSchemaTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/ResponseAddedContentSchemaTest.java index baaf2a10f..a4f0cabb0 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/ResponseAddedContentSchemaTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/ResponseAddedContentSchemaTest.java @@ -1,16 +1,15 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.model.ChangedResponse; -import com.qdesrame.openapi.diff.core.output.ConsoleRender; -import com.qdesrame.openapi.diff.core.output.HtmlRender; -import com.qdesrame.openapi.diff.core.output.MarkdownRender; import io.swagger.v3.oas.models.media.Content; import java.util.Map; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.model.ChangedResponse; +import org.openapitools.openapidiff.core.output.ConsoleRender; +import org.openapitools.openapidiff.core.output.HtmlRender; +import org.openapitools.openapidiff.core.output.MarkdownRender; public class ResponseAddedContentSchemaTest { diff --git a/core/src/test/java/com/qdesrame/openapi/test/ResponseHeaderDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/ResponseHeaderDiffTest.java similarity index 81% rename from core/src/test/java/com/qdesrame/openapi/test/ResponseHeaderDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/ResponseHeaderDiffTest.java index 17947e792..58b30a74a 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/ResponseHeaderDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/ResponseHeaderDiffTest.java @@ -1,13 +1,12 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedHeaders; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; -import com.qdesrame.openapi.diff.core.model.ChangedResponse; import java.util.Map; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.ChangedHeaders; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.model.ChangedResponse; /** Created by adarsh.sharma on 28/12/17. */ public class ResponseHeaderDiffTest { diff --git a/core/src/test/java/com/qdesrame/openapi/test/SecurityDiffTest.java b/core/src/test/java/org/openapitools/openapidiff/core/SecurityDiffTest.java similarity index 96% rename from core/src/test/java/com/qdesrame/openapi/test/SecurityDiffTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/SecurityDiffTest.java index 4c78ae39c..ef1bec29c 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/SecurityDiffTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/SecurityDiffTest.java @@ -1,12 +1,11 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.*; import io.swagger.v3.oas.models.security.SecurityRequirement; import org.junit.jupiter.api.Test; +import org.openapitools.openapidiff.core.model.*; /** Created by adarsh.sharma on 06/01/18. */ public class SecurityDiffTest { diff --git a/core/src/test/java/com/qdesrame/openapi/test/Swagger2CompatibilityTest.java b/core/src/test/java/org/openapitools/openapidiff/core/Swagger2CompatibilityTest.java similarity index 78% rename from core/src/test/java/com/qdesrame/openapi/test/Swagger2CompatibilityTest.java rename to core/src/test/java/org/openapitools/openapidiff/core/Swagger2CompatibilityTest.java index 6b8487231..69bbb431d 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/Swagger2CompatibilityTest.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/Swagger2CompatibilityTest.java @@ -1,6 +1,6 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; -import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals; +import static org.openapitools.openapidiff.core.TestUtils.assertOpenApiAreEquals; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/com/qdesrame/openapi/test/TestUtils.java b/core/src/test/java/org/openapitools/openapidiff/core/TestUtils.java similarity index 91% rename from core/src/test/java/com/qdesrame/openapi/test/TestUtils.java rename to core/src/test/java/org/openapitools/openapidiff/core/TestUtils.java index c58f50e69..1180f2886 100644 --- a/core/src/test/java/com/qdesrame/openapi/test/TestUtils.java +++ b/core/src/test/java/org/openapitools/openapidiff/core/TestUtils.java @@ -1,10 +1,9 @@ -package com.qdesrame.openapi.test; +package org.openapitools.openapidiff.core; import static org.assertj.core.api.Assertions.assertThat; import static org.slf4j.LoggerFactory.getLogger; -import com.qdesrame.openapi.diff.core.OpenApiCompare; -import com.qdesrame.openapi.diff.core.model.ChangedOpenApi; +import org.openapitools.openapidiff.core.model.ChangedOpenApi; import org.slf4j.Logger; public class TestUtils {