Skip to content

Commit 348717a

Browse files
ludochgae-java-bot
ludoch
authored and
gae-java-bot
committed
Refactor StringBuilder usage to use append() calls.
PiperOrigin-RevId: 863263787 Change-Id: I5b7805c536e69fd544fc71edadd0d799e3e5c145
1 parent 967dabb commit 348717a

File tree

7 files changed

+98
-79
lines changed

7 files changed

+98
-79
lines changed

‎lib/tools_api/src/main/java/com/google/appengine/tools/admin/AppYamlTranslator.java‎

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -148,36 +148,36 @@ private void appendIfNotZero(StringBuilder builder, String tag, double value) {
148148

149149
private void translateAppEngineWebXml(StringBuilder builder) {
150150
if (appEngineWebXml.getAppId() != null) {
151-
builder.append("application: '" + appEngineWebXml.getAppId() + "'\n");
151+
builder.append("application: '").append(appEngineWebXml.getAppId()).append("'\n");
152152
}
153-
builder.append("runtime: " + runtime + "\n");
153+
builder.append("runtime: ").append(runtime).append("\n");
154154
if (appEngineWebXml.getUseVm()) {
155155
builder.append("vm: True\n");
156156
}
157157

158158
if (appEngineWebXml.isFlexible()) {
159-
builder.append("env: " + appEngineWebXml.getEnv() + "\n");
159+
builder.append("env: ").append(appEngineWebXml.getEnv()).append("\n");
160160
}
161161

162162
if (appEngineWebXml.getEntrypoint() != null) {
163-
builder.append("entrypoint: '" + appEngineWebXml.getEntrypoint() + "'\n");
163+
builder.append("entrypoint: '").append(appEngineWebXml.getEntrypoint()).append("'\n");
164164
}
165165

166166
if (appEngineWebXml.getRuntimeChannel() != null) {
167-
builder.append("runtime_channel: " + appEngineWebXml.getRuntimeChannel() + "\n");
167+
builder.append("runtime_channel: ").append(appEngineWebXml.getRuntimeChannel()).append("\n");
168168
}
169169
if (appEngineWebXml.getMajorVersionId() != null) {
170-
builder.append("version: '" + appEngineWebXml.getMajorVersionId() + "'\n");
170+
builder.append("version: '").append(appEngineWebXml.getMajorVersionId()).append("'\n");
171171
}
172172

173173
if (appEngineWebXml.getService() != null) {
174-
builder.append("service: '" + appEngineWebXml.getService() + "'\n");
174+
builder.append("service: '").append(appEngineWebXml.getService()).append("'\n");
175175
} else if (appEngineWebXml.getModule() != null) {
176-
builder.append("module: '" + appEngineWebXml.getModule() + "'\n");
176+
builder.append("module: '").append(appEngineWebXml.getModule()).append("'\n");
177177
}
178178

179179
if (appEngineWebXml.getInstanceClass() != null) {
180-
builder.append("instance_class: " + appEngineWebXml.getInstanceClass() + "\n");
180+
builder.append("instance_class: ").append(appEngineWebXml.getInstanceClass()).append("\n");
181181
}
182182

183183
if (!appEngineWebXml.getAutomaticScaling().isEmpty()) {
@@ -248,14 +248,14 @@ private void translateAppEngineWebXml(StringBuilder builder) {
248248
}
249249
builder.append(" custom_metrics:\n");
250250
for (CustomMetricUtilization metric : settings.getCustomMetrics()) {
251-
builder.append(" - metric_name: '" + metric.getMetricName() + "'\n");
252-
builder.append(" target_type: '" + metric.getTargetType() + "'\n");
251+
builder.append(" - metric_name: '").append(metric.getMetricName()).append("'\n");
252+
builder.append(" target_type: '").append(metric.getTargetType()).append("'\n");
253253
appendIfNotNull(builder, " target_utilization: ", metric.getTargetUtilization());
254254
appendIfNotNull(builder,
255255
" single_instance_assignment: ",
256256
metric.getSingleInstanceAssignment());
257257
if (metric.getFilter() != null) {
258-
builder.append(" filter: '" + metric.getFilter() + "'\n");
258+
builder.append(" filter: '").append(metric.getFilter()).append("'\n");
259259
}
260260
}
261261
}
@@ -264,28 +264,28 @@ private void translateAppEngineWebXml(StringBuilder builder) {
264264
if (!appEngineWebXml.getManualScaling().isEmpty()) {
265265
builder.append("manual_scaling:\n");
266266
AppEngineWebXml.ManualScaling settings = appEngineWebXml.getManualScaling();
267-
builder.append(" instances: " + settings.getInstances() + "\n");
267+
builder.append(" instances: ").append(settings.getInstances()).append("\n");
268268
}
269269

270270
if (!appEngineWebXml.getBasicScaling().isEmpty()) {
271271
builder.append("basic_scaling:\n");
272272
AppEngineWebXml.BasicScaling settings = appEngineWebXml.getBasicScaling();
273-
builder.append(" max_instances: " + settings.getMaxInstances() + "\n");
273+
builder.append(" max_instances: ").append(settings.getMaxInstances()).append("\n");
274274
appendIfNotNull(builder, " idle_timeout: ", settings.getIdleTimeout());
275275
}
276276

277277
Collection<String> services = appEngineWebXml.getInboundServices();
278278
if (!services.isEmpty()) {
279279
builder.append("inbound_services:\n");
280280
for (String service : services) {
281-
builder.append("- " + service + "\n");
281+
builder.append("- ").append(service).append("\n");
282282
}
283283
}
284284
Collection<String> appEngineBundledServices = appEngineWebXml.getAppEngineBundledServices();
285285
if (!appEngineBundledServices.isEmpty()) {
286286
builder.append("app_engine_bundled_services:\n");
287287
for (String service : appEngineBundledServices) {
288-
builder.append("- " + service + "\n");
288+
builder.append("- ").append(service).append("\n");
289289
}
290290
}
291291

@@ -310,7 +310,7 @@ private void translateAppEngineWebXml(StringBuilder builder) {
310310
}
311311

312312
if (appEngineWebXml.getAutoIdPolicy() != null) {
313-
builder.append("auto_id_policy: " + appEngineWebXml.getAutoIdPolicy() + "\n");
313+
builder.append("auto_id_policy: ").append(appEngineWebXml.getAutoIdPolicy()).append("\n");
314314
} else {
315315
// NOTE: The YAML parsing and validation done in the admin console must
316316
// set the value for unspecified auto_id_policy to 'legacy' in order to achieve
@@ -327,23 +327,23 @@ private void translateAppEngineWebXml(StringBuilder builder) {
327327
if (appEngineWebXml.getVpcAccessConnector() != null) {
328328
VpcAccessConnector connector = appEngineWebXml.getVpcAccessConnector();
329329
builder.append("vpc_access_connector:\n");
330-
builder.append(" name: " + connector.getName() + "\n");
330+
builder.append(" name: ").append(connector.getName()).append("\n");
331331
if (connector.getEgressSetting().isPresent()) {
332-
builder.append(" egress_setting: " + connector.getEgressSetting().get() + "\n");
332+
builder.append(" egress_setting: ").append(connector.getEgressSetting().get()).append("\n");
333333
}
334334
}
335335

336336
if (appEngineWebXml.getServiceAccount() != null) {
337-
builder.append("service_account: " + appEngineWebXml.getServiceAccount() + "\n");
337+
builder.append("service_account: ").append(appEngineWebXml.getServiceAccount()).append("\n");
338338
}
339339

340340
List<AdminConsolePage> adminConsolePages = appEngineWebXml.getAdminConsolePages();
341341
if (!adminConsolePages.isEmpty()) {
342342
builder.append("admin_console:\n");
343343
builder.append(" pages:\n");
344344
for (AdminConsolePage page : adminConsolePages) {
345-
builder.append(" - name: " + page.getName() + "\n");
346-
builder.append(" url: " + page.getUrl() + "\n");
345+
builder.append(" - name: ").append(page.getName()).append("\n");
346+
builder.append(" url: ").append(page.getUrl()).append("\n");
347347
}
348348
}
349349

@@ -362,13 +362,13 @@ private void translateAppEngineWebXml(StringBuilder builder) {
362362
+ fileName + ", out of " + staticFiles);
363363
}
364364
// error_handlers doesn't want a leading slash here.
365-
builder.append("- file: __static__" + fileName + "\n");
365+
builder.append("- file: __static__").append(fileName).append("\n");
366366
if (handler.getErrorCode() != null) {
367-
builder.append(" error_code: " + handler.getErrorCode() + "\n");
367+
builder.append(" error_code: ").append(handler.getErrorCode()).append("\n");
368368
}
369369
String mimeType = webXml.getMimeTypeForPath(handler.getFile());
370370
if (mimeType != null) {
371-
builder.append(" mime_type: " + mimeType + "\n");
371+
builder.append(" mime_type: ").append(mimeType).append("\n");
372372
}
373373
}
374374
}
@@ -383,7 +383,7 @@ private void translateAppEngineWebXml(StringBuilder builder) {
383383
ApiConfig apiConfig = appEngineWebXml.getApiConfig();
384384
if (apiConfig != null) {
385385
builder.append("api_config:\n");
386-
builder.append(" url: " + apiConfig.getUrl() + "\n");
386+
builder.append(" url: ").append(apiConfig.getUrl()).append("\n");
387387
builder.append(" script: unused\n");
388388
}
389389

@@ -454,8 +454,11 @@ private void appendBetaSettings(Map<String, String> betaSettings, StringBuilder
454454
if (betaSettings != null && !betaSettings.isEmpty()) {
455455
builder.append("beta_settings:\n");
456456
for (Map.Entry<String, String> setting : betaSettings.entrySet()) {
457-
builder.append(
458-
" " + yamlQuote(setting.getKey()) + ": " + yamlQuote(setting.getValue()) + "\n");
457+
builder.append(" ")
458+
.append(yamlQuote(setting.getKey()))
459+
.append(": ")
460+
.append(yamlQuote(setting.getValue()))
461+
.append("\n");
459462
}
460463
}
461464
}
@@ -516,7 +519,7 @@ private void appendNetwork(Network network, StringBuilder builder) {
516519
if (!network.getForwardedPorts().isEmpty()) {
517520
builder.append(" forwarded_ports:\n");
518521
for (String forwardedPort : network.getForwardedPorts()) {
519-
builder.append(" - " + forwardedPort + "\n");
522+
builder.append(" - ").append(forwardedPort).append("\n");
520523
}
521524
}
522525
appendIfNotNull(builder, " name: ", network.getName());
@@ -660,8 +663,9 @@ public void translateGlob(StringBuilder builder, Glob glob) {
660663
(List<String>) glob.getProperty(WELCOME_FILES, RESOLVER);
661664
if (welcomeFiles != null) {
662665
for (String welcomeFile : welcomeFiles) {
663-
builder.append("- url: (" + regex + ")\n");
664-
builder.append(" static_files: __static__" + root + "\\1" + welcomeFile + "\n");
666+
builder.append("- url: (").append(regex).append(")\n");
667+
builder.append(" static_files: __static__").append(root).append("\\1").append(welcomeFile)
668+
.append("\n");
665669
builder.append(" upload: __NOT_USED__\n");
666670
builder.append(" require_matching_file: True\n");
667671
translateHandlerOptions(builder, glob);
@@ -670,8 +674,8 @@ public void translateGlob(StringBuilder builder, Glob glob) {
670674
} else {
671675
Boolean isStatic = (Boolean) glob.getProperty(STATIC_PROPERTY, RESOLVER);
672676
if (isStatic != null && isStatic.booleanValue()) {
673-
builder.append("- url: (" + regex + ")\n");
674-
builder.append(" static_files: __static__" + root + "\\1\n");
677+
builder.append("- url: (").append(regex).append(")\n");
678+
builder.append(" static_files: __static__").append(root).append("\\1\n");
675679
builder.append(" upload: __NOT_USED__\n");
676680
builder.append(" require_matching_file: True\n");
677681
translateHandlerOptions(builder, glob);
@@ -684,7 +688,7 @@ private void translateAdditionalStaticOptions(StringBuilder builder, Glob glob)
684688
throws AppEngineConfigException {
685689
String expiration = (String) glob.getProperty(EXPIRATION_PROPERTY, RESOLVER);
686690
if (expiration != null) {
687-
builder.append(" expiration: " + expiration + "\n");
691+
builder.append(" expiration: ").append(expiration).append("\n");
688692
}
689693

690694
@SuppressWarnings("unchecked")
@@ -787,7 +791,7 @@ public void translateGlob(StringBuilder builder, Glob glob) {
787791

788792
Boolean isDynamic = (Boolean) glob.getProperty(DYNAMIC_PROPERTY, RESOLVER);
789793
if (isDynamic != null && isDynamic.booleanValue()) {
790-
builder.append("- url: " + regex + "\n");
794+
builder.append("- url: ").append(regex).append("\n");
791795
builder.append(" script: unused\n");
792796
translateHandlerOptions(builder, glob);
793797
}

‎runtime/impl/src/main/java/com/google/apphosting/runtime/RequestManager.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,8 @@ private void checkForDeadlocks(final RequestToken token) {
817817
long[] deadlockedThreadsIds = THREAD_MX.findDeadlockedThreads();
818818
if (deadlockedThreadsIds != null) {
819819
StringBuilder builder = new StringBuilder();
820-
builder.append("Detected a deadlock across " + deadlockedThreadsIds.length + " threads:");
820+
builder.append("Detected a deadlock across ").append(deadlockedThreadsIds.length)
821+
.append(" threads:");
821822
for (ThreadInfo info :
822823
THREAD_MX.getThreadInfo(deadlockedThreadsIds, MAXIMUM_DEADLOCK_STACK_LENGTH)) {
823824
builder.append(info);
@@ -839,7 +840,8 @@ private void logMemoryStats() {
839840
private void logAllStackTraces() {
840841
long[] allthreadIds = THREAD_MX.getAllThreadIds();
841842
StringBuilder builder = new StringBuilder();
842-
builder.append("Dumping thread info for all " + allthreadIds.length + " runtime threads:");
843+
builder.append("Dumping thread info for all ").append(allthreadIds.length)
844+
.append(" runtime threads:");
843845
for (ThreadInfo info : THREAD_MX.getThreadInfo(allthreadIds, MAXIMUM_DEADLOCK_STACK_LENGTH)) {
844846
builder.append(info);
845847
builder.append("\n");

‎utils/src/main/java/com/google/apphosting/utils/config/BackendsXml.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,24 @@ public String toYaml() {
6969
if (!backends.isEmpty()) {
7070
builder.append("backends:\n");
7171
for (BackendsXml.Entry entry : backends) {
72-
builder.append("- name: " + entry.getName() + "\n");
72+
builder.append("- name: ").append(entry.getName()).append("\n");
7373
if (entry.getInstances() != null) {
74-
builder.append(" instances: " + entry.getInstances() + "\n");
74+
builder.append(" instances: ").append(entry.getInstances()).append("\n");
7575
}
7676
if (entry.getInstanceClass() != null) {
77-
builder.append(" class: " + entry.getInstanceClass() + "\n");
77+
builder.append(" class: ").append(entry.getInstanceClass()).append("\n");
7878
}
7979
if (entry.getMaxConcurrentRequests() != null) {
80-
builder.append(" max_concurrent_requests: " + entry.getMaxConcurrentRequests() + "\n");
80+
builder.append(" max_concurrent_requests: ").append(entry.getMaxConcurrentRequests())
81+
.append("\n");
8182
}
8283
List<String> options = new ArrayList<String>();
8384
for (BackendsXml.Option option : entry.getOptions()) {
8485
options.add(option.getYamlValue());
8586
}
8687
if (!options.isEmpty()) {
87-
builder.append(" options: " + Joiner.on(", ").useForNull("null").join(options) + "\n");
88+
builder.append(" options: ").append(Joiner.on(", ").useForNull("null").join(options))
89+
.append("\n");
8890
}
8991
}
9092
}
@@ -239,19 +241,19 @@ public String toString() {
239241
builder.append("Backend: ");
240242
builder.append(name);
241243
if (instances != null) {
242-
builder.append(", instances = " + instances);
244+
builder.append(", instances = ").append(instances);
243245
}
244246
if (instanceClass != null) {
245-
builder.append(", instanceClass = " + instanceClass);
247+
builder.append(", instanceClass = ").append(instanceClass);
246248
}
247249
if (maxConcurrentRequests != null) {
248-
builder.append(", maxConcurrentRequests = " + maxConcurrentRequests);
250+
builder.append(", maxConcurrentRequests = ").append(maxConcurrentRequests);
249251
}
250252
if (options != null) {
251-
builder.append(", options = " + options);
253+
builder.append(", options = ").append(options);
252254
}
253255
if (state != null) {
254-
builder.append(", state = " + state);
256+
builder.append(", state = ").append(state);
255257
}
256258
return builder.toString();
257259
}

‎utils/src/main/java/com/google/apphosting/utils/config/CronXml.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,14 @@ public String toYaml() {
200200
StringBuilder builder = new StringBuilder("cron:\n");
201201
for (Entry ent : entries) {
202202
// description may contain YAML special characters.
203-
builder.append("- description: '" + ent.getDescription().replace("'", "''") + "'\n");
204-
builder.append(" url: " + ent.getUrl() + "\n");
205-
builder.append(" schedule: " + ent.getSchedule() + "\n");
206-
builder.append(" timezone: " + ent.getTimezone() + "\n");
203+
builder.append("- description: '").append(ent.getDescription().replace("'", "''"))
204+
.append("'\n");
205+
builder.append(" url: ").append(ent.getUrl()).append("\n");
206+
builder.append(" schedule: ").append(ent.getSchedule()).append("\n");
207+
builder.append(" timezone: ").append(ent.getTimezone()).append("\n");
207208
String target = ent.getTarget();
208209
if (target != null) {
209-
builder.append(" target: " + target + "\n");
210+
builder.append(" target: ").append(target).append("\n");
210211
}
211212
RetryParametersXml retryParameters = ent.getRetryParameters();
212213
if (retryParameters != null) {

‎utils/src/main/java/com/google/apphosting/utils/config/DosXml.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ public void validateLastEntry() {
138138
public String toYaml() {
139139
StringBuilder builder = new StringBuilder("blacklist:\n");
140140
for (BlacklistEntry ent : blacklistEntries) {
141-
builder.append("- subnet: " + ent.getSubnet() + "\n");
141+
builder.append("- subnet: ").append(ent.getSubnet()).append("\n");
142142
if (!ent.getDescription().equals("")) {
143-
builder.append(" description: " + ent.getDescription() + "\n");
143+
builder.append(" description: ").append(ent.getDescription()).append("\n");
144144
}
145145
}
146146
return builder.toString();

‎utils/src/main/java/com/google/apphosting/utils/config/IndexesXml.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,21 @@ public String toYaml() {
129129
*/
130130
private String toLocalStyleYaml(){
131131
StringBuilder builder = new StringBuilder(50 * (1 + properties.size()));
132-
builder.append("- kind: \"" + kind + "\"\n");
132+
builder.append("- kind: \"").append(kind).append("\"\n");
133133
if (Boolean.TRUE.equals(ancestors)) {
134134
builder.append(" ancestor: yes\n");
135135
}
136136
if (!properties.isEmpty()) {
137137
builder.append(" properties:\n");
138138
for (PropertySort prop : properties) {
139-
builder.append(" - name: \"" + prop.getPropertyName() + "\"\n");
139+
builder.append(" - name: \"").append(prop.getPropertyName()).append("\"\n");
140140

141141
if (prop.getDirection() != null) {
142-
builder.append(" direction: " + prop.getDirection() + "\n");
142+
builder.append(" direction: ").append(prop.getDirection()).append("\n");
143143
}
144144

145145
if (prop.getMode() != null) {
146-
builder.append(" mode: " + prop.getMode() + "\n");
146+
builder.append(" mode: ").append(prop.getMode()).append("\n");
147147
}
148148
}
149149
}
@@ -162,7 +162,7 @@ private String toLocalStyleYaml(){
162162
private String toServerStyleYaml() {
163163
StringBuilder builder = new StringBuilder(50 * (1 + properties.size()));
164164
builder.append("- ").append(IndexYamlReader.INDEX_TAG).append("\n");
165-
builder.append(" kind: " + kind + "\n");
165+
builder.append(" kind: ").append(kind).append("\n");
166166
if (Boolean.TRUE.equals(ancestors)) {
167167
builder.append(" ancestor: yes\n");
168168
}
@@ -186,7 +186,7 @@ private String toServerStyleYaml() {
186186
}
187187

188188
builder.append(" ");
189-
builder.append("name: " + prop.getPropertyName());
189+
builder.append("name: ").append(prop.getPropertyName());
190190
builder.append("}\n");
191191
}
192192
}
@@ -197,16 +197,17 @@ public String toXmlString() {
197197
StringBuilder builder = new StringBuilder(100 * (1 + properties.size()));
198198
String ancestorAttribute = ancestors == null ? ""
199199
: String.format(" ancestor=\"%s\"", ancestors);
200-
builder.append("<datastore-index kind=\"" + kind + "\"" + ancestorAttribute + ">\n");
200+
builder.append("<datastore-index kind=\"").append(kind).append("\"")
201+
.append(ancestorAttribute).append(">\n");
201202
for (PropertySort prop : properties) {
202-
builder.append(" <property name=\"" + prop.getPropertyName() + "\"");
203+
builder.append(" <property name=\"").append(prop.getPropertyName()).append("\"");
203204

204205
if (prop.getDirection() != null) {
205-
builder.append(" direction=\"" + prop.getDirection() + "\"");
206+
builder.append(" direction=\"").append(prop.getDirection()).append("\"");
206207
}
207208

208209
if (prop.getMode() != null) {
209-
builder.append(" mode=\"" + prop.getMode() + "\"");
210+
builder.append(" mode=\"").append(prop.getMode()).append("\"");
210211
}
211212

212213
builder.append("/>\n");

0 commit comments

Comments
 (0)