Fix typo, closes #98

dstl · Oct 24, 2019 · e2c6208 · e2c6208
1 parent fcf5c46
commit e2c6208
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 37 deletions.
diff --git a/...tors/src/main/java/uk/gov/dstl/baleen/annotators/renoun/AbstractPatternDataGenerator.java b/...tors/src/main/java/uk/gov/dstl/baleen/annotators/renoun/AbstractPatternDataGenerator.java
@@ -1,14 +1,10 @@
 // Copyright (c) Committed Software 2018, opensource@committed.io
 package uk.gov.dstl.baleen.annotators.renoun;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
 import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.fit.descriptor.ConfigurationParameter;
@@ -17,12 +13,6 @@
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.bson.Document;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-
 import uk.gov.dstl.baleen.core.pipelines.orderers.AnalysisEngineAction;
 import uk.gov.dstl.baleen.resources.SharedMongoResource;
 import uk.gov.dstl.baleen.resources.data.ReNounFact;
@@ -33,6 +23,10 @@
 import uk.gov.dstl.baleen.uima.grammar.DependencyGraph;
 import uk.gov.dstl.baleen.uima.grammar.DependencyTree;
 
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
 /**
  * An abstract annotator for the generation of ReNoun dependency patterns based on known facts.
  *
@@ -62,9 +56,9 @@ public abstract class AbstractPatternDataGenerator extends BaleenSentenceAnnotat
    *
    * @baleen.config renoun_patterns
    */
-  public static final String PARAM_OUPUT_COLLECTION = "ouputCollection";
+  public static final String PARAM_OUTPUT_COLLECTION = "outputCollection";
 
-  @ConfigurationParameter(name = PARAM_OUPUT_COLLECTION, defaultValue = "renoun_patterns")
+  @ConfigurationParameter(name = PARAM_OUTPUT_COLLECTION, defaultValue = "renoun_patterns")
   private String patternsCollection;
 
   /**

diff --git a/...ators/src/main/java/uk/gov/dstl/baleen/annotators/renoun/ReNounRelationshipAnnotator.java b/...ators/src/main/java/uk/gov/dstl/baleen/annotators/renoun/ReNounRelationshipAnnotator.java
@@ -1,27 +1,25 @@
 // Copyright (c) Committed Software 2018, opensource@committed.io
 package uk.gov.dstl.baleen.annotators.renoun;
 
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
+import com.google.common.base.Predicates;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
 import org.apache.uima.UimaContext;
 import org.apache.uima.fit.descriptor.ConfigurationParameter;
 import org.apache.uima.fit.descriptor.ExternalResource;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.bson.Document;
 import org.elasticsearch.common.Strings;
-
-import com.google.common.base.Predicates;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoDatabase;
-
 import uk.gov.dstl.baleen.resources.SharedMongoResource;
 import uk.gov.dstl.baleen.resources.data.ReNounFact;
 import uk.gov.dstl.baleen.types.semantic.Relation;
 import uk.gov.dstl.baleen.uima.grammar.DependencyParseException;
 import uk.gov.dstl.baleen.uima.grammar.DependencyTree;
 
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
 /**
  * A dependency tree based relation extractor for ReNoun.
  *
@@ -47,9 +45,9 @@ public class ReNounRelationshipAnnotator extends AbstractReNounRelationshipAnnot
    *
    * @baleen.config renoun_patterns
    */
-  public static final String PARAM_OUPUT_COLLECTION = "ouputCollection";
+  public static final String PARAM_OUTPUT_COLLECTION = "outputCollection";
 
-  @ConfigurationParameter(name = PARAM_OUPUT_COLLECTION, defaultValue = "renoun_patterns")
+  @ConfigurationParameter(name = PARAM_OUTPUT_COLLECTION, defaultValue = "renoun_patterns")
   private String patternsCollection;
 
   /**

diff --git a/baleen-mallet/src/main/java/uk/gov/dstl/baleen/mallet/RemoveStopwords.java b/baleen-mallet/src/main/java/uk/gov/dstl/baleen/mallet/RemoveStopwords.java
@@ -1,19 +1,18 @@
 // Copyright (c) Committed Software 2018, opensource@committed.io
 package uk.gov.dstl.baleen.mallet;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Collection;
-
 import cc.mallet.pipe.Pipe;
 import cc.mallet.types.Instance;
 import cc.mallet.types.Token;
 import cc.mallet.types.TokenSequence;
-
 import com.google.common.collect.ImmutableSet;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+
 /** A pipe to remove the given stopwords */
 public class RemoveStopwords extends Pipe implements Serializable {
 
@@ -31,14 +30,14 @@ public RemoveStopwords(Collection<String> stopwords) {
   @Override
   public Instance pipe(Instance carrier) {
     TokenSequence input = (TokenSequence) carrier.getData();
-    TokenSequence ouput = new TokenSequence();
+    TokenSequence output = new TokenSequence();
     for (int i = 0; i < input.size(); i++) {
       Token t = input.get(i);
       if (!stopwords.contains(t.getText())) {
-        ouput.add(t);
+        output.add(t);
       }
     }
-    carrier.setData(ouput);
+    carrier.setData(output);
     return carrier;
   }