renamed namespace com.logstash to org.logstash

few auto-rename glitches fixes

few auto-rename glitches fixes

few auto-rename glitches fixes

few auto-rename glitches fixes

few auto-rename glitches fixes
This commit is contained in:
Colin Surprenant 2016-09-08 16:48:17 -04:00
parent ce68fb4706
commit 5824080871
55 changed files with 96 additions and 102 deletions

View file

@ -6,12 +6,12 @@ module LogStash
# clear the global compiled templates cache
def clear_cache
Java::ComLogstash::StringInterpolation.get_instance.clear_cache;
Java::OrgLogstash::StringInterpolation.get_instance.clear_cache;
end
# @return [Fixnum] the compiled templates cache size
def cache_size
Java::ComLogstash::StringInterpolation.get_instance.cache_size;
Java::OrgLogstash::StringInterpolation.get_instance.cache_size;
end
end
end

View file

@ -5,7 +5,6 @@ require "logstash/util"
require "logstash/event"
require "json"
require "java"
# java_import 'com.logstash.Util'
TIMESTAMP = "@timestamp"
@ -123,7 +122,7 @@ describe LogStash::Event do
end
it "should set XXJavaProxy Jackson crafted" do
proxy = com.logstash.Util.getMapFixtureJackson()
proxy = org.logstash.Util.getMapFixtureJackson()
# proxy is {"string": "foo", "int": 42, "float": 42.42, "array": ["bar","baz"], "hash": {"string":"quux"} }
e = LogStash::Event.new()
e.set("[proxy]", proxy)
@ -136,7 +135,7 @@ describe LogStash::Event do
end
it "should set XXJavaProxy hand crafted" do
proxy = com.logstash.Util.getMapFixtureHandcrafted()
proxy = org.logstash.Util.getMapFixtureHandcrafted()
# proxy is {"string": "foo", "int": 42, "float": 42.42, "array": ["bar","baz"], "hash": {"string":"quux"} }
e = LogStash::Event.new()
e.set("[proxy]", proxy)
@ -159,12 +158,12 @@ describe LogStash::Event do
it "to_hash should inject a Ruby LogStash::Timestamp" do
e = LogStash::Event.new()
expect(e.to_java).to be_kind_of(Java::ComLogstash::Event)
expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::ComLogstash::Timestamp)
expect(e.to_java).to be_kind_of(Java::OrgLogstash::Event)
expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::OrgLogstash::Timestamp)
expect(e.to_hash[TIMESTAMP]).to be_kind_of(LogStash::Timestamp)
# now make sure the original map was not touched
expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::ComLogstash::Timestamp)
expect(e.to_java.get_field(TIMESTAMP)).to be_kind_of(Java::OrgLogstash::Timestamp)
end
it "should set timestamp" do

View file

@ -1,4 +1,4 @@
import com.logstash.ext.JrubyEventExtLibrary;
import org.logstash.ext.JrubyEventExtLibrary;
import org.jruby.Ruby;
import org.jruby.runtime.load.BasicLibraryService;

View file

@ -1,5 +1,4 @@
import com.logstash.ext.JrubyEventExtLibrary;
import com.logstash.ext.JrubyTimestampExtLibrary;
import org.logstash.ext.JrubyTimestampExtLibrary;
import org.jruby.Ruby;
import org.jruby.runtime.load.BasicLibraryService;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.util.HashMap;
import java.util.Map;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.util.*;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import org.jruby.RubyArray;
import org.jruby.runtime.builtin.IRubyObject;
@ -15,7 +15,7 @@ import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import java.util.stream.Stream;
import static com.logstash.Valuefier.convert;
import static org.logstash.Valuefier.convert;
public class ConvertedList<T> implements List<T>, Collection<T>, Iterable<T> {
private final List<T> delegate;

View file

@ -1,6 +1,6 @@
package com.logstash;
package org.logstash;
import com.logstash.bivalues.BiValues;
import org.logstash.bivalues.BiValues;
import org.jruby.RubyHash;
import org.jruby.runtime.builtin.IRubyObject;

View file

@ -1,10 +1,9 @@
package com.logstash;
package org.logstash;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import java.io.IOError;
import java.io.IOException;
/**

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.io.IOException;

View file

@ -1,11 +1,11 @@
package com.logstash;
package org.logstash;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.logstash.bivalues.NullBiValue;
import com.logstash.bivalues.StringBiValue;
import com.logstash.bivalues.TimeBiValue;
import com.logstash.bivalues.TimestampBiValue;
import com.logstash.ext.JrubyTimestampExtLibrary;
import org.logstash.bivalues.NullBiValue;
import org.logstash.bivalues.StringBiValue;
import org.logstash.bivalues.TimeBiValue;
import org.logstash.bivalues.TimestampBiValue;
import org.logstash.ext.JrubyTimestampExtLibrary;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.joda.time.DateTime;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.util.ArrayList;
import java.util.Arrays;

View file

@ -1,8 +1,8 @@
package com.logstash;
package org.logstash;
import com.logstash.bivalues.BiValue;
import com.logstash.bivalues.BiValues;
import org.logstash.bivalues.BiValue;
import org.logstash.bivalues.BiValues;
public class Javafier {
private static final String ERR_TEMPLATE = "Missing Ruby class handling for full class name=%s, simple name=%s";

View file

@ -1,7 +1,7 @@
package com.logstash;
package org.logstash;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.logstash.bivalues.BiValue;
import org.logstash.bivalues.BiValue;
import java.io.IOException;
import java.util.List;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.util.concurrent.ConcurrentHashMap;

View file

@ -1,7 +1,7 @@
package com.logstash;
package org.logstash;
import com.logstash.bivalues.BiValue;
import com.logstash.bivalues.BiValues;
import org.logstash.bivalues.BiValue;
import org.logstash.bivalues.BiValues;
import org.jruby.Ruby;
import org.jruby.RubyArray;
import org.jruby.RubyHash;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.io.IOException;

View file

@ -1,9 +1,8 @@
package com.logstash;
package org.logstash;
import java.io.IOException;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.io.IOException;
import java.util.ArrayList;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import java.io.IOException;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.joda.time.DateTime;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import com.fasterxml.jackson.databind.ObjectMapper;

View file

@ -1,8 +1,8 @@
package com.logstash;
package org.logstash;
import com.logstash.bivalues.BiValue;
import com.logstash.bivalues.BiValues;
import com.logstash.ext.JrubyTimestampExtLibrary;
import org.logstash.bivalues.BiValue;
import org.logstash.bivalues.BiValues;
import org.logstash.ext.JrubyTimestampExtLibrary;
import org.joda.time.DateTime;
import org.jruby.RubyArray;
import org.jruby.RubyHash;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.runtime.builtin.IRubyObject;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import com.fasterxml.jackson.annotation.JsonValue;
import org.jruby.Ruby;

View file

@ -1,7 +1,7 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import com.logstash.Timestamp;
import com.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp;
import org.logstash.Timestamp;
import org.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp;
import org.jruby.RubyBignum;
import org.jruby.RubyBoolean;
import org.jruby.RubyFloat;
@ -18,8 +18,8 @@ import java.math.BigInteger;
import java.util.HashMap;
public enum BiValues {
COM_LOGSTASH_EXT_JRUBYTIMESTAMPEXTLIBRARY$RUBYTIMESTAMP(BiValueType.TIMESTAMP),
COM_LOGSTASH_TIMESTAMP(BiValueType.TIMESTAMP),
ORG_LOGSTASH_EXT_JRUBYTIMESTAMPEXTLIBRARY$RUBYTIMESTAMP(BiValueType.TIMESTAMP),
ORG_LOGSTASH_TIMESTAMP(BiValueType.TIMESTAMP),
JAVA_LANG_BOOLEAN(BiValueType.BOOLEAN),
JAVA_LANG_DOUBLE(BiValueType.DOUBLE),
JAVA_LANG_FLOAT(BiValueType.FLOAT),
@ -44,8 +44,8 @@ public enum BiValues {
private static HashMap<String, String> initCache() {
HashMap<String, String> hm = new HashMap<>();
hm.put("com.logstash.Timestamp", "COM_LOGSTASH_TIMESTAMP");
hm.put("com.logstash.ext.JrubyTimestampExtLibrary$RubyTimestamp", "COM_LOGSTASH_EXT_JRUBYTIMESTAMPEXTLIBRARY$RUBYTIMESTAMP");
hm.put("org.logstash.Timestamp", "ORG_LOGSTASH_TIMESTAMP");
hm.put("org.logstash.ext.JrubyTimestampExtLibrary$RubyTimestamp", "ORG_LOGSTASH_EXT_JRUBYTIMESTAMPEXTLIBRARY$RUBYTIMESTAMP");
hm.put("java.lang.Boolean", "JAVA_LANG_BOOLEAN");
hm.put("java.lang.Double", "JAVA_LANG_DOUBLE");
hm.put("java.lang.Float", "JAVA_LANG_FLOAT");

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.ext.bigdecimal.RubyBigDecimal;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubyBignum;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubyBoolean;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubyFloat;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubyFloat;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubyInteger;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.java.proxies.JavaProxy;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubyInteger;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import com.fasterxml.jackson.annotation.JsonValue;
import org.jruby.Ruby;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubyString;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.jruby.Ruby;
import org.jruby.RubySymbol;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import org.joda.time.DateTime;
import org.jruby.Ruby;

View file

@ -1,7 +1,7 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import com.logstash.Timestamp;
import com.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp;
import org.logstash.Timestamp;
import org.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp;
import org.jruby.Ruby;
import java.io.ObjectStreamException;

View file

@ -1,6 +1,6 @@
package com.logstash.ext;
package org.logstash.ext;
import com.logstash.*;
import org.logstash.*;
import org.jruby.*;
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;

View file

@ -1,6 +1,5 @@
package com.logstash.ext;
package org.logstash.ext;
import com.logstash.*;
import org.jruby.*;
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;
@ -12,6 +11,7 @@ import org.jruby.runtime.ObjectAllocator;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.runtime.load.Library;
import org.logstash.Timestamp;
import java.io.IOException;

View file

@ -1,6 +1,7 @@
package com.logstash;
package org.logstash;
import org.junit.Test;
import static org.junit.Assert.*;
import java.util.ArrayList;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import org.junit.Test;

View file

@ -1,11 +1,7 @@
package com.logstash;
package org.logstash;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
public class FieldReferenceTest {

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import org.jruby.RubyBignum;
import org.junit.Test;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import org.junit.Test;

View file

@ -1,4 +1,4 @@
package com.logstash;
package org.logstash;
import org.jruby.RubyArray;
import org.jruby.RubyBignum;
@ -36,7 +36,7 @@ public class RubyfierTest extends TestBase {
{
Map data = new HashMap();
data.put("foo", "bar");
RubyHash rubyHash = ((RubyHash)Rubyfier.deep(ruby, data));
RubyHash rubyHash = ((RubyHash) Rubyfier.deep(ruby, data));
// Hack to be able to retrieve the original, unconverted Ruby object from Map
// it seems the only method providing this is internalGet but it is declared protected.

View file

@ -1,6 +1,6 @@
package com.logstash;
package org.logstash;
import com.logstash.ext.JrubyTimestampExtLibrary;
import org.logstash.ext.JrubyTimestampExtLibrary;
import org.jruby.CompatVersion;
import org.jruby.Ruby;
import org.jruby.RubyInstanceConfig;

View file

@ -1,8 +1,9 @@
package com.logstash;
package org.logstash;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.junit.Test;
import static org.junit.Assert.*;
public class TimestampTest {

View file

@ -1,8 +1,8 @@
package com.logstash;
package org.logstash;
import com.logstash.bivalues.BiValue;
import com.logstash.bivalues.BiValues;
import com.logstash.bivalues.TimestampBiValue;
import org.logstash.bivalues.BiValue;
import org.logstash.bivalues.BiValues;
import org.logstash.bivalues.TimestampBiValue;
import org.joda.time.DateTime;
import org.jruby.RubyClass;
import org.jruby.RubyMatchData;

View file

@ -1,6 +1,6 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import com.logstash.TestBase;
import org.logstash.TestBase;
import org.joda.time.DateTime;
import org.jruby.RubyBignum;
import org.jruby.RubyBoolean;

View file

@ -1,8 +1,8 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
import com.logstash.TestBase;
import com.logstash.Timestamp;
import com.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp;
import org.logstash.TestBase;
import org.logstash.Timestamp;
import org.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp;
import org.jruby.RubyBignum;
import org.jruby.RubyBoolean;
import org.jruby.RubyFixnum;

View file

@ -1,4 +1,4 @@
package com.logstash.bivalues;
package org.logstash.bivalues;
public class SomeJavaObject<T> {
private T value;