From b8ee9f8421167e5a76c6051c7f231fc407091ad9 Mon Sep 17 00:00:00 2001 From: "Mark H. Wood" Date: Fri, 3 May 2024 16:46:42 -0400 Subject: [PATCH] Remove dead code. --- .../statistics/SolrLoggerServiceImpl.java | 26 ------------------- .../statistics/service/SolrLoggerService.java | 7 ----- .../statistics/util/SpiderDetector.java | 11 -------- 3 files changed, 44 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java b/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java index 3cfd84457c73..68a73f7d7a67 100644 --- a/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java @@ -1136,32 +1136,6 @@ public QueryResponse query(String query, String filterQuery, String facetField, return response; } - - /** - * String of IP and Ranges in IPTable as a Solr Query - */ - protected String filterQuery = null; - - @Override - public String getIgnoreSpiderIPs() { - if (filterQuery == null) { - StringBuilder query = new StringBuilder(); - boolean first = true; - for (String ip : SpiderDetector.getSpiderIpAddresses()) { - if (first) { - query.append(" AND "); - first = false; - } - - query.append(" NOT(ip: ").append(ip).append(")"); - } - filterQuery = query.toString(); - } - - return filterQuery; - - } - @Override public void shardSolrIndex() throws IOException, SolrServerException { if (!(solr instanceof HttpSolrClient)) { diff --git a/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java b/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java index f359955dc649..74b729c3536a 100644 --- a/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java +++ b/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java @@ -262,13 +262,6 @@ public QueryResponse query(String query, String filterQuery, int facetMinCount, boolean defaultFilterQueries) throws SolrServerException, IOException; - /** - * Returns in a filterQuery string all the ip addresses that should be ignored - * - * @return a string query with ip addresses - */ - public String getIgnoreSpiderIPs(); - public void shardSolrIndex() throws IOException, SolrServerException; public void reindexBitstreamHits(boolean removeDeletedBitstreams) throws Exception; diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java index 316572b80d82..fa5f71e32631 100644 --- a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java +++ b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java @@ -34,17 +34,6 @@ public class SpiderDetector { */ private SpiderDetector() { } - /** - * Get an immutable Set representing all the Spider Addresses here - * - * @return a set of IP addresses as strings - */ - public static Set getSpiderIpAddresses() { - - spiderDetectorService.loadSpiderIpAddresses(); - return spiderDetectorService.getTable().toSet(); - } - /** * Utility method which reads lines from a file & returns them in a Set. *