summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
6f071d8)
These maps are not needed, hence we can forgo creating and maintaining
them.
Change-Id: Ib366bc3d61d8aca7a6f5f881b8a7c8db30ce8c85
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit
082ccfc61766e06fb45c545780b53849f0c19771)
augSchemaNodeToMethods(module, basePackageName, augTypeBuilder, augTypeBuilder, augSchema.getChildNodes());
augmentBuilders.put(augTypeName, augTypeBuilder);
augSchemaNodeToMethods(module, basePackageName, augTypeBuilder, augTypeBuilder, augSchema.getChildNodes());
augmentBuilders.put(augTypeName, augTypeBuilder);
- if(!augSchema.getChildNodes().isEmpty()) {
- genCtx.get(module).addTargetToAugmentation(targetTypeRef, augTypeBuilder);
+ if (!augSchema.getChildNodes().isEmpty()) {
genCtx.get(module).addTypeToAugmentation(augTypeBuilder, augSchema);
}
genCtx.get(module).addTypeToAugmentation(augTypeBuilder, augSchema);
}
public final class ModuleContext {
private GeneratedTypeBuilder moduleNode;
public final class ModuleContext {
private GeneratedTypeBuilder moduleNode;
- private final List<GeneratedTOBuilder> genTOs = new ArrayList<GeneratedTOBuilder>();
- private final Map<SchemaPath, Type> typedefs = new HashMap<SchemaPath, Type>();
- private final Map<SchemaPath, GeneratedTypeBuilder> childNodes = new HashMap<SchemaPath, GeneratedTypeBuilder>();
- private final Map<SchemaPath, GeneratedTypeBuilder> groupings = new HashMap<SchemaPath, GeneratedTypeBuilder>();
- private final Map<SchemaPath, GeneratedTypeBuilder> cases = new HashMap<SchemaPath, GeneratedTypeBuilder>();
+ private final List<GeneratedTOBuilder> genTOs = new ArrayList<>();
+ private final Map<SchemaPath, Type> typedefs = new HashMap<>();
+ private final Map<SchemaPath, GeneratedTypeBuilder> childNodes = new HashMap<>();
+ private final Map<SchemaPath, GeneratedTypeBuilder> groupings = new HashMap<>();
+ private final Map<SchemaPath, GeneratedTypeBuilder> cases = new HashMap<>();
private final Map<QName,GeneratedTOBuilder> identities = new HashMap<>();
private final Map<QName,GeneratedTOBuilder> identities = new HashMap<>();
- private final Set<GeneratedTypeBuilder> topLevelNodes = new HashSet<GeneratedTypeBuilder>();
- private final List<GeneratedTypeBuilder> augmentations = new ArrayList<GeneratedTypeBuilder>();
- private final BiMap<Type,AugmentationSchema> typeToAugmentation = HashBiMap.create();
+ private final Set<GeneratedTypeBuilder> topLevelNodes = new HashSet<>();
+ private final List<GeneratedTypeBuilder> augmentations = new ArrayList<>();
+ private final BiMap<Type, AugmentationSchema> typeToAugmentation = HashBiMap.create();
private final Map<Type,Object> typeToSchema = new HashMap<>();
private final Multimap<Type, Type> choiceToCases = HashMultimap.create();
private final Map<Type,Object> typeToSchema = new HashMap<>();
private final Multimap<Type, Type> choiceToCases = HashMultimap.create();
- private final BiMap<Type,ChoiceCaseNode> caseTypeToSchema = HashBiMap.create();
+ private final BiMap<Type, ChoiceCaseNode> caseTypeToSchema = HashBiMap.create();
- private final Multimap<Type, Type> augmentableToAugmentations = HashMultimap.create();
private final Map<SchemaPath, Type> innerTypes = new HashMap<>();
List<Type> getGeneratedTypes() {
private final Map<SchemaPath, Type> innerTypes = new HashMap<>();
List<Type> getGeneratedTypes() {
return Multimaps.unmodifiableMultimap(choiceToCases);
}
return Multimaps.unmodifiableMultimap(choiceToCases);
}
- public Multimap<Type, Type> getAugmentableToAugmentations() {
- return Multimaps.unmodifiableMultimap(augmentableToAugmentations);
- }
-
public GeneratedTypeBuilder getModuleNode() {
return moduleNode;
}
public GeneratedTypeBuilder getModuleNode() {
return moduleNode;
}
}
public void addTypeToAugmentation(final GeneratedTypeBuilder builder, final AugmentationSchema schema) {
}
public void addTypeToAugmentation(final GeneratedTypeBuilder builder, final AugmentationSchema schema) {
- typeToAugmentation.put(builder, schema);
- typeToSchema.put(builder, schema);
- }
-
- public void addTargetToAugmentation(final Type target, final GeneratedTypeBuilder augmentation) {
- augmentableToAugmentations.put(target,augmentation);
+ typeToAugmentation.put(builder, schema);
+ typeToSchema.put(builder, schema);
}
public void addChoiceToCaseMapping(final Type choiceType, final Type caseType, final ChoiceCaseNode schema) {
}
public void addChoiceToCaseMapping(final Type choiceType, final Type caseType, final ChoiceCaseNode schema) {
*
* Valid values are only instances of {@link DataSchemaNode} or {@link AugmentationSchema}
*
*
* Valid values are only instances of {@link DataSchemaNode} or {@link AugmentationSchema}
*
+ * @return Mapping from type to corresponding schema
*/
public Map<Type, Object> getTypeToSchema() {
return Collections.unmodifiableMap(typeToSchema);
*/
public Map<Type, Object> getTypeToSchema() {
return Collections.unmodifiableMap(typeToSchema);
private final Map<Type, AugmentationSchema> augmentationToSchema = new HashMap<>();
private final BiMap<Type, Object> typeToDefiningSchema = HashBiMap.create();
private final Map<Type, AugmentationSchema> augmentationToSchema = new HashMap<>();
private final BiMap<Type, Object> typeToDefiningSchema = HashBiMap.create();
- private final Multimap<Type, Type> augmentableToAugmentations = HashMultimap.create();
private final Multimap<Type, Type> choiceToCases = HashMultimap.create();
private final Map<QName, Type> identities = new HashMap<>();
private final Multimap<Type, Type> choiceToCases = HashMultimap.create();
private final Map<QName, Type> identities = new HashMap<>();
typeToDefiningSchema.putAll(ctx.getTypeToSchema());
ctx.getTypedefs();
typeToDefiningSchema.putAll(ctx.getTypeToSchema());
ctx.getTypedefs();
- augmentableToAugmentations.putAll(ctx.getAugmentableToAugmentations());
choiceToCases.putAll(ctx.getChoiceToCases());
identities.putAll(ctx.getIdentities());
}
choiceToCases.putAll(ctx.getChoiceToCases());
identities.putAll(ctx.getIdentities());
}