Applied feedbacks from @pasin

Author: hideki

src/main/java/com/couchbase/lite/javascript/JavaScriptReplicationFilterCompiler.java

@@ -1,3 +1,17 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
 package com.couchbase.lite.javascript;
 
 import com.couchbase.lite.ReplicationFilter;
@@ -9,6 +23,9 @@
 public class JavaScriptReplicationFilterCompiler implements ReplicationFilterCompiler {
     @Override
     public ReplicationFilter compileFilterFunction(String source, String language) {
-        return new ReplicationFilterBlockRhino(source);
+        if (language != null && language.equalsIgnoreCase("javascript")) {
+            return new ReplicationFilterBlockRhino(source);
+        }
+        throw new IllegalArgumentException(language + " is not supported");
     }
 }

src/main/java/com/couchbase/lite/javascript/JavaScriptViewCompiler.java

@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 package com.couchbase.lite.javascript;
 
 import com.couchbase.lite.Mapper;
@@ -7,15 +20,15 @@
 public class JavaScriptViewCompiler implements ViewCompiler {
     @Override
     public Mapper compileMap(String source, String language) {
-        if (language.equals("javascript")) {
+        if (language != null && language.equalsIgnoreCase("javascript")) {
             return new ViewMapBlockRhino(source);
         }
         throw new IllegalArgumentException(language + " is not supported");
     }
 
     @Override
     public Reducer compileReduce(String source, String language) {
-        if (language.equals("javascript")) {
+        if (language != null && language.equalsIgnoreCase("javascript")) {
             return new ViewReduceBlockRhino(source);
         }
         throw new IllegalArgumentException(language + " is not supported");

src/main/java/com/couchbase/lite/javascript/ReplicationFilterBlockRhino.java

@@ -1,3 +1,17 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
 package com.couchbase.lite.javascript;
 
 import com.couchbase.lite.ReplicationFilter;

src/main/java/com/couchbase/lite/javascript/ViewMapBlockRhino.java

@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 package com.couchbase.lite.javascript;
 
 import com.couchbase.lite.Emitter;

src/main/java/com/couchbase/lite/javascript/ViewReduceBlockRhino.java

@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 package com.couchbase.lite.javascript;
 
 import com.couchbase.lite.Reducer;

src/main/java/com/couchbase/lite/javascript/scopes/GlobalScope.java

@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 package com.couchbase.lite.javascript.scopes;
 
 import com.couchbase.lite.util.Log;

src/main/java/com/couchbase/lite/javascript/scopes/MapGlobalScope.java

@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 package com.couchbase.lite.javascript.scopes;
 
 import com.couchbase.lite.Emitter;

src/main/java/com/couchbase/lite/javascript/scopes/ReduceGlobalScope.java

@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 package com.couchbase.lite.javascript.scopes;
 
 import com.couchbase.lite.CouchbaseLiteException;

src/main/java/com/couchbase/lite/javascript/wrapper/CustomWrapFactory.java

@@ -1,3 +1,16 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
 package com.couchbase.lite.javascript.wrapper;
 
 import org.mozilla.javascript.Context;
@@ -14,7 +27,6 @@ public class CustomWrapFactory extends WrapFactory {
 
     public CustomWrapFactory() {
         setJavaPrimitiveWrap(false);
-
     }
 
     @Override

src/test/java/com/couchbase/lite/ReplicationFilterTestCase.java

@@ -1,3 +1,17 @@
+/**
+ * Copyright (c) 2015 Couchbase, Inc All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
 package com.couchbase.lite;
 
 import com.couchbase.lite.internal.RevisionInternal;
@@ -88,4 +102,12 @@ public void testSimpleFilterWithReqFalse2() {
         ReplicationFilter replicationFilter = replicationFilterCompiler.compileFilterFunction("function(doc, req) {if(doc.type && doc.type == 'order' && req.abc == 1) {return true;}else{return false}}", "javascript");
         assertFalse(replicationFilter.filter(savedRevision, null));
     }
+    public void testInvalidLanguage() {
+        try {
+            ReplicationFilter replicationFilter = replicationFilterCompiler.compileFilterFunction("function(doc, req) {if(doc.type && doc.type == 'order' && req.abc == 1) {return true;}else{return false}}", "C++");
+            fail("IllegalArgumentException should be thrown");
+        }
+        catch (IllegalArgumentException e){
+        }
+    }
 }