You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 23:54:44 UTC
[04/12] oodt git commit: OODT-890 remove unneeded boxing, unboxing,
swap indexof to contains, stringbuffer to builder
OODT-890 remove unneeded boxing, unboxing, swap indexof to contains, stringbuffer to builder
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/1e5b0f9f
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/1e5b0f9f
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/1e5b0f9f
Branch: refs/heads/master
Commit: 1e5b0f9f274e12bf4d3460878d3f69aa91eb1546
Parents: 15df02a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:08:51 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:08:51 2015 +0000
----------------------------------------------------------------------
.../filemgr/structs/FreeTextQueryCriteria.java | 9 +++------
.../oodt/cas/filemgr/tools/SolrIndexer.java | 13 ++++---------
.../main/java/org/apache/oodt/grid/Server.java | 2 +-
.../metadata/extractors/ExternConfigReader.java | 11 ++++++-----
.../org/apache/oodt/pcs/opsui/OpsuiApp.java | 5 ++---
.../org/apache/oodt/cas/pge/util/XmlHelper.java | 2 +-
.../handlers/ofsn/AbstractCrawlLister.java | 5 ++---
.../queuerepo/TestXmlQueueRepository.java | 20 +++++++++++---------
8 files changed, 30 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
index 7615bab..5fc05e9 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/FreeTextQueryCriteria.java
@@ -18,6 +18,7 @@
package org.apache.oodt.cas.filemgr.structs;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.StringTokenizer;
@@ -57,9 +58,7 @@ public class FreeTextQueryCriteria extends QueryCriteria {
values = new ArrayList<String>();
noiseWordHash = new HashSet<String>();
- for (String noiseWord : noiseWords) {
- noiseWordHash.add(noiseWord);
- }
+ Collections.addAll(noiseWordHash, noiseWords);
}
/**
@@ -73,9 +72,7 @@ public class FreeTextQueryCriteria extends QueryCriteria {
values = v;
noiseWordHash = new HashSet<String>();
- for (String noiseWord : noiseWords) {
- noiseWordHash.add(noiseWord);
- }
+ Collections.addAll(noiseWordHash, noiseWords);
}
/**
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
index f99b055..493d3d7 100755
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/SolrIndexer.java
@@ -29,6 +29,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
@@ -747,25 +748,19 @@ public class SolrIndexer {
if (properties.getProperty(IGNORE_TYPES) != null) {
String[] values = properties.getProperty(IGNORE_TYPES).trim()
.split(",");
- for (String value : values) {
- ignoreTypes.add(value);
- }
+ Collections.addAll(ignoreTypes, values);
}
if (properties.getProperty(IGNORE_VALUES) != null) {
String[] values = properties.getProperty(IGNORE_VALUES).trim().split(
",");
- for (String value : values) {
- ignoreValues.add(value);
- }
+ Collections.addAll(ignoreValues, values);
}
if (properties.getProperty(REPLACEMENT_KEYS) != null) {
String[] values = properties.getProperty(REPLACEMENT_KEYS).trim()
.split(",");
- for (String value : values) {
- replacementKeys.add(value);
- }
+ Collections.addAll(replacementKeys, values);
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/grid/src/main/java/org/apache/oodt/grid/Server.java
----------------------------------------------------------------------
diff --git a/grid/src/main/java/org/apache/oodt/grid/Server.java b/grid/src/main/java/org/apache/oodt/grid/Server.java
index f84cadf..3babd2e 100755
--- a/grid/src/main/java/org/apache/oodt/grid/Server.java
+++ b/grid/src/main/java/org/apache/oodt/grid/Server.java
@@ -87,7 +87,7 @@ public abstract class Server implements Serializable {
if (urlList.isEmpty())
clazz = Class.forName(className);
else {
- URL[] urls = (URL[]) urlList.toArray(EMPTY_URL_ARRAY);
+ URL[] urls = (URL[]) urlList.toArray(new URL[urlList.size()]);
URLClassLoader loader = new URLClassLoader(urls, getClass()
.getClassLoader());
clazz = loader.loadClass(className);
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
index 3a736eb..8bc749c 100644
--- a/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
+++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/extractors/ExternConfigReader.java
@@ -24,14 +24,15 @@ import org.apache.oodt.cas.metadata.MetExtractorConfigReader;
import org.apache.oodt.cas.metadata.exceptions.MetExtractorConfigReaderException;
import org.apache.oodt.cas.metadata.util.PathUtils;
import org.apache.oodt.commons.xml.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
-//JDK imports
import java.io.File;
import java.io.FileInputStream;
import java.util.Vector;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+
+//JDK imports
/**
* @author mattmann
@@ -117,7 +118,7 @@ public final class ExternConfigReader implements MetExtractorConfigReader,
}
config.setArgList((String[]) argVector
- .toArray(new String[] {}));
+ .toArray(new String[argVector.size()]));
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
----------------------------------------------------------------------
diff --git a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
index 94824a7..b8fdb02 100644
--- a/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
+++ b/pcs/opsui/src/main/java/org/apache/oodt/pcs/opsui/OpsuiApp.java
@@ -33,6 +33,7 @@ import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
import org.apache.wicket.util.file.File;
import java.io.Serializable;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.Vector;
@@ -190,9 +191,7 @@ public class OpsuiApp extends WebApplication implements Serializable {
"org.apache.oodt.pcs.trace.excludeList").split(",");
List<String> excludes = new Vector<String>();
- for (String type : types) {
- excludes.add(type);
- }
+ Collections.addAll(excludes, types);
return excludes;
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
index 453f2ac..4a905fc 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/util/XmlHelper.java
@@ -311,7 +311,7 @@ public class XmlHelper {
String writer = getWriter(fileElem, metadata);
List<String> args = getArgs(fileElem, metadata);
dynamicConfigFiles.add(new DynamicConfigFile(path, writer, args
- .toArray(new String[0])));
+ .toArray(new String[args.size()])));
}
}
return dynamicConfigFiles;
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
----------------------------------------------------------------------
diff --git a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
index 34f76f7..3159996 100644
--- a/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
+++ b/product/src/main/java/org/apache/oodt/product/handlers/ofsn/AbstractCrawlLister.java
@@ -23,6 +23,7 @@ import org.apache.oodt.product.ProductException;
import java.io.File;
import java.io.FileFilter;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.Stack;
@@ -99,9 +100,7 @@ public abstract class AbstractCrawlLister implements OFSNListHandler {
productFiles = dir.listFiles(FILE_FILTER);
}
- for (File productFile : productFiles) {
- fileList.add(productFile);
- }
+ Collections.addAll(fileList, productFiles);
if (recur) {
File[] subdirs = dir.listFiles(DIR_FILTER);
http://git-wip-us.apache.org/repos/asf/oodt/blob/1e5b0f9f/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
----------------------------------------------------------------------
diff --git a/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java b/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
index c2f144b..9abcdc4 100644
--- a/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
+++ b/resource/src/test/java/org/apache/oodt/cas/resource/queuerepo/TestXmlQueueRepository.java
@@ -18,15 +18,17 @@
package org.apache.oodt.cas.resource.queuerepo;
//JDK imports
+import org.apache.oodt.cas.resource.scheduler.QueueManager;
+import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
+
import java.io.File;
import java.util.Arrays;
+import java.util.Collections;
-//OODT imports
-import org.apache.oodt.cas.resource.scheduler.QueueManager;
-import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException;
+import junit.framework.TestCase;
+//OODT imports
//Junit imports
-import junit.framework.TestCase;
/**
* @author bfoster
@@ -50,21 +52,21 @@ public class TestXmlQueueRepository extends TestCase {
public void testMapping() throws QueueManagerException {
assertTrue(this.queueManager.getQueues().containsAll(Arrays.asList("quick", "high", "long")));
- assertEquals(this.queueManager.getNodes("quick"), Arrays.asList("localhost"));
- assertEquals(this.queueManager.getNodes("high"), Arrays.asList("localhost"));
- assertEquals(this.queueManager.getNodes("long"), Arrays.asList("localhost"));
+ assertEquals(this.queueManager.getNodes("quick"), Collections.singletonList("localhost"));
+ assertEquals(this.queueManager.getNodes("high"), Collections.singletonList("localhost"));
+ assertEquals(this.queueManager.getNodes("long"), Collections.singletonList("localhost"));
assertTrue(this.queueManager.getQueues("localhost").containsAll(Arrays.asList("quick", "high", "long")));
this.queueManager.addQueue("test-queue-1");
this.queueManager.addNodeToQueue("test-node-1", "test-queue-1");
- assertEquals(this.queueManager.getQueues("test-node-1"), Arrays.asList("test-queue-1"));
+ assertEquals(this.queueManager.getQueues("test-node-1"), Collections.singletonList("test-queue-1"));
this.queueManager.addNodeToQueue("test-node-1","quick");
assertEquals(this.queueManager.getQueues("test-node-1"), Arrays.asList("quick", "test-queue-1"));
this.queueManager.removeQueue("quick");
- assertEquals(this.queueManager.getQueues("test-node-1"), Arrays.asList("test-queue-1"));
+ assertEquals(this.queueManager.getQueues("test-node-1"), Collections.singletonList("test-queue-1"));
assertEquals(this.queueManager.getQueues("localhost"), Arrays.asList("high", "long"));
}