This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 51305dbf76 SonarQube bug fixes
51305dbf76 is described below
commit 51305dbf7663d4464c9b00ec853ffc62e18d5e9e
Author: James Bognar <[email protected]>
AuthorDate: Tue Feb 3 20:59:11 2026 -0500
SonarQube bug fixes
---
.../main/java/org/apache/juneau/csv/CsvParser.java | 14 ++------------
.../java/org/apache/juneau/csv/CsvSerializer.java | 14 ++------------
.../java/org/apache/juneau/html/HtmlParser.java | 14 ++------------
.../org/apache/juneau/html/HtmlSerializer.java | 14 ++------------
.../java/org/apache/juneau/json/JsonParser.java | 14 ++------------
.../apache/juneau/json/JsonSchemaSerializer.java | 14 ++------------
.../juneau/jsonschema/JsonSchemaGenerator.java | 14 ++------------
.../org/apache/juneau/msgpack/MsgPackParser.java | 14 ++------------
.../apache/juneau/msgpack/MsgPackSerializer.java | 14 ++------------
.../java/org/apache/juneau/oapi/OpenApiParser.java | 14 ++------------
.../org/apache/juneau/oapi/OpenApiSerializer.java | 14 ++------------
.../apache/juneau/plaintext/PlainTextParser.java | 14 ++------------
.../juneau/plaintext/PlainTextSerializer.java | 14 ++------------
.../org/apache/juneau/soap/SoapXmlSerializer.java | 14 ++------------
.../main/java/org/apache/juneau/uon/UonParser.java | 14 ++------------
.../juneau/urlencoding/UrlEncodingParser.java | 14 ++------------
.../juneau/urlencoding/UrlEncodingSerializer.java | 14 ++------------
.../main/java/org/apache/juneau/xml/XmlParser.java | 22 +++-------------------
.../java/org/apache/juneau/xml/XmlSerializer.java | 21 +++------------------
.../org/apache/juneau/rest/RestOperations.java | 4 +---
20 files changed, 41 insertions(+), 244 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index 92f31eb034..f9c5a7b88e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -620,22 +620,12 @@ public class CsvParser extends ReaderParser implements
CsvMetaProvider {
public CsvBeanPropertyMeta getCsvBeanPropertyMeta(BeanPropertyMeta bpm)
{
if (bpm == null)
return CsvBeanPropertyMeta.DEFAULT;
- CsvBeanPropertyMeta m = csvBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new CsvBeanPropertyMeta(bpm.getDelegateFor(), this);
- csvBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return csvBeanPropertyMetas.computeIfAbsent(bpm, k -> new
CsvBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from CsvMetaProvider */
public CsvClassMeta getCsvClassMeta(ClassMeta<?> cm) {
- CsvClassMeta m = csvClassMetas.get(cm);
- if (m == null) {
- m = new CsvClassMeta(cm, this);
- csvClassMetas.put(cm, m);
- }
- return m;
+ return csvClassMetas.computeIfAbsent(cm, k -> new
CsvClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index 125f01baa3..1843119ab1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -773,22 +773,12 @@ public class CsvSerializer extends WriterSerializer
implements CsvMetaProvider {
public CsvBeanPropertyMeta getCsvBeanPropertyMeta(BeanPropertyMeta bpm)
{
if (bpm == null)
return CsvBeanPropertyMeta.DEFAULT;
- CsvBeanPropertyMeta m = csvBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new CsvBeanPropertyMeta(bpm.getDelegateFor(), this);
- csvBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return csvBeanPropertyMetas.computeIfAbsent(bpm, k -> new
CsvBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from CsvMetaProvider */
public CsvClassMeta getCsvClassMeta(ClassMeta<?> cm) {
- CsvClassMeta m = csvClassMetas.get(cm);
- if (m == null) {
- m = new CsvClassMeta(cm, this);
- csvClassMetas.put(cm, m);
- }
- return m;
+ return csvClassMetas.computeIfAbsent(cm, k -> new
CsvClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index 2764b5bb19..1461ceb378 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -678,22 +678,12 @@ public class HtmlParser extends XmlParser implements
HtmlMetaProvider {
public HtmlBeanPropertyMeta getHtmlBeanPropertyMeta(BeanPropertyMeta
bpm) {
if (bpm == null)
return HtmlBeanPropertyMeta.DEFAULT;
- HtmlBeanPropertyMeta m = htmlBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new HtmlBeanPropertyMeta(bpm.getDelegateFor(),
this.getAnnotationProvider(), this);
- htmlBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return htmlBeanPropertyMetas.computeIfAbsent(bpm, k -> new
HtmlBeanPropertyMeta(k.getDelegateFor(), this.getAnnotationProvider(), this));
}
@Override /* Overridden from HtmlMetaProvider */
public HtmlClassMeta getHtmlClassMeta(ClassMeta<?> cm) {
- HtmlClassMeta m = htmlClassMetas.get(cm);
- if (m == null) {
- m = new HtmlClassMeta(cm, this);
- htmlClassMetas.put(cm, m);
- }
- return m;
+ return htmlClassMetas.computeIfAbsent(cm, k -> new
HtmlClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index a7eb8fad52..218944e820 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -1475,22 +1475,12 @@ public class HtmlSerializer extends XmlSerializer
implements HtmlMetaProvider {
public HtmlBeanPropertyMeta getHtmlBeanPropertyMeta(BeanPropertyMeta
bpm) {
if (bpm == null)
return HtmlBeanPropertyMeta.DEFAULT;
- HtmlBeanPropertyMeta m = htmlBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new HtmlBeanPropertyMeta(bpm.getDelegateFor(),
this.getAnnotationProvider(), this);
- htmlBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return htmlBeanPropertyMetas.computeIfAbsent(bpm, k -> new
HtmlBeanPropertyMeta(k.getDelegateFor(), this.getAnnotationProvider(), this));
}
@Override /* Overridden from HtmlMetaProvider */
public HtmlClassMeta getHtmlClassMeta(ClassMeta<?> cm) {
- HtmlClassMeta m = htmlClassMetas.get(cm);
- if (m == null) {
- m = new HtmlClassMeta(cm, this);
- htmlClassMetas.put(cm, m);
- }
- return m;
+ return htmlClassMetas.computeIfAbsent(cm, k -> new
HtmlClassMeta(k, this));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index ab68d76111..531f16d9ad 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -772,22 +772,12 @@ public class JsonParser extends ReaderParser implements
JsonMetaProvider {
public JsonBeanPropertyMeta getJsonBeanPropertyMeta(BeanPropertyMeta
bpm) {
if (bpm == null)
return JsonBeanPropertyMeta.DEFAULT;
- JsonBeanPropertyMeta m = jsonBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new JsonBeanPropertyMeta(bpm.getDelegateFor(),
this);
- jsonBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return jsonBeanPropertyMetas.computeIfAbsent(bpm, k -> new
JsonBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from JsonMetaProvider */
public JsonClassMeta getJsonClassMeta(ClassMeta<?> cm) {
- JsonClassMeta m = jsonClassMetas.get(cm);
- if (m == null) {
- m = new JsonClassMeta(cm, this);
- jsonClassMetas.put(cm, m);
- }
- return m;
+ return jsonClassMetas.computeIfAbsent(cm, k -> new
JsonClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 6304f0d850..e14dc9e76e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -1008,22 +1008,12 @@ public class JsonSchemaSerializer extends
JsonSerializer implements JsonSchemaMe
@Override /* Overridden from JsonSchemaMetaProvider */
public JsonSchemaBeanPropertyMeta
getJsonSchemaBeanPropertyMeta(BeanPropertyMeta bpm) {
- JsonSchemaBeanPropertyMeta m =
jsonSchemaBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new
JsonSchemaBeanPropertyMeta(bpm.getDelegateFor(), this);
- jsonSchemaBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return jsonSchemaBeanPropertyMetas.computeIfAbsent(bpm, k ->
new JsonSchemaBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from JsonSchemaMetaProvider */
public JsonSchemaClassMeta getJsonSchemaClassMeta(ClassMeta<?> cm) {
- JsonSchemaClassMeta m = jsonSchemaClassMetas.get(cm);
- if (m == null) {
- m = new JsonSchemaClassMeta(cm, this);
- jsonSchemaClassMetas.put(cm, m);
- }
- return m;
+ return jsonSchemaClassMetas.computeIfAbsent(cm, k -> new
JsonSchemaClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index 7317eb23c7..98d4c06fcb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -905,22 +905,12 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
@Override
public JsonSchemaBeanPropertyMeta
getJsonSchemaBeanPropertyMeta(BeanPropertyMeta bpm) {
- JsonSchemaBeanPropertyMeta m =
jsonSchemaBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new JsonSchemaBeanPropertyMeta(bpm, this);
- jsonSchemaBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return jsonSchemaBeanPropertyMetas.computeIfAbsent(bpm, k ->
new JsonSchemaBeanPropertyMeta(k, this));
}
@Override
public JsonSchemaClassMeta getJsonSchemaClassMeta(ClassMeta<?> cm) {
- JsonSchemaClassMeta m = jsonSchemaClassMetas.get(cm);
- if (m == null) {
- m = new JsonSchemaClassMeta(cm, this);
- jsonSchemaClassMetas.put(cm, m);
- }
- return m;
+ return jsonSchemaClassMetas.computeIfAbsent(cm, k -> new
JsonSchemaClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index 04e20a044a..ba9ca5b5d9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -655,22 +655,12 @@ public class MsgPackParser extends InputStreamParser
implements MsgPackMetaProvi
public MsgPackBeanPropertyMeta
getMsgPackBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return MsgPackBeanPropertyMeta.DEFAULT;
- MsgPackBeanPropertyMeta m = msgPackBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new MsgPackBeanPropertyMeta(bpm.getDelegateFor(),
this);
- msgPackBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return msgPackBeanPropertyMetas.computeIfAbsent(bpm, k -> new
MsgPackBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from MsgPackMetaProvider */
public MsgPackClassMeta getMsgPackClassMeta(ClassMeta<?> cm) {
- MsgPackClassMeta m = msgPackClassMetas.get(cm);
- if (m == null) {
- m = new MsgPackClassMeta(cm, this);
- msgPackClassMetas.put(cm, m);
- }
- return m;
+ return msgPackClassMetas.computeIfAbsent(cm, k -> new
MsgPackClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index bd11d5a191..5ecd4aa26b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -801,22 +801,12 @@ public class MsgPackSerializer extends
OutputStreamSerializer implements MsgPack
public MsgPackBeanPropertyMeta
getMsgPackBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return MsgPackBeanPropertyMeta.DEFAULT;
- MsgPackBeanPropertyMeta m = msgPackBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new MsgPackBeanPropertyMeta(bpm.getDelegateFor(),
this);
- msgPackBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return msgPackBeanPropertyMetas.computeIfAbsent(bpm, k -> new
MsgPackBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from MsgPackMetaProvider */
public MsgPackClassMeta getMsgPackClassMeta(ClassMeta<?> cm) {
- MsgPackClassMeta m = msgPackClassMetas.get(cm);
- if (m == null) {
- m = new MsgPackClassMeta(cm, this);
- msgPackClassMetas.put(cm, m);
- }
- return m;
+ return msgPackClassMetas.computeIfAbsent(cm, k -> new
MsgPackClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
index 426d6452d7..9d512463c6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
@@ -772,22 +772,12 @@ public class OpenApiParser extends UonParser implements
OpenApiMetaProvider {
public OpenApiBeanPropertyMeta
getOpenApiBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return OpenApiBeanPropertyMeta.DEFAULT;
- OpenApiBeanPropertyMeta m = openApiBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new OpenApiBeanPropertyMeta(bpm.getDelegateFor(),
this);
- openApiBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return openApiBeanPropertyMetas.computeIfAbsent(bpm, k -> new
OpenApiBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from OpenApiMetaProvider */
public OpenApiClassMeta getOpenApiClassMeta(ClassMeta<?> cm) {
- OpenApiClassMeta m = openApiClassMetas.get(cm);
- if (m == null) {
- m = new OpenApiClassMeta(cm, this);
- openApiClassMetas.put(cm, m);
- }
- return m;
+ return openApiClassMetas.computeIfAbsent(cm, k -> new
OpenApiClassMeta(k, this));
}
@Override /* Overridden from HttpPartParser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index 988494bfe0..9395d4a09e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -940,22 +940,12 @@ public class OpenApiSerializer extends UonSerializer
implements OpenApiMetaProvi
public OpenApiBeanPropertyMeta
getOpenApiBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return OpenApiBeanPropertyMeta.DEFAULT;
- OpenApiBeanPropertyMeta m = openApiBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new OpenApiBeanPropertyMeta(bpm.getDelegateFor(),
this);
- openApiBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return openApiBeanPropertyMetas.computeIfAbsent(bpm, k -> new
OpenApiBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from OpenApiMetaProvider */
public OpenApiClassMeta getOpenApiClassMeta(ClassMeta<?> cm) {
- OpenApiClassMeta m = openApiClassMetas.get(cm);
- if (m == null) {
- m = new OpenApiClassMeta(cm, this);
- openApiClassMetas.put(cm, m);
- }
- return m;
+ return openApiClassMetas.computeIfAbsent(cm, k -> new
OpenApiClassMeta(k, this));
}
@Override /* Overridden from HttpPartSerializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 63d618d0ac..c15c537f5c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -639,22 +639,12 @@ public class PlainTextParser extends ReaderParser
implements PlainTextMetaProvid
public PlainTextBeanPropertyMeta
getPlainTextBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return PlainTextBeanPropertyMeta.DEFAULT;
- var m = plainTextBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new PlainTextBeanPropertyMeta(bpm.getDelegateFor(),
this);
- plainTextBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return plainTextBeanPropertyMetas.computeIfAbsent(bpm, k -> new
PlainTextBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from PlainTextMetaProvider */
public PlainTextClassMeta getPlainTextClassMeta(ClassMeta<?> cm) {
- var m = plainTextClassMetas.get(cm);
- if (m == null) {
- m = new PlainTextClassMeta(cm, this);
- plainTextClassMetas.put(cm, m);
- }
- return m;
+ return plainTextClassMetas.computeIfAbsent(cm, k -> new
PlainTextClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 6a9a8af72f..40c165fdc3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -782,22 +782,12 @@ public class PlainTextSerializer extends WriterSerializer
implements PlainTextMe
public PlainTextBeanPropertyMeta
getPlainTextBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return PlainTextBeanPropertyMeta.DEFAULT;
- var m = plainTextBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new PlainTextBeanPropertyMeta(bpm.getDelegateFor(),
this);
- plainTextBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return plainTextBeanPropertyMetas.computeIfAbsent(bpm, k -> new
PlainTextBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from PlainTextMetaProvider */
public PlainTextClassMeta getPlainTextClassMeta(ClassMeta<?> cm) {
- var m = plainTextClassMetas.get(cm);
- if (m == null) {
- m = new PlainTextClassMeta(cm, this);
- plainTextClassMetas.put(cm, m);
- }
- return m;
+ return plainTextClassMetas.computeIfAbsent(cm, k -> new
PlainTextClassMeta(k, this));
}
@Override /* Overridden from Context */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index a0a9fb77de..78cea3bae1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -884,22 +884,12 @@ public class SoapXmlSerializer extends XmlSerializer
implements SoapXmlMetaProvi
public SoapXmlBeanPropertyMeta
getSoapXmlBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return SoapXmlBeanPropertyMeta.DEFAULT;
- var m = soapXmlBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new SoapXmlBeanPropertyMeta(bpm.getDelegateFor(),
this);
- soapXmlBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return soapXmlBeanPropertyMetas.computeIfAbsent(bpm, k -> new
SoapXmlBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from SoapXmlMetaProvider */
public SoapXmlClassMeta getSoapXmlClassMeta(ClassMeta<?> cm) {
- var m = soapXmlClassMetas.get(cm);
- if (m == null) {
- m = new SoapXmlClassMeta(cm, this);
- soapXmlClassMetas.put(cm, m);
- }
- return m;
+ return soapXmlClassMetas.computeIfAbsent(cm, k -> new
SoapXmlClassMeta(k, this));
}
@Override /* Overridden from XmlSerializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 0b7e675daf..fbb4acfd16 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -765,22 +765,12 @@ public class UonParser extends ReaderParser implements
HttpPartParser, UonMetaPr
public UonBeanPropertyMeta getUonBeanPropertyMeta(BeanPropertyMeta bpm)
{
if (bpm == null)
return UonBeanPropertyMeta.DEFAULT;
- UonBeanPropertyMeta m = uonBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new UonBeanPropertyMeta(bpm.getDelegateFor(), this);
- uonBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return uonBeanPropertyMetas.computeIfAbsent(bpm, k -> new
UonBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from UonMetaProvider */
public UonClassMeta getUonClassMeta(ClassMeta<?> cm) {
- UonClassMeta m = uonClassMetas.get(cm);
- if (m == null) {
- m = new UonClassMeta(cm, this);
- uonClassMetas.put(cm, m);
- }
- return m;
+ return uonClassMetas.computeIfAbsent(cm, k -> new
UonClassMeta(k, this));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 4ae96899e4..4f5fdcd9da 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -735,22 +735,12 @@ public class UrlEncodingParser extends UonParser
implements UrlEncodingMetaProvi
public UrlEncodingBeanPropertyMeta
getUrlEncodingBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return UrlEncodingBeanPropertyMeta.DEFAULT;
- UrlEncodingBeanPropertyMeta m =
urlEncodingBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new
UrlEncodingBeanPropertyMeta(bpm.getDelegateFor(), this);
- urlEncodingBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return urlEncodingBeanPropertyMetas.computeIfAbsent(bpm, k ->
new UrlEncodingBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from UrlEncodingMetaProvider */
public UrlEncodingClassMeta getUrlEncodingClassMeta(ClassMeta<?> cm) {
- UrlEncodingClassMeta m = urlEncodingClassMetas.get(cm);
- if (m == null) {
- m = new UrlEncodingClassMeta(cm, this);
- urlEncodingClassMetas.put(cm, m);
- }
- return m;
+ return urlEncodingClassMetas.computeIfAbsent(cm, k -> new
UrlEncodingClassMeta(k, this));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 8f3f64d74c..9c122e1f39 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -1026,22 +1026,12 @@ public class UrlEncodingSerializer extends
UonSerializer implements UrlEncodingM
public UrlEncodingBeanPropertyMeta
getUrlEncodingBeanPropertyMeta(BeanPropertyMeta bpm) {
if (bpm == null)
return UrlEncodingBeanPropertyMeta.DEFAULT;
- UrlEncodingBeanPropertyMeta m =
urlEncodingBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new
UrlEncodingBeanPropertyMeta(bpm.getDelegateFor(), this);
- urlEncodingBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return urlEncodingBeanPropertyMetas.computeIfAbsent(bpm, k ->
new UrlEncodingBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from UrlEncodingMetaProvider */
public UrlEncodingClassMeta getUrlEncodingClassMeta(ClassMeta<?> cm) {
- UrlEncodingClassMeta m = urlEncodingClassMetas.get(cm);
- if (m == null) {
- m = new UrlEncodingClassMeta(cm, this);
- urlEncodingClassMetas.put(cm, m);
- }
- return m;
+ return urlEncodingClassMetas.computeIfAbsent(cm, k -> new
UrlEncodingClassMeta(k, this));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index 29b769c2ad..a935026825 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -811,33 +811,17 @@ public class XmlParser extends ReaderParser implements
XmlMetaProvider {
@Override /* Overridden from XmlMetaProvider */
public XmlBeanMeta getXmlBeanMeta(BeanMeta<?> bm) {
- var m = xmlBeanMetas.get(bm);
- if (m == null) {
- m = new XmlBeanMeta(bm, this);
- xmlBeanMetas.put(bm, m);
- }
- return m;
+ return xmlBeanMetas.computeIfAbsent(bm, k -> new XmlBeanMeta(k,
this));
}
@Override /* Overridden from XmlMetaProvider */
public XmlBeanPropertyMeta getXmlBeanPropertyMeta(BeanPropertyMeta bpm)
{
- var m = xmlBeanPropertyMetas.get(bpm);
- if (m == null) {
- var dbpm = bpm.getDelegateFor();
- m = new XmlBeanPropertyMeta(dbpm, this);
- xmlBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return xmlBeanPropertyMetas.computeIfAbsent(bpm, k -> new
XmlBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from XmlMetaProvider */
public XmlClassMeta getXmlClassMeta(ClassMeta<?> cm) {
- var m = xmlClassMetas.get(cm);
- if (m == null) {
- m = new XmlClassMeta(cm, this);
- xmlClassMetas.put(cm, m);
- }
- return m;
+ return xmlClassMetas.computeIfAbsent(cm, k -> new
XmlClassMeta(k, this));
}
private static <T> T newInstance(Class<T> c) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 248e240bf1..33c5a56a58 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -1270,32 +1270,17 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
@Override /* Overridden from XmlMetaProvider */
public XmlBeanMeta getXmlBeanMeta(BeanMeta<?> bm) {
- XmlBeanMeta m = xmlBeanMetas.get(bm);
- if (m == null) {
- m = new XmlBeanMeta(bm, this);
- xmlBeanMetas.put(bm, m);
- }
- return m;
+ return xmlBeanMetas.computeIfAbsent(bm, k -> new XmlBeanMeta(k,
this));
}
@Override /* Overridden from XmlMetaProvider */
public XmlBeanPropertyMeta getXmlBeanPropertyMeta(BeanPropertyMeta bpm)
{
- XmlBeanPropertyMeta m = xmlBeanPropertyMetas.get(bpm);
- if (m == null) {
- m = new XmlBeanPropertyMeta(bpm.getDelegateFor(), this);
- xmlBeanPropertyMetas.put(bpm, m);
- }
- return m;
+ return xmlBeanPropertyMetas.computeIfAbsent(bpm, k -> new
XmlBeanPropertyMeta(k.getDelegateFor(), this));
}
@Override /* Overridden from XmlMetaProvider */
public XmlClassMeta getXmlClassMeta(ClassMeta<?> cm) {
- XmlClassMeta m = xmlClassMetas.get(cm);
- if (m == null) {
- m = new XmlClassMeta(cm, this);
- xmlClassMetas.put(cm, m);
- }
- return m;
+ return xmlClassMetas.computeIfAbsent(cm, k -> new
XmlClassMeta(k, this));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
index 56614b8ae8..ba19766789 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
@@ -70,9 +70,7 @@ public class RestOperations {
*/
public Builder add(String httpMethodName, RestOpContext value) {
httpMethodName = httpMethodName.toUpperCase();
- if (! map.containsKey(httpMethodName))
- map.put(httpMethodName, new TreeSet<>());
- map.get(httpMethodName).add(value);
+ map.computeIfAbsent(httpMethodName, k -> new
TreeSet<>()).add(value);
set.add(value);
return this;
}
