Removed unused imports, replaced deprecated code.
Change-Id: Iec9c79dd2592133eb953367f23f38c3626531745
Signed-off-by: Martin Vitez <mvitez@cisco.com>
return null;
}
checkArgument(arguments.size() == 1);
return null;
}
checkArgument(arguments.size() == 1);
- for (QName qName : arguments) {
- //previous.getDataChildByName(qName);
- }
for(TypeDefinition<?> typedef : previous.getTypeDefinitions()) {
if(typedef.getQName().equals(typeQName)) {
return typedef;
for(TypeDefinition<?> typedef : previous.getTypeDefinitions()) {
if(typedef.getQName().equals(typeQName)) {
return typedef;
*/
package org.opendaylight.yangtools.binding.generator.util.generated.type.builder;
*/
package org.opendaylight.yangtools.binding.generator.util.generated.type.builder;
-import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.parseToClassName;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.opendaylight.yangtools.sal.binding.model.api.Type;
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder;
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder;
import org.opendaylight.yangtools.sal.binding.model.api.Type;
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.AnnotationTypeBuilder;
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder;
+import org.opendaylight.yangtools.yang.binding.BindingMapping;
import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
* @see java.lang.Object#hashCode()
*/
@Override
* @see java.lang.Object#hashCode()
*/
@Override
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
* @see java.lang.Object#toString()
*/
@Override
* @see java.lang.Object#toString()
*/
@Override
int listIndex = 0;
for (final EnumPair enumPair : enums) {
if (enumPair != null) {
int listIndex = 0;
for (final EnumPair enumPair : enums) {
if (enumPair != null) {
- final String enumPairName = parseToClassName(enumPair.getName());
+ final String enumPairName = BindingMapping.getClassName(enumPair.getName());
Integer enumPairValue = enumPair.getValue();
if (enumPairValue == null) {
Integer enumPairValue = enumPair.getValue();
if (enumPairValue == null) {
* @see java.lang.Object#hashCode()
*/
@Override
* @see java.lang.Object#hashCode()
*/
@Override
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
* @see java.lang.Object#toString()
*/
@Override
* @see java.lang.Object#toString()
*/
@Override
* @see java.lang.Object#hashCode()
*/
@Override
* @see java.lang.Object#hashCode()
*/
@Override
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
* @see java.lang.Object#toString()
*/
@Override
* @see java.lang.Object#toString()
*/
@Override
// TODO Auto-generated method stub
return Collections.emptyList();
}
// TODO Auto-generated method stub
return Collections.emptyList();
}
@Override
public List<GeneratedProperty> getProperties() {
return Collections.emptyList();
@Override
public List<GeneratedProperty> getProperties() {
return Collections.emptyList();
import java.util.Set;
import org.junit.Test;
import java.util.Set;
import org.junit.Test;
+import org.opendaylight.yangtools.yang.binding.BindingMapping;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
public void testParsingMethods() {
// parseToClassName method testing
assertEquals("Class name has incorrect format", "SomeTestingClassName",
public void testParsingMethods() {
// parseToClassName method testing
assertEquals("Class name has incorrect format", "SomeTestingClassName",
- BindingGeneratorUtil.parseToClassName(" some-testing_class name "));
+ BindingMapping.getClassName(" some-testing_class name "));
assertEquals("Class name has incorrect format", "_0SomeTestingClassName",
assertEquals("Class name has incorrect format", "_0SomeTestingClassName",
- BindingGeneratorUtil.parseToClassName(" 0 some-testing_class name "));
+ BindingMapping.getClassName(" 0 some-testing_class name "));
// parseToValidParamName
assertEquals("Parameter name has incorrect format", "someTestingParameterName",
// parseToValidParamName
assertEquals("Parameter name has incorrect format", "someTestingParameterName",
*/
public static void putTypeIntoImports(final GeneratedType parentGenType, final Type type,
final Map<String, String> imports) {
*/
public static void putTypeIntoImports(final GeneratedType parentGenType, final Type type,
final Map<String, String> imports) {
- checkArgument(parentGenType != null,
- "Parent Generated Type parameter MUST be specified and cannot be " + "NULL!");
+ checkArgument(parentGenType != null, "Parent Generated Type parameter MUST be specified and cannot be "
+ + "NULL!");
checkArgument(parentGenType.getName() != null, "Parent Generated Type name cannot be NULL!");
checkArgument(parentGenType.getPackageName() != null,
"Parent Generated Type cannot have Package Name referenced as NULL!");
checkArgument(parentGenType.getName() != null, "Parent Generated Type name cannot be NULL!");
checkArgument(parentGenType.getPackageName() != null,
"Parent Generated Type cannot have Package Name referenced as NULL!");
final String typeName = type.getName();
final String typePackageName = type.getPackageName();
final String parentTypeName = parentGenType.getName();
final String typeName = type.getName();
final String typePackageName = type.getPackageName();
final String parentTypeName = parentGenType.getName();
- final String parentTypePackageName = parentGenType.getPackageName();
- if (typeName.equals(parentTypeName) || typePackageName.startsWith("java.lang")
- || typePackageName.isEmpty()) {
+ if (typeName.equals(parentTypeName) || typePackageName.startsWith("java.lang") || typePackageName.isEmpty()) {
return;
}
if (!imports.containsKey(typeName)) {
return;
}
if (!imports.containsKey(typeName)) {