diff --git a/src/main/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfig.java b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConfig.java similarity index 99% rename from src/main/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfig.java rename to src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConfig.java index f1e0fa6b..4e4898ae 100644 --- a/src/main/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfig.java +++ b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConfig.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.config; +package io.github.robwin.swagger2markup; import com.google.common.base.Function; import com.google.common.collect.Ordering; import io.github.robwin.markup.builder.LineSeparator; import io.github.robwin.markup.builder.MarkupLanguage; -import io.github.robwin.swagger2markup.*; -import io.github.robwin.swagger2markup.utils.IOUtils; +import io.github.robwin.swagger2markup.internal.model.PathOperation; +import io.github.robwin.swagger2markup.internal.utils.IOUtils; import io.swagger.models.HttpMethod; import io.swagger.models.parameters.Parameter; import org.apache.commons.lang3.StringUtils; @@ -89,7 +89,7 @@ public class Swagger2MarkupConfig { * @param globalContext Partially initialized global context (globalContext.extensionRegistry == null) */ public void setGlobalContext(Swagger2MarkupConverter.Context globalContext) { - configureDefaultContentPaths(globalContext.swaggerLocation); + configureDefaultContentPaths(globalContext.getSwaggerLocation()); } /** diff --git a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java index ddcbdf35..baf0c3d5 100644 --- a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java +++ b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java @@ -15,14 +15,13 @@ */ package io.github.robwin.swagger2markup; -import io.github.robwin.swagger2markup.builder.DefinitionsDocumentBuilder; -import io.github.robwin.swagger2markup.builder.OverviewDocumentBuilder; -import io.github.robwin.swagger2markup.builder.PathsDocumentBuilder; -import io.github.robwin.swagger2markup.builder.SecurityDocumentBuilder; -import io.github.robwin.swagger2markup.config.Swagger2MarkupConfig; -import io.github.robwin.swagger2markup.extension.Extension; -import io.github.robwin.swagger2markup.extension.Swagger2MarkupExtensionRegistry; -import io.github.robwin.swagger2markup.extension.SwaggerExtension; +import com.google.common.annotations.VisibleForTesting; +import io.github.robwin.swagger2markup.internal.builder.DefinitionsDocumentBuilder; +import io.github.robwin.swagger2markup.internal.builder.OverviewDocumentBuilder; +import io.github.robwin.swagger2markup.internal.builder.PathsDocumentBuilder; +import io.github.robwin.swagger2markup.internal.builder.SecurityDocumentBuilder; +import io.github.robwin.swagger2markup.spi.Extension; +import io.github.robwin.swagger2markup.spi.SwaggerExtension; import io.swagger.models.Swagger; import io.swagger.parser.SwaggerParser; import org.apache.commons.io.IOUtils; @@ -43,14 +42,21 @@ import java.nio.file.Path; */ public class Swagger2MarkupConverter { - public static class Context { - public Swagger2MarkupConfig config; - public Swagger2MarkupExtensionRegistry extensionRegistry; - public Swagger swagger; - public URI swaggerLocation; + private Context context; + + public Swagger2MarkupConverter(Context globalContext) { + this.context = globalContext; } - Context globalContext; + /** + * Returns the global Context + * + * @return the global Context + */ + @VisibleForTesting + Context getContext(){ + return context; + } /** * Creates a Swagger2MarkupConverter.Builder using a remote URL. @@ -113,12 +119,6 @@ public class Swagger2MarkupConverter { return new Builder(swagger); } - protected void applySwaggerExtensions() { - for (SwaggerExtension swaggerExtension : globalContext.extensionRegistry.getExtensions(SwaggerExtension.class)) { - swaggerExtension.apply(globalContext); - } - } - /** * Builds the document with the given markup language and stores * the files in the given folder. @@ -144,6 +144,12 @@ public class Swagger2MarkupConverter { return buildDocuments(); } + private void applySwaggerExtensions() { + for (SwaggerExtension swaggerExtension : context.extensionRegistry.getExtensions(SwaggerExtension.class)) { + swaggerExtension.apply(context); + } + } + /** * Builds all documents and writes them to a directory * @@ -151,10 +157,10 @@ public class Swagger2MarkupConverter { * @throws IOException if a file cannot be written */ private void buildDocuments(Path outputPath) throws IOException { - new OverviewDocumentBuilder(globalContext, outputPath).build().writeToFile(outputPath.resolve(globalContext.config.getOverviewDocument()), StandardCharsets.UTF_8); - new PathsDocumentBuilder(globalContext, outputPath).build().writeToFile(outputPath.resolve(globalContext.config.getPathsDocument()), StandardCharsets.UTF_8); - new DefinitionsDocumentBuilder(globalContext, outputPath).build().writeToFile(outputPath.resolve(globalContext.config.getDefinitionsDocument()), StandardCharsets.UTF_8); - new SecurityDocumentBuilder(globalContext, outputPath).build().writeToFile(outputPath.resolve(globalContext.config.getSecurityDocument()), StandardCharsets.UTF_8); + new OverviewDocumentBuilder(context, outputPath).build().writeToFile(outputPath.resolve(context.config.getOverviewDocument()), StandardCharsets.UTF_8); + new PathsDocumentBuilder(context, outputPath).build().writeToFile(outputPath.resolve(context.config.getPathsDocument()), StandardCharsets.UTF_8); + new DefinitionsDocumentBuilder(context, outputPath).build().writeToFile(outputPath.resolve(context.config.getDefinitionsDocument()), StandardCharsets.UTF_8); + new SecurityDocumentBuilder(context, outputPath).build().writeToFile(outputPath.resolve(context.config.getSecurityDocument()), StandardCharsets.UTF_8); } /** @@ -164,10 +170,10 @@ public class Swagger2MarkupConverter { */ private String buildDocuments() { StringBuilder sb = new StringBuilder(); - sb.append(new OverviewDocumentBuilder(globalContext, null).build().toString()); - sb.append(new PathsDocumentBuilder(globalContext, null).build().toString()); - sb.append(new DefinitionsDocumentBuilder(globalContext, null).build().toString()); - sb.append(new SecurityDocumentBuilder(globalContext, null).build().toString()); + sb.append(new OverviewDocumentBuilder(context, null).build().toString()); + sb.append(new PathsDocumentBuilder(context, null).build().toString()); + sb.append(new DefinitionsDocumentBuilder(context, null).build().toString()); + sb.append(new SecurityDocumentBuilder(context, null).build().toString()); return sb.toString(); } @@ -238,30 +244,49 @@ public class Swagger2MarkupConverter { } public Swagger2MarkupConverter build() { - Context context = new Context(); - - context.swagger = this.swagger; - context.swaggerLocation = this.swaggerLocation; - if (config == null) - context.config = Swagger2MarkupConfig.ofDefaults().build(); - else - context.config = config; - context.config.setGlobalContext(context); + config = Swagger2MarkupConfig.ofDefaults().build(); if (extensionRegistry == null) - context.extensionRegistry = Swagger2MarkupExtensionRegistry.ofDefaults().build(); - else - context.extensionRegistry = extensionRegistry; - for (Extension extension : context.extensionRegistry.getExtensions()) + extensionRegistry = Swagger2MarkupExtensionRegistry.ofDefaults().build(); + + Context context = new Context(config, extensionRegistry, swagger, swaggerLocation); + config.setGlobalContext(context); + + for (Extension extension : extensionRegistry.getExtensions()) extension.setGlobalContext(context); + return new Swagger2MarkupConverter(context); + } + } - Swagger2MarkupConverter converter = new Swagger2MarkupConverter(); - converter.globalContext = context; + public static class Context { + private Swagger2MarkupConfig config; + private Swagger2MarkupExtensionRegistry extensionRegistry; + private Swagger swagger; + private URI swaggerLocation; - return converter; + Context(Swagger2MarkupConfig config, Swagger2MarkupExtensionRegistry extensionRegistry, Swagger swagger, URI swaggerLocation) { + this.config = config; + this.extensionRegistry = extensionRegistry; + this.swagger = swagger; + this.swaggerLocation = swaggerLocation; } + public Swagger2MarkupConfig getConfig() { + return config; + } + + public Swagger2MarkupExtensionRegistry getExtensionRegistry() { + return extensionRegistry; + } + + public Swagger getSwagger() { + return swagger; + } + + public URI getSwaggerLocation() { + return swaggerLocation; + } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/Swagger2MarkupExtensionRegistry.java b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupExtensionRegistry.java similarity index 88% rename from src/main/java/io/github/robwin/swagger2markup/extension/Swagger2MarkupExtensionRegistry.java rename to src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupExtensionRegistry.java index d3c5bab6..77cb0669 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/Swagger2MarkupExtensionRegistry.java +++ b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupExtensionRegistry.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; -import io.github.robwin.swagger2markup.extension.repository.DynamicDefinitionsContentExtension; -import io.github.robwin.swagger2markup.extension.repository.DynamicOperationsContentExtension; -import io.github.robwin.swagger2markup.extension.repository.DynamicOverviewContentExtension; -import io.github.robwin.swagger2markup.extension.repository.DynamicSecurityContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicDefinitionsContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicOperationsContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicOverviewContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicSecurityContentExtension; +import io.github.robwin.swagger2markup.spi.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/DefinitionsDocumentBuilder.java b/src/main/java/io/github/robwin/swagger2markup/internal/builder/DefinitionsDocumentBuilder.java similarity index 96% rename from src/main/java/io/github/robwin/swagger2markup/builder/DefinitionsDocumentBuilder.java rename to src/main/java/io/github/robwin/swagger2markup/internal/builder/DefinitionsDocumentBuilder.java index e8ef931e..51d33dc8 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/DefinitionsDocumentBuilder.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/builder/DefinitionsDocumentBuilder.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.builder; +package io.github.robwin.swagger2markup.internal.builder; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import io.github.robwin.markup.builder.MarkupDocBuilder; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.document.MarkupDocument; -import io.github.robwin.swagger2markup.extension.DefinitionsContentExtension; -import io.github.robwin.swagger2markup.type.ObjectType; -import io.github.robwin.swagger2markup.type.Type; +import io.github.robwin.swagger2markup.internal.document.MarkupDocument; +import io.github.robwin.swagger2markup.spi.DefinitionsContentExtension; +import io.github.robwin.swagger2markup.internal.type.ObjectType; +import io.github.robwin.swagger2markup.internal.type.Type; import io.swagger.models.ComposedModel; import io.swagger.models.Model; import io.swagger.models.RefModel; @@ -41,7 +41,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.*; -import static io.github.robwin.swagger2markup.utils.IOUtils.normalizeName; +import static io.github.robwin.swagger2markup.internal.utils.IOUtils.normalizeName; import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -89,7 +89,7 @@ public class DefinitionsDocumentBuilder extends MarkupDocumentBuilder { */ @Override public MarkupDocument build() { - definitions(globalContext.swagger.getDefinitions()); + definitions(globalContext.getSwagger().getDefinitions()); return new MarkupDocument(markupDocBuilder); } @@ -142,7 +142,7 @@ public class DefinitionsDocumentBuilder extends MarkupDocumentBuilder { * @param context context */ private void applyDefinitionExtension(DefinitionsContentExtension.Context context) { - for (DefinitionsContentExtension extension : globalContext.extensionRegistry.getExtensions(DefinitionsContentExtension.class)) { + for (DefinitionsContentExtension extension : globalContext.getExtensionRegistry().getExtensions(DefinitionsContentExtension.class)) { extension.apply(context); } } @@ -338,7 +338,7 @@ public class DefinitionsDocumentBuilder extends MarkupDocumentBuilder { for (String fileNameExtension : config.getMarkupLanguage().getFileNameExtensions()) { URI contentUri = config.getDefinitionDescriptionsUri().resolve(descriptionFolder).resolve(descriptionFileName + fileNameExtension); - try (Reader reader = io.github.robwin.swagger2markup.utils.IOUtils.uriReader(contentUri)) { + try (Reader reader = io.github.robwin.swagger2markup.internal.utils.IOUtils.uriReader(contentUri)) { if (logger.isInfoEnabled()) { logger.info("Definition description content processed {}", contentUri); } diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/MarkupDocumentBuilder.java b/src/main/java/io/github/robwin/swagger2markup/internal/builder/MarkupDocumentBuilder.java similarity index 91% rename from src/main/java/io/github/robwin/swagger2markup/builder/MarkupDocumentBuilder.java rename to src/main/java/io/github/robwin/swagger2markup/internal/builder/MarkupDocumentBuilder.java index 7a4485cf..2e0148a2 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/MarkupDocumentBuilder.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/builder/MarkupDocumentBuilder.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.builder; +package io.github.robwin.swagger2markup.internal.builder; import io.github.robwin.markup.builder.MarkupDocBuilder; import io.github.robwin.markup.builder.MarkupDocBuilders; import io.github.robwin.markup.builder.MarkupLanguage; import io.github.robwin.markup.builder.MarkupTableColumn; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.config.Swagger2MarkupConfig; -import io.github.robwin.swagger2markup.document.MarkupDocument; -import io.github.robwin.swagger2markup.type.DefinitionDocumentResolver; -import io.github.robwin.swagger2markup.type.ObjectType; -import io.github.robwin.swagger2markup.type.RefType; -import io.github.robwin.swagger2markup.type.Type; -import io.github.robwin.swagger2markup.utils.IOUtils; -import io.github.robwin.swagger2markup.utils.PropertyUtils; +import io.github.robwin.swagger2markup.Swagger2MarkupConfig; +import io.github.robwin.swagger2markup.internal.document.MarkupDocument; +import io.github.robwin.swagger2markup.internal.type.DefinitionDocumentResolver; +import io.github.robwin.swagger2markup.internal.type.ObjectType; +import io.github.robwin.swagger2markup.internal.type.RefType; +import io.github.robwin.swagger2markup.internal.type.Type; +import io.github.robwin.swagger2markup.internal.utils.IOUtils; +import io.github.robwin.swagger2markup.internal.utils.PropertyUtils; import io.swagger.models.properties.Property; import io.swagger.util.Json; import org.apache.commons.collections.MapUtils; @@ -68,7 +68,7 @@ public abstract class MarkupDocumentBuilder { MarkupDocumentBuilder(Swagger2MarkupConverter.Context globalContext, Path outputPath) { this.globalContext = globalContext; - this.config = globalContext.config; + this.config = globalContext.getConfig(); this.outputPath = outputPath; this.markupDocBuilder = MarkupDocBuilders.documentBuilder(config.getMarkupLanguage(), config.getLineSeparator()).withAnchorPrefix(config.getAnchorPrefix()); @@ -140,7 +140,7 @@ public abstract class MarkupDocumentBuilder { } } - Object example = PropertyUtils.getExample(globalContext.config.isGeneratedExamplesEnabled(), property, markupDocBuilder); + Object example = PropertyUtils.getExample(config.isGeneratedExamplesEnabled(), property, markupDocBuilder); List content = Arrays.asList( propertyName, diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/OverviewDocumentBuilder.java b/src/main/java/io/github/robwin/swagger2markup/internal/builder/OverviewDocumentBuilder.java similarity index 95% rename from src/main/java/io/github/robwin/swagger2markup/builder/OverviewDocumentBuilder.java rename to src/main/java/io/github/robwin/swagger2markup/internal/builder/OverviewDocumentBuilder.java index 1e9d2712..0ba8be2f 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/OverviewDocumentBuilder.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/builder/OverviewDocumentBuilder.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.builder; +package io.github.robwin.swagger2markup.internal.builder; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.document.MarkupDocument; -import io.github.robwin.swagger2markup.extension.OverviewContentExtension; +import io.github.robwin.swagger2markup.internal.document.MarkupDocument; +import io.github.robwin.swagger2markup.spi.OverviewContentExtension; import io.swagger.models.*; import java.nio.file.Path; @@ -86,7 +86,7 @@ public class OverviewDocumentBuilder extends MarkupDocumentBuilder { * Builds the document header of the swagger model */ private void overview() { - Swagger swagger = globalContext.swagger; + Swagger swagger = globalContext.getSwagger(); Info info = swagger.getInfo(); this.markupDocBuilder.documentTitle(info.getTitle()); @@ -179,7 +179,7 @@ public class OverviewDocumentBuilder extends MarkupDocumentBuilder { * @param context context */ private void applyOverviewExtension(OverviewContentExtension.Context context) { - for (OverviewContentExtension extension : globalContext.extensionRegistry.getExtensions(OverviewContentExtension.class)) { + for (OverviewContentExtension extension : globalContext.getExtensionRegistry().getExtensions(OverviewContentExtension.class)) { extension.apply(context); } } diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/PathsDocumentBuilder.java b/src/main/java/io/github/robwin/swagger2markup/internal/builder/PathsDocumentBuilder.java similarity index 95% rename from src/main/java/io/github/robwin/swagger2markup/builder/PathsDocumentBuilder.java rename to src/main/java/io/github/robwin/swagger2markup/internal/builder/PathsDocumentBuilder.java index 91941135..ea7f480d 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/PathsDocumentBuilder.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/builder/PathsDocumentBuilder.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.builder; +package io.github.robwin.swagger2markup.internal.builder; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.collect.Multimap; import io.github.robwin.markup.builder.*; import io.github.robwin.swagger2markup.GroupBy; -import io.github.robwin.swagger2markup.PathOperation; +import io.github.robwin.swagger2markup.internal.model.PathOperation; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.document.MarkupDocument; -import io.github.robwin.swagger2markup.extension.OperationsContentExtension; -import io.github.robwin.swagger2markup.type.ObjectType; -import io.github.robwin.swagger2markup.type.RefType; -import io.github.robwin.swagger2markup.type.Type; -import io.github.robwin.swagger2markup.utils.ExamplesUtil; -import io.github.robwin.swagger2markup.utils.ParameterUtils; -import io.github.robwin.swagger2markup.utils.PropertyUtils; -import io.github.robwin.swagger2markup.utils.TagUtils; +import io.github.robwin.swagger2markup.internal.document.MarkupDocument; +import io.github.robwin.swagger2markup.spi.OperationsContentExtension; +import io.github.robwin.swagger2markup.internal.type.ObjectType; +import io.github.robwin.swagger2markup.internal.type.RefType; +import io.github.robwin.swagger2markup.internal.type.Type; +import io.github.robwin.swagger2markup.internal.utils.ExamplesUtil; +import io.github.robwin.swagger2markup.internal.utils.ParameterUtils; +import io.github.robwin.swagger2markup.internal.utils.PropertyUtils; +import io.github.robwin.swagger2markup.internal.utils.TagUtils; import io.swagger.models.*; import io.swagger.models.auth.SecuritySchemeDefinition; import io.swagger.models.parameters.Parameter; @@ -50,9 +50,9 @@ import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.*; -import static io.github.robwin.swagger2markup.utils.IOUtils.normalizeName; -import static io.github.robwin.swagger2markup.utils.TagUtils.convertTagsListToMap; -import static io.github.robwin.swagger2markup.utils.TagUtils.getTagDescription; +import static io.github.robwin.swagger2markup.internal.utils.IOUtils.normalizeName; +import static io.github.robwin.swagger2markup.internal.utils.TagUtils.convertTagsListToMap; +import static io.github.robwin.swagger2markup.internal.utils.TagUtils.getTagDescription; import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -154,7 +154,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { */ private void operations() { Set allOperations = new LinkedHashSet<>(); - Map paths = globalContext.swagger.getPaths(); + Map paths = globalContext.getSwagger().getPaths(); if (paths != null) { for (Map.Entry path : paths.entrySet()) { @@ -192,7 +192,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { } else { Multimap operationsGroupedByTag = TagUtils.groupOperationsByTag(allOperations, config.getTagOrdering(), config.getOperationOrdering()); - Map tagsMap = convertTagsListToMap(globalContext.swagger.getTags()); + Map tagsMap = convertTagsListToMap(globalContext.getSwagger().getTags()); for (String tagName : operationsGroupedByTag.keySet()) { this.markupDocBuilder.sectionTitleLevel2(WordUtils.capitalize(tagName)); @@ -219,7 +219,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { * @param context context */ private void applyOperationExtension(OperationsContentExtension.Context context) { - for (OperationsContentExtension extension : globalContext.extensionRegistry.getExtensions(OperationsContentExtension.class)) { + for (OperationsContentExtension extension : globalContext.getExtensionRegistry().getExtensions(OperationsContentExtension.class)) { extension.apply(context); } } @@ -600,8 +600,8 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { */ private void examplesSection(PathOperation operation, MarkupDocBuilder docBuilder) { - Map generatedRequestExampleMap = ExamplesUtil.generateRequestExampleMap(globalContext.config.isGeneratedExamplesEnabled(), operation, globalContext.swagger.getDefinitions(), markupDocBuilder); - Map generatedResponseExampleMap = ExamplesUtil.generateResponseExampleMap(globalContext.config.isGeneratedExamplesEnabled(), operation.getOperation(), globalContext.swagger.getDefinitions(), markupDocBuilder); + Map generatedRequestExampleMap = ExamplesUtil.generateRequestExampleMap(config.isGeneratedExamplesEnabled(), operation, globalContext.getSwagger().getDefinitions(), markupDocBuilder); + Map generatedResponseExampleMap = ExamplesUtil.generateResponseExampleMap(config.isGeneratedExamplesEnabled(), operation.getOperation(), globalContext.getSwagger().getDefinitions(), markupDocBuilder); exampleMap(generatedRequestExampleMap, EXAMPLE_REQUEST, REQUEST, docBuilder); exampleMap(generatedResponseExampleMap, EXAMPLE_RESPONSE, RESPONSE, docBuilder); @@ -627,7 +627,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { List>> securitySchemes = operation.getOperation().getSecurity(); if (CollectionUtils.isNotEmpty(securitySchemes)) { addOperationSectionTitle(SECURITY, docBuilder); - Map securityDefinitions = globalContext.swagger.getSecurityDefinitions(); + Map securityDefinitions = globalContext.getSwagger().getSecurityDefinitions(); List> cells = new ArrayList<>(); List cols = Arrays.asList( new MarkupTableColumn(TYPE_COLUMN, 1).withMarkupSpecifiers(MarkupLanguage.ASCIIDOC, ".^1"), @@ -660,7 +660,7 @@ public class PathsDocumentBuilder extends MarkupDocumentBuilder { for (String fileNameExtension : config.getMarkupLanguage().getFileNameExtensions()) { URI contentUri = config.getOperationDescriptionsUri().resolve(descriptionFolder).resolve(descriptionFileName + fileNameExtension); - try (Reader reader = io.github.robwin.swagger2markup.utils.IOUtils.uriReader(contentUri)) { + try (Reader reader = io.github.robwin.swagger2markup.internal.utils.IOUtils.uriReader(contentUri)) { if (logger.isInfoEnabled()) { logger.info("Operation description content processed {}", contentUri); } diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/SecurityDocumentBuilder.java b/src/main/java/io/github/robwin/swagger2markup/internal/builder/SecurityDocumentBuilder.java similarity index 94% rename from src/main/java/io/github/robwin/swagger2markup/builder/SecurityDocumentBuilder.java rename to src/main/java/io/github/robwin/swagger2markup/internal/builder/SecurityDocumentBuilder.java index a011b2a9..d136c793 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/SecurityDocumentBuilder.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/builder/SecurityDocumentBuilder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.builder; +package io.github.robwin.swagger2markup.internal.builder; import io.github.robwin.markup.builder.MarkupTableColumn; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.document.MarkupDocument; -import io.github.robwin.swagger2markup.extension.SecurityContentExtension; +import io.github.robwin.swagger2markup.internal.document.MarkupDocument; +import io.github.robwin.swagger2markup.spi.SecurityContentExtension; import io.swagger.models.auth.ApiKeyAuthDefinition; import io.swagger.models.auth.OAuth2Definition; import io.swagger.models.auth.SecuritySchemeDefinition; @@ -76,7 +76,7 @@ public class SecurityDocumentBuilder extends MarkupDocumentBuilder { * Builds all security definition of the Swagger model. */ private void security() { - Map definitions = globalContext.swagger.getSecurityDefinitions(); + Map definitions = globalContext.getSwagger().getSecurityDefinitions(); if (MapUtils.isNotEmpty(definitions)) { applyOverviewExtension(new SecurityContentExtension.Context(SecurityContentExtension.Position.DOC_BEFORE, this.markupDocBuilder)); @@ -124,7 +124,7 @@ public class SecurityDocumentBuilder extends MarkupDocumentBuilder { * @param context context */ private void applyOverviewExtension(SecurityContentExtension.Context context) { - for (SecurityContentExtension extension : globalContext.extensionRegistry.getExtensions(SecurityContentExtension.class)) { + for (SecurityContentExtension extension : globalContext.getExtensionRegistry().getExtensions(SecurityContentExtension.class)) { extension.apply(context); } } diff --git a/src/main/java/io/github/robwin/swagger2markup/document/MarkupDocument.java b/src/main/java/io/github/robwin/swagger2markup/internal/document/MarkupDocument.java similarity index 96% rename from src/main/java/io/github/robwin/swagger2markup/document/MarkupDocument.java rename to src/main/java/io/github/robwin/swagger2markup/internal/document/MarkupDocument.java index 3d8eb1e7..bb9a9a99 100644 --- a/src/main/java/io/github/robwin/swagger2markup/document/MarkupDocument.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/document/MarkupDocument.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.document; +package io.github.robwin.swagger2markup.internal.document; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/ContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/ContentExtension.java similarity index 92% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/ContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/ContentExtension.java index 8341c24a..3c4c5a29 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/ContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/ContentExtension.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import com.google.common.base.Optional; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.ContentContext; +import io.github.robwin.swagger2markup.spi.ContentContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,7 +80,7 @@ public class ContentExtension { */ protected Optional readContentUri(URI contentUri) { try { - Reader reader = io.github.robwin.swagger2markup.utils.IOUtils.uriReader(contentUri); + Reader reader = io.github.robwin.swagger2markup.internal.utils.IOUtils.uriReader(contentUri); if (logger.isInfoEnabled()) { logger.info("Content URI {} processed", contentUri); diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicContentExtension.java similarity index 93% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicContentExtension.java index 14e6a1ed..22e316a0 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicContentExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -22,7 +22,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.ContentContext; +import io.github.robwin.swagger2markup.spi.ContentContext; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -53,7 +53,7 @@ public class DynamicContentExtension extends ContentExtension { * @param levelOffset import markup level offset */ public void extensionsSection(Path contentPath, final String prefix, int levelOffset) { - final Collection filenameExtensions = Collections2.transform(globalContext.config.getMarkupLanguage().getFileNameExtensions(), new Function() { + final Collection filenameExtensions = Collections2.transform(globalContext.getConfig().getMarkupLanguage().getFileNameExtensions(), new Function() { public String apply(String input) { return StringUtils.stripStart(input, "."); } diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicDefinitionsContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicDefinitionsContentExtension.java similarity index 90% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicDefinitionsContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicDefinitionsContentExtension.java index a0ac84d0..12f6bee6 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicDefinitionsContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicDefinitionsContentExtension.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.DefinitionsContentExtension; -import io.github.robwin.swagger2markup.utils.IOUtils; +import io.github.robwin.swagger2markup.spi.DefinitionsContentExtension; +import io.github.robwin.swagger2markup.internal.utils.IOUtils; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,11 +60,11 @@ public class DynamicDefinitionsContentExtension extends DefinitionsContentExtens @Override public void init(Swagger2MarkupConverter.Context globalContext) { if (contentPath == null) { - if (globalContext.swaggerLocation == null || !globalContext.swaggerLocation.getScheme().equals("file")) { + if (globalContext.getSwaggerLocation() == null || !globalContext.getSwaggerLocation().getScheme().equals("file")) { if (logger.isWarnEnabled()) logger.warn("Disable DynamicDefinitionsContentExtension > Can't set default contentPath from swaggerLocation. You have to explicitly configure the content path."); } else { - contentPath = Paths.get(globalContext.swaggerLocation).getParent(); + contentPath = Paths.get(globalContext.getSwaggerLocation()).getParent(); } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOperationsContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicOperationsContentExtension.java similarity index 90% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOperationsContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicOperationsContentExtension.java index 122ddfd6..00adde59 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOperationsContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicOperationsContentExtension.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.OperationsContentExtension; -import io.github.robwin.swagger2markup.utils.IOUtils; +import io.github.robwin.swagger2markup.spi.OperationsContentExtension; +import io.github.robwin.swagger2markup.internal.utils.IOUtils; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,11 +60,11 @@ public class DynamicOperationsContentExtension extends OperationsContentExtensio @Override public void init(Swagger2MarkupConverter.Context globalContext) { if (contentPath == null) { - if (globalContext.swaggerLocation == null || !globalContext.swaggerLocation.getScheme().equals("file")) { + if (globalContext.getSwaggerLocation() == null || !globalContext.getSwaggerLocation().getScheme().equals("file")) { if (logger.isWarnEnabled()) logger.warn("Disable DynamicOperationsContentExtension > Can't set default contentPath from swaggerLocation. You have to explicitly configure the content path."); } else { - contentPath = Paths.get(globalContext.swaggerLocation).getParent(); + contentPath = Paths.get(globalContext.getSwaggerLocation()).getParent(); } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOverviewContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicOverviewContentExtension.java similarity index 90% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOverviewContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicOverviewContentExtension.java index 9bf99726..530a24c1 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOverviewContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicOverviewContentExtension.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.OverviewContentExtension; +import io.github.robwin.swagger2markup.spi.OverviewContentExtension; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,11 +57,11 @@ public class DynamicOverviewContentExtension extends OverviewContentExtension { @Override public void init(Swagger2MarkupConverter.Context globalContext) { if (contentPath == null) { - if (globalContext.swaggerLocation == null || !globalContext.swaggerLocation.getScheme().equals("file")) { + if (globalContext.getSwaggerLocation() == null || !globalContext.getSwaggerLocation().getScheme().equals("file")) { if (logger.isWarnEnabled()) logger.warn("Disable > DynamicOverviewContentExtension > Can't set default contentPath from swaggerLocation. You have to explicitly configure the content path."); } else { - contentPath = Paths.get(globalContext.swaggerLocation).getParent(); + contentPath = Paths.get(globalContext.getSwaggerLocation()).getParent(); } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicSecurityContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicSecurityContentExtension.java similarity index 90% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicSecurityContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicSecurityContentExtension.java index f8883771..799e089a 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicSecurityContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/DynamicSecurityContentExtension.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.SecurityContentExtension; +import io.github.robwin.swagger2markup.spi.SecurityContentExtension; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,11 +57,11 @@ public class DynamicSecurityContentExtension extends SecurityContentExtension { @Override public void init(Swagger2MarkupConverter.Context globalContext) { if (contentPath == null) { - if (globalContext.swaggerLocation == null || !globalContext.swaggerLocation.getScheme().equals("file")) { + if (globalContext.getSwaggerLocation() == null || !globalContext.getSwaggerLocation().getScheme().equals("file")) { if (logger.isWarnEnabled()) logger.warn("Disable > DynamicSecurityContentExtension > Can't set default contentPath from swaggerLocation. You have to explicitly configure the content path."); } else { - contentPath = Paths.get(globalContext.swaggerLocation).getParent(); + contentPath = Paths.get(globalContext.getSwaggerLocation()).getParent(); } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/SchemaExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/SchemaExtension.java similarity index 95% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/SchemaExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/SchemaExtension.java index e805d80d..507de04e 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/SchemaExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/SchemaExtension.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import com.google.common.base.Optional; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.DefinitionsContentExtension; -import io.github.robwin.swagger2markup.utils.IOUtils; +import io.github.robwin.swagger2markup.spi.DefinitionsContentExtension; +import io.github.robwin.swagger2markup.internal.utils.IOUtils; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,11 +75,11 @@ public class SchemaExtension extends DefinitionsContentExtension { @Override public void init(Swagger2MarkupConverter.Context globalContext) { if (schemaBaseUri == null) { - if (globalContext.swaggerLocation == null) { + if (globalContext.getSwaggerLocation() == null) { if (logger.isWarnEnabled()) logger.warn("Disable SchemaExtension > Can't set default schemaBaseUri from swaggerLocation. You have to explicitly configure the schemaBaseUri."); } else { - schemaBaseUri = IOUtils.uriParent(globalContext.swaggerLocation); + schemaBaseUri = IOUtils.uriParent(globalContext.getSwaggerLocation()); } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/SpringRestDocsExtension.java b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/SpringRestDocsExtension.java similarity index 93% rename from src/main/java/io/github/robwin/swagger2markup/extension/repository/SpringRestDocsExtension.java rename to src/main/java/io/github/robwin/swagger2markup/internal/extensions/SpringRestDocsExtension.java index 212baa31..51f12210 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/SpringRestDocsExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/extensions/SpringRestDocsExtension.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension.repository; +package io.github.robwin.swagger2markup.internal.extensions; import com.google.common.base.Optional; import com.google.common.base.Throwables; -import io.github.robwin.swagger2markup.PathOperation; +import io.github.robwin.swagger2markup.internal.model.PathOperation; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.OperationsContentExtension; -import io.github.robwin.swagger2markup.utils.IOUtils; +import io.github.robwin.swagger2markup.spi.OperationsContentExtension; +import io.github.robwin.swagger2markup.internal.utils.IOUtils; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,11 +66,11 @@ public class SpringRestDocsExtension extends OperationsContentExtension { @Override public void init(Swagger2MarkupConverter.Context globalContext) { if (snippetBaseUri == null) { - if (globalContext.swaggerLocation == null) { + if (globalContext.getSwaggerLocation() == null) { if (logger.isWarnEnabled()) logger.warn("Disable SpringRestDocsExtension > Can't set default snippetBaseUri from swaggerLocation. You have to explicitly configure the snippetBaseUri."); } else { - snippetBaseUri = IOUtils.uriParent(globalContext.swaggerLocation); + snippetBaseUri = IOUtils.uriParent(globalContext.getSwaggerLocation()); } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/PathOperation.java b/src/main/java/io/github/robwin/swagger2markup/internal/model/PathOperation.java similarity index 97% rename from src/main/java/io/github/robwin/swagger2markup/PathOperation.java rename to src/main/java/io/github/robwin/swagger2markup/internal/model/PathOperation.java index 7a54ee6a..84af1bd0 100644 --- a/src/main/java/io/github/robwin/swagger2markup/PathOperation.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/model/PathOperation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup; +package io.github.robwin.swagger2markup.internal.model; import io.swagger.models.HttpMethod; import io.swagger.models.Operation; diff --git a/src/main/java/io/github/robwin/swagger2markup/type/ArrayType.java b/src/main/java/io/github/robwin/swagger2markup/internal/type/ArrayType.java similarity index 96% rename from src/main/java/io/github/robwin/swagger2markup/type/ArrayType.java rename to src/main/java/io/github/robwin/swagger2markup/internal/type/ArrayType.java index 6c53f1f8..d1225d52 100644 --- a/src/main/java/io/github/robwin/swagger2markup/type/ArrayType.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/type/ArrayType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.type; +package io.github.robwin.swagger2markup.internal.type; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/type/BasicType.java b/src/main/java/io/github/robwin/swagger2markup/internal/type/BasicType.java similarity index 95% rename from src/main/java/io/github/robwin/swagger2markup/type/BasicType.java rename to src/main/java/io/github/robwin/swagger2markup/internal/type/BasicType.java index d2122652..d0841095 100644 --- a/src/main/java/io/github/robwin/swagger2markup/type/BasicType.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/type/BasicType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.type; +package io.github.robwin.swagger2markup.internal.type; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/type/DefinitionDocumentResolver.java b/src/main/java/io/github/robwin/swagger2markup/internal/type/DefinitionDocumentResolver.java similarity index 93% rename from src/main/java/io/github/robwin/swagger2markup/type/DefinitionDocumentResolver.java rename to src/main/java/io/github/robwin/swagger2markup/internal/type/DefinitionDocumentResolver.java index b87efc38..418dcd03 100644 --- a/src/main/java/io/github/robwin/swagger2markup/type/DefinitionDocumentResolver.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/type/DefinitionDocumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.type; +package io.github.robwin.swagger2markup.internal.type; import com.google.common.base.Function; diff --git a/src/main/java/io/github/robwin/swagger2markup/type/EnumType.java b/src/main/java/io/github/robwin/swagger2markup/internal/type/EnumType.java similarity index 95% rename from src/main/java/io/github/robwin/swagger2markup/type/EnumType.java rename to src/main/java/io/github/robwin/swagger2markup/internal/type/EnumType.java index dc777a7e..5b46f023 100644 --- a/src/main/java/io/github/robwin/swagger2markup/type/EnumType.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/type/EnumType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.type; +package io.github.robwin.swagger2markup.internal.type; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/type/ObjectType.java b/src/main/java/io/github/robwin/swagger2markup/internal/type/ObjectType.java similarity index 96% rename from src/main/java/io/github/robwin/swagger2markup/type/ObjectType.java rename to src/main/java/io/github/robwin/swagger2markup/internal/type/ObjectType.java index 63f81d98..e3ad610c 100644 --- a/src/main/java/io/github/robwin/swagger2markup/type/ObjectType.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/type/ObjectType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.type; +package io.github.robwin.swagger2markup.internal.type; import io.github.robwin.markup.builder.MarkupDocBuilder; import io.swagger.models.properties.Property; diff --git a/src/main/java/io/github/robwin/swagger2markup/type/RefType.java b/src/main/java/io/github/robwin/swagger2markup/internal/type/RefType.java similarity index 95% rename from src/main/java/io/github/robwin/swagger2markup/type/RefType.java rename to src/main/java/io/github/robwin/swagger2markup/internal/type/RefType.java index d6fa51db..fb9edba8 100644 --- a/src/main/java/io/github/robwin/swagger2markup/type/RefType.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/type/RefType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.type; +package io.github.robwin.swagger2markup.internal.type; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/type/Type.java b/src/main/java/io/github/robwin/swagger2markup/internal/type/Type.java similarity index 96% rename from src/main/java/io/github/robwin/swagger2markup/type/Type.java rename to src/main/java/io/github/robwin/swagger2markup/internal/type/Type.java index a87ce227..e379c5c6 100644 --- a/src/main/java/io/github/robwin/swagger2markup/type/Type.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/type/Type.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.type; +package io.github.robwin.swagger2markup.internal.type; import io.github.robwin.markup.builder.MarkupDocBuilder; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/io/github/robwin/swagger2markup/utils/Consumer.java b/src/main/java/io/github/robwin/swagger2markup/internal/utils/Consumer.java similarity index 93% rename from src/main/java/io/github/robwin/swagger2markup/utils/Consumer.java rename to src/main/java/io/github/robwin/swagger2markup/internal/utils/Consumer.java index 1a31c74b..98820d48 100644 --- a/src/main/java/io/github/robwin/swagger2markup/utils/Consumer.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/utils/Consumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.utils; +package io.github.robwin.swagger2markup.internal.utils; /** * Java 8 style Consumer functional interface diff --git a/src/main/java/io/github/robwin/swagger2markup/utils/ExamplesUtil.java b/src/main/java/io/github/robwin/swagger2markup/internal/utils/ExamplesUtil.java similarity index 99% rename from src/main/java/io/github/robwin/swagger2markup/utils/ExamplesUtil.java rename to src/main/java/io/github/robwin/swagger2markup/internal/utils/ExamplesUtil.java index 825fb341..5fd31b78 100644 --- a/src/main/java/io/github/robwin/swagger2markup/utils/ExamplesUtil.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/utils/ExamplesUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.utils; +package io.github.robwin.swagger2markup.internal.utils; import io.github.robwin.markup.builder.MarkupDocBuilder; -import io.github.robwin.swagger2markup.PathOperation; +import io.github.robwin.swagger2markup.internal.model.PathOperation; import io.swagger.models.*; import io.swagger.models.parameters.*; import io.swagger.models.properties.ArrayProperty; diff --git a/src/main/java/io/github/robwin/swagger2markup/utils/IOUtils.java b/src/main/java/io/github/robwin/swagger2markup/internal/utils/IOUtils.java similarity index 97% rename from src/main/java/io/github/robwin/swagger2markup/utils/IOUtils.java rename to src/main/java/io/github/robwin/swagger2markup/internal/utils/IOUtils.java index 54c04514..f4566117 100644 --- a/src/main/java/io/github/robwin/swagger2markup/utils/IOUtils.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/utils/IOUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.utils; +package io.github.robwin.swagger2markup.internal.utils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/io/github/robwin/swagger2markup/utils/ModelUtils.java b/src/main/java/io/github/robwin/swagger2markup/internal/utils/ModelUtils.java similarity index 85% rename from src/main/java/io/github/robwin/swagger2markup/utils/ModelUtils.java rename to src/main/java/io/github/robwin/swagger2markup/internal/utils/ModelUtils.java index 5e8bcc4e..12ea82f6 100644 --- a/src/main/java/io/github/robwin/swagger2markup/utils/ModelUtils.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/utils/ModelUtils.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.utils; +package io.github.robwin.swagger2markup.internal.utils; import com.google.common.base.Function; -import io.github.robwin.swagger2markup.type.ArrayType; -import io.github.robwin.swagger2markup.type.ObjectType; -import io.github.robwin.swagger2markup.type.RefType; -import io.github.robwin.swagger2markup.type.Type; +import io.github.robwin.swagger2markup.internal.type.ArrayType; +import io.github.robwin.swagger2markup.internal.type.ObjectType; +import io.github.robwin.swagger2markup.internal.type.RefType; +import io.github.robwin.swagger2markup.internal.type.Type; import io.swagger.models.ArrayModel; import io.swagger.models.Model; import io.swagger.models.ModelImpl; diff --git a/src/main/java/io/github/robwin/swagger2markup/utils/ParameterUtils.java b/src/main/java/io/github/robwin/swagger2markup/internal/utils/ParameterUtils.java similarity index 97% rename from src/main/java/io/github/robwin/swagger2markup/utils/ParameterUtils.java rename to src/main/java/io/github/robwin/swagger2markup/internal/utils/ParameterUtils.java index 81718eea..586688d3 100644 --- a/src/main/java/io/github/robwin/swagger2markup/utils/ParameterUtils.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/utils/ParameterUtils.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.utils; +package io.github.robwin.swagger2markup.internal.utils; import com.google.common.base.Function; import io.github.robwin.markup.builder.MarkupDocBuilder; -import io.github.robwin.swagger2markup.type.*; +import io.github.robwin.swagger2markup.internal.type.*; import io.swagger.models.Model; import io.swagger.models.parameters.AbstractSerializableParameter; import io.swagger.models.parameters.BodyParameter; diff --git a/src/main/java/io/github/robwin/swagger2markup/utils/PropertyUtils.java b/src/main/java/io/github/robwin/swagger2markup/internal/utils/PropertyUtils.java similarity index 98% rename from src/main/java/io/github/robwin/swagger2markup/utils/PropertyUtils.java rename to src/main/java/io/github/robwin/swagger2markup/internal/utils/PropertyUtils.java index 4ad9593b..0693d9bb 100644 --- a/src/main/java/io/github/robwin/swagger2markup/utils/PropertyUtils.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/utils/PropertyUtils.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.utils; +package io.github.robwin.swagger2markup.internal.utils; import com.google.common.base.Function; import io.github.robwin.markup.builder.MarkupDocBuilder; -import io.github.robwin.swagger2markup.type.*; +import io.github.robwin.swagger2markup.internal.type.*; import io.swagger.models.properties.*; import io.swagger.models.refs.RefFormat; import org.apache.commons.collections.CollectionUtils; diff --git a/src/main/java/io/github/robwin/swagger2markup/utils/TagUtils.java b/src/main/java/io/github/robwin/swagger2markup/internal/utils/TagUtils.java similarity index 96% rename from src/main/java/io/github/robwin/swagger2markup/utils/TagUtils.java rename to src/main/java/io/github/robwin/swagger2markup/internal/utils/TagUtils.java index 9882d838..5823642a 100644 --- a/src/main/java/io/github/robwin/swagger2markup/utils/TagUtils.java +++ b/src/main/java/io/github/robwin/swagger2markup/internal/utils/TagUtils.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.utils; +package io.github.robwin.swagger2markup.internal.utils; import com.google.common.base.Optional; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Ordering; -import io.github.robwin.swagger2markup.PathOperation; +import io.github.robwin.swagger2markup.internal.model.PathOperation; import io.swagger.models.Tag; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/AbstractExtension.java b/src/main/java/io/github/robwin/swagger2markup/spi/AbstractExtension.java similarity index 96% rename from src/main/java/io/github/robwin/swagger2markup/extension/AbstractExtension.java rename to src/main/java/io/github/robwin/swagger2markup/spi/AbstractExtension.java index fef3b235..6989be5a 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/AbstractExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/AbstractExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/ContentContext.java b/src/main/java/io/github/robwin/swagger2markup/spi/ContentContext.java similarity index 94% rename from src/main/java/io/github/robwin/swagger2markup/extension/ContentContext.java rename to src/main/java/io/github/robwin/swagger2markup/spi/ContentContext.java index cbb84835..4c34130e 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/ContentContext.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/ContentContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/DefinitionsContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/spi/DefinitionsContentExtension.java similarity index 98% rename from src/main/java/io/github/robwin/swagger2markup/extension/DefinitionsContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/spi/DefinitionsContentExtension.java index 31bde96f..15170ea0 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/DefinitionsContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/DefinitionsContentExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.markup.builder.MarkupDocBuilder; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/Extension.java b/src/main/java/io/github/robwin/swagger2markup/spi/Extension.java similarity index 94% rename from src/main/java/io/github/robwin/swagger2markup/extension/Extension.java rename to src/main/java/io/github/robwin/swagger2markup/spi/Extension.java index 1584402c..31bf49e2 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/Extension.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/Extension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/OperationsContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/spi/OperationsContentExtension.java similarity index 93% rename from src/main/java/io/github/robwin/swagger2markup/extension/OperationsContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/spi/OperationsContentExtension.java index 6f69c8f3..1f0f95e7 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/OperationsContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/OperationsContentExtension.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.markup.builder.MarkupDocBuilder; import io.github.robwin.swagger2markup.GroupBy; -import io.github.robwin.swagger2markup.PathOperation; +import io.github.robwin.swagger2markup.internal.model.PathOperation; import org.apache.commons.lang3.Validate; public abstract class OperationsContentExtension extends AbstractExtension { @@ -82,7 +82,7 @@ public abstract class OperationsContentExtension extends AbstractExtension { default: throw new RuntimeException(String.format("Unknown position '%s'", context.position)); } - if (globalContext.config.getOperationsGroupedBy() == GroupBy.TAGS) { + if (globalContext.getConfig().getOperationsGroupedBy() == GroupBy.TAGS) { levelOffset++; } return levelOffset; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/OverviewContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/spi/OverviewContentExtension.java similarity index 97% rename from src/main/java/io/github/robwin/swagger2markup/extension/OverviewContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/spi/OverviewContentExtension.java index 0b03c31a..1e8bf700 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/OverviewContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/OverviewContentExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/SecurityContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/spi/SecurityContentExtension.java similarity index 97% rename from src/main/java/io/github/robwin/swagger2markup/extension/SecurityContentExtension.java rename to src/main/java/io/github/robwin/swagger2markup/spi/SecurityContentExtension.java index ac23d530..b7db426c 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/SecurityContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/SecurityContentExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.markup.builder.MarkupDocBuilder; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/SwaggerExtension.java b/src/main/java/io/github/robwin/swagger2markup/spi/SwaggerExtension.java similarity index 94% rename from src/main/java/io/github/robwin/swagger2markup/extension/SwaggerExtension.java rename to src/main/java/io/github/robwin/swagger2markup/spi/SwaggerExtension.java index 48a3da8f..358bd93e 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/SwaggerExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/spi/SwaggerExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; diff --git a/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java b/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java index c6a432d1..a1ea954b 100644 --- a/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/AsciidocConverterTest.java @@ -16,12 +16,10 @@ package io.github.robwin.swagger2markup; import io.github.robwin.swagger2markup.assertions.DiffUtils; -import io.github.robwin.swagger2markup.config.Swagger2MarkupConfig; -import io.github.robwin.swagger2markup.extension.Swagger2MarkupExtensionRegistry; -import io.github.robwin.swagger2markup.extension.repository.DynamicDefinitionsContentExtension; -import io.github.robwin.swagger2markup.extension.repository.DynamicOperationsContentExtension; -import io.github.robwin.swagger2markup.extension.repository.SchemaExtension; -import io.github.robwin.swagger2markup.extension.repository.SpringRestDocsExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicDefinitionsContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicOperationsContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.SchemaExtension; +import io.github.robwin.swagger2markup.internal.extensions.SpringRestDocsExtension; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.junit.Before; diff --git a/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java b/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java index c173425c..d194f180 100644 --- a/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/GeneralConverterTest.java @@ -15,7 +15,6 @@ */ package io.github.robwin.swagger2markup; -import io.github.robwin.swagger2markup.config.Swagger2MarkupConfig; import io.swagger.models.Swagger; import org.junit.Test; @@ -40,14 +39,14 @@ public class GeneralConverterTest { .withOperationDescriptions() .build(); - Swagger2MarkupConverter converterBuilder = Swagger2MarkupConverter.from(file) + Swagger2MarkupConverter converter = Swagger2MarkupConverter.from(file) .withConfig(config) .build(); //Then - URI baseUri = io.github.robwin.swagger2markup.utils.IOUtils.uriParent(converterBuilder.globalContext.swaggerLocation); - assertThat(converterBuilder.globalContext.config.getDefinitionDescriptionsUri()).isEqualTo(baseUri); - assertThat(converterBuilder.globalContext.config.getOperationDescriptionsUri()).isEqualTo(baseUri); + URI baseUri = io.github.robwin.swagger2markup.internal.utils.IOUtils.uriParent(converter.getContext().getSwaggerLocation()); + assertThat(converter.getContext().getConfig().getDefinitionDescriptionsUri()).isEqualTo(baseUri); + assertThat(converter.getContext().getConfig().getOperationDescriptionsUri()).isEqualTo(baseUri); } @Test @@ -65,8 +64,8 @@ public class GeneralConverterTest { .build(); //Then - assertThat(converterBuilder.globalContext.config.getDefinitionDescriptionsUri()).isNull(); - assertThat(converterBuilder.globalContext.config.getOperationDescriptionsUri()).isNull(); + assertThat(converterBuilder.getContext().getConfig().getDefinitionDescriptionsUri()).isNull(); + assertThat(converterBuilder.getContext().getConfig().getOperationDescriptionsUri()).isNull(); } @Test @@ -81,6 +80,6 @@ public class GeneralConverterTest { Swagger2MarkupConverter converter = Swagger2MarkupConverter.from(new Swagger()) .withConfig(config) .build(); - assertThat(converter.globalContext.config.isDefinitionDescriptionsEnabled()).isFalse(); + assertThat(converter.getContext().getConfig().isDefinitionDescriptionsEnabled()).isFalse(); } } diff --git a/src/test/java/io/github/robwin/swagger2markup/MarkdownConverterTest.java b/src/test/java/io/github/robwin/swagger2markup/MarkdownConverterTest.java index bcb40a8e..2d937a29 100644 --- a/src/test/java/io/github/robwin/swagger2markup/MarkdownConverterTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/MarkdownConverterTest.java @@ -21,10 +21,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import io.github.robwin.markup.builder.MarkupLanguage; import io.github.robwin.swagger2markup.assertions.DiffUtils; -import io.github.robwin.swagger2markup.config.Swagger2MarkupConfig; -import io.github.robwin.swagger2markup.extension.Swagger2MarkupExtensionRegistry; -import io.github.robwin.swagger2markup.extension.repository.DynamicDefinitionsContentExtension; -import io.github.robwin.swagger2markup.extension.repository.DynamicOperationsContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicDefinitionsContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicOperationsContentExtension; import org.apache.commons.io.FileUtils; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfigTest.java b/src/test/java/io/github/robwin/swagger2markup/Swagger2MarkupConfigTest.java similarity index 98% rename from src/test/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfigTest.java rename to src/test/java/io/github/robwin/swagger2markup/Swagger2MarkupConfigTest.java index 30fb200d..1385c308 100644 --- a/src/test/java/io/github/robwin/swagger2markup/config/Swagger2MarkupConfigTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/Swagger2MarkupConfigTest.java @@ -13,13 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.config; +package io.github.robwin.swagger2markup; import com.google.common.collect.Ordering; import io.github.robwin.markup.builder.MarkupLanguage; -import io.github.robwin.swagger2markup.GroupBy; -import io.github.robwin.swagger2markup.Language; -import io.github.robwin.swagger2markup.OrderBy; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/io/github/robwin/swagger2markup/spi/MySwaggerExtension.java b/src/test/java/io/github/robwin/swagger2markup/spi/MySwaggerExtension.java new file mode 100644 index 00000000..5e5cf1c9 --- /dev/null +++ b/src/test/java/io/github/robwin/swagger2markup/spi/MySwaggerExtension.java @@ -0,0 +1,29 @@ +/* + * Copyright 2016 Robert Winkler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.github.robwin.swagger2markup.spi; + +import io.github.robwin.swagger2markup.Swagger2MarkupConverter; + +public class MySwaggerExtension extends SwaggerExtension { + + public MySwaggerExtension() { + super(); + } + + public void apply(Swagger2MarkupConverter.Context globalContext) { + globalContext.getSwagger().setHost("host.domain.tld"); + } +} diff --git a/src/test/java/io/github/robwin/swagger2markup/extension/Swagger2MarkupExtensionRegistryTest.java b/src/test/java/io/github/robwin/swagger2markup/spi/Swagger2MarkupExtensionRegistryTest.java similarity index 84% rename from src/test/java/io/github/robwin/swagger2markup/extension/Swagger2MarkupExtensionRegistryTest.java rename to src/test/java/io/github/robwin/swagger2markup/spi/Swagger2MarkupExtensionRegistryTest.java index c0b60caf..3a6e3722 100644 --- a/src/test/java/io/github/robwin/swagger2markup/extension/Swagger2MarkupExtensionRegistryTest.java +++ b/src/test/java/io/github/robwin/swagger2markup/spi/Swagger2MarkupExtensionRegistryTest.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.robwin.swagger2markup.extension; +package io.github.robwin.swagger2markup.spi; import io.github.robwin.swagger2markup.Swagger2MarkupConverter; -import io.github.robwin.swagger2markup.extension.repository.DynamicDefinitionsContentExtension; -import io.github.robwin.swagger2markup.extension.repository.DynamicOperationsContentExtension; +import io.github.robwin.swagger2markup.Swagger2MarkupExtensionRegistry; +import io.github.robwin.swagger2markup.internal.extensions.DynamicDefinitionsContentExtension; +import io.github.robwin.swagger2markup.internal.extensions.DynamicOperationsContentExtension; import org.junit.Test; import java.nio.file.Paths; @@ -27,17 +28,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -class MySwaggerExtension extends SwaggerExtension { - - public MySwaggerExtension() { - super(); - } - - public void apply(Swagger2MarkupConverter.Context globalContext) { - globalContext.swagger.setHost("host.domain.tld"); - } -} - public class Swagger2MarkupExtensionRegistryTest { @Test