-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Import Statement for BigDecimal not generated
- Loading branch information
Aleksandar Stojsavljevic
committed
Sep 11, 2018
1 parent
0d9cef5
commit 0d78b2f
Showing
18 changed files
with
537 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
src/test/java/com/phoenixnap/oss/ramlplugin/raml2code/github/Issue275RulesTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| package com.phoenixnap.oss.ramlplugin.raml2code.github; | ||
|
|
||
| import static com.phoenixnap.oss.ramlplugin.raml2code.rules.spring.SpringConfigurableRule.CALLABLE_RESPONSE_CONFIGURATION; | ||
| import static com.phoenixnap.oss.ramlplugin.raml2code.rules.spring.SpringConfigurableRule.SIMPLE_RETURN_TYPES; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import com.phoenixnap.oss.ramlplugin.raml2code.data.ApiResourceMetadata; | ||
| import com.phoenixnap.oss.ramlplugin.raml2code.plugin.Config; | ||
| import com.phoenixnap.oss.ramlplugin.raml2code.rules.ConfigurableRule; | ||
| import com.phoenixnap.oss.ramlplugin.raml2code.rules.GitHubAbstractRuleTestBase; | ||
| import com.phoenixnap.oss.ramlplugin.raml2code.rules.Spring4ControllerDecoratorRule; | ||
| import com.phoenixnap.oss.ramlplugin.raml2code.rules.Spring4ControllerInterfaceRule; | ||
| import com.phoenixnap.oss.ramlplugin.raml2code.rules.Spring4RestTemplateClientRule; | ||
| import com.phoenixnap.oss.ramlplugin.raml2code.rules.TestPojoConfig; | ||
| import com.sun.codemodel.JCodeModel; | ||
| import com.sun.codemodel.JDefinedClass; | ||
|
|
||
| /** | ||
| * @author aleksandars | ||
| * @since 2.0.4 | ||
| */ | ||
| public class Issue275RulesTest extends GitHubAbstractRuleTestBase { | ||
|
|
||
| private ConfigurableRule<JCodeModel, JDefinedClass, ApiResourceMetadata> rule; | ||
|
|
||
| @Test | ||
| public void validate_basic_interface_rule() throws Exception { | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(true); | ||
| loadRaml("issue-275.raml"); | ||
| rule = new Spring4ControllerInterfaceRule(); | ||
| rule.apply(getControllerMetadata(), jCodeModel); | ||
| verifyGeneratedCode("Issue275-1Spring4ControllerInterface"); | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(false); | ||
| } | ||
|
|
||
| @Test | ||
| public void validate_callable_interface_rule() throws Exception { | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(true); | ||
| loadRaml("issue-275.raml"); | ||
| rule = new Spring4ControllerInterfaceRule(); | ||
|
|
||
| Map<String, String> configuration = new HashMap<>(); | ||
| configuration.put(CALLABLE_RESPONSE_CONFIGURATION, "true"); | ||
| rule.applyConfiguration(configuration); | ||
|
|
||
| rule.apply(getControllerMetadata(), jCodeModel); | ||
| verifyGeneratedCode("Issue275-2Spring4ControllerInterface"); | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(false); | ||
| } | ||
|
|
||
| @Test | ||
| public void validate_simple_return_type_interface_rule() throws Exception { | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(true); | ||
| loadRaml("issue-275.raml"); | ||
| rule = new Spring4ControllerInterfaceRule(); | ||
|
|
||
| Map<String, String> configuration = new HashMap<>(); | ||
| configuration.put(SIMPLE_RETURN_TYPES, "true"); | ||
| rule.applyConfiguration(configuration); | ||
|
|
||
| rule.apply(getControllerMetadata(), jCodeModel); | ||
| verifyGeneratedCode("Issue275-3Spring4ControllerInterface"); | ||
| } | ||
|
|
||
| @Test | ||
| public void validate_basic_decorator_rule() throws Exception { | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(true); | ||
| loadRaml("issue-275.raml"); | ||
| rule = new Spring4ControllerDecoratorRule(); | ||
| rule.apply(getControllerMetadata(), jCodeModel); | ||
| verifyGeneratedCode("Issue275-1Spring4ControllerDecorator"); | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(false); | ||
| } | ||
|
|
||
| @Test | ||
| public void validate_callable_decorator_rule() throws Exception { | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(true); | ||
| loadRaml("issue-275.raml"); | ||
| rule = new Spring4ControllerDecoratorRule(); | ||
|
|
||
| Map<String, String> configuration = new HashMap<>(); | ||
| configuration.put(CALLABLE_RESPONSE_CONFIGURATION, "true"); | ||
| rule.applyConfiguration(configuration); | ||
|
|
||
| rule.apply(getControllerMetadata(), jCodeModel); | ||
| verifyGeneratedCode("Issue275-2Spring4ControllerDecorator"); | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(false); | ||
| } | ||
|
|
||
| @Test | ||
| public void validate_simple_return_type_decorator_rule() throws Exception { | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(true); | ||
| loadRaml("issue-275.raml"); | ||
| rule = new Spring4ControllerDecoratorRule(); | ||
|
|
||
| Map<String, String> configuration = new HashMap<>(); | ||
| configuration.put(SIMPLE_RETURN_TYPES, "true"); | ||
| rule.applyConfiguration(configuration); | ||
|
|
||
| rule.apply(getControllerMetadata(), jCodeModel); | ||
| verifyGeneratedCode("Issue275-3Spring4ControllerDecorator"); | ||
| } | ||
|
|
||
| @Test | ||
| public void validate_basic_client_rule() throws Exception { | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(true); | ||
| loadRaml("issue-275.raml"); | ||
| rule = new Spring4RestTemplateClientRule(); | ||
| rule.apply(getControllerMetadata(), jCodeModel); | ||
| verifyGeneratedCode("Issue275-Spring4RestTemplateClient"); | ||
| ((TestPojoConfig) Config.getPojoConfig()).setUseBigDecimals(false); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #%RAML 1.0 | ||
| title: Number as bigdecimal | ||
| version: 1.0 | ||
|
|
||
| /number: | ||
| get: | ||
| description: Returns the winning number. | ||
| queryParameters: | ||
| name: string | ||
| responses: | ||
| 200: | ||
| body: | ||
| application/json: | ||
| type: number |
64 changes: 64 additions & 0 deletions
64
src/test/resources/validations/github/Issue275-1Spring4ControllerDecorator.java.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| -----------------------------------com.gen.test.NumberController.java----------------------------------- | ||
|
|
||
| package com.gen.test; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import org.springframework.http.ResponseEntity; | ||
|
|
||
|
|
||
| /** | ||
| * No description | ||
| * (Generated with springmvc-raml-parser v.@project.version@) | ||
| * | ||
| */ | ||
| public interface NumberController { | ||
|
|
||
|
|
||
| /** | ||
| * Returns the winning number. | ||
| * | ||
| */ | ||
| public ResponseEntity<BigDecimal> getBigDecimalByName(String name); | ||
|
|
||
| } | ||
| -----------------------------------com.gen.test.NumberControllerDecorator.java----------------------------------- | ||
|
|
||
| package com.gen.test; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.validation.annotation.Validated; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestMethod; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
|
|
||
| /** | ||
| * No description | ||
| * (Generated with springmvc-raml-parser v.@project.version@) | ||
| * | ||
| */ | ||
| @RestController | ||
| @RequestMapping("/api/number") | ||
| @Validated | ||
| public class NumberControllerDecorator | ||
| implements NumberController | ||
| { | ||
|
|
||
| @Autowired | ||
| private NumberController numberControllerDelegate; | ||
|
|
||
| /** | ||
| * Returns the winning number. | ||
| * | ||
| */ | ||
| @RequestMapping(value = "", method = RequestMethod.GET) | ||
| public ResponseEntity<BigDecimal> getBigDecimalByName( | ||
| @RequestParam | ||
| String name) { | ||
| return this.numberControllerDelegate.getBigDecimalByName(name); | ||
| } | ||
|
|
||
| } |
34 changes: 34 additions & 0 deletions
34
src/test/resources/validations/github/Issue275-1Spring4ControllerInterface.java.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| -----------------------------------com.gen.test.NumberController.java----------------------------------- | ||
|
|
||
| package com.gen.test; | ||
|
|
||
| import java.math.BigDecimal; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.validation.annotation.Validated; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestMethod; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
|
|
||
| /** | ||
| * No description | ||
| * (Generated with springmvc-raml-parser v.@project.version@) | ||
| * | ||
| */ | ||
| @RestController | ||
| @Validated | ||
| @RequestMapping("/api/number") | ||
| public interface NumberController { | ||
|
|
||
|
|
||
| /** | ||
| * Returns the winning number. | ||
| * | ||
| */ | ||
| @RequestMapping(value = "", method = RequestMethod.GET) | ||
| public ResponseEntity<BigDecimal> getBigDecimalByName( | ||
| @RequestParam | ||
| String name); | ||
|
|
||
| } |
Oops, something went wrong.