Skip to content

Commit df46276

Browse files
committed
Small refactoring.
1 parent f3f8466 commit df46276

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

framework/core/src/main/java/com/thefirstlineofcode/granite/framework/core/pipeline/stages/PipelineExtendersConfigurator.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@
88
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.event.IEvent;
99
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.event.IEventListener;
1010
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.event.IEventListenerFactory;
11+
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.parsing.CocProtocolParserFactory;
1112
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.parsing.IPipelinePreprocessor;
1213
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.parsing.IProtocolParserFactory;
13-
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.parsing.CocProtocolParserFactory;
1414
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.processing.IIqResultProcessor;
1515
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.processing.IXepProcessor;
1616
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.processing.IXepProcessorFactory;
1717
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.processing.SingletonXepProcessorFactory;
18+
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.routing.CocProtocolTranslatorFactory;
1819
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.routing.IPipelinePostprocessor;
1920
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.routing.IProtocolTranslatorFactory;
20-
import com.thefirstlineofcode.granite.framework.core.pipeline.stages.routing.CocProtocolTranslatorFactory;
21+
import com.thefirstlineofcode.granite.framework.core.repository.IInitializable;
2122
import com.thefirstlineofcode.granite.framework.core.session.ISessionListener;
2223

23-
public abstract class PipelineExtendersConfigurator implements IPipelineExtendersContributor, IPipelineExtendersConfigurator {
24+
public abstract class PipelineExtendersConfigurator implements IPipelineExtendersContributor,
25+
IPipelineExtendersConfigurator, IInitializable {
2426
protected List<IProtocolParserFactory<?>> parserFactories;
2527
protected List<IXepProcessorFactory<?, ?>> xepProcessorFactories;
2628
protected List<IProtocolTranslatorFactory<?>> translatorFactories;
@@ -46,7 +48,10 @@ public PipelineExtendersConfigurator() {
4648

4749
iqResultProcessors = new ArrayList<>();
4850
sessionListeners = new ArrayList<>();
49-
51+
}
52+
53+
@Override
54+
public void init() {
5055
configure(this);
5156
}
5257

framework/core/src/main/java/com/thefirstlineofcode/granite/framework/core/utils/CommonUtils.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ public static IPipelineExtendersContributor[] getExtendersContributors(IApplicat
118118
if (extendersContributors == null || extendersContributors.size() == 0)
119119
return new IPipelineExtendersContributor[0];
120120

121-
for (IPipelineExtendersContributor extendersContributor : extendersContributors) {
122-
appComponentService.inject(extendersContributor);
123-
}
124-
125121
return extendersContributors.toArray(new IPipelineExtendersContributor[extendersContributors.size()]);
126122
}
127123

stream/standard/src/main/java/com/thefirstlineofcode/granite/stream/standard/StandardClientMessageProcessor.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -378,14 +378,12 @@ public void init() {
378378
}
379379

380380
private void loadContributedSessionListeners() {
381-
List<Class<? extends IPipelineExtendersContributor>> contributorClasses = appComponentService.
382-
getExtensionClasses(IPipelineExtendersContributor.class);
383-
if (contributorClasses == null || contributorClasses.size() == 0) {
381+
IPipelineExtendersContributor[] contributors = CommonUtils.getExtendersContributors(appComponentService);
382+
if (contributors == null || contributors.length == 0) {
384383
return;
385384
}
386385

387-
for (Class<? extends IPipelineExtendersContributor> contributorClass : contributorClasses) {
388-
IPipelineExtendersContributor contributor = appComponentService.createExtension(contributorClass);
386+
for (IPipelineExtendersContributor contributor: contributors) {
389387
ISessionListener[] sessionListeners = contributor.getSessionListeners();
390388
if (sessionListeners == null || sessionListeners.length == 0)
391389
continue;

0 commit comments

Comments
 (0)