Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to swagger-ui v3 #76

Merged
merged 10 commits into from Sep 8, 2017
Merged

Upgrade to swagger-ui v3 #76

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8438f80
Initial work at upgrading to Swagger UI v3
jplock Mar 25, 2017
cf7e801
Upgrade to swagger-ui v3.0.6
jplock Apr 17, 2017
76e61c1
Upgrade test plugins to 2.20
jplock Apr 17, 2017
ecbc3c0
Upgrade to swagger-ui v3.0.11
jplock May 21, 2017
2e0e77f
Merge branch 'master' into jp-swagger-ui3
jplock May 21, 2017
87dd7da
Upgrade to swagger-ui v3.0.12
jplock May 28, 2017
a153a64
feat(oauth2): upgrade oauth2 support to work with swagger v3
akraxx Jun 17, 2017
de646a9
Merge pull request #83 from akraxx/oauth2_support_swagger_v3
jplock Jun 17, 2017
166590b
Upgrade to swagger-ui v3.0.18
jplock Jul 10, 2017
5d1dbf8
Upgrade to swagger-ui v3.1.7
jplock Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -245,7 +245,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.20</version>
<configuration>
<excludes>
<exclude>**/*SeleniumTest.java</exclude>
Expand All @@ -257,7 +257,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>2.20</version>
<configuration>
<includes>
<include>**/*SeleniumTest.java</include>
Expand Down
220 changes: 118 additions & 102 deletions src/main/resources/io/federecio/dropwizard/swagger/index.ftl
View file
Open in desktop
@@ -1,112 +1,128 @@
<#-- @ftlvariable name="" type="io.federecio.dropwizard.swagger.SwaggerView" -->
<!-- HTML for static distribution bundle build -->
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="x-ua-compatible" content="IE=edge">
<title>${title}</title>
<link rel="icon" type="image/png" href="${swaggerAssetsPath}/images/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="${swaggerAssetsPath}/images/favicon-16x16.png" sizes="16x16" />
<link href='${swaggerAssetsPath}/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
<link href='${swaggerAssetsPath}/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
<link href='${swaggerAssetsPath}/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
<link href='${swaggerAssetsPath}/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
<link href='${swaggerAssetsPath}/css/print.css' media='print' rel='stylesheet' type='text/css'/>

<script src='${swaggerAssetsPath}/lib/object-assign-pollyfill.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/jquery.slideto.min.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/jquery.wiggle.min.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/handlebars-4.0.5.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/lodash.min.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/backbone-min.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/swagger-ui.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/jsoneditor.min.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/marked.js' type='text/javascript'></script>
<script src='${swaggerAssetsPath}/lib/swagger-oauth.js' type='text/javascript'></script>

<!-- Some basic translations -->
<!-- <script src='${swaggerAssetsPath}/lang/translator.js' type='text/javascript'></script> -->
<!-- <script src='${swaggerAssetsPath}/lang/ru.js' type='text/javascript'></script> -->
<!-- <script src='${swaggerAssetsPath}/lang/en.js' type='text/javascript'></script> -->

<script type="text/javascript">
$(function () {
hljs.configure({
highlightSizeThreshold: 5000
});

// Pre load translate...
if(window.SwaggerTranslator) {
window.SwaggerTranslator.translate();
}
window.swaggerUi = new SwaggerUi({
url: "${contextPath}/swagger.json",
<#if validatorUrl??>
validatorUrl: "${validatorUrl}",
<#else>
validatorUrl: null,
</#if>
dom_id: "swagger-ui-container",
supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
onComplete: function(swaggerApi, swaggerUi){
if(typeof initOAuth == "function") {
initOAuth({
clientId: "${oauth2Configuration.clientId!"your-client-id"}",
clientSecret: "${oauth2Configuration.clientSecret!"your-client-secret-if-required"}",
realm: "${oauth2Configuration.realm!"your-realms"}",
appName: "${oauth2Configuration.appName!"your-app-name"}",
scopeSeparator: "${oauth2Configuration.scopeSeparator!" "}",
additionalQueryStringParams: {
<#list oauth2Configuration.additionalQueryStringParams?keys as additionalQueryStringParamKey>
"${additionalQueryStringParamKey}": "${oauth2Configuration.additionalQueryStringParams[additionalQueryStringParamKey]}"
</#list>
}
});
}
<title>Swagger UI</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="${swaggerAssetsPath}/swagger-ui.css" >
<link rel="icon" type="image/png" href="${swaggerAssetsPath}/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="${swaggerAssetsPath}/favicon-16x16.png" sizes="16x16" />
<style>
html
{
box-sizing: border-box;
overflow: -moz-scrollbars-vertical;
overflow-y: scroll;
}
*,
*:before,
*:after
{
box-sizing: inherit;
}

body {
margin:0;
background: #fafafa;
}
</style>
</head>

<body>

<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
<defs>
<symbol viewBox="0 0 20 20" id="unlocked">
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
</symbol>

<symbol viewBox="0 0 20 20" id="locked">
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
</symbol>

<symbol viewBox="0 0 20 20" id="close">
<path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
</symbol>

<symbol viewBox="0 0 20 20" id="large-arrow">
<path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
</symbol>

<symbol viewBox="0 0 20 20" id="large-arrow-down">
<path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
</symbol>

if(window.SwaggerTranslator) {
window.SwaggerTranslator.translate();

<symbol viewBox="0 0 24 24" id="jump-to">
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
</symbol>

<symbol viewBox="0 0 24 24" id="expand">
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
</symbol>

</defs>
</svg>

<div id="swagger-ui"></div>

<script src="${swaggerAssetsPath}/swagger-ui-bundle.js"> </script>
<script src="${swaggerAssetsPath}/swagger-ui-standalone-preset.js"> </script>
<script>
window.onload = function() {
// Build a system
const ui = SwaggerUIBundle({
url: "${contextPath}/swagger.json",
<#if validatorUrl??>
validatorUrl: "${validatorUrl}",
<#else>
validatorUrl: null,
</#if>
dom_id: '#swagger-ui',
supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
onComplete: function(swaggerApi, swaggerUi){
if(typeof initOAuth == "function") {
initOAuth({
clientId: "${oauth2Configuration.clientId!"your-client-id"}",
clientSecret: "${oauth2Configuration.clientSecret!"your-client-secret-if-required"}",
realm: "${oauth2Configuration.realm!"your-realms"}",
appName: "${oauth2Configuration.appName!"your-app-name"}",
scopeSeparator: "${oauth2Configuration.scopeSeparator!" "}",
additionalQueryStringParams: {
<#list oauth2Configuration.additionalQueryStringParams?keys as additionalQueryStringParamKey>
"${additionalQueryStringParamKey}": "${oauth2Configuration.additionalQueryStringParams[additionalQueryStringParamKey]}"
</#list>
}
},
onFailure: function(data) {
log("Unable to Load SwaggerUI");
},
docExpansion: "none",
jsonEditor: false,
apisSorter: "alpha",
defaultModelRendering: 'schema',
showRequestHeaders: false,
showOperationIds: false
});

window.swaggerUi.load();

function log() {
if ('console' in window) {
console.log.apply(console, arguments);
}
});
}
});
</script>
</head>

<body class="swagger-section">
<div id='header'>
<div class="swagger-ui-wrap">
<a id="logo" href="http://swagger.io"><img class="logo__img" alt="swagger" height="30" width="30" src="${swaggerAssetsPath}/images/logo_small.png" /><span class="logo__title">swagger</span></a>
<form id='api_selector'>
<div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
<div id='auth_container'></div>
<div class='input'><a id="explore" class="header__btn" href="#" data-sw-translate>Explore</a></div>
</form>
</div>
</div>

<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
if(window.SwaggerTranslator) {
window.SwaggerTranslator.translate();
}
},
onFailure: function(data) {
log("Unable to Load SwaggerUI");
},
docExpansion: "none",
jsonEditor: false,
apisSorter: "alpha",
defaultModelRendering: 'schema',
showRequestHeaders: false,
presets: [
SwaggerUIBundle.presets.apis,
SwaggerUIStandalonePreset
],
plugins: [
SwaggerUIBundle.plugins.DownloadUrl
],
layout: "StandaloneLayout"
})

window.ui = ui
}
</script>
</body>

</html>
1 change: 0 additions & 1 deletion src/main/resources/swagger-static/css/print.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/swagger-static/css/reset.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/swagger-static/css/screen.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/swagger-static/css/style.css
View file
Open in desktop

This file was deleted.

Empty file removed src/main/resources/swagger-static/css/typography.css
View file
Open in desktop
Empty file.
0 ...s/swagger-static/images/favicon-16x16.png → ...esources/swagger-static/favicon-16x16.png 100755 → 100644
View file
Open in desktop
File renamed without changes
0 ...s/swagger-static/images/favicon-32x32.png → ...esources/swagger-static/favicon-32x32.png 100755 → 100644
View file
Open in desktop
File renamed without changes
Binary file removed src/main/resources/swagger-static/fonts/DroidSans-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/fonts/DroidSans.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/collapse.gif
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/expand.gif
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/explorer_icons.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/logo_small.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/pet_store_api.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/throbber.gif
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/swagger-static/images/wordnik_api.png
View file
Open in desktop
Binary file not shown.