@@ -70,69 +70,55 @@ public void addInstanceRules(RuleStore rs) {
7070
7171 @ Override
7272 protected DefaultProcessor buildDefaultProcessor (Context context , ModelInterpretationContext mic ) {
73- DefaultProcessor defaultProcessor = super .buildDefaultProcessor (context , mic );
73+ DefaultProcessor defaultProcessor = super .buildDefaultProcessor (context , mic );
7474 defaultProcessor .addHandler (ConfigurationModel .class , ConfigurationModelHandler ::makeInstance );
7575 defaultProcessor .addHandler (AppenderModel .class , AppenderModelHandler ::makeInstance );
7676 defaultProcessor .addHandler (AppenderRefModel .class , AppenderRefModelHandler ::makeInstance );
77-
78-
79- defaultProcessor . addAnalyser ( AppenderModel . class , new RefContainerDependencyAnalyser (context , AppenderModel .class ));
77+
78+ defaultProcessor . addAnalyser ( AppenderModel . class ,
79+ new RefContainerDependencyAnalyser (context , AppenderModel .class ));
8080 defaultProcessor .addAnalyser (AppenderRefModel .class , new AppenderRefDependencyAnalyser (context ));
81-
81+
8282 injectModelFilters (defaultProcessor );
83-
84- return defaultProcessor ;
85-
83+
84+ return defaultProcessor ;
85+
86+ }
87+
88+ private void injectModelFilters (DefaultProcessor defaultProcessor ) {
89+ @ SuppressWarnings ("unchecked" )
90+ Class <? extends Model >[] importModelClasses = new Class [] { ImportModel .class };
91+
92+ @ SuppressWarnings ("unchecked" )
93+ Class <? extends Model >[] variableDefinitionModelClasses = new Class [] { DefineModel .class , PropertyModel .class ,
94+ TimestampModel .class , ParamModel .class };
95+
96+ @ SuppressWarnings ("unchecked" )
97+ Class <? extends Model >[] implicitModelClasses = new Class [] { ImplicitModel .class , ParamModel .class };
98+
99+ @ SuppressWarnings ("unchecked" )
100+ Class <? extends Model >[] otherFirstPhaseModelClasses = new Class [] { ConfigurationModel .class ,
101+ EventEvaluatorModel .class , ShutdownHookModel .class , EventEvaluatorModel .class , IncludeModel .class , };
102+
103+ ChainedModelFilter fistPhaseDefintionFilter = new ChainedModelFilter ();
104+ for (Class <? extends Model > modelClass : importModelClasses )
105+ fistPhaseDefintionFilter .allow (modelClass );
106+ for (Class <? extends Model > modelClass : variableDefinitionModelClasses )
107+ fistPhaseDefintionFilter .allow (modelClass );
108+ for (Class <? extends Model > modelClass : otherFirstPhaseModelClasses )
109+ fistPhaseDefintionFilter .allow (modelClass );
110+ for (Class <? extends Model > modelClass : implicitModelClasses )
111+ fistPhaseDefintionFilter .allow (modelClass );
112+
113+ fistPhaseDefintionFilter .denyAll ();
114+ defaultProcessor .setPhaseOneFilter (fistPhaseDefintionFilter );
115+
116+ // Note: AppenderModel is in the second phase
117+
118+ defaultProcessor .setPhaseTwoFilter (new AllowAllModelFilter ());
119+
86120 }
87121
88- private void injectModelFilters (DefaultProcessor defaultProcessor ) {
89- @ SuppressWarnings ("unchecked" )
90- Class <? extends Model >[] importModelClasses = new Class [] { ImportModel .class };
91-
92-
93- @ SuppressWarnings ("unchecked" )
94- Class <? extends Model >[] variableDefinitionModelClasses = new Class [] {
95- DefineModel .class ,
96- PropertyModel .class ,
97- TimestampModel .class ,
98- ParamModel .class };
99-
100- @ SuppressWarnings ("unchecked" )
101- Class <? extends Model >[] implicitModelClasses = new Class [] {
102- ImplicitModel .class ,
103- ParamModel .class };
104-
105- @ SuppressWarnings ("unchecked" )
106- Class <? extends Model >[] otherFirstPhaseModelClasses = new Class [] {
107- ConfigurationModel .class ,
108- EventEvaluatorModel .class ,
109- ShutdownHookModel .class ,
110- EventEvaluatorModel .class ,
111- IncludeModel .class ,
112- };
113-
114-
115-
116- ChainedModelFilter fistPhaseDefintionFilter = new ChainedModelFilter ();
117- for (Class <? extends Model > modelClass : importModelClasses )
118- fistPhaseDefintionFilter .allow (modelClass );
119- for (Class <? extends Model > modelClass : variableDefinitionModelClasses )
120- fistPhaseDefintionFilter .allow (modelClass );
121- for (Class <? extends Model > modelClass : otherFirstPhaseModelClasses )
122- fistPhaseDefintionFilter .allow (modelClass );
123- for (Class <? extends Model > modelClass : implicitModelClasses )
124- fistPhaseDefintionFilter .allow (modelClass );
125-
126- fistPhaseDefintionFilter .denyAll ();
127- defaultProcessor .setPhaseOneFilter (fistPhaseDefintionFilter );
128-
129- // Note: AppenderModel is in the second phase
130-
131- defaultProcessor .setPhaseTwoFilter (new AllowAllModelFilter ());
132-
133- }
134-
135-
136122 @ Override
137123 protected void addDefaultNestedComponentRegistryRules (DefaultNestedComponentRegistry registry ) {
138124 registry .add (AppenderBase .class , "layout" , PatternLayout .class );
0 commit comments