Skip to content

Commit

Permalink
remove illegal reflective access from freemarker to compiler api; fixes
Browse files Browse the repository at this point in the history 
#1148
  • Loading branch information
@stoicflame
stoicflame committed Dec 29, 2022
1 parent 07cb007 commit 530aad9
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 59 deletions.
40 changes: 20 additions & 20 deletions ...verlay/src/main/resources/com/webcohesion/enunciate/modules/gwt_json_overlay/gwt-type.fmt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,37 +61,37 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final ${classnameFor(member)} get${member.simpleName.toString()?cap_first}() {
return ${classnameFor(member)}.fromString(get${member.simpleName.toString()?cap_first}Internal());
public final ${classnameFor(member)} get${member.simpleNameString?cap_first}() {
return ${classnameFor(member)}.fromString(get${member.simpleNameString?cap_first}Internal());
}

/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} ${member.simpleName}) {
set${member.simpleName.toString()?cap_first}Internal(${member.simpleName} == null ? null : ${member.simpleName}.toString());
public final void set${member.simpleNameString?cap_first}(${classnameFor(member)} ${member.simpleName}) {
set${member.simpleNameString?cap_first}Internal(${member.simpleName} == null ? null : ${member.simpleName}.toString());
}

/**
* Internal (native) getter for the enum property ${member.simpleName}.
*/
private final native String get${member.simpleName.toString()?cap_first}Internal() /*-{
private final native String get${member.simpleNameString?cap_first}Internal() /*-{
return this.${member.name};
}-*/;

/**
* Internal (native) setter for the enum property ${member.simpleName}.
*/
private final native void set${member.simpleName.toString()?cap_first}Internal(String ${member.simpleName}) /*-{
private final native void set${member.simpleNameString?cap_first}Internal(String ${member.simpleName}) /*-{
this.${member.name} = ${member.simpleName};
}-*/;
[#elseif !member.adapted && member.bareAccessorType.enum!false]

/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final ${classnameFor(member.bareAccessorType)}[] get${member.simpleName.toString()?cap_first}() {
com.google.gwt.core.client.JsArrayString _rawItems = get${member.simpleName.toString()?cap_first}Internal();
public final ${classnameFor(member.bareAccessorType)}[] get${member.simpleNameString?cap_first}() {
com.google.gwt.core.client.JsArrayString _rawItems = get${member.simpleNameString?cap_first}Internal();
${classnameFor(member.bareAccessorType)}[] _items = new ${classnameFor(member.bareAccessorType)}[_rawItems.length()];
for (int i = 0; i < _rawItems.length(); i++) {
_items[i] = ${classnameFor(member.bareAccessorType)}.fromString(_rawItems.get(i));
Expand All @@ -102,55 +102,55 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final void set${member.simpleName.toString()?cap_first}(${classnameFor(member.bareAccessorType)}[] ${member.simpleName}) {
public final void set${member.simpleNameString?cap_first}(${classnameFor(member.bareAccessorType)}[] ${member.simpleName}) {
com.google.gwt.core.client.JsArrayString _rawItems = (com.google.gwt.core.client.JsArrayString) com.google.gwt.core.client.JavaScriptObject.createArray();
for (int i = 0; i < ${member.simpleName}.length; i++) {
_rawItems.set(i, ${member.simpleName}[i] == null ? null : ${member.simpleName}[i].toString());
}
set${member.simpleName.toString()?cap_first}Internal(_rawItems);
set${member.simpleNameString?cap_first}Internal(_rawItems);
}

/**
* Internal (native) getter for the enum property ${member.simpleName}.
*/
private final native com.google.gwt.core.client.JsArrayString get${member.simpleName.toString()?cap_first}Internal() /*-{
private final native com.google.gwt.core.client.JsArrayString get${member.simpleNameString?cap_first}Internal() /*-{
return this.${member.name};
}-*/;

/**
* Internal (native) setter for the enum property ${member.simpleName}.
*/
private final native void set${member.simpleName.toString()?cap_first}Internal(com.google.gwt.core.client.JsArrayString ${member.simpleName}) /*-{
private final native void set${member.simpleNameString?cap_first}Internal(com.google.gwt.core.client.JsArrayString ${member.simpleName}) /*-{
this.${member.name} = ${member.simpleName};
}-*/;
[#elseif isAccessorOfTypeLong(member)]

/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final native Long get${member.simpleName.toString()?cap_first}() /*-{
public final native Long get${member.simpleNameString?cap_first}() /*-{
return (this.${member.name} == null ? null : @java.lang.Long::valueOf(Ljava/lang/String;)(this.${member.name} + ''));
}-*/;

/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final native void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
public final native void set${member.simpleNameString?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
this.${member.name} = (${member.simpleName} == null ? null : (+(@java.lang.String::valueOf(Ljava/lang/Object;)(${member.simpleName}))));
}-*/;
[#else]

/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final native ${classnameFor(member)} get${member.simpleName.toString()?cap_first}() /*-{
public final native ${classnameFor(member)} get${member.simpleNameString?cap_first}() /*-{
return this.${member.name};
}-*/;

/**
* ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
public final native void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
public final native void set${member.simpleNameString?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
this.${member.name} = ${member.simpleName};
}-*/;
[#if member.referencesQNameEnum!false]
Expand All @@ -160,17 +160,17 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
*
* @see ${classnameFor(member.QNameEnumRef)}#convertFromKnownQName
*/
public final ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleName.toString()?cap_first}() {
return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleName.toString()?cap_first}());
public final ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleNameString?cap_first}() {
return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleNameString?cap_first}());
}

/**
* Convenience accessor for the known value of a ${member.simpleName} property.
*
* @see ${classnameFor(member.QNameEnumRef)}#convertToKnownQName
*/
public final void setKnown${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)} ${member.simpleName}) {
set${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(${member.simpleName}));
public final void setKnown${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)} ${member.simpleName}) {
set${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(${member.simpleName}));
}
[/#if]
[/#if]
Expand Down
24 changes: 12 additions & 12 deletions ...main/resources/com/webcohesion/enunciate/modules/java_json_client/client-complex-type.fmt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
* ${(type.value.javaDoc.return!type.value.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
@JsonValue
public ${classnameFor(type.value)} get${type.value.simpleName.toString()?cap_first}() {
public ${classnameFor(type.value)} get${type.value.simpleNameString?cap_first}() {
return this._${type.value.simpleName};
}

/**
* ${(type.value.javaDoc.return!type.value.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
@JsonValue
public void set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
public void set${type.value.simpleNameString?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
this._${type.value.simpleName} = _${type.value.simpleName};
}
[#if type.value.referencesQNameEnum!false]
Expand All @@ -92,8 +92,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
* @see ${classnameFor(type.value.QNameEnumRef)}#convertFromKnownQName
*/
@JsonIgnore
public ${classnameFor(type.value.QNameEnumRef)} getKnown${type.value.simpleName.toString()?cap_first}() {
return ${classnameFor(type.value.QNameEnumRef)}.convertFromKnownQName(get${type.value.simpleName.toString()?cap_first}());
public ${classnameFor(type.value.QNameEnumRef)} getKnown${type.value.simpleNameString?cap_first}() {
return ${classnameFor(type.value.QNameEnumRef)}.convertFromKnownQName(get${type.value.simpleNameString?cap_first}());
}

/**
Expand All @@ -102,8 +102,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
* @see ${classnameFor(type.value.QNameEnumRef)}#convertToKnownQName
*/
@JsonIgnore
public void setKnown${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value.QNameEnumRef)} _${type.value.simpleName}) {
set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value.QNameEnumRef)}.convertToKnownQName(_${type.value.simpleName})[#if type.value.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
public void setKnown${type.value.simpleNameString?cap_first}(${classnameFor(type.value.QNameEnumRef)} _${type.value.simpleName}) {
set${type.value.simpleNameString?cap_first}(${classnameFor(type.value.QNameEnumRef)}.convertToKnownQName(_${type.value.simpleName})[#if type.value.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
}
[/#if]
[/#if]
Expand All @@ -129,7 +129,7 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
@JsonFormat( pattern = "${formatInfo.pattern!""}"[#if formatInfo.shape??], shape = JsonFormat.Shape.${formatInfo.shape.name()}[/#if][#if formatInfo.timezone??], timezone = "${formatInfo.timezone}"[/#if][#if formatInfo.locale??], locale = "${formatInfo.locale}"[/#if] )
[/#if]
@JsonProperty( value = "${member.name}", required = ${member.required?c}[#if member.defaultValue??], defaultValue="${member.defaultValue}"[/#if] )
public ${classnameFor(member)} get${member.simpleName.toString()?cap_first}() {
public ${classnameFor(member)} get${member.simpleNameString?cap_first}() {
return this._${member.simpleName};
}

Expand All @@ -147,7 +147,7 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
@JsonTypeInfo( include = JsonTypeInfo.As.${member.subtypeIdInclusion?string}, use = JsonTypeInfo.Id.NAME )
[/#if]
@JsonProperty( value = "${member.name}", required = ${member.required?c}[#if member.defaultValue??], defaultValue="${member.defaultValue}"[/#if] )
public void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} _${member.simpleName}) {
public void set${member.simpleNameString?cap_first}(${classnameFor(member)} _${member.simpleName}) {
this._${member.simpleName} = _${member.simpleName};
}
[#if member.referencesQNameEnum!false]
Expand All @@ -158,8 +158,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
* @see ${classnameFor(member.QNameEnumRef)}#convertFromKnownQName
*/
@JsonIgnore
public ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleName.toString()?cap_first}() {
return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleName.toString()?cap_first}());
public ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleNameString?cap_first}() {
return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleNameString?cap_first}());
}

/**
Expand All @@ -168,8 +168,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
* @see ${classnameFor(member.QNameEnumRef)}#convertToKnownQName
*/
@JsonIgnore
public void setKnown${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)} _${member.simpleName}) {
set${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(_${member.simpleName})[#if member.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
public void setKnown${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)} _${member.simpleName}) {
set${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(_${member.simpleName})[#if member.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
}
[/#if]
[/#if]
Expand Down
4 changes: 2 additions & 2 deletions .../main/resources/com/webcohesion/enunciate/modules/java_json_client/client-simple-type.fmt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ public [#if type.final]final [/#if]class ${type.simpleName} implements java.io.S
* ${(type.value.docComment!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
@JsonValue
public ${classnameFor(type.value)} get${type.value.simpleName.toString()?cap_first}() {
public ${classnameFor(type.value)} get${type.value.simpleNameString?cap_first}() {
return this._${type.value.simpleName};
}

/**
* ${(type.value.docComment!"(no documentation provided)")?chop_linebreak?replace("\n", "\n * ")}
*/
@JsonValue
public void set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
public void set${type.value.simpleNameString?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
this._${type.value.simpleName} = _${type.value.simpleName};
}
}
Expand Down
Loading

0 comments on commit 530aad9

Please sign in to comment.