Follow-up patch for Yangtools API change:
https://git.opendaylight.org/gerrit/#/c/42855/
This solves issue with distibution-check jenkins job, where
EnumPair.getValue() returns Integer instead of correct int type.
Change-Id: I459364d17747e0adf10ec021a0bd9cc3e316726d
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
(cherry picked from commit
36a598c3b773cf67d0897354c2644fcadcd11f8f)
*
* @return the value of the enumeration item.
*/
*
* @return the value of the enumeration item.
*/
* @param name
* @param value
*/
* @param name
* @param value
*/
- void addValue(final String name, final Integer value, final String description);
+ void addValue(final String name, final int value, final String description);
- public void addValue(final String name, final Integer value, final String description) {
+ public void addValue(final String name, final int value, final String description) {
final EnumPairImpl p = new EnumPairImpl(name, value, description);
values = LazyCollections.lazyAdd(values, p);
unmodifiableValues = Collections.unmodifiableList(values);
final EnumPairImpl p = new EnumPairImpl(name, value, description);
values = LazyCollections.lazyAdd(values, p);
unmodifiableValues = Collections.unmodifiableList(values);
public void updateEnumPairsFromEnumTypeDef(final EnumTypeDefinition enumTypeDef) {
final List<EnumPair> enums = enumTypeDef.getValues();
if (enums != null) {
public void updateEnumPairsFromEnumTypeDef(final EnumTypeDefinition enumTypeDef) {
final List<EnumPair> enums = enumTypeDef.getValues();
if (enums != null) {
for (final EnumPair enumPair : enums) {
if (enumPair != null) {
for (final EnumPair enumPair : enums) {
if (enumPair != null) {
- final String enumPairName = enumPair.getName();
- Integer enumPairValue = enumPair.getValue();
-
- if (enumPairValue == null) {
- enumPairValue = listIndex;
- }
- else {
- listIndex = enumPairValue;
- }
-
- this.addValue(enumPairName, enumPairValue, enumPair.getDescription());
- listIndex++;
+ this.addValue(enumPair.getName(), enumPair.getValue(), enumPair.getDescription());
private final String name;
private final String mappedName;
private final String name;
private final String mappedName;
- private final Integer value;
+ private final int value;
private final String description;
private final String description;
- public EnumPairImpl(final String name, final Integer value, final String description) {
+ public EnumPairImpl(final String name, final int value, final String description) {
super();
this.name = name;
this.mappedName = BindingMapping.getClassName(name);
super();
this.name = name;
this.mappedName = BindingMapping.getClassName(name);
- public Integer getValue() {
+ public int getValue() {
@Override
public List<MethodSignature> getMethodDefinitions() {
@Override
public List<MethodSignature> getMethodDefinitions() {
- // TODO Auto-generated method stub
return Collections.emptyList();
}
return Collections.emptyList();
}