Fixed license headers

Author: andsel

logstash-core/benchmarks/src/main/java/org/logstash/benchmark/BufferedTokenizerBenchmark.java

@@ -1,3 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you 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 org.logstash.benchmark;
 
 import org.logstash.common.BufferedTokenizer;

logstash-core/lib/logstash/file_watch.rb

@@ -16,7 +16,6 @@
 # under the License.
 
 require "logstash/environment"
-require "logstash/file_watch"
 
 module LogStash::Util
   UNAME = case RbConfig::CONFIG["host_os"]

logstash-core/lib/logstash/util.rb

@@ -1,3 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you 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 org.logstash.common;
 
 import java.util.Iterator;
@@ -120,15 +138,12 @@ public Iterable<String> extract(String data) {
     }
 
     private Iterable<String> setupIterable() {
-        return new Iterable<String>() {
-            @Override
-            public Iterator<String> iterator() {
-                Iterator<String> returnedIterator = dataSplitter;
-                if (sizeLimit != null) {
-                    returnedIterator = new ValueLimitIteratorDecorator(returnedIterator, sizeLimit);
-                }
-                return returnedIterator;
+        return () -> {
+            Iterator<String> returnedIterator = dataSplitter;
+            if (sizeLimit != null) {
+                returnedIterator = new ValueLimitIteratorDecorator(returnedIterator, sizeLimit);
             }
+            return returnedIterator;
         };
     }
 

logstash-core/src/main/java/org/logstash/common/BufferedTokenizer.java

@@ -83,19 +83,12 @@ public IRubyObject extract(final ThreadContext context, IRubyObject data) {
         Iterable<String> extractor = tokenizer.extract(data.asJavaString());
 
         // return an iterator that does the encoding conversion
-        IRubyObject rubyIterable = RubyUtil.toRubyObject(new Iterable<CharSequence>() {
+        return RubyUtil.toRubyObject((Iterable<CharSequence>) () -> new BufferedTokenizer.IteratorDecorator<>(extractor.iterator()) {
             @Override
-            public Iterator<CharSequence> iterator() {
-                return new BufferedTokenizer.IteratorDecorator<>(extractor.iterator()) {
-                    @Override
-                    public CharSequence next() {
-                        return toEncodedRubyString(context, iterator.next());
-                    }
-                };
+            public CharSequence next() {
+                return toEncodedRubyString(context, iterator.next());
             }
         });
-
-        return rubyIterable;
     }
 
     private RubyString toEncodedRubyString(ThreadContext context, String input) {

logstash-core/src/main/java/org/logstash/common/BufferedTokenizerExt.java

@@ -23,12 +23,10 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 public final class BufferedTokenizerTest {