You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/11/26 14:50:40 UTC
[1/6] tomee git commit: removes String concatenation loop in Assembler
Repository: tomee
Updated Branches:
refs/heads/master 4a6183a11 -> e893b19b6
removes String concatenation loop in Assembler
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/442a81b3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/442a81b3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/442a81b3
Branch: refs/heads/master
Commit: 442a81b3e78b7700f0420573927872bedbec30a4
Parents: f032a7f
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Nov 22 13:23:49 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Nov 22 13:23:49 2018 -0200
----------------------------------------------------------------------
.../java/org/apache/openejb/assembler/classic/Assembler.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/442a81b3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 72659d9..e0a5fcb 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -786,12 +786,13 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
final List<String> used = getDuplicates(appInfo);
if (used.size() > 0) {
- String message = logger.error("createApplication.appFailedDuplicateIds", appInfo.path);
+ StringBuilder message = new StringBuilder(logger.error("createApplication.appFailedDuplicateIds"
+ , appInfo.path));
for (final String id : used) {
logger.error("createApplication.deploymentIdInUse", id);
- message += "\n " + id;
+ message.append("\n ").append(id);
}
- throw new DuplicateDeploymentIdException(message);
+ throw new DuplicateDeploymentIdException(message.toString());
}
final ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
[6/6] tomee git commit: Merge branch
'use_string_builder_instad_string_loop' of github.com:otaviojava/tomee
Posted by jg...@apache.org.
Merge branch 'use_string_builder_instad_string_loop' of github.com:otaviojava/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e893b19b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e893b19b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e893b19b
Branch: refs/heads/master
Commit: e893b19b64d2700155e73ab95817f07675fc737d
Parents: 4a6183a 806df6d
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Nov 26 14:50:14 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Nov 26 14:50:14 2018 +0000
----------------------------------------------------------------------
.../openejb/assembler/classic/Assembler.java | 7 +++---
.../openejb/config/AnnotationDeployer.java | 8 +++---
.../apache/openejb/config/SunConversion.java | 12 ++++-----
.../openejb/monitoring/ObjectNameBuilder.java | 2 +-
.../openejb/resource/AutoConnectionTracker.java | 2 +-
.../logging/LoggingPreparedSqlStatement.java | 26 ++++++++++----------
.../loader/provisining/MavenResolver.java | 2 +-
.../webapp/installer/InstallerServlet.java | 2 +-
8 files changed, 32 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[4/6] tomee git commit: removes String concatenation loop in
LoggingPreparedSqlStatement
Posted by jg...@apache.org.
removes String concatenation loop in LoggingPreparedSqlStatement
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e859469a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e859469a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e859469a
Branch: refs/heads/master
Commit: e859469a996d4581a971869f685dea5bf9b06b8d
Parents: 20b08f5
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Nov 22 13:24:41 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Nov 22 13:24:41 2018 -0200
----------------------------------------------------------------------
.../logging/LoggingPreparedSqlStatement.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e859469a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
index 9b78d3f..d68135b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/LoggingPreparedSqlStatement.java
@@ -75,13 +75,13 @@ public class LoggingPreparedSqlStatement implements InvocationHandler {
parameters.add(param);
} else if (execute) {
- String str = sql;
- if (str.contains("?")) {
+ StringBuilder str = new StringBuilder(sql);
+ if (str.toString().contains("?")) {
Collections.sort(parameters);
int lastBatch = 0;
for (int i = 0; i < parameters.size(); i++) {
final Parameter param = parameters.get(i);
- if (str.contains("?")) {
+ if (str.toString().contains("?")) {
try {
String val;
if (ByteArrayInputStream.class.isInstance(param.value)) {
@@ -95,40 +95,40 @@ public class LoggingPreparedSqlStatement implements InvocationHandler {
} else {
val = param.value.toString();
}
- str = str.replaceFirst("\\?", val);
+ str = new StringBuilder(str.toString().replaceFirst("\\?", val));
} catch (final Exception e) {
if (param.value == null) {
- str = str.replaceFirst("\\?", "null");
+ str = new StringBuilder(str.toString().replaceFirst("\\?", "null"));
} else {
- str = str.replaceFirst("\\?", param.value.getClass().getName());
+ str = new StringBuilder(str.toString().replaceFirst("\\?", param.value.getClass().getName()));
}
}
lastBatch = param.batchIndex;
} else {
if (lastBatch != param.batchIndex) {
- str += ", (";
+ str.append(", (");
lastBatch = param.batchIndex;
}
try {
- str += param.value.toString();
+ str.append(param.value.toString());
} catch (final Exception e) {
if (param.value == null) {
- str += "null";
+ str.append("null");
} else {
- str += param.value.getClass().getName();
+ str.append(param.value.getClass().getName());
}
}
if (i == parameters.size() - 1 || parameters.get(i + 1).batchIndex != lastBatch) {
- str += ")";
+ str.append(")");
} else {
- str += ",";
+ str.append(",");
}
}
}
}
- LOGGER.info(result.format(str) + (packages != null ? " - stack:" + TimeWatcherExecutor.inlineStack(packages) : ""));
+ LOGGER.info(result.format(str.toString()) + (packages != null ? " - stack:" + TimeWatcherExecutor.inlineStack(packages) : ""));
} else if ("clearParameters".equals(mtdName)) {
parameters.clear();
parameterIndex = 0;
[2/6] tomee git commit: removes String concatenation loop in
AnnotationDeployer
Posted by jg...@apache.org.
removes String concatenation loop in AnnotationDeployer
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/afec54d2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/afec54d2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/afec54d2
Branch: refs/heads/master
Commit: afec54d2204e6e5b8814cddc7eef427a35b54dd5
Parents: 442a81b
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Nov 22 13:24:04 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Nov 22 13:24:04 2018 -0200
----------------------------------------------------------------------
.../java/org/apache/openejb/config/AnnotationDeployer.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/afec54d2/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 9df12fe..98b5484 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -2939,12 +2939,14 @@ public class AnnotationDeployer implements DynamicDeployer {
}
if (interfaces.size() != 1) {
- String msg = "When annotating a bean class as @MessageDriven without declaring messageListenerInterface, the bean must implement exactly one interface, no more and no less. beanClass=" + clazz.getName() + " interfaces=";
+ StringBuilder msg = new StringBuilder("When annotating a bean class as @MessageDriven without" +
+ " declaring messageListenerInterface, the bean must implement exactly one interface, no more and" +
+ " no less. beanClass=" + clazz.getName() + " interfaces=");
for (final Class<?> intf : interfaces) {
- msg += intf.getName() + ", ";
+ msg.append(intf.getName()).append(", ");
}
// TODO: Make this a validation failure, not an exception
- throw new IllegalStateException(msg);
+ throw new IllegalStateException(msg.toString());
}
mdb.setMessagingType(interfaces.get(0).getName());
}
[5/6] tomee git commit: removes redudant toString
Posted by jg...@apache.org.
removes redudant toString
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/806df6dc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/806df6dc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/806df6dc
Branch: refs/heads/master
Commit: 806df6dc4095d0d444357b242560d182544fa69f
Parents: e859469
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Nov 22 16:26:57 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Nov 22 16:26:57 2018 -0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java | 2 +-
.../java/org/apache/openejb/resource/AutoConnectionTracker.java | 2 +-
.../java/org/apache/openejb/loader/provisining/MavenResolver.java | 2 +-
.../java/org/apache/tomee/webapp/installer/InstallerServlet.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/806df6dc/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
index 8a02206..ab52dbe 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ObjectNameBuilder.java
@@ -66,7 +66,7 @@ public class ObjectNameBuilder {
return new ObjectName(sb.toString());
} catch (final MalformedObjectNameException e) {
- throw new IllegalStateException("Failed to build valid name for: " + sb.toString(), e);
+ throw new IllegalStateException("Failed to build valid name for: " + sb, e);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/806df6dc/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
index 49f891e..d9f4618 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/AutoConnectionTracker.java
@@ -140,7 +140,7 @@ public class AutoConnectionTracker implements ConnectionTracker {
sb.append("\n ").append("Connection handle opened at ").append(stackTraceToString(connectionInfo.getTrace().getStackTrace()));
}
- logger.warning("Transaction complete, but connection still has handles associated: " + managedConnectionInfo + "\nAbandoned connection information: " + sb.toString());
+ logger.warning("Transaction complete, but connection still has handles associated: " + managedConnectionInfo + "\nAbandoned connection information: " + sb);
}
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/806df6dc/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
index b335614..2f8c60d 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
@@ -281,7 +281,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
parser.parse(metadata, handler);
if (handler.timestamp != null && handler.buildNumber != null) {
return defaultVersion.substring(0, defaultVersion.length() - SNAPSHOT_SUFFIX.length())
- + "-" + handler.timestamp.toString() + "-" + handler.buildNumber.toString();
+ + "-" + handler.timestamp + "-" + handler.buildNumber;
}
} catch (final Exception e) {
// no-op: not parseable so ignoring
http://git-wip-us.apache.org/repos/asf/tomee/blob/806df6dc/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/InstallerServlet.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/InstallerServlet.java b/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/InstallerServlet.java
index 8bf7aac..03d5765 100644
--- a/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/InstallerServlet.java
+++ b/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/installer/InstallerServlet.java
@@ -49,7 +49,7 @@ public class InstallerServlet extends HttpServlet {
if (!list.isEmpty()) {
sb.deleteCharAt(sb.length() - 1);
}
- return "[" + sb.toString() + "]";
+ return "[" + sb + "]";
}
@Override
[3/6] tomee git commit: removes String concatenation loop in
SunConvertion
Posted by jg...@apache.org.
removes String concatenation loop in SunConvertion
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/20b08f50
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/20b08f50
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/20b08f50
Branch: refs/heads/master
Commit: 20b08f5093e2c562886d6221e5f2a6322bd158e1
Parents: afec54d
Author: Otavio Santana <ot...@gmail.com>
Authored: Thu Nov 22 13:24:17 2018 -0200
Committer: Otavio Santana <ot...@gmail.com>
Committed: Thu Nov 22 13:24:17 2018 -0200
----------------------------------------------------------------------
.../java/org/apache/openejb/config/SunConversion.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/20b08f50/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
index 5f40caa..3f987b0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
@@ -1170,7 +1170,7 @@ public class SunConversion implements DynamicDeployer {
final List bits = Collections.list(new StringTokenizer(queryFilter, " \t\n\r\f()&|<>=!~+-/*", true));
boolean inWitespace = false;
- String currentSymbol = "";
+ StringBuilder currentSymbol = new StringBuilder();
for (int i = 0; i < bits.size(); i++) {
final TokenType tokenType;
final String bit = (String) bits.get(i);
@@ -1190,7 +1190,7 @@ public class SunConversion implements DynamicDeployer {
case '<':
case '!':
// symbols are blindly coalesced so you can end up with nonsence like +-=+
- currentSymbol += bit.charAt(0);
+ currentSymbol.append(bit.charAt(0));
tokenType = TokenType.SYMBOL;
break;
default:
@@ -1201,8 +1201,8 @@ public class SunConversion implements DynamicDeployer {
inWitespace = false;
}
if (tokenType != TokenType.SYMBOL && currentSymbol.length() > 0) {
- tokens.add(currentSymbol);
- currentSymbol = "";
+ tokens.add(currentSymbol.toString());
+ currentSymbol = new StringBuilder();
}
if (tokenType == TokenType.NORMAL) {
tokens.add(bit);
@@ -1210,8 +1210,8 @@ public class SunConversion implements DynamicDeployer {
}
// add saved symobl if we have one
if (currentSymbol.length() > 0) {
- tokens.add(currentSymbol);
- currentSymbol = "";
+ tokens.add(currentSymbol.toString());
+ currentSymbol = new StringBuilder();
}
// strip off leading space
if (tokens.getFirst().equals(" ")) {