summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
93a4aea)
Yang expression "typedef String" leads to java class String,
creating potential naming conflict with java.lang.String.
Few places places in EnumTemplate are fixed by using «String.importedName».
Also, YangModuleInfoTemplate#getExplicitType
no longer removes java.lang unconditionally.
+ Ifs against void are re-ordered to occur sooner in getExplicitType.
Change-Id: If014aca30875589e361733317dfb47eaa07df031
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
«writeEnumeration(enums)»
«writeEnumeration(enums)»
+ «String.importedName» name;
int value;
private static final java.util.Map<java.lang.Integer, «enums.name»> VALUE_MAP;
int value;
private static final java.util.Map<java.lang.Integer, «enums.name»> VALUE_MAP;
- private «enums.name»(int value, String name) {
+ private «enums.name»(int value, «String.importedName» name) {
this.value = value;
this.name = name;
}
this.value = value;
this.name = name;
}
*
* @return the name of the enumeration item as it is specified in the input yang
*/
*
* @return the name of the enumeration item as it is specified in the input yang
*/
- public String getName() {
+ public «String.importedName» getName() {
var StringBuilder builder;
if (typePackageName.equals(importedPackageName)) {
builder = new StringBuilder(type.getName());
var StringBuilder builder;
if (typePackageName.equals(importedPackageName)) {
builder = new StringBuilder(type.getName());
- addActualTypeParameters(builder, type);
if (builder.toString().equals("Void")) {
return "void";
}
if (builder.toString().equals("Void")) {
return "void";
}
+ addActualTypeParameters(builder, type);
- builder = new StringBuilder();
- if (typePackageName.startsWith("java.lang")) {
- builder.append(type.getName());
- } else {
- if (!typePackageName.isEmpty()) {
- builder.append(typePackageName + Constants.DOT + type.getName());
- } else {
- builder.append(type.getName());
- }
- }
if (type.equals(Types.voidType())) {
return "void";
}
if (type.equals(Types.voidType())) {
return "void";
}
+ builder = new StringBuilder();
+ if (!typePackageName.isEmpty()) {
+ builder.append(typePackageName + Constants.DOT + type.getName());
+ } else {
+ builder.append(type.getName());
+ }
addActualTypeParameters(builder, type);
}
return builder.toString();
addActualTypeParameters(builder, type);
}
return builder.toString();