Merge remote-tracking branch 'origin/master'

Robert Winkler · Robert Winkler · commit ddd679a9307d · 2016-05-02T13:26:01.000+02:00
diff --git a/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicDefinitionsDocumentExtension.java b/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicDefinitionsDocumentExtension.java
@@ -31,13 +31,7 @@
 import java.util.Optional;
 
 /**
- * Dynamically search for markup files in {@code contentPath} to append in Definitions, with the format :<br>
- * - {@code document-before-*.<markup.ext>} : import before Definitions document with levelOffset = 0<br>
- * - {@code document-after-*.<markup.ext>} : import after Definitions document with levelOffset = 0<br>
- * - {@code document-begin-*.<markup.ext>} : import just after Definitions document main title with levelOffset = 1<br>
- * - {@code document-end-*.<markup.ext>} : import at the end of Definitions document with levelOffset = 1<br>
- * - {@code definition-begin-*.<markup.ext>} : import just after each definition title with levelOffset = 2<br>
- * - {@code definition-end-*.<markup.ext>} : import at the end of each definition with levelOffset = 2<br>
+ * Dynamically search for markup files in {@code contentPath} to append in Definitions document.
  * <p>
  * Markup files are appended in the natural order of their names, for each category.
  */
@@ -120,12 +114,12 @@ public void apply(Context context) {
                 case DOCUMENT_END:
                     dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath, contentPrefix(position), levelOffset(context));
                     break;
+                case DEFINITION_BEFORE:
                 case DEFINITION_BEGIN:
                 case DEFINITION_END:
+                case DEFINITION_AFTER:
                     dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath.resolve(Paths.get(IOUtils.normalizeName(context.getDefinitionName().get()))), contentPrefix(position), levelOffset(context));
                     break;
-                default:
-                    throw new RuntimeException(String.format("Unknown position '%s'", position));
             }
         }
     }
diff --git a/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicOverviewDocumentExtension.java b/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicOverviewDocumentExtension.java
@@ -30,11 +30,7 @@
 import java.util.Optional;
 
 /**
- * Dynamically search for markup files in {@code contentPath} to append to Overview, with the format :<br>
- * - {@code document-before-*.<markup.ext>} : import before Overview document with levelOffset = 0<br>
- * - {@code document-after-*.<markup.ext>} : import after Overview document with levelOffset = 0<br>
- * - {@code document-begin-*.<markup.ext>} : import just after Overview document main title with levelOffset = 1<br>
- * - {@code document-end-*.<markup.ext>} : import at the end of Overview document with levelOffset = 1<br>
+ * Dynamically search for markup files in {@code contentPath} to append to Overview document.
  * <p>
  * Markup files are appended in the natural order of their names, for each category.
  */
@@ -117,8 +113,6 @@ public void apply(Context context) {
                 case DOCUMENT_END:
                     dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath, contentPrefix(position), levelOffset(context));
                     break;
-                default:
-                    throw new RuntimeException(String.format("Unknown position '%s'", position));
             }
         }
     }
diff --git a/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicPathsDocumentExtension.java b/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicPathsDocumentExtension.java
@@ -31,13 +31,7 @@
 import java.util.Optional;
 
 /**
- * Dynamically search for markup files in {@code contentPath} to append to Operations, with the format :<br>
- * - {@code document-before-*.<markup.ext>} : import before Paths document with levelOffset = 0<br>
- * - {@code document-after-*.<markup.ext>} : import after Paths document with levelOffset = 0<br>
- * - {@code document-begin-*.<markup.ext>} : import just after Paths document main title with levelOffset = 1<br>
- * - {@code document-end-*.<markup.ext>} : import at the end of Paths document with levelOffset = 1<br>
- * - {@code operation-begin-*.<markup.ext>} : import just after each operation title with levelOffset = 2(GroupBy.AS_IS) | 3(GroupBy.TAGS)<br>
- * - {@code operation-end-*.<markup.ext>} : import at the end of each operation with levelOffset = 2(GroupBy.AS_IS) | 3(GroupBy.TAGS)<br>
+ * Dynamically search for markup files in {@code contentPath} to append to Paths document.
  * <p>
  * Markup files are appended in the natural order of their names, for each category.
  */
@@ -120,12 +114,28 @@ public void apply(Context context) {
                 case DOCUMENT_END:
                     dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath, contentPrefix(position), levelOffset(context));
                     break;
+                case OPERATION_BEFORE:
                 case OPERATION_BEGIN:
                 case OPERATION_END:
+                case OPERATION_AFTER:
+                case OPERATION_DESCRIPTION_BEFORE:
+                case OPERATION_DESCRIPTION_AFTER:
+                case OPERATION_PARAMETERS_BEFORE:
+                case OPERATION_PARAMETERS_AFTER:
+                case OPERATION_RESPONSES_BEFORE:
+                case OPERATION_RESPONSES_AFTER:
+                case OPERATION_SECURITY_BEFORE:
+                case OPERATION_SECURITY_AFTER:
+                case OPERATION_DESCRIPTION_BEGIN:
+                case OPERATION_DESCRIPTION_END:
+                case OPERATION_PARAMETERS_BEGIN:
+                case OPERATION_PARAMETERS_END:
+                case OPERATION_RESPONSES_BEGIN:
+                case OPERATION_RESPONSES_END:
+                case OPERATION_SECURITY_BEGIN:
+                case OPERATION_SECURITY_END:
                     dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath.resolve(IOUtils.normalizeName(context.getOperation().get().getId())), contentPrefix(position), levelOffset(context));
                     break;
-                default:
-                    throw new RuntimeException(String.format("Unknown position '%s'", position));
             }
         }
     }
diff --git a/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicSecurityDocumentExtension.java b/swagger2markup-import-files-ext/src/main/java/io/github/swagger2markup/extensions/DynamicSecurityDocumentExtension.java
@@ -31,13 +31,7 @@
 import java.util.Optional;
 
 /**
- * Dynamically search for markup files in {@code contentPath} to append to Overview, with the format :<br>
- * - {@code document-before-*.<markup.ext>} : import before Overview document with levelOffset = 0<br>
- * - {@code document-after-*.<markup.ext>} : import after Overview document with levelOffset = 0<br>
- * - {@code document-begin-*.<markup.ext>} : import just after Overview document main title with levelOffset = 1<br>
- * - {@code document-end-*.<markup.ext>} : import at the end of Overview document with levelOffset = 1<br>
- * - {@code definition-begin-*.<markup.ext>} : import just after each definition title with levelOffset = 2<br>
- * - {@code definition-end-*.<markup.ext>} : import at the end of each definition with levelOffset = 2<br>
+ * Dynamically search for markup files in {@code contentPath} to append to Security document.
  * <p>
  * Markup files are appended in the natural order of their names, for each category.
  */
@@ -120,12 +114,12 @@ public void apply(Context context) {
                 case DOCUMENT_END:
                     dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath, contentPrefix(position), levelOffset(context));
                     break;
-                case DEFINITION_BEGIN:
-                case DEFINITION_END:
-                    dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath.resolve(IOUtils.normalizeName(context.getDefinitionName().get())), contentPrefix(position), levelOffset(context));
+                case SECURITY_SCHEME_BEFORE:
+                case SECURITY_SCHEME_BEGIN:
+                case SECURITY_SCHEME_END:
+                case SECURITY_SCHEME_AFTER:
+                    dynamicContent.extensionsSection(extensionMarkupLanguage, contentPath.resolve(IOUtils.normalizeName(context.getSecuritySchemeName().get())), contentPrefix(position), levelOffset(context));
                     break;
-                default:
-                    throw new RuntimeException(String.format("Unknown position '%s'", position));
             }
         }
     }
diff --git a/swagger2markup-import-files-ext/src/test/java/io/github/swagger2markup/extensions/DynamicDocumentExtensionTest.java b/swagger2markup-import-files-ext/src/test/java/io/github/swagger2markup/extensions/DynamicDocumentExtensionTest.java
@@ -40,7 +40,7 @@ public class DynamicDocumentExtensionTest {
     public void testSwagger2AsciiDocExtensions() throws IOException, URISyntaxException {
         //Given
         Path file = Paths.get(DynamicDocumentExtensionTest.class.getResource("/yaml/swagger_petstore.yaml").toURI());
-        Path outputDirectory = Paths.get("build/docs/asciidoc/generated");
+        Path outputDirectory = Paths.get("build/test/asciidoc/generated");
         FileUtils.deleteQuietly(outputDirectory.toFile());
 
         //When
@@ -70,7 +70,7 @@ public void testSwagger2AsciiDocExtensions() throws IOException, URISyntaxExcept
     public void testSwagger2MarkdownExtensions() throws IOException, URISyntaxException {
         //Given
         Path file = Paths.get(DynamicDocumentExtensionTest.class.getResource("/yaml/swagger_petstore.yaml").toURI());
-        Path outputDirectory = Paths.get("build/docs/markdown/generated");
+        Path outputDirectory = Paths.get("build/test/markdown/generated");
         FileUtils.deleteQuietly(outputDirectory.toFile());
 
         //When
diff --git a/swagger2markup-import-schemas-ext/src/main/java/io/github/swagger2markup/extensions/SchemaExtension.java b/swagger2markup-import-schemas-ext/src/main/java/io/github/swagger2markup/extensions/SchemaExtension.java
@@ -124,19 +124,11 @@ public void apply(Context context) {
 
         if (schemaBaseUri != null) {
             switch (context.getPosition()) {
-                case DOCUMENT_BEFORE:
-                case DOCUMENT_AFTER:
-                case DOCUMENT_BEGIN:
-                case DOCUMENT_END:
-                case DEFINITION_BEGIN:
-                    break;
                 case DEFINITION_END:
                     for (SchemaMetadata schema : DEFAULT_SCHEMAS) {
                         schemaSection(context, schema, levelOffset(context));
                     }
                     break;
-                default:
-                    throw new RuntimeException(String.format("Unknown position '%s'", context.getPosition()));
             }
         }
     }
diff --git a/swagger2markup-import-schemas-ext/src/test/java/io/github/swagger2markup/extensions/SchemaExtensionTest.java b/swagger2markup-import-schemas-ext/src/test/java/io/github/swagger2markup/extensions/SchemaExtensionTest.java
@@ -40,7 +40,7 @@ public class SchemaExtensionTest {
     public void testSwagger2AsciiDocSchemaExtension() throws IOException, URISyntaxException {
         //Given
         Path file = Paths.get(SchemaExtensionTest.class.getResource("/yaml/swagger_petstore.yaml").toURI());
-        Path outputDirectory = Paths.get("build/docs/asciidoc/generated");
+        Path outputDirectory = Paths.get("build/test/asciidoc/generated");
         FileUtils.deleteQuietly(outputDirectory.toFile());
 
         //When
diff --git a/swagger2markup-spring-restdocs-ext/src/test/java/io/github/swagger2markup/extensions/SpringRestDocsExtensionsTest.java b/swagger2markup-spring-restdocs-ext/src/test/java/io/github/swagger2markup/extensions/SpringRestDocsExtensionsTest.java
@@ -53,7 +53,7 @@ public void setUp(){
     public void testSwagger2AsciiDocConversionWithSpringRestDocsExtension() throws IOException, URISyntaxException {
         //Given
         Path file = Paths.get(SpringRestDocsExtensionsTest.class.getResource("/yaml/swagger_petstore.yaml").toURI());
-        Path outputDirectory = Paths.get("build/docs/asciidoc/spring_rest_docs");
+        Path outputDirectory = Paths.get("build/test/asciidoc/spring_rest_docs");
         FileUtils.deleteQuietly(outputDirectory.toFile());
 
         //When
diff --git a/swagger2markup-spring-restdocs-ext/src/test/resources/expected_results/asciidoc/spring_rest_docs/paths.adoc b/swagger2markup-spring-restdocs-ext/src/test/resources/expected_results/asciidoc/spring_rest_docs/paths.adoc

Original file line number	Diff line number	Diff line change
`@@ -124,19 +124,11 @@ public void apply(Context context) {`
`124`	`124`
`125`	`125`	`if (schemaBaseUri != null) {`
`126`	`126`	`switch (context.getPosition()) {`
`127`		`- case DOCUMENT_BEFORE:`
`128`		`- case DOCUMENT_AFTER:`
`129`		`- case DOCUMENT_BEGIN:`
`130`		`- case DOCUMENT_END:`
`131`		`- case DEFINITION_BEGIN:`
`132`		`- break;`
`133`	`127`	`case DEFINITION_END:`
`134`	`128`	`for (SchemaMetadata schema : DEFAULT_SCHEMAS) {`
`135`	`129`	`schemaSection(context, schema, levelOffset(context));`
`136`	`130`	`}`
`137`	`131`	`break;`
`138`		`- default:`
`139`		`- throw new RuntimeException(String.format("Unknown position '%s'", context.getPosition()));`
`140`	`132`	`}`
`141`	`133`	`}`
`142`	`134`	`}`