Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0f632392bf27
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec3fc6bfbdce
Choose a head ref
  • 6 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 6, 2015

  1. review MapJavaProxy internals

    @kares
    kares committed Jul 6, 2015
    Copy the full SHA
    29e75fa View commit details

  2. cleanup java.util.Map spec

    @kares
    kares committed Jul 6, 2015
    Copy the full SHA
    b959118 View commit details

  3. [ji] spec array to_a conversion

    @kares
    kares committed Jul 6, 2015
    Copy the full SHA
    15c7efc View commit details

  4. [ji] spec (working) map to_hash

    @kares
    kares committed Jul 6, 2015
    Copy the full SHA
    4736f82 View commit details

  5. [ji] to_ary also works as expected with array proxy

    @kares
    kares committed Jul 6, 2015
    Copy the full SHA
    7ad7a50 View commit details

  6. [ji] a working map.to_h (just like to_hash does)

    @kares
    kares committed Jul 6, 2015
    Copy the full SHA
    ec3fc6b View commit details
Showing with 266 additions and 215 deletions.
  1. +60 −46 core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
  2. +155 −140 spec/java_integration/types/array_spec.rb
  3. +51 −29 spec/java_integration/types/map_spec.rb
106 changes: 60 additions & 46 deletions core/src/main/java/org/jruby/java/proxies/MapJavaProxy.java
View file
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@
*/

public class MapJavaProxy extends ConcreteJavaProxy {

private RubyHashMap wrappedMap;

public MapJavaProxy(Ruby runtime, RubyClass klazz) {
@@ -88,17 +89,19 @@ private RubyHashMap getOrCreateRubyHashMap() {
// (JavaProxy)recv).getObject() might raise exception when
// wrong number of args are given to the constructor.
try {
wrappedMap.setSize(((Map)((JavaProxy)this).getObject()).size());
} catch (RaiseException e) {
wrappedMap.setSize( getMapObject().size() );
}
catch (RaiseException e) {
wrappedMap.setSize(0);
}
return wrappedMap;
}

private static class RubyHashMap extends RubyHash {
private IRubyObject receiver;

public RubyHashMap(Ruby runtime, IRubyObject receiver) {
private final MapJavaProxy receiver;

public RubyHashMap(Ruby runtime, MapJavaProxy receiver) {
super(runtime);
this.receiver = receiver;
}
@@ -107,15 +110,14 @@ private void setSize(int size) {
this.size = size;
}

private Map getMap() {
return (Map) ((JavaProxy)receiver).getObject();
}
private Map getMap() { return receiver.getMapObject(); }

@Override
public void internalPut(final IRubyObject key, final IRubyObject value, final boolean checkForExisting) {
Map map = getMap();
@SuppressWarnings("unchecked")
final Map<Object, Object> map = getMap();
map.put(key.toJava(Object.class), value.toJava(Object.class));
size = map.size();
this.size = map.size();
}

@Override
@@ -141,14 +143,14 @@ public RubyHashEntry internalGetEntry(IRubyObject key) {

@Override
public RubyHashEntry internalDelete(final IRubyObject key) {
Map map = getMap();
final Map map = getMap();
Object convertedKey = key.toJava(Object.class);
Object value = map.get(convertedKey);

if (value != null) {
RubyHashEntry rubyEntry = new RubyHashEntry(key.hashCode(), key, JavaUtil.convertJavaToUsableRubyObject(getRuntime(), value), null, null);
map.remove(convertedKey);
size = map.size();
this.size = map.size();
return rubyEntry;
}

@@ -157,12 +159,12 @@ public RubyHashEntry internalDelete(final IRubyObject key) {

@Override
public RubyHashEntry internalDeleteEntry(final RubyHashEntry entry) {
Map map = getMap();
Object convertedKey = ((IRubyObject)entry.getKey()).toJava(Object.class);
final Map map = getMap();
Object convertedKey = ((IRubyObject) entry.getKey()).toJava(Object.class);

if (map.containsKey(convertedKey)) {
map.remove(convertedKey);
size = map.size();
this.size = map.size();
return entry;
}

@@ -171,18 +173,23 @@ public RubyHashEntry internalDeleteEntry(final RubyHashEntry entry) {

@Override
public void visitAll(Visitor visitor) {
Map.Entry[] entries = (Entry[]) getMap().entrySet().toArray(new Map.Entry[0]);
for (Map.Entry entry : entries) {
IRubyObject key = JavaUtil.convertJavaToUsableRubyObject(getRuntime(), entry.getKey());
IRubyObject value = JavaUtil.convertJavaToUsableRubyObject(getRuntime(), entry.getValue());
final Ruby runtime = getRuntime();
@SuppressWarnings("unchecked")
final Map<Object, Object> map = getMap();
final Map.Entry[] entries = map.entrySet().toArray( new Map.Entry[ map.size() ] );
for ( Map.Entry entry : entries ) {
IRubyObject key = JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getKey());
IRubyObject value = JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getValue());
visitor.visit(key, value);
}
}

@Override
public void op_asetForString(Ruby runtime, RubyString key, IRubyObject value) {
getMap().put(key.toJava(String.class), value.toJava(Object.class));
size = getMap().size();
@SuppressWarnings("unchecked")
final Map<Object, Object> map = getMap();
map.put(key.toJava(String.class), value.toJava(Object.class));
this.size = map.size();
}

@Override
@@ -193,8 +200,7 @@ public RubyHash rehash() {
@Override
public RubyHash rb_clear() {
getMap().clear();
size = 0;

this.size = 0;
return this;
}

@@ -208,12 +214,14 @@ public IRubyObject shift(ThreadContext context) {

@Override
public RubyHash to_hash() {
RubyHash hash = new RubyHash(getRuntime());
Set<Map.Entry> entries = ((Map) ((JavaProxy)receiver).getObject()).entrySet();
for (Map.Entry entry : entries) {
IRubyObject key = JavaUtil.convertJavaToUsableRubyObject(getRuntime(), entry.getKey());
IRubyObject value = JavaUtil.convertJavaToUsableRubyObject(getRuntime(), entry.getValue());
hash.op_aset(getRuntime().getCurrentContext(), key, value);
final Ruby runtime = getRuntime();
final RubyHash hash = new RubyHash(runtime);
@SuppressWarnings("unchecked")
Set<Map.Entry> entries = getMap().entrySet();
for ( Map.Entry entry : entries ) {
IRubyObject key = JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getKey());
IRubyObject value = JavaUtil.convertJavaToUsableRubyObject(runtime, entry.getValue());
hash.fastASetCheckString(runtime, key, value);
}
return hash;
}
@@ -314,7 +322,7 @@ public RubyHash rehash() {
/** rb_hash_to_hash
*
*/
@JRubyMethod(name = "to_hash")
@JRubyMethod(name = { "to_hash", "to_h" })
public RubyHash to_hash() {
return getOrCreateRubyHashMap().to_hash();
}
@@ -664,32 +672,38 @@ public IRubyObject getCompareByIdentity_p(ThreadContext context) {

@Override
public IRubyObject dup() {
try {
MapJavaProxy proxy = new MapJavaProxy(getRuntime(), metaClass);
Map newMap = (Map)getObject().getClass().newInstance();
newMap.putAll((Map)getObject());
proxy.setObject(newMap);
return proxy;
} catch (InstantiationException ex) {
throw getRuntime().newNotImplementedError("can't dup Map of type " + getObject().getClass().getName());
} catch (IllegalAccessException ex) {
throw getRuntime().newNotImplementedError("can't dup Map of type " + getObject().getClass().getName());
}
return dupImpl("dup");
}

@Override
public IRubyObject rbClone() {
return dupImpl("clone");
}

@SuppressWarnings("unchecked")
private MapJavaProxy dupImpl(final String method) {
final Map map = getMapObject();
try {
Map newMap = (Map) map.getClass().newInstance();
newMap.putAll(map);
MapJavaProxy proxy = new MapJavaProxy(getRuntime(), metaClass);
Map newMap = (Map)getObject().getClass().newInstance();
newMap.putAll((Map)getObject());
proxy.setObject(newMap);
return proxy;
} catch (InstantiationException ex) {
throw getRuntime().newNotImplementedError("can't clone Map of type " + getObject().getClass().getName());
} catch (IllegalAccessException ex) {
throw getRuntime().newNotImplementedError("can't clone Map of type " + getObject().getClass().getName());
}
catch (InstantiationException ex) {
throw initCause( getRuntime().newNotImplementedError("can't "+ method +" Map of type " + getObject().getClass().getName()), ex);
}
catch (IllegalAccessException ex) {
throw initCause( getRuntime().newNotImplementedError("can't "+ method +" Map of type " + getObject().getClass().getName()), ex);
}
}

private static RaiseException initCause(final RaiseException re, final Exception e) {
re.initCause(e); return re;
}

final Map getMapObject() {
return (Map) getObject();
}

@Deprecated
Loading