Skip to content

Support for file based config. Implementation for #616. #805

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
Merged
merged 19 commits into from
Jun 2, 2015
Merged

Support for file based config. Implementation for #616. #805

merged 19 commits into from
Jun 2, 2015

Conversation

hyeghiazaryan
Copy link
Contributor

Implementation for #616

This adds file based config support: --config @config.json

File format

{
  "classPrefix":"MyProj",
  "sourceFolder":"my_proj_client"
}

hrachya added 16 commits May 26, 2015 15:49
new CliOption class for wrapping org.apache.commons.cli.Option
f8cafaa
add List<CliOption> cliOptions() method to CodegenConfig interface wi…
9f15040 
…th default implementation in DefaultCodegen
Get all cliOptions for available codegen configs and add to command l…
33436d6 
…ine options

Add all the specified ones to clientOpts properties
Use new functionality to add 't' as a command line option to set 'tem…
d7dec5a 
…plateDir'
Add 'modelPackage' and 'apiPackage' as command line options
e08a5a9 
Add setters for modelPackage and apiPackage
Add 'invokerPackage', 'groupId', 'arifactId', 'artifactVersion', 'sou…
1e09f51 
…rceFolder' command line options for java (and all the derived ones jaxrs, spring-mvc ...)

Add processOpts override to process java  specific options
Move supporting file initialization from constructor to processOpts, since it uses some of the options that are not yet set in the constructor
Add setters
removing extra file, was committed by mistake
74f5c76
Rolling back changes to deprecated class
a9e767c
Changing templateDir back to explicit option for cli
2cca1a8
Adding Config and ConfigParser classes
c3055c7
new -c/--config option for swagger-cli to specify json config file path
c9c58cb 
setting options passed in config file if those were allowed by lang specific CodegenConfig
adding classPrefix, sourceFolder, projectName cli options to objc
26a2290
fixing typo
c5a7800
fixing property name
08647b3
Simplifying CliOption class
1f36096
Adding config-help command
ba7025d
@who
Copy link
Contributor

who commented May 29, 2015

👍

@lakeba
Copy link

lakeba commented May 29, 2015

Can we please merge the pulls from @wing328 in the developer 2.0? I really need it for my production project !!! thank you in advance.

@who
Copy link
Contributor

who commented May 29, 2015

@uniprof This PR thread is not the correct place to ask for that, as it is unrelated to your request. Please ask in the correct place.

@who
Copy link
Contributor

who commented May 29, 2015

@fehguy @olensmar @webron

+1 to merge this PR from @hyeghiazaryan.

@olensmar olensmar mentioned this pull request May 29, 2015
Merged
@hyeghiazaryan hyeghiazaryan changed the title Develop 2.0 Support for file based config. Implementation for #616. May 29, 2015
@hyeghiazaryan
Copy link
Contributor Author

Example of client output when running config-help command

java -jar swagger-codegen-cli.jar config-help -l objc

CONFIG OPTIONS
    modelPackage
        package for generated models

    apiPackage
        package for generated api classes

    classPrefix
        prefix for generated classes

    sourceFolder
        source folder for generated code

    projectName
        name of the Xcode project in generated Podfile

java -jar swagger-codegen-cli.jar config-help -l java

CONFIG OPTIONS
    modelPackage
        package for generated models

    apiPackage
        package for generated api classes

    invokerPackage
        root package for generated code

    groupId
        groupId in generated pom.xml

    artifactId
        groupId in generated pom.xml

    artifactVersion
        artifact version in generated pom.xml

    sourceFolder
        source folder for generated code

@webron
Copy link
Contributor

webron commented May 29, 2015

@hyeghiazaryan - it's up to @fehguy to merge it, but I would appreciate either a modification to the README.md or an additional file with documentation for this feature (linked from the main README).

@hyeghiazaryan
Copy link
Contributor Author

Valid point @webron, I'll modify the README.md.

xhh
xhh reviewed May 30, 2015
View reviewed changes
modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/ConfigHelp.java
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would better to remove these comments to be consistent with other files in the repo

olensmar
olensmar reviewed Jun 2, 2015
View reviewed changes
modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/ConfigHelp.java
@@ -0,0 +1,54 @@
/*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please either remove this header or add the Apache 2.0 License header

@olensmar
Copy link
Contributor

olensmar commented Jun 2, 2015

Looks great - I'd love to merge this - please fix the file headers as indicated in the comments first - thank you!

olensmar pushed a commit that referenced this pull request Jun 2, 2015
Merge pull request #805 from hyeghiazaryan/develop_2.0
2662167 
Support for file based config. Implementation for #616.
@olensmar olensmar merged commit 2662167 into swagger-api:develop_2.0 Jun 2, 2015
@olensmar
Copy link
Contributor

olensmar commented Jun 2, 2015

thank you!

@who who mentioned this pull request Jun 2, 2015
Merged
@wing328 wing328 mentioned this pull request Jun 16, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@hyeghiazaryan @who @lakeba @webron @olensmar @xhh