lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r1389133 [5/5] - in /lucene/dev/trunk: dev-tools/eclipse/dot.settings/ lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/ lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/ lucene/analysis/common/src/ja...
Date Sun, 23 Sep 2012 19:54:32 GMT
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java Sun
Sep 23 19:54:23 2012
@@ -48,8 +48,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a collection of documents
    * @param docs  the collection of documents
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse add(Collection<SolrInputDocument> docs) throws SolrServerException,
IOException {
     return add(docs, -1);
@@ -59,8 +58,7 @@ public abstract class SolrServer impleme
    * Adds a collection of documents, specifying max time before they become committed
    * @param docs  the collection of documents
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse add(Collection<SolrInputDocument> docs, int commitWithinMs)
throws SolrServerException, IOException {
@@ -73,8 +71,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a collection of beans
    * @param beans  the collection of beans
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse addBeans(Collection<?> beans ) throws SolrServerException,
IOException {
     return addBeans(beans, -1);
@@ -84,8 +81,7 @@ public abstract class SolrServer impleme
    * Adds a collection of beans specifying max time before they become committed
    * @param beans  the collection of beans
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse addBeans(Collection<?> beans, int commitWithinMs) throws SolrServerException,
IOException {
@@ -100,8 +96,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a single document
    * @param doc  the input document
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse add(SolrInputDocument doc ) throws SolrServerException, IOException
{
     return add(doc, -1);
@@ -111,8 +106,7 @@ public abstract class SolrServer impleme
    * Adds a single document specifying max time before it becomes committed
    * @param doc  the input document
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse add(SolrInputDocument doc, int commitWithinMs) throws SolrServerException,
IOException {
@@ -125,8 +119,7 @@ public abstract class SolrServer impleme
   /**
    * Adds a single bean
    * @param obj  the input bean
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse addBean(Object obj) throws IOException, SolrServerException {
     return addBean(obj, -1);
@@ -136,8 +129,7 @@ public abstract class SolrServer impleme
    * Adds a single bean specifying max time before it becomes committed
    * @param obj  the input bean
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since solr 3.5
    */
   public UpdateResponse addBean(Object obj, int commitWithinMs) throws IOException, SolrServerException
{
@@ -148,8 +140,7 @@ public abstract class SolrServer impleme
    * Performs an explicit commit, causing pending documents to be committed for indexing
    * <p>
    * waitFlush=true and waitSearcher=true to be inline with the defaults for plain HTTP access
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse commit( ) throws SolrServerException, IOException {
     return commit(true, true);
@@ -161,8 +152,7 @@ public abstract class SolrServer impleme
    * waitFlush=true and waitSearcher=true to be inline with the defaults for plain HTTP access
    * <p>
    * Note: In most cases it is not required to do explicit optimize
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse optimize( ) throws SolrServerException, IOException {
     return optimize(true, true, 1);
@@ -172,8 +162,7 @@ public abstract class SolrServer impleme
    * Performs an explicit commit, causing pending documents to be committed for indexing
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main
query searcher, making the changes visible 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse commit( boolean waitFlush, boolean waitSearcher ) throws SolrServerException,
IOException {
     return new UpdateRequest().setAction( UpdateRequest.ACTION.COMMIT, waitFlush, waitSearcher
).process( this );
@@ -184,8 +173,7 @@ public abstract class SolrServer impleme
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main
query searcher, making the changes visible
    * @param softCommit makes index changes visible while neither fsync-ing index files nor
writing a new index descriptor
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse commit( boolean waitFlush, boolean waitSearcher, boolean softCommit
) throws SolrServerException, IOException {
     return new UpdateRequest().setAction( UpdateRequest.ACTION.COMMIT, waitFlush, waitSearcher,
softCommit ).process( this );
@@ -197,8 +185,7 @@ public abstract class SolrServer impleme
    * Note: In most cases it is not required to do explicit optimize
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main
query searcher, making the changes visible 
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse optimize( boolean waitFlush, boolean waitSearcher ) throws SolrServerException,
IOException {
     return optimize(waitFlush, waitSearcher, 1);
@@ -211,8 +198,7 @@ public abstract class SolrServer impleme
    * @param waitFlush  block until index changes are flushed to disk
    * @param waitSearcher  block until a new searcher is opened and registered as the main
query searcher, making the changes visible 
    * @param maxSegments  optimizes down to at most this number of segments
-   * @throws SolrServerException
-   * @throws IOException 
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse optimize(boolean waitFlush, boolean waitSearcher, int maxSegments
) throws SolrServerException, IOException {
     return new UpdateRequest().setAction( UpdateRequest.ACTION.OPTIMIZE, waitFlush, waitSearcher,
maxSegments ).process( this );
@@ -224,8 +210,7 @@ public abstract class SolrServer impleme
    * Note that this is not a true rollback as in databases. Content you have previously
    * added may have been committed due to autoCommit, buffer full, other client performing
    * a commit etc.
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse rollback() throws SolrServerException, IOException {
     return new UpdateRequest().rollback().process( this );
@@ -234,8 +219,7 @@ public abstract class SolrServer impleme
   /**
    * Deletes a single document by unique ID
    * @param id  the ID of the document to delete
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse deleteById(String id) throws SolrServerException, IOException {
     return deleteById(id, -1);
@@ -245,8 +229,7 @@ public abstract class SolrServer impleme
    * Deletes a single document by unique ID, specifying max time before commit
    * @param id  the ID of the document to delete
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since 3.6
    */
   public UpdateResponse deleteById(String id, int commitWithinMs) throws SolrServerException,
IOException {
@@ -259,8 +242,7 @@ public abstract class SolrServer impleme
   /**
    * Deletes a list of documents by unique ID
    * @param ids  the list of document IDs to delete 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse deleteById(List<String> ids) throws SolrServerException, IOException
{
     return deleteById(ids, -1);
@@ -270,8 +252,7 @@ public abstract class SolrServer impleme
    * Deletes a list of documents by unique ID, specifying max time before commit
    * @param ids  the list of document IDs to delete 
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since 3.6
    */
   public UpdateResponse deleteById(List<String> ids, int commitWithinMs) throws SolrServerException,
IOException {
@@ -284,8 +265,7 @@ public abstract class SolrServer impleme
   /**
    * Deletes documents from the index based on a query
    * @param query  the query expressing what documents to delete
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public UpdateResponse deleteByQuery(String query) throws SolrServerException, IOException
{
     return deleteByQuery(query, -1);
@@ -295,8 +275,7 @@ public abstract class SolrServer impleme
    * Deletes documents from the index based on a query, specifying max time before commit
    * @param query  the query expressing what documents to delete
    * @param commitWithinMs  max time (in ms) before a commit will happen 
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * @since 3.6
    */
   public UpdateResponse deleteByQuery(String query, int commitWithinMs) throws SolrServerException,
IOException {
@@ -308,8 +287,7 @@ public abstract class SolrServer impleme
 
   /**
    * Issues a ping request to check if the server is alive
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public SolrPingResponse ping() throws SolrServerException, IOException {
     return new SolrPing().process( this );
@@ -318,7 +296,6 @@ public abstract class SolrServer impleme
   /**
    * Performs a query to the Solr server
    * @param params  an object holding all key/value parameters to send along the request
-   * @throws SolrServerException
    */
   public QueryResponse query(SolrParams params) throws SolrServerException {
     return new QueryRequest( params ).process( this );
@@ -328,7 +305,6 @@ public abstract class SolrServer impleme
    * Performs a query to the Solr server
    * @param params  an object holding all key/value parameters to send along the request
    * @param method  specifies the HTTP method to use for the request, such as GET or POST
-   * @throws SolrServerException
    */
   public QueryResponse query(SolrParams params, METHOD method) throws SolrServerException
{
     return new QueryRequest( params, method ).process( this );

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=1389133&r1=1389132&r2=1389133&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
Sun Sep 23 19:54:23 2012
@@ -166,8 +166,7 @@ public class HttpSolrServer extends Solr
    * @param request
    *          The {@link org.apache.solr.client.solrj.SolrRequest} to process
    * @return The {@link org.apache.solr.common.util.NamedList} result
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    * 
    * @see #request(org.apache.solr.client.solrj.SolrRequest,
    *      org.apache.solr.client.solrj.ResponseParser)

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=1389133&r1=1389132&r2=1389133&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
Sun Sep 23 19:54:23 2012
@@ -230,8 +230,7 @@ public class LBHttpSolrServer extends So
    *
    * @return the result of the request
    *
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public Rsp request(Req req) throws SolrServerException, IOException {
     Rsp rsp = new Rsp();
@@ -419,8 +418,7 @@ public class LBHttpSolrServer extends So
    *
    * @return response
    *
-   * @throws SolrServerException
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   @Override
   public NamedList<Object> request(final SolrRequest request)

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
Sun Sep 23 19:54:23 2012
@@ -163,7 +163,6 @@ public class ClientUtils 
   /**
    * Returns a formatter that can be use by the current thread if needed to
    * convert Date objects to the Internal representation.
-   * @throws ParseException
    *
    * @deprecated Use {@link org.apache.solr.common.util.DateUtil#parseDate(String)}
    */

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Sun
Sep 23 19:54:23 2012
@@ -59,9 +59,6 @@ public class ClusterState implements JSO
    * Use this constr when ClusterState is meant for publication.
    * 
    * hashCode and equals will only depend on liveNodes and not clusterStateVersion.
-   * 
-   * @param liveNodes
-   * @param collectionStates
    */
   public ClusterState(Set<String> liveNodes,
       Map<String, Map<String,Slice>> collectionStates) {
@@ -70,10 +67,6 @@ public class ClusterState implements JSO
   
   /**
    * Use this constr when ClusterState is meant for consumption.
-   * 
-   * @param zkClusterStateVersion
-   * @param liveNodes
-   * @param collectionStates
    */
   public ClusterState(Integer zkClusterStateVersion, Set<String> liveNodes,
       Map<String, Map<String,Slice>> collectionStates) {

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/HashPartitioner.java
Sun Sep 23 19:54:23 2012
@@ -89,9 +89,7 @@ public class HashPartitioner {
   }
 
   /**
-   *
-   * @param partitions
-   * @return Range for each partition
+   * Returns the range for each partition
    */
   public List<Range> partitionRange(int partitions, int min, int max) {
     assert max >= min;

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Sun
Sep 23 19:54:23 2012
@@ -75,10 +75,6 @@ public class SolrZkClient {
   private volatile boolean isClosed = false;
   private ZkClientConnectionStrategy zkClientConnectionStrategy;
   
-  /**
-   * @param zkServerAddress
-   * @param zkClientTimeout
-   */
   public SolrZkClient(String zkServerAddress, int zkClientTimeout) {
     this(zkServerAddress, zkClientTimeout, new DefaultConnectionStrategy(), null);
   }
@@ -87,24 +83,11 @@ public class SolrZkClient {
     this(zkServerAddress, zkClientTimeout, new DefaultConnectionStrategy(), onReonnect, zkClientConnectTimeout);
   }
 
-  /**
-   * @param zkServerAddress
-   * @param zkClientTimeout
-   * @param strat
-   * @param onReconnect
-   */
   public SolrZkClient(String zkServerAddress, int zkClientTimeout,
       ZkClientConnectionStrategy strat, final OnReconnect onReconnect) {
     this(zkServerAddress, zkClientTimeout, strat, onReconnect, DEFAULT_CLIENT_CONNECT_TIMEOUT);
   }
 
-  /**
-   * @param zkServerAddress
-   * @param zkClientTimeout
-   * @param strat
-   * @param onReconnect
-   * @param clientConnectTimeout
-   */
   public SolrZkClient(String zkServerAddress, int zkClientTimeout,
       ZkClientConnectionStrategy strat, final OnReconnect onReconnect, int clientConnectTimeout)
{
     this.zkClientConnectionStrategy = strat;
@@ -146,19 +129,12 @@ public class SolrZkClient {
   }
 
   /**
-   * @return true if client is connected
+   * Returns true if client is connected
    */
   public boolean isConnected() {
     return keeper != null && keeper.getState() == ZooKeeper.States.CONNECTED;
   }
   
-  /**
-   * @param path
-   * @param version
-   * @param retryOnConnLoss 
-   * @throws InterruptedException
-   * @throws KeeperException
-   */
   public void delete(final String path, final int version, boolean retryOnConnLoss)
       throws InterruptedException, KeeperException {
     if (retryOnConnLoss) {
@@ -185,7 +161,6 @@ public class SolrZkClient {
    *
    * @param path the node path
    * @param watcher explicit watcher
-   * @param retryOnConnLoss 
    * @return the stat of the node of the given path; return null if no such a
    *         node exists.
    * @throws KeeperException If the server signals an error
@@ -207,11 +182,7 @@ public class SolrZkClient {
   }
   
   /**
-   * @param path
-   * @return true if path exists
-   * @param retryOnConnLoss  
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns true if path exists
    */
   public Boolean exists(final String path, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -228,14 +199,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param data
-   * @param acl
-   * @param createMode
-   * @param retryOnConnLoss 
-   * @return path of created node
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns path of created node
    */
   public String create(final String path, final byte data[], final List<ACL> acl,
       final CreateMode createMode, boolean retryOnConnLoss) throws KeeperException, InterruptedException
{
@@ -252,12 +216,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param watcher
-   * @param retryOnConnLoss 
-   * @return children of the node at the path
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns children of the node at the path
    */
   public List<String> getChildren(final String path, final Watcher watcher, boolean
retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -274,13 +233,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param watcher
-   * @param stat
-   * @param retryOnConnLoss 
-   * @return node's data
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns node's data
    */
   public byte[] getData(final String path, final Watcher watcher, final Stat stat, boolean
retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -297,13 +250,7 @@ public class SolrZkClient {
   }
 
   /**
-   * @param path
-   * @param data
-   * @param version
-   * @param retryOnConnLoss 
-   * @return node's state
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns node's state
    */
   public Stat setData(final String path, final byte data[], final int version, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -320,14 +267,7 @@ public class SolrZkClient {
   }
   
   /**
-   * 
-   * @param path
-   * @param data
-   * @param createMode
-   * @return path of created node
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
+   * Returns path of created node
    */
   public String create(final String path, final byte[] data,
       final CreateMode createMode, boolean retryOnConnLoss) throws KeeperException,
@@ -350,11 +290,6 @@ public class SolrZkClient {
    * 
    * e.g. If <code>path=/solr/group/node</code> and none of the nodes, solr,
    * group, node exist, each will be created.
-   * 
-   * @param path
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, boolean retryOnConnLoss) throws KeeperException,
       InterruptedException {
@@ -385,11 +320,7 @@ public class SolrZkClient {
   /**
    * Creates the path in ZooKeeper, creating each node as necessary.
    * 
-   * @param path
    * @param data to set on the last zkNode
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, boolean retryOnConnLoss) throws KeeperException,
       InterruptedException {
@@ -402,12 +333,7 @@ public class SolrZkClient {
    * e.g. If <code>path=/solr/group/node</code> and none of the nodes, solr,
    * group, node exist, each will be created.
    * 
-   * @param path
    * @param data to set on the last zkNode
-   * @param createMode
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, CreateMode createMode, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
@@ -420,13 +346,7 @@ public class SolrZkClient {
    * e.g. If <code>path=/solr/group/node</code> and none of the nodes, solr,
    * group, node exist, each will be created.
    * 
-   * @param path
    * @param data to set on the last zkNode
-   * @param createMode
-   * @param watcher
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, CreateMode createMode,
       Watcher watcher, boolean retryOnConnLoss) throws KeeperException, InterruptedException
{
@@ -443,15 +363,6 @@ public class SolrZkClient {
    * 
    * Note: retryOnConnLoss is only respected for the final node - nodes
    * before that are always retried on connection loss.
-   * 
-   * @param path
-   * @param data
-   * @param createMode
-   * @param watcher
-   * @param failOnExists
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void makePath(String path, byte[] data, CreateMode createMode,
       Watcher watcher, boolean failOnExists, boolean retryOnConnLoss) throws KeeperException,
InterruptedException {
@@ -520,14 +431,6 @@ public class SolrZkClient {
     }
   }
 
-  /**
-   * @param zkPath
-   * @param createMode
-   * @param watcher
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
-   */
   public void makePath(String zkPath, CreateMode createMode, Watcher watcher, boolean retryOnConnLoss)
       throws KeeperException, InterruptedException {
     makePath(zkPath, null, createMode, watcher, retryOnConnLoss);
@@ -535,12 +438,6 @@ public class SolrZkClient {
 
   /**
    * Write data to ZooKeeper.
-   * 
-   * @param path
-   * @param data
-   * @param retryOnConnLoss
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void setData(String path, byte[] data, boolean retryOnConnLoss) throws KeeperException,
       InterruptedException {
@@ -552,10 +449,6 @@ public class SolrZkClient {
    * 
    * @param path path to upload file to e.g. /solr/conf/solrconfig.xml
    * @param file path to file to be uploaded
-   * @param retryOnConnLoss
-   * @throws IOException
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void setData(String path, File file, boolean retryOnConnLoss) throws IOException,
       KeeperException, InterruptedException {
@@ -569,11 +462,6 @@ public class SolrZkClient {
 
   /**
    * Fills string with printout of current ZooKeeper layout.
-   * 
-   * @param path
-   * @param indent
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void printLayout(String path, int indent, StringBuilder string)
       throws KeeperException, InterruptedException {
@@ -619,9 +507,6 @@ public class SolrZkClient {
 
   /**
    * Prints current ZooKeeper layout to stdout.
-   * 
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   public void printLayoutToStdOut() throws KeeperException,
       InterruptedException {
@@ -667,9 +552,6 @@ public class SolrZkClient {
 
   /**
    * Allows package private classes to update volatile ZooKeeper.
-   * 
-   * @param keeper
-   * @throws InterruptedException 
    */
   void updateKeeper(SolrZooKeeper keeper) throws InterruptedException {
    SolrZooKeeper oldKeeper = this.keeper;

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java Sun
Sep 23 19:54:23 2012
@@ -53,10 +53,6 @@ public class ZkCmdExecutor {
 
   /**
    * Perform the given operation, retrying if the connection fails
-   * 
-   * @param operation
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   @SuppressWarnings("unchecked")
   public <T> T retryOperation(ZkOperation operation)
@@ -107,7 +103,6 @@ public class ZkCmdExecutor {
    * 
    * @param attemptCount
    *          the number of the attempts performed so far
-   * @throws InterruptedException 
    */
   protected void retryDelay(int attemptCount) throws InterruptedException {
     if (attemptCount > 0) {

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java Sun
Sep 23 19:54:23 2012
@@ -32,8 +32,6 @@ public abstract class ZkOperation {
      * to ZooKeeper closes during this operation
      *
      * @return the result of the operation or null
-     * @throws KeeperException
-     * @throws InterruptedException
      */
     public abstract Object execute() throws KeeperException, InterruptedException;
 }

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=1389133&r1=1389132&r2=1389133&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
Sun Sep 23 19:54:23 2012
@@ -102,7 +102,6 @@ public class FastOutputStream extends Ou
 
   /** reserve at least len bytes at the end of the buffer.
    * Invalid if len > buffer.length
-   * @param len
    */
   public void reserve(int len) throws IOException {
     if (len > (buf.length - pos))

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java Sun
Sep 23 19:54:23 2012
@@ -619,10 +619,7 @@ public class JavaBinCodec {
    * collection/array/map In most of the cases the length can be represented in one byte
(length < 127) so it saves 3
    * bytes/object
    *
-   * @param i
-   * @param out
-   *
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public static void writeVInt(int i, FastOutputStream out) throws IOException {
     while ((i & ~0x7F) != 0) {
@@ -633,13 +630,9 @@ public class JavaBinCodec {
   }
 
   /**
-   * The counterpart for the above
-   *
-   * @param in
-   *
-   * @return the int value
+   * The counterpart for {@link #writeVInt(int, FastOutputStream)}
    *
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public static int readVInt(FastInputStream in) throws IOException {
     byte b = in.readByte();

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=1389133&r1=1389132&r2=1389133&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 Sun Sep
23 19:54:23 2012
@@ -97,7 +97,6 @@ public class NamedList<T> implements Clo
    * indexed elements (0,2,4. ..etc) are Strings and odd elements (1,3,5,) are of
    * the type "T".
    *
-   * @param nameValuePairs
    * @return Modified List as per the above description
    * @deprecated This a temporary placeholder method until the guts of the class
    * are actually replaced by List&lt;String, ?&gt;.
@@ -273,8 +272,6 @@ public class NamedList<T> implements Clo
    *
    * Helper class implementing Map.Entry&lt;String, T&gt; to store the key-value
    * relationship in NamedList (the keys of which are String-s) 
-   * 
-   * @param <T>
    */
   public static final class NamedListEntry<T> implements Map.Entry<String, T>
{
 

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java Sun Sep
23 19:54:23 2012
@@ -241,8 +241,6 @@ public class StrUtils {
 
   /**
    * {@link NullPointerException} and {@link SolrException} free version of {@link #parseBool(String)}
-   * @param s
-   * @param def
    * @return parsed boolean value (or def, if s is null or invalid)
    */
   public static boolean parseBool(String s, boolean def) {

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XML.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XML.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XML.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/util/XML.java Sun Sep 23 19:54:23
2012
@@ -71,9 +71,7 @@ public class XML {
 
 /*********
  *
- * @param str
- * @param out
- * @throws IOException
+ * @throws IOException If there is a low-level I/O error.
  */
   public static void escapeCharData(String str, Writer out) throws IOException {
     escape(str, out, chardata_escapes);

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
Sun Sep 23 19:54:23 2012
@@ -719,8 +719,6 @@ public abstract class BaseDistributedSea
    * causing a spelling index not to get built:  both control & shard data would have
no results
    * but because they match the test would pass.  This method gives us a chance to ensure
something
    * exists in the control data.
-   * 
-   * @throws Exception
    */
   public void validateControlData(QueryResponse control) throws Exception {
     /* no-op */

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=1389133&r1=1389132&r2=1389133&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
Sun Sep 23 19:54:23 2012
@@ -280,12 +280,10 @@ public abstract class AbstractFullDistri
   
 
   /**
-   * @param numJettys
    * @param checkCreatedVsState
    *          if true, make sure the number created (numJettys) matches the
    *          number in the cluster state - if you add more jetties this may not
    *          be the case
-   * @throws Exception
    */
   protected List<JettySolrRunner> createJettys(int numJettys, boolean checkCreatedVsState)
throws Exception {
     List<JettySolrRunner> jettys = new ArrayList<JettySolrRunner>();

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java?rev=1389133&r1=1389132&r2=1389133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
Sun Sep 23 19:54:23 2012
@@ -83,7 +83,7 @@ public class ZkTestServer {
     /**
      * Run from a ServerConfig.
      * @param config ServerConfig to use.
-     * @throws IOException
+     * @throws IOException If there is a low-level I/O error.
      */
     public void runFromConfig(ServerConfig config) throws IOException {
       try {
@@ -110,7 +110,7 @@ public class ZkTestServer {
 
     /**
      * Shutdown the serving instance
-     * @throws IOException 
+     * @throws IOException If there is a low-level I/O error.
      */
     protected void shutdown() throws IOException {
       zooKeeperServer.shutdown();
@@ -287,7 +287,7 @@ public class ZkTestServer {
    * @param host the destination host
    * @param port the destination port
    * @param cmd the 4letterword
-   * @throws IOException
+   * @throws IOException If there is a low-level I/O error.
    */
   public static String send4LetterWord(String host, int port, String cmd)
       throws IOException



Mime
View raw message