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 12:56:56 UTC
[3/4] oodt git commit: OODT-888 string concat to string builders
OODT-888 string concat to string builders
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/4768f4a4
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/4768f4a4
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/4768f4a4
Branch: refs/heads/master
Commit: 4768f4a4e514c8fe76158764402c80fd5da4ef93
Parents: 48aad4b
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 11:46:54 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 11:46:54 2015 +0000
----------------------------------------------------------------------
.../apache/oodt/commons/activity/Activity.java | 6 ++----
.../cas/filemgr/structs/type/TestTypeHandler.java | 8 ++------
.../extractors/ThreddsMetadataExtractor.java | 18 ++++--------------
.../security/sso/opensso/IdentityDetails.java | 15 ++-------------
.../oodt/security/sso/opensso/UserDetails.java | 10 +---------
5 files changed, 11 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/4768f4a4/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java b/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
index 1f35901..4a01a6d 100644
--- a/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
+++ b/commons/src/main/java/org/apache/oodt/commons/activity/Activity.java
@@ -100,10 +100,8 @@ public abstract class Activity {
Date date = new Date(); // Get the current time
byte[] bytes = new byte[32]; // Make space for 32 random bytes
RANDOM.nextBytes(bytes); // Fill in 32 random bytes
- StringBuilder input = new StringBuilder(); // Make space to put the 1st 3 components...
- input.append(addr).append(nextNum).append(date); // ...together and put 'em together
- MessageDigest messageDigest = MessageDigest.getInstance("MD5");// Prepare to take a hash
- messageDigest.update(input.toString().getBytes()); // Add the 1st 3 components
+ MessageDigest messageDigest = MessageDigest.getInstance("MD5");// Prepare to take a hash
+ messageDigest.update((String.valueOf(addr) + nextNum + date).getBytes()); // Add the 1st 3 components
byte[] sig = messageDigest.digest(bytes); // And add the random bytes
StringBuilder output = new StringBuilder(); // Make space to store the hash as a string
for (int i = 0; i < sig.length; ++i) // For each byte in the hash
http://git-wip-us.apache.org/repos/asf/oodt/blob/4768f4a4/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
----------------------------------------------------------------------
diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
index 07075e9..c4dfa38 100644
--- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
+++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/structs/type/TestTypeHandler.java
@@ -451,8 +451,6 @@ public class TestTypeHandler extends TestCase {
String tableName = type.getName() + "_metadata";
String subSelectQueryBase = "SELECT product_id FROM "
+ tableName + " ";
- StringBuilder selectClause = new StringBuilder(
- "SELECT DISTINCT p.product_id ");
StringBuilder fromClause = new StringBuilder("FROM " + tableName
+ " p ");
StringBuilder whereClause = new StringBuilder("WHERE ");
@@ -575,7 +573,7 @@ public class TestTypeHandler extends TestCase {
}
}
}
- getProductSql = selectClause.toString() + fromClause.toString();
+ getProductSql = "SELECT DISTINCT p.product_id " + fromClause.toString();
if (gotFirstClause) {
getProductSql += whereClause.toString();
}
@@ -691,8 +689,6 @@ public class TestTypeHandler extends TestCase {
String tableName = type.getName() + "_metadata";
String subSelectQueryBase = "SELECT product_id FROM "
+ tableName + " ";
- StringBuilder selectClause = new StringBuilder(
- "SELECT COUNT(DISTINCT p.product_id) AS numResults ");
StringBuilder fromClause = new StringBuilder("FROM " + tableName
+ " p ");
StringBuilder whereClause = new StringBuilder("WHERE ");
@@ -816,7 +812,7 @@ public class TestTypeHandler extends TestCase {
}
}
- getProductSql = selectClause.toString() + fromClause.toString();
+ getProductSql = "SELECT COUNT(DISTINCT p.product_id) AS numResults " + fromClause.toString();
if (gotFirstClause) {
getProductSql += whereClause.toString();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/4768f4a4/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/ThreddsMetadataExtractor.java
----------------------------------------------------------------------
diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/ThreddsMetadataExtractor.java b/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/ThreddsMetadataExtractor.java
index 74cba96..406feb4 100644
--- a/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/ThreddsMetadataExtractor.java
+++ b/opendapps/src/main/java/org/apache/oodt/opendapps/extractors/ThreddsMetadataExtractor.java
@@ -296,13 +296,8 @@ public class ThreddsMetadataExtractor implements MetadataExtractor {
* @return
*/
private String encodeXlinkTuple(final String href, final String title, final String type) {
- final StringBuilder tuple = new StringBuilder();
- tuple.append(href)
- .append(ProfileUtils.CHAR)
- .append(StringUtils.hasText(title) ? title : "Reference" )
- .append(ProfileUtils.CHAR)
- .append(StringUtils.hasText(type) ? type : "HTML" );
- return tuple.toString();
+ return href + ProfileUtils.CHAR + (StringUtils.hasText(title) ? title : "Reference") + ProfileUtils.CHAR + (
+ StringUtils.hasText(type) ? type : "HTML");
}
/**
@@ -313,13 +308,8 @@ public class ThreddsMetadataExtractor implements MetadataExtractor {
* @return
*/
private String encodeAccessTuple(final String url, final String type, final String name) {
- final StringBuilder tuple = new StringBuilder();
- tuple.append(url)
- .append(ProfileUtils.CHAR)
- .append(StringUtils.hasText(type) ? type : "")
- .append(ProfileUtils.CHAR)
- .append(StringUtils.hasText(name) ? name : "");
- return tuple.toString();
+ return url + ProfileUtils.CHAR + (StringUtils.hasText(type) ? type : "") + ProfileUtils.CHAR + (
+ StringUtils.hasText(name) ? name : "");
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/4768f4a4/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
index a0950e8..7c0dcba 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/IdentityDetails.java
@@ -128,19 +128,8 @@ public class IdentityDetails {
}
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("[name=");
- sb.append(this.name);
- sb.append(",type=");
- sb.append(this.type);
- sb.append(",realm=");
- sb.append(this.realm);
- sb.append(",roles=");
- sb.append(this.groups);
- sb.append(",attributes=");
- sb.append(this.attributes.getHashtable());
- sb.append("]");
- return sb.toString();
+ return "[name=" + this.name + ",type=" + this.type + ",realm=" + this.realm + ",roles=" + this.groups
+ + ",attributes=" + this.attributes.getHashtable() + "]";
}
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/4768f4a4/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
----------------------------------------------------------------------
diff --git a/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java b/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
index af24e02..ab0b708 100755
--- a/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
+++ b/sso/src/main/java/org/apache/oodt/security/sso/opensso/UserDetails.java
@@ -92,14 +92,6 @@ public class UserDetails {
}
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("[token=");
- sb.append(this.token);
- sb.append(",roles=");
- sb.append(this.roles);
- sb.append(",attributes=");
- sb.append(this.attributes.getHashtable());
- sb.append("]");
- return sb.toString();
+ return "[token=" + this.token + ",roles=" + this.roles + ",attributes=" + this.attributes.getHashtable() + "]";
}
}