Skip to content

Commit f7b9c34

Browse files
committed
remove processors and allow dynamic processor loading
1 parent 439cbda commit f7b9c34

40 files changed

+66
-4058
lines changed

pom.xml

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,11 @@
2525
<retrofit.version>2.9.0</retrofit.version>
2626
<okhttp3.logging-interceptor.version>3.14.0</okhttp3.logging-interceptor.version>
2727
<unirest.version>1.4.9</unirest.version>
28-
<opennlp-tools.version>1.9.3</opennlp-tools.version>
29-
<emoji-java.version>5.1.1</emoji-java.version>
3028
<jsr305.version>3.0.2</jsr305.version>
3129
</properties>
3230

3331
<dependencies>
3432

35-
<!-- Stanford NLP -->
36-
<!-- This dependency has the provided scope because it is only required by some pre/post processors, see the
37-
documentation to setup Stanford NLP in Xatkit. -->
38-
<dependency>
39-
<groupId>edu.stanford.nlp</groupId>
40-
<artifactId>stanford-corenlp</artifactId>
41-
</dependency>
42-
43-
<!-- emoji-java -->
44-
45-
<dependency>
46-
<groupId>com.vdurmont</groupId>
47-
<artifactId>emoji-java</artifactId>
48-
</dependency>
49-
50-
<!-- OpenNLP Tools -->
51-
52-
<dependency>
53-
<groupId>org.apache.opennlp</groupId>
54-
<artifactId>opennlp-tools</artifactId>
55-
</dependency>
56-
5733
<!-- EMF -->
5834

5935
<dependency>
@@ -166,38 +142,6 @@
166142

167143
<dependencies>
168144

169-
<!-- Stanford NLP -->
170-
<!-- This dependency has the provided scope because it is only required by some pre/post processors, see the
171-
documentation to setup Stanford NLP in Xatkit. -->
172-
<dependency>
173-
<groupId>edu.stanford.nlp</groupId>
174-
<artifactId>stanford-corenlp</artifactId>
175-
<version>3.9.2</version>
176-
<scope>provided</scope>
177-
<exclusions>
178-
<exclusion>
179-
<groupId>com.google.protobuf</groupId>
180-
<artifactId>protobuf-java</artifactId>
181-
</exclusion>
182-
</exclusions>
183-
</dependency>
184-
185-
<!-- emoji-java -->
186-
187-
<dependency>
188-
<groupId>com.vdurmont</groupId>
189-
<artifactId>emoji-java</artifactId>
190-
<version>${emoji-java.version}</version>
191-
</dependency>
192-
193-
<!-- OpenNLP Tools -->
194-
195-
<dependency>
196-
<groupId>org.apache.opennlp</groupId>
197-
<artifactId>opennlp-tools</artifactId>
198-
<version>${opennlp-tools.version}</version>
199-
</dependency>
200-
201145
<!-- Utils -->
202146

203147
<!-- Provides javax.annotation.Nullable -->

src/main/java/com/xatkit/core/recognition/IntentRecognitionProviderFactory.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,9 @@ private static List<InputPreProcessor> loadPreProcessors(
207207
return configuration.getPreProcessorNames().stream().map(preProcessorName -> {
208208
Class<? extends InputPreProcessor> processor;
209209
try {
210-
processor = Loader.loadClass("com.xatkit.core.recognition.processor." + preProcessorName
211-
+ "PreProcessor",
212-
InputPreProcessor.class);
210+
processor = Loader.loadClass(preProcessorName, InputPreProcessor.class);
213211
} catch (XatkitException e) {
214-
/*
215-
* Try to load it without the suffix
216-
*/
217-
processor = Loader.loadClass("com.xatkit.core.recognition.processor." + preProcessorName,
218-
InputPreProcessor.class);
212+
throw new XatkitException(e);
219213
}
220214
try {
221215
return Loader.construct(processor, new Object[]{configuration.getBaseConfiguration()});
@@ -237,14 +231,9 @@ private static List<IntentPostProcessor> loadPostProcessors(IntentRecognitionPro
237231
return configuration.getPostProcessorNames().stream().map(postProcessorName -> {
238232
Class<? extends IntentPostProcessor> processor;
239233
try {
240-
processor = Loader.loadClass("com.xatkit.core.recognition.processor." + postProcessorName
241-
+ "PostProcessor", IntentPostProcessor.class);
234+
processor = Loader.loadClass(postProcessorName, IntentPostProcessor.class);
242235
} catch (XatkitException e) {
243-
/*
244-
* Try to load it without the suffix
245-
*/
246-
processor = Loader.loadClass("com.xatkit.core.recognition.processor." + postProcessorName,
247-
IntentPostProcessor.class);
236+
throw new XatkitException(e);
248237
}
249238
try {
250239
return Loader.construct(processor, new Object[]{configuration.getBaseConfiguration()});

src/main/java/com/xatkit/core/recognition/processor/EmojiData.java

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)