Skip to content

Migrate Java packages to org.openapitools.openapidiff #187

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2020
Merged

Migrate Java packages to org.openapitools.openapidiff #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<shadedClassifierName>all</shadedClassifierName>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.qdesrame.openapi.diff.cli.Main</mainClass>
<mainClass>org.openapitools.openapidiff.cli.Main</mainClass>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
Expand Down
12 changes: 6 additions & 6 deletions ...a/com/qdesrame/openapi/diff/cli/Main.java → ...rg/openapitools/openapidiff/cli/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
8 changes: 0 additions & 8 deletions core/src/main/java/com/qdesrame/openapi/diff/core/output/Render.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...ame/openapi/diff/core/OpenApiCompare.java → ...ools/openapidiff/core/OpenApiCompare.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
10 changes: 5 additions & 5 deletions ...pi/diff/core/compare/ApiResponseDiff.java → ...apidiff/core/compare/ApiResponseDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...e/openapi/diff/core/compare/CacheKey.java → ...ls/openapidiff/core/compare/CacheKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...openapi/diff/core/compare/Comparable.java → .../openapidiff/core/compare/Comparable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.qdesrame.openapi.diff.core.compare;
package org.openapitools.openapidiff.core.compare;

public interface Comparable<T> {

Expand Down
12 changes: 6 additions & 6 deletions ...penapi/diff/core/compare/ContentDiff.java → ...openapidiff/core/compare/ContentDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Content> {

Expand Down
8 changes: 4 additions & 4 deletions ...napi/diff/core/compare/ExtensionDiff.java → ...enapidiff/core/compare/ExtensionDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
14 changes: 7 additions & 7 deletions ...api/diff/core/compare/ExtensionsDiff.java → ...napidiff/core/compare/ExtensionsDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...openapi/diff/core/compare/HeaderDiff.java → .../openapidiff/core/compare/HeaderDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Header, ChangedHeader> {
Expand Down
10 changes: 5 additions & 5 deletions ...penapi/diff/core/compare/HeadersDiff.java → ...openapidiff/core/compare/HeadersDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...e/openapi/diff/core/compare/ListDiff.java → ...ls/openapidiff/core/compare/ListDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...openapi/diff/core/compare/MapKeyDiff.java → .../openapidiff/core/compare/MapKeyDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...enapi/diff/core/compare/MetadataDiff.java → ...penapidiff/core/compare/MetadataDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions ...napi/diff/core/compare/OAuthFlowDiff.java → ...enapidiff/core/compare/OAuthFlowDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...api/diff/core/compare/OAuthFlowsDiff.java → ...napidiff/core/compare/OAuthFlowsDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
18 changes: 9 additions & 9 deletions ...penapi/diff/core/compare/OpenApiDiff.java → ...openapidiff/core/compare/OpenApiDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
10 changes: 5 additions & 5 deletions ...napi/diff/core/compare/OperationDiff.java → ...enapidiff/core/compare/OperationDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions ...napi/diff/core/compare/ParameterDiff.java → ...enapidiff/core/compare/ParameterDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Parameter, ChangedParameter> {

Expand Down
12 changes: 6 additions & 6 deletions ...api/diff/core/compare/ParametersDiff.java → ...napidiff/core/compare/ParametersDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...e/openapi/diff/core/compare/PathDiff.java → ...ls/openapidiff/core/compare/PathDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading