Format code, update .gitignore, fix some possible bugs

.gitignore

@@ -1,4 +1,7 @@
+.classpath
+.project
 .settings
 .tags
+
 *.class
 

Rakefile

@@ -21,3 +21,4 @@ task :package do
 end
 
 task :build => [:clean, :compile, :package]
+

src/sk/opencourts/elasticsearch/FacetMatcherFactory.java

@@ -6,11 +6,12 @@
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.NativeScriptFactory;
 
-public class FacetMatcherFactory implements NativeScriptFactory {
-
+public final class FacetMatcherFactory implements NativeScriptFactory
+{
 	@Override
-	public ExecutableScript newScript(@Nullable Map<String, Object> params) {
-		return new FacetMatcherScript(params);
+	public final ExecutableScript newScript(final @Nullable Map<String, Object> parameters)
+	{
+		return new FacetMatcherScript(parameters);
 	}
 
 }

src/sk/opencourts/elasticsearch/FacetMatcherScript.java

@@ -5,38 +5,44 @@
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.script.AbstractSearchScript;
 
-public class FacetMatcherScript extends AbstractSearchScript {
+public final class FacetMatcherScript extends AbstractSearchScript
+{
+	private final String term;
+	private final String query;
+
+	public FacetMatcherScript(final @Nullable Map<String, Object> parameters)
+	{
+		this.query = (String) parameters.get("query");
+	}
+
+	private static final String analyze(final String s)
+	{
+		return Strings.unaccent(s).toLowerCase();
+	}
+
+	@Override
+	public final Object run()
+	{
+		String value = analyze(this.term);
 
-	private String   term;
-	private String   query;
+		if (value.contains(analyze(this.query)))
+		{
+			return this.term;
+		}
 
-	public FacetMatcherScript(@Nullable Map<String, Object> params) {
-		query = (String) params.get("query");
+		return null;
 	}
 
 	@Override
-	public Object run() {
-		String value = analyzeString(term);
-
-        if (value.contains(analyzeString(query))) {
-          return term;
-        }
-        else {
-          return null;
-        }
-    }
-
-    @Override
-	public void setNextVar(String name, Object value) {
-		if (name.equals("term")) {
-			term = (String) value;
+	public final void setNextVar(final String name, final Object value)
+	{
+		if (name.equals("term"))
+		{
+			this.term = value.toString();
 		}
-		else {
+		else
+		{
 			super.setNextVar(name, value);
 		}
 	}
-
-	private String analyzeString(String s) {
-		return StringUtils.unaccent(s).toLowerCase();
-	}
 }

src/sk/opencourts/elasticsearch/StringUtils.java → src/sk/opencourts/elasticsearch/Strings.java

@@ -2,17 +2,25 @@
 
 import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
 
-public class StringUtils {
-	public static String unaccent(String s) {
-		int size = s.length();
+public class Strings
+{
+	private Strings()
+	{
+		throw new AssertionError();
+	}
+
+	public static final String unaccent(final String s)
+	{
+		int    size   = s.length();
 		char[] result = new char[size];
-		
+
 		ASCIIFoldingFilter.foldToASCII(s.toCharArray(), 0, result, 0, size);
-		
+
 		return new String(result);
 	}
-
-	public static String[] tokenize(String s) {
+
+	public static final String[] tokenize(final String s)
+	{
 		return s.split("\\s+");
 	}
 }