You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by CMoH <gi...@git.apache.org> on 2015/11/18 14:02:26 UTC
[GitHub] incubator-brooklyn pull request: [BROOKLYN-185] Upgrade swagger to...
GitHub user CMoH opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/1040
[BROOKLYN-185] Upgrade swagger to version 1.5.3
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/CMoH/incubator-brooklyn swagger-1.5.3
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/1040.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1040
----
commit ab086febd400426b6c56d1bc4c0b64147e085588
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-10-19T15:19:41Z
[BROOKLYN-185] Upgrade swagger to 1.5.3
Move from swagger-1.0.1 to 1.5.3
Update annotations on REST API classes
brooklyn-utils-rest-swagger will be updated in another commit
commit f9ca422aeec6852b03bb1d61a0af3b64b2983b88
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-11-09T21:41:32Z
[BROOKLYN-185] Move @Apidoc annotation out of utils-rest-swagger
The REST API and REST API documentation are different responsibilities
and should be split in two separate bundles. They can be aggregated
later on through the UI if needed.
commit fe0071fa9e4126eee5e84b4710a6b049a3a62740
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-10-20T15:55:42Z
[BROOKLYN-185] Move from custom Apidoc annotation to standard swagger
The classes used when implementing the internals of handling the Apidoc
annotation are no longer available in swagger-1.5.3. Porting to the new
internals of swagger may be an option, but the actual number of classes
involved in the API is low enough to allow easy use of standard swagger
annotations.
commit 55c59048fbcc3f3d36c2c4d23f220ad189ee461a
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-10-20T16:18:14Z
[BROOKLYN-185] Remove brooklyn-swagger-annotations
commit 8dea764309fd58ced129c5008db5cd04e012af91
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-10-22T14:42:34Z
[BROOKLYN-185] Add SwaggerFilter to BrooklynRestApiLauncher's defaults
commit 13a97d7db374903fedbd896bb0a78734331bd123
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-10-22T17:24:53Z
[BROOKLYN-185] Revert to original API tags
The @Api description field is no longer used in swagger-1.5.3; move the
description back into the value field.
commit 6ee23828b278390fe662af5e340579df2b732b45
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-10-30T16:38:36Z
[BROOKLYN-185] Update karaf feature dependencies
commit 5c62562640affb17d23eb87048933aa47b8230bd
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-11-09T23:09:54Z
[BROOKLYN-185] Move ApidocResource(s) to swagger 2.0 spec standard
Add SwaggerFilter to web.xml, initializing the appropriate context
parameters for new swagger resource scanners.
Use a custom ApiListingResource instead of swagger-provided resource so
we can use swagger within a jersey servlet filter context.
commit cc56bb27cda7240fc5db8d992c49f6b9873da9fb
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-11-11T02:00:12Z
[BROOKLYN-185] Disable swagger-related tests
swagger-jaxrs-1.5.3 relies on the servlet context to store the
swagger-spec model that is exposed via the rest service. However,
since JerseyTest does not provide the appropriate wiring when using the
default InMemoryTestContainerFactory, we use GrizzlyTestContainerFactory
instead for the swagger test. This is still not enough to fix the tests,
because the grizzly2 container is not properly initialized with the
needed REST resources and their wiring to brooklyn internals.
Disabled all swagger tests for now, while looking for a solution.
commit 9f25ae18abe59e6a154c2c7f1b37c0894c5e3270
Author: Mark McKenna <m4...@gmail.com>
Date: 2015-11-16T15:43:14Z
Added Swagger filter to chain
commit 95da81e373d5c54499caa10c96a3cf301140b078
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-11-16T15:44:36Z
Merge pull request #2 from m4rkmckenna/cmoh-swagger-1.5.3
Fixed issue with swagger API (there is still an issue with JSGUI)
commit 63c575d1233853c5563e84ce8555cc4942a67d9e
Author: Mark McKenna <m4...@gmail.com>
Date: 2015-11-17T14:54:30Z
Added static Swagger UI due to js dependency issue
commit 0a28fc53b68628bf37cdb76a61462d213a3567a3
Author: Ciprian Ciubotariu <ch...@gmx.net>
Date: 2015-11-18T12:50:17Z
Merge pull request #3 from m4rkmckenna/cmoh-swagger-1.5.3
[BROOKLYN-185] Added static swagger-ui avoiding JS dependency changes in main JSGUI
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: [BROOKLYN-185] Upgrade swagger to...
Posted by CMoH <gi...@git.apache.org>.
Github user CMoH commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/1040#issuecomment-157898416
I've added a detailed description in the commit where I disabled the tests (cc56bb27cda7240fc5db8d992c49f6b9873da9fb)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: [BROOKLYN-185] Upgrade swagger to...
Posted by hzbarcea <gi...@git.apache.org>.
Github user hzbarcea commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/1040#issuecomment-157890871
Build ok, tests pass.
Manually tested the swagger rest ui on [localhost](http://localhost:8081/assets/html/swagger-ui.html#/), all good.
@CMoH, @m4rkmckenna , excellent work.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: [BROOKLYN-185] Upgrade swagger to...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/1040
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: [BROOKLYN-185] Upgrade swagger to...
Posted by hzbarcea <gi...@git.apache.org>.
Github user hzbarcea commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/1040#issuecomment-157898807
Doh, makes sense. I will create a jira to track that. Merging shortly...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: [BROOKLYN-185] Upgrade swagger to...
Posted by hzbarcea <gi...@git.apache.org>.
Github user hzbarcea commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/1040#issuecomment-157897657
Reviewed. Looks good.
One minor comment is that the "@author" tags are discouraged, as in time they tend to not reflect the collaborative reality. They are everywhere, so at some point we should probably get rid of them, like many other projects did. Not a priority.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---