lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sh...@apache.org
Subject svn commit: r1420195 [13/13] - in /lucene/dev/trunk: lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/ lucene/analysis/common/src/java/org/apache/lucene/analysis/br/ lucene/ana...
Date Tue, 11 Dec 2012 14:34:28 GMT
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
Tue Dec 11 14:31:01 2012
@@ -563,16 +563,19 @@ public class HttpSolrServer extends Solr
     UpdateRequest req = new UpdateRequest();
     req.setDocIterator(new Iterator<SolrInputDocument>() {
       
+      @Override
       public boolean hasNext() {
         return beanIterator.hasNext();
       }
       
+      @Override
       public SolrInputDocument next() {
         Object o = beanIterator.next();
         if (o == null) return null;
         return getBinder().toSolrInputDocument(o);
       }
       
+      @Override
       public void remove() {
         beanIterator.remove();
       }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
Tue Dec 11 14:31:01 2012
@@ -566,6 +566,7 @@ public class LBHttpSolrServer extends So
 
   private static Runnable getAliveCheckRunner(final WeakReference<LBHttpSolrServer>
lbRef) {
     return new Runnable() {
+      @Override
       public void run() {
         LBHttpSolrServer lb = lbRef.get();
         if (lb != null && lb.zombieServers != null) {

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
Tue Dec 11 14:31:01 2012
@@ -98,26 +98,32 @@ public class RequestWriter {
       return contentStream;
     }
 
+    @Override
     public String getName() {
       return getDelegate().getName();
     }
 
+    @Override
     public String getSourceInfo() {
       return getDelegate().getSourceInfo();
     }
 
+    @Override
     public String getContentType() {
       return getUpdateContentType();
     }
 
+    @Override
     public Long getSize() {
       return getDelegate().getSize();
     }
 
+    @Override
     public InputStream getStream() throws IOException {
       return getDelegate().getStream();
     }
 
+    @Override
     public Reader getReader() throws IOException {
       return getDelegate().getReader();
     }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
Tue Dec 11 14:31:01 2012
@@ -103,6 +103,7 @@ public class DocumentAnalysisResponse ex
    *
    * @return An iterator over the document analyses map.
    */
+  @Override
   public Iterator<Map.Entry<String, DocumentAnalysis>> iterator() {
     return documentAnalysisByKey.entrySet().iterator();
   }
@@ -152,6 +153,7 @@ public class DocumentAnalysisResponse ex
      *
      * @return An iterator over the field analyses map.
      */
+    @Override
     public Iterator<Map.Entry<String, FieldAnalysis>> iterator() {
       return fieldAnalysisByFieldName.entrySet().iterator();
     }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java Tue Dec
11 14:31:01 2012
@@ -64,6 +64,7 @@ public class SolrDocument implements Map
   /**
    * Remove all fields from the document
    */
+  @Override
   public void clear()
   {
     _fields.clear();
@@ -202,6 +203,7 @@ public class SolrDocument implements Map
   /**
    * Iterate of String->Object keys
    */
+  @Override
   public Iterator<Entry<String, Object>> iterator() {
     return _fields.entrySet().iterator();
   }
@@ -217,23 +219,35 @@ public class SolrDocument implements Map
   {
     return new Map<String,Collection<Object>>() {
       /** Get the field Value */
+      @Override
       public Collection<Object> get(Object key) { 
         return getFieldValues( (String)key ); 
       }
       
       // Easily Supported methods
+      @Override
       public boolean containsKey(Object key) { return _fields.containsKey( key ); }
+      @Override
       public Set<String>  keySet()           { return _fields.keySet();  }
+      @Override
       public int          size()             { return _fields.size();    }
+      @Override
       public boolean      isEmpty()          { return _fields.isEmpty(); }
 
       // Unsupported operations.  These are not necessary for JSTL
+      @Override
       public void clear() { throw new UnsupportedOperationException(); }
+      @Override
       public boolean containsValue(Object value) {throw new UnsupportedOperationException();}
+      @Override
       public Set<java.util.Map.Entry<String, Collection<Object>>> entrySet()
{throw new UnsupportedOperationException();}
+      @Override
       public void putAll(Map<? extends String, ? extends Collection<Object>>
t) {throw new UnsupportedOperationException();}
+      @Override
       public Collection<Collection<Object>> values() {throw new UnsupportedOperationException();}
+      @Override
       public Collection<Object> put(String key, Collection<Object> value) {throw
new UnsupportedOperationException();}
+      @Override
       public Collection<Object> remove(Object key) {throw new UnsupportedOperationException();}
       @Override
       public String toString() {return _fields.toString();}
@@ -246,23 +260,35 @@ public class SolrDocument implements Map
   public Map<String,Object> getFieldValueMap() {
     return new Map<String,Object>() {
       /** Get the field Value */
+      @Override
       public Object get(Object key) { 
         return getFirstValue( (String)key ); 
       }
       
       // Easily Supported methods
+      @Override
       public boolean containsKey(Object key) { return _fields.containsKey( key ); }
+      @Override
       public Set<String>  keySet()           { return _fields.keySet();  }
+      @Override
       public int          size()             { return _fields.size();    }
+      @Override
       public boolean      isEmpty()          { return _fields.isEmpty(); }
 
       // Unsupported operations.  These are not necessary for JSTL
+      @Override
       public void clear() { throw new UnsupportedOperationException(); }
+      @Override
       public boolean containsValue(Object value) {throw new UnsupportedOperationException();}
+      @Override
       public Set<java.util.Map.Entry<String, Object>> entrySet() {throw new UnsupportedOperationException();}
+      @Override
       public void putAll(Map<? extends String, ? extends Object> t) {throw new UnsupportedOperationException();}
+      @Override
       public Collection<Object> values() {throw new UnsupportedOperationException();}
+      @Override
       public Collection<Object> put(String key, Object value) {throw new UnsupportedOperationException();}
+      @Override
       public Collection<Object> remove(Object key) {throw new UnsupportedOperationException();}
     
       @Override
       public String toString() {return _fields.toString();}
@@ -273,46 +299,57 @@ public class SolrDocument implements Map
   // MAP interface
   //---------------------------------------------------
 
+  @Override
   public boolean containsKey(Object key) {
     return _fields.containsKey(key);
   }
 
+  @Override
   public boolean containsValue(Object value) {
     return _fields.containsValue(value);
   }
 
+  @Override
   public Set<Entry<String, Object>> entrySet() {
     return _fields.entrySet();
   }
   //TODO: Shouldn't the input parameter here be a String?  The _fields map requires a String.
+  @Override
   public Object get(Object key) {
     return _fields.get(key);
   }
 
+  @Override
   public boolean isEmpty() {
     return _fields.isEmpty();
   }
 
+  @Override
   public Set<String> keySet() {
     return _fields.keySet();
   }
 
+  @Override
   public Object put(String key, Object value) {
     return _fields.put(key, value);
   }
 
+  @Override
   public void putAll(Map<? extends String, ? extends Object> t) {
     _fields.putAll( t );
   }
 
+  @Override
   public Object remove(Object key) {
     return _fields.remove(key);
   }
 
+  @Override
   public int size() {
     return _fields.size();
   }
 
+  @Override
   public Collection<Object> values() {
     return _fields.values();
   }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java Tue
Dec 11 14:31:01 2012
@@ -48,6 +48,7 @@ public class SolrInputDocument implement
   /**
    * Remove all fields and boosts from the document
    */
+  @Override
   public void clear()
   {
     if( _fields != null ) {
@@ -166,6 +167,7 @@ public class SolrInputDocument implement
     return _fields.get( field );
   }
 
+  @Override
   public Iterator<SolrInputField> iterator() {
     return _fields.values().iterator();
   }
@@ -198,46 +200,57 @@ public class SolrInputDocument implement
   // MAP interface
   //---------------------------------------------------
 
+  @Override
   public boolean containsKey(Object key) {
     return _fields.containsKey(key);
   }
 
+  @Override
   public boolean containsValue(Object value) {
     return _fields.containsValue(value);
   }
 
+  @Override
   public Set<Entry<String, SolrInputField>> entrySet() {
     return _fields.entrySet();
   }
 
+  @Override
   public SolrInputField get(Object key) {
     return _fields.get(key);
   }
 
+  @Override
   public boolean isEmpty() {
     return _fields.isEmpty();
   }
 
+  @Override
   public Set<String> keySet() {
     return _fields.keySet();
   }
 
+  @Override
   public SolrInputField put(String key, SolrInputField value) {
     return _fields.put(key, value);
   }
 
+  @Override
   public void putAll(Map<? extends String, ? extends SolrInputField> t) {
     _fields.putAll( t );
   }
 
+  @Override
   public SolrInputField remove(Object key) {
     return _fields.remove(key);
   }
 
+  @Override
   public int size() {
     return _fields.size();
   }
 
+  @Override
   public Collection<SolrInputField> values() {
     return _fields.values();
   }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java Tue Dec
11 14:31:01 2012
@@ -182,6 +182,7 @@ public class SolrInputField implements I
     this.name = name;
   }
 
+  @Override
   @SuppressWarnings("unchecked")
   public Iterator<Object> iterator() {
     if( value instanceof Collection ) {
@@ -190,15 +191,18 @@ public class SolrInputField implements I
     return new Iterator<Object>() {
       boolean nxt = (value!=null);
       
+      @Override
       public boolean hasNext() {
         return nxt;
       }
 
+      @Override
       public Object next() {
         nxt = false;
         return value;
       }
 
+      @Override
       public void remove() {
         throw new UnsupportedOperationException();
       }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Tue Dec 11 14:31:01 2012
@@ -66,6 +66,7 @@ class ConnectionManager implements Watch
     connected = false;
   }
 
+  @Override
   public synchronized void process(WatchedEvent event) {
     if (log.isInfoEnabled()) {
       log.info("Watcher " + this + " name:" + name + " got event " + event

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java Tue Dec
11 14:31:01 2012
@@ -85,6 +85,7 @@ public abstract class DocRouter {
       return includes(other.min) || includes(other.max) || isSubsetOf(other);
     }
 
+    @Override
     public String toString() {
       return Integer.toHexString(min) + '-' + Integer.toHexString(max);
     }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java Tue
Dec 11 14:31:01 2012
@@ -52,6 +52,7 @@ public class SolrZooKeeper extends ZooKe
    */
   public void pauseCnxn(final long ms) {
     final Thread t = new Thread() {
+      @Override
       public void run() {
         try {
           final ClientCnxn cnxn = getConnection();

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Tue
Dec 11 14:31:01 2012
@@ -139,6 +139,7 @@ public class ZkStateReader {
         // on reconnect, reload cloud info
         new OnReconnect() {
 
+          @Override
           public void command() {
             try {
               ZkStateReader.this.createClusterStateWatchersAndUpdate();
@@ -317,6 +318,7 @@ public class ZkStateReader {
       clusterStateUpdateScheduled = true;
       updateCloudExecutor.schedule(new Runnable() {
         
+        @Override
         public void run() {
           log.info("Updating cluster state from ZooKeeper...");
           synchronized (getUpdateLock()) {

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
Tue Dec 11 14:31:01 2012
@@ -186,6 +186,7 @@ public abstract class ContentStreamBase 
    * Base reader implementation.  If the contentType declares a 
    * charset use it, otherwise use "utf-8".
    */
+  @Override
   public Reader getReader() throws IOException {
     String charset = getCharsetFromContentType( getContentType() );
     return charset == null 
@@ -197,6 +198,7 @@ public abstract class ContentStreamBase 
   // Getters / Setters for overrideable attributes
   //------------------------------------------------------------------
 
+  @Override
   public String getContentType() {
     return contentType;
   }
@@ -205,6 +207,7 @@ public abstract class ContentStreamBase 
     this.contentType = contentType;
   }
 
+  @Override
   public String getName() {
     return name;
   }
@@ -213,6 +216,7 @@ public abstract class ContentStreamBase 
     this.name = name;
   }
 
+  @Override
   public Long getSize() {
     return size;
   }
@@ -221,6 +225,7 @@ public abstract class ContentStreamBase 
     this.size = size;
   }
 
+  @Override
   public String getSourceInfo() {
     return sourceInfo;
   }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java
Tue Dec 11 14:31:01 2012
@@ -65,6 +65,7 @@ public class FastInputStream extends Inp
   }
 
 
+  @Override
   public int readUnsignedByte() throws IOException {
     if (pos >= end) {
       refill();
@@ -140,10 +141,12 @@ public class FastInputStream extends Inp
     in.close();
   }
 
+  @Override
   public void readFully(byte b[]) throws IOException {
     readFully(b, 0, b.length);
   }
 
+  @Override
   public void readFully(byte b[], int off, int len) throws IOException {
     while (len>0) {
       int ret = read(b, off, len);
@@ -155,6 +158,7 @@ public class FastInputStream extends Inp
     }
   }
 
+  @Override
   public int skipBytes(int n) throws IOException {
     if (end-pos >= n) {
       pos += n;
@@ -177,10 +181,12 @@ public class FastInputStream extends Inp
     return r;
   }
 
+  @Override
   public boolean readBoolean() throws IOException {
     return readByte()==1;
   }
 
+  @Override
   public byte readByte() throws IOException {
     if (pos >= end) {
       refill();
@@ -190,18 +196,22 @@ public class FastInputStream extends Inp
   }
 
 
+  @Override
   public short readShort() throws IOException {
     return (short)((readUnsignedByte() << 8) | readUnsignedByte());
   }
 
+  @Override
   public int readUnsignedShort() throws IOException {
     return (readUnsignedByte() << 8) | readUnsignedByte();
   }
 
+  @Override
   public char readChar() throws IOException {
     return (char)((readUnsignedByte() << 8) | readUnsignedByte());
   }
 
+  @Override
   public int readInt() throws IOException {
     return  ((readUnsignedByte() << 24)
             |(readUnsignedByte() << 16)
@@ -209,6 +219,7 @@ public class FastInputStream extends Inp
             | readUnsignedByte());
   }
 
+  @Override
   public long readLong() throws IOException {
     return  (((long)readUnsignedByte()) << 56)
             | (((long)readUnsignedByte()) << 48)
@@ -220,18 +231,22 @@ public class FastInputStream extends Inp
             | (readUnsignedByte());
   }
 
+  @Override
   public float readFloat() throws IOException {
     return Float.intBitsToFloat(readInt());    
   }
 
+  @Override
   public double readDouble() throws IOException {
     return Double.longBitsToDouble(readLong());    
   }
 
+  @Override
   public String readLine() throws IOException {
     throw new UnsupportedOperationException();
   }
 
+  @Override
   public String readUTF() throws IOException {
     return new DataInputStream(this).readUTF();
   }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java
Tue Dec 11 14:31:01 2012
@@ -109,23 +109,28 @@ public class FastOutputStream extends Ou
   }
 
   ////////////////// DataOutput methods ///////////////////
+  @Override
   public void writeBoolean(boolean v) throws IOException {
     write(v ? 1:0);
   }
 
+  @Override
   public void writeByte(int v) throws IOException {
     write((byte)v);
   }
 
+  @Override
   public void writeShort(int v) throws IOException {
     write((byte)(v >>> 8));
     write((byte)v);
   }
 
+  @Override
   public void writeChar(int v) throws IOException {
     writeShort(v);
   }
 
+  @Override
   public void writeInt(int v) throws IOException {
     reserve(4);
     buf[pos] = (byte)(v>>>24);
@@ -135,6 +140,7 @@ public class FastOutputStream extends Ou
     pos+=4;
   }
 
+  @Override
   public void writeLong(long v) throws IOException {
     reserve(8);
     buf[pos] = (byte)(v>>>56);
@@ -148,26 +154,31 @@ public class FastOutputStream extends Ou
     pos+=8;
   }
 
+  @Override
   public void writeFloat(float v) throws IOException {
     writeInt(Float.floatToRawIntBits(v));
   }
 
+  @Override
   public void writeDouble(double v) throws IOException {
     writeLong(Double.doubleToRawLongBits(v));
   }
 
+  @Override
   public void writeBytes(String s) throws IOException {
     // non-optimized version, but this shouldn't be used anyway
     for (int i=0; i<s.length(); i++)
       write((byte)s.charAt(i));
   }
 
+  @Override
   public void writeChars(String s) throws IOException {
     // non-optimized version
     for (int i=0; i<s.length(); i++)
       writeChar(s.charAt(i)); 
   }
 
+  @Override
   public void writeUTF(String s) throws IOException {
     // non-optimized version, but this shouldn't be used anyway
     DataOutputStream daos = new DataOutputStream(this);

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java Tue
Dec 11 14:31:01 2012
@@ -36,6 +36,7 @@ public class IteratorChain<E> implements
     iterators.add(it);
   }
   
+  @Override
   public boolean hasNext() {
     if(itit==null) itit = iterators.iterator();
     return recursiveHasNext();
@@ -66,6 +67,7 @@ public class IteratorChain<E> implements
   /** hasNext() must ALWAYS be called before calling this
    *  otherwise it's a bit hard to keep track of what's happening
    */
+  @Override
   public E next() {
     if(current==null) { 
       throw new RuntimeException("For an IteratorChain, hasNext() MUST be called before calling
next()");
@@ -73,6 +75,7 @@ public class IteratorChain<E> implements
     return current.next();
   }
 
+  @Override
   public void remove() {
     // we just need this class 
     // to iterate in readonly mode

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java Tue Dec
11 14:31:01 2012
@@ -284,14 +284,17 @@ public class NamedList<T> implements Clo
       value = _value;
     }
 
+    @Override
     public String getKey() {
       return key;
     }
 
+    @Override
     public T getValue() {
       return  value;
     }
 
+    @Override
     public T setValue(T _value) {
       T oldValue = value;
       value = _value;
@@ -337,6 +340,7 @@ public class NamedList<T> implements Clo
   /**
    * Support the Iterable interface
    */
+  @Override
   public Iterator<Map.Entry<String,T>> iterator() {
 
     final NamedList<T> list = this;
@@ -345,17 +349,21 @@ public class NamedList<T> implements Clo
 
       int idx = 0;
 
+      @Override
       public boolean hasNext() {
         return idx < list.size();
       }
 
+      @Override
       public Map.Entry<String,T> next() {
         final int index = idx++;
         Map.Entry<String,T> nv = new Map.Entry<String,T>() {
+          @Override
           public String getKey() {
             return list.getName( index );
           }
 
+          @Override
           @SuppressWarnings("unchecked")
           public T getValue() {
             return list.getVal( index );
@@ -367,6 +375,7 @@ public class NamedList<T> implements Clo
             return getKey()+"="+getValue();
           }
 
+          @Override
           public T setValue(T value) {
             return list.setVal(index, value);
           }
@@ -374,6 +383,7 @@ public class NamedList<T> implements Clo
         return nv;
       }
 
+      @Override
       public void remove() {
         throw new UnsupportedOperationException();
       }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java
Tue Dec 11 14:31:01 2012
@@ -35,6 +35,7 @@ public class SolrjNamedThreadFactory imp
                    "-thread-";
   }
 
+  @Override
   public Thread newThread(Runnable r) {
       Thread t = new Thread(group, r,
                             prefix + threadNumber.getAndIncrement(),

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java Tue
Dec 11 14:31:01 2012
@@ -37,34 +37,41 @@ public final class XMLErrorLogger implem
 
   // ErrorHandler
 
+  @Override
   public void warning(SAXParseException e) {
     log.warn("XML parse warning in \""+e.getSystemId()+"\", line "+e.getLineNumber()+", column
"+e.getColumnNumber()+": "+e.getMessage());
   }
 
+  @Override
   public void error(SAXParseException e) throws SAXException {
     throw e;
   }
 
+  @Override
   public void fatalError(SAXParseException e) throws SAXException {
     throw e;
   }
 
   // ErrorListener
 
+  @Override
   public void warning(TransformerException e) {
     log.warn(e.getMessageAndLocation());
   }
 
+  @Override
   public void error(TransformerException e) throws TransformerException {
     throw e;
   }
 
+  @Override
   public void fatalError(TransformerException e) throws TransformerException {
     throw e;
   }
 
   // XMLReporter
 
+  @Override
   public void report(String message, String errorType, Object relatedInformation, Location
loc) {
     final StringBuilder sb = new StringBuilder("XML parser reported ").append(errorType);
     if (loc !=  null) {

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
Tue Dec 11 14:31:01 2012
@@ -71,10 +71,12 @@ public class TestBatchUpdate extends Sol
     counter[0] = 0;
     commonsHttpSolrServer.addBeans(new Iterator<Bean>() {
 
+      @Override
       public boolean hasNext() {
         return counter[0] < numdocs;
       }
 
+      @Override
       public Bean next() {
         Bean bean = new Bean();
         bean.id = "" + (++counter[0]);
@@ -82,6 +84,7 @@ public class TestBatchUpdate extends Sol
         return bean;
       }
 
+      @Override
       public void remove() {
         //do nothing
       }
@@ -105,10 +108,12 @@ public class TestBatchUpdate extends Sol
     counter[0] = 0;
     commonsHttpSolrServer.add(new Iterator<SolrInputDocument>() {
 
+      @Override
       public boolean hasNext() {
         return counter[0] < numdocs;
       }
 
+      @Override
       public SolrInputDocument next() {
         SolrInputDocument doc = new SolrInputDocument();
         doc.addField("id", "" + (++counter[0]));
@@ -116,6 +121,7 @@ public class TestBatchUpdate extends Sol
         return doc;
       }
 
+      @Override
       public void remove() {
         //do nothing
 

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
Tue Dec 11 14:31:01 2012
@@ -45,6 +45,7 @@ public class TestEmbeddedSolrServer exte
 
   protected static Logger log = LoggerFactory.getLogger(TestEmbeddedSolrServer.class);
 
+  @Override
   protected EmbeddedSolrServer getSolrCore1() {
     return new EmbeddedSolrServer(cores, "core1");
   }

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
Tue Dec 11 14:31:01 2012
@@ -139,6 +139,7 @@ public class CloudSolrServerTest extends
   }
   
   
+  @Override
   protected void indexr(Object... fields) throws Exception {
     SolrInputDocument doc = getDoc(fields);
     indexDoc(doc);

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
Tue Dec 11 14:31:01 2012
@@ -85,6 +85,7 @@ public class TestUpdateRequestCodec exte
     codec.marshal(updateRequest, baos);
     final List<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
     JavaBinUpdateRequestCodec.StreamingUpdateHandler handler = new JavaBinUpdateRequestCodec.StreamingUpdateHandler()
{
+      @Override
       public void update(SolrInputDocument document, UpdateRequest req) {
         Assert.assertNotNull(req.getParams());
         docs.add(document);
@@ -124,6 +125,7 @@ public class TestUpdateRequestCodec exte
     // imagine someone adding a custom Bean that implements Iterable 
     // but is not a Collection
     doc.addField("iter", new Iterable<String>() { 
+        @Override
         public Iterator<String> iterator() { return values.iterator(); } 
       });
     doc.addField("desc", "1");
@@ -134,6 +136,7 @@ public class TestUpdateRequestCodec exte
     codec.marshal(updateRequest, baos);
     final List<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
     JavaBinUpdateRequestCodec.StreamingUpdateHandler handler = new JavaBinUpdateRequestCodec.StreamingUpdateHandler()
{
+      @Override
       public void update(SolrInputDocument document, UpdateRequest req) {
         Assert.assertNotNull(req.getParams());
         docs.add(document);

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java Tue
Dec 11 14:31:01 2012
@@ -131,6 +131,7 @@ public class SolrDocumentTest extends Lu
     assertEquals( 0, doc.getFieldNames().size() );
     
     Iterable iter = new Iterable() {
+      @Override
       public Iterator iterator() {
         return c0.iterator();
       }

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java
Tue Dec 11 14:31:01 2012
@@ -91,9 +91,12 @@ public class SolrParamTest extends Lucen
     }
     
     // Malformed params: These should throw a 400
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { params.getInt(
  "f.bad.int" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { params.getBool(
 "f.bad.bool" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { params.getFloat(
"f.bad.float" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { params.getInt(   "f.bad.int" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { params.getBool(  "f.bad.bool" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { params.getFloat( "f.bad.float" ); } } ) );
     
     // Ask for params that arent there
     assertNull( params.get( "asagdsaga" ) );
@@ -130,15 +133,24 @@ public class SolrParamTest extends Lucen
     assertEquals( pfloat , required.getFieldFloat( "fakefield", "float" ) );
     
     // Required params which are missing: These should throw a 400
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { required.get(
"aaaa" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { required.getInt(
  "f.bad.int" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { required.getBool(
 "f.bad.bool" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { required.getFloat(
"f.bad.float" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { required.getInt(
  "aaa" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { required.getBool(
 "aaa" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { required.getFloat(
"aaa" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { params.getFieldBool(
 "bad", "bool" ); } } ) );
-    assertEquals( 400, getReturnCode( new Runnable() { public void run() { params.getFieldInt(
  "bad", "int"  ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { required.get( "aaaa" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { required.getInt(   "f.bad.int" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { required.getBool(  "f.bad.bool" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { required.getFloat( "f.bad.float" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { required.getInt(   "aaa" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { required.getBool(  "aaa" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { required.getFloat( "aaa" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { params.getFieldBool(  "bad", "bool" ); } } ) );
+    assertEquals( 400, getReturnCode( new Runnable() { @Override
+    public void run() { params.getFieldInt(   "bad", "int"  ); } } ) );
 
     // Fields with default use their parent value:
     assertEquals(

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
Tue Dec 11 14:31:01 2012
@@ -32,10 +32,12 @@ class StringMockSolrResourceLoader imple
     this.text = text;
   }
 
+  @Override
   public <T> T newInstance(String cname, Class<T> expectedType) {
     return null;
   }
 
+  @Override
   public InputStream openResource(String resource) throws IOException {
     return new ByteArrayInputStream(text.getBytes("UTF-8"));
   }

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Tue Dec 11 14:31:01 2012
@@ -501,6 +501,7 @@ public abstract class AbstractFullDistri
     ureq.process(cloudClient);
   }
   
+  @Override
   protected void index_specific(int serverNumber, Object... fields)
       throws Exception {
     SolrInputDocument doc = new SolrInputDocument();
@@ -534,6 +535,7 @@ public abstract class AbstractFullDistri
     controlClient.add(doc);
   }
   
+  @Override
   protected void del(String q) throws Exception {
     controlClient.deleteByQuery(q);
     cloudClient.deleteByQuery(q);
@@ -1067,6 +1069,7 @@ public abstract class AbstractFullDistri
           + " deletes:" + numDeletes);
     }
     
+    @Override
     public void safeStop() {
       stop = true;
     }
@@ -1116,6 +1119,7 @@ public abstract class AbstractFullDistri
       System.err.println("num searches done:" + numSearches + " with " + fails + " fails");
     }
     
+    @Override
     public void safeStop() {
       stop = true;
     }
@@ -1175,11 +1179,13 @@ public abstract class AbstractFullDistri
     System.clearProperty("numShards");
   }
   
+  @Override
   protected void commit() throws Exception {
     controlClient.commit();
     cloudClient.commit();
   }
   
+  @Override
   protected void destroyServers() throws Exception {
     if (controlJetty != null) {
       ChaosMonkey.stop(controlJetty);
@@ -1195,6 +1201,7 @@ public abstract class AbstractFullDistri
     jettys.clear();
   }
   
+  @Override
   protected SolrServer createNewSolrServer(int port) {
     try {
       // setup the server...

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
Tue Dec 11 14:31:01 2012
@@ -79,6 +79,7 @@ public abstract class AbstractSolrTestCa
   /** Subclasses that override setUp can optionally call this method
    * to log the fact that their setUp process has ended.
    */
+  @Override
   public void postSetUp() {
     log.info("####POSTSETUP " + getTestName());
   }
@@ -89,6 +90,7 @@ public abstract class AbstractSolrTestCa
    * since subclasses will want to call super.tearDown() at the *end* of their
    * tearDown method.
    */
+  @Override
   public void preTearDown() {
     log.info("####PRETEARDOWN " + getTestName());      
   }



Mime
View raw message