diff options
74 files changed, 737 insertions, 308 deletions
diff --git a/java/src/Freeze/BackgroundSaveEvictorI.java b/java/src/Freeze/BackgroundSaveEvictorI.java index 581f083feda..867f686efd4 100644 --- a/java/src/Freeze/BackgroundSaveEvictorI.java +++ b/java/src/Freeze/BackgroundSaveEvictorI.java @@ -107,6 +107,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, _thread.start(); } + @Override public Ice.ObjectPrx addFacet(Ice.Object servant, Ice.Identity ident, String facet) { @@ -194,7 +195,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, ObjectRecord rec = element.rec; rec.servant = servant; - + if(store.keepStats()) { rec.stats.creationTime = IceInternal.Time.currentMonotonicTimeMillis(); @@ -253,6 +254,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override public Ice.Object removeFacet(Ice.Identity ident, String facet) { @@ -389,12 +391,14 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override public void keep(Ice.Identity ident) { keepFacet(ident, ""); } + @Override public void keepFacet(Ice.Identity ident, String facet) { @@ -493,12 +497,14 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override public void release(Ice.Identity ident) { releaseFacet(ident, ""); } + @Override public void releaseFacet(Ice.Identity ident, String facet) { @@ -566,6 +572,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override public boolean hasFacet(Ice.Identity ident, String facet) { @@ -607,6 +614,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override protected boolean hasAnotherFacet(Ice.Identity ident, String facet) { @@ -667,6 +675,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override protected Object createEvictorElement(Ice.Identity ident, ObjectRecord rec, ObjectStore store) { @@ -675,6 +684,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, return elt; } + @Override protected Ice.Object locateImpl(Ice.Current current, Ice.LocalObjectHolder cookie) { @@ -758,6 +768,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie) { @@ -819,6 +830,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override public void deactivate(String category) { @@ -858,6 +870,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override public void run() { @@ -994,6 +1007,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, // future = _timer.schedule(new Runnable() { + @Override public void run() { _communicator.getLogger().error(_errorPrefix + @@ -1001,7 +1015,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, Util.handleFatalError(BackgroundSaveEvictorI.this, _communicator, null); } - }, _streamTimeout, java.util.concurrent.TimeUnit.MILLISECONDS); + }, _streamTimeout, java.util.concurrent.TimeUnit.MILLISECONDS); } synchronized(servant) { @@ -1233,6 +1247,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override protected void evict() { @@ -1280,6 +1295,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, } } + @Override protected TransactionI beforeQuery() { diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/ConnectionI.java index d2df7d40203..194fe82cf31 100644 --- a/java/src/Freeze/ConnectionI.java +++ b/java/src/Freeze/ConnectionI.java @@ -11,6 +11,7 @@ package Freeze; public class ConnectionI implements Connection { + @Override public Transaction beginTransaction() { @@ -23,12 +24,14 @@ public class ConnectionI implements Connection return _transaction; } + @Override public Transaction currentTransaction() { return _transaction; } + @Override public void removeMapIndex(String mapName, String indexName) { @@ -55,6 +58,7 @@ public class ConnectionI implements Connection } } + @Override public void close() { @@ -72,7 +76,7 @@ public class ConnectionI implements Connection } } - java.util.Iterator<Map> p = _mapList.iterator(); + java.util.Iterator<Map<?,?> > p = _mapList.iterator(); while(p.hasNext()) { p.next().close(); @@ -91,24 +95,28 @@ public class ConnectionI implements Connection } } + @Override public Ice.Communicator getCommunicator() { return _communicator; } + @Override public Ice.EncodingVersion getEncoding() { return _encoding; } + @Override public String getName() { return _envName; } + @Override protected void finalize() throws Throwable @@ -151,24 +159,24 @@ public class ConnectionI implements Connection public void closeAllIterators() { - java.util.Iterator<Map> p = _mapList.iterator(); + java.util.Iterator<Map<?,?>> p = _mapList.iterator(); while(p.hasNext()) { p.next().closeAllIterators(); } } - public java.util.Iterator - registerMap(Map map) + public java.util.Iterator<?> + registerMap(Map<?,?> map) { _mapList.addFirst(map); - java.util.Iterator<Map> p = _mapList.iterator(); + java.util.Iterator<Map<?,?>> p = _mapList.iterator(); p.next(); return p; } public void - unregisterMap(java.util.Iterator p) + unregisterMap(java.util.Iterator<?> p) { p.remove(); } @@ -240,7 +248,7 @@ public class ConnectionI implements Connection private SharedDbEnv _dbEnv; private String _envName; private TransactionI _transaction; - private LinkedList<Map> _mapList = new LinkedList<Map>(); + private LinkedList<Map<?,?> > _mapList = new LinkedList<Map<?,?>>(); private int _trace; private int _txTrace; private boolean _deadlockWarning; diff --git a/java/src/Freeze/EvictorElement.java b/java/src/Freeze/EvictorElement.java index f0ab2691ad8..bf75d451ed9 100644 --- a/java/src/Freeze/EvictorElement.java +++ b/java/src/Freeze/EvictorElement.java @@ -43,7 +43,7 @@ class EvictorElement this.identity = identity; this.store = store; } - + final ObjectStore store; final Ice.Identity identity; diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java index 86284eef996..c7c00bfe466 100644 --- a/java/src/Freeze/EvictorI.java +++ b/java/src/Freeze/EvictorI.java @@ -140,24 +140,28 @@ abstract class EvictorI implements Evictor static final String defaultDb = "$default"; static final String indexPrefix = "$index:"; + @Override public Ice.ObjectPrx add(Ice.Object servant, Ice.Identity ident) { return addFacet(servant, ident, ""); } + @Override public Ice.Object remove(Ice.Identity ident) { return removeFacet(ident, ""); } + @Override public boolean hasObject(Ice.Identity ident) { return hasFacet(ident, ""); } + @Override public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) { @@ -214,6 +218,7 @@ abstract class EvictorI implements Evictor return result; } + @Override synchronized public void setSize(int evictorSize) { @@ -244,12 +249,14 @@ abstract class EvictorI implements Evictor } } + @Override synchronized public int getSize() { return _evictorSize; } + @Override public EvictorIterator getIterator(String facet, int batchSize) { @@ -438,7 +445,7 @@ abstract class EvictorI implements Evictor { return _encoding; } - + final SharedDbEnv dbEnv() { diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java index 7b6d6bce4e9..e92dd671705 100644 --- a/java/src/Freeze/EvictorIteratorI.java +++ b/java/src/Freeze/EvictorIteratorI.java @@ -11,6 +11,7 @@ package Freeze; class EvictorIteratorI implements EvictorIterator { + @Override public boolean hasNext() { @@ -25,6 +26,7 @@ class EvictorIteratorI implements EvictorIterator } } + @Override public Ice.Identity next() { diff --git a/java/src/Freeze/Index.java b/java/src/Freeze/Index.java index 3b84522ea7d..922c5f52c84 100644 --- a/java/src/Freeze/Index.java +++ b/java/src/Freeze/Index.java @@ -17,6 +17,7 @@ public abstract class Index implements com.sleepycat.db.SecondaryKeyCreator // Implementation details // + @Override public boolean createSecondaryKey(com.sleepycat.db.SecondaryDatabase secondary, com.sleepycat.db.DatabaseEntry key, @@ -81,8 +82,8 @@ public abstract class Index implements com.sleepycat.db.SecondaryKeyCreator // In DB > 5.1.x we can not set DB_DBT_PARTIAL in the key Dbt when calling // getSearchKey. // - if(com.sleepycat.db.Environment.getVersionMajor() < 5 || - (com.sleepycat.db.Environment.getVersionMajor() == 5 && + if(com.sleepycat.db.Environment.getVersionMajor() < 5 || + (com.sleepycat.db.Environment.getVersionMajor() == 5 && com.sleepycat.db.Environment.getVersionMinor() <= 1)) { key.setPartial(true); @@ -231,8 +232,8 @@ public abstract class Index implements com.sleepycat.db.SecondaryKeyCreator // In DB > 5.1.x we can not set DB_DBT_PARTIAL in the key Dbt when calling // getSearchKey. // - if(com.sleepycat.db.Environment.getVersionMajor() < 5 || - (com.sleepycat.db.Environment.getVersionMajor() == 5 && + if(com.sleepycat.db.Environment.getVersionMajor() < 5 || + (com.sleepycat.db.Environment.getVersionMajor() == 5 && com.sleepycat.db.Environment.getVersionMinor() <= 1)) { key.setPartial(true); diff --git a/java/src/Freeze/LinkedList.java b/java/src/Freeze/LinkedList.java index b75b9cd1f04..dbeccf854a1 100644 --- a/java/src/Freeze/LinkedList.java +++ b/java/src/Freeze/LinkedList.java @@ -82,12 +82,14 @@ public class LinkedList<T> private class ForwardIterator implements java.util.Iterator<T> { + @Override public boolean hasNext() { return _next != null; } + @Override public T next() { @@ -109,6 +111,7 @@ public class LinkedList<T> return _current.element; } + @Override public void remove() { @@ -139,12 +142,14 @@ public class LinkedList<T> private class ReverseIterator implements java.util.Iterator<T> { + @Override public boolean hasNext() { return _next != null; } + @Override public T next() { @@ -166,6 +171,7 @@ public class LinkedList<T> return _current.element; } + @Override public void remove() { diff --git a/java/src/Freeze/MapDb.java b/java/src/Freeze/MapDb.java index 6caf7a09a9e..61c921b8312 100644 --- a/java/src/Freeze/MapDb.java +++ b/java/src/Freeze/MapDb.java @@ -17,7 +17,7 @@ package Freeze; public class MapDb { public - MapDb(ConnectionI connection, String dbName, String key, String value, java.util.Comparator comparator, + MapDb(ConnectionI connection, String dbName, String key, String value, java.util.Comparator<?> comparator, MapIndex[] indices, boolean createDb) { _communicator = connection.communicator(); @@ -27,7 +27,7 @@ public class MapDb _trace = connection.trace(); Catalog catalog = new Catalog(connection, Util.catalogName(), true); - CatalogData catalogData = (CatalogData)catalog.get(_dbName); + CatalogData catalogData = catalog.get(_dbName); if(catalogData != null) { if(catalogData.evictor) diff --git a/java/src/Freeze/MapInternal/EntryI.java b/java/src/Freeze/MapInternal/EntryI.java index f7de9fa6551..e6d402e28b1 100644 --- a/java/src/Freeze/MapInternal/EntryI.java +++ b/java/src/Freeze/MapInternal/EntryI.java @@ -24,6 +24,7 @@ class EntryI<K, V> implements java.util.Map.Entry<K, V> _haveKey = key != null; } + @Override public K getKey() { @@ -36,6 +37,7 @@ class EntryI<K, V> implements java.util.Map.Entry<K, V> return _key; } + @Override public V getValue() { @@ -58,6 +60,7 @@ class EntryI<K, V> implements java.util.Map.Entry<K, V> return _indexBytes; } + @Override public V setValue(V value) { @@ -75,6 +78,7 @@ class EntryI<K, V> implements java.util.Map.Entry<K, V> return old; } + @Override public boolean equals(Object o) { @@ -87,6 +91,7 @@ class EntryI<K, V> implements java.util.Map.Entry<K, V> return eq(getKey(), e.getKey()) && eq(getValue(), e.getValue()); } + @Override public int hashCode() { @@ -94,6 +99,7 @@ class EntryI<K, V> implements java.util.Map.Entry<K, V> ((getValue() == null) ? 0 : getValue().hashCode()); } + @Override public String toString() { diff --git a/java/src/Freeze/MapInternal/Index.java b/java/src/Freeze/MapInternal/Index.java index de8e93e2a9e..331f14272f4 100644 --- a/java/src/Freeze/MapInternal/Index.java +++ b/java/src/Freeze/MapInternal/Index.java @@ -11,8 +11,6 @@ package Freeze.MapInternal; import Freeze.DatabaseException; import Freeze.DeadlockException; -import Freeze.ConnectionI; -import Freeze.Map; import Freeze.MapIndex; import Freeze.NavigableMap; import java.nio.ByteBuffer; @@ -37,12 +35,14 @@ public abstract class Index<K, V, I> // MapIndex methods // + @Override public String name() { return _name; } + @Override public void associate(String dbName, com.sleepycat.db.Database db, com.sleepycat.db.Transaction txn, boolean createDb) throws com.sleepycat.db.DatabaseException, java.io.FileNotFoundException @@ -62,6 +62,7 @@ public abstract class Index<K, V, I> { java.util.Comparator<byte[]> c = new java.util.Comparator<byte[]>() { + @Override public int compare(byte[] a1, byte[] a2) { return Index.this.compare(ByteBuffer.wrap(a1), ByteBuffer.wrap(a2)); @@ -107,6 +108,7 @@ public abstract class Index<K, V, I> _db = _map.connection().dbEnv().getEnv().openSecondaryDatabase(txn, _dbName, null, db, config); } + @Override public void init(MapIndex f) { @@ -122,6 +124,7 @@ public abstract class Index<K, V, I> _trace = _map.traceLevels(); } + @Override public void close() { @@ -149,6 +152,7 @@ public abstract class Index<K, V, I> // SecondaryKeyCreator methods // + @Override public boolean createSecondaryKey(com.sleepycat.db.SecondaryDatabase secondary, com.sleepycat.db.DatabaseEntry key, @@ -156,7 +160,6 @@ public abstract class Index<K, V, I> com.sleepycat.db.DatabaseEntry result) throws com.sleepycat.db.DatabaseException { - Ice.Communicator communicator = _map.connection().getCommunicator(); ByteBuffer secondaryKey = marshalKey(UtilI.getBuffer(value)); assert(secondaryKey != null); @@ -167,6 +170,7 @@ public abstract class Index<K, V, I> // // java.util.Comparator<ByteBuffer>.compare() // + @Override public int compare(ByteBuffer b1, ByteBuffer b2) { assert(_comparator != null); @@ -181,18 +185,21 @@ public abstract class Index<K, V, I> _onlyDups = onlyDups; } + @Override public String dbName() { return Index.this.dbName(); } + @Override public TraceLevels traceLevels() { return _trace; } + @Override public com.sleepycat.db.Cursor openCursor() throws com.sleepycat.db.DatabaseException @@ -200,6 +207,7 @@ public abstract class Index<K, V, I> return _db.openSecondaryCursor(_map.connection().dbTxn(), null); } + @Override public EntryI<K, V> firstEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -207,6 +215,7 @@ public abstract class Index<K, V, I> return Index.this.findFirstEntry(cursor, _fromKey); } + @Override public EntryI<K, V> nextEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -246,8 +255,8 @@ public abstract class Index<K, V, I> // In DB > 5.1.x we can not set DB_DBT_PARTIAL in the key Dbt when calling // getSearchKey. // - if(com.sleepycat.db.Environment.getVersionMajor() < 5 || - (com.sleepycat.db.Environment.getVersionMajor() == 5 && + if(com.sleepycat.db.Environment.getVersionMajor() < 5 || + (com.sleepycat.db.Environment.getVersionMajor() == 5 && com.sleepycat.db.Environment.getVersionMinor() <= 1)) { dbKey.setPartial(true); @@ -294,14 +303,14 @@ public abstract class Index<K, V, I> } else { - + if(_trace.deadlockWarning) { _trace.logger.warning( "Deadlock in Freeze.MapInternal.Index.count while iterating over index \"" + _dbName + "\"; retrying..."); } - + // // Retry // diff --git a/java/src/Freeze/MapInternal/IndexedSubMap.java b/java/src/Freeze/MapInternal/IndexedSubMap.java index 2a35174003e..e2bb0b51ee0 100644 --- a/java/src/Freeze/MapInternal/IndexedSubMap.java +++ b/java/src/Freeze/MapInternal/IndexedSubMap.java @@ -9,7 +9,6 @@ package Freeze.MapInternal; -import Freeze.ConnectionI; import Freeze.DatabaseException; import Freeze.Map; import Freeze.NavigableMap; @@ -24,24 +23,27 @@ class IndexedSubMap<K, V, I> { private class Value extends java.util.AbstractSet<java.util.Map.Entry<K, V>> { + @Override public java.util.Iterator<java.util.Map.Entry<K, V>> iterator() { return _index.find(_myKey, true); } + @Override public int size() { return _index.count(_myKey); } + @Override public boolean equals(Object o) { if(o instanceof IndexedSubMap.Value) { - IndexedSubMap.Value v = (IndexedSubMap.Value)o; + IndexedSubMap<?,?,?>.Value v = (IndexedSubMap<?,?,?>.Value)o; return v._myKey.equals(_myKey); } else @@ -50,6 +52,7 @@ class IndexedSubMap<K, V, I> } } + @Override public int hashCode() { @@ -73,30 +76,34 @@ class IndexedSubMap<K, V, I> private class Entry implements java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> { + @Override public I getKey() { return _value.getKey(); } + @Override public java.util.Set<java.util.Map.Entry<K, V>> getValue() { return _value; } + @Override public java.util.Set<java.util.Map.Entry<K, V>> setValue(java.util.Set<java.util.Map.Entry<K, V>> value) { throw new UnsupportedOperationException(); } + @Override public boolean equals(Object o) { if(o instanceof IndexedSubMap.Entry) { - IndexedSubMap.Entry e = (IndexedSubMap.Entry)o; + IndexedSubMap<?,?,?>.Entry e = (IndexedSubMap<?,?,?>.Entry)o; return e._value.equals(_value); } else @@ -105,6 +112,7 @@ class IndexedSubMap<K, V, I> } } + @Override public int hashCode() { @@ -129,12 +137,14 @@ class IndexedSubMap<K, V, I> private class Iterator implements Map.EntryIterator<java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>>> { + @Override public boolean hasNext() { return _iterator.hasNext(); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> next() { @@ -142,18 +152,21 @@ class IndexedSubMap<K, V, I> return new Entry(_index.decodeKey(entry.getIndexBytes())); } + @Override public void remove() { _iterator.remove(); } + @Override public void close() { _iterator.close(); } + @Override public void destroy() { @@ -189,6 +202,7 @@ class IndexedSubMap<K, V, I> // NavigableMap methods // + @Override public boolean fastRemove(I key) { @@ -203,42 +217,49 @@ class IndexedSubMap<K, V, I> throw new UnsupportedOperationException(); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> firstEntry() { return _view.first(); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> lastEntry() { return _view.last(); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> ceilingEntry(I key) { return _view.ceiling(key); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> floorEntry(I key) { return _view.floor(key); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> higherEntry(I key) { return _view.higher(key); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> lowerEntry(I key) { return _view.lower(key); } + @Override public I ceilingKey(I key) { @@ -246,6 +267,7 @@ class IndexedSubMap<K, V, I> return e != null ? e.getKey() : null; } + @Override public I floorKey(I key) { @@ -253,6 +275,7 @@ class IndexedSubMap<K, V, I> return e != null ? e.getKey() : null; } + @Override public I higherKey(I key) { @@ -260,6 +283,7 @@ class IndexedSubMap<K, V, I> return e != null ? e.getKey() : null; } + @Override public I lowerKey(I key) { @@ -267,12 +291,14 @@ class IndexedSubMap<K, V, I> return e != null ? e.getKey() : null; } + @Override public java.util.Set<I> descendingKeySet() { return descendingMap().keySet(); } + @Override public NavigableMap<I, java.util.Set<java.util.Map.Entry<K, V>>> descendingMap() { @@ -284,6 +310,7 @@ class IndexedSubMap<K, V, I> return _descendingMap; } + @Override public NavigableMap<I, java.util.Set<java.util.Map.Entry<K, V>>> headMap(I toKey, boolean inclusive) { @@ -295,6 +322,7 @@ class IndexedSubMap<K, V, I> return new IndexedSubMap<K, V, I>(_index, v); } + @Override public NavigableMap<I, java.util.Set<java.util.Map.Entry<K, V>>> subMap(I fromKey, boolean fromInclusive, I toKey, boolean toInclusive) { @@ -306,6 +334,7 @@ class IndexedSubMap<K, V, I> return new IndexedSubMap<K, V, I>(_index, v); } + @Override public NavigableMap<I, java.util.Set<java.util.Map.Entry<K, V>>> tailMap(I fromKey, boolean inclusive) { @@ -317,6 +346,7 @@ class IndexedSubMap<K, V, I> return new IndexedSubMap<K, V, I>(_index, v); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> pollFirstEntry() { @@ -326,6 +356,7 @@ class IndexedSubMap<K, V, I> throw new UnsupportedOperationException(); } + @Override public java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>> pollLastEntry() { @@ -339,12 +370,14 @@ class IndexedSubMap<K, V, I> // SortedMap methods // + @Override public java.util.Comparator<? super I> comparator() { return _view.comparator(); } + @Override public I firstKey() { @@ -356,6 +389,7 @@ class IndexedSubMap<K, V, I> return e.getKey(); } + @Override public I lastKey() { @@ -367,18 +401,21 @@ class IndexedSubMap<K, V, I> return e.getKey(); } + @Override public java.util.SortedMap<I, java.util.Set<java.util.Map.Entry<K, V>>> headMap(I toKey) { return headMap(toKey, false); } + @Override public java.util.SortedMap<I, java.util.Set<java.util.Map.Entry<K, V>>> tailMap(I fromKey) { return tailMap(fromKey, true); } + @Override public java.util.SortedMap<I, java.util.Set<java.util.Map.Entry<K, V>>> subMap(I fromKey, I toKey) { @@ -389,6 +426,7 @@ class IndexedSubMap<K, V, I> // Map methods // + @Override public java.util.Set<java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>>> entrySet() { @@ -396,18 +434,20 @@ class IndexedSubMap<K, V, I> { _entrySet = new java.util.AbstractSet<java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>>>() { + @Override public java.util.Iterator<java.util.Map.Entry<I, java.util.Set<java.util.Map.Entry<K, V>>>> iterator() { return new Iterator(); } + @Override public boolean contains(Object o) { if(o instanceof IndexedSubMap.Entry) { - IndexedSubMap.Entry e = (IndexedSubMap.Entry)o; + IndexedSubMap<?,?,?>.Entry e = (IndexedSubMap<?,?,?>.Entry)o; return e.parent() == IndexedSubMap.this && _index.containsKey(e.getKey()); } else @@ -416,6 +456,7 @@ class IndexedSubMap<K, V, I> } } + @Override public boolean remove(Object o) { @@ -426,12 +467,14 @@ class IndexedSubMap<K, V, I> throw new UnsupportedOperationException(); } + @Override public int size() { throw new UnsupportedOperationException(); } + @Override public boolean isEmpty() { @@ -467,6 +510,7 @@ class IndexedSubMap<K, V, I> return _index.containsKey(key); } + @Override public java.util.Set<java.util.Map.Entry<K, V>> get(Object key) { @@ -487,6 +531,7 @@ class IndexedSubMap<K, V, I> } } + @Override public java.util.Set<java.util.Map.Entry<K, V>> remove(Object key) { @@ -655,18 +700,21 @@ class IndexedSubMap<K, V, I> // IteratorModel methods (partial) // + @Override final public String dbName() { return _index.dbName(); } + @Override final public TraceLevels traceLevels() { return _index.traceLevels(); } + @Override final public com.sleepycat.db.Cursor openCursor() throws com.sleepycat.db.DatabaseException @@ -678,6 +726,7 @@ class IndexedSubMap<K, V, I> // Search.KeyValidator methods // + @Override final public boolean keyInRange(ByteBuffer key) { @@ -771,18 +820,21 @@ class IndexedSubMap<K, V, I> // View methods // + @Override Search.Type mapSearchType(Search.Type type) { return type; } + @Override View copy(I fromKey, boolean fromInclusive, I toKey, boolean toInclusive) { return new AscendingView(this, fromKey, fromInclusive, toKey, toInclusive); } + @Override View descendingView() { @@ -793,6 +845,7 @@ class IndexedSubMap<K, V, I> // IteratorModel methods // + @Override public EntryI<K, V> firstEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -800,6 +853,7 @@ class IndexedSubMap<K, V, I> return _index.firstEntry(cursor, _fromKey, _fromInclusive, _toKey, _toInclusive); } + @Override public EntryI<K, V> nextEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -825,18 +879,21 @@ class IndexedSubMap<K, V, I> // View methods // + @Override Search.Type mapSearchType(Search.Type type) { return type.descending(); } + @Override View copy(I fromKey, boolean fromInclusive, I toKey, boolean toInclusive) { return new DescendingView(this, fromKey, fromInclusive, toKey, toInclusive); } + @Override View descendingView() { @@ -847,6 +904,7 @@ class IndexedSubMap<K, V, I> // IteratorModel methods // + @Override public EntryI<K, V> firstEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -854,6 +912,7 @@ class IndexedSubMap<K, V, I> return _index.lastEntry(cursor, _fromKey, _fromInclusive, _toKey, _toInclusive); } + @Override public EntryI<K, V> nextEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException diff --git a/java/src/Freeze/MapInternal/IteratorI.java b/java/src/Freeze/MapInternal/IteratorI.java index 08ca5e12b47..d65c28403e4 100644 --- a/java/src/Freeze/MapInternal/IteratorI.java +++ b/java/src/Freeze/MapInternal/IteratorI.java @@ -9,12 +9,9 @@ package Freeze.MapInternal; -import Freeze.Connection; -import Freeze.ConnectionI; import Freeze.DatabaseException; import Freeze.DeadlockException; import Freeze.NotFoundException; -import Freeze.Map; import java.nio.ByteBuffer; class IteratorI<K, V> implements Freeze.Map.EntryIterator<java.util.Map.Entry<K, V>> @@ -46,6 +43,7 @@ class IteratorI<K, V> implements Freeze.Map.EntryIterator<java.util.Map.Entry<K, _iteratorListToken = _map.addIterator(this); } + @Override public boolean hasNext() { @@ -96,6 +94,7 @@ class IteratorI<K, V> implements Freeze.Map.EntryIterator<java.util.Map.Entry<K, } } + @Override public java.util.Map.Entry<K, V> next() { @@ -110,6 +109,7 @@ class IteratorI<K, V> implements Freeze.Map.EntryIterator<java.util.Map.Entry<K, } } + @Override public void remove() { @@ -208,6 +208,7 @@ class IteratorI<K, V> implements Freeze.Map.EntryIterator<java.util.Map.Entry<K, // // Extra operations. // + @Override public void close() { @@ -228,12 +229,14 @@ class IteratorI<K, V> implements Freeze.Map.EntryIterator<java.util.Map.Entry<K, // // An alias for close() // + @Override public void destroy() { close(); } + @Override protected void finalize() throws Throwable diff --git a/java/src/Freeze/MapInternal/MapI.java b/java/src/Freeze/MapInternal/MapI.java index 10bd15dbb40..389e935ed41 100644 --- a/java/src/Freeze/MapInternal/MapI.java +++ b/java/src/Freeze/MapInternal/MapI.java @@ -284,18 +284,21 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> // Freeze.Map methods // + @Override public void fastPut(K key, V value) { putImpl(new com.sleepycat.db.DatabaseEntry(encodeKey(key)), value); } + @Override public boolean fastRemove(K key) { return removeImpl(new com.sleepycat.db.DatabaseEntry(encodeKey(key))); } + @Override public void close() { @@ -314,6 +317,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public int closeAllIterators() { @@ -323,6 +327,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> // // Close this map and destroy the underlying Berkeley DB database // + @Override public void destroy() { @@ -429,12 +434,14 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public Connection getConnection() { return _connection; } + @Override public void closeDb() { @@ -446,42 +453,49 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> // NavigableMap methods // + @Override public java.util.Map.Entry<K, V> firstEntry() { return entrySearch(Search.Type.FIRST, null, true); } + @Override public java.util.Map.Entry<K, V> lastEntry() { return entrySearch(Search.Type.LAST, null, true); } + @Override public java.util.Map.Entry<K, V> ceilingEntry(K key) { return entrySearch(Search.Type.CEILING, encodeKey(key), true); } + @Override public java.util.Map.Entry<K, V> floorEntry(K key) { return entrySearch(Search.Type.FLOOR, encodeKey(key), true); } + @Override public java.util.Map.Entry<K, V> higherEntry(K key) { return entrySearch(Search.Type.HIGHER, encodeKey(key), true); } + @Override public java.util.Map.Entry<K, V> lowerEntry(K key) { return entrySearch(Search.Type.LOWER, encodeKey(key), true); } + @Override public K ceilingKey(K key) { @@ -489,6 +503,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return e != null ? e.getKey() : null; } + @Override public K floorKey(K key) { @@ -496,6 +511,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return e != null ? e.getKey() : null; } + @Override public K higherKey(K key) { @@ -503,6 +519,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return e != null ? e.getKey() : null; } + @Override public K lowerKey(K key) { @@ -510,12 +527,14 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return e != null ? e.getKey() : null; } + @Override public java.util.Set<K> descendingKeySet() { return descendingMap().keySet(); } + @Override public NavigableMap<K, V> descendingMap() { @@ -532,6 +551,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return _descendingMap; } + @Override public NavigableMap<K, V> headMap(K toKey, boolean inclusive) { @@ -548,6 +568,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return new SubMap<K, V>(this, null, false, toKey, inclusive, true); } + @Override public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive) { @@ -564,6 +585,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return new SubMap<K, V>(this, fromKey, fromInclusive, toKey, toInclusive, true); } + @Override public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive) { @@ -580,6 +602,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return new SubMap<K, V>(this, fromKey, inclusive, null, false, true); } + @Override public java.util.Map.Entry<K, V> pollFirstEntry() { @@ -591,6 +614,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return e; } + @Override public java.util.Map.Entry<K, V> pollLastEntry() { @@ -606,6 +630,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> // SortedMap methods // + @Override public java.util.Comparator<? super K> comparator() { @@ -622,6 +647,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public K firstKey() { @@ -633,6 +659,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return e.getKey(); } + @Override public K lastKey() { @@ -644,18 +671,21 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return e.getKey(); } + @Override public java.util.SortedMap<K, V> headMap(K toKey) { return headMap(toKey, false); } + @Override public java.util.SortedMap<K, V> tailMap(K fromKey) { return tailMap(fromKey, true); } + @Override public java.util.SortedMap<K, V> subMap(K fromKey, K toKey) { @@ -666,6 +696,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> // Map methods // + @Override public int size() { @@ -678,7 +709,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> for(;;) { - + try { com.sleepycat.db.BtreeStats s = @@ -711,6 +742,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public boolean containsValue(Object value) { @@ -725,7 +757,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> { while(p.hasNext()) { - Entry e = (Entry)p.next(); + Entry<K,V> e = p.next(); if(e.getValue() == null) { return true; @@ -736,7 +768,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> { while(p.hasNext()) { - Entry e = (Entry)p.next(); + Entry<K,V> e = p.next(); if(value.equals(e.getValue())) { return true; @@ -755,7 +787,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> { if(_trace.deadlockWarning) { - _trace.logger.warning("Deadlock in Freeze.MapInternal.MapI.containsValue while " + + _trace.logger.warning("Deadlock in Freeze.MapInternal.MapI.containsValue while " + "iterating over Db \"" + _dbName + "\"; retrying..."); } @@ -774,6 +806,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public boolean containsKey(Object o) { @@ -829,6 +862,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public V get(Object o) { @@ -846,6 +880,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public V put(K key, V value) { @@ -860,6 +895,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return old; } + @Override public V remove(Object o) { @@ -879,6 +915,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public void clear() { @@ -900,7 +937,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> com.sleepycat.db.DatabaseEntry valueEntry = new com.sleepycat.db.DatabaseEntry(); valueEntry.setPartial(true); - + for(;;) { try @@ -931,7 +968,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> dbc.close(); } } - finally + finally { if(tx != null) { @@ -967,6 +1004,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } } + @Override public java.util.Set<java.util.Map.Entry<K, V>> entrySet() { @@ -974,12 +1012,14 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> { _entrySet = new java.util.AbstractSet<java.util.Map.Entry<K, V>>() { + @Override public java.util.Iterator<java.util.Map.Entry<K, V>> iterator() { return new IteratorI<K, V>(MapI.this, MapI.this); } + @Override public boolean contains(Object o) { @@ -995,6 +1035,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return v != null && valEquals(decodeValue(v), value); } + @Override public boolean remove(Object o) { @@ -1014,12 +1055,14 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return false; } + @Override public int size() { return MapI.this.size(); } + @Override public void clear() { @@ -1035,18 +1078,21 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> // IteratorModel methods // + @Override public String dbName() { return _dbName; } + @Override public TraceLevels traceLevels() { return _trace; } + @Override public com.sleepycat.db.Cursor openCursor() throws com.sleepycat.db.DatabaseException @@ -1054,6 +1100,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return _db.db().openCursor(_connection.dbTxn(), null); } + @Override public EntryI<K, V> firstEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -1061,6 +1108,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return firstEntry(cursor, null, false, null, false); } + @Override public EntryI<K, V> nextEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -1155,11 +1203,11 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> { int count = 0; - java.util.Iterator<IteratorI> p = _iteratorList.iterator(); + java.util.Iterator<IteratorI<K, V>> p = _iteratorList.iterator(); while(p.hasNext()) { - IteratorI i = p.next(); + IteratorI<K, V> i = p.next(); if(i != except) { i.close(); @@ -1171,10 +1219,10 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> } Object - addIterator(IteratorI i) + addIterator(IteratorI<K, V> i) { _iteratorList.addFirst(i); - java.util.Iterator<IteratorI> p = _iteratorList.iterator(); + java.util.Iterator<IteratorI<K, V>> p = _iteratorList.iterator(); p.next(); return p; } @@ -1183,8 +1231,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> removeIterator(Object token) { @SuppressWarnings("unchecked") - java.util.Iterator<IteratorI> i = (java.util.Iterator<IteratorI>)token; - + java.util.Iterator<IteratorI<K, V>> i = (java.util.Iterator<IteratorI<K, V>>)token; i.remove(); } @@ -1568,11 +1615,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> _comparator = comparator; } - public java.util.Comparator<K> comparator() - { - return _comparator; - } - + @Override public int compare(byte[] d1, byte[] d2) { final ByteBuffer b1 = ByteBuffer.wrap(d1); @@ -1598,6 +1641,7 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> return _comparator; } + @Override public int compare(ByteBuffer b1, ByteBuffer b2) { return _comparator.compare(decodeKey(b1), decodeKey(b2)); @@ -1617,12 +1661,14 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> this.type = type; } + @Override public void patch(Ice.Object v) { value = v; } + @Override public String type() { @@ -1647,11 +1693,11 @@ public abstract class MapI<K, V> extends java.util.AbstractMap<K, V> private final Ice.Communicator _communicator; private final Ice.EncodingVersion _encoding; private final TraceLevels _trace; - private java.util.Iterator _token; + private java.util.Iterator<?> _token; private MapDb _db; private java.util.Set<java.util.Map.Entry<K, V>> _entrySet; private NavigableMap<K, V> _descendingMap; - private LinkedList<IteratorI> _iteratorList = new LinkedList<IteratorI>(); + private LinkedList<IteratorI<K, V>> _iteratorList = new LinkedList<IteratorI<K, V>>(); private java.util.Map<String, MapIndex> _indexMap = new java.util.HashMap<String, MapIndex>(); } diff --git a/java/src/Freeze/MapInternal/Search.java b/java/src/Freeze/MapInternal/Search.java index 7146bd5661c..0579e4fd1aa 100644 --- a/java/src/Freeze/MapInternal/Search.java +++ b/java/src/Freeze/MapInternal/Search.java @@ -20,26 +20,32 @@ class Search { FIRST // The first entry { + @Override Type descending() { return LAST; }; }, LAST // The last entry { + @Override Type descending() { return FIRST; }; }, CEILING // The entry with the smallest key greater than or equal to the target key { + @Override Type descending() { return FLOOR; }; }, FLOOR // The entry with the greatest key less than or equal to the target key { + @Override Type descending() { return CEILING; }; }, HIGHER // The entry with the smallest key greater than the target key { + @Override Type descending() { return LOWER; }; }, LOWER // The entry with the greatest key less than the target key { + @Override Type descending() { return HIGHER; }; }; diff --git a/java/src/Freeze/MapInternal/SubMap.java b/java/src/Freeze/MapInternal/SubMap.java index 270f72ca949..5f9fdff28c1 100644 --- a/java/src/Freeze/MapInternal/SubMap.java +++ b/java/src/Freeze/MapInternal/SubMap.java @@ -9,8 +9,6 @@ package Freeze.MapInternal; -import Freeze.ConnectionI; -import Freeze.Map; import Freeze.NavigableMap; import java.nio.ByteBuffer; @@ -44,6 +42,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // NavigableMap methods // + @Override public boolean fastRemove(K key) { @@ -55,42 +54,49 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return _map.fastRemove(key); } + @Override public java.util.Map.Entry<K, V> firstEntry() { return _view.first(); } + @Override public java.util.Map.Entry<K, V> lastEntry() { return _view.last(); } + @Override public java.util.Map.Entry<K, V> ceilingEntry(K key) { return _view.ceiling(key); } + @Override public java.util.Map.Entry<K, V> floorEntry(K key) { return _view.floor(key); } + @Override public java.util.Map.Entry<K, V> higherEntry(K key) { return _view.higher(key); } + @Override public java.util.Map.Entry<K, V> lowerEntry(K key) { return _view.lower(key); } + @Override public K ceilingKey(K key) { @@ -98,6 +104,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return e != null ? e.getKey() : null; } + @Override public K floorKey(K key) { @@ -105,6 +112,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return e != null ? e.getKey() : null; } + @Override public K higherKey(K key) { @@ -112,6 +120,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return e != null ? e.getKey() : null; } + @Override public K lowerKey(K key) { @@ -119,12 +128,14 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return e != null ? e.getKey() : null; } + @Override public java.util.Set<K> descendingKeySet() { return descendingMap().keySet(); } + @Override public NavigableMap<K, V> descendingMap() { @@ -136,6 +147,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return _descendingMap; } + @Override public NavigableMap<K, V> headMap(K toKey, boolean inclusive) { @@ -147,6 +159,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return new SubMap<K, V>(_map, v); } + @Override public NavigableMap<K, V> subMap(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive) { @@ -158,6 +171,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return new SubMap<K, V>(_map, v); } + @Override public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive) { @@ -169,6 +183,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return new SubMap<K, V>(_map, v); } + @Override public java.util.Map.Entry<K, V> pollFirstEntry() { @@ -180,6 +195,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return e; } + @Override public java.util.Map.Entry<K, V> pollLastEntry() { @@ -195,12 +211,14 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // SortedMap methods // + @Override public java.util.Comparator<? super K> comparator() { return _view.comparator(); } + @Override public K firstKey() { @@ -212,6 +230,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return e.getKey(); } + @Override public K lastKey() { @@ -223,18 +242,21 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return e.getKey(); } + @Override public java.util.SortedMap<K, V> headMap(K toKey) { return headMap(toKey, false); } + @Override public java.util.SortedMap<K, V> tailMap(K fromKey) { return tailMap(fromKey, true); } + @Override public java.util.SortedMap<K, V> subMap(K fromKey, K toKey) { @@ -245,6 +267,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // Map methods // + @Override public java.util.Set<java.util.Map.Entry<K, V>> entrySet() { @@ -252,12 +275,14 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K { _entrySet = new java.util.AbstractSet<java.util.Map.Entry<K, V>>() { + @Override public java.util.Iterator<java.util.Map.Entry<K, V>> iterator() { return new IteratorI<K, V>(_map, _view); } + @Override public boolean contains(Object o) { @@ -276,6 +301,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K } } + @Override public boolean remove(Object o) { @@ -291,12 +317,14 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K } } + @Override public int size() { throw new UnsupportedOperationException(); } + @Override public boolean isEmpty() { @@ -332,6 +360,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return _map.containsKey(k); } + @Override public V get(Object key) { @@ -345,6 +374,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return _map.get(k); } + @Override public V remove(Object key) { @@ -483,18 +513,21 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // IteratorModel methods (partial) // + @Override final public String dbName() { return _map.dbName(); } + @Override final public TraceLevels traceLevels() { return _map.traceLevels(); } + @Override final public com.sleepycat.db.Cursor openCursor() throws com.sleepycat.db.DatabaseException @@ -506,6 +539,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // Search.KeyValidator methods // + @Override final public boolean keyInRange(ByteBuffer key) { @@ -599,18 +633,21 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // View methods // + @Override Search.Type mapSearchType(Search.Type type) { return type; } + @Override View copy(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive) { return new AscendingView(this, fromKey, fromInclusive, toKey, toInclusive); } + @Override View descendingView() { @@ -621,6 +658,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // IteratorModel methods // + @Override public EntryI<K, V> firstEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -628,6 +666,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return _map.firstEntry(cursor, _fromKey, _fromInclusive, _toKey, _toInclusive); } + @Override public EntryI<K, V> nextEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -652,18 +691,21 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // View methods // + @Override Search.Type mapSearchType(Search.Type type) { return type.descending(); } + @Override View copy(K fromKey, boolean fromInclusive, K toKey, boolean toInclusive) { return new DescendingView(this, fromKey, fromInclusive, toKey, toInclusive); } + @Override View descendingView() { @@ -674,6 +716,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K // IteratorModel methods // + @Override public EntryI<K, V> firstEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException @@ -681,6 +724,7 @@ class SubMap<K, V> extends java.util.AbstractMap<K, V> implements NavigableMap<K return _map.lastEntry(cursor, _fromKey, _fromInclusive, _toKey, _toInclusive); } + @Override public EntryI<K, V> nextEntry(com.sleepycat.db.Cursor cursor) throws com.sleepycat.db.DatabaseException diff --git a/java/src/Freeze/NavigableMap.java b/java/src/Freeze/NavigableMap.java index 7e9bb807fe9..aa76f6d0207 100644 --- a/java/src/Freeze/NavigableMap.java +++ b/java/src/Freeze/NavigableMap.java @@ -141,7 +141,7 @@ public interface NavigableMap<K, V> extends java.util.SortedMap<K, V> * <p> * If either map is modified while an iteration over either map is * in progress (except through the iterator's own <code>remove</code> or <code>fastRemove</code>operation), - * the results of the iteration are undefined. + * the results of the iteration are undefined. * * @return a Reverse order view of this map. **/ diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java index 9e43a28c8ee..fcd3253dab0 100644 --- a/java/src/Freeze/ObjectStore.java +++ b/java/src/Freeze/ObjectStore.java @@ -428,6 +428,7 @@ class ObjectStore implements IceUtil.Store // Load a servant from the database; will end up in the cache associated with // this ObjectStore. This load is not transactional. // + @Override public Object load(Object identObj) { diff --git a/java/src/Freeze/SharedDbEnv.java b/java/src/Freeze/SharedDbEnv.java index 19209180a07..d9ec31431c6 100644 --- a/java/src/Freeze/SharedDbEnv.java +++ b/java/src/Freeze/SharedDbEnv.java @@ -18,13 +18,13 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable SharedDbEnv result; - synchronized(_map) + synchronized(_map) { result = _map.get(key); if(result == null) { result = new SharedDbEnv(key, dbEnv); - + SharedDbEnv previousValue = _map.put(key, result); assert(previousValue == null); } @@ -36,12 +36,12 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable return result; } - + // // Returns a shared map Db; the caller should NOT close this Db. // public MapDb - getSharedMapDb(String dbName, String key, String value, java.util.Comparator comparator, MapIndex[] indices, + getSharedMapDb(String dbName, String key, String value, java.util.Comparator<?> comparator, MapIndex[] indices, boolean createDb) { if(dbName.equals(_catalog.dbName())) @@ -55,7 +55,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable return _catalogIndexList; } - synchronized(_sharedDbMap) + synchronized(_sharedDbMap) { MapDb db = _sharedDbMap.get(dbName); if(db == null) @@ -89,7 +89,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable public void removeSharedMapDb(String dbName) { - synchronized(_sharedDbMap) + synchronized(_sharedDbMap) { MapDb db = _sharedDbMap.remove(dbName); if(db != null) @@ -99,7 +99,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable } } - public String + public String getEnvName() { return _key.envName; @@ -122,14 +122,14 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable { return _dbEnv; } - + public void close() { - synchronized(_map) + synchronized(_map) { if(--_refCount == 0) - { + { // // Remove from map // @@ -144,6 +144,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable } } + @Override public void run() { @@ -168,7 +169,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable return; } } - + if(_trace >= 2) { _key.communicator.getLogger().trace("Freeze.DbEnv", "checkpointing environment \"" + _key.envName + @@ -188,8 +189,9 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable } } } - - public void + + @Override + public void error(com.sleepycat.db.Environment env, String errorPrefix, String message) { _key.communicator.getLogger().error("Freeze database error in DbEnv \"" + _key.envName + "\": " + message); @@ -209,14 +211,14 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable TransactionalEvictorContext ctx = _ctxMap.get(t); assert ctx == null; - + ctx = new TransactionalEvictorContext(this); synchronized(_map) { _refCount++; // owned by the underlying ConnectionI } _ctxMap.put(t, ctx); - + return ctx; } @@ -244,7 +246,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable // if(txi.getConnectionI().dbEnv() != this) { - throw new DatabaseException(errorPrefix(_key.envName) + + throw new DatabaseException(errorPrefix(_key.envName) + "the given transaction is bound to environment '" + txi.getConnectionI().dbEnv()._key.envName + "'"); } @@ -266,10 +268,10 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable _ctxMap.put(t, null); } } - + private SharedDbEnv(MapKey key, com.sleepycat.db.Environment dbEnv) - { + { _key = key; _dbEnv = dbEnv; _ownDbEnv = (dbEnv == null); @@ -320,7 +322,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable if(_ownDbEnv) { com.sleepycat.db.EnvironmentConfig config = new com.sleepycat.db.EnvironmentConfig(); - + config.setErrorHandler(this); config.setInitializeLocking(true); config.setInitializeLogging(true); @@ -367,13 +369,13 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable { throw new NotFoundException(errorPrefix(_key.envName) + "open: " + dx.getMessage(), dx); } - + // // Default checkpoint period is every 120 seconds // _checkpointPeriod = properties.getPropertyAsIntWithDefault(propertyPrefix + ".CheckpointPeriod", 120) * 1000; - + _kbyte = properties.getPropertyAsIntWithDefault(propertyPrefix + ".PeriodicCheckpointMinSize", 0); String threadName; @@ -392,7 +394,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable { _thread = new Thread(this, threadName); _thread.start(); - } + } } _catalog = new MapDb(_key.communicator, _key.envName, Util.catalogName(), "string", @@ -430,7 +432,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable _done = true; notify(); } - + while(_thread != null) { try @@ -443,7 +445,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable { } } - + // // Release catalogs // @@ -458,7 +460,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable _catalog = null; } } - + if(_catalogIndexList != null) { try @@ -470,7 +472,7 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable _catalogIndexList = null; } } - + // // Close Dbs // @@ -478,13 +480,13 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable { db.close(); } - + if(_trace >= 1) { _key.communicator.getLogger().trace("Freeze.DbEnv", "closing database environment \"" + _key.envName + "\""); } - + if(_ownDbEnv && _dbEnv != null) { try @@ -520,16 +522,17 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable { final String envName; final Ice.Communicator communicator; - + MapKey(String envName, Ice.Communicator communicator) { this.envName = envName; this.communicator = communicator; } + @Override public boolean equals(Object o) - { + { try { MapKey k = (MapKey)o; @@ -541,7 +544,8 @@ public class SharedDbEnv implements com.sleepycat.db.ErrorHandler, Runnable return false; } } - + + @Override public int hashCode() { diff --git a/java/src/Freeze/TransactionI.java b/java/src/Freeze/TransactionI.java index 5c23c186711..55f61e5e217 100644 --- a/java/src/Freeze/TransactionI.java +++ b/java/src/Freeze/TransactionI.java @@ -11,6 +11,7 @@ package Freeze; class TransactionI implements Transaction { + @Override public void commit() { @@ -79,6 +80,7 @@ class TransactionI implements Transaction } } + @Override public void rollback() { @@ -145,6 +147,7 @@ class TransactionI implements Transaction } } + @Override public Connection getConnection() { diff --git a/java/src/Freeze/TransactionalEvictorContext.java b/java/src/Freeze/TransactionalEvictorContext.java index 433bbf0b3ab..21e1b6d6597 100644 --- a/java/src/Freeze/TransactionalEvictorContext.java +++ b/java/src/Freeze/TransactionalEvictorContext.java @@ -16,6 +16,7 @@ package Freeze; class TransactionalEvictorContext implements Ice.DispatchInterceptorAsyncCallback, PostCompletionCallback { + @Override public void postCompletion(boolean committed, boolean deadlock, SharedDbEnv dbEnv) { @@ -55,6 +56,7 @@ class TransactionalEvictorContext implements Ice.DispatchInterceptorAsyncCallbac } } + @Override public boolean response(boolean ok) { @@ -91,6 +93,7 @@ class TransactionalEvictorContext implements Ice.DispatchInterceptorAsyncCallbac } } + @Override public boolean exception(java.lang.Exception ex) { diff --git a/java/src/Freeze/TransactionalEvictorDeadlockException.java b/java/src/Freeze/TransactionalEvictorDeadlockException.java index db9c69e862d..2515691dd19 100644 --- a/java/src/Freeze/TransactionalEvictorDeadlockException.java +++ b/java/src/Freeze/TransactionalEvictorDeadlockException.java @@ -16,6 +16,7 @@ public class TransactionalEvictorDeadlockException extends Ice.SystemException tx = transaction; } + @Override public String ice_name() { diff --git a/java/src/Freeze/TransactionalEvictorI.java b/java/src/Freeze/TransactionalEvictorI.java index 1e24e8a6319..9522185a6b0 100644 --- a/java/src/Freeze/TransactionalEvictorI.java +++ b/java/src/Freeze/TransactionalEvictorI.java @@ -19,6 +19,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor static final int required = 2; static final int never = 3; + @Override public Transaction getCurrentTransaction() { @@ -34,6 +35,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor } } + @Override public void setCurrentTransaction(Transaction tx) { @@ -48,6 +50,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor } } + @Override public Ice.ObjectPrx addFacet(Ice.Object servant, Ice.Identity ident, String facet) { @@ -127,6 +130,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor } } + @Override public Ice.Object removeFacet(Ice.Identity ident, String facet) { @@ -208,6 +212,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor } } + @Override public boolean hasFacet(Ice.Identity ident, String facet) { @@ -250,6 +255,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor } } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookieObj) { @@ -258,6 +264,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor // } + @Override public void deactivate(String category) { @@ -599,18 +606,21 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor return null; } + @Override protected Object createEvictorElement(Ice.Identity ident, ObjectRecord rec, ObjectStore store) { return new EvictorElement(rec.servant, ident, store); } + @Override protected Ice.Object locateImpl(Ice.Current current, Ice.LocalObjectHolder cookie) { return _interceptor; } + @Override protected boolean hasAnotherFacet(Ice.Identity ident, String facet) { @@ -632,7 +642,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor // if(!facet.equals(entry.getKey())) { - ObjectStore store = (ObjectStore)entry.getValue(); + ObjectStore store = entry.getValue(); if(tx == null && store.cache().getIfPinned(ident) != null) { @@ -654,6 +664,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor } } + @Override protected void evict() { @@ -669,6 +680,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor } } + @Override protected TransactionI beforeQuery() { @@ -830,6 +842,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor // private Ice.DispatchInterceptor _interceptor = new Ice.DispatchInterceptor() { + @Override public Ice.DispatchStatus dispatch(Ice.Request request) { diff --git a/java/src/Glacier2/Application.java b/java/src/Glacier2/Application.java index 6afab7a0528..6217b4fa4cb 100644 --- a/java/src/Glacier2/Application.java +++ b/java/src/Glacier2/Application.java @@ -29,7 +29,7 @@ package Glacier2; * class destroys the current session and restarts the application * with another call to {@link #createSession} followed by * {@link #runWithSession}. - * + * * The application can optionally override the {@link #sessionDestroyed} * callback method if it needs to take action when connectivity with * the Glacier2 router is lost. @@ -98,6 +98,7 @@ public abstract class Application extends Ice.Application * Run should not be overridden for Glacier2.Application. Instead * <code>runWithSession</code> should be used. */ + @Override final public int run(String[] args) { @@ -234,17 +235,20 @@ public abstract class Application extends Ice.Application private class ConnectionCallbackI implements Ice.ConnectionCallback { + @Override public void heartbeat(Ice.Connection con) { - + } + @Override public void closed(Ice.Connection con) { sessionDestroyed(); } } + @Override protected int doMain(Ice.StringSeqHolder argHolder, Ice.InitializationData initData) { @@ -287,7 +291,7 @@ public abstract class Application extends Ice.Application boolean restart = false; status.value = 0; - + try { _communicator = Ice.Util.initialize(argHolder, initData); @@ -326,7 +330,7 @@ public abstract class Application extends Ice.Application { int acmTimeout = 0; try - { + { acmTimeout = _router.getACMTimeout(); } catch(Ice.OperationNotExistException ex) @@ -336,8 +340,8 @@ public abstract class Application extends Ice.Application { Ice.Connection connection = _router.ice_getCachedConnection(); assert(connection != null); - connection.setACM(new Ice.IntOptional(acmTimeout), - null, + connection.setACM(new Ice.IntOptional(acmTimeout), + null, new Ice.Optional<Ice.ACMHeartbeat>(Ice.ACMHeartbeat.HeartbeatAlways)); connection.setCallback(new ConnectionCallbackI()); } @@ -354,15 +358,18 @@ public abstract class Application extends Ice.Application // timer.scheduleAtFixedRate(new Runnable() { + @Override public void run() { _router.begin_refreshSession(new Glacier2.Callback_Router_refreshSession() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { @@ -373,6 +380,7 @@ public abstract class Application extends Ice.Application sessionDestroyed(); } + @Override public void exception(Ice.UserException ex) { @@ -510,7 +518,7 @@ public abstract class Application extends Ice.Application // // Not expected. // - Ice.Util.getProcessLogger().error("unexpected exception when destroying the session:\n" + + Ice.Util.getProcessLogger().error("unexpected exception when destroying the session:\n" + IceInternal.Ex.toString(ex)); } _router = null; diff --git a/java/src/Glacier2/SessionHelper.java b/java/src/Glacier2/SessionHelper.java index 0e5e0abe748..2ea89487044 100644 --- a/java/src/Glacier2/SessionHelper.java +++ b/java/src/Glacier2/SessionHelper.java @@ -21,11 +21,13 @@ public class SessionHelper _sessionHelper = sessionHelper; } + @Override public void heartbeat(Ice.Connection con) { - + } + @Override public void closed(Ice.Connection con) { _sessionHelper.destroy(); @@ -48,7 +50,7 @@ public class SessionHelper /** * Destroys the Glacier2 session. - * + * * Once the session has been destroyed, {@link SessionCallback.disconnected} is called on * the associated callback object. */ @@ -95,6 +97,7 @@ public class SessionHelper // new Thread(new Runnable() { + @Override public void run() { destroyInternal(); @@ -127,7 +130,7 @@ public class SessionHelper { throw new SessionNotExistException(); } - + return _category; } @@ -148,9 +151,9 @@ public class SessionHelper return internalObjectAdapter().add(servant, new Ice.Identity(java.util.UUID.randomUUID().toString(), _category)); } - + /** - * Returns the Glacier2 session proxy. If the session hasn't been established yet, + * Returns the Glacier2 session proxy. If the session hasn't been established yet, * or the session has already been destroyed, throws SessionNotExistException. * @return The session proxy, or throws SessionNotExistException if no session exists. * @throws SessionNotExistException No session exists. @@ -169,7 +172,7 @@ public class SessionHelper /** * Returns true if there is an active session, otherwise returns false. - * @return <code>true</code>if session exists or false if no session exists. + * @return <code>true</code>if session exists or false if no session exists. */ synchronized public boolean isConnected() @@ -214,7 +217,7 @@ public class SessionHelper connect(Glacier2.RouterPrx router) throws CannotCreateSessionException, PermissionDeniedException; } - + /** * Connects to the Glacier2 router using the associated SSL credentials. * @@ -228,6 +231,7 @@ public class SessionHelper { connectImpl(new ConnectStrategy() { + @Override public SessionPrx connect(RouterPrx router) throws CannotCreateSessionException, PermissionDeniedException { @@ -240,8 +244,8 @@ public class SessionHelper * Connects a Glacier2 session using user name and password credentials. * * Once the connection is established, {@link SessionCallback#connected} is called on the callback object; - * upon failure {@link SessionCallback.exception} is called with the exception. - * + * upon failure {@link SessionCallback.exception} is called with the exception. + * * @param username The user name. * @param password The password. * @param context The request context to use when creating the session. @@ -251,6 +255,7 @@ public class SessionHelper { connectImpl(new ConnectStrategy() { + @Override public SessionPrx connect(RouterPrx router) throws CannotCreateSessionException, PermissionDeniedException { @@ -286,6 +291,7 @@ public class SessionHelper // new Thread(new Runnable() { + @Override public void run() { destroyInternal(); @@ -309,8 +315,8 @@ public class SessionHelper { Ice.Connection connection = _router.ice_getCachedConnection(); assert(connection != null); - connection.setACM(new Ice.IntOptional(acmTimeout), - null, + connection.setACM(new Ice.IntOptional(acmTimeout), + null, new Ice.Optional<Ice.ACMHeartbeat>(Ice.ACMHeartbeat.HeartbeatAlways)); connection.setCallback(new ConnectionCallbackI(this)); } @@ -324,19 +330,23 @@ public class SessionHelper // timer.scheduleAtFixedRate(new Runnable() { + @Override public void run() { _router.begin_refreshSession(new Glacier2.Callback_Router_refreshSession() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { SessionHelper.this.destroy(); } + @Override public void exception(Ice.UserException ex) { SessionHelper.this.destroy(); @@ -352,6 +362,7 @@ public class SessionHelper _shutdownHook = new Thread("Shutdown hook") { + @Override public void run() { SessionHelper.this.destroy(); @@ -378,6 +389,7 @@ public class SessionHelper dispatchCallback(new Runnable() { + @Override public void run() { try @@ -451,13 +463,14 @@ public class SessionHelper // dispatchCallback(new Runnable() { + @Override public void run() { _callback.disconnected(SessionHelper.this); } }, null); } - + private void connectImpl(final ConnectStrategy factory) { @@ -472,10 +485,12 @@ public class SessionHelper _destroy = true; new Thread(new Runnable() { + @Override public void run() { dispatchCallback(new Runnable() { + @Override public void run() { _callback.connectFailed(SessionHelper.this, ex); @@ -488,12 +503,14 @@ public class SessionHelper new Thread(new Runnable() { + @Override public void run() { try { dispatchCallbackAndWait(new Runnable() { + @Override public void run() { _callback.createdCommunicator(SessionHelper.this); @@ -518,6 +535,7 @@ public class SessionHelper dispatchCallback(new Runnable() { + @Override public void run() { _callback.connectFailed(SessionHelper.this, ex); @@ -550,7 +568,8 @@ public class SessionHelper _initData.dispatcher.dispatch( new Runnable() { - public void + @Override + public void run() { runnable.run(); diff --git a/java/src/Ice/OptionalObject.java b/java/src/Ice/OptionalObject.java index 04f85f40584..ef113f68971 100644 --- a/java/src/Ice/OptionalObject.java +++ b/java/src/Ice/OptionalObject.java @@ -21,8 +21,9 @@ public class OptionalObject implements ReadObjectCallback, IceInternal.Patcher * @param cls The formal type required for the unmarshaled object. * @param type The Slice type ID corresponding to the formal type. **/ + @SuppressWarnings("rawtypes") public - OptionalObject(Optional opt, Class cls, String type) + OptionalObject(Optional opt, Class<?> cls, String type) { this.opt = opt; this.cls = cls; @@ -34,8 +35,8 @@ public class OptionalObject implements ReadObjectCallback, IceInternal.Patcher * * @param v The new object for the optional. **/ - @Override @SuppressWarnings("unchecked") + @Override public void patch(Ice.Object v) { @@ -80,12 +81,13 @@ public class OptionalObject implements ReadObjectCallback, IceInternal.Patcher /** * The optional object. **/ + @SuppressWarnings("rawtypes") public Optional opt; /** * The formal type of the target class. **/ - public Class cls; + public Class<?> cls; /** * The Slice type ID of the target class. diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java index deee6338a6d..6432bd849b9 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/Admin.java @@ -27,6 +27,7 @@ public final class Admin "shutdown Shutdown the server."); } + @Override public int run(String[] args) { @@ -68,11 +69,11 @@ public final class Admin // Ice.Properties properties = communicator().getProperties(); - + Ice.Identity managerIdentity = new Ice.Identity(); managerIdentity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox"); managerIdentity.name = "ServiceManager"; - + String managerProxy; if(properties.getProperty("Ice.Default.Locator").length() == 0) { @@ -82,7 +83,7 @@ public final class Admin System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set"); return 1; } - + managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints; } else @@ -93,10 +94,10 @@ public final class Admin System.err.println(appName() + ": property `IceBoxAdmin.ServiceManager.Proxy' is not set"); return 1; } - + managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId; } - + base = communicator().stringToProxy(managerProxy); } @@ -109,7 +110,7 @@ public final class Admin for(int i = 0; i < commands.size(); i++) { - String command = (String)commands.get(i); + String command = commands.get(i); if(command.equals("shutdown")) { manager.shutdown(); @@ -122,7 +123,7 @@ public final class Admin return 1; } - String service = (String)commands.get(i); + String service = commands.get(i); try { manager.startService(service); @@ -144,7 +145,7 @@ public final class Admin return 1; } - String service = (String)commands.get(i); + String service = commands.get(i); try { manager.stopService(service); diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java index 7f367d4bb09..59d85d0e824 100644 --- a/java/src/IceBox/Server.java +++ b/java/src/IceBox/Server.java @@ -32,6 +32,7 @@ public final class Server extends Ice.Application System.exit(server.main("IceBox.Server", args, initData)); } + @Override public int run(String[] args) { @@ -40,8 +41,8 @@ public final class Server extends Ice.Application java.util.Map<String, String> services = properties.getPropertiesForPrefix(prefix); java.util.List<String> argSeq = new java.util.ArrayList<String>(args.length); for(String s : args) - { - argSeq.add(s); + { + argSeq.add(s); } for(java.util.Map.Entry<String, String> entry : services.entrySet()) diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 9cd6989ccf7..1f4cc9210d9 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -24,6 +24,7 @@ public class ServiceManagerI extends _ServiceManagerDisp _traceServiceObserver = _communicator.getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver"); _observerCompletedCB = new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { try @@ -45,12 +46,14 @@ public class ServiceManagerI extends _ServiceManagerDisp }; } + @Override public java.util.Map<String, String> getSliceChecksums(Ice.Current current) { return SliceChecksums.checksums; } + @Override public void startService(String name, Ice.Current current) throws AlreadyStartedException, NoSuchServiceException @@ -123,6 +126,7 @@ public class ServiceManagerI extends _ServiceManagerDisp } } + @Override public void stopService(String name, Ice.Current current) throws AlreadyStoppedException, NoSuchServiceException @@ -195,6 +199,7 @@ public class ServiceManagerI extends _ServiceManagerDisp } } + @Override public void addObserver(final ServiceObserverPrx observer, Ice.Current current) { @@ -230,6 +235,7 @@ public class ServiceManagerI extends _ServiceManagerDisp } } + @Override public void shutdown(Ice.Current current) { @@ -348,9 +354,9 @@ public class ServiceManagerI extends _ServiceManagerDisp } // - // If Ice metrics are enabled on the IceBox communicator, we also enable them on the + // If Ice metrics are enabled on the IceBox communicator, we also enable them on the // shared communicator. - // + // IceInternal.MetricsAdminI metricsAdmin = null; if(_communicator.getObserver() instanceof IceInternal.CommunicatorObserverI) { @@ -362,7 +368,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // // Ensure the metrics admin plugin uses the same property set as the - // communicator. This is necessary to correctly deal with runtime + // communicator. This is necessary to correctly deal with runtime // property updates. // if(metricsAdmin != null) @@ -489,18 +495,18 @@ public class ServiceManagerI extends _ServiceManagerDisp classDir = new java.io.File(System.getProperty("user.dir") + java.io.File.separator + classDir).getCanonicalPath(); } - + if(!classDir.endsWith(java.io.File.separator) && !classDir.endsWith(".jar")) { classDir += java.io.File.separator; } - + // // Reuse an existing class loader if we have already loaded a plug-in with // the same value for classDir, otherwise create a new one. // ClassLoader cl = null; - + if(_classLoaders == null) { _classLoaders = new java.util.HashMap<String, ClassLoader>(); @@ -509,16 +515,16 @@ public class ServiceManagerI extends _ServiceManagerDisp { cl = _classLoaders.get(classDir); } - + if(cl == null) { final java.net.URL[] url = new java.net.URL[] { new java.net.URL("file:///" + classDir) }; - + cl = new java.net.URLClassLoader(url); - + _classLoaders.put(classDir, cl); } - + c = cl.loadClass(className); } catch(java.net.MalformedURLException ex) @@ -539,7 +545,7 @@ public class ServiceManagerI extends _ServiceManagerDisp { c = IceInternal.Util.findClass(className, null); } - + if(c == null) { throw new FailureException("ServiceManager: class " + className + " not found"); @@ -594,7 +600,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // serviceArgs.value = initData.properties.parseCommandLineOptions(service, serviceArgs.value); } - + // // Clone the logger to assign a new prefix. If one of the built-in loggers is configured // don't set any logger. @@ -609,13 +615,13 @@ public class ServiceManagerI extends _ServiceManagerDisp // // If Ice metrics are enabled on the IceBox communicator, we also enable them on // the service communicator. - // + // if(_communicator.getObserver() instanceof IceInternal.CommunicatorObserverI) { metricsAdmin = new IceInternal.MetricsAdminI(initData.properties, initData.logger); initData.observer = new IceInternal.CommunicatorObserverI(metricsAdmin); } - + // // Remaining command line options are passed to the communicator. This is // necessary for Ice plug-in properties (e.g.: IceSSL). @@ -626,7 +632,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // // Ensure the metrics admin plugin uses the same property set as the - // communicator. This is necessary to correctly deal with runtime + // communicator. This is necessary to correctly deal with runtime // property updates. // if(metricsAdmin != null) @@ -652,8 +658,8 @@ public class ServiceManagerI extends _ServiceManagerDisp // in case it wants to set a callback). // final String facetName = "IceBox.Service." + service + ".Properties"; - IceInternal.PropertiesAdminI propAdmin = new IceInternal.PropertiesAdminI(facetName, - communicator.getProperties(), + IceInternal.PropertiesAdminI propAdmin = new IceInternal.PropertiesAdminI(facetName, + communicator.getProperties(), communicator.getLogger()); _communicator.addAdminFacet(propAdmin, facetName); @@ -934,6 +940,7 @@ public class ServiceManagerI extends _ServiceManagerDisp static class ServiceInfo implements Cloneable { + @Override public Object clone() { Object o = null; diff --git a/java/src/IceDiscovery/LocatorI.java b/java/src/IceDiscovery/LocatorI.java index be49f1f47ad..0a11bc7028c 100644 --- a/java/src/IceDiscovery/LocatorI.java +++ b/java/src/IceDiscovery/LocatorI.java @@ -17,19 +17,22 @@ class LocatorI extends Ice._LocatorDisp _registry = registry; } - public void + @Override + public void findObjectById_async(Ice.AMD_Locator_findObjectById cb, Ice.Identity id, Ice.Current current) { _lookup.findObject(cb, id); } - public void + @Override + public void findAdapterById_async(Ice.AMD_Locator_findAdapterById cb, String adapterId, Ice.Current current) { _lookup.findAdapter(cb, adapterId); } - public Ice.LocatorRegistryPrx + @Override + public Ice.LocatorRegistryPrx getRegistry(Ice.Current current) { return _registry; diff --git a/java/src/IceDiscovery/LocatorRegistryI.java b/java/src/IceDiscovery/LocatorRegistryI.java index 56e8f0c35b0..5628236d6cc 100644 --- a/java/src/IceDiscovery/LocatorRegistryI.java +++ b/java/src/IceDiscovery/LocatorRegistryI.java @@ -23,9 +23,10 @@ class LocatorRegistryI extends Ice._LocatorRegistryDisp _wellKnownProxy = com.stringToProxy("p").ice_locator(null).ice_router(null).ice_collocationOptimized(true); } + @Override synchronized public void - setAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setAdapterDirectProxy cb, - String adapterId, + setAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setAdapterDirectProxy cb, + String adapterId, Ice.ObjectPrx proxy, Ice.Current current) { @@ -40,11 +41,12 @@ class LocatorRegistryI extends Ice._LocatorRegistryDisp cb.ice_response(); } + @Override synchronized public void setReplicatedAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setReplicatedAdapterDirectProxy cb, String adapterId, String replicaGroupId, - Ice.ObjectPrx proxy, + Ice.ObjectPrx proxy, Ice.Current current) { if(proxy != null) @@ -74,25 +76,26 @@ class LocatorRegistryI extends Ice._LocatorRegistryDisp cb.ice_response(); } + @Override public void - setServerProcessProxy_async(Ice.AMD_LocatorRegistry_setServerProcessProxy cb, - String serverId, + setServerProcessProxy_async(Ice.AMD_LocatorRegistry_setServerProcessProxy cb, + String serverId, Ice.ProcessPrx process, Ice.Current current) { cb.ice_response(); } - - synchronized Ice.ObjectPrx + + synchronized Ice.ObjectPrx findObject(Ice.Identity id) { if(id.name.length() == 0) { return null; } - + Ice.ObjectPrx prx = _wellKnownProxy.ice_identity(id); - + List<String> adapterIds = new ArrayList<String>(); for(String a : _replicaGroups.keySet()) { @@ -127,8 +130,8 @@ class LocatorRegistryI extends Ice._LocatorRegistryDisp java.util.Collections.shuffle(adapterIds); return prx.ice_adapterId(adapterIds.get(0)); } - - synchronized Ice.ObjectPrx + + synchronized Ice.ObjectPrx findAdapter(String adapterId, Ice.Holder<Boolean> isReplicaGroup) { Ice.ObjectPrx proxy = _adapters.get(adapterId); @@ -137,7 +140,7 @@ class LocatorRegistryI extends Ice._LocatorRegistryDisp isReplicaGroup.value = false; return proxy; } - + Set<String> s = _replicaGroups.get(adapterId); if(s != null) { @@ -150,15 +153,15 @@ class LocatorRegistryI extends Ice._LocatorRegistryDisp { continue; // TODO: Inconsistency } - + if(prx == null) { prx = proxy; } - + endpoints.addAll(java.util.Arrays.asList(proxy.ice_getEndpoints())); } - + if(prx != null) { isReplicaGroup.value = true; @@ -170,7 +173,7 @@ class LocatorRegistryI extends Ice._LocatorRegistryDisp } final Ice.ObjectPrx _wellKnownProxy; - final Map<String, Ice.ObjectPrx> _adapters = new HashMap<String, Ice.ObjectPrx>(); + final Map<String, Ice.ObjectPrx> _adapters = new HashMap<String, Ice.ObjectPrx>(); final Map<String, Set<String>> _replicaGroups = new HashMap<String, Set<String>>(); } diff --git a/java/src/IceDiscovery/LookupI.java b/java/src/IceDiscovery/LookupI.java index 8c53d2910a6..c3aaf296364 100644 --- a/java/src/IceDiscovery/LookupI.java +++ b/java/src/IceDiscovery/LookupI.java @@ -24,12 +24,12 @@ class LookupI extends _LookupDisp _nRetry = retryCount; } - T + T getId() { return _id; } - + boolean addCallback(AmdCB cb) { @@ -72,12 +72,13 @@ class LookupI extends _LookupDisp _latency = 0; } + @Override boolean retry() { return _proxies.size() == 0 && --_nRetry >= 0; } - + boolean response(Ice.ObjectPrx proxy, boolean isReplicaGroup) { @@ -126,8 +127,9 @@ class LookupI extends _LookupDisp } sendResponse(result.ice_endpoints(endpoints.toArray(new Ice.Endpoint[endpoints.size()]))); } - - public void + + @Override + public void run() { adapterRequestTimedOut(this); @@ -155,13 +157,13 @@ class LookupI extends _LookupDisp super(id, retryCount); } - void + void response(Ice.ObjectPrx proxy) { finished(proxy); } - - void + + void finished(Ice.ObjectPrx proxy) { for(Ice.AMD_Locator_findObjectById cb : _callbacks) @@ -171,6 +173,7 @@ class LookupI extends _LookupDisp _callbacks.clear(); } + @Override public void run() { @@ -195,6 +198,7 @@ class LookupI extends _LookupDisp _lookupReply = lookupReply; } + @Override public void findObjectById(String domainId, Ice.Identity id, IceDiscovery.LookupReplyPrx reply, Ice.Current c) { @@ -213,6 +217,7 @@ class LookupI extends _LookupDisp } } + @Override public void findAdapterById(String domainId, String adapterId, IceDiscovery.LookupReplyPrx reply, Ice.Current c) { diff --git a/java/src/IceDiscovery/LookupReplyI.java b/java/src/IceDiscovery/LookupReplyI.java index 70397fc4c3e..9e072221a4a 100644 --- a/java/src/IceDiscovery/LookupReplyI.java +++ b/java/src/IceDiscovery/LookupReplyI.java @@ -16,13 +16,15 @@ class LookupReplyI extends _LookupReplyDisp _lookup = lookup; } - public void + @Override + public void foundObjectById(Ice.Identity id, Ice.ObjectPrx proxy, Ice.Current current) { _lookup.foundObject(id, proxy); } - public void + @Override + public void foundAdapterById(String adapterId, Ice.ObjectPrx proxy, boolean isReplicaGroup, Ice.Current current) { _lookup.foundAdapter(adapterId, proxy, isReplicaGroup); diff --git a/java/src/IceDiscovery/PluginFactory.java b/java/src/IceDiscovery/PluginFactory.java index e400e885d7b..2efeaf3a831 100644 --- a/java/src/IceDiscovery/PluginFactory.java +++ b/java/src/IceDiscovery/PluginFactory.java @@ -11,6 +11,7 @@ package IceDiscovery; public class PluginFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { diff --git a/java/src/IceDiscovery/PluginI.java b/java/src/IceDiscovery/PluginI.java index a853730bc02..6be47ee2750 100644 --- a/java/src/IceDiscovery/PluginI.java +++ b/java/src/IceDiscovery/PluginI.java @@ -17,6 +17,7 @@ public class PluginI implements Ice.Plugin _communicator = communicator; } + @Override public void initialize() { @@ -99,7 +100,7 @@ public class PluginI implements Ice.Plugin b.append(ex.toString()); throw new Ice.PluginInitializationException(b.toString()); } - + // // Add lookup and lookup reply Ice objects // @@ -114,12 +115,13 @@ public class PluginI implements Ice.Plugin // Ice.ObjectPrx locator = _locatorAdapter.addWithUUID(new LocatorI(lookup, locatorRegistryPrx)); _communicator.setDefaultLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); - + _multicastAdapter.activate(); _replyAdapter.activate(); _locatorAdapter.activate(); } + @Override public void destroy() { diff --git a/java/src/IceGrid/DiscoveryPluginFactoryI.java b/java/src/IceGrid/DiscoveryPluginFactoryI.java index 4ac13e8b470..2c79ceeb5f7 100644 --- a/java/src/IceGrid/DiscoveryPluginFactoryI.java +++ b/java/src/IceGrid/DiscoveryPluginFactoryI.java @@ -11,7 +11,8 @@ package IceGrid; public class DiscoveryPluginFactoryI implements Ice.PluginFactory { - public Ice.Plugin + @Override + public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new DiscoveryPluginI(communicator); diff --git a/java/src/IceGrid/DiscoveryPluginI.java b/java/src/IceGrid/DiscoveryPluginI.java index 839c6665956..1ce6899b593 100644 --- a/java/src/IceGrid/DiscoveryPluginI.java +++ b/java/src/IceGrid/DiscoveryPluginI.java @@ -17,9 +17,9 @@ class DiscoveryPluginI implements Ice.Plugin { private static class Request { - Request(LocatorI locator, - String operation, - Ice.OperationMode mode, + Request(LocatorI locator, + String operation, + Ice.OperationMode mode, byte[] inParams, java.util.Map<String, String> context, Ice.AMD_Object_ice_invoke amdCB) @@ -36,21 +36,24 @@ class DiscoveryPluginI implements Ice.Plugin invoke(Ice.LocatorPrx l) { _locatorPrx = l; - l.begin_ice_invoke(_operation, _mode, _inParams, _context, + l.begin_ice_invoke(_operation, _mode, _inParams, _context, new Ice.Callback_Object_ice_invoke() { + @Override public void response(boolean ok, byte[] outParams) { _amdCB.ice_response(ok, outParams); } + @Override public void exception(Ice.LocalException ex) { _locator.invoke(_locatorPrx, Request.this); // Retry with new locator proxy } - + + @Override public void exception(Ice.SystemException ex) { @@ -71,31 +74,36 @@ class DiscoveryPluginI implements Ice.Plugin static private class VoidLocatorI extends IceGrid._LocatorDisp { - public void + @Override + public void findObjectById_async(Ice.AMD_Locator_findObjectById amdCB, Ice.Identity id, Ice.Current current) { amdCB.ice_response(null); } - - public void + + @Override + public void findAdapterById_async(Ice.AMD_Locator_findAdapterById amdCB, String id, Ice.Current current) { amdCB.ice_response(null); } - - public Ice.LocatorRegistryPrx + + @Override + public Ice.LocatorRegistryPrx getRegistry(Ice.Current current) { return null; } - - public IceGrid.RegistryPrx + + @Override + public IceGrid.RegistryPrx getLocalRegistry(Ice.Current current) { return null; } - - public IceGrid.QueryPrx + + @Override + public IceGrid.QueryPrx getLocalQuery(Ice.Current current) { return null; @@ -124,6 +132,7 @@ class DiscoveryPluginI implements Ice.Plugin _lookupReply = lookupReply; } + @Override public synchronized void ice_invoke_async(Ice.AMD_Object_ice_invoke amdCB, byte[] inParams, Ice.Current current) { @@ -133,7 +142,7 @@ class DiscoveryPluginI implements Ice.Plugin public synchronized void foundLocator(LocatorPrx locator) { - if(locator == null || + if(locator == null || (!_instanceName.isEmpty() && !locator.ice_getIdentity().category.equals(_instanceName))) { return; @@ -235,7 +244,7 @@ class DiscoveryPluginI implements Ice.Plugin _locator = null; _pendingRequests.add(request); - + if(_pendingRetryCount == 0) // No request in progress { _pendingRetryCount = _retryCount; @@ -247,6 +256,7 @@ class DiscoveryPluginI implements Ice.Plugin private Runnable _retryTask = new Runnable() { + @Override public void run() { synchronized(LocatorI.this) @@ -296,6 +306,7 @@ class DiscoveryPluginI implements Ice.Plugin _locator = locator; } + @Override public void foundLocator(LocatorPrx locator, Ice.Current curr) { @@ -311,6 +322,7 @@ class DiscoveryPluginI implements Ice.Plugin _communicator = communicator; } + @Override public void initialize() { @@ -378,7 +390,7 @@ class DiscoveryPluginI implements Ice.Plugin } LocatorPrx voidLoc = LocatorPrxHelper.uncheckedCast(_locatorAdapter.addWithUUID(new VoidLocatorI())); - + String instanceName = properties.getProperty("IceGridDiscovery.InstanceName"); Ice.Identity id = new Ice.Identity(); id.name = "Locator"; @@ -393,6 +405,7 @@ class DiscoveryPluginI implements Ice.Plugin _locatorAdapter.activate(); } + @Override public void destroy() { diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index efc602aa773..6d042853612 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -2755,10 +2755,9 @@ public class BasicStream abstract private static class EncapsDecoder { - EncapsDecoder(BasicStream stream, ReadEncaps encaps, boolean sliceObjects, ObjectFactoryManager f) + EncapsDecoder(BasicStream stream, boolean sliceObjects, ObjectFactoryManager f) { _stream = stream; - _encaps = encaps; _sliceObjects = sliceObjects; _servantFactoryManager = f; _typeIdIndex = 0; @@ -2978,7 +2977,6 @@ public class BasicStream } protected final BasicStream _stream; - protected final ReadEncaps _encaps; protected final boolean _sliceObjects; protected ObjectFactoryManager _servantFactoryManager; @@ -2994,9 +2992,9 @@ public class BasicStream private static final class EncapsDecoder10 extends EncapsDecoder { - EncapsDecoder10(BasicStream stream, ReadEncaps encaps, boolean sliceObjects, ObjectFactoryManager f) + EncapsDecoder10(BasicStream stream, boolean sliceObjects, ObjectFactoryManager f) { - super(stream, encaps, sliceObjects, f); + super(stream, sliceObjects, f); _sliceType = SliceType.NoSlice; } @@ -3297,9 +3295,9 @@ public class BasicStream private static class EncapsDecoder11 extends EncapsDecoder { - EncapsDecoder11(BasicStream stream, ReadEncaps encaps, boolean sliceObjects, ObjectFactoryManager f) + EncapsDecoder11(BasicStream stream, boolean sliceObjects, ObjectFactoryManager f) { - super(stream, encaps, sliceObjects, f); + super(stream, sliceObjects, f); _objectIdIndex = 1; _current = null; } @@ -4568,11 +4566,11 @@ public class BasicStream ObjectFactoryManager factoryManager = _instance.servantFactoryManager(); if(_readEncapsStack.encoding_1_0) { - _readEncapsStack.decoder = new EncapsDecoder10(this, _readEncapsStack, _sliceObjects, factoryManager); + _readEncapsStack.decoder = new EncapsDecoder10(this, _sliceObjects, factoryManager); } else { - _readEncapsStack.decoder = new EncapsDecoder11(this, _readEncapsStack, _sliceObjects, factoryManager); + _readEncapsStack.decoder = new EncapsDecoder11(this, _sliceObjects, factoryManager); }; } } diff --git a/java/src/IceInternal/MetricsAdminI.java b/java/src/IceInternal/MetricsAdminI.java index 3cb4833d0be..ef92f9c0a5f 100644 --- a/java/src/IceInternal/MetricsAdminI.java +++ b/java/src/IceInternal/MetricsAdminI.java @@ -100,7 +100,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper public void updateViews() { - java.util.Set<MetricsMapFactory> updatedMaps = new java.util.HashSet<MetricsMapFactory>(); + java.util.Set<MetricsMapFactory<?> > updatedMaps = new java.util.HashSet<MetricsMapFactory<?> >(); synchronized(this) { String viewsPrefix = "IceMX.Metrics."; @@ -169,7 +169,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper // // Call the updaters to update the maps. // - for(MetricsMapFactory f : updatedMaps) + for(MetricsMapFactory<?> f : updatedMaps) { f.update(); } @@ -375,7 +375,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper } private boolean - addOrUpdateMap(String mapName, MetricsMapFactory factory) + addOrUpdateMap(String mapName, MetricsMapFactory<?> factory) { boolean updated = false; for(MetricsViewI v : _views.values()) diff --git a/java/src/IceInternal/MetricsMap.java b/java/src/IceInternal/MetricsMap.java index ea798edd6ee..c69af08cce2 100644 --- a/java/src/IceInternal/MetricsMap.java +++ b/java/src/IceInternal/MetricsMap.java @@ -80,7 +80,7 @@ public class MetricsMap<T extends IceMX.Metrics> } } - public MetricsMap + public MetricsMap<?> getMap() { return MetricsMap.this; @@ -121,7 +121,7 @@ public class MetricsMap<T extends IceMX.Metrics> T metrics = (T)_object.clone(); if(_subMaps != null) { - for(SubMap s : _subMaps.values()) + for(SubMap<?> s : _subMaps.values()) { s.addSubMapToMetrics(metrics); } diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java index e6f0659916c..67d508e713d 100644 --- a/java/src/IceInternal/ValueWriter.java +++ b/java/src/IceInternal/ValueWriter.java @@ -70,11 +70,11 @@ public final class ValueWriter } else if(value instanceof java.util.Map) { - java.util.Map map = (java.util.Map)value; - java.util.Iterator i = map.entrySet().iterator(); + java.util.Map<?,?> map = (java.util.Map<?,?>)value; + java.util.Iterator<?> i = map.entrySet().iterator(); while(i.hasNext()) { - java.util.Map.Entry entry = (java.util.Map.Entry)i.next(); + java.util.Map.Entry<?,?> entry = (java.util.Map.Entry<?,?>)i.next(); String elem = (name != null ? name + "." : ""); writeValue(elem + "key", entry.getKey(), objectTable, out); writeValue(elem + "value", entry.getValue(), objectTable, out); @@ -109,7 +109,7 @@ public final class ValueWriter else if(value instanceof java.lang.Enum) { writeName(name, out); - out.print(((java.lang.Enum)value).name()); + out.print(((java.lang.Enum<?>)value).name()); } else { diff --git a/java/src/IceMX/MetricsHelper.java b/java/src/IceMX/MetricsHelper.java index d28929c7a72..7300aefe1bd 100644 --- a/java/src/IceMX/MetricsHelper.java +++ b/java/src/IceMX/MetricsHelper.java @@ -15,11 +15,6 @@ public class MetricsHelper<T> { private abstract class Resolver { - Resolver(String name) - { - _name = name; - } - abstract Object resolve(Object obj) throws Exception; String resolveImpl(Object obj) @@ -44,17 +39,15 @@ public class MetricsHelper<T> return null; } } + } - final String _name; - }; - - protected + protected AttributeResolver() { } - public String - resolve(MetricsHelper helper, String attribute) + public String + resolve(MetricsHelper<?> helper, String attribute) { Resolver resolver = _attributes.get(attribute); if(resolver == null) @@ -73,12 +66,13 @@ public class MetricsHelper<T> return resolver.resolveImpl(helper); } - public void + public void add(String name, final java.lang.reflect.Method method) { - _attributes.put(name, new Resolver(name) + _attributes.put(name, new Resolver() { - public Object + @Override + public Object resolve(Object obj) throws Exception { return method.invoke(obj); @@ -86,11 +80,12 @@ public class MetricsHelper<T> }); } - public void + public void add(String name, final java.lang.reflect.Field field) { - _attributes.put(name, new Resolver(name) + _attributes.put(name, new Resolver() { + @Override public Object resolve(Object obj) throws Exception { @@ -99,12 +94,13 @@ public class MetricsHelper<T> }); } - public void + public void add(final String name, final java.lang.reflect.Method method, final java.lang.reflect.Field field) { - _attributes.put(name, new Resolver(name) + _attributes.put(name, new Resolver() { - public Object + @Override + public Object resolve(Object obj) throws Exception { Object o = method.invoke(obj); @@ -117,12 +113,13 @@ public class MetricsHelper<T> }); } - public void + public void add(final String name, final java.lang.reflect.Method method, final java.lang.reflect.Method subMethod) { - _attributes.put(name, new Resolver(name) + _attributes.put(name, new Resolver() { - public Object + @Override + public Object resolve(Object obj) throws Exception { Object o = method.invoke(obj); @@ -138,19 +135,19 @@ public class MetricsHelper<T> private java.util.Map<String, Resolver> _attributes = new java.util.HashMap<String, Resolver>(); }; - protected + protected MetricsHelper(AttributeResolver attributes) { _attributes = attributes; } - public String + public String resolve(String attribute) { return _attributes.resolve(this, attribute); } - public void + public void initMetrics(T metrics) { // Override in specialized helpers. diff --git a/java/src/IceMX/Observer.java b/java/src/IceMX/Observer.java index e64a7a4b357..1ca0d9aba76 100644 --- a/java/src/IceMX/Observer.java +++ b/java/src/IceMX/Observer.java @@ -17,7 +17,8 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple { void update(T m); }; - + + @Override public void attach() { @@ -27,6 +28,7 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple } } + @Override public void detach() { @@ -37,6 +39,7 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple } } + @Override public void failed(String exceptionName) { @@ -45,7 +48,7 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple e.failed(exceptionName); } } - + public void forEach(MetricsUpdate<T> u) { @@ -64,7 +67,7 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple { return; } - + _previousDelay = previous._previousDelay + previous.delay(); // @@ -115,8 +118,8 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple } } - public MetricsMap<T>.Entry - getEntry(MetricsMap map) + public MetricsMap<T>.Entry + getEntry(MetricsMap<?> map) { for(MetricsMap<T>.Entry e : _objects) { @@ -127,7 +130,7 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple } return null; } - + private java.util.List<MetricsMap<T>.Entry> _objects; private long _previousDelay = 0; }; diff --git a/java/src/IceMX/ObserverFactory.java b/java/src/IceMX/ObserverFactory.java index 3b60cdcc1f1..2039836bdfe 100644 --- a/java/src/IceMX/ObserverFactory.java +++ b/java/src/IceMX/ObserverFactory.java @@ -13,15 +13,16 @@ import IceInternal.MetricsMap; public class ObserverFactory<T extends Metrics, O extends Observer<T>> { - public + public ObserverFactory(IceInternal.MetricsAdminI metrics, String name, Class<T> cl) { _metrics = metrics; _name = name; _class = cl; - _metrics.registerMap(name, _class, new Runnable() + _metrics.registerMap(name, _class, new Runnable() { - public void + @Override + public void run() { update(); @@ -105,7 +106,7 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>> return _enabled; } - public void + public void update() { Runnable updater; @@ -131,7 +132,7 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>> { _updater = updater; } - + private final IceInternal.MetricsAdminI _metrics; private final String _name; private final Class<T> _class; diff --git a/java/src/IceMX/ObserverFactoryWithDelegate.java b/java/src/IceMX/ObserverFactoryWithDelegate.java index eda8cb870e1..ed19cb6456b 100644 --- a/java/src/IceMX/ObserverFactoryWithDelegate.java +++ b/java/src/IceMX/ObserverFactoryWithDelegate.java @@ -10,11 +10,11 @@ package IceMX; public class ObserverFactoryWithDelegate<T extends Metrics, - OImpl extends ObserverWithDelegate<T, O>, - O extends Ice.Instrumentation.Observer> + OImpl extends ObserverWithDelegate<T, O>, + O extends Ice.Instrumentation.Observer> extends ObserverFactory<T, OImpl> { - public + public ObserverFactoryWithDelegate(IceInternal.MetricsAdminI metrics, String name, Class<T> cl) { super(metrics, name, cl); diff --git a/java/src/IceMX/ObserverWithDelegate.java b/java/src/IceMX/ObserverWithDelegate.java index 876252cf1ba..31341a5af71 100644 --- a/java/src/IceMX/ObserverWithDelegate.java +++ b/java/src/IceMX/ObserverWithDelegate.java @@ -11,6 +11,7 @@ package IceMX; public class ObserverWithDelegate<T extends Metrics, O extends Ice.Instrumentation.Observer> extends Observer<T> { + @Override public void attach() { @@ -21,6 +22,7 @@ public class ObserverWithDelegate<T extends Metrics, O extends Ice.Instrumentati } } + @Override public void detach() { @@ -31,7 +33,8 @@ public class ObserverWithDelegate<T extends Metrics, O extends Ice.Instrumentati } } - public void + @Override + public void failed(String exceptionName) { super.failed(exceptionName); @@ -54,7 +57,7 @@ public class ObserverWithDelegate<T extends Metrics, O extends Ice.Instrumentati } @SuppressWarnings("unchecked") - public <S extends Metrics, ObserverImpl extends ObserverWithDelegate<S, Obs>, + public <S extends Metrics, ObserverImpl extends ObserverWithDelegate<S, Obs>, Obs extends Ice.Instrumentation.Observer> Obs getObserver(String mapName, MetricsHelper<S> helper, Class<S> mcl, Class<ObserverImpl> ocl, Obs delegate) { diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java index 804f72b12ef..22a5c238876 100644 --- a/java/src/IceSSL/AcceptorI.java +++ b/java/src/IceSSL/AcceptorI.java @@ -11,11 +11,13 @@ package IceSSL; final class AcceptorI implements IceInternal.Acceptor { + @Override public java.nio.channels.ServerSocketChannel fd() { return _fd; } + @Override public void close() { if(_instance.traceLevel() >= 1) @@ -29,6 +31,7 @@ final class AcceptorI implements IceInternal.Acceptor _fd = null; } + @Override public void listen() { // Nothing to do. @@ -38,8 +41,8 @@ final class AcceptorI implements IceInternal.Acceptor StringBuffer s = new StringBuffer("listening for " + _instance.protocol() + " connections at "); s.append(toString()); - java.util.List<String> interfaces = - IceInternal.Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), + java.util.List<String> interfaces = + IceInternal.Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), _instance.protocolSupport(), true); if(!interfaces.isEmpty()) { @@ -50,6 +53,7 @@ final class AcceptorI implements IceInternal.Acceptor } } + @Override public IceInternal.Transceiver accept() { // @@ -88,11 +92,13 @@ final class AcceptorI implements IceInternal.Acceptor return new TransceiverI(_instance, engine, fd, _adapterName); } + @Override public String protocol() { return _instance.protocol(); } + @Override public String toString() { return IceInternal.Network.addrToString(_addr); @@ -131,7 +137,7 @@ final class AcceptorI implements IceInternal.Acceptor // IceInternal.Network.setReuseAddress(_fd, true); } - _addr = IceInternal.Network.getAddressForServer(host, port, _instance.protocolSupport(), + _addr = IceInternal.Network.getAddressForServer(host, port, _instance.protocolSupport(), _instance.preferIPv6()); if(_instance.traceLevel() >= 2) { @@ -147,6 +153,7 @@ final class AcceptorI implements IceInternal.Acceptor } } + @Override protected synchronized void finalize() throws Throwable { diff --git a/java/src/IceSSL/ConnectorI.java b/java/src/IceSSL/ConnectorI.java index 8dc715bcbd9..2bffb15712e 100644 --- a/java/src/IceSSL/ConnectorI.java +++ b/java/src/IceSSL/ConnectorI.java @@ -11,6 +11,7 @@ package IceSSL; final class ConnectorI implements IceInternal.Connector { + @Override public IceInternal.Transceiver connect() { // @@ -58,16 +59,19 @@ final class ConnectorI implements IceInternal.Connector } } + @Override public short type() { return _instance.type(); } + @Override public String toString() { return IceInternal.Network.addrToString(_proxy == null ? _addr : _proxy.getAddress()); } + @Override public int hashCode() { return _hashCode; @@ -98,6 +102,7 @@ final class ConnectorI implements IceInternal.Connector _hashCode = IceInternal.HashUtil.hashAdd(_hashCode , _connectionId); } + @Override public boolean equals(java.lang.Object obj) { if(!(obj instanceof ConnectorI)) diff --git a/java/src/IceSSL/EndpointFactoryI.java b/java/src/IceSSL/EndpointFactoryI.java index 74f04426d60..18354104ef7 100644 --- a/java/src/IceSSL/EndpointFactoryI.java +++ b/java/src/IceSSL/EndpointFactoryI.java @@ -16,16 +16,19 @@ final class EndpointFactoryI implements IceInternal.EndpointFactory _instance = instance; } + @Override public short type() { return _instance.type(); } + @Override public String protocol() { return _instance.protocol(); } + @Override public IceInternal.EndpointI create(java.util.ArrayList<String> args, boolean oaEndpoint) { IceInternal.IPEndpointI endpt = new EndpointI(_instance); @@ -33,16 +36,19 @@ final class EndpointFactoryI implements IceInternal.EndpointFactory return endpt; } + @Override public IceInternal.EndpointI read(IceInternal.BasicStream s) { return new EndpointI(_instance, s); } + @Override public void destroy() { _instance = null; } + @Override public IceInternal.EndpointFactory clone(IceInternal.ProtocolInstance instance) { return new EndpointFactoryI(new Instance(_instance.engine(), instance.type(), instance.protocol())); diff --git a/java/src/IceSSL/EndpointI.java b/java/src/IceSSL/EndpointI.java index 82bb7a82fd6..246100b7f26 100644 --- a/java/src/IceSSL/EndpointI.java +++ b/java/src/IceSSL/EndpointI.java @@ -39,20 +39,24 @@ final class EndpointI extends IceInternal.IPEndpointI // // Return the endpoint information. // + @Override public Ice.EndpointInfo getInfo() { Ice.IPEndpointInfo info = new IceSSL.EndpointInfo() { + @Override public short type() { return EndpointI.this.type(); } + @Override public boolean datagram() { return EndpointI.this.datagram(); } + @Override public boolean secure() { return EndpointI.this.secure(); @@ -67,6 +71,7 @@ final class EndpointI extends IceInternal.IPEndpointI // Return the timeout for the endpoint in milliseconds. 0 means // non-blocking, -1 means no timeout. // + @Override public int timeout() { return _timeout; @@ -77,6 +82,7 @@ final class EndpointI extends IceInternal.IPEndpointI // that timeouts are supported by the endpoint. Otherwise the same // endpoint is returned. // + @Override public IceInternal.EndpointI timeout(int timeout) { if(timeout == _timeout) @@ -93,6 +99,7 @@ final class EndpointI extends IceInternal.IPEndpointI // Return true if the endpoints support bzip2 compress, or false // otherwise. // + @Override public boolean compress() { return _compress; @@ -103,6 +110,7 @@ final class EndpointI extends IceInternal.IPEndpointI // provided that compression is supported by the // endpoint. Otherwise the same endpoint is returned. // + @Override public IceInternal.EndpointI compress(boolean compress) { if(compress == _compress) @@ -118,6 +126,7 @@ final class EndpointI extends IceInternal.IPEndpointI // // Return true if the endpoint is datagram-based. // + @Override public boolean datagram() { return false; @@ -126,6 +135,7 @@ final class EndpointI extends IceInternal.IPEndpointI // // Return true if the endpoint is secure. // + @Override public boolean secure() { return true; @@ -138,6 +148,7 @@ final class EndpointI extends IceInternal.IPEndpointI // "effective" endpoint, which might differ from this endpoint, // for example, if a dynamic port number is assigned. // + @Override public IceInternal.Transceiver transceiver(IceInternal.EndpointIHolder endpoint) { endpoint.value = this; @@ -151,6 +162,7 @@ final class EndpointI extends IceInternal.IPEndpointI // from this endpoint, for example, if a dynamic port number is // assigned. // + @Override public IceInternal.Acceptor acceptor(IceInternal.EndpointIHolder endpoint, String adapterName) { AcceptorI p = new AcceptorI(_instance, adapterName, _host, _port); @@ -159,6 +171,7 @@ final class EndpointI extends IceInternal.IPEndpointI return p; } + @Override public String options() { // @@ -190,6 +203,7 @@ final class EndpointI extends IceInternal.IPEndpointI // // Compare endpoints for sorting purposes // + @Override public int compareTo(IceInternal.EndpointI obj) // From java.lang.Comparable { if(!(obj instanceof EndpointI)) @@ -224,6 +238,7 @@ final class EndpointI extends IceInternal.IPEndpointI return super.compareTo(obj); } + @Override public void streamWriteImpl(IceInternal.BasicStream s) { super.streamWriteImpl(s); @@ -231,6 +246,7 @@ final class EndpointI extends IceInternal.IPEndpointI s.writeBool(_compress); } + @Override public int hashInit(int h) { h = super.hashInit(h); @@ -239,6 +255,7 @@ final class EndpointI extends IceInternal.IPEndpointI return h; } + @Override public void fillEndpointInfo(Ice.IPEndpointInfo info) { super.fillEndpointInfo(info); @@ -261,6 +278,7 @@ final class EndpointI extends IceInternal.IPEndpointI } } + @Override protected boolean checkOption(String option, String argument, String endpoint) { if(super.checkOption(option, argument, endpoint)) @@ -321,11 +339,13 @@ final class EndpointI extends IceInternal.IPEndpointI } } + @Override protected IceInternal.Connector createConnector(java.net.InetSocketAddress addr, IceInternal.NetworkProxy proxy) { return new ConnectorI(_instance, _host, addr, proxy, _sourceAddr, _timeout, _connectionId); } + @Override protected IceInternal.IPEndpointI createEndpoint(String host, int port, String connectionId) { return new EndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress); diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java index aa38aad03b8..9d9930ec250 100644 --- a/java/src/IceSSL/Instance.java +++ b/java/src/IceSSL/Instance.java @@ -9,10 +9,6 @@ package IceSSL; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - class Instance extends IceInternal.ProtocolInstance { Instance(SSLEngine engine, short type, String protocol) diff --git a/java/src/IceSSL/PluginFactory.java b/java/src/IceSSL/PluginFactory.java index 1a756ec4f9a..5fb43644b03 100644 --- a/java/src/IceSSL/PluginFactory.java +++ b/java/src/IceSSL/PluginFactory.java @@ -25,6 +25,7 @@ public class PluginFactory implements Ice.PluginFactory * that a general error occurred. Alternatively, <code>create</code> can throw * {@link PluginInitializationException} to provide more detailed information. **/ + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { diff --git a/java/src/IceSSL/PluginI.java b/java/src/IceSSL/PluginI.java index fbd2123c0c6..a723d093681 100644 --- a/java/src/IceSSL/PluginI.java +++ b/java/src/IceSSL/PluginI.java @@ -26,55 +26,66 @@ class PluginI implements Plugin new EndpointFactoryI(new Instance(_engine, IceSSL.EndpointType.value, "ssl"))); } + @Override public void initialize() { _engine.initialize(); } + @Override public void destroy() { } + @Override public void setContext(javax.net.ssl.SSLContext context) { _engine.context(context); } + @Override public javax.net.ssl.SSLContext getContext() { return _engine.context(); } + @Override public void setCertificateVerifier(CertificateVerifier verifier) { _engine.setCertificateVerifier(verifier); } + @Override public CertificateVerifier getCertificateVerifier() { return _engine.getCertificateVerifier(); } + @Override public void setPasswordCallback(PasswordCallback callback) { _engine.setPasswordCallback(callback); } + @Override public PasswordCallback getPasswordCallback() { return _engine.getPasswordCallback(); } + @Override public void setKeystoreStream(java.io.InputStream stream) { _engine.setKeystoreStream(stream); } + @Override public void setTruststoreStream(java.io.InputStream stream) { _engine.setTruststoreStream(stream); } + @Override public void addSeedStream(java.io.InputStream stream) { _engine.addSeedStream(stream); diff --git a/java/src/IceSSL/RFC2253.java b/java/src/IceSSL/RFC2253.java index 324e84b2ccf..291cb67b897 100644 --- a/java/src/IceSSL/RFC2253.java +++ b/java/src/IceSSL/RFC2253.java @@ -25,6 +25,7 @@ class RFC2253 this.reason = reason; } + @Override public String ice_name() { diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/IceSSL/TransceiverI.java index f6301cc2eb4..3729bf569a5 100644 --- a/java/src/IceSSL/TransceiverI.java +++ b/java/src/IceSSL/TransceiverI.java @@ -15,12 +15,14 @@ import javax.net.ssl.SSLEngineResult.*; final class TransceiverI implements IceInternal.Transceiver { + @Override public java.nio.channels.SelectableChannel fd() { assert(_fd != null); return _fd; } + @Override public int initialize(IceInternal.Buffer readBuffer, IceInternal.Buffer writeBuffer, Ice.Holder<Boolean> moreData) { try @@ -119,6 +121,7 @@ final class TransceiverI implements IceInternal.Transceiver } } + @Override public int closing(boolean initiator, Ice.LocalException ex) { // If we are initiating the connection closure, wait for the peer @@ -126,6 +129,7 @@ final class TransceiverI implements IceInternal.Transceiver return initiator ? IceInternal.SocketOperation.Read : IceInternal.SocketOperation.None; } + @Override public void close() { if(_state == StateHandshakeComplete && _instance.traceLevel() >= 1) @@ -201,6 +205,7 @@ final class TransceiverI implements IceInternal.Transceiver } } + @Override public int write(IceInternal.Buffer buf) { if(_state == StateProxyConnectRequest) @@ -226,7 +231,7 @@ final class TransceiverI implements IceInternal.Transceiver return status; } - @SuppressWarnings("deprecation") + @Override public int read(IceInternal.Buffer buf, Ice.Holder<Boolean> moreData) { moreData.value = false; @@ -320,21 +325,25 @@ final class TransceiverI implements IceInternal.Transceiver return IceInternal.SocketOperation.None; } + @Override public String protocol() { return _instance.protocol(); } + @Override public String toString() { return _desc; } + @Override public Ice.ConnectionInfo getInfo() { return getNativeConnectionInfo(); } + @Override public void checkSendSize(IceInternal.Buffer buf, int messageSizeMax) { if(buf.size() > messageSizeMax) @@ -366,7 +375,6 @@ final class TransceiverI implements IceInternal.Transceiver _desc = IceInternal.Network.fdToString(_fd); } - @SuppressWarnings("deprecation") private void init(Instance instance, javax.net.ssl.SSLEngine engine, java.nio.channels.SocketChannel fd) { _instance = instance; @@ -392,6 +400,7 @@ final class TransceiverI implements IceInternal.Transceiver _netOutput = ByteBuffer.allocateDirect(engine.getSession().getPacketBufferSize() * 2); } + @Override protected void finalize() throws Throwable { @@ -619,7 +628,6 @@ final class TransceiverI implements IceInternal.Transceiver } } - @SuppressWarnings("deprecation") private int writeNonBlocking(ByteBuffer buf) { // @@ -836,7 +844,6 @@ final class TransceiverI implements IceInternal.Transceiver _appInput.compact(); } - @SuppressWarnings("deprecation") private boolean writeRaw(IceInternal.Buffer buf) { // @@ -886,7 +893,6 @@ final class TransceiverI implements IceInternal.Transceiver return true; } - @SuppressWarnings("deprecation") private boolean readRaw(IceInternal.Buffer buf) { int packetSize = buf.b.remaining(); diff --git a/java/src/IceSSL/TrustManager.java b/java/src/IceSSL/TrustManager.java index 474993641e7..858f176b9ae 100644 --- a/java/src/IceSSL/TrustManager.java +++ b/java/src/IceSSL/TrustManager.java @@ -128,8 +128,7 @@ class TrustManager // if(info.nativeCerts != null && info.nativeCerts.length > 0) { - javax.security.auth.x500.X500Principal subjectDN = (javax.security.auth.x500.X500Principal) - ((java.security.cert.X509Certificate)info.nativeCerts[0]).getSubjectX500Principal(); + javax.security.auth.x500.X500Principal subjectDN = ((java.security.cert.X509Certificate)info.nativeCerts[0]).getSubjectX500Principal(); String subjectName = subjectDN.getName(javax.security.auth.x500.X500Principal.RFC2253); assert subjectName != null; try diff --git a/java/src/IceSSL/X509KeyManagerI.java b/java/src/IceSSL/X509KeyManagerI.java index 7331f9b4fd8..31a8500180f 100644 --- a/java/src/IceSSL/X509KeyManagerI.java +++ b/java/src/IceSSL/X509KeyManagerI.java @@ -49,7 +49,7 @@ final class X509KeyManagerI extends javax.net.ssl.X509ExtendedKeyManager public java.security.cert.X509Certificate[] getCertificateChain(String alias) { - return _delegate.getCertificateChain(alias); + return _delegate.getCertificateChain(alias); } @Override diff --git a/java/src/IceSSL/X509TrustManagerI.java b/java/src/IceSSL/X509TrustManagerI.java index ab1bc5a6b6b..108156b5597 100644 --- a/java/src/IceSSL/X509TrustManagerI.java +++ b/java/src/IceSSL/X509TrustManagerI.java @@ -17,6 +17,7 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager _delegate = delegate; } + @Override public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException @@ -39,6 +40,7 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager } } + @Override public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws java.security.cert.CertificateException @@ -61,6 +63,7 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager } } + @Override public java.security.cert.X509Certificate[] getAcceptedIssuers() { diff --git a/java/src/IceUtil/Cache.java b/java/src/IceUtil/Cache.java index 441fec0bf3c..064069cc843 100644 --- a/java/src/IceUtil/Cache.java +++ b/java/src/IceUtil/Cache.java @@ -45,7 +45,7 @@ public class Cache { synchronized(_map) { - CacheValue val = (CacheValue)_map.get(key); + CacheValue val = _map.get(key); return val == null ? null : val.obj; } } @@ -64,7 +64,7 @@ public class Cache { synchronized(_map) { - CacheValue val = (CacheValue)_map.remove(key); + CacheValue val = _map.remove(key); return val == null ? null : val.obj; } } @@ -112,7 +112,7 @@ public class Cache { synchronized(_map) { - CacheValue existingVal = (CacheValue)_map.put(key, new CacheValue(o)); + CacheValue existingVal = _map.put(key, new CacheValue(o)); if(existingVal != null) { _map.put(key, existingVal); @@ -188,7 +188,7 @@ public class Cache synchronized(_map) { - val = (CacheValue)_map.get(key); + val = _map.get(key); if(val == null) { val = new CacheValue(); diff --git a/java/src/IceUtil/FileLockException.java b/java/src/IceUtil/FileLockException.java index 226dd870273..19ddfdffa02 100644 --- a/java/src/IceUtil/FileLockException.java +++ b/java/src/IceUtil/FileLockException.java @@ -31,6 +31,7 @@ public class FileLockException extends RuntimeException implements Cloneable this.path = path; } + @Override public java.lang.Object clone() { java.lang.Object o = null; @@ -51,6 +52,7 @@ public class FileLockException extends RuntimeException implements Cloneable return "IceUtil::FileLockException"; } + @Override public String toString() { diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index 202a0e1b94b..ca76ae37216 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -13,6 +13,7 @@ package IceUtil; * @deprecated IceUtil.Version is deprecated, use Ice.Util.stringVersion() or * Ice.Util.intVersion() instead. **/ +@Deprecated public final class Version { // diff --git a/java/src/IceUtilInternal/Base64.java b/java/src/IceUtilInternal/Base64.java index 5e5e34ca570..ba0b4918153 100644 --- a/java/src/IceUtilInternal/Base64.java +++ b/java/src/IceUtilInternal/Base64.java @@ -15,7 +15,7 @@ public class Base64 public static String encode(byte[] plainSeq) { - if(plainSeq == null || plainSeq.length == 0) + if(plainSeq == null || plainSeq.length == 0) { return ""; } @@ -25,7 +25,7 @@ encode(byte[] plainSeq) int totalBytes = base64Bytes + newlineBytes; StringBuilder retval = new StringBuilder(totalBytes); - + int by1; int by2; int by3; @@ -49,7 +49,7 @@ encode(byte[] plainSeq) { by3 = plainSeq[i+2] & 0xff; } - + by4 = (by1 >> 2) & 0xff; by5 = (((by1 & 0x3) << 4) | (by2 >> 4)) & 0xff; by6 = (((by2 & 0xf) << 2) | (by3 >> 6)) & 0xff; @@ -57,7 +57,7 @@ encode(byte[] plainSeq) retval.append(encode((byte)by4)); retval.append(encode((byte)by5)); - + if((i + 1) < plainSeq.length) { retval.append(encode((byte)by6)); @@ -66,7 +66,7 @@ encode(byte[] plainSeq) { retval.append('='); } - + if((i + 2) < plainSeq.length) { retval.append(encode((byte)by7)); @@ -222,17 +222,17 @@ encode(byte uc) { return (char)('A' + uc); } - + if(uc < 52) { return (char)('a' + (uc - 26)); } - + if(uc < 62) { return (char)('0' + (uc - 52)); } - + if(uc == 62) { return '+'; @@ -263,7 +263,7 @@ decode(char c) { return 62; } - + return 63; } diff --git a/java/src/IceUtilInternal/FileLock.java b/java/src/IceUtilInternal/FileLock.java index 3279bc60a4b..5ff24ccf0f7 100644 --- a/java/src/IceUtilInternal/FileLock.java +++ b/java/src/IceUtilInternal/FileLock.java @@ -11,10 +11,7 @@ package IceUtilInternal; import java.io.File; import java.io.RandomAccessFile; -import java.io.FileWriter; import java.nio.channels.FileChannel; -import java.nio.channels.OverlappingFileLockException; - import java.lang.reflect.Method; public final class FileLock @@ -41,7 +38,7 @@ public final class FileLock { throw new IceUtil.FileLockException(path); } - + java.nio.channels.FileLock lock; try { @@ -51,7 +48,7 @@ public final class FileLock { throw new IceUtil.FileLockException(path, ex); } - + if(lock == null) { throw new IceUtil.FileLockException(path); @@ -76,7 +73,7 @@ public final class FileLock { // // We access java.lang.management classes using reflection - // because these classes are not available with Android + // because these classes are not available with Android // Dalvik JVM. // if(!System.getProperty("java.vm.name").startsWith("Dalvik")) @@ -95,7 +92,7 @@ public final class FileLock { // // In Android with Dalvik we can use android.os.Process to get the - // process pid. That is done using reflection because it is specific + // process pid. That is done using reflection because it is specific // for Android Dalvik VM. // Class<?> pC = IceInternal.Util.findClass("android.os.Process", null); diff --git a/java/src/IceUtilInternal/Options.java b/java/src/IceUtilInternal/Options.java index aab4ed55e73..9e0167018ed 100644 --- a/java/src/IceUtilInternal/Options.java +++ b/java/src/IceUtilInternal/Options.java @@ -114,7 +114,7 @@ public final class Options { vec.add(arg.toString()); arg = new StringBuilder(128); - + // // Move to start of next argument. // @@ -260,7 +260,7 @@ public final class Options final String octalDigits = "01234567"; short us = 0; int j; - for(j = i; + for(j = i; j < i + 3 && j < line.length() && octalDigits.indexOf(c = line.charAt(j)) != -1; ++j) { @@ -283,7 +283,7 @@ public final class Options arg.append('x'); break; } - + short s = 0; int j; for(j = i + 1; @@ -308,7 +308,7 @@ public final class Options arg.append((char)s); break; } - + // // Process control-chars. // @@ -316,7 +316,7 @@ public final class Options { c = line.charAt(++i); if((Character.toUpperCase(c) >= 'A' && Character.toUpperCase(c) <= 'Z') || - c == '@' || + c == '@' || (c >= '[' && c <= '_')) { arg.append((char)(Character.toUpperCase(c) - '@')); @@ -336,7 +336,7 @@ public final class Options } break; } - + // // If inside an ANSI-quoted string, a backslash isn't followed by // one of the recognized characters, both the backslash and the @@ -395,8 +395,8 @@ public final class Options break; } } - - return (String[])vec.toArray(new String[0]); + + return vec.toArray(new String[0]); } diff --git a/java/src/IceUtilInternal/StopWatch.java b/java/src/IceUtilInternal/StopWatch.java index c1e30ca4f40..8231e852fbc 100644 --- a/java/src/IceUtilInternal/StopWatch.java +++ b/java/src/IceUtilInternal/StopWatch.java @@ -11,12 +11,12 @@ package IceUtilInternal; public class StopWatch { - public void + public void start() { _s = System.nanoTime(); } - + public long stop() { diff --git a/java/src/IceUtilInternal/StringUtil.java b/java/src/IceUtilInternal/StringUtil.java index 3feb6278539..68d93a8e322 100644 --- a/java/src/IceUtilInternal/StringUtil.java +++ b/java/src/IceUtilInternal/StringUtil.java @@ -244,38 +244,38 @@ public final class StringUtil } switch(s.charAt(++start)) { - case '\\': - case '\'': - case '"': + case '\\': + case '\'': + case '"': { c = s.charAt(start++); break; } - case 'b': + case 'b': { ++start; c = '\b'; break; } - case 'f': + case 'f': { ++start; c = '\f'; break; } - case 'n': + case 'n': { ++start; c = '\n'; break; } - case 'r': + case 'r': { ++start; c = '\r'; break; } - case 't': + case 't': { ++start; c = '\t'; @@ -393,7 +393,7 @@ public final class StringUtil java.util.List<String> l = new java.util.ArrayList<String>(); char[] arr = new char[str.length()]; int pos = 0; - + int n = 0; char quoteChar = '\0'; while(pos < str.length()) @@ -403,12 +403,12 @@ public final class StringUtil quoteChar = str.charAt(pos++); continue; // Skip the quote. } - else if(quoteChar == '\0' && str.charAt(pos) == '\\' && pos + 1 < str.length() && + else if(quoteChar == '\0' && str.charAt(pos) == '\\' && pos + 1 < str.length() && (str.charAt(pos + 1) == '"' || str.charAt(pos + 1) == '\'')) { ++pos; // Skip the backslash } - else if(quoteChar != '\0' && str.charAt(pos) == '\\' && pos + 1 < str.length() && + else if(quoteChar != '\0' && str.charAt(pos) == '\\' && pos + 1 < str.length() && str.charAt(pos + 1) == quoteChar) { ++pos; // Skip the backslash @@ -447,7 +447,7 @@ public final class StringUtil { return null; // Unmatched quote. } - return (String[])l.toArray(new String[0]); + return l.toArray(new String[0]); } public static int @@ -484,7 +484,7 @@ public final class StringUtil return 0; // Not quoted } - public static boolean + public static boolean match(String s, String pat, boolean emptyMatch) { assert(s.length() > 0); diff --git a/java/src/IceUtilInternal/XMLOutput.java b/java/src/IceUtilInternal/XMLOutput.java index 37a624c7315..22ccd557b55 100644 --- a/java/src/IceUtilInternal/XMLOutput.java +++ b/java/src/IceUtilInternal/XMLOutput.java @@ -47,6 +47,7 @@ public class XMLOutput extends OutputBase _sgml = true; } + @Override public void print(String s) { @@ -75,6 +76,7 @@ public class XMLOutput extends OutputBase return this; } + @Override public void nl() { diff --git a/java/src/IceWS/AcceptorI.java b/java/src/IceWS/AcceptorI.java index 171f0a2b8bb..b7457b14104 100644 --- a/java/src/IceWS/AcceptorI.java +++ b/java/src/IceWS/AcceptorI.java @@ -11,21 +11,25 @@ package IceWS; final class AcceptorI implements IceInternal.Acceptor { + @Override public java.nio.channels.ServerSocketChannel fd() { return _delegate.fd(); } + @Override public void close() { _delegate.close(); } + @Override public void listen() { _delegate.listen(); } + @Override public IceInternal.Transceiver accept() { // @@ -35,11 +39,13 @@ final class AcceptorI implements IceInternal.Acceptor return new TransceiverI(_instance, _delegate.accept()); } + @Override public String protocol() { return _delegate.protocol(); } + @Override public String toString() { return _delegate.toString(); diff --git a/java/src/IceWS/ConnectorI.java b/java/src/IceWS/ConnectorI.java index c558d92fac1..40a4100fa3a 100644 --- a/java/src/IceWS/ConnectorI.java +++ b/java/src/IceWS/ConnectorI.java @@ -11,21 +11,25 @@ package IceWS; final class ConnectorI implements IceInternal.Connector { + @Override public IceInternal.Transceiver connect() { return new TransceiverI(_instance, _delegate.connect(), _host, _port, _resource); } + @Override public short type() { return _delegate.type(); } + @Override public String toString() { return _delegate.toString(); } + @Override public int hashCode() { return _delegate.hashCode(); @@ -40,6 +44,7 @@ final class ConnectorI implements IceInternal.Connector _resource = resource; } + @Override public boolean equals(java.lang.Object obj) { if(!(obj instanceof ConnectorI)) diff --git a/java/src/IceWS/EndpointFactoryI.java b/java/src/IceWS/EndpointFactoryI.java index 20d2395d133..6963aa990c9 100644 --- a/java/src/IceWS/EndpointFactoryI.java +++ b/java/src/IceWS/EndpointFactoryI.java @@ -17,32 +17,38 @@ final class EndpointFactoryI implements IceInternal.EndpointFactory _delegate = delegate; } + @Override public short type() { return _instance.type(); } + @Override public String protocol() { return _instance.protocol(); } + @Override public IceInternal.EndpointI create(java.util.ArrayList<String> args, boolean oaEndpoint) { return new EndpointI(_instance, _delegate.create(args, oaEndpoint), args); } + @Override public IceInternal.EndpointI read(IceInternal.BasicStream s) { return new EndpointI(_instance, _delegate.read(s), s); } + @Override public void destroy() { _delegate.destroy(); _instance = null; } + @Override public IceInternal.EndpointFactory clone(IceInternal.ProtocolInstance instance) { assert(false); // We don't support cloning this transport. diff --git a/java/src/IceWS/EndpointI.java b/java/src/IceWS/EndpointI.java index 3c9b62cee04..40fafd6f1b0 100644 --- a/java/src/IceWS/EndpointI.java +++ b/java/src/IceWS/EndpointI.java @@ -39,20 +39,24 @@ final class EndpointI extends IceInternal.EndpointI _resource = s.readString(); } + @Override public Ice.EndpointInfo getInfo() { IceWS.EndpointInfo info = new IceWS.EndpointInfo() { + @Override public short type() { return EndpointI.this.type(); } + @Override public boolean datagram() { return EndpointI.this.datagram(); } + @Override public boolean secure() { return EndpointI.this.secure(); @@ -66,16 +70,19 @@ final class EndpointI extends IceInternal.EndpointI return info; } + @Override public short type() { return _delegate.type(); } + @Override public String protocol() { return _delegate.protocol(); } + @Override public void streamWrite(IceInternal.BasicStream s) { s.startWriteEncaps(); @@ -84,11 +91,13 @@ final class EndpointI extends IceInternal.EndpointI s.endWriteEncaps(); } + @Override public int timeout() { return _delegate.timeout(); } + @Override public IceInternal.EndpointI timeout(int timeout) { if(timeout == _delegate.timeout()) @@ -101,11 +110,13 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public String connectionId() { return _delegate.connectionId(); } + @Override public IceInternal.EndpointI connectionId(String connectionId) { if(connectionId.equals(_delegate.connectionId())) @@ -118,11 +129,13 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public boolean compress() { return _delegate.compress(); } + @Override public IceInternal.EndpointI compress(boolean compress) { if(compress == _delegate.compress()) @@ -135,22 +148,26 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public boolean datagram() { return _delegate.datagram(); } + @Override public boolean secure() { return _delegate.secure(); } + @Override public IceInternal.Transceiver transceiver(IceInternal.EndpointIHolder endpoint) { endpoint.value = this; return null; } + @Override public java.util.List<IceInternal.Connector> connectors(Ice.EndpointSelectionType selType) { java.util.List<IceInternal.Connector> connectors = _delegate.connectors(selType); @@ -162,10 +179,12 @@ final class EndpointI extends IceInternal.EndpointI return l; } + @Override public void connectors_async(Ice.EndpointSelectionType selType, final IceInternal.EndpointI_connectors callback) { IceInternal.EndpointI_connectors cb = new IceInternal.EndpointI_connectors() { + @Override public void connectors(java.util.List<IceInternal.Connector> connectors) { java.util.List<IceInternal.Connector> l = new java.util.ArrayList<IceInternal.Connector>(); @@ -176,6 +195,7 @@ final class EndpointI extends IceInternal.EndpointI callback.connectors(l); } + @Override public void exception(Ice.LocalException ex) { callback.exception(ex); @@ -184,6 +204,7 @@ final class EndpointI extends IceInternal.EndpointI _delegate.connectors_async(selType, cb); } + @Override public IceInternal.Acceptor acceptor(IceInternal.EndpointIHolder endpoint, String adapterName) { IceInternal.EndpointIHolder delEndp = new IceInternal.EndpointIHolder(); @@ -195,6 +216,7 @@ final class EndpointI extends IceInternal.EndpointI return new AcceptorI(_instance, delAcc); } + @Override public java.util.List<IceInternal.EndpointI> expand() { java.util.List<IceInternal.EndpointI> endps = _delegate.expand(); @@ -206,6 +228,7 @@ final class EndpointI extends IceInternal.EndpointI return l; } + @Override public boolean equivalent(IceInternal.EndpointI endpoint) { if(!(endpoint instanceof EndpointI)) @@ -216,6 +239,7 @@ final class EndpointI extends IceInternal.EndpointI return _delegate.equivalent(wsEndpointI._delegate); } + @Override synchronized public int hashCode() { int h = _delegate.hashCode(); @@ -223,6 +247,7 @@ final class EndpointI extends IceInternal.EndpointI return h; } + @Override public String options() { // @@ -252,6 +277,7 @@ final class EndpointI extends IceInternal.EndpointI return s; } + @Override public int compareTo(IceInternal.EndpointI obj) // From java.lang.Comparable { if(!(obj instanceof EndpointI)) @@ -274,6 +300,7 @@ final class EndpointI extends IceInternal.EndpointI return _delegate.compareTo(p._delegate); } + @Override protected boolean checkOption(String option, String argument, String endpoint) { switch(option.charAt(1)) diff --git a/java/src/IceWS/HttpParser.java b/java/src/IceWS/HttpParser.java index 7e6e3981e39..b8139609805 100644 --- a/java/src/IceWS/HttpParser.java +++ b/java/src/IceWS/HttpParser.java @@ -472,7 +472,7 @@ final class HttpParser _versionMajor = 0; } _versionMajor *= 10; - _versionMajor += (int)(c - '0'); + _versionMajor += c - '0'; break; } case VersionMinor: @@ -513,7 +513,7 @@ final class HttpParser _versionMinor = 0; } _versionMinor *= 10; - _versionMinor += (int)(c - '0'); + _versionMinor += c - '0'; break; } case Response: @@ -571,7 +571,7 @@ final class HttpParser _status = 0; } _status *= 10; - _status += (int)(c - '0'); + _status += c - '0'; break; } case ResponseReasonStart: diff --git a/java/src/IceWS/PluginFactory.java b/java/src/IceWS/PluginFactory.java index 919d822a346..b5bbe9776fc 100644 --- a/java/src/IceWS/PluginFactory.java +++ b/java/src/IceWS/PluginFactory.java @@ -25,6 +25,7 @@ public class PluginFactory implements Ice.PluginFactory * that a general error occurred. Alternatively, <code>create</code> can throw * {@link PluginInitializationException} to provide more detailed information. **/ + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginI(communicator); diff --git a/java/src/IceWS/PluginI.java b/java/src/IceWS/PluginI.java index ee1e46141ed..7cf31ec616f 100644 --- a/java/src/IceWS/PluginI.java +++ b/java/src/IceWS/PluginI.java @@ -28,10 +28,12 @@ class PluginI implements Ice.Plugin } } + @Override public void initialize() { } + @Override public void destroy() { } diff --git a/java/src/IceWS/TransceiverI.java b/java/src/IceWS/TransceiverI.java index a7a1b6b1eae..1c6ebbd5176 100644 --- a/java/src/IceWS/TransceiverI.java +++ b/java/src/IceWS/TransceiverI.java @@ -9,16 +9,17 @@ package IceWS; -import java.nio.*; import java.security.*; final class TransceiverI implements IceInternal.Transceiver { + @Override public java.nio.channels.SelectableChannel fd() { return _delegate.fd(); } + @Override public int initialize(IceInternal.Buffer readBuffer, IceInternal.Buffer writeBuffer, Ice.Holder<Boolean> moreData) { // @@ -236,6 +237,7 @@ final class TransceiverI implements IceInternal.Transceiver return IceInternal.SocketOperation.None; } + @Override public int closing(boolean initiator, Ice.LocalException reason) { if(_instance.traceLevel() >= 1) @@ -296,12 +298,14 @@ final class TransceiverI implements IceInternal.Transceiver } } + @Override public void close() { _delegate.close(); _state = StateClosed; } + @Override public int write(IceInternal.Buffer buf) { if(_state < StateOpened) @@ -355,7 +359,7 @@ final class TransceiverI implements IceInternal.Transceiver return IceInternal.SocketOperation.None; } - @SuppressWarnings("deprecation") + @Override public int read(IceInternal.Buffer buf, Ice.Holder<Boolean> moreData) { if(_state < StateOpened) @@ -386,7 +390,7 @@ final class TransceiverI implements IceInternal.Transceiver { // // If the payload length is smaller than what remains to be read, we read - // no more than the payload length. The remaining of the buffer will be + // no more than the payload length. The remaining of the buffer will be // sent over in another frame. // int readSz = _readPayloadLength - (buf.b.position() - _readStart); @@ -433,16 +437,19 @@ final class TransceiverI implements IceInternal.Transceiver return s; } + @Override public String protocol() { return _instance.protocol(); } + @Override public String toString() { return _delegate.toString(); } + @Override public Ice.ConnectionInfo getInfo() { Ice.IPConnectionInfo di = (Ice.IPConnectionInfo)_delegate.getInfo(); @@ -454,6 +461,7 @@ final class TransceiverI implements IceInternal.Transceiver return info; } + @Override public void checkSendSize(IceInternal.Buffer buf, int messageSizeMax) { _delegate.checkSendSize(buf, messageSizeMax); @@ -497,7 +505,6 @@ final class TransceiverI implements IceInternal.Transceiver assert(_readBufferSize > 256); } - @SuppressWarnings("deprecation") private void init(Instance instance, IceInternal.Transceiver del) { _instance = instance; @@ -1494,18 +1501,28 @@ final class TransceiverI implements IceInternal.Transceiver final static private int OP_CONT = 0x0; // Continuation frame final static private int OP_TEXT = 0x1; // Text frame final static private int OP_DATA = 0x2; // Data frame + @SuppressWarnings("unused") final static private int OP_RES_0x3 = 0x3; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0x4 = 0x4; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0x5 = 0x5; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0x6 = 0x6; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0x7 = 0x7; // Reserved final static private int OP_CLOSE = 0x8; // Connection close final static private int OP_PING = 0x9; // Ping final static private int OP_PONG = 0xA; // Pong + @SuppressWarnings("unused") final static private int OP_RES_0xB = 0xB; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0xC = 0xC; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0xD = 0xD; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0xE = 0xE; // Reserved + @SuppressWarnings("unused") final static private int OP_RES_0xF = 0xF; // Reserved final static private int FLAG_FINAL = 0x80; // Last frame final static private int FLAG_MASKED = 0x80; // Payload is masked |