mindol1004/swagger2markup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved classes for backward compability.

Browse Source
This commit is contained in:
Robert Winkler
2020-06-16 11:07:28 +02:00
parent e8a51345a8
commit 7d0d73cd51
35 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.adoc
View File

@@ -163,7 +163,7 @@
* PR #294: Examples always start with a newline if there is other content in the same cell
* PR 307: Include required parameters in example request
=== Version 1.4.0
=== Version 2.0.0
* Added openapi2markup to support OpenAPI v3
* Issue #409: Fixed JSON response example

6
build.gradle
View File

@@ -22,13 +22,13 @@ allprojects {
group 'io.github.swagger2markup'
description = 'swagger2markup Build'
repositories {
repositories {
jcenter()
mavenCentral()
maven {
name "OSS Snapshots"
url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
}
jcenter()
mavenCentral()
}
}
artifactoryPublish.skip = true // apply to all projects except the root

2
openapi2markup/src/main/java/io/github/swagger2markup/OpenAPI2MarkupConverter.java
View File

@@ -16,8 +16,6 @@
package io.github.swagger2markup;
import io.github.swagger2markup.adoc.ast.impl.DocumentImpl;
import io.github.swagger2markup.config.Labels;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.config.OpenAPILabels;
import io.github.swagger2markup.config.builder.OpenAPI2MarkupConfigBuilder;
import io.github.swagger2markup.extension.OpenAPI2MarkupExtensionRegistry;

2
openapi2markup/src/main/java/io/github/swagger2markup/config/OpenAPILabels.java
View File

@@ -1,7 +1,7 @@
package io.github.swagger2markup.config;
import io.github.swagger2markup.Labels;
import io.github.swagger2markup.OpenSchema2MarkupConfig;
import io.github.swagger2markup.config.builder.OpenAPI2MarkupConfigBuilder;
import java.util.ResourceBundle;

3
openapi2markup/src/main/java/io/github/swagger2markup/extension/MarkupComponent.java
View File

@@ -17,9 +17,8 @@
package io.github.swagger2markup.extension;
import io.github.swagger2markup.OpenSchema2MarkupConfig;
import io.github.swagger2markup.config.builder.OpenAPI2MarkupConfigBuilder;
import io.github.swagger2markup.OpenAPI2MarkupConverter;
import io.github.swagger2markup.config.Labels;
import io.github.swagger2markup.Labels;
import io.swagger.v3.oas.models.OpenAPI;
import io.vavr.Function2;
import org.slf4j.Logger;

1
swagger2markup-core/src/main/java/io/github/swagger2markup/AbstractSchema2MarkupConverter.java
View File

@@ -15,7 +15,6 @@
*/
package io.github.swagger2markup;
import io.github.swagger2markup.config.Labels;
import io.github.swagger2markup.config.Schema2MarkupConfig;
import io.github.swagger2markup.extension.Schema2MarkupExtensionRegistry;
import org.apache.commons.lang3.Validate;

2
swagger2markup-core/src/main/java/io/github/swagger2markup/config/GroupBy.java → swagger2markup-core/src/main/java/io/github/swagger2markup/GroupBy.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.swagger2markup.config;
package io.github.swagger2markup;
/**
* GroupBy enum for ordering

2
swagger2markup-core/src/main/java/io/github/swagger2markup/config/Labels.java → swagger2markup-core/src/main/java/io/github/swagger2markup/Labels.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.swagger2markup.config;
package io.github.swagger2markup;
import java.util.ResourceBundle;

2
swagger2markup-core/src/main/java/io/github/swagger2markup/config/Language.java → swagger2markup-core/src/main/java/io/github/swagger2markup/Language.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.github.swagger2markup.config;
package io.github.swagger2markup;
import java.util.Locale;

2
swagger2markup-core/src/main/java/io/github/swagger2markup/config/MarkupLanguage.java → swagger2markup-core/src/main/java/io/github/swagger2markup/MarkupLanguage.java
View File

@@ -17,7 +17,7 @@
*
*/
package io.github.swagger2markup.config;
package io.github.swagger2markup;
import java.util.Arrays;
import java.util.List;

2
swagger2markup-core/src/main/java/io/github/swagger2markup/config/OrderBy.java → swagger2markup-core/src/main/java/io/github/swagger2markup/OrderBy.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.swagger2markup.config;
package io.github.swagger2markup;
public enum OrderBy {
AS_IS,

23
swagger2markup-core/src/main/java/io/github/swagger2markup/config/PageBreakLocations.java → swagger2markup-core/src/main/java/io/github/swagger2markup/PageBreakLocations.java
View File

@@ -13,11 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.swagger2markup.config;
package io.github.swagger2markup;
/**
* Marker interface for PageBreak enums
*/
public interface PageBreakLocations {
public enum PageBreakLocations {
BEFORE_OPERATION,
BEFORE_OPERATION_DESCRIPTION,
BEFORE_OPERATION_PARAMETERS,
BEFORE_OPERATION_RESPONSES,
BEFORE_OPERATION_CONSUMES,
BEFORE_OPERATION_PRODUCES,
BEFORE_OPERATION_EXAMPLE_REQUEST,
BEFORE_OPERATION_EXAMPLE_RESPONSE,
BEFORE_DEFINITION,
AFTER_OPERATION,
AFTER_OPERATION_DESCRIPTION,
AFTER_OPERATION_PARAMETERS,
AFTER_OPERATION_RESPONSES,
AFTER_OPERATION_CONSUMES,
AFTER_OPERATION_PRODUCES,
AFTER_OPERATION_EXAMPLE_REQUEST,
AFTER_OPERATION_EXAMPLE_RESPONSE,
AFTER_DEFINITION
}

1
swagger2markup-core/src/main/java/io/github/swagger2markup/Schema2MarkupProperties.java
View File

@@ -15,7 +15,6 @@
*/
package io.github.swagger2markup;
import io.github.swagger2markup.config.*;
import io.github.swagger2markup.utils.URIUtils;
import org.apache.commons.collections4.IteratorUtils;
import org.apache.commons.configuration2.Configuration;

2
swagger2markup-core/src/main/java/io/github/swagger2markup/config/Schema2MarkupConfig.java
View File

@@ -15,7 +15,7 @@
*/
package io.github.swagger2markup.config;
import io.github.swagger2markup.Schema2MarkupProperties;
import io.github.swagger2markup.*;
import io.github.swagger2markup.model.Parameter;
import io.github.swagger2markup.model.PathOperation;

2
swagger2markup-core/src/main/java/io/github/swagger2markup/config/builder/Schema2MarkupConfigBuilder.java
View File

@@ -17,7 +17,7 @@
package io.github.swagger2markup.config.builder;
import com.google.common.collect.Ordering;
import io.github.swagger2markup.Schema2MarkupProperties;
import io.github.swagger2markup.*;
import io.github.swagger2markup.config.*;
import io.github.swagger2markup.model.Parameter;
import io.github.swagger2markup.model.PathOperation;

1
swagger2markup/src/main/java/io/github/swagger2markup/Swagger2MarkupConverter.java
View File

@@ -17,7 +17,6 @@ package io.github.swagger2markup;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.builder.Swagger2MarkupExtensionRegistryBuilder;
import io.github.swagger2markup.config.Labels;
import io.github.swagger2markup.internal.document.DefinitionsDocument;
import io.github.swagger2markup.internal.document.OverviewDocument;
import io.github.swagger2markup.internal.document.PathsDocument;

2
swagger2markup/src/main/java/io/github/swagger2markup/SwaggerLabels.java
View File

@@ -16,8 +16,6 @@
package io.github.swagger2markup;
import io.github.swagger2markup.config.Labels;
import java.util.ResourceBundle;
public class SwaggerLabels extends Labels {

2
swagger2markup/src/main/java/io/github/swagger2markup/SwaggerPageBreakLocations.java
View File

@@ -15,7 +15,7 @@
*/
package io.github.swagger2markup;
public enum SwaggerPageBreakLocations implements io.github.swagger2markup.config.PageBreakLocations {
public enum SwaggerPageBreakLocations implements PageBreakLocations {
BEFORE_OPERATION,
BEFORE_OPERATION_DESCRIPTION,
BEFORE_OPERATION_PARAMETERS,

2
swagger2markup/src/main/java/io/github/swagger2markup/internal/adapter/ParameterAdapter.java
View File

@@ -109,7 +109,7 @@ public class ParameterAdapter {
}
public String displayDescription(MarkupDocBuilder markupDocBuilder) {
io.github.swagger2markup.config.MarkupLanguage schemaMarkupLanguage = config.getSchemaMarkupLanguage();
io.github.swagger2markup.MarkupLanguage schemaMarkupLanguage = config.getSchemaMarkupLanguage();
return markupDescription(MarkupLanguage.valueOf(schemaMarkupLanguage.name()), markupDocBuilder, getDescription());
}

2
swagger2markup/src/main/java/io/github/swagger2markup/internal/component/BodyParameterComponent.java
View File

@@ -17,7 +17,7 @@ package io.github.swagger2markup.internal.component;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.config.GroupBy;
import io.github.swagger2markup.GroupBy;
import io.github.swagger2markup.internal.adapter.ParameterAdapter;
import io.github.swagger2markup.internal.resolver.DocumentResolver;
import io.github.swagger2markup.internal.type.ObjectType;

4
swagger2markup/src/main/java/io/github/swagger2markup/internal/component/PathOperationComponent.java
View File

@@ -20,8 +20,8 @@ import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.config.GroupBy;
import io.github.swagger2markup.config.PageBreakLocations;
import io.github.swagger2markup.GroupBy;
import io.github.swagger2markup.PageBreakLocations;
import io.github.swagger2markup.internal.resolver.DocumentResolver;
import io.github.swagger2markup.internal.type.ObjectType;
import io.github.swagger2markup.internal.utils.ExamplesUtil;

2
swagger2markup/src/main/java/io/github/swagger2markup/internal/document/PathsDocument.java
View File

@@ -19,7 +19,7 @@ import com.google.common.collect.Multimap;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter.SwaggerContext;
import io.github.swagger2markup.SwaggerLabels;
import io.github.swagger2markup.config.GroupBy;
import io.github.swagger2markup.GroupBy;
import io.github.swagger2markup.internal.component.PathOperationComponent;
import io.github.swagger2markup.internal.resolver.DefinitionDocumentResolverFromOperation;
import io.github.swagger2markup.internal.resolver.OperationDocumentNameResolver;

2
swagger2markup/src/main/java/io/github/swagger2markup/spi/MarkupComponent.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.spi;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.config.Labels;
import io.github.swagger2markup.Labels;
import io.github.swagger2markup.markup.builder.MarkupDocBuilder;
import io.vavr.Function2;
import org.slf4j.Logger;

2
swagger2markup/src/main/java/io/github/swagger2markup/spi/PathsDocumentExtension.java
View File

@@ -17,7 +17,7 @@
package io.github.swagger2markup.spi;
import com.google.common.base.Optional;
import io.github.swagger2markup.config.GroupBy;
import io.github.swagger2markup.GroupBy;
import io.github.swagger2markup.markup.builder.MarkupDocBuilder;
import io.github.swagger2markup.model.PathOperation;
import org.apache.commons.lang3.Validate;

7
swagger2markup/src/test/java/io/github/swagger2markup/AsciidocConverterTest.java
View File

@@ -17,10 +17,6 @@ package io.github.swagger2markup;
import io.github.swagger2markup.assertions.DiffUtils;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.GroupBy;
import io.github.swagger2markup.config.Language;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.config.OrderBy;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
@@ -124,6 +120,7 @@ public class AsciidocConverterTest {
//When
Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
.withOutputLanguage(Language.BR)
.withTagOrdering(OrderBy.AS_IS)
.withParameterOrdering(OrderBy.AS_IS)
.withOperationOrdering(OrderBy.AS_IS)
@@ -610,7 +607,7 @@ public class AsciidocConverterTest {
//When
Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
.withSwaggerMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.ASCIIDOC)
.withSwaggerMarkupLanguage(MarkupLanguage.ASCIIDOC)
.build();
Swagger2MarkupConverter.from(file).withConfig(config).build()

4
swagger2markup/src/test/java/io/github/swagger2markup/DocumentationTest.java
View File

@@ -18,8 +18,6 @@ package io.github.swagger2markup;
import io.github.swagger2markup.builder.MyExtension;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.builder.Swagger2MarkupExtensionRegistryBuilder;
import io.github.swagger2markup.config.GroupBy;
import io.github.swagger2markup.config.Language;
import io.github.swagger2markup.markup.builder.MarkupLanguage;
import io.github.swagger2markup.spi.Swagger2MarkupExtensionRegistry;
import org.apache.commons.configuration2.Configuration;
@@ -88,7 +86,7 @@ public class DocumentationTest {
// tag::swagger2MarkupConfigBuilder[]
Swagger2MarkupConfig config = (Swagger2MarkupConfig) new Swagger2MarkupConfigBuilder() //<1>
.withMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.MARKDOWN) //<2>
.withMarkupLanguage(io.github.swagger2markup.MarkupLanguage.MARKDOWN) //<2>
.withOutputLanguage(Language.DE) //<3>
.withPathsGroupedBy(GroupBy.TAGS) //<4>
.build(); //<5>

5
swagger2markup/src/test/java/io/github/swagger2markup/MarkdownConverterTest.java
View File

@@ -21,7 +21,6 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import io.github.swagger2markup.assertions.DiffUtils;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Test;
@@ -128,7 +127,7 @@ public class MarkdownConverterTest {
//When
Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
.withMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.MARKDOWN)
.withMarkupLanguage(MarkupLanguage.MARKDOWN)
.build();
Swagger2MarkupConverter.from(file)
.withConfig(config)
@@ -152,7 +151,7 @@ public class MarkdownConverterTest {
//When
Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
.withMarkupLanguage(io.github.swagger2markup.config.MarkupLanguage.MARKDOWN)
.withMarkupLanguage(MarkupLanguage.MARKDOWN)
.build();
Swagger2MarkupConverter.from(file)
.withConfig(config)

6
swagger2markup/src/test/java/io/github/swagger2markup/builder/Swagger2MarkupConfigBuilderTest.java
View File

@@ -18,9 +18,9 @@ package io.github.swagger2markup.builder;
import com.google.common.collect.Ordering;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupProperties;
import io.github.swagger2markup.config.GroupBy;
import io.github.swagger2markup.config.Language;
import io.github.swagger2markup.config.OrderBy;
import io.github.swagger2markup.GroupBy;
import io.github.swagger2markup.Language;
import io.github.swagger2markup.OrderBy;
import io.github.swagger2markup.markup.builder.MarkupLanguage;
import org.junit.Test;

2
swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentNameResolverTest.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.MarkupLanguage;
import org.junit.Test;
import java.nio.file.Paths;

2
swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverDefaultTest.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.MarkupLanguage;
import org.junit.Test;
import java.nio.file.FileSystems;

2
swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromDefinitionTest.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.MarkupLanguage;
import org.junit.Test;
import java.nio.file.Paths;

2
swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/DefinitionDocumentResolverFromOperationTest.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.MarkupLanguage;
import org.junit.Test;
import java.nio.file.FileSystems;

2
swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentNameResolverTest.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.MarkupLanguage;
import io.github.swagger2markup.model.SwaggerPathOperation;
import io.swagger.models.HttpMethod;
import io.swagger.models.Operation;

2
swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/OperationDocumentResolverDefaultTest.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.MarkupLanguage;
import io.github.swagger2markup.model.PathOperation;
import io.github.swagger2markup.model.SwaggerPathOperation;
import io.swagger.models.HttpMethod;

2
swagger2markup/src/test/java/io/github/swagger2markup/internal/resolver/SecurityDocumentResolverTest.java
View File

@@ -18,7 +18,7 @@ package io.github.swagger2markup.internal.resolver;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.config.MarkupLanguage;
import io.github.swagger2markup.MarkupLanguage;
import org.junit.Test;
import java.nio.file.Paths;