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

feat: add support for additionalProperties (#272) #273

Merged
merged 10 commits into from
Oct 11, 2023
Merged

feat: add support for additionalProperties (#272) #273

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b10c94
feat: Add support for additionalProperties (#272)
JapuDCret Jan 27, 2023
8345428
fix: Map imports (#272)
JapuDCret Jan 27, 2023
fba26f7
fix: Allow additionalProperties=false (#272)
JapuDCret Jan 27, 2023
3fa7e8b
test: Extend test case for boolean (#272)
JapuDCret May 19, 2023
df823ae
test: Extend test case for oneOf (#272)
JapuDCret May 19, 2023
04d2fa5
rework: Remove else-branch to check value (#272)
JapuDCret May 19, 2023
2eaaa3f
Merge branch 'master' into master
Tenischev May 25, 2023
88faa64
Merge remote-tracking branch 'origin/master' into pr/273
Tenischev Oct 11, 2023
e1034c3
update from master, fix order of imports and tests
Tenischev Oct 11, 2023
bffdcd5
fix case when `additionalProperties = true`
Tenischev Oct 11, 2023
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
10 changes: 9 additions & 1 deletion filters/all.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ const filter = module.exports;
const _ = require('lodash');

function defineType(prop, propName) {
if (prop.type() === 'object') {
if (prop.additionalProperties()) {
Tenischev marked this conversation as resolved.
Show resolved Hide resolved
if (prop.additionalProperties().type() === 'object') {
return 'Map<String, ' + _.upperFirst(_.camelCase(prop.additionalProperties().uid())) + '>';
} else if (prop.additionalProperties().format()) {
return 'Map<String, ' + toClass(toJavaType(prop.additionalProperties().format())) + '>';
} else if (prop.additionalProperties().type()) {
return 'Map<String, ' + toClass(toJavaType(prop.additionalProperties().type())) + '>';
}
} else if (prop.type() === 'object') {
return _.upperFirst(_.camelCase(prop.uid()));
} else if (prop.type() === 'array') {
if (prop.items().type() === 'object') {
Expand Down
3 changes: 2 additions & 1 deletion template/src/main/java/com/asyncapi/model/$$message$$.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import javax.validation.Valid;

import java.util.Objects;
import java.util.List;
import java.util.Map;
import java.util.Objects;

{% if message.description() or message.examples()%}/**{% for line in message.description() | splitByLines %}
* {{ line | safe}}{% endfor %}{% if message.examples() %}
Expand Down
11 changes: 10 additions & 1 deletion template/src/main/java/com/asyncapi/model/$$objectSchema$$.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.fasterxml.jackson.annotation.JsonValue;

import java.util.List;
import java.util.Map;
import java.util.Objects;

{% if schema.description() or schema.examples() %}/**{% for line in schema.description() | splitByLines %}
Expand All @@ -17,7 +18,15 @@
public class {{schemaName | camelCase | upperFirst}} {
{% for propName, prop in schema.properties() %}
{%- set isRequired = propName | isRequired(schema.required()) %}
{%- if prop.type() === 'object' %}
{%- if prop.additionalProperties() %}
{%- if prop.additionalProperties().type() === 'object' %}
Tenischev marked this conversation as resolved.
Show resolved Hide resolved
private @Valid Map<String, {{prop.additionalProperties().uid() | camelCase | upperFirst}}> {{propName | camelCase}};
{%- elif prop.additionalProperties().format() %}
private @Valid Map<String, {{prop.additionalProperties().format() | toJavaType | toClass}}> {{propName | camelCase}};
{%- elif prop.additionalProperties().type() %}
private @Valid Map<String, {{prop.additionalProperties().type() | toJavaType | toClass}}> {{propName | camelCase}};
{%- endif %}
{%- elif prop.type() === 'object' %}
private @Valid {{prop.uid() | camelCase | upperFirst}} {{propName | camelCase}};
{%- elif prop.type() === 'array' %}
{%- if prop.items().type() === 'object' %}
Expand Down
1 change: 1 addition & 0 deletions tests/__snapshots__/additional-formats.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;

import java.util.List;
import java.util.Map;
import java.util.Objects;


Expand Down
4 changes: 3 additions & 1 deletion tests/__snapshots__/kafka.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;

import java.util.List;
import java.util.Map;
import java.util.Objects;


Expand Down Expand Up @@ -250,8 +251,9 @@ exports[`template integration tests for generated files using the generator and

import javax.validation.Valid;

import java.util.Objects;
import java.util.List;
import java.util.Map;
import java.util.Objects;


public class LightMeasured {
Expand Down