\r
import static org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil.*;\r
import static org.opendaylight.yangtools.binding.generator.util.BindingTypes.*;\r
-import static org.opendaylight.yangtools.binding.generator.util.Types.BOOLEAN;\r
import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.*;\r
\r
import java.util.ArrayList;\r
import java.util.Collections;\r
-import java.util.Comparator;\r
import java.util.HashMap;\r
import java.util.List;\r
import java.util.Map;\r
import java.util.Set;\r
-import java.util.concurrent.Future;\r
\r
import org.opendaylight.yangtools.binding.generator.util.BindingTypes;\r
import org.opendaylight.yangtools.binding.generator.util.ReferencedTypeImpl;\r
import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;\r
import org.opendaylight.yangtools.sal.binding.generator.spi.TypeProvider;\r
import org.opendaylight.yangtools.sal.binding.model.api.AccessModifier;\r
-import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;\r
import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType;\r
-import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType;\r
import org.opendaylight.yangtools.sal.binding.model.api.Type;\r
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.EnumBuilder;\r
-import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedPropertyBuilder;\r
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder;\r
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder;\r
import org.opendaylight.yangtools.sal.binding.model.api.type.builder.MethodSignatureBuilder;\r
import org.opendaylight.yangtools.sal.binding.yang.types.GroupingDefinitionDependencySort;\r
import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl;\r
-import org.opendaylight.yangtools.yang.binding.DataRoot;\r
-import org.opendaylight.yangtools.yang.binding.Identifiable;\r
-import org.opendaylight.yangtools.yang.binding.Identifier;\r
import org.opendaylight.yangtools.yang.binding.RpcService;\r
-import org.opendaylight.yangtools.yang.common.QName;\r
import org.opendaylight.yangtools.yang.common.RpcResult;\r
import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;\r
import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;\r
import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;\r
import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;\r
import org.opendaylight.yangtools.yang.model.api.Module;\r
-import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;\r
import org.opendaylight.yangtools.yang.model.api.RpcDefinition;\r
import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
import org.opendaylight.yangtools.yang.model.api.SchemaNode;\r
import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;\r
import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
-import org.opendaylight.yangtools.yang.model.api.UsesNode;\r
import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;\r
import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;\r
import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;\r
import org.opendaylight.yangtools.yang.model.util.ExtendedType;\r
import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;\r
import org.opendaylight.yangtools.yang.model.util.UnionType;\r
+import static com.google.common.base.Preconditions.*;\r
+import static extension org.opendaylight.yangtools.binding.generator.util.Types.*;\r
\r
-import com.google.common.base.Preconditions;\r
-\r
-public final class BindingGeneratorImpl implements BindingGenerator {\r
+public class BindingGeneratorImpl implements BindingGenerator {\r
\r
/**\r
* Outter key represents the package name. Outter value represents map of\r
/**\r
* Provide methods for converting YANG types to JAVA types.\r
*/\r
- private TypeProvider typeProvider;\r
+ private var TypeProvider typeProvider;\r
\r
/**\r
* Holds reference to schema context to resolve data of augmented elemnt\r
* when creating augmentation builder\r
*/\r
- private SchemaContext schemaContext;\r
+ private var SchemaContext schemaContext;\r
\r
/**\r
* Each grouping which is converted from schema node to generated type is\r
* Schema node the object of type <code>Type</code> is required. So in this\r
* case is used this map.\r
*/\r
- private final Map<SchemaPath, GeneratedType> allGroupings = new HashMap<SchemaPath, GeneratedType>();\r
+ private val allGroupings = new HashMap<SchemaPath, GeneratedType>();\r
+ \r
+ \r
+ private val yangToJavaMapping = new HashMap<SchemaPath, Type>();\r
\r
/**\r
* Constant with the concrete name of namespace.\r
*/\r
- private final static String YANG_EXT_NAMESPACE = "urn:opendaylight:yang:extension:yang-ext";\r
+ private val static String YANG_EXT_NAMESPACE = "urn:opendaylight:yang:extension:yang-ext";\r
\r
/**\r
* Constant with the concrete name of identifier.\r
*/\r
- private final static String AUGMENT_IDENTIFIER_NAME = "augment-identifier";\r
-\r
- /**\r
- * Only parent constructor is invoked.\r
- */\r
- public BindingGeneratorImpl() {\r
- super();\r
- }\r
+ private val static String AUGMENT_IDENTIFIER_NAME = "augment-identifier";\r
\r
+ \r
/**\r
* Resolves generated types from <code>context</code> schema nodes of all\r
* modules.\r
* @throws IllegalStateException\r
* if <code>context</code> contain no modules\r
*/\r
- @Override\r
- public List<Type> generateTypes(final SchemaContext context) {\r
- Preconditions.checkArgument(context != null,"Schema Context reference cannot be NULL.");\r
- Preconditions.checkState(context.getModules() != null,"Schema Context does not contain defined modules.");\r
- final List<Type> generatedTypes = new ArrayList<>();\r
+ override generateTypes(SchemaContext context) {\r
+ checkArgument(context !== null,"Schema Context reference cannot be NULL.");\r
+ checkState(context.modules !== null,"Schema Context does not contain defined modules.");\r
+ val List<Type> generatedTypes = new ArrayList();\r
schemaContext = context;\r
typeProvider = new TypeProviderImpl(context);\r
- final Set<Module> modules = context.getModules();\r
- genTypeBuilders = new HashMap<>();\r
- for (final Module module : modules) {\r
+ val Set<Module> modules = context.modules;\r
+ genTypeBuilders = new HashMap();\r
+ for (module : modules) {\r
\r
generatedTypes.addAll(allGroupingsToGenTypes(module));\r
\r
- if (false == module.getChildNodes().isEmpty()) {\r
+ if (false == module.childNodes.isEmpty()) {\r
generatedTypes.add(moduleToDataType(module));\r
}\r
generatedTypes.addAll(allTypeDefinitionsToGenTypes(module));\r
generatedTypes.addAll(allContainersToGenTypes(module));\r
generatedTypes.addAll(allListsToGenTypes(module));\r
generatedTypes.addAll(allChoicesToGenTypes(module));\r
- generatedTypes.addAll(allAugmentsToGenTypes(module));\r
generatedTypes.addAll(allRPCMethodsToGenType(module));\r
generatedTypes.addAll(allNotificationsToGenType(module));\r
generatedTypes.addAll(allIdentitiesToGenTypes(module, context));\r
-\r
+ }\r
+ for (module : modules) {\r
+ generatedTypes.addAll(allAugmentsToGenTypes(module));\r
+ \r
}\r
return generatedTypes;\r
}\r
* @throws IllegalStateException\r
* if <code>context</code> contain no modules\r
*/\r
- @Override\r
- public List<Type> generateTypes(final SchemaContext context, final Set<Module> modules) {\r
- Preconditions.checkArgument(context != null,"Schema Context reference cannot be NULL.");\r
- Preconditions.checkState(context.getModules() != null,"Schema Context does not contain defined modules.");\r
- Preconditions.checkArgument(modules != null,"Sef of Modules cannot be NULL.");\r
+ override generateTypes(SchemaContext context, Set<Module> modules) {\r
+ checkArgument(context !== null,"Schema Context reference cannot be NULL.");\r
+ checkState(context.modules !== null,"Schema Context does not contain defined modules.");\r
+ checkArgument(modules !== null,"Set of Modules cannot be NULL.");\r
\r
- final List<Type> filteredGenTypes = new ArrayList<>();\r
+ val List<Type> filteredGenTypes = new ArrayList();\r
schemaContext = context;\r
typeProvider = new TypeProviderImpl(context);\r
- final Set<Module> contextModules = context.getModules();\r
- genTypeBuilders = new HashMap<>();\r
- for (final Module contextModule : contextModules) {\r
- final List<Type> generatedTypes = new ArrayList<>();\r
+ val Set<Module> contextModules = context.modules;\r
+ genTypeBuilders = new HashMap();\r
+ \r
+ for (contextModule : contextModules) {\r
+ val List<Type> generatedTypes = new ArrayList();\r
\r
generatedTypes.addAll(allGroupingsToGenTypes(contextModule));\r
- if (false == contextModule.getChildNodes().isEmpty()) {\r
+ if (false == contextModule.childNodes.isEmpty()) {\r
generatedTypes.add(moduleToDataType(contextModule));\r
}\r
generatedTypes.addAll(allTypeDefinitionsToGenTypes(contextModule));\r
generatedTypes.addAll(allContainersToGenTypes(contextModule));\r
generatedTypes.addAll(allListsToGenTypes(contextModule));\r
generatedTypes.addAll(allChoicesToGenTypes(contextModule));\r
- generatedTypes.addAll(allAugmentsToGenTypes(contextModule));\r
generatedTypes.addAll(allRPCMethodsToGenType(contextModule));\r
generatedTypes.addAll(allNotificationsToGenType(contextModule));\r
generatedTypes.addAll(allIdentitiesToGenTypes(contextModule, context));\r
-\r
+ \r
if (modules.contains(contextModule)) {\r
filteredGenTypes.addAll(generatedTypes);\r
}\r
}\r
+ for (contextModule : contextModules) {\r
+ val generatedTypes = (allAugmentsToGenTypes(contextModule));\r
+ if (modules.contains(contextModule)) {\r
+ filteredGenTypes.addAll(generatedTypes);\r
+ }\r
+ \r
+ }\r
return filteredGenTypes;\r
}\r
\r
* </ul>\r
*\r
*/\r
- private List<Type> allTypeDefinitionsToGenTypes(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
- Preconditions.checkArgument(module.getName() != null,"Module name cannot be NULL.");\r
- Preconditions.checkArgument(module.getTypeDefinitions() != null,"Type Definitions for module " + module.getName() + " cannot be NULL.");\r
-\r
- final Set<TypeDefinition<?>> typeDefinitions = module.getTypeDefinitions();\r
- final List<Type> generatedTypes = new ArrayList<>();\r
- for (final TypeDefinition<?> typedef : typeDefinitions) {\r
- if (typedef != null) {\r
- final Type type = ((TypeProviderImpl) typeProvider).generatedTypeForExtendedDefinitionType(typedef, typedef);\r
- if ((type != null) && !generatedTypes.contains(type)) {\r
+ private def List<Type> allTypeDefinitionsToGenTypes( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ val Set<TypeDefinition<?>> typeDefinitions = module.typeDefinitions;\r
+ checkState(typeDefinitions !== null,'''Type Definitions for module «module.name» cannot be NULL.''');\r
+\r
+ \r
+ val List<Type> generatedTypes = new ArrayList();\r
+ for ( TypeDefinition<?> typedef : typeDefinitions) {\r
+ if (typedef !== null) {\r
+ val type = (typeProvider as TypeProviderImpl).generatedTypeForExtendedDefinitionType(typedef, typedef);\r
+ if ((type !== null) && !generatedTypes.contains(type)) {\r
generatedTypes.add(type);\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private List<Type> allContainersToGenTypes(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
+ private def List<Type> allContainersToGenTypes( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
\r
- Preconditions.checkArgument(module.getName() != null,"Module name cannot be NULL.");\r
+ checkArgument(module.name !== null,"Module name cannot be NULL.");\r
\r
- if (module.getChildNodes() == null) {\r
- throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.getName()\r
+ if (module.childNodes === null) {\r
+ throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.name\r
+ " cannot be NULL.");\r
}\r
\r
- final List<Type> generatedTypes = new ArrayList<>();\r
- final DataNodeIterator it = new DataNodeIterator(module);\r
- final List<ContainerSchemaNode> schemaContainers = it.allContainers();\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
- for (final ContainerSchemaNode container : schemaContainers) {\r
+ val List<Type> generatedTypes = new ArrayList();\r
+ val it = new DataNodeIterator(module);\r
+ val List<ContainerSchemaNode> schemaContainers = it.allContainers();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
+ for (container : schemaContainers) {\r
if (!container.isAddedByUses()) {\r
generatedTypes.add(containerToGenType(basePackageName, container));\r
}\r
* </ul>\r
*\r
*/\r
- private List<Type> allListsToGenTypes(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
-\r
- Preconditions.checkArgument(module.getName() != null,"Module name cannot be NULL.");\r
+ private def List<Type> allListsToGenTypes( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null,"Module name cannot be NULL.");\r
\r
- if (module.getChildNodes() == null) {\r
- throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.getName()\r
+ if (module.childNodes === null) {\r
+ throw new IllegalArgumentException("Reference to Set of Child Nodes in module " + module.name\r
+ " cannot be NULL.");\r
}\r
\r
- final List<Type> generatedTypes = new ArrayList<>();\r
- final DataNodeIterator it = new DataNodeIterator(module);\r
- final List<ListSchemaNode> schemaLists = it.allLists();\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
- if (schemaLists != null) {\r
- for (final ListSchemaNode list : schemaLists) {\r
+ val List<Type> generatedTypes = new ArrayList();\r
+ val it = new DataNodeIterator(module);\r
+ val List<ListSchemaNode> schemaLists = it.allLists();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
+ if (schemaLists !== null) {\r
+ for (list : schemaLists) {\r
if (!list.isAddedByUses()) {\r
generatedTypes.addAll(listToGenType(basePackageName, list));\r
}\r
* </ul>\r
*\r
*/\r
- private List<GeneratedType> allChoicesToGenTypes(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
- Preconditions.checkArgument(module.getName() != null,"Module name cannot be NULL.");\r
+ private def List<GeneratedType> allChoicesToGenTypes( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null,"Module name cannot be NULL.");\r
\r
- final DataNodeIterator it = new DataNodeIterator(module);\r
- final List<ChoiceNode> choiceNodes = it.allChoices();\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
+ val it = new DataNodeIterator(module);\r
+ val choiceNodes = it.allChoices();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
\r
- final List<GeneratedType> generatedTypes = new ArrayList<>();\r
- for (final ChoiceNode choice : choiceNodes) {\r
- if ((choice != null) && !choice.isAddedByUses()) {\r
+ val List<GeneratedType> generatedTypes = new ArrayList();\r
+ for (choice : choiceNodes) {\r
+ if ((choice !== null) && !choice.isAddedByUses()) {\r
generatedTypes.addAll(choiceToGeneratedType(basePackageName, choice));\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private List<Type> allAugmentsToGenTypes(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
- Preconditions.checkArgument(module.getName() != null,"Module name cannot be NULL.");\r
- if (module.getChildNodes() == null) {\r
+ private def List<Type> allAugmentsToGenTypes( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ checkArgument(module.name !== null,"Module name cannot be NULL.");\r
+ if (module.childNodes === null) {\r
throw new IllegalArgumentException("Reference to Set of Augmentation Definitions in module "\r
- + module.getName() + " cannot be NULL.");\r
+ + module.name + " cannot be NULL.");\r
}\r
\r
- final List<Type> generatedTypes = new ArrayList<>();\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
-
final List<AugmentationSchema> augmentations = resolveAugmentations(module);
\r- for (final AugmentationSchema augment : augmentations) {\r
+ val List<Type> generatedTypes = new ArrayList();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
+
val List<AugmentationSchema> augmentations = resolveAugmentations(module);
\r+ for (augment : augmentations) {\r
generatedTypes.addAll(augmentationToGenTypes(basePackageName, augment));\r
}\r
return generatedTypes;\r
* </ul>\r
*\r
*/\r
- private List<AugmentationSchema> resolveAugmentations(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
- Preconditions.checkState(module.getAugmentations() != null,"Augmentations Set cannot be NULL.");\r
-\r
- final Set<AugmentationSchema> augmentations = module.getAugmentations();\r
- final List<AugmentationSchema> sortedAugmentations = new ArrayList<>(augmentations);\r
- Collections.sort(sortedAugmentations, new Comparator<AugmentationSchema>() {\r
+ private def List<AugmentationSchema> resolveAugmentations( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ checkState(module.augmentations !== null,"Augmentations Set cannot be NULL.");\r
\r
- @Override\r
- public int compare(AugmentationSchema augSchema1, AugmentationSchema augSchema2) {\r
+ val Set<AugmentationSchema> augmentations = module.augmentations;\r
+ val List<AugmentationSchema> sortedAugmentations = new ArrayList(augmentations);\r
+ Collections.sort(sortedAugmentations, [augSchema1, augSchema2 |\r
\r
- if (augSchema1.getTargetPath().getPath().size() > augSchema2.getTargetPath().getPath().size()) {\r
+ if (augSchema1.targetPath.path.size() > augSchema2.targetPath.path.size()) {\r
return 1;\r
- } else if (augSchema1.getTargetPath().getPath().size() < augSchema2.getTargetPath().getPath().size()) {\r
+ } else if (augSchema1.targetPath.path.size() < augSchema2.targetPath.path.size()) {\r
return -1;\r
}\r
return 0;\r
-\r
- }\r
- });\r
-\r
+ ]);\r
return sortedAugmentations;\r
}\r
\r
/**\r
* Converts whole <b>module</b> to <code>GeneratedType</code> object.\r
- * Firstly is created the module builder object from which is finally\r
+ * Firstly is created the module builder object from which is vally\r
* obtained reference to <code>GeneratedType</code> object.\r
*\r
* @param module\r
* if the module equals null\r
*\r
*/\r
- private GeneratedType moduleToDataType(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
+ private def GeneratedType moduleToDataType( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
\r
- final GeneratedTypeBuilder moduleDataTypeBuilder = moduleTypeBuilder(module, "Data");\r
+ val moduleDataTypeBuilder = moduleTypeBuilder(module, "Data");\r
addImplementedInterfaceFromUses(module, moduleDataTypeBuilder);\r
- moduleDataTypeBuilder.addImplementsType(Types.typeForClass(DataRoot.class));\r
+ moduleDataTypeBuilder.addImplementsType(DATA_ROOT);\r
\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
- if (moduleDataTypeBuilder != null) {\r
- final Set<DataSchemaNode> dataNodes = module.getChildNodes();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
+ if (moduleDataTypeBuilder !== null) {\r
+ val Set<DataSchemaNode> dataNodes = module.childNodes;\r
resolveDataSchemaNodes(basePackageName, moduleDataTypeBuilder, dataNodes);\r
}\r
return moduleDataTypeBuilder.toInstance();\r
* </ul>\r
*\r
*/\r
- private List<Type> allRPCMethodsToGenType(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
+ private def List<Type> allRPCMethodsToGenType( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
\r
- Preconditions.checkArgument(module.getName() != null,"Module name cannot be NULL.");\r
+ checkArgument(module.name !== null,"Module name cannot be NULL.");\r
\r
- if (module.getChildNodes() == null) {\r
+ if (module.childNodes === null) {\r
throw new IllegalArgumentException("Reference to Set of RPC Method Definitions in module "\r
- + module.getName() + " cannot be NULL.");\r
+ + module.name + " cannot be NULL.");\r
}\r
\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
- final Set<RpcDefinition> rpcDefinitions = module.getRpcs();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
+ val Set<RpcDefinition> rpcDefinitions = module.rpcs;\r
\r
if (rpcDefinitions.isEmpty()) {\r
return Collections.emptyList();\r
}\r
\r
- final List<Type> genRPCTypes = new ArrayList<>();\r
- final GeneratedTypeBuilder interfaceBuilder = moduleTypeBuilder(module, "Service");\r
- interfaceBuilder.addImplementsType(Types.typeForClass(RpcService.class));\r
- final Type future = Types.typeForClass(Future.class);\r
- for (final RpcDefinition rpc : rpcDefinitions) {\r
- if (rpc != null) {\r
+ val List<Type> genRPCTypes = new ArrayList();\r
+ val interfaceBuilder = moduleTypeBuilder(module, "Service");\r
+ interfaceBuilder.addImplementsType(Types.typeForClass(RpcService));\r
+ for (rpc : rpcDefinitions) {\r
+ if (rpc !== null) {\r
\r
- String rpcName = parseToClassName(rpc.getQName().getLocalName());\r
- String rpcMethodName = parseToValidParamName(rpcName);\r
- MethodSignatureBuilder method = interfaceBuilder.addMethod(rpcMethodName);\r
+ val rpcName = parseToClassName(rpc.QName.localName);\r
+ val rpcMethodName = parseToValidParamName(rpcName);\r
+ val method = interfaceBuilder.addMethod(rpcMethodName);\r
\r
- final List<DataNodeIterator> rpcInOut = new ArrayList<>();\r
+ val rpcInOut = new ArrayList();\r
\r
- ContainerSchemaNode input = rpc.getInput();\r
- ContainerSchemaNode output = rpc.getOutput();\r
+ val input = rpc.input;\r
+ val output = rpc.output;\r
\r
- if (input != null) {\r
+ if (input !== null) {\r
rpcInOut.add(new DataNodeIterator(input));\r
- GeneratedTypeBuilder inType = addRawInterfaceDefinition(basePackageName, input, rpcName);\r
+ val inType = addRawInterfaceDefinition(basePackageName, input, rpcName);\r
addImplementedInterfaceFromUses(input, inType);\r
inType.addImplementsType(DATA_OBJECT);\r
inType.addImplementsType(augmentable(inType));\r
- resolveDataSchemaNodes(basePackageName, inType, input.getChildNodes());\r
- Type inTypeInstance = inType.toInstance();\r
+ resolveDataSchemaNodes(basePackageName, inType, input.childNodes);\r
+ val inTypeInstance = inType.toInstance();\r
genRPCTypes.add(inTypeInstance);\r
method.addParameter(inTypeInstance, "input");\r
}\r
\r
- Type outTypeInstance = Types.typeForClass(Void.class);\r
- if (output != null) {\r
+ var Type outTypeInstance = VOID;\r
+ if (output !== null) {\r
rpcInOut.add(new DataNodeIterator(output));\r
- GeneratedTypeBuilder outType = addRawInterfaceDefinition(basePackageName, output, rpcName);\r
+ val outType = addRawInterfaceDefinition(basePackageName, output, rpcName);\r
addImplementedInterfaceFromUses(output, outType);\r
outType.addImplementsType(DATA_OBJECT);\r
outType.addImplementsType(augmentable(outType));\r
\r
- resolveDataSchemaNodes(basePackageName, outType, output.getChildNodes());\r
+ resolveDataSchemaNodes(basePackageName, outType, output.childNodes);\r
outTypeInstance = outType.toInstance();\r
genRPCTypes.add(outTypeInstance);\r
\r
}\r
\r
- final Type rpcRes = Types.parameterizedTypeFor(Types.typeForClass(RpcResult.class), outTypeInstance);\r
- method.setReturnType(Types.parameterizedTypeFor(future, rpcRes));\r
- for (DataNodeIterator it : rpcInOut) {\r
- List<ContainerSchemaNode> nContainers = it.allContainers();\r
- if ((nContainers != null) && !nContainers.isEmpty()) {\r
- for (final ContainerSchemaNode container : nContainers) {\r
+ val rpcRes = Types.parameterizedTypeFor(Types.typeForClass(RpcResult), outTypeInstance);\r
+ method.setReturnType(Types.parameterizedTypeFor(FUTURE, rpcRes));\r
+ for (iter : rpcInOut) {\r
+ val List<ContainerSchemaNode> nContainers = iter.allContainers();\r
+ if ((nContainers !== null) && !nContainers.isEmpty()) {\r
+ for (container : nContainers) {\r
if (!container.isAddedByUses()) {\r
genRPCTypes.add(containerToGenType(basePackageName, container));\r
}\r
}\r
}\r
- List<ListSchemaNode> nLists = it.allLists();\r
- if ((nLists != null) && !nLists.isEmpty()) {\r
- for (final ListSchemaNode list : nLists) {\r
+ val List<ListSchemaNode> nLists = iter.allLists();\r
+ if ((nLists !== null) && !nLists.isEmpty()) {\r
+ for (list : nLists) {\r
if (!list.isAddedByUses()) {\r
genRPCTypes.addAll(listToGenType(basePackageName, list));\r
}\r
* </ul>\r
*\r
*/\r
- private List<Type> allNotificationsToGenType(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
+ private def List<Type> allNotificationsToGenType( Module module) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
\r
- Preconditions.checkArgument(module.getName() != null,"Module name cannot be NULL.");\r
+ checkArgument(module.name !== null,"Module name cannot be NULL.");\r
\r
- if (module.getChildNodes() == null) {\r
+ if (module.childNodes === null) {\r
throw new IllegalArgumentException("Reference to Set of Notification Definitions in module "\r
- + module.getName() + " cannot be NULL.");\r
+ + module.name + " cannot be NULL.");\r
}\r
- final Set<NotificationDefinition> notifications = module.getNotifications();\r
+ val notifications = module.notifications;\r
if(notifications.isEmpty()) return Collections.emptyList();\r
\r
- final GeneratedTypeBuilder listenerInterface = moduleTypeBuilder(module, "Listener");\r
+ val listenerInterface = moduleTypeBuilder(module, "Listener");\r
listenerInterface.addImplementsType(BindingTypes.NOTIFICATION_LISTENER);\r
\r
\r
\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
- final List<Type> generatedTypes = new ArrayList<>();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
+ val List<Type> generatedTypes = new ArrayList();\r
\r
\r
- for (final NotificationDefinition notification : notifications) {\r
- if (notification != null) {\r
- DataNodeIterator it = new DataNodeIterator(notification);\r
+ for ( notification : notifications) {\r
+ if (notification !== null) {\r
+ val iter = new DataNodeIterator(notification);\r
\r
// Containers\r
- for (ContainerSchemaNode node : it.allContainers()) {\r
+ for (node : iter.allContainers()) {\r
if (!node.isAddedByUses()) {\r
generatedTypes.add(containerToGenType(basePackageName, node));\r
}\r
}\r
// Lists\r
- for (ListSchemaNode node : it.allLists()) {\r
+ for (node : iter.allLists()) {\r
if (!node.isAddedByUses()) {\r
generatedTypes.addAll(listToGenType(basePackageName, node));\r
}\r
}\r
- final GeneratedTypeBuilder notificationInterface = addDefaultInterfaceDefinition(basePackageName,\r
+ val notificationInterface = addDefaultInterfaceDefinition(basePackageName,\r
notification);\r
- notificationInterface.addImplementsType(Types\r
- .typeForClass(org.opendaylight.yangtools.yang.binding.Notification.class));\r
+ notificationInterface.addImplementsType(NOTIFICATION);\r
// Notification object\r
- resolveDataSchemaNodes(basePackageName, notificationInterface, notification.getChildNodes());\r
+ resolveDataSchemaNodes(basePackageName, notificationInterface, notification.childNodes);\r
\r
- listenerInterface.addMethod("on"+notificationInterface.getName()) //\r
+ listenerInterface.addMethod("on"+notificationInterface.name) //\r
.setAccessModifier(AccessModifier.PUBLIC)\r
.addParameter(notificationInterface, "notification")\r
.setReturnType(Types.VOID);\r
* (object of type <code>IdentitySchemaNode</code>\r
*\r
*/\r
- private List<Type> allIdentitiesToGenTypes(final Module module, final SchemaContext context) {\r
- List<Type> genTypes = new ArrayList<>();\r
+ private def List<Type> allIdentitiesToGenTypes( Module module, SchemaContext context) {\r
+ val List<Type> genTypes = new ArrayList();\r
\r
- final Set<IdentitySchemaNode> schemaIdentities = module.getIdentities();\r
+ val Set<IdentitySchemaNode> schemaIdentities = module.identities;\r
\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
\r
- if (schemaIdentities != null && !schemaIdentities.isEmpty()) {\r
- for (final IdentitySchemaNode identity : schemaIdentities) {\r
+ if (schemaIdentities !== null && !schemaIdentities.isEmpty()) {\r
+ for (identity : schemaIdentities) {\r
genTypes.add(identityToGenType(basePackageName, identity, context));\r
}\r
}\r
* <code>IdentitySchemaNode</code>\r
*\r
*/\r
- private GeneratedType identityToGenType(final String basePackageName, final IdentitySchemaNode identity,\r
- final SchemaContext context) {\r
- if (identity == null) {\r
+ private def GeneratedType identityToGenType(String basePackageName, IdentitySchemaNode identity,\r
+ SchemaContext context) {\r
+ if (identity === null) {\r
return null;\r
}\r
\r
- final String packageName = packageNameForGeneratedType(basePackageName, identity.getPath());\r
- final String genTypeName = parseToClassName(identity.getQName().getLocalName());\r
- final GeneratedTOBuilderImpl newType = new GeneratedTOBuilderImpl(packageName, genTypeName);\r
+ val packageName = packageNameForGeneratedType(basePackageName, identity.path);\r
+ val genTypeName = parseToClassName(identity.QName.localName);\r
+ val newType = new GeneratedTOBuilderImpl(packageName, genTypeName);\r
\r
- IdentitySchemaNode baseIdentity = identity.getBaseIdentity();\r
- if (baseIdentity != null) {\r
- Module baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity);\r
+ val baseIdentity = identity.baseIdentity;\r
+ if (baseIdentity !== null) {\r
+ val baseIdentityParentModule = SchemaContextUtil.findParentModule(context, baseIdentity);\r
\r
- final String returnTypePkgName = moduleNamespaceToPackageName(baseIdentityParentModule);\r
- final String returnTypeName = parseToClassName(baseIdentity.getQName().getLocalName());\r
+ val returnTypePkgName = moduleNamespaceToPackageName(baseIdentityParentModule);\r
+ val returnTypeName = parseToClassName(baseIdentity.QName.localName);\r
\r
- GeneratedTransferObject gto = new GeneratedTOBuilderImpl(returnTypePkgName, returnTypeName).toInstance();\r
+ val gto = new GeneratedTOBuilderImpl(returnTypePkgName, returnTypeName).toInstance();\r
newType.setExtendsType(gto);\r
} else {\r
- newType.setExtendsType(Types.getBaseIdentityTO());\r
+ newType.setExtendsType(Types.baseIdentityTO);\r
}\r
newType.setAbstract(true);\r
return newType.toInstance();\r
* (object of type <code>GroupingDefinition</code>)\r
*\r
*/\r
- private List<Type> allGroupingsToGenTypes(final Module module) {\r
- Preconditions.checkArgument(module != null,"Module parameter can not be null");\r
- final List<Type> genTypes = new ArrayList<>();\r
- final String basePackageName = moduleNamespaceToPackageName(module);\r
- final Set<GroupingDefinition> groupings = module.getGroupings();\r
- List<GroupingDefinition> groupingsSortedByDependencies;\r
-\r
- groupingsSortedByDependencies = GroupingDefinitionDependencySort.sort(groupings);\r
-\r
- for (final GroupingDefinition grouping : groupingsSortedByDependencies) {\r
- GeneratedType genType = groupingToGenType(basePackageName, grouping);\r
+ private def List<Type> allGroupingsToGenTypes( Module module) {\r
+ checkArgument(module !== null,"Module parameter can not be null");\r
+ val List<Type> genTypes = new ArrayList();\r
+ val basePackageName = moduleNamespaceToPackageName(module);\r
+ val Set<GroupingDefinition> groupings = module.groupings;\r
+ val List<GroupingDefinition> groupingsSortedByDependencies = GroupingDefinitionDependencySort.sort(groupings);\r
+\r
+ for (grouping : groupingsSortedByDependencies) {\r
+ val genType = groupingToGenType(basePackageName, grouping);\r
genTypes.add(genType);\r
- SchemaPath schemaPath = grouping.getPath();\r
+ val schemaPath = grouping.path;\r
allGroupings.put(schemaPath, genType);\r
}\r
return genTypes;\r
* @return GeneratedType which is generated from grouping (object of type\r
* <code>GroupingDefinition</code>)\r
*/\r
- private GeneratedType groupingToGenType(final String basePackageName, GroupingDefinition grouping) {\r
- if (grouping == null) {\r
+ private def GeneratedType groupingToGenType( String basePackageName, GroupingDefinition grouping) {\r
+ if (grouping === null) {\r
return null;\r
}\r
\r
- final String packageName = packageNameForGeneratedType(basePackageName, grouping.getPath());\r
- final Set<DataSchemaNode> schemaNodes = grouping.getChildNodes();\r
- final GeneratedTypeBuilder typeBuilder = addDefaultInterfaceDefinition(packageName, grouping);\r
+ val packageName = packageNameForGeneratedType(basePackageName, grouping.path);\r
+ val Set<DataSchemaNode> schemaNodes = grouping.childNodes;\r
+ val typeBuilder = addDefaultInterfaceDefinition(packageName, grouping);\r
\r
resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes);\r
return typeBuilder.toInstance();\r
* @return EnumTypeDefinition if it is found inside\r
* <code>typeDefinition</code> or <code>null</code> in other case\r
*/\r
- private EnumTypeDefinition enumTypeDefFromExtendedType(final TypeDefinition<?> typeDefinition) {\r
- if (typeDefinition != null) {\r
- if (typeDefinition.getBaseType() instanceof EnumTypeDefinition) {\r
- return (EnumTypeDefinition) typeDefinition.getBaseType();\r
- } else if (typeDefinition.getBaseType() instanceof ExtendedType) {\r
- return enumTypeDefFromExtendedType(typeDefinition.getBaseType());\r
+ private def EnumTypeDefinition enumTypeDefFromExtendedType( TypeDefinition<?> typeDefinition) {\r
+ if (typeDefinition !== null) {\r
+ if (typeDefinition.baseType instanceof EnumTypeDefinition) {\r
+ return typeDefinition.baseType as EnumTypeDefinition;\r
+ } else if (typeDefinition.baseType instanceof ExtendedType) {\r
+ return enumTypeDefFromExtendedType(typeDefinition.baseType);\r
}\r
}\r
return null;\r
* @return enumeration builder which contais data from\r
* <code>enumTypeDef</code>\r
*/\r
- private EnumBuilder resolveInnerEnumFromTypeDefinition(final EnumTypeDefinition enumTypeDef, final String enumName,\r
- final GeneratedTypeBuilder typeBuilder) {\r
- if ((enumTypeDef != null) && (typeBuilder != null) && (enumTypeDef.getQName() != null)\r
- && (enumTypeDef.getQName().getLocalName() != null)) {\r
+ private def EnumBuilder resolveInnerEnumFromTypeDefinition( EnumTypeDefinition enumTypeDef, String enumName,\r
+ GeneratedTypeBuilder typeBuilder) {\r
+ if ((enumTypeDef !== null) && (typeBuilder !== null) && (enumTypeDef.QName !== null)\r
+ && (enumTypeDef.QName.localName !== null)) {\r
\r
- final String enumerationName = parseToClassName(enumName);\r
- final EnumBuilder enumBuilder = typeBuilder.addEnumeration(enumerationName);\r
+ val enumerationName = parseToClassName(enumName);\r
+ val enumBuilder = typeBuilder.addEnumeration(enumerationName);\r
enumBuilder.updateEnumPairsFromEnumTypeDef(enumTypeDef);\r
\r
return enumBuilder;\r
* @throws IllegalArgumentException\r
* if <code>module</code> equals null\r
*/\r
- private GeneratedTypeBuilder moduleTypeBuilder(final Module module, final String postfix) {\r
- Preconditions.checkArgument(module != null,"Module reference cannot be NULL.");\r
- String packageName = moduleNamespaceToPackageName(module);\r
- final String moduleName = parseToClassName(module.getName()) + postfix;\r
+ private def GeneratedTypeBuilder moduleTypeBuilder( Module module, String postfix) {\r
+ checkArgument(module !== null,"Module reference cannot be NULL.");\r
+ val packageName = moduleNamespaceToPackageName(module);\r
+ val moduleName = parseToClassName(module.name) + postfix;\r
\r
return new GeneratedTypeBuilderImpl(packageName, moduleName);\r
\r
* <li>if target path of <code>augSchema</code> equals null</li>\r
* </ul>\r
*/\r
- private List<Type> augmentationToGenTypes(final String augmentPackageName, final AugmentationSchema augSchema) {\r
- Preconditions.checkArgument(augmentPackageName != null,"Package Name cannot be NULL.");\r
- Preconditions.checkArgument(augSchema != null,"Augmentation Schema cannot be NULL.");\r
- Preconditions.checkState(augSchema.getTargetPath() != null,"Augmentation Schema does not contain Target Path (Target Path is NULL).");\r
+ private def List<Type> augmentationToGenTypes( String augmentPackageName, AugmentationSchema augSchema) {\r
+ checkArgument(augmentPackageName !== null,"Package Name cannot be NULL.");\r
+ checkArgument(augSchema !== null,"Augmentation Schema cannot be NULL.");\r
+ checkState(augSchema.targetPath !== null,"Augmentation Schema does not contain Target Path (Target Path is NULL).");\r
\r
- final List<Type> genTypes = new ArrayList<>();\r
+ val List<Type> genTypes = new ArrayList();\r
\r
// EVERY augmented interface will extends Augmentation<T> interface\r
// and DataObject interface!!!\r
- final SchemaPath targetPath = augSchema.getTargetPath();\r
- final DataSchemaNode targetSchemaNode = findDataSchemaNode(schemaContext, targetPath);\r
- if ((targetSchemaNode != null) && (targetSchemaNode.getQName() != null)\r
- && (targetSchemaNode.getQName().getLocalName() != null)) {\r
- final Module targetModule = findParentModule(schemaContext, targetSchemaNode);\r
- final String targetBasePackage = moduleNamespaceToPackageName(targetModule);\r
- final String targetPackageName = packageNameForGeneratedType(targetBasePackage, targetSchemaNode.getPath());\r
- final String targetSchemaNodeName = targetSchemaNode.getQName().getLocalName();\r
- final Set<DataSchemaNode> augChildNodes = augSchema.getChildNodes();\r
+ val targetPath = augSchema.targetPath;\r
+ val targetSchemaNode = findDataSchemaNode(schemaContext, targetPath);\r
+ val targetType = yangToJavaMapping.get(targetSchemaNode.path);\r
+ if ((targetSchemaNode !== null) && (targetSchemaNode.QName !== null)\r
+ && (targetSchemaNode.QName.localName !== null)) {\r
+ \r
+ val targetPackageName = targetType.packageName;\r
+ val targetSchemaNodeName = targetType.name;\r
+ \r
+ \r
+ val augChildNodes = augSchema.childNodes;\r
\r
if (!(targetSchemaNode instanceof ChoiceNode)) {\r
- final GeneratedTypeBuilder augTypeBuilder = addRawAugmentGenTypeDefinition(augmentPackageName,\r
- targetPackageName, targetSchemaNodeName, augSchema);\r
- final GeneratedType augType = augTypeBuilder.toInstance();\r
+ val augTypeBuilder = addRawAugmentGenTypeDefinition(augmentPackageName,\r
+ targetType, augSchema);\r
+ val augType = augTypeBuilder.toInstance();\r
genTypes.add(augType);\r
} else {\r
- final Type refChoiceType = new ReferencedTypeImpl(targetPackageName,\r
+ val refChoiceType = new ReferencedTypeImpl(targetPackageName,\r
parseToClassName(targetSchemaNodeName));\r
- final ChoiceNode choiceTarget = (ChoiceNode) targetSchemaNode;\r
- final Set<ChoiceCaseNode> choiceCaseNodes = choiceTarget.getCases();\r
+ val choiceTarget = targetSchemaNode as ChoiceNode;\r
+ val choiceCaseNodes = choiceTarget.cases;\r
genTypes.addAll(generateTypesFromAugmentedChoiceCases(augmentPackageName, refChoiceType,\r
choiceCaseNodes));\r
}\r
* and uses of augment\r
* @return generated type builder for augment\r
*/\r
- private GeneratedTypeBuilder addRawAugmentGenTypeDefinition(final String augmentPackageName,\r
- final String targetPackageName, final String targetSchemaNodeName, final AugmentationSchema augSchema) {\r
- final String targetTypeName = parseToClassName(targetSchemaNodeName);\r
- Map<String, GeneratedTypeBuilder> augmentBuilders = genTypeBuilders.get(augmentPackageName);\r
- if (augmentBuilders == null) {\r
- augmentBuilders = new HashMap<>();\r
+ private def GeneratedTypeBuilder addRawAugmentGenTypeDefinition( String augmentPackageName,\r
+ Type targetTypeRef, AugmentationSchema augSchema) {\r
+ var Map<String, GeneratedTypeBuilder> augmentBuilders = genTypeBuilders.get(augmentPackageName);\r
+ if (augmentBuilders === null) {\r
+ augmentBuilders = new HashMap();\r
genTypeBuilders.put(augmentPackageName, augmentBuilders);\r
}\r
- final String augIdentifier = getAugmentIdentifier(augSchema.getUnknownSchemaNodes());\r
+ val augIdentifier = getAugmentIdentifier(augSchema.unknownSchemaNodes);\r
\r
- final String augTypeName = augIdentifier != null ? parseToClassName(augIdentifier) : augGenTypeName(\r
- augmentBuilders, targetTypeName);\r
- final Type targetTypeRef = new ReferencedTypeImpl(targetPackageName, targetTypeName);\r
- final Set<DataSchemaNode> augChildNodes = augSchema.getChildNodes();\r
+ val augTypeName = if (augIdentifier !== null ) { \r
+ parseToClassName(augIdentifier)\r
+ } else {\r
+ augGenTypeName(augmentBuilders, targetTypeRef.name);\r
+ }\r
+ val Set<DataSchemaNode> augChildNodes = augSchema.childNodes;\r
\r
- final GeneratedTypeBuilder augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName);\r
+ val augTypeBuilder = new GeneratedTypeBuilderImpl(augmentPackageName, augTypeName);\r
\r
augTypeBuilder.addImplementsType(DATA_OBJECT);\r
augTypeBuilder.addImplementsType(Types.augmentationTypeFor(targetTypeRef));\r
* @param unknownSchemaNodes\r
* @return\r
*/\r
- private String getAugmentIdentifier(List<UnknownSchemaNode> unknownSchemaNodes) {\r
- String ret = null;\r
- for (UnknownSchemaNode unknownSchemaNode : unknownSchemaNodes) {\r
- QName nodeType = unknownSchemaNode.getNodeType();\r
- if (AUGMENT_IDENTIFIER_NAME.equals(nodeType.getLocalName())\r
- && YANG_EXT_NAMESPACE.equals(nodeType.getNamespace().toString())) {\r
- return unknownSchemaNode.getNodeParameter();\r
+ private def String getAugmentIdentifier(List<UnknownSchemaNode> unknownSchemaNodes) {\r
+ for (unknownSchemaNode : unknownSchemaNodes) {\r
+ val nodeType = unknownSchemaNode.nodeType;\r
+ if (AUGMENT_IDENTIFIER_NAME.equals(nodeType.localName)\r
+ && YANG_EXT_NAMESPACE.equals(nodeType.namespace.toString())) {\r
+ return unknownSchemaNode.nodeParameter;\r
}\r
}\r
- return ret;\r
+ return null;\r
}\r
\r
/**\r
* @return list of <code>Type</code> which represents container, list and\r
* choice subnodes of augment\r
*/\r
- private List<Type> augmentationBodyToGenTypes(final String augBasePackageName,\r
- final Set<DataSchemaNode> augChildNodes) {\r
- final List<Type> genTypes = new ArrayList<>();\r
- final List<DataNodeIterator> augSchemaIts = new ArrayList<>();\r
- for (final DataSchemaNode childNode : augChildNodes) {\r
+ private def List<Type> augmentationBodyToGenTypes( String augBasePackageName,\r
+ Set<DataSchemaNode> augChildNodes) {\r
+ val List<Type> genTypes = new ArrayList();\r
+ val List<DataNodeIterator> augSchemaIts = new ArrayList();\r
+ for (childNode : augChildNodes) {\r
if (childNode instanceof DataNodeContainer) {\r
- augSchemaIts.add(new DataNodeIterator((DataNodeContainer) childNode));\r
+ augSchemaIts.add(new DataNodeIterator(childNode as DataNodeContainer));\r
\r
if (childNode instanceof ContainerSchemaNode) {\r
- genTypes.add(containerToGenType(augBasePackageName, (ContainerSchemaNode) childNode));\r
+ genTypes.add(containerToGenType(augBasePackageName, childNode as ContainerSchemaNode));\r
} else if (childNode instanceof ListSchemaNode) {\r
- genTypes.addAll(listToGenType(augBasePackageName, (ListSchemaNode) childNode));\r
+ genTypes.addAll(listToGenType(augBasePackageName, childNode as ListSchemaNode));\r
}\r
} else if (childNode instanceof ChoiceNode) {\r
- final ChoiceNode choice = (ChoiceNode) childNode;\r
- for (final ChoiceCaseNode caseNode : choice.getCases()) {\r
+ val choice = childNode as ChoiceNode;\r
+ for (caseNode : choice.cases) {\r
augSchemaIts.add(new DataNodeIterator(caseNode));\r
}\r
- genTypes.addAll(choiceToGeneratedType(augBasePackageName, (ChoiceNode) childNode));\r
+ genTypes.addAll(choiceToGeneratedType(augBasePackageName, childNode as ChoiceNode));\r
}\r
}\r
\r
- for (final DataNodeIterator it : augSchemaIts) {\r
- final List<ContainerSchemaNode> augContainers = it.allContainers();\r
- final List<ListSchemaNode> augLists = it.allLists();\r
- final List<ChoiceNode> augChoices = it.allChoices();\r
+ for (it : augSchemaIts) {\r
+ val List<ContainerSchemaNode> augContainers = it.allContainers();\r
+ val List<ListSchemaNode> augLists = it.allLists();\r
+ val List<ChoiceNode> augChoices = it.allChoices();\r
\r
- if (augContainers != null) {\r
- for (final ContainerSchemaNode container : augContainers) {\r
+ if (augContainers !== null) {\r
+ for (container : augContainers) {\r
genTypes.add(containerToGenType(augBasePackageName, container));\r
}\r
}\r
- if (augLists != null) {\r
- for (final ListSchemaNode list : augLists) {\r
+ if (augLists !== null) {\r
+ for (list : augLists) {\r
genTypes.addAll(listToGenType(augBasePackageName, list));\r
}\r
}\r
- if (augChoices != null) {\r
- for (final ChoiceNode choice : augChoices) {\r
+ if (augChoices !== null) {\r
+ for (choice : augChoices) {\r
genTypes.addAll(choiceToGeneratedType(augBasePackageName, choice));\r
}\r
}\r
* string with name of augmented node\r
* @return string with unique name for augmentation builder\r
*/\r
- private String augGenTypeName(final Map<String, GeneratedTypeBuilder> builders, final String genTypeName) {\r
- String augTypeName = genTypeName;\r
-\r
- int index = 1;\r
- while ((builders != null) && builders.containsKey(genTypeName + index)) {\r
- index++;\r
+ private def String augGenTypeName( Map<String, GeneratedTypeBuilder> builders, String genTypeName) {\r
+ var index = 1;\r
+ while ((builders !== null) && builders.containsKey(genTypeName + index)) {\r
+ index = index + 1;\r
}\r
- augTypeName += index;\r
- return augTypeName;\r
+ return genTypeName + index;\r
}\r
\r
/**\r
* schema paths\r
* @return generated type for <code>containerNode</code>\r
*/\r
- private GeneratedType containerToGenType(final String basePackageName, ContainerSchemaNode containerNode) {\r
- if (containerNode == null) {\r
+ private def GeneratedType containerToGenType( String basePackageName, ContainerSchemaNode containerNode) {\r
+ if (containerNode === null) {\r
return null;\r
}\r
\r
- final String packageName = packageNameForGeneratedType(basePackageName, containerNode.getPath());\r
- final Set<DataSchemaNode> schemaNodes = containerNode.getChildNodes();\r
- final GeneratedTypeBuilder typeBuilder = addDefaultInterfaceDefinition(packageName, containerNode);\r
+ val packageName = packageNameForGeneratedType(basePackageName, containerNode.path);\r
+ val schemaNodes = containerNode.childNodes;\r
+ val typeBuilder = addDefaultInterfaceDefinition(packageName, containerNode);\r
\r
resolveDataSchemaNodes(basePackageName, typeBuilder, schemaNodes);\r
return typeBuilder.toInstance();\r
* parameter. The getter methods (representing child nodes) could be\r
* added to it.\r
*/\r
- private GeneratedTypeBuilder resolveDataSchemaNodes(final String basePackageName,\r
- final GeneratedTypeBuilder typeBuilder, final Set<DataSchemaNode> schemaNodes) {\r
- if ((schemaNodes != null) && (typeBuilder != null)) {\r
- for (final DataSchemaNode schemaNode : schemaNodes) {\r
- if (schemaNode.isAugmenting() || schemaNode.isAddedByUses()) {\r
- continue;\r
+ private def GeneratedTypeBuilder resolveDataSchemaNodes( String basePackageName,\r
+ GeneratedTypeBuilder typeBuilder, Set<DataSchemaNode> schemaNodes) {\r
+ if ((schemaNodes !== null) && (typeBuilder !== null)) {\r
+ for (schemaNode : schemaNodes) {\r
+ if (!schemaNode.isAugmenting() && !schemaNode.isAddedByUses()) {\r
+ addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
}\r
- addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
+ \r
}\r
}\r
return typeBuilder;\r
* parameter <code>typeBuilder</code>. The getter method could be\r
* added to it.\r
*/\r
- private GeneratedTypeBuilder augSchemaNodeToMethods(final String basePackageName,\r
- final GeneratedTypeBuilder typeBuilder, final Set<DataSchemaNode> schemaNodes) {\r
- if ((schemaNodes != null) && (typeBuilder != null)) {\r
- for (final DataSchemaNode schemaNode : schemaNodes) {\r
+ private def GeneratedTypeBuilder augSchemaNodeToMethods( String basePackageName,\r
+ GeneratedTypeBuilder typeBuilder, Set<DataSchemaNode> schemaNodes) {\r
+ if ((schemaNodes !== null) && (typeBuilder !== null)) {\r
+ for (schemaNode : schemaNodes) {\r
if (schemaNode.isAugmenting()) {\r
addSchemaNodeToBuilderAsMethod(basePackageName, schemaNode, typeBuilder);\r
}\r
* generated type builder to which is <code>schemaNode</code>\r
* added as a method.\r
*/\r
- private void addSchemaNodeToBuilderAsMethod(final String basePackageName, final DataSchemaNode schemaNode,\r
- final GeneratedTypeBuilder typeBuilder) {\r
- if (schemaNode != null && typeBuilder != null) {\r
- if (schemaNode instanceof LeafSchemaNode) {\r
- resolveLeafSchemaNodeAsMethod(typeBuilder, (LeafSchemaNode) schemaNode);\r
- } else if (schemaNode instanceof LeafListSchemaNode) {\r
- resolveLeafListSchemaNode(typeBuilder, (LeafListSchemaNode) schemaNode);\r
- } else if (schemaNode instanceof ContainerSchemaNode) {\r
- resolveContainerSchemaNode(basePackageName, typeBuilder, (ContainerSchemaNode) schemaNode);\r
- } else if (schemaNode instanceof ListSchemaNode) {\r
- resolveListSchemaNode(basePackageName, typeBuilder, (ListSchemaNode) schemaNode);\r
- } else if (schemaNode instanceof ChoiceNode) {\r
- resolveChoiceSchemaNode(basePackageName, typeBuilder, (ChoiceNode) schemaNode);\r
+ private def void addSchemaNodeToBuilderAsMethod( String basePackageName, DataSchemaNode node,\r
+ GeneratedTypeBuilder typeBuilder) {\r
+ if (node !== null && typeBuilder !== null) {\r
+ switch(node) {\r
+ case node instanceof LeafSchemaNode: resolveLeafSchemaNodeAsMethod(typeBuilder, node as LeafSchemaNode)\r
+ case node instanceof LeafListSchemaNode: resolveLeafListSchemaNode(typeBuilder, node as LeafListSchemaNode)\r
+ case node instanceof ContainerSchemaNode: resolveContainerSchemaNode(basePackageName, typeBuilder, node as ContainerSchemaNode)\r
+ case node instanceof ListSchemaNode: resolveListSchemaNode(basePackageName, typeBuilder, node as ListSchemaNode)\r
+ case node instanceof ChoiceNode: resolveChoiceSchemaNode(basePackageName, typeBuilder, node as ChoiceNode)\r
}\r
}\r
}\r
* </ul>\r
*\r
*/\r
- private void resolveChoiceSchemaNode(final String basePackageName, final GeneratedTypeBuilder typeBuilder,\r
- final ChoiceNode choiceNode) {\r
- Preconditions.checkArgument(basePackageName != null,"Base Package Name cannot be NULL.");\r
- Preconditions.checkArgument(typeBuilder != null,"Generated Type Builder cannot be NULL.");\r
- Preconditions.checkArgument(choiceNode != null,"Choice Schema Node cannot be NULL.");\r
-\r
- final String choiceName = choiceNode.getQName().getLocalName();\r
- if (choiceName != null && !choiceNode.isAddedByUses()) {\r
- final String packageName = packageNameForGeneratedType(basePackageName, choiceNode.getPath());\r
- final GeneratedTypeBuilder choiceType = addDefaultInterfaceDefinition(packageName, choiceNode);\r
- constructGetter(typeBuilder, choiceName, choiceNode.getDescription(), choiceType);\r
+ private def void resolveChoiceSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ ChoiceNode choiceNode) {\r
+ checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
+ checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
+ checkArgument(choiceNode !== null,"Choice Schema Node cannot be NULL.");\r
+\r
+ val choiceName = choiceNode.QName.localName;\r
+ if (choiceName !== null && !choiceNode.isAddedByUses()) {\r
+ val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);\r
+ val choiceType = addDefaultInterfaceDefinition(packageName, choiceNode);\r
+ constructGetter(typeBuilder, choiceName, choiceNode.description, choiceType);\r
}\r
}\r
\r
* </ul>\r
*\r
*/\r
- private List<GeneratedType> choiceToGeneratedType(final String basePackageName, final ChoiceNode choiceNode) {\r
- Preconditions.checkArgument(basePackageName != null,"Base Package Name cannot be NULL.");\r
- Preconditions.checkArgument(choiceNode != null,"Choice Schema Node cannot be NULL.");\r
+ private def List<GeneratedType> choiceToGeneratedType( String basePackageName, ChoiceNode choiceNode) {\r
+ checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
+ checkArgument(choiceNode !== null,"Choice Schema Node cannot be NULL.");\r
\r
- final List<GeneratedType> generatedTypes = new ArrayList<>();\r
- final String packageName = packageNameForGeneratedType(basePackageName, choiceNode.getPath());\r
- final GeneratedTypeBuilder choiceTypeBuilder = addRawInterfaceDefinition(packageName, choiceNode);\r
- choiceTypeBuilder.addImplementsType(DATA_OBJECT);\r
- final GeneratedType choiceType = choiceTypeBuilder.toInstance();\r
+ val List<GeneratedType> generatedTypes = new ArrayList();\r
+ val packageName = packageNameForGeneratedType(basePackageName, choiceNode.path);\r
+ val choiceTypeBuilder = addRawInterfaceDefinition(packageName, choiceNode);\r
+ //choiceTypeBuilder.addImplementsType(DATA_OBJECT);\r
+ val choiceType = choiceTypeBuilder.toInstance();\r
\r
generatedTypes.add(choiceType);\r
- final Set<ChoiceCaseNode> caseNodes = choiceNode.getCases();\r
- if ((caseNodes != null) && !caseNodes.isEmpty()) {\r
+ val Set<ChoiceCaseNode> caseNodes = choiceNode.cases;\r
+ if ((caseNodes !== null) && !caseNodes.isEmpty()) {\r
generatedTypes.addAll(generateTypesFromChoiceCases(basePackageName, choiceType, caseNodes));\r
}\r
return generatedTypes;\r
* </ul>\r
* *\r
*/\r
- private List<GeneratedType> generateTypesFromChoiceCases(final String basePackageName, final Type refChoiceType,\r
- final Set<ChoiceCaseNode> caseNodes) {\r
- Preconditions.checkArgument(basePackageName != null,"Base Package Name cannot be NULL.");\r
- Preconditions.checkArgument(refChoiceType != null,"Referenced Choice Type cannot be NULL.");\r
- Preconditions.checkArgument(caseNodes != null,"Set of Choice Case Nodes cannot be NULL.");\r
-\r
- final List<GeneratedType> generatedTypes = new ArrayList<>();\r
- for (final ChoiceCaseNode caseNode : caseNodes) {\r
- if (caseNode != null && !caseNode.isAddedByUses() && !caseNode.isAugmenting()) {\r
- final String packageName = packageNameForGeneratedType(basePackageName, caseNode.getPath());\r
- final GeneratedTypeBuilder caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
+ private def List<GeneratedType> generateTypesFromChoiceCases( String basePackageName, Type refChoiceType,\r
+ Set<ChoiceCaseNode> caseNodes) {\r
+ checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
+ checkArgument(refChoiceType !== null,"Referenced Choice Type cannot be NULL.");\r
+ checkArgument(caseNodes !== null,"Set of Choice Case Nodes cannot be NULL.");\r
+\r
+ val List<GeneratedType> generatedTypes = new ArrayList();\r
+ for (caseNode : caseNodes) {\r
+ if (caseNode !== null && !caseNode.isAddedByUses() && !caseNode.isAugmenting()) {\r
+ val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);\r
+ val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
caseTypeBuilder.addImplementsType(refChoiceType);\r
\r
- final Set<DataSchemaNode> childNodes = caseNode.getChildNodes();\r
- if (childNodes != null) {\r
+ val Set<DataSchemaNode> childNodes = caseNode.childNodes;\r
+ if (childNodes !== null) {\r
resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);\r
}\r
generatedTypes.add(caseTypeBuilder.toInstance());\r
* <li>if <code>caseNodes</code> equals null</li>\r
* </ul>\r
*/\r
- private List<GeneratedType> generateTypesFromAugmentedChoiceCases(final String basePackageName,\r
- final Type refChoiceType, final Set<ChoiceCaseNode> caseNodes) {\r
- Preconditions.checkArgument(basePackageName != null,"Base Package Name cannot be NULL.");\r
- Preconditions.checkArgument(refChoiceType != null,"Referenced Choice Type cannot be NULL.");\r
- Preconditions.checkArgument(caseNodes != null,"Set of Choice Case Nodes cannot be NULL.");\r
-\r
- final List<GeneratedType> generatedTypes = new ArrayList<>();\r
- for (final ChoiceCaseNode caseNode : caseNodes) {\r
- if (caseNode != null && caseNode.isAugmenting()) {\r
- final String packageName = packageNameForGeneratedType(basePackageName, caseNode.getPath());\r
- final GeneratedTypeBuilder caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
+ private def List<GeneratedType> generateTypesFromAugmentedChoiceCases( String basePackageName,\r
+ Type refChoiceType, Set<ChoiceCaseNode> caseNodes) {\r
+ checkArgument(basePackageName !== null,"Base Package Name cannot be NULL.");\r
+ checkArgument(refChoiceType !== null,"Referenced Choice Type cannot be NULL.");\r
+ checkArgument(caseNodes !== null,"Set of Choice Case Nodes cannot be NULL.");\r
+\r
+ val List<GeneratedType> generatedTypes = new ArrayList();\r
+ for (caseNode : caseNodes) {\r
+ if (caseNode !== null && caseNode.isAugmenting()) {\r
+ val packageName = packageNameForGeneratedType(basePackageName, caseNode.path);\r
+ val caseTypeBuilder = addDefaultInterfaceDefinition(packageName, caseNode);\r
caseTypeBuilder.addImplementsType(refChoiceType);\r
\r
- final Set<DataSchemaNode> childNodes = caseNode.getChildNodes();\r
- if (childNodes != null) {\r
+ val Set<DataSchemaNode> childNodes = caseNode.childNodes;\r
+ if (childNodes !== null) {\r
resolveDataSchemaNodes(basePackageName, caseTypeBuilder, childNodes);\r
}\r
generatedTypes.add(caseTypeBuilder.toInstance());\r
* <li>true - in other cases</li>\r
* </ul>\r
*/\r
- private boolean resolveLeafSchemaNodeAsMethod(final GeneratedTypeBuilder typeBuilder, final LeafSchemaNode leaf) {\r
- if ((leaf != null) && (typeBuilder != null)) {\r
- final String leafName = leaf.getQName().getLocalName();\r
- String leafDesc = leaf.getDescription();\r
- if (leafDesc == null) {\r
+ private def boolean resolveLeafSchemaNodeAsMethod( GeneratedTypeBuilder typeBuilder, LeafSchemaNode leaf) {\r
+ if ((leaf !== null) && (typeBuilder !== null)) {\r
+ val leafName = leaf.QName.localName;\r
+ var String leafDesc = leaf.description;\r
+ if (leafDesc === null) {\r
leafDesc = "";\r
}\r
\r
- final Module parentModule = findParentModule(schemaContext, leaf);\r
- if (leafName != null && !leaf.isAddedByUses()) {\r
- final TypeDefinition<?> typeDef = leaf.getType();\r
+ val parentModule = findParentModule(schemaContext, leaf);\r
+ if (leafName !== null && !leaf.isAddedByUses()) {\r
+ val TypeDefinition<?> typeDef = leaf.type;\r
\r
- Type returnType = null;\r
+ var Type returnType = null;\r
if (typeDef instanceof EnumTypeDefinition) {\r
returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
- final EnumTypeDefinition enumTypeDef = enumTypeDefFromExtendedType(typeDef);\r
- final EnumBuilder enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName,\r
+ val enumTypeDef = enumTypeDefFromExtendedType(typeDef);\r
+ val enumBuilder = resolveInnerEnumFromTypeDefinition(enumTypeDef, leafName,\r
typeBuilder);\r
\r
- if (enumBuilder != null) {\r
- returnType = new ReferencedTypeImpl(enumBuilder.getPackageName(), enumBuilder.getName());\r
+ if (enumBuilder !== null) {\r
+ returnType = new ReferencedTypeImpl(enumBuilder.packageName, enumBuilder.name);\r
}\r
- ((TypeProviderImpl) typeProvider).putReferencedType(leaf.getPath(), returnType);\r
+ (typeProvider as TypeProviderImpl).putReferencedType(leaf.path, returnType);\r
} else if (typeDef instanceof UnionType) {\r
- GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
- if (genTOBuilder != null) {\r
- returnType = new ReferencedTypeImpl(genTOBuilder.getPackageName(), genTOBuilder.getName());\r
+ val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
+ if (genTOBuilder !== null) {\r
+ returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);\r
}\r
} else if (typeDef instanceof BitsTypeDefinition) {\r
- GeneratedTOBuilder genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
- if (genTOBuilder != null) {\r
- returnType = new ReferencedTypeImpl(genTOBuilder.getPackageName(), genTOBuilder.getName());\r
+ val genTOBuilder = addTOToTypeBuilder(typeDef, typeBuilder, leafName, leaf, parentModule);\r
+ if (genTOBuilder !== null) {\r
+ returnType = new ReferencedTypeImpl(genTOBuilder.packageName, genTOBuilder.name);\r
}\r
} else {\r
returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
}\r
- if (returnType != null) {\r
+ if (returnType !== null) {\r
constructGetter(typeBuilder, leafName, leafDesc, returnType);\r
return true;\r
}\r
* <li>true - other cases</li>\r
* </ul>\r
*/\r
- private boolean resolveLeafSchemaNodeAsProperty(final GeneratedTOBuilder toBuilder, final LeafSchemaNode leaf,\r
+ private def boolean resolveLeafSchemaNodeAsProperty( GeneratedTOBuilder toBuilder, LeafSchemaNode leaf,\r
boolean isReadOnly) {\r
- if ((leaf != null) && (toBuilder != null)) {\r
- final String leafName = leaf.getQName().getLocalName();\r
- String leafDesc = leaf.getDescription();\r
- if (leafDesc == null) {\r
+ if ((leaf !== null) && (toBuilder !== null)) {\r
+ val leafName = leaf.QName.localName;\r
+ var String leafDesc = leaf.description;\r
+ if (leafDesc === null) {\r
leafDesc = "";\r
}\r
\r
- if (leafName != null && !leaf.isAddedByUses()) {\r
- final TypeDefinition<?> typeDef = leaf.getType();\r
+ if (leafName !== null && !leaf.isAddedByUses()) {\r
+ val TypeDefinition<?> typeDef = leaf.type;\r
\r
// TODO: properly resolve enum types\r
- final Type returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
+ val returnType = typeProvider.javaTypeForSchemaDefinitionType(typeDef, leaf);\r
\r
- if (returnType != null) {\r
- final GeneratedPropertyBuilder propBuilder = toBuilder.addProperty(parseToClassName(leafName));\r
+ if (returnType !== null) {\r
+ val propBuilder = toBuilder.addProperty(parseToClassName(leafName));\r
\r
propBuilder.setReadOnly(isReadOnly);\r
propBuilder.setReturnType(returnType);\r
* <li>false - other cases</li>\r
* </ul>\r
*/\r
- private boolean resolveLeafListSchemaNode(final GeneratedTypeBuilder typeBuilder, final LeafListSchemaNode node) {\r
- if ((node != null) && (typeBuilder != null)) {\r
- final String nodeName = node.getQName().getLocalName();\r
- String nodeDesc = node.getDescription();\r
- if (nodeDesc == null) {\r
+ private def boolean resolveLeafListSchemaNode( GeneratedTypeBuilder typeBuilder, LeafListSchemaNode node) {\r
+ if ((node !== null) && (typeBuilder !== null)) {\r
+ val nodeName = node.QName.localName;\r
+ var String nodeDesc = node.description;\r
+ if (nodeDesc === null) {\r
nodeDesc = "";\r
}\r
\r
- if (nodeName != null && !node.isAddedByUses()) {\r
- final TypeDefinition<?> type = node.getType();\r
- final Type listType = Types.listTypeFor(typeProvider.javaTypeForSchemaDefinitionType(type, node));\r
+ if (nodeName !== null && !node.isAddedByUses()) {\r
+ val TypeDefinition<?> type = node.type;\r
+ val listType = Types.listTypeFor(typeProvider.javaTypeForSchemaDefinitionType(type, node));\r
\r
constructGetter(typeBuilder, nodeName, nodeDesc, listType);\r
return true;\r
* <li>true - other cases</li>\r
* </ul>\r
*/\r
- private boolean resolveContainerSchemaNode(final String basePackageName, final GeneratedTypeBuilder typeBuilder,\r
- final ContainerSchemaNode containerNode) {\r
- if ((containerNode != null) && (typeBuilder != null)) {\r
- final String nodeName = containerNode.getQName().getLocalName();\r
+ private def boolean resolveContainerSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ ContainerSchemaNode containerNode) {\r
+ if ((containerNode !== null) && (typeBuilder !== null)) {\r
+ val nodeName = containerNode.QName.localName;\r
\r
- if (nodeName != null && !containerNode.isAddedByUses()) {\r
- final String packageName = packageNameForGeneratedType(basePackageName, containerNode.getPath());\r
+ if (nodeName !== null && !containerNode.isAddedByUses()) {\r
+ val packageName = packageNameForGeneratedType(basePackageName, containerNode.path);\r
\r
- final GeneratedTypeBuilder rawGenType = addDefaultInterfaceDefinition(packageName, containerNode);\r
- constructGetter(typeBuilder, nodeName, containerNode.getDescription(), rawGenType);\r
+ val rawGenType = addDefaultInterfaceDefinition(packageName, containerNode);\r
+ constructGetter(typeBuilder, nodeName, containerNode.description, rawGenType);\r
\r
return true;\r
}\r
* <li>true - other cases</li>\r
* </ul>\r
*/\r
- private boolean resolveListSchemaNode(final String basePackageName, final GeneratedTypeBuilder typeBuilder,\r
- final ListSchemaNode listNode) {\r
- if ((listNode != null) && (typeBuilder != null)) {\r
- final String listName = listNode.getQName().getLocalName();\r
-\r
- if (listName != null && !listNode.isAddedByUses()) {\r
- final String packageName = packageNameForGeneratedType(basePackageName, listNode.getPath());\r
- final GeneratedTypeBuilder rawGenType = addDefaultInterfaceDefinition(packageName, listNode);\r
- constructGetter(typeBuilder, listName, listNode.getDescription(), Types.listTypeFor(rawGenType));\r
+ private def boolean resolveListSchemaNode( String basePackageName, GeneratedTypeBuilder typeBuilder,\r
+ ListSchemaNode listNode) {\r
+ if ((listNode !== null) && (typeBuilder !== null)) {\r
+ val listName = listNode.QName.localName;\r
+\r
+ if (listName !== null && !listNode.isAddedByUses()) {\r
+ val packageName = packageNameForGeneratedType(basePackageName, listNode.path);\r
+ val rawGenType = addDefaultInterfaceDefinition(packageName, listNode);\r
+ constructGetter(typeBuilder, listName, listNode.description, Types.listTypeFor(rawGenType));\r
return true;\r
}\r
}\r
* schema node for which is created generated type builder\r
* @return generated type builder <code>schemaNode</code>\r
*/\r
- private GeneratedTypeBuilder addDefaultInterfaceDefinition(final String packageName, final SchemaNode schemaNode) {\r
- final GeneratedTypeBuilder builder = addRawInterfaceDefinition(packageName, schemaNode, "");\r
+ private def GeneratedTypeBuilder addDefaultInterfaceDefinition( String packageName, SchemaNode schemaNode) {\r
+ val builder = addRawInterfaceDefinition(packageName, schemaNode, "");\r
builder.addImplementsType(DATA_OBJECT);\r
if (!(schemaNode instanceof GroupingDefinition)) {\r
builder.addImplementsType(augmentable(builder));\r
}\r
\r
if (schemaNode instanceof DataNodeContainer) {\r
- addImplementedInterfaceFromUses((DataNodeContainer) schemaNode, builder);\r
+ addImplementedInterfaceFromUses( schemaNode as DataNodeContainer, builder);\r
}\r
\r
return builder;\r
* schema node which provide data about the schema node name\r
* @return generated type builder for <code>schemaNode</code>\r
*/\r
- private GeneratedTypeBuilder addRawInterfaceDefinition(final String packageName, final SchemaNode schemaNode) {\r
+ private def GeneratedTypeBuilder addRawInterfaceDefinition( String packageName, SchemaNode schemaNode) {\r
return addRawInterfaceDefinition(packageName, schemaNode, "");\r
}\r
\r
* </ul>\r
*\r
*/\r
- private GeneratedTypeBuilder addRawInterfaceDefinition(final String packageName, final SchemaNode schemaNode,\r
- final String prefix) {\r
- Preconditions.checkArgument(schemaNode != null,"Data Schema Node cannot be NULL.");\r
- Preconditions.checkArgument(packageName != null,"Package Name for Generated Type cannot be NULL.");\r
- Preconditions.checkArgument(schemaNode.getQName() != null,"QName for Data Schema Node cannot be NULL.");\r
- final String schemaNodeName = schemaNode.getQName().getLocalName();\r
- Preconditions.checkArgument(schemaNodeName != null,"Local Name of QName for Data Schema Node cannot be NULL.");\r
-\r
- final String genTypeName;\r
- if (prefix == null) {\r
+ private def GeneratedTypeBuilder addRawInterfaceDefinition( String packageName, SchemaNode schemaNode,\r
+ String prefix) {\r
+ checkArgument(schemaNode !== null,"Data Schema Node cannot be NULL.");\r
+ checkArgument(packageName !== null,"Package Name for Generated Type cannot be NULL.");\r
+ checkArgument(schemaNode.QName !== null,"QName for Data Schema Node cannot be NULL.");\r
+ val schemaNodeName = schemaNode.QName.localName;\r
+ checkArgument(schemaNodeName !== null,"Local Name of QName for Data Schema Node cannot be NULL.");\r
+\r
+ var String genTypeName;\r
+ if (prefix === null) {\r
genTypeName = parseToClassName(schemaNodeName);\r
} else {\r
genTypeName = prefix + parseToClassName(schemaNodeName);\r
}\r
-\r
- final GeneratedTypeBuilder newType = new GeneratedTypeBuilderImpl(packageName, genTypeName);\r
+ //FIXME: Validation of name conflict\r
+ val newType = new GeneratedTypeBuilderImpl(packageName, genTypeName);\r
+ yangToJavaMapping.put(schemaNode.path,newType);\r
if (!genTypeBuilders.containsKey(packageName)) {\r
- final Map<String, GeneratedTypeBuilder> builders = new HashMap<>();\r
+ val Map<String, GeneratedTypeBuilder> builders = new HashMap();\r
builders.put(genTypeName, newType);\r
genTypeBuilders.put(packageName, builders);\r
} else {\r
- final Map<String, GeneratedTypeBuilder> builders = genTypeBuilders.get(packageName);\r
+ val Map<String, GeneratedTypeBuilder> builders = genTypeBuilders.get(packageName);\r
if (!builders.containsKey(genTypeName)) {\r
builders.put(genTypeName, newType);\r
}\r
* @return string with the name of the getter method for\r
* <code>methodName</code> in JAVA method format\r
*/\r
- private String getterMethodName(final String methodName,Type returnType) {\r
- final StringBuilder method = new StringBuilder();\r
+ private def String getterMethodName( String methodName,Type returnType) {\r
+ val method = new StringBuilder();\r
if(BOOLEAN.equals(returnType)) {\r
method.append("is");\r
} else {\r
return method.toString();\r
}\r
\r
- /**\r
- * Creates the name of the setter method from <code>methodName</code>.\r
- *\r
- * @param methodName\r
- * string with the name of the setter method\r
- * @return string with the name of the setter method for\r
- * <code>methodName</code> in JAVA method format\r
- */\r
- private String setterMethodName(final String methodName) {\r
- final StringBuilder method = new StringBuilder();\r
- method.append("set");\r
- method.append(parseToClassName(methodName));\r
- return method.toString();\r
- }\r
-\r
/**\r
* Created a method signature builder as part of\r
* <code>interfaceBuilder</code>.\r
* @return method signature builder which represents the getter method of\r
* <code>interfaceBuilder</code>\r
*/\r
- private MethodSignatureBuilder constructGetter(final GeneratedTypeBuilder interfaceBuilder,\r
- final String schemaNodeName, final String comment, final Type returnType) {\r
+ private def MethodSignatureBuilder constructGetter( GeneratedTypeBuilder interfaceBuilder,\r
+ String schemaNodeName, String comment, Type returnType) {\r
\r
- final MethodSignatureBuilder getMethod = interfaceBuilder.addMethod(getterMethodName(schemaNodeName,returnType));\r
+ val getMethod = interfaceBuilder.addMethod(getterMethodName(schemaNodeName,returnType));\r
\r
getMethod.setComment(comment);\r
getMethod.setReturnType(returnType);\r
return getMethod;\r
}\r
\r
- private List<Type> listToGenType(final String basePackageName, final ListSchemaNode list) {\r
- Preconditions.checkArgument(basePackageName != null,"Package Name for Generated Type cannot be NULL.");\r
- Preconditions.checkArgument(list != null,"List Schema Node cannot be NULL.");\r
+ private def listToGenType( String basePackageName, ListSchemaNode list) {\r
+ checkArgument(basePackageName !== null,"Package Name for Generated Type cannot be NULL.");\r
+ checkArgument(list !== null,"List Schema Node cannot be NULL.");\r
\r
- final String packageName = packageNameForGeneratedType(basePackageName, list.getPath());\r
- // final GeneratedTypeBuilder typeBuilder =\r
+ val packageName = packageNameForGeneratedType(basePackageName, list.path);\r
+ // val typeBuilder =\r
// resolveListTypeBuilder(packageName, list);\r
- final GeneratedTypeBuilder typeBuilder = addDefaultInterfaceDefinition(packageName, list);\r
+ val typeBuilder = addDefaultInterfaceDefinition(packageName, list);\r
\r
- final List<String> listKeys = listKeys(list);\r
- GeneratedTOBuilder genTOBuilder = resolveListKeyTOBuilder(packageName, list);\r
+ val List<String> listKeys = listKeys(list);\r
+ val genTOBuilder = resolveListKeyTOBuilder(packageName, list);\r
\r
- if (genTOBuilder != null) {\r
- ParameterizedType identifierMarker = Types.parameterizedTypeFor(Types.typeForClass(Identifier.class),\r
- typeBuilder);\r
- ParameterizedType identifiableMarker = Types.parameterizedTypeFor(Types.typeForClass(Identifiable.class),\r
- genTOBuilder);\r
+ if (genTOBuilder !== null) {\r
+ val identifierMarker = IDENTIFIER.parameterizedTypeFor(typeBuilder);\r
+ val identifiableMarker = IDENTIFIABLE.parameterizedTypeFor(genTOBuilder);\r
genTOBuilder.addImplementsType(identifierMarker);\r
typeBuilder.addImplementsType(identifiableMarker);\r
}\r
- final Set<DataSchemaNode> schemaNodes = list.getChildNodes();\r
+ val schemaNodes = list.childNodes;\r
\r
- for (final DataSchemaNode schemaNode : schemaNodes) {\r
- if (schemaNode.isAugmenting()) {\r
- continue;\r
+ for (schemaNode : schemaNodes) {\r
+ if (!schemaNode.isAugmenting()) {\r
+ addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, genTOBuilder, listKeys);\r
}\r
- addSchemaNodeToListBuilders(basePackageName, schemaNode, typeBuilder, genTOBuilder, listKeys);\r
}\r
return typeBuildersToGenTypes(typeBuilder, genTOBuilder);\r
}\r
* <li>if <code>typeBuilder</code> equals null</li>\r
* </ul>\r
*/\r
- private void addSchemaNodeToListBuilders(final String basePackageName, final DataSchemaNode schemaNode,\r
- final GeneratedTypeBuilder typeBuilder, final GeneratedTOBuilder genTOBuilder, final List<String> listKeys) {\r
- Preconditions.checkArgument(schemaNode != null,"Data Schema Node cannot be NULL.");\r
+ private def void addSchemaNodeToListBuilders( String basePackageName, DataSchemaNode schemaNode,\r
+ GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder, List<String> listKeys) {\r
+ checkArgument(schemaNode !== null,"Data Schema Node cannot be NULL.");\r
\r
- Preconditions.checkArgument(typeBuilder != null,"Generated Type Builder cannot be NULL.");\r
+ checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
\r
if (schemaNode instanceof LeafSchemaNode) {\r
- final LeafSchemaNode leaf = (LeafSchemaNode) schemaNode;\r
- final String leafName = leaf.getQName().getLocalName();\r
+ val leaf = schemaNode as LeafSchemaNode;\r
+ val leafName = leaf.QName.localName;\r
if (!listKeys.contains(leafName)) {\r
resolveLeafSchemaNodeAsMethod(typeBuilder, leaf);\r
} else {\r
resolveLeafSchemaNodeAsProperty(genTOBuilder, leaf, true);\r
}\r
} else if (schemaNode instanceof LeafListSchemaNode) {\r
- resolveLeafListSchemaNode(typeBuilder, (LeafListSchemaNode) schemaNode);\r
+ resolveLeafListSchemaNode(typeBuilder, schemaNode as LeafListSchemaNode);\r
} else if (schemaNode instanceof ContainerSchemaNode) {\r
- resolveContainerSchemaNode(basePackageName, typeBuilder, (ContainerSchemaNode) schemaNode);\r
+ resolveContainerSchemaNode(basePackageName, typeBuilder, schemaNode as ContainerSchemaNode);\r
} else if (schemaNode instanceof ListSchemaNode) {\r
- resolveListSchemaNode(basePackageName, typeBuilder, (ListSchemaNode) schemaNode);\r
+ resolveListSchemaNode(basePackageName, typeBuilder, schemaNode as ListSchemaNode);\r
}\r
}\r
\r
- private List<Type> typeBuildersToGenTypes(final GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {\r
- final List<Type> genTypes = new ArrayList<>();\r
- Preconditions.checkArgument(typeBuilder != null,"Generated Type Builder cannot be NULL.");\r
+ private def typeBuildersToGenTypes( GeneratedTypeBuilder typeBuilder, GeneratedTOBuilder genTOBuilder) {\r
+ val List<Type> genTypes = new ArrayList();\r
+ checkArgument(typeBuilder !== null,"Generated Type Builder cannot be NULL.");\r
\r
- if (genTOBuilder != null) {\r
- final GeneratedTransferObject genTO = genTOBuilder.toInstance();\r
+ if (genTOBuilder !== null) {\r
+ val genTO = genTOBuilder.toInstance();\r
constructGetter(typeBuilder, "key", "Returns Primary Key of Yang List Type", genTO);\r
genTypes.add(genTO);\r
}\r
* <code>list</code> contains no keys then the empty list is\r
* returned.\r
*/\r
- private List<String> listKeys(final ListSchemaNode list) {\r
- final List<String> listKeys = new ArrayList<>();\r
+ private def listKeys( ListSchemaNode list) {\r
+ val List<String> listKeys = new ArrayList();\r
\r
- if (list.getKeyDefinition() != null) {\r
- final List<QName> keyDefinitions = list.getKeyDefinition();\r
-\r
- for (final QName keyDefinition : keyDefinitions) {\r
- listKeys.add(keyDefinition.getLocalName());\r
+ if (list.keyDefinition !== null) {\r
+ val keyDefinitions = list.keyDefinition;\r
+ for (keyDefinition : keyDefinitions) {\r
+ listKeys.add(keyDefinition.localName);\r
}\r
}\r
return listKeys;\r
* <code>list</code> or null if <code>list</code> is null or list of\r
* key definitions is null or empty.\r
*/\r
- private GeneratedTOBuilder resolveListKeyTOBuilder(final String packageName, final ListSchemaNode list) {\r
- GeneratedTOBuilder genTOBuilder = null;\r
- if ((list.getKeyDefinition() != null) && (!list.getKeyDefinition().isEmpty())) {\r
- if (list != null) {\r
- final String listName = list.getQName().getLocalName() + "Key";\r
+ private def GeneratedTOBuilder resolveListKeyTOBuilder( String packageName, ListSchemaNode list) {\r
+ var GeneratedTOBuilder genTOBuilder = null;\r
+ if ((list.keyDefinition !== null) && (!list.keyDefinition.isEmpty())) {\r
+ if (list !== null) {\r
+ val listName = list.QName.localName + "Key";\r
genTOBuilder = schemaNodeToTransferObjectBuilder(packageName, listName);\r
}\r
}\r
* string with name for generated TO builder\r
* @return generated TO builder for <code>typeDef</code>\r
*/\r
- private GeneratedTOBuilder addTOToTypeBuilder(TypeDefinition<?> typeDef, GeneratedTypeBuilder typeBuilder,\r
+ private def GeneratedTOBuilder addTOToTypeBuilder(TypeDefinition<?> typeDef, GeneratedTypeBuilder typeBuilder,\r
String leafName, LeafSchemaNode leaf, Module parentModule) {\r
- final String classNameFromLeaf = parseToClassName(leafName);\r
- List<GeneratedTOBuilder> genTOBuilders = new ArrayList<>();\r
- final String packageName = typeBuilder.getFullyQualifiedName();\r
+ val classNameFromLeaf = parseToClassName(leafName);\r
+ val List<GeneratedTOBuilder> genTOBuilders = new ArrayList();\r
+ val packageName = typeBuilder.fullyQualifiedName;\r
if (typeDef instanceof UnionTypeDefinition) {\r
- genTOBuilders.addAll(((TypeProviderImpl) typeProvider).provideGeneratedTOBuildersForUnionTypeDef(\r
+ genTOBuilders.addAll((typeProvider as TypeProviderImpl).provideGeneratedTOBuildersForUnionTypeDef(\r
packageName, typeDef, classNameFromLeaf, leaf));\r
} else if (typeDef instanceof BitsTypeDefinition) {\r
- genTOBuilders.add(((TypeProviderImpl) typeProvider).provideGeneratedTOBuilderForBitsTypeDefinition(\r
+ genTOBuilders.add(((typeProvider as TypeProviderImpl) ).provideGeneratedTOBuilderForBitsTypeDefinition(\r
packageName, typeDef, classNameFromLeaf));\r
}\r
- if (genTOBuilders != null && !genTOBuilders.isEmpty()) {\r
- for (GeneratedTOBuilder genTOBuilder : genTOBuilders) {\r
+ if (genTOBuilders !== null && !genTOBuilders.isEmpty()) {\r
+ for (genTOBuilder : genTOBuilders) {\r
typeBuilder.addEnclosingTransferObject(genTOBuilder);\r
}\r
return genTOBuilders.get(0);\r
* The method passes through the list of <i>uses</i> in\r
* {@code dataNodeContainer}. For every <i>use</i> is obtained coresponding\r
* generated type from {@link BindingGeneratorImpl#allGroupings\r
- * allGroupings} which is adde as <i>implements type</i> to\r
+ * allGroupings} which is added as <i>implements type</i> to\r
* <code>builder</code>\r
*\r
* @param dataNodeContainer\r
* <code>dataNodeContainer</code>\r
* @return generated type builder with all implemented types\r
*/\r
- private GeneratedTypeBuilder addImplementedInterfaceFromUses(final DataNodeContainer dataNodeContainer,\r
- final GeneratedTypeBuilder builder) {\r
- for (UsesNode usesNode : dataNodeContainer.getUses()) {\r
- if (usesNode.getGroupingPath() != null) {\r
- GeneratedType genType = allGroupings.get(usesNode.getGroupingPath());\r
- if (genType == null) {\r
- throw new IllegalStateException("Grouping " + usesNode.getGroupingPath() + "is not resolved for "\r
- + builder.getName());\r
+ private def addImplementedInterfaceFromUses( DataNodeContainer dataNodeContainer,\r
+ GeneratedTypeBuilder builder) {\r
+ for (usesNode : dataNodeContainer.uses) {\r
+ if (usesNode.groupingPath !== null) {\r
+ val genType = allGroupings.get(usesNode.groupingPath);\r
+ if (genType === null) {\r
+ throw new IllegalStateException("Grouping " + usesNode.groupingPath + "is not resolved for "\r
+ + builder.name);\r
}\r
builder.addImplementsType(genType);\r
}\r
}\r
return builder;\r
}\r
-\r
}\r
Code Review / mdsal.git / commitdiff