From 1e7c51a2cbb05742c6b9f7041efa2730f41bbfcb Mon Sep 17 00:00:00 2001 From: Hugo de Paix de Coeur Date: Tue, 1 Mar 2016 18:31:13 +0100 Subject: [PATCH] Removed file prefixes from dynamic content extensions --- ...s-def-end-example.adoc => def-end-example.adoc} | 0 ...ops-op-end-example.adoc => op-end-example.adoc} | 0 ...ndefs-def-end-example.md => def-end-example.md} | 0 ...{dynops-op-end-example.md => op-end-example.md} | 0 .../DynamicDefinitionsContentExtension.java | 14 +++++++------- .../DynamicOperationsContentExtension.java | 14 +++++++------- .../DynamicOverviewContentExtension.java | 10 +++++----- .../DynamicSecurityContentExtension.java | 10 +++++----- 8 files changed, 24 insertions(+), 24 deletions(-) rename src/docs/asciidoc/extensions/Pet/{dyndefs-def-end-example.adoc => def-end-example.adoc} (100%) rename src/docs/asciidoc/extensions/updatePet/{dynops-op-end-example.adoc => op-end-example.adoc} (100%) rename src/docs/markdown/extensions/Pet/{dyndefs-def-end-example.md => def-end-example.md} (100%) rename src/docs/markdown/extensions/updatePet/{dynops-op-end-example.md => op-end-example.md} (100%) diff --git a/src/docs/asciidoc/extensions/Pet/dyndefs-def-end-example.adoc b/src/docs/asciidoc/extensions/Pet/def-end-example.adoc similarity index 100% rename from src/docs/asciidoc/extensions/Pet/dyndefs-def-end-example.adoc rename to src/docs/asciidoc/extensions/Pet/def-end-example.adoc diff --git a/src/docs/asciidoc/extensions/updatePet/dynops-op-end-example.adoc b/src/docs/asciidoc/extensions/updatePet/op-end-example.adoc similarity index 100% rename from src/docs/asciidoc/extensions/updatePet/dynops-op-end-example.adoc rename to src/docs/asciidoc/extensions/updatePet/op-end-example.adoc diff --git a/src/docs/markdown/extensions/Pet/dyndefs-def-end-example.md b/src/docs/markdown/extensions/Pet/def-end-example.md similarity index 100% rename from src/docs/markdown/extensions/Pet/dyndefs-def-end-example.md rename to src/docs/markdown/extensions/Pet/def-end-example.md diff --git a/src/docs/markdown/extensions/updatePet/dynops-op-end-example.md b/src/docs/markdown/extensions/updatePet/op-end-example.md similarity index 100% rename from src/docs/markdown/extensions/updatePet/dynops-op-end-example.md rename to src/docs/markdown/extensions/updatePet/op-end-example.md diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicDefinitionsContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicDefinitionsContentExtension.java index ff979cb9..eb1c9e18 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicDefinitionsContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicDefinitionsContentExtension.java @@ -14,18 +14,18 @@ import static org.apache.commons.lang3.StringUtils.defaultString; /** * Dynamically search for markup files in {@code contentPath} to append in Definitions, with the format :
- * - {@code dyndefs-doc-before-*.} : import before Definitions document with levelOffset = 0
- * - {@code dyndefs-doc-after-*.} : import after Definitions document with levelOffset = 0
- * - {@code dyndefs-doc-begin-*.} : import just after Definitions document main title with levelOffset = 1
- * - {@code dyndefs-doc-end-*.} : import at the end of Definitions document with levelOffset = 1
- * - {@code dyndefs-def-begin-*.} : import just after each definition title with levelOffset = 2
- * - {@code dyndefs-def-end-*.} : import at the end of each definition with levelOffset = 2
+ * - {@code doc-before-*.} : import before Definitions document with levelOffset = 0
+ * - {@code doc-after-*.} : import after Definitions document with levelOffset = 0
+ * - {@code doc-begin-*.} : import just after Definitions document main title with levelOffset = 1
+ * - {@code doc-end-*.} : import at the end of Definitions document with levelOffset = 1
+ * - {@code def-begin-*.} : import just after each definition title with levelOffset = 2
+ * - {@code def-end-*.} : import at the end of each definition with levelOffset = 2
*

* Markup files are appended in the natural order of their names, for each category. */ public class DynamicDefinitionsContentExtension extends DefinitionsContentExtension { - protected static final String EXTENSION_FILENAME_PREFIX = "dyndefs-"; + protected static final String EXTENSION_FILENAME_PREFIX = ""; private static final Logger logger = LoggerFactory.getLogger(DynamicDefinitionsContentExtension.class); protected Path contentPath; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOperationsContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOperationsContentExtension.java index 18992aa4..fa0714e4 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOperationsContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOperationsContentExtension.java @@ -14,18 +14,18 @@ import static org.apache.commons.lang3.StringUtils.defaultString; /** * Dynamically search for markup files in {@code contentPath} to append to Operations, with the format :
- * - {@code dynops-doc-before-*.} : import before Paths document with levelOffset = 0
- * - {@code dynops-doc-after-*.} : import after Paths document with levelOffset = 0
- * - {@code dynops-doc-begin-*.} : import just after Paths document main title with levelOffset = 1
- * - {@code dynops-doc-end-*.} : import at the end of Paths document with levelOffset = 1
- * - {@code dynops-op-begin-*.} : import just after each operation title with levelOffset = 2(GroupBy.AS_IS) | 3(GroupBy.TAGS)
- * - {@code dynops-op-end-*.} : import at the end of each operation with levelOffset = 2(GroupBy.AS_IS) | 3(GroupBy.TAGS)
+ * - {@code doc-before-*.} : import before Paths document with levelOffset = 0
+ * - {@code doc-after-*.} : import after Paths document with levelOffset = 0
+ * - {@code doc-begin-*.} : import just after Paths document main title with levelOffset = 1
+ * - {@code doc-end-*.} : import at the end of Paths document with levelOffset = 1
+ * - {@code op-begin-*.} : import just after each operation title with levelOffset = 2(GroupBy.AS_IS) | 3(GroupBy.TAGS)
+ * - {@code op-end-*.} : import at the end of each operation with levelOffset = 2(GroupBy.AS_IS) | 3(GroupBy.TAGS)
*

* Markup files are appended in the natural order of their names, for each category. */ public class DynamicOperationsContentExtension extends OperationsContentExtension { - protected static final String EXTENSION_FILENAME_PREFIX = "dynops-"; + protected static final String EXTENSION_FILENAME_PREFIX = ""; private static final Logger logger = LoggerFactory.getLogger(DynamicOperationsContentExtension.class); protected Path contentPath; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOverviewContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOverviewContentExtension.java index 41c09ff9..bce63df8 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOverviewContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicOverviewContentExtension.java @@ -13,16 +13,16 @@ import static org.apache.commons.lang3.StringUtils.defaultString; /** * Dynamically search for markup files in {@code contentPath} to append to Overview, with the format :
- * - {@code dynoview-doc-before-*.} : import before Overview document with levelOffset = 0
- * - {@code dynoview-doc-after-*.} : import after Overview document with levelOffset = 0
- * - {@code dynoview-doc-begin-*.} : import just after Overview document main title with levelOffset = 1
- * - {@code dynoview-doc-end-*.} : import at the end of Overview document with levelOffset = 1
+ * - {@code doc-before-*.} : import before Overview document with levelOffset = 0
+ * - {@code doc-after-*.} : import after Overview document with levelOffset = 0
+ * - {@code doc-begin-*.} : import just after Overview document main title with levelOffset = 1
+ * - {@code doc-end-*.} : import at the end of Overview document with levelOffset = 1
*

* Markup files are appended in the natural order of their names, for each category. */ public class DynamicOverviewContentExtension extends OverviewContentExtension { - protected static final String EXTENSION_FILENAME_PREFIX = "dynoview-"; + protected static final String EXTENSION_FILENAME_PREFIX = ""; private static final Logger logger = LoggerFactory.getLogger(DynamicOverviewContentExtension.class); protected Path contentPath; diff --git a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicSecurityContentExtension.java b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicSecurityContentExtension.java index f6c4ef0b..dc172807 100644 --- a/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicSecurityContentExtension.java +++ b/src/main/java/io/github/robwin/swagger2markup/extension/repository/DynamicSecurityContentExtension.java @@ -13,16 +13,16 @@ import static org.apache.commons.lang3.StringUtils.defaultString; /** * Dynamically search for markup files in {@code contentPath} to append to Overview, with the format :
- * - {@code dynsec-doc-before-*.} : import before Overview document with levelOffset = 0
- * - {@code dynsec-doc-after-*.} : import after Overview document with levelOffset = 0
- * - {@code dynsec-doc-begin-*.} : import just after Overview document main title with levelOffset = 1
- * - {@code dynsec-doc-end-*.} : import at the end of Overview document with levelOffset = 1
+ * - {@code doc-before-*.} : import before Overview document with levelOffset = 0
+ * - {@code doc-after-*.} : import after Overview document with levelOffset = 0
+ * - {@code doc-begin-*.} : import just after Overview document main title with levelOffset = 1
+ * - {@code doc-end-*.} : import at the end of Overview document with levelOffset = 1
*

* Markup files are appended in the natural order of their names, for each category. */ public class DynamicSecurityContentExtension extends SecurityContentExtension { - protected static final String EXTENSION_FILENAME_PREFIX = "dynsec-"; + protected static final String EXTENSION_FILENAME_PREFIX = ""; private static final Logger logger = LoggerFactory.getLogger(DynamicSecurityContentExtension.class); protected Path contentPath;