You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/07/17 21:12:57 UTC
[22/48] lucene-solr:jira/lucene-2562: LUCENE-8345 - add wrapper class
constructors to forbiddenapis
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
index 05cbe17..7b0e613 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java
@@ -126,12 +126,12 @@ public class TestSortedMapBackedCache extends AbstractDIHCacheTestCase {
int j = 0;
for (int i = 0; i < data.size(); i++) {
// We'll be deleting a_id=1 so remove it from the control data.
- if (data.get(i).data[0].equals(new Integer(1))) {
+ if (data.get(i).data[0].equals(1)) {
continue;
}
// We'll be changing "Cookie" to "Carrot" in a_id=3 so change it in the control data.
- if (data.get(i).data[0].equals(new Integer(3))) {
+ if (data.get(i).data[0].equals(3)) {
newIdEqualsThree = new Object[data.get(i).data.length];
System.arraycopy(data.get(i).data, 0, newIdEqualsThree, 0, newIdEqualsThree.length);
newIdEqualsThree[3] = "Carrot";
@@ -146,8 +146,8 @@ public class TestSortedMapBackedCache extends AbstractDIHCacheTestCase {
}
// These new rows of data will get added to the cache, so add them to the control data too.
- Object[] newDataRow1 = new Object[] { new Integer(99), new BigDecimal(Math.PI), "Z", "Zebra", new Float(99.99), Feb21_2011, null };
- Object[] newDataRow2 = new Object[] { new Integer(2), new BigDecimal(Math.PI), "B", "Ballerina", new Float(2.22), Feb21_2011, null };
+ Object[] newDataRow1 = new Object[] {99, new BigDecimal(Math.PI), "Z", "Zebra", 99.99f, Feb21_2011, null };
+ Object[] newDataRow2 = new Object[] {2, new BigDecimal(Math.PI), "B", "Ballerina", 2.22f, Feb21_2011, null };
newControlData.add(new ControlData(newDataRow1));
newControlData.add(new ControlData(newDataRow2));
@@ -156,11 +156,11 @@ public class TestSortedMapBackedCache extends AbstractDIHCacheTestCase {
cache.open(getContext(new HashMap<String,String>()));
// Delete a_id=1 from the cache.
- cache.delete(new Integer(1));
+ cache.delete(1);
// Because the cache allows duplicates, the only way to update is to
// delete first then add.
- cache.delete(new Integer(3));
+ cache.delete(3);
cache.add(controlDataToMap(new ControlData(newIdEqualsThree), fieldNames, false));
// Add this row with a new Primary key.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
index b6e46cf..2662490 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java
@@ -177,7 +177,7 @@ public class LTRRescorer extends Rescorer {
scorer.docID();
scorer.iterator().advance(targetDoc);
- scorer.getDocInfo().setOriginalDocScore(new Float(hit.score));
+ scorer.getDocInfo().setOriginalDocScore(hit.score);
hit.score = scorer.score();
if (hitUpto < topN) {
reranked[hitUpto] = hit;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java
index 5080edf..94eacab 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/LinearModel.java
@@ -78,7 +78,7 @@ public class LinearModel extends LTRScoringModel {
for (int ii = 0; ii < features.size(); ++ii) {
final String key = features.get(ii).getName();
final Double val = modelWeights.get(key);
- featureToWeight[ii] = (val == null ? null : new Float(val.floatValue()));
+ featureToWeight[ii] = (val == null ? null : val.floatValue());
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java
index 23d4886..a626189 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.java
@@ -246,11 +246,11 @@ public class MultipleAdditiveTreesModel extends LTRScoringModel {
private RegressionTreeNode root;
public void setWeight(float weight) {
- this.weight = new Float(weight);
+ this.weight = weight;
}
public void setWeight(String weight) {
- this.weight = new Float(weight);
+ this.weight = Float.valueOf(weight);
}
public void setRoot(Object root) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
index c542d00..0e84009 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
@@ -256,7 +256,7 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
@Override
public void transform(SolrDocument doc, int docid, float score)
throws IOException {
- implTransform(doc, docid, new Float(score));
+ implTransform(doc, docid, score);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
index de97894..e0708b9 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java
@@ -279,7 +279,7 @@ public class TestLTRReRankingPipeline extends LuceneTestCase {
LTRScoringQuery query = new LTRScoringQuery(ltrScoringModel);
LTRScoringQuery.ModelWeight wgt = query.createWeight(null, ScoreMode.COMPLETE, 1f);
LTRScoringQuery.ModelWeight.ModelScorer modelScr = wgt.scorer(null);
- modelScr.getDocInfo().setOriginalDocScore(new Float(1f));
+ modelScr.getDocInfo().setOriginalDocScore(1f);
for (final Scorer.ChildScorer feat : modelScr.getChildren()) {
assertNotNull(((Feature.FeatureWeight.FeatureScorer) feat.child).getDocInfo().getOriginalDocScore());
}
@@ -295,7 +295,7 @@ public class TestLTRReRankingPipeline extends LuceneTestCase {
query = new LTRScoringQuery(ltrScoringModel);
wgt = query.createWeight(null, ScoreMode.COMPLETE, 1f);
modelScr = wgt.scorer(null);
- modelScr.getDocInfo().setOriginalDocScore(new Float(1f));
+ modelScr.getDocInfo().setOriginalDocScore(1f);
for (final Scorer.ChildScorer feat : modelScr.getChildren()) {
assertNotNull(((Feature.FeatureWeight.FeatureScorer) feat.child).getDocInfo().getOriginalDocScore());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
index 7658f62..311b544 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
@@ -44,28 +44,28 @@ public class TestFeatureExtractionFromMultipleSegments extends TestRerankBase {
setuptest("solrconfig-multiseg.xml", "schema.xml");
// index 400 documents
for(int i = 0; i<400;i=i+20) {
- assertU(adoc("id", new Integer(i).toString(), "popularity", "201", "description", "apple is a company " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+1).toString(), "popularity", "201", "description", "d " + randomString(i%6+3), "normHits", "0.11"));
+ assertU(adoc("id", Integer.toString(i), "popularity", "201", "description", "apple is a company " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+1), "popularity", "201", "description", "d " + randomString(i%6+3), "normHits", "0.11"));
- assertU(adoc("id", new Integer(i+2).toString(), "popularity", "201", "description", "apple is a company too " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+3).toString(), "popularity", "201", "description", "new york city is big apple " + randomString(i%6+3), "normHits", "0.11"));
+ assertU(adoc("id", Integer.toString(i+2), "popularity", "201", "description", "apple is a company too " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+3), "popularity", "201", "description", "new york city is big apple " + randomString(i%6+3), "normHits", "0.11"));
- assertU(adoc("id", new Integer(i+6).toString(), "popularity", "301", "description", "function name " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+7).toString(), "popularity", "301", "description", "function " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+6), "popularity", "301", "description", "function name " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+7), "popularity", "301", "description", "function " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+8).toString(), "popularity", "301", "description", "This is a sample function for testing " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+9).toString(), "popularity", "301", "description", "Function to check out stock prices "+randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+10).toString(),"popularity", "301", "description", "Some descriptions "+randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+8), "popularity", "301", "description", "This is a sample function for testing " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+9), "popularity", "301", "description", "Function to check out stock prices "+randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+10),"popularity", "301", "description", "Some descriptions "+randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+11).toString(), "popularity", "201", "description", "apple apple is a company " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+12).toString(), "popularity", "201", "description", "Big Apple is New York.", "normHits", "0.01"));
- assertU(adoc("id", new Integer(i+13).toString(), "popularity", "201", "description", "New some York is Big. "+ randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+11), "popularity", "201", "description", "apple apple is a company " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+12), "popularity", "201", "description", "Big Apple is New York.", "normHits", "0.01"));
+ assertU(adoc("id", Integer.toString(i+13), "popularity", "201", "description", "New some York is Big. "+ randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+14).toString(), "popularity", "201", "description", "apple apple is a company " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+15).toString(), "popularity", "201", "description", "Big Apple is New York.", "normHits", "0.01"));
- assertU(adoc("id", new Integer(i+16).toString(), "popularity", "401", "description", "barack h", "normHits", "0.0"));
- assertU(adoc("id", new Integer(i+17).toString(), "popularity", "201", "description", "red delicious apple " + randomString(i%6+3), "normHits", "0.1"));
- assertU(adoc("id", new Integer(i+18).toString(), "popularity", "201", "description", "nyc " + randomString(i%6+3), "normHits", "0.11"));
+ assertU(adoc("id", Integer.toString(i+14), "popularity", "201", "description", "apple apple is a company " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+15), "popularity", "201", "description", "Big Apple is New York.", "normHits", "0.01"));
+ assertU(adoc("id", Integer.toString(i+16), "popularity", "401", "description", "barack h", "normHits", "0.0"));
+ assertU(adoc("id", Integer.toString(i+17), "popularity", "201", "description", "red delicious apple " + randomString(i%6+3), "normHits", "0.1"));
+ assertU(adoc("id", Integer.toString(i+18), "popularity", "201", "description", "nyc " + randomString(i%6+3), "normHits", "0.11"));
}
assertU(commit());
@@ -85,7 +85,7 @@ public class TestFeatureExtractionFromMultipleSegments extends TestRerankBase {
query.setQuery("{!edismax qf='description^1' boost='sum(product(pow(normHits, 0.7), 1600), .1)' v='apple'}");
// request 100 rows, if any rows are fetched from the second or subsequent segments the tests should succeed if LTRRescorer::extractFeaturesInfo() advances the doc iterator properly
int numRows = 100;
- query.add("rows", (new Integer(numRows)).toString());
+ query.add("rows", Integer.toString(numRows));
query.add("wt", "json");
query.add("fq", "popularity:201");
query.add("fl", "*, score,id,normHits,description,fv:[features store='feature-store-6' format='dense' efi.user_text='apple']");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
index d17d3d6..e4aabb0 100644
--- a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
@@ -461,7 +461,7 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory implements Sol
}
synchronized (HdfsDirectoryFactory.class) {
if (kerberosInit == null) {
- kerberosInit = new Boolean(true);
+ kerberosInit = Boolean.TRUE;
final Configuration conf = getConf();
final String authVal = conf.get(HADOOP_SECURITY_AUTHENTICATION);
final String kerberos = "kerberos";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
index d26a0db..4b4145d 100644
--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -574,7 +574,7 @@ public class IndexFetcher {
reloadCore = true; // reload update log
}
final long timeTakenSeconds = getReplicationTimeElapsed();
- final Long bytesDownloadedPerSecond = (timeTakenSeconds != 0 ? new Long(bytesDownloaded/timeTakenSeconds) : null);
+ final Long bytesDownloadedPerSecond = (timeTakenSeconds != 0 ? Long.valueOf(bytesDownloaded / timeTakenSeconds) : null);
LOG.info("Total time taken for download (fullCopy={},bytesDownloaded={}) : {} secs ({} bytes/sec) to {}",
isFullCopyNeeded, bytesDownloaded, timeTakenSeconds, bytesDownloadedPerSecond, tmpIndexDir);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
index 8d47a93..144d1b1 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java
@@ -666,7 +666,7 @@ public class RangeFacetRequest extends FacetComponent.FacetBase {
@Override
public Float parseAndAddGap(Float value, String gap) {
- return new Float(value.floatValue() + Float.parseFloat(gap));
+ return value.floatValue() + Float.parseFloat(gap);
}
}
@@ -684,7 +684,7 @@ public class RangeFacetRequest extends FacetComponent.FacetBase {
@Override
public Double parseAndAddGap(Double value, String gap) {
- return new Double(value.doubleValue() + Double.parseDouble(gap));
+ return value.doubleValue() + Double.parseDouble(gap);
}
}
@@ -702,7 +702,7 @@ public class RangeFacetRequest extends FacetComponent.FacetBase {
@Override
public Integer parseAndAddGap(Integer value, String gap) {
- return new Integer(value.intValue() + Integer.parseInt(gap));
+ return value.intValue() + Integer.parseInt(gap);
}
}
@@ -720,7 +720,7 @@ public class RangeFacetRequest extends FacetComponent.FacetBase {
@Override
public Long parseAndAddGap(Long value, String gap) {
- return new Long(value.longValue() + Long.parseLong(gap));
+ return value.longValue() + Long.parseLong(gap);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
index e81ed85..4cb95c2 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
@@ -419,7 +419,7 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar
result = new ArrayList<>(vals.length);
for (int i = 0; i < vals.length; i++) {
try {
- result.add(new Integer(vals[i]));
+ result.add(Integer.valueOf(vals[i]));
} catch (NumberFormatException e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
index 250b37d..98ef787 100644
--- a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
@@ -177,7 +177,7 @@ public abstract class TextResponseWriter implements TextWriter {
DocList ids = res.getDocList();
Iterator<SolrDocument> docsStreamer = res.getProcessedDocuments();
writeStartDocumentList(name, ids.offset(), ids.size(), ids.matches(),
- res.wantsScores() ? new Float(ids.maxScore()) : null);
+ res.wantsScores() ? ids.maxScore() : null);
int idx = 0;
while (docsStreamer.hasNext()) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
index 6366a9b..e183a02 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java
@@ -541,7 +541,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
}
@Override
public Float parseAndAddGap(Comparable value, String gap) {
- return new Float(((Number)value).floatValue() + Float.parseFloat(gap));
+ return ((Number) value).floatValue() + Float.parseFloat(gap);
}
}
private static class DoubleCalc extends Calc {
@@ -566,7 +566,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
}
@Override
public Double parseAndAddGap(Comparable value, String gap) {
- return new Double(((Number)value).doubleValue() + Double.parseDouble(gap));
+ return ((Number) value).doubleValue() + Double.parseDouble(gap);
}
}
private static class IntCalc extends Calc {
@@ -582,7 +582,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
}
@Override
public Integer parseAndAddGap(Comparable value, String gap) {
- return new Integer(((Number)value).intValue() + Integer.parseInt(gap));
+ return ((Number) value).intValue() + Integer.parseInt(gap);
}
}
private static class LongCalc extends Calc {
@@ -594,7 +594,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
}
@Override
public Long parseAndAddGap(Comparable value, String gap) {
- return new Long(((Number)value).longValue() + Long.parseLong(gap));
+ return ((Number) value).longValue() + Long.parseLong(gap);
}
}
private static class DateCalc extends Calc {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/security/RequestContinuesRecorderAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/security/RequestContinuesRecorderAuthenticationHandler.java b/solr/core/src/java/org/apache/solr/security/RequestContinuesRecorderAuthenticationHandler.java
index 95591ca..344f805 100644
--- a/solr/core/src/java/org/apache/solr/security/RequestContinuesRecorderAuthenticationHandler.java
+++ b/solr/core/src/java/org/apache/solr/security/RequestContinuesRecorderAuthenticationHandler.java
@@ -60,7 +60,7 @@ public class RequestContinuesRecorderAuthenticationHandler implements Authentica
HttpServletResponse response)
throws IOException, AuthenticationException {
boolean result = authHandler.managementOperation(token, request, response);
- request.setAttribute(RequestContinuesRecorderAuthenticationHandler.REQUEST_CONTINUES_ATTR, new Boolean(result).toString());
+ request.setAttribute(RequestContinuesRecorderAuthenticationHandler.REQUEST_CONTINUES_ATTR, Boolean.toString(result));
return result;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/java/org/apache/solr/util/SolrCLI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index 25d0c7b..dc239f1 100755
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -3339,7 +3339,7 @@ public class SolrCLI {
int attempts = 3;
while (value != null && --attempts > 0) {
try {
- inputAsInt = new Integer(value);
+ inputAsInt = Integer.valueOf(value);
if (min != null) {
if (inputAsInt < min) {
@@ -4349,8 +4349,8 @@ public class SolrCLI {
out("Rotating solr logs, keeping a max of "+generations+" generations");
try (Stream<Path> files = Files.find(logsPath, 1,
(f, a) -> a.isRegularFile() && String.valueOf(f.getFileName()).startsWith("solr.log."))
- .sorted((b,a) -> new Integer(a.getFileName().toString().substring(9))
- .compareTo(new Integer(b.getFileName().toString().substring(9))))) {
+ .sorted((b,a) -> Integer.valueOf(a.getFileName().toString().substring(9))
+ .compareTo(Integer.valueOf(b.getFileName().toString().substring(9))))) {
files.forEach(p -> {
try {
int number = Integer.parseInt(p.getFileName().toString().substring(9));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
index 8a29db6..89c6a17 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -289,9 +289,9 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
"facet.range.end",900,
"facet.range.other","all");
assertEquals(tlong, response.getFacetRanges().get(0).getName());
- assertEquals(new Integer(6), response.getFacetRanges().get(0).getBefore());
- assertEquals(new Integer(5), response.getFacetRanges().get(0).getBetween());
- assertEquals(new Integer(2), response.getFacetRanges().get(0).getAfter());
+ assertEquals(6, response.getFacetRanges().get(0).getBefore());
+ assertEquals(5, response.getFacetRanges().get(0).getBetween());
+ assertEquals(2, response.getFacetRanges().get(0).getAfter());
// Test mincounts. Do NOT want to go through all the stuff where with validateControlData in query() method
// Purposely packing a _bunch_ of stuff together here to insure that the proper level of mincount is used for
@@ -448,7 +448,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
// long
FieldStatsInfo s = rsp.getFieldStatsInfo().get(tlong);
assertNotNull("missing stats", s);
- assertEquals("wrong cardinality", new Long(13), s.getCardinality());
+ assertEquals("wrong cardinality", Long.valueOf(13), s.getCardinality());
//
assertNull("expected null for min", s.getMin());
assertNull("expected null for mean", s.getMean());
@@ -464,7 +464,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
// string
s = rsp.getFieldStatsInfo().get(oddField);
assertNotNull("missing stats", s);
- assertEquals("wrong cardinality", new Long(1), s.getCardinality());
+ assertEquals("wrong cardinality", Long.valueOf(1), s.getCardinality());
//
assertNull("expected null for min", s.getMin());
assertNull("expected null for mean", s.getMean());
@@ -727,7 +727,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
assertNotNull(p+" no stats for " + i1, s);
//
assertEquals(p+" wrong min", -987.0D, (Double)s.getMin(), 0.0001D );
- assertEquals(p+" wrong calcDistinct", new Long(13), s.getCountDistinct());
+ assertEquals(p+" wrong calcDistinct", Long.valueOf(13), s.getCountDistinct());
assertNotNull(p+" expected non-null list for distinct vals", s.getDistinctValues());
assertEquals(p+" expected list for distinct vals", 13, s.getDistinctValues().size());
//
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index 5db2de9..f0477ab 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -710,7 +710,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
protected void assertDocNotExists(HttpSolrClient solr, String coll, String docId) throws Exception {
NamedList rsp = realTimeGetDocId(solr, docId);
- String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), new Integer(docId));
+ String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), Integer.valueOf(docId));
assertTrue("Doc with id=" + docId + " is found in " + solr.getBaseURL()
+ " due to: " + match + "; rsp="+rsp, match != null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
index 5e0bccd..3074106 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
@@ -61,7 +61,7 @@ class SegmentTerminateEarlyTestState {
for (int cc = 1; cc <= numCommits; ++cc) {
for (int nn = 1; nn <= numDocsPerCommit; ++nn) {
++numDocs;
- final Integer docKey = new Integer(numDocs);
+ final Integer docKey = numDocs;
SolrInputDocument doc = new SolrInputDocument();
doc.setField(KEY_FIELD, ""+docKey);
final int MM = rand.nextInt(60); // minutes
@@ -69,17 +69,17 @@ class SegmentTerminateEarlyTestState {
if (minTimestampMM != null && MM < minTimestampMM.intValue()) {
minTimestampDocKeys.clear();
}
- minTimestampMM = new Integer(MM);
+ minTimestampMM = MM;
minTimestampDocKeys.add(docKey);
}
if (maxTimestampMM == null || maxTimestampMM.intValue() <= MM) {
if (maxTimestampMM != null && maxTimestampMM.intValue() < MM) {
maxTimestampDocKeys.clear();
}
- maxTimestampMM = new Integer(MM);
+ maxTimestampMM = MM;
maxTimestampDocKeys.add(docKey);
}
- doc.setField(TIMESTAMP_FIELD, (Integer)MM);
+ doc.setField(TIMESTAMP_FIELD, MM);
doc.setField(ODD_FIELD, ""+(numDocs % 2));
doc.setField(QUAD_FIELD, ""+(numDocs % 4)+1);
cloudSolrClient.add(doc);
@@ -94,7 +94,7 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescending(CloudSolrClient cloudSolrClient) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
TestSegmentSorting.assertTrue("numDocs="+numDocs+" is not even", (numDocs%2)==0);
- final Long oddFieldValue = new Long(maxTimestampDocKeys.iterator().next().intValue()%2);
+ final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next().intValue() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD +":"+oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
query.setFields(KEY_FIELD, ODD_FIELD, TIMESTAMP_FIELD);
@@ -120,13 +120,13 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescendingSegmentTerminateEarlyYes(CloudSolrClient cloudSolrClient) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
TestSegmentSorting.assertTrue("numDocs="+numDocs+" is not even", (numDocs%2)==0);
- final Long oddFieldValue = new Long(maxTimestampDocKeys.iterator().next().intValue()%2);
+ final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next().intValue() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD +":"+oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
query.setFields(KEY_FIELD, ODD_FIELD, TIMESTAMP_FIELD);
final int rowsWanted = 1;
query.setRows(rowsWanted);
- final Boolean shardsInfoWanted = (rand.nextBoolean() ? null : new Boolean(rand.nextBoolean()));
+ final Boolean shardsInfoWanted = (rand.nextBoolean() ? null : rand.nextBoolean());
if (shardsInfoWanted != null) {
query.set(ShardParams.SHARDS_INFO, shardsInfoWanted.booleanValue());
}
@@ -170,12 +170,12 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescendingSegmentTerminateEarlyNo(CloudSolrClient cloudSolrClient) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
TestSegmentSorting.assertTrue("numDocs="+numDocs+" is not even", (numDocs%2)==0);
- final Long oddFieldValue = new Long(maxTimestampDocKeys.iterator().next().intValue()%2);
+ final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next().intValue() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD +":"+oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
query.setFields(KEY_FIELD, ODD_FIELD, TIMESTAMP_FIELD);
query.setRows(1);
- final Boolean shardsInfoWanted = (rand.nextBoolean() ? null : new Boolean(rand.nextBoolean()));
+ final Boolean shardsInfoWanted = (rand.nextBoolean() ? null : rand.nextBoolean());
if (shardsInfoWanted != null) {
query.set(ShardParams.SHARDS_INFO, shardsInfoWanted.booleanValue());
}
@@ -217,7 +217,7 @@ class SegmentTerminateEarlyTestState {
void queryTimestampDescendingSegmentTerminateEarlyYesGrouped(CloudSolrClient cloudSolrClient) throws Exception {
TestSegmentSorting.assertFalse(maxTimestampDocKeys.isEmpty());
TestSegmentSorting.assertTrue("numDocs="+numDocs+" is not even", (numDocs%2)==0);
- final Long oddFieldValue = new Long(maxTimestampDocKeys.iterator().next().intValue()%2);
+ final Long oddFieldValue = (long) (maxTimestampDocKeys.iterator().next().intValue() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD +":"+oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.desc);
query.setFields(KEY_FIELD, ODD_FIELD, TIMESTAMP_FIELD);
@@ -247,7 +247,7 @@ class SegmentTerminateEarlyTestState {
void queryTimestampAscendingSegmentTerminateEarlyYes(CloudSolrClient cloudSolrClient) throws Exception {
TestSegmentSorting.assertFalse(minTimestampDocKeys.isEmpty());
TestSegmentSorting.assertTrue("numDocs="+numDocs+" is not even", (numDocs%2)==0);
- final Long oddFieldValue = new Long(minTimestampDocKeys.iterator().next().intValue()%2);
+ final Long oddFieldValue = (long) (minTimestampDocKeys.iterator().next().intValue() % 2);
final SolrQuery query = new SolrQuery(ODD_FIELD +":"+oddFieldValue);
query.setSort(TIMESTAMP_FIELD, SolrQuery.ORDER.asc); // a sort order that is _not_ compatible with the merge sort order
query.setFields(KEY_FIELD, ODD_FIELD, TIMESTAMP_FIELD);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
index 02573b2..b181b49 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java
@@ -204,10 +204,10 @@ public class SolrCloudExampleTest extends AbstractFullDistribZkTestBase {
Map<String, Object> configJson = SolrCLI.getJson(configUrl);
Object maxTimeFromConfig = SolrCLI.atPath("/config/updateHandler/autoSoftCommit/maxTime", configJson);
assertNotNull(maxTimeFromConfig);
- assertEquals(new Long(-1L), maxTimeFromConfig);
+ assertEquals(-1L, maxTimeFromConfig);
String prop = "updateHandler.autoSoftCommit.maxTime";
- Long maxTime = new Long(3000L);
+ Long maxTime = 3000L;
String[] args = new String[]{
"-collection", testCollectionName,
"-property", prop,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
index a02ac28..2b7a62c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudPivotFacet.java
@@ -753,25 +753,25 @@ public class TestCloudPivotFacet extends AbstractFullDistribZkTestBase {
private void sanityCheckAssertNumerics() {
assertNumerics("Null?", null, null);
- assertNumerics("large a",
- new Double(2.3005390038169265E9),
- new Double(2.300539003816927E9));
+ assertNumerics("large a",
+ 2.3005390038169265E9,
+ 2.300539003816927E9);
assertNumerics("large b",
- new Double(1.2722582464444444E9),
- new Double(1.2722582464444442E9));
- assertNumerics("small",
- new Double(2.3005390038169265E-9),
- new Double(2.300539003816927E-9));
+ 1.2722582464444444E9,
+ 1.2722582464444442E9);
+ assertNumerics("small",
+ 2.3005390038169265E-9,
+ 2.300539003816927E-9);
- assertNumerics("large a negative",
- new Double(-2.3005390038169265E9),
- new Double(-2.300539003816927E9));
+ assertNumerics("large a negative",
+ -2.3005390038169265E9,
+ -2.300539003816927E9);
assertNumerics("large b negative",
- new Double(-1.2722582464444444E9),
- new Double(-1.2722582464444442E9));
- assertNumerics("small negative",
- new Double(-2.3005390038169265E-9),
- new Double(-2.300539003816927E-9));
+ -1.2722582464444444E9,
+ -1.2722582464444442E9);
+ assertNumerics("small negative",
+ -2.3005390038169265E-9,
+ -2.300539003816927E-9);
assertNumerics("high long", Long.MAX_VALUE, Long.MAX_VALUE);
assertNumerics("high int", Integer.MAX_VALUE, Integer.MAX_VALUE);
@@ -804,15 +804,15 @@ public class TestCloudPivotFacet extends AbstractFullDistribZkTestBase {
} catch (AssertionError e) {}
try {
- assertNumerics("diff",
- new Double(2.3005390038169265E9),
- new Double(2.267272520100462E9));
+ assertNumerics("diff",
+ 2.3005390038169265E9,
+ 2.267272520100462E9);
throw new RuntimeException("did not get assertion failure when args are big & too diff");
} catch (AssertionError e) {}
try {
- assertNumerics("diff",
- new Double(2.3005390038169265E-9),
- new Double(2.267272520100462E-9));
+ assertNumerics("diff",
+ 2.3005390038169265E-9,
+ 2.267272520100462E-9);
throw new RuntimeException("did not get assertion failure when args are small & too diff");
} catch (AssertionError e) {}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
index 5c7bd50..4317736 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
@@ -105,7 +105,7 @@ public class TestSolrCloudWithKerberosAlt extends SolrCloudTestCase {
System.setProperty("authenticationPlugin", "org.apache.solr.security.KerberosPlugin");
boolean enableDt = random().nextBoolean();
log.info("Enable delegation token: " + enableDt);
- System.setProperty("solr.kerberos.delegation.token.enabled", new Boolean(enableDt).toString());
+ System.setProperty("solr.kerberos.delegation.token.enabled", Boolean.toString(enableDt));
// Extracts 127.0.0.1 from HTTP/127.0.0.1@EXAMPLE.COM
System.setProperty("solr.kerberos.name.rules", "RULE:[1:$1@$0](.*EXAMPLE.COM)s/@.*//"
+ "\nRULE:[2:$2@$0](.*EXAMPLE.COM)s/@.*//"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
index 2b52720..b87c94c 100644
--- a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
+++ b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
@@ -34,9 +34,9 @@ public abstract class AnalysisRequestHandlerTestBase extends SolrTestCaseJ4 {
assertEquals(info.getRawText(), token.get("raw_text"));
}
assertEquals(info.getType(), token.get("type"));
- assertEquals(new Integer(info.getStart()), token.get("start"));
- assertEquals(new Integer(info.getEnd()), token.get("end"));
- assertEquals(new Integer(info.getPosition()), token.get("position"));
+ assertEquals(info.getStart(), token.get("start"));
+ assertEquals(info.getEnd(), token.get("end"));
+ assertEquals(info.getPosition(), token.get("position"));
assertArrayEquals(info.getPositionHistory(), ArrayUtils.toPrimitive((Integer[]) token.get("positionHistory")));
if (info.isMatch()) {
assertEquals(Boolean.TRUE, token.get("match"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java b/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java
index 0d33d11..d53d218 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.component;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.lucene.util.TestUtil;
+import org.apache.solr.common.util.SuppressForbidden;
import java.util.List;
import java.util.Arrays;
@@ -86,6 +87,7 @@ public class TestPivotHelperCode extends SolrTestCaseJ4{
}
+ @SuppressForbidden(reason = "Checking object equality for Long instance")
public void testCompareWithNullLast() throws Exception {
Long a = random().nextLong();
Long b = random().nextLong();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java
index 69d135c..751bd94 100644
--- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java
+++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyTerms.java
@@ -56,8 +56,8 @@ public class TestLegacyTerms extends LuceneTestCase {
IndexReader r = w.getReader();
Terms terms = MultiFields.getTerms(r, "field");
- assertEquals(new Integer(minValue), LegacyNumericUtils.getMinInt(terms));
- assertEquals(new Integer(maxValue), LegacyNumericUtils.getMaxInt(terms));
+ assertEquals(Integer.valueOf(minValue), LegacyNumericUtils.getMinInt(terms));
+ assertEquals(Integer.valueOf(maxValue), LegacyNumericUtils.getMaxInt(terms));
r.close();
w.close();
@@ -87,8 +87,8 @@ public class TestLegacyTerms extends LuceneTestCase {
IndexReader r = w.getReader();
Terms terms = MultiFields.getTerms(r, "field");
- assertEquals(new Long(minValue), LegacyNumericUtils.getMinLong(terms));
- assertEquals(new Long(maxValue), LegacyNumericUtils.getMaxLong(terms));
+ assertEquals(Long.valueOf(minValue), LegacyNumericUtils.getMinLong(terms));
+ assertEquals(Long.valueOf(maxValue), LegacyNumericUtils.getMaxLong(terms));
r.close();
w.close();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
index 1f87786..49b70b9 100644
--- a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
@@ -1530,9 +1530,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
final String meta = pre + "/../";
String start = "0.0";
- String gap = (new Double( (double)Float.MAX_VALUE )).toString();
- String end = (new Double( ((double)Float.MAX_VALUE) * 3D )).toString();
- String mid = (new Double( ((double)Float.MAX_VALUE) * 2D )).toString();
+ String gap = Double.toString(Float.MAX_VALUE );
+ String end = Double.toString(((double) Float.MAX_VALUE) * 3D);
+ String mid = Double.toString(((double) Float.MAX_VALUE) * 2D);
assertQ(f+": checking counts for lower",
req( "q", "id_i1:[30 TO 60]"
@@ -1807,9 +1807,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
final String meta = pre + "/../";
String start = "0";
- String gap = (new Long( (long)Integer.MAX_VALUE )).toString();
- String end = (new Long( ((long)Integer.MAX_VALUE) * 3L )).toString();
- String mid = (new Long( ((long)Integer.MAX_VALUE) * 2L )).toString();
+ String gap = Long.toString(Integer.MAX_VALUE );
+ String end = Long.toString( ((long)Integer.MAX_VALUE) * 3L );
+ String mid = Long.toString(((long)Integer.MAX_VALUE) * 2L );
assertQ(f+": checking counts for lower",
req( "q", "id_i1:[30 TO 60]"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
index 06f18fc..ef3718d 100644
--- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
@@ -396,7 +396,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
assertTrue(!usedcollations.contains(multipleCollation));
usedcollations.add(multipleCollation);
- assertEquals(new Long(1L), expandedCollation.get("hits"));
+ assertEquals(1L, expandedCollation.get("hits"));
NamedList misspellingsAndCorrections = (NamedList) expandedCollation.get("misspellingsAndCorrections");
assertTrue(misspellingsAndCorrections.size() == 3);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
index 62df017..43a84e6 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
@@ -146,8 +146,8 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
doc = new SolrInputDocument();
doc.setField("id", "1001");
List<Long> removeList = new ArrayList<Long>();
- removeList.add(new Long(222));
- removeList.add(new Long(333));
+ removeList.add(222L);
+ removeList.add(333L);
doc.setField("intRemove", ImmutableMap.of("remove", removeList)); //behavior when hitting Solr through ZK
assertU(adoc(doc));
assertU(commit());
@@ -158,8 +158,8 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
doc = new SolrInputDocument();
doc.setField("id", "1021");
removeList = new ArrayList<Long>();
- removeList.add(new Long(222));
- removeList.add(new Long(333));
+ removeList.add(222L);
+ removeList.add(333L);
doc.setField("intRemove", ImmutableMap.of("remove", removeList)); //behavior when hitting Solr through ZK
assertU(adoc(doc));
assertU(commit());
@@ -214,8 +214,8 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
doc = new SolrInputDocument();
doc.setField("id", "1001");
List<Long> removeList = new ArrayList<Long>();
- removeList.add(new Long(222));
- removeList.add(new Long(333));
+ removeList.add(222L);
+ removeList.add(333L);
doc.setField("intRemove", ImmutableMap.of("remove", removeList)); //behavior when hitting Solr through ZK
assertU(adoc(doc));
assertU(commit());
@@ -226,8 +226,8 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
doc = new SolrInputDocument();
doc.setField("id", "1021");
removeList = new ArrayList<Long>();
- removeList.add(new Long(222));
- removeList.add(new Long(333));
+ removeList.add(222L);
+ removeList.add(333L);
doc.setField("intRemove", ImmutableMap.of("remove", removeList)); //behavior when hitting Solr through ZK
assertU(adoc(doc));
assertU(commit());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
index 55fa5bd..1f48d71 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java
@@ -49,10 +49,10 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
"XXXX", "Adam", "Sam"),
f("all_authors_s1",
"XXXX", "Adam", "Sam"),
- f("foo_is", countMe, new Integer(42)),
- f("first_foo_l", countMe, new Integer(-34)),
- f("max_foo_l", countMe, new Integer(-34)),
- f("min_foo_l", countMe, new Integer(-34))));
+ f("foo_is", countMe, 42),
+ f("first_foo_l", countMe, -34),
+ f("max_foo_l", countMe, -34),
+ f("min_foo_l", countMe, -34)));
assertU(commit());
@@ -74,7 +74,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
doc(f("id", "1111"),
f("name", " Hoss ", new StringBuilder(" Man")),
f("foo_t", " some text ", "other Text\t"),
- f("foo_d", new Integer(42)),
+ f("foo_d", 42),
field("foo_s", " string ")));
assertNotNull(d);
@@ -88,7 +88,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
// slightly more interesting
assertEquals("processor borked non string value",
- new Integer(42), d.getFieldValue("foo_d"));
+ 42, d.getFieldValue("foo_d"));
}
public void testUniqValues() throws Exception {
@@ -281,7 +281,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
f("foo_s", "string1", ""),
f("bar_dt", "string2", "", "string3"),
f("yak_t", ""),
- f("foo_d", new Integer(42))));
+ f("foo_d", 42)));
assertNotNull(d);
@@ -292,7 +292,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
assertFalse("shouldn't be any values for yak_t",
d.containsKey("yak_t"));
assertEquals("processor borked non string value",
- new Integer(42), d.getFieldValue("foo_d"));
+ 42, d.getFieldValue("foo_d"));
}
@@ -303,7 +303,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
f("foo_s", "string1", "string222"),
f("bar_dt", "string3"),
f("yak_t", ""),
- f("foo_d", new Integer(42))));
+ f("foo_d", 42)));
assertNotNull(d);
@@ -312,23 +312,23 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
assertEquals("string3", d.getFieldValue("bar_dt"));
assertEquals("", d.getFieldValue("yak_t"));
assertEquals("processor borked non string value",
- new Integer(42), d.getFieldValue("foo_d"));
+ 42, d.getFieldValue("foo_d"));
d = processAdd("length-some",
doc(f("id", "1111"),
f("foo_s", "string1", "string222"),
f("bar_dt", "string3"),
f("yak_t", ""),
- f("foo_d", new Integer(42))));
+ f("foo_d", 42)));
assertNotNull(d);
- assertEquals(Arrays.asList(new Integer(7), new Integer(9)),
+ assertEquals(Arrays.asList(7, 9),
d.getFieldValues("foo_s"));
assertEquals("string3", d.getFieldValue("bar_dt"));
- assertEquals(new Integer(0), d.getFieldValue("yak_t"));
+ assertEquals(0, d.getFieldValue("yak_t"));
assertEquals("processor borked non string value",
- new Integer(42), d.getFieldValue("foo_d"));
+ 42, d.getFieldValue("foo_d"));
}
public void testRegexReplace() throws Exception {
@@ -515,7 +515,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
ignoreException(".*Unable to mutate field.*");
d = processAdd("min-value",
doc(f("id", "1111"),
- f("foo_s", "zzz", new Integer(42), "bbb"),
+ f("foo_s", "zzz", 42, "bbb"),
f("bar_s", "aaa"),
f("yak_t", "aaa", "bbb")));
} catch (SolrException e) {
@@ -556,7 +556,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
ignoreException(".*Unable to mutate field.*");
d = processAdd("min-value",
doc(f("id", "1111"),
- f("foo_s", "zzz", new Integer(42), "bbb"),
+ f("foo_s", "zzz", 42, "bbb"),
f("bar_s", "aaa"),
f("yak_t", "aaa", "bbb")));
} catch (SolrException e) {
@@ -786,7 +786,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
f("foo_s1", "string3", "string4"),
f("bar_dt", "string5", "string6"),
f("bar_HOSS_s", "string7", "string8"),
- f("foo_d", new Integer(42))));
+ f("foo_d", 42)));
assertNotNull(d);
@@ -799,7 +799,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
assertEquals(Arrays.asList("string7","string8"),
d.getFieldValues("bar_HOSS_s"));
assertEquals("processor borked non string value",
- new Integer(42), d.getFieldValue("foo_d"));
+ 42, d.getFieldValue("foo_d"));
}
@@ -816,7 +816,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
d = processAdd(chain,
doc(f("id", "1111"),
f("foo_t", "string1", "string2"),
- f("foo_d", new Integer(42)),
+ f("foo_d", 42),
field("foo_s", "string3", "string4")));
assertNotNull(d);
@@ -827,7 +827,7 @@ public class FieldMutatingUpdateProcessorTest extends UpdateProcessorTestBase {
// slightly more interesting
assertEquals("processor borked non string value",
- new Integer(42), d.getFieldValue("foo_d"));
+ 42, d.getFieldValue("foo_d"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java
index 9d0cb8b..4b24488 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java
@@ -47,7 +47,7 @@ public class IgnoreCommitOptimizeUpdateProcessorFactoryTest extends SolrTestCase
rsp = processCommit("ignore-optimize-only-from-client-403", true);
assertNotNull("Sending an optimize should have resulted in an exception in the response", rsp.getException());
// commit should happen if DistributedUpdateProcessor.COMMIT_END_POINT == true
- rsp = processCommit("ignore-commit-from-client-403", false, new Boolean(true));
+ rsp = processCommit("ignore-commit-from-client-403", false, Boolean.TRUE);
shouldBeNull = rsp.getException();
assertNull("Sending a commit should NOT have resulted in an exception in the response: "+shouldBeNull, shouldBeNull);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
index 8f9d2b7..06af046 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
@@ -300,7 +300,7 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
UnusualList<Integer> ints = new UnusualList<>(3);
for (int val : new int[] {42, 66, 34}) {
- docA.addField("ints_is", new Integer(val));
+ docA.addField("ints_is", val);
ints.add(val);
}
docB.addField("ints_is", ints);
@@ -318,7 +318,7 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 {
doc.addField("v_t", "same");
doc.addField("weight", 3.0f);
for (int val : new int[] {66, 42, 34}) {
- doc.addField("ints_is", new Integer(val));
+ doc.addField("ints_is", val);
}
ureq.add(doc);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
index 99c41e9..e53bfdc 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
@@ -133,8 +133,8 @@ public class StatelessScriptUpdateProcessorFactoryTest extends UpdateProcessorTe
assertEquals(chain + " didn't add Double field",
42.3d, d.getFieldValue("script_added_d"));
- assertEquals(chain + " didn't add integer field",
- new Integer(42), d.getFieldValue("script_added_i"));
+ assertEquals(chain + " didn't add integer field",
+ 42, d.getFieldValue("script_added_i"));
processCommit("run-no-scripts");
@@ -211,8 +211,8 @@ public class StatelessScriptUpdateProcessorFactoryTest extends UpdateProcessorTe
"i went for it", d.getFieldValue("script_added_s"));
assertEquals(chain +" didn't add Double field",
42.3d, d.getFieldValue("script_added_d"));
- assertEquals(chain + " didn't add integer field",
- new Integer(42), d.getFieldValue("script_added_i"));
+ assertEquals(chain + " didn't add integer field",
+ 42, d.getFieldValue("script_added_i"));
}
}
@@ -227,8 +227,8 @@ public class StatelessScriptUpdateProcessorFactoryTest extends UpdateProcessorTe
assertEquals(chain +" didn't add Double field",
42.3d, d.getFieldValue("script_added_d"));
- assertEquals(chain + " didn't add integer field",
- new Integer(42), d.getFieldValue("script_added_i"));
+ assertEquals(chain + " didn't add integer field",
+ 42, d.getFieldValue("script_added_i"));
}
public void testPropogatedException() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/util/CircularListTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/CircularListTest.java b/solr/core/src/test/org/apache/solr/util/CircularListTest.java
index 9231bde..53c29b4 100644
--- a/solr/core/src/test/org/apache/solr/util/CircularListTest.java
+++ b/solr/core/src/test/org/apache/solr/util/CircularListTest.java
@@ -31,18 +31,18 @@ public class CircularListTest extends LuceneTestCase {
public void testCircularList() throws IOException {
CircularList<Integer> list = new CircularList<>(10);
for(int i=0;i<10; i++) {
- list.add(new Integer(i));
+ list.add(i);
}
- assertEquals("within list", new Integer(0), list.get(0));
+ assertEquals("within list", Integer.valueOf(0), list.get(0));
for(int i=10;i<20; i++) {
- list.add(new Integer(i));
- assertEquals("within list", new Integer(i-9), list.get(0));
+ list.add(i);
+ assertEquals("within list", Integer.valueOf(i - 9), list.get(0));
}
// now try the resize
list.resize(5);
- assertEquals(new Integer(15), list.get(0));
+ assertEquals(Integer.valueOf(15), list.get(0));
list.resize(10);
- assertEquals(new Integer(15), list.get(0));
+ assertEquals(Integer.valueOf(15), list.get(0));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
index 0ffb206..4f50cd0 100644
--- a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
@@ -415,7 +415,7 @@ public class SolrPluginUtilsTest extends SolrTestCaseJ4 {
@Test
public void testInvokeSetters() {
- final Float theFloat = new Float(random().nextFloat());
+ final Float theFloat = random().nextFloat();
implTestInvokeSetters(theFloat, theFloat);
implTestInvokeSetters(theFloat, theFloat.toString());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/core/src/test/org/apache/solr/util/TestUtils.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java
index edf8135..88dbba2 100644
--- a/solr/core/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java
@@ -119,7 +119,7 @@ public class TestUtils extends SolrTestCaseJ4 {
map.add( "test", 10 );
SimpleOrderedMap<Integer> clone = map.clone();
assertEquals( map.toString(), clone.toString() );
- assertEquals( new Integer(10), clone.get( "test" ) );
+ assertEquals(Integer.valueOf(10), clone.get( "test" ) );
Map<String,Integer> realMap = new HashMap<>();
realMap.put( "one", 1 );
@@ -138,7 +138,7 @@ public class TestUtils extends SolrTestCaseJ4 {
assertEquals( "one", map.getName(0) );
map.setName( 0, "ONE" );
assertEquals( "ONE", map.getName(0) );
- assertEquals( new Integer(100), map.get( "one", 1 ) );
+ assertEquals(Integer.valueOf(100), map.get( "one", 1 ) );
assertEquals( 4, map.indexOf( null, 1 ) );
assertEquals( null, map.get( null, 1 ) );
@@ -156,8 +156,8 @@ public class TestUtils extends SolrTestCaseJ4 {
} catch( UnsupportedOperationException ignored) {}
}
// the values should be bigger
- assertEquals( new Integer(10), map.get( "one" ) );
- assertEquals( new Integer(20), map.get( "two" ) );
+ assertEquals(Integer.valueOf(10), map.get( "one" ) );
+ assertEquals(Integer.valueOf(20), map.get( "two" ) );
}
public void testNumberUtils()
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
index 0be3401..1f77b6e 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
@@ -53,6 +53,6 @@ public class ConvolutionEvaluator extends RecursiveNumericEvaluator implements T
((List)first).stream().mapToDouble(value -> ((Number)value).doubleValue()).toArray(),
((List)second).stream().mapToDouble(value -> ((Number)value).doubleValue()).toArray()
)
- ).mapToObj(Double::new).collect(Collectors.toList());
+ ).boxed().collect(Collectors.toList());
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java
index 65629cd..22cbfc9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/NormalizeEvaluator.java
@@ -44,7 +44,7 @@ public class NormalizeEvaluator extends RecursiveObjectEvaluator implements OneV
return null;
}
else if(value instanceof List){
- return Arrays.stream(StatUtils.normalize(((List<?>)value).stream().mapToDouble(innerValue -> ((Number)innerValue).doubleValue()).toArray())).mapToObj(Double::new).collect(Collectors.toList());
+ return Arrays.stream(StatUtils.normalize(((List<?>)value).stream().mapToDouble(innerValue -> ((Number)innerValue).doubleValue()).toArray())).boxed().collect(Collectors.toList());
} else if (value instanceof Matrix) {
Matrix matrix = (Matrix) value;
double[][] data = matrix.getData();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
index b6b293c..2495543 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
@@ -44,7 +44,7 @@ public class RankEvaluator extends RecursiveNumericEvaluator implements OneValue
}
else if(value instanceof List){
NaturalRanking rank = new NaturalRanking();
- return Arrays.stream(rank.rank(((List<?>)value).stream().mapToDouble(innerValue -> ((Number)innerValue).doubleValue()).toArray())).mapToObj(Double::new).collect(Collectors.toList());
+ return Arrays.stream(rank.rank(((List<?>)value).stream().mapToDouble(innerValue -> ((Number)innerValue).doubleValue()).toArray())).boxed().collect(Collectors.toList());
}
else{
return doWork(Arrays.asList((Number)value));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
index 99950da..5377fe2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
@@ -57,6 +57,6 @@ public class ScaleEvaluator extends RecursiveNumericEvaluator implements TwoValu
scaleOver = ((List<?>)second).stream().mapToDouble(value -> ((Number)value).doubleValue()).toArray();
}
- return Arrays.stream(MathArrays.scale(((Number)first).doubleValue(), scaleOver)).mapToObj(Double::new).collect(Collectors.toList());
+ return Arrays.stream(MathArrays.scale(((Number)first).doubleValue(), scaleOver)).boxed().collect(Collectors.toList());
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java b/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
index 33860ff..f757c60 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
@@ -87,7 +87,7 @@ public abstract class ContentStreamBase implements ContentStream
contentType = conn.getContentType();
name = url.toExternalForm();
- size = new Long( conn.getContentLength() );
+ size = (long) conn.getContentLength();
return conn.getInputStream();
}
}
@@ -155,7 +155,7 @@ public abstract class ContentStreamBase implements ContentStream
this.contentType = contentType;
name = null;
try {
- size = new Long( str.getBytes(DEFAULT_CHARSET).length );
+ size = (long) str.getBytes(DEFAULT_CHARSET).length;
} catch (UnsupportedEncodingException e) {
// won't happen
throw new RuntimeException(e);
@@ -277,7 +277,7 @@ public abstract class ContentStreamBase implements ContentStream
this.contentType = contentType;
name = source;
- size = new Long(bytes.length);
+ size = (long) bytes.length;
sourceInfo = source;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
index bf0d245..f6628da 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
@@ -758,8 +758,8 @@ abstract public class SolrExampleTests extends SolrExampleTestsBase
assertEquals( 23.0, ((Double)stats.getMin()).doubleValue(), 0 );
assertEquals(94.0, ((Double) stats.getMax()).doubleValue(), 0);
- assertEquals( new Long(nums.length), stats.getCount() );
- assertEquals( new Long(0), stats.getMissing() );
+ assertEquals(Long.valueOf(nums.length), stats.getCount() );
+ assertEquals(Long.valueOf(0), stats.getMissing() );
assertEquals( "26.4", stats.getStddev().toString().substring(0, 4) );
// now lets try again with a new set... (odd median)
@@ -784,8 +784,8 @@ abstract public class SolrExampleTests extends SolrExampleTestsBase
assertEquals(5.0, ((Double) stats.getMin()).doubleValue(), 0);
assertEquals( 20.0, ((Double)stats.getMax()).doubleValue(), 0 );
- assertEquals(new Long(nums.length), stats.getCount());
- assertEquals( new Long(0), stats.getMissing() );
+ assertEquals(Long.valueOf(nums.length), stats.getCount());
+ assertEquals(Long.valueOf(0), stats.getMissing() );
// Now try again with faceting
//---------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
index 7dc14de..70b0ea8 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
@@ -249,7 +249,7 @@ abstract public class SolrExampleTestsBase extends SolrJettyTestBase {
// Make sure the transformer works for streaming
Float score = (Float) doc.get("score");
- assertEquals("should have score", new Float(1.0), score);
+ assertEquals("should have score", Float.valueOf(1.0f), score);
}
});
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
index 9b11783..2cd0e97 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
@@ -646,23 +646,23 @@ public class GraphExpressionTest extends SolrCloudTestCase {
Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 4);
assertTrue(tuples.get(0).getString("node").equals("bill"));
- assertTrue(tuples.get(0).getLong("level").equals(new Long(0)));
+ assertTrue(tuples.get(0).getLong("level").equals(0L));
assertTrue(tuples.get(0).getStrings("ancestors").size() == 0);
assertTrue(tuples.get(1).getString("node").equals("jim"));
- assertTrue(tuples.get(1).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(1).getLong("level").equals(1L));
List<String> ancestors = tuples.get(1).getStrings("ancestors");
System.out.println("##################### Ancestors:"+ancestors);
assert(ancestors.size() == 1);
assert(ancestors.get(0).equals("bill"));
assertTrue(tuples.get(2).getString("node").equals("max"));
- assertTrue(tuples.get(2).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(2).getLong("level").equals(1L));
ancestors = tuples.get(2).getStrings("ancestors");
assert(ancestors.size() == 1);
assert(ancestors.get(0).equals("bill"));
assertTrue(tuples.get(3).getString("node").equals("sam"));
- assertTrue(tuples.get(3).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(3).getLong("level").equals(1L));
ancestors = tuples.get(3).getStrings("ancestors");
assert(ancestors.size() == 1);
assert(ancestors.get(0).equals("bill"));
@@ -705,13 +705,13 @@ public class GraphExpressionTest extends SolrCloudTestCase {
Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 4);
assertTrue(tuples.get(0).getString("node").equals("bill"));
- assertTrue(tuples.get(0).getLong("level").equals(new Long(0)));
+ assertTrue(tuples.get(0).getLong("level").equals(0L));
assertTrue(tuples.get(1).getString("node").equals("jim"));
- assertTrue(tuples.get(1).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(1).getLong("level").equals(1L));
assertTrue(tuples.get(2).getString("node").equals("max"));
- assertTrue(tuples.get(2).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(2).getLong("level").equals(1L));
assertTrue(tuples.get(3).getString("node").equals("sam"));
- assertTrue(tuples.get(3).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(3).getLong("level").equals(1L));
expr = "gatherNodes(collection1, " +
"search(collection1, q=\"message_t:jim\", fl=\"from_s\", sort=\"from_s asc\"),"+
@@ -777,19 +777,19 @@ public class GraphExpressionTest extends SolrCloudTestCase {
assertTrue(tuples.size() == 7);
assertTrue(tuples.get(0).getString("node").equals("ann"));
- assertTrue(tuples.get(0).getLong("level").equals(new Long(2)));
+ assertTrue(tuples.get(0).getLong("level").equals(2L));
assertTrue(tuples.get(1).getString("node").equals("bill"));
- assertTrue(tuples.get(1).getLong("level").equals(new Long(0)));
+ assertTrue(tuples.get(1).getLong("level").equals(0L));
assertTrue(tuples.get(2).getString("node").equals("jim"));
- assertTrue(tuples.get(2).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(2).getLong("level").equals(1L));
assertTrue(tuples.get(3).getString("node").equals("kip"));
- assertTrue(tuples.get(3).getLong("level").equals(new Long(2)));
+ assertTrue(tuples.get(3).getLong("level").equals(2L));
assertTrue(tuples.get(4).getString("node").equals("max"));
- assertTrue(tuples.get(4).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(4).getLong("level").equals(1L));
assertTrue(tuples.get(5).getString("node").equals("sam"));
- assertTrue(tuples.get(5).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(5).getLong("level").equals(1L));
assertTrue(tuples.get(6).getString("node").equals("steve"));
- assertTrue(tuples.get(6).getLong("level").equals(new Long(2)));
+ assertTrue(tuples.get(6).getLong("level").equals(2L));
//Add a cycle from jim to bill
new UpdateRequest()
@@ -817,10 +817,10 @@ public class GraphExpressionTest extends SolrCloudTestCase {
assertTrue(tuples.size() == 7);
assertTrue(tuples.get(0).getString("node").equals("ann"));
- assertTrue(tuples.get(0).getLong("level").equals(new Long(2)));
+ assertTrue(tuples.get(0).getLong("level").equals(2L));
//Bill should now have one ancestor
assertTrue(tuples.get(1).getString("node").equals("bill"));
- assertTrue(tuples.get(1).getLong("level").equals(new Long(0)));
+ assertTrue(tuples.get(1).getLong("level").equals(0L));
assertTrue(tuples.get(1).getStrings("ancestors").size() == 2);
List<String> anc = tuples.get(1).getStrings("ancestors");
@@ -829,15 +829,15 @@ public class GraphExpressionTest extends SolrCloudTestCase {
assertTrue(anc.get(1).equals("sam"));
assertTrue(tuples.get(2).getString("node").equals("jim"));
- assertTrue(tuples.get(2).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(2).getLong("level").equals(1L));
assertTrue(tuples.get(3).getString("node").equals("kip"));
- assertTrue(tuples.get(3).getLong("level").equals(new Long(2)));
+ assertTrue(tuples.get(3).getLong("level").equals(2L));
assertTrue(tuples.get(4).getString("node").equals("max"));
- assertTrue(tuples.get(4).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(4).getLong("level").equals(1L));
assertTrue(tuples.get(5).getString("node").equals("sam"));
- assertTrue(tuples.get(5).getLong("level").equals(new Long(1)));
+ assertTrue(tuples.get(5).getLong("level").equals(1L));
assertTrue(tuples.get(6).getString("node").equals("steve"));
- assertTrue(tuples.get(6).getLong("level").equals(new Long(2)));
+ assertTrue(tuples.get(6).getLong("level").equals(2L));
cache.close();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index 845703e..52c77dd 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -474,7 +474,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
UpdateRequest update = new UpdateRequest();
for(int idx = 0; idx < 1000; ++idx){
- String idxString = new Integer(idx).toString();
+ String idxString = Integer.toString(idx);
update.add(id,idxString, "a_s", "hello" + idxString, "a_i", idxString, "a_f", idxString);
}
update.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
index ac90157..078cd23 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/NormalizeEvaluatorTest.java
@@ -57,10 +57,10 @@ public class NormalizeEvaluatorTest extends LuceneTestCase {
values.put("singleInt", singleInt);
Tuple tuple = new Tuple(values);
- assertSimilar(StatUtils.normalize(Arrays.stream(ints).mapToDouble(Double::new).toArray()), factory.constructEvaluator("norm(ints)").evaluate(tuple));
- assertSimilar(StatUtils.normalize(Arrays.stream(longs).mapToDouble(Double::new).toArray()), factory.constructEvaluator("norm(longs)").evaluate(tuple));
+ assertSimilar(StatUtils.normalize(Arrays.stream(ints).mapToDouble(Double::valueOf).toArray()), factory.constructEvaluator("norm(ints)").evaluate(tuple));
+ assertSimilar(StatUtils.normalize(Arrays.stream(longs).mapToDouble(Double::valueOf).toArray()), factory.constructEvaluator("norm(longs)").evaluate(tuple));
assertSimilar(StatUtils.normalize(doubles), factory.constructEvaluator("norm(doubles)").evaluate(tuple));
- assertSimilar(StatUtils.normalize(Arrays.stream(singleInt).mapToDouble(Double::new).toArray()), factory.constructEvaluator("norm(singleInt)").evaluate(tuple));
+ assertSimilar(StatUtils.normalize(Arrays.stream(singleInt).mapToDouble(Double::valueOf).toArray()), factory.constructEvaluator("norm(singleInt)").evaluate(tuple));
}
private void assertSimilar(double[] expected, Object actual){
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java
index c376223..6d4fa28 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestDelegationTokenResponse.java
@@ -122,7 +122,7 @@ public class TestDelegationTokenResponse extends LuceneTestCase {
}
// valid
- Long expirationTime = new Long(Long.MAX_VALUE);
+ Long expirationTime = Long.MAX_VALUE;
delegationTokenResponse(renewRequest, renewResponse,
getMapJson("long", expirationTime));
assertEquals(expirationTime, renewResponse.getExpirationTime());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
index 0234ce0..e05d436 100644
--- a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java
@@ -33,7 +33,7 @@ public class SolrDocumentTest extends LuceneTestCase
{
public void testSimple()
{
- Float fval = new Float( 10.01f );
+ Float fval = 10.01f;
Boolean bval = Boolean.TRUE;
String sval = "12qwaszx";
@@ -184,9 +184,9 @@ public class SolrDocumentTest extends LuceneTestCase
public void testDuplicate()
{
- Float fval0 = new Float( 10.01f );
- Float fval1 = new Float( 11.01f );
- Float fval2 = new Float( 12.01f );
+ Float fval0 = 10.01f;
+ Float fval1 = 11.01f;
+ Float fval2 = 12.01f;
// Set up a simple document
SolrInputDocument doc = new SolrInputDocument();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ea7071d7/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java b/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java
index f079828..e674153 100644
--- a/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java
@@ -187,8 +187,8 @@ public class SolrParamTest extends LuceneTestCase {
final String pstr = "string";
final Boolean pbool = Boolean.TRUE;
- final Integer pint = new Integer( 100 );
- final Float pfloat = new Float( 10.6f );
+ final Integer pint = 100;
+ final Float pfloat = 10.6f;
// Make sure they parse ok
assertEquals( pstr , params.get( "str" ) );
@@ -285,7 +285,7 @@ public class SolrParamTest extends LuceneTestCase {
assertEquals( pstr , defaults.get( "str" ) );
// in default, not in params
assertEquals( "default" , defaults.get( "dstr" ) );
- assertEquals( new Integer(123) , defaults.getInt( "dint" ) );
+ assertEquals(Integer.valueOf(123), defaults.getInt( "dint" ) );
// in params, overriding defaults
assertEquals( pint , defaults.getInt( "int" ) );
// in neither params nor defaults