From 124ebd9c8e1a07d4b2abd7fa1360d281e324035e Mon Sep 17 00:00:00 2001 From: Gregory Seaman Date: Tue, 22 Sep 2015 10:46:58 -0400 Subject: [PATCH] Remove deprecated delete all clusters API from Retrieve and Rank client --- ...RetrieveAndRankSolrClusterDeleteExample.java | 17 ----------------- .../v1/ClusterLifecycleClient.java | 5 ----- .../v1/HttpClusterLifecycleClient.java | 5 ----- .../v1/utils/ClusterLifecycleRestSender.java | 14 -------------- .../v1/utils/RetrieveAndRankMessages.java | 2 +- .../RetrieveAndRankMessages.properties | 2 -- 6 files changed, 1 insertion(+), 44 deletions(-) diff --git a/examples/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankSolrClusterDeleteExample.java b/examples/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankSolrClusterDeleteExample.java index 8e3c1112dc1..127d0bcb819 100644 --- a/examples/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankSolrClusterDeleteExample.java +++ b/examples/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankSolrClusterDeleteExample.java @@ -41,11 +41,6 @@ public class RetrieveAndRankSolrClusterDeleteExample { */ private static String SOLR_CLUSTER_ID = "your-solr-cluster-id"; - /** - * Whether to delete all Solr clusters associated with the service instance - */ - private static boolean DELETE_ALL_SOLR_CLUSTERS = false; - private static HttpClusterLifecycleClient clusterLifecycleClient; public static void main(String[] args) { @@ -53,9 +48,6 @@ public static void main(String[] args) { try { deleteSolrCluster(); - if (DELETE_ALL_SOLR_CLUSTERS) { - deleteAllSolrClusters(); - } } catch (final Exception e) { e.printStackTrace(); } finally { @@ -73,15 +65,6 @@ private static void deleteSolrCluster() { System.out.println("Deleted Solr cluster."); } - /** - * Deletes all Solr clusters associated with this instance of the service. - */ - private static void deleteAllSolrClusters() { - System.out.println("Deleting all Solr clusters..."); - clusterLifecycleClient.deleteSolrClusters(); - System.out.println("Deleted all Solr clusters."); - } - /** * Cleanup the resources created via the example. */ diff --git a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/ClusterLifecycleClient.java b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/ClusterLifecycleClient.java index f33205ee22b..374c7613d75 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/ClusterLifecycleClient.java +++ b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/ClusterLifecycleClient.java @@ -41,11 +41,6 @@ public interface ClusterLifecycleClient { */ void deleteSolrCluster(SolrCluster solrCluster); - /** - * Deletes all Solr clusters currently associated with the service instance. - */ - void deleteSolrClusters(); - /** * Checks whether a provided Solr cluster is ready for use. */ diff --git a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/HttpClusterLifecycleClient.java b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/HttpClusterLifecycleClient.java index 6d00f6e5cee..528ddc89d0c 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/HttpClusterLifecycleClient.java +++ b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/HttpClusterLifecycleClient.java @@ -82,11 +82,6 @@ public void deleteSolrCluster(SolrCluster solrCluster) { clusterLifecycleRestSender.deleteSolrCluster(solrCluster); } - @Override - public void deleteSolrClusters() { - clusterLifecycleRestSender.deleteSolrClusters(); - } - @Override public SolrClusterListResponse listSolrClusters() { return clusterLifecycleRestSender.listSolrClusters(); diff --git a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/ClusterLifecycleRestSender.java b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/ClusterLifecycleRestSender.java index eade22b0284..41cc3782684 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/ClusterLifecycleRestSender.java +++ b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/ClusterLifecycleRestSender.java @@ -87,20 +87,6 @@ public void deleteSolrCluster(SolrCluster solrCluster) { } } - public void deleteSolrClusters() { - final HttpDelete request = new HttpDelete(watsonSearchUrl); - try { - final HttpResponse response = client.execute(request); - - if (!(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK)) { - throw new RuntimeException( - generateErrorMessage(response, RetrieveAndRankMessages.ERROR_DELETING_CLUSTERS_1)); - } - } catch (final IOException e) { - throw new RuntimeException(MSGS.format(ERROR_DELETING_CLUSTERS), e); - } - } - public SolrClusterListResponse listSolrClusters() { final HttpUriRequest request = new HttpGet(watsonSearchUrl); diff --git a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/RetrieveAndRankMessages.java b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/RetrieveAndRankMessages.java index 254587a0e4e..fc048659174 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/RetrieveAndRankMessages.java +++ b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/utils/RetrieveAndRankMessages.java @@ -27,7 +27,7 @@ public enum RetrieveAndRankMessages implements BundleKey { // ClusterLifecycleRestSender ERROR_CREATING_CLUSTER, ERROR_CREATING_CLUSTER_1, ERROR_DELETING_CLUSTER_1, ERROR_DELETING_CLUSTER_2, - ERROR_DELETING_CLUSTERS, ERROR_DELETING_CLUSTERS_1, ERROR_LISTING_CLUSTERS, ERROR_LISTING_CLUSTERS_1, + ERROR_LISTING_CLUSTERS, ERROR_LISTING_CLUSTERS_1, ERROR_POLLING_CLUSTER_1, ERROR_POLLING_CLUSTER_2, ERROR_CAUSE_1, // SolrConfigRestSender diff --git a/src/main/resources/RetrieveAndRankMessages.properties b/src/main/resources/RetrieveAndRankMessages.properties index 8338d085b58..8e01cad8714 100644 --- a/src/main/resources/RetrieveAndRankMessages.properties +++ b/src/main/resources/RetrieveAndRankMessages.properties @@ -26,8 +26,6 @@ ERROR_CREATING_CLUSTER = WRRHC004: Error creating new Solr cluster. ERROR_CREATING_CLUSTER_1 = WRRHC005: Error creating new Solr cluster with status code [{0}]. ERROR_DELETING_CLUSTER_1 = WRRHC006: Error deleting Solr cluster ID [{0}]. ERROR_DELETING_CLUSTER_2 = WRRHC007: Error deleting Solr cluster ID [{0}] with status code [{1}]. -ERROR_DELETING_CLUSTERS = WRRHC008: Error deleting Solr clusters. -ERROR_DELETING_CLUSTERS_1 = WRRHC009: Error deleting Solr clusters with status code [{0}]. ERROR_LISTING_CLUSTERS = WRRHC010: Error listing Solr clusters. ERROR_LISTING_CLUSTERS_1 = WRRHC011: Error listing Solr clusters with status code [{0}]. ERROR_POLLING_CLUSTER_1 = WRRHC0012: Error polling Solr cluster ID [{0}].