- private final List<AugmentationSchemaBuilder> addedAugments = new ArrayList<AugmentationSchemaBuilder>();
- private final List<AugmentationSchemaBuilder> allAugments = new ArrayList<AugmentationSchemaBuilder>();
- private final Set<UsesNodeBuilder> addedUsesNodes = new HashSet<UsesNodeBuilder>();
- private final List<UsesNodeBuilder> allUsesNodes = new ArrayList<UsesNodeBuilder>();
- private final Set<RpcDefinitionBuilder> addedRpcs = new HashSet<RpcDefinitionBuilder>();
- private final Set<NotificationBuilder> addedNotifications = new HashSet<NotificationBuilder>();
- private final Set<IdentitySchemaNodeBuilder> addedIdentities = new HashSet<IdentitySchemaNodeBuilder>();
- private final Set<FeatureBuilder> addedFeatures = new HashSet<FeatureBuilder>();
- private final Set<DeviationBuilder> addedDeviations = new HashSet<DeviationBuilder>();
- private final Set<TypeDefinitionBuilder> addedTypedefs = new HashSet<TypeDefinitionBuilder>();
- private final List<ExtensionBuilder> addedExtensions = new ArrayList<ExtensionBuilder>();
+
+ private final Set<AugmentationSchema> augments = new HashSet<>();
+ private final List<AugmentationSchemaBuilder> augmentBuilders = new ArrayList<>();
+ private final List<AugmentationSchemaBuilder> allAugments = new ArrayList<>();
+
+ private final List<GroupingBuilder> allGroupings = new ArrayList<>();
+
+ private final List<UsesNodeBuilder> allUsesNodes = new ArrayList<>();
+
+ private final Set<RpcDefinition> rpcs = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+ private final Set<RpcDefinitionBuilder> addedRpcs = new HashSet<>();
+
+ private final Set<NotificationDefinition> notifications = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+ private final Set<NotificationBuilder> addedNotifications = new HashSet<>();
+
+ private final Set<IdentitySchemaNode> identities = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+ private final Set<IdentitySchemaNodeBuilder> addedIdentities = new HashSet<>();
+
+ private final Set<FeatureDefinition> features = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+ private final Set<FeatureBuilder> addedFeatures = new HashSet<>();
+
+ private final Set<Deviation> deviations = new HashSet<>();
+ private final Set<DeviationBuilder> deviationBuilders = new HashSet<>();
+
+ private final List<ExtensionDefinition> extensions = new ArrayList<>();
+ private final List<ExtensionBuilder> addedExtensions = new ArrayList<>();
+