You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/07/02 17:22:58 UTC
[lucene-solr] branch branch_8x updated: SOLR-14066,
SOLR-14022: Fix compilation issues with JDK8,
which doesn't support since with @Deprecated
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 7326be6 SOLR-14066, SOLR-14022: Fix compilation issues with JDK8, which doesn't support since with @Deprecated
7326be6 is described below
commit 7326be6406014a15de8325629c9eb326f59ea366
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Thu Jul 2 22:52:08 2020 +0530
SOLR-14066, SOLR-14022: Fix compilation issues with JDK8, which doesn't support since with @Deprecated
---
.../src/java/org/apache/solr/handler/dataimport/DataImportHandler.java | 2 +-
solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java | 2 +-
solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java | 2 +-
solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java | 2 +-
solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java | 2 +-
solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java | 2 +-
solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java | 2 +-
solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java | 2 +-
.../src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
index a1fbcc2..fc26adc 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
@@ -66,7 +66,7 @@ import static org.apache.solr.handler.dataimport.DataImporter.IMPORT_CMD;
* @deprecated since 8.6
* @since solr 1.3
*/
-@Deprecated(since = "8.6")
+@Deprecated
public class DataImportHandler extends RequestHandlerBase implements
SolrCoreAware {
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java
index 49d19f1..5084787 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java
@@ -34,7 +34,7 @@ import java.nio.charset.Charset;
* through Zookeeper. The state of the buffer is stored in the zk node defined by {@link #getZnodePath()}.
* @deprecated since 8.6
*/
-@Deprecated(since = "8.6")
+@Deprecated
class CdcrBufferStateManager extends CdcrStateManager {
private CdcrParams.BufferState state = DEFAULT_STATE;
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java
index c9bc5fd..06cebbc 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* </p>
* @deprecated since 8.6
*/
-@Deprecated(since = "8.6")
+@Deprecated
class CdcrLeaderStateManager extends CdcrStateManager {
private boolean amILeader = false;
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java
index 6506030..80776ae 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* </p>
* @deprecated since 8.6
*/
-@Deprecated(since = "8.6")
+@Deprecated
class CdcrProcessStateManager extends CdcrStateManager {
private CdcrParams.ProcessState state = DEFAULT_STATE;
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
index 936750e..af5d057 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
@@ -41,7 +41,7 @@ import static org.apache.solr.common.params.CommonParams.VERSION_FIELD;
* will be tried again later.
* @deprecated since 8.6
*/
-@Deprecated(since = "8.6")
+@Deprecated
public class CdcrReplicator implements Runnable {
private final CdcrReplicatorState state;
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java
index 1f9d1f9..c5881c7 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.handler.admin.CoreAdminHandler.RESPONSE_STATUS;
-@Deprecated(since = "8.6")
+@Deprecated
class CdcrReplicatorManager implements CdcrStateManager.CdcrStateObserver {
private static final int MAX_BOOTSTRAP_ATTEMPTS = 5;
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
index 8e77a84..d50d39a 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
@@ -109,7 +109,7 @@ import static org.apache.solr.handler.admin.CoreAdminHandler.RUNNING;
* </p>
* @deprecated since 8.6
*/
-@Deprecated(since = "8.6")
+@Deprecated
public class CdcrRequestHandler extends RequestHandlerBase implements SolrCoreAware {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java b/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java
index 86cee71..64b8c14 100644
--- a/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java
+++ b/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
* </ul>
* @deprecated since 8.6
*/
-@Deprecated(since = "8.6")
+@Deprecated
public class CdcrTransactionLog extends TransactionLog {
private boolean isReplaying;
diff --git a/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java
index 180784a..4ea4232 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* </p>
* @deprecated since 8.6
*/
-@Deprecated(since = "8.6")
+@Deprecated
public class CdcrUpdateProcessor extends DistributedZkUpdateProcessor {
public static final String CDCR_UPDATE = "cdcr.update";