This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 2c6f07271b Simplify nonNullElse code (#2547)
2c6f07271b is described below
commit 2c6f07271ba1cc58fda857794d85fbc361229344
Author: Martin Wiesner <[email protected]>
AuthorDate: Tue Mar 17 07:24:34 2026 +0100
Simplify nonNullElse code (#2547)
---
.../java/org/apache/openejb/jee/Application.java | 8 +++----
.../org/apache/openejb/jee/ApplicationClient.java | 8 +++----
.../java/org/apache/openejb/jee/Connector.java | 8 +++----
.../java/org/apache/openejb/jee/Connector10.java | 7 ++----
.../main/java/org/apache/openejb/jee/EjbJar.java | 8 +++----
.../org/apache/openejb/jee/JavaWsdlMapping.java | 8 +++----
.../java/org/apache/openejb/jee/Persistence.java | 8 +++----
.../java/org/apache/openejb/jee/TldTaglib.java | 8 +++----
.../java/org/apache/openejb/jee/Webservices.java | 7 ++----
.../openejb/jee/bval/ConstraintMappingsType.java | 8 +++----
.../openejb/jee/bval/ExecutableValidationType.java | 8 +++----
.../openejb/jee/bval/ValidationConfigType.java | 8 +++----
.../apache/openejb/jee/jba/ClientInterceptors.java | 8 +++----
.../org/apache/openejb/jee/jba/Interceptor.java | 14 ++++--------
.../org/apache/openejb/jee/jpa/EntityMappings.java | 8 +++----
.../jee/jpa/fragment/PersistenceFragment.java | 8 +++----
.../apache/openejb/jee/jpa/unit/Persistence.java | 8 +++----
.../java/org/apache/openejb/jee/sun/Cache.java | 20 +++++------------
.../org/apache/openejb/jee/sun/ClassLoader.java | 8 +++----
.../apache/openejb/jee/sun/ConstraintField.java | 20 +++++------------
.../openejb/jee/sun/ConstraintFieldValue.java | 20 +++++------------
.../openejb/jee/sun/IdempotentUrlPattern.java | 8 +++----
.../java/org/apache/openejb/jee/sun/KeyField.java | 8 +++----
.../org/apache/openejb/jee/sun/RefreshField.java | 8 +++----
.../org/apache/openejb/jee/sun/SessionManager.java | 8 +++----
.../java/org/apache/openejb/jee/sun/SunWebApp.java | 8 +++----
.../java/org/apache/openejb/jee/sun/Timeout.java | 8 +++----
.../openejb/jee/was/v6/common/Description.java | 8 +++----
.../jee/was/v6/common/DescriptionGroup.java | 8 +++----
.../openejb/jee/was/v6/common/DisplayName.java | 8 +++----
.../apache/openejb/jee/was/v6/common/EjbRef.java | 8 +++----
.../apache/openejb/jee/was/v6/common/EnvEntry.java | 8 +++----
.../apache/openejb/jee/was/v6/common/IconType.java | 8 +++----
.../apache/openejb/jee/was/v6/common/Identity.java | 8 +++----
.../jee/was/v6/common/MessageDestinationRef.java | 8 +++----
.../openejb/jee/was/v6/common/ParamValue.java | 8 +++----
.../apache/openejb/jee/was/v6/common/QName.java | 8 +++----
.../openejb/jee/was/v6/common/ResourceEnvRef.java | 8 +++----
.../openejb/jee/was/v6/common/ResourceRef.java | 8 +++----
.../jee/was/v6/common/SecurityIdentity.java | 8 +++----
.../openejb/jee/was/v6/common/SecurityRole.java | 8 +++----
.../openejb/jee/was/v6/common/SecurityRoleRef.java | 8 +++----
.../jee/was/v6/commonbnd/AbstractAuthData.java | 26 +++++++++-------------
.../jee/was/v6/commonbnd/EjbRefBinding.java | 8 +++----
.../v6/commonbnd/MessageDestinationRefBinding.java | 8 +++----
.../openejb/jee/was/v6/commonbnd/Property.java | 8 +++----
.../was/v6/commonbnd/ResourceEnvRefBinding.java | 8 +++----
.../jee/was/v6/commonbnd/ResourceRefBinding.java | 8 +++----
.../apache/openejb/jee/was/v6/ecore/EObject.java | 8 +++----
.../jee/was/v6/ecore/EStringToStringMapEntry.java | 8 +++----
.../openejb/jee/was/v6/ejb/ActivationConfig.java | 8 +++----
.../jee/was/v6/ejb/ActivationConfigProperty.java | 8 +++----
.../openejb/jee/was/v6/ejb/AssemblyDescriptor.java | 8 +++----
.../openejb/jee/was/v6/ejb/EJBMethodCategory.java | 8 +++----
.../apache/openejb/jee/was/v6/ejb/EJBRelation.java | 8 +++----
.../jee/was/v6/ejb/EJBRelationshipRole.java | 8 +++----
.../apache/openejb/jee/was/v6/ejb/ExcludeList.java | 8 +++----
.../jee/was/v6/ejb/MessageDrivenDestination.java | 8 +++----
.../openejb/jee/was/v6/ejb/MethodElement.java | 8 +++----
.../openejb/jee/was/v6/ejb/MethodPermission.java | 8 +++----
.../openejb/jee/was/v6/ejb/MethodTransaction.java | 8 +++----
.../org/apache/openejb/jee/was/v6/ejb/Query.java | 8 +++----
.../openejb/jee/was/v6/ejb/Relationships.java | 8 +++----
.../apache/openejb/jee/was/v6/ejb/RoleSource.java | 8 +++----
.../was/v6/ejbbnd/CMPConnectionFactoryBinding.java | 8 +++----
.../openejb/jee/was/v6/ejbbnd/EJBJarBinding.java | 8 +++----
.../jee/was/v6/ejbbnd/EnterpriseBeanBinding.java | 8 +++----
.../org/apache/openejb/jee/was/v6/java/Block.java | 8 +++----
.../openejb/jee/was/v6/java/Initializer.java | 8 +++----
.../v6/webservice/clientbnd/ServiceRefBinding.java | 8 +++----
.../jee/was/v6/wsclient/ComponentScopedRefs.java | 8 +++----
.../jee/was/v6/wsclient/PortComponentRef.java | 8 +++----
.../jee/was/v6/wsclient/WebServicesClient.java | 8 +++----
.../apache/openejb/jee/was/v6/xmi/Difference.java | 8 +++----
.../openejb/jee/was/v6/xmi/Documentation.java | 8 +++----
.../apache/openejb/jee/was/v6/xmi/Extension.java | 8 +++----
.../openejb/jee/was/v6/xmi/PackageReference.java | 8 +++----
.../org/apache/openejb/jee/was/v6/xmi/XMI.java | 8 +++----
.../httpd/part/CommonsFileUploadPartFactory.java | 7 ++----
79 files changed, 248 insertions(+), 441 deletions(-)
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java
index a2e847f2e8..e29cae1031 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Application.java
@@ -20,6 +20,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -415,11 +417,7 @@ public class Application implements JndiConsumer,
NamedModule {
}
public java.lang.String getVersion() {
- if (version == null) {
- return "6";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "6");
}
public void setVersion(final java.lang.String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
index 220cef8e01..fae34de9fe 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ApplicationClient.java
@@ -26,10 +26,12 @@ import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
@@ -420,11 +422,7 @@ public class ApplicationClient implements JndiConsumer,
Lifecycle, NamedModule {
}
public String getVersion() {
- if (version == null) {
- return "5";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "5");
}
public void setVersion(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
index e0e1797ff2..6b4da0d432 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
@@ -26,10 +26,12 @@ import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* connector_1_6.xsd
@@ -236,11 +238,7 @@ public class Connector implements NamedModule {
}
public String getVersion() {
- if (version == null) {
- return "1.6";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "1.6");
}
public void setVersion(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
index 2c50278fe8..1f588bd15b 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector10.java
@@ -21,6 +21,7 @@ import
jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
/**
* class for adapting connector 1.0 ra.xml to our jaxb class tree
@@ -150,11 +151,7 @@ public class Connector10 {
}
public String getSpecVersion() {
- if (specVersion == null) {
- return "1.0";
- } else {
- return specVersion;
- }
+ return Objects.requireNonNullElse(specVersion, "1.0");
}
public void setSpecVersion(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
index dd9e8ff7ea..9f277671e5 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
@@ -30,9 +30,11 @@ import jakarta.xml.bind.annotation.XmlTransient;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Objects;
/**
* ejb-jar_3_1.xsd
@@ -273,11 +275,7 @@ public class EjbJar implements NamedModule {
}
public String getVersion() {
- if (version == null) {
- return "3.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "3.0");
}
public void setVersion(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java
index d93ddd8228..308593e2c6 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaWsdlMapping.java
@@ -26,10 +26,12 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
@XmlRootElement(name = "java-wsdl-mapping")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -123,11 +125,7 @@ public class JavaWsdlMapping {
}
public String getVersion() {
- if (version == null) {
- return "1.1";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "1.1");
}
public void setVersion(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java
index 994d749835..74af21807b 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Persistence.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -134,11 +136,7 @@ public class Persistence {
* {@link java.lang.String }
*/
public java.lang.String getVersion() {
- if (version == null) {
- return "2.1";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.1");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
index af6d65c575..d01310cc0a 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
@@ -26,10 +26,12 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* web-jsptaglibrary_2_1.xsd
@@ -236,11 +238,7 @@ public class TldTaglib {
}
public String getVersion() {
- if (version == null) {
- return "2.1";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.1");
}
public void setVersion(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
index f402c8ac2e..d89590e9ae 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Webservices.java
@@ -29,6 +29,7 @@ import
jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
/**
* javaee_web_services_1_3.xsd
@@ -144,11 +145,7 @@ public class Webservices {
}
public String getVersion() {
- if (version == null) {
- return "1.2";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "1.2");
}
public void setVersion(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java
index 2c634cb76c..fa00fc2772 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ConstraintMappingsType.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.bval;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -157,11 +159,7 @@ public class ConstraintMappingsType {
*
*/
public String getVersion() {
- if (version == null) {
- return "1.1";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "1.1");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ExecutableValidationType.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ExecutableValidationType.java
index d848e0ed70..eb076e8d04 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ExecutableValidationType.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ExecutableValidationType.java
@@ -22,6 +22,8 @@ import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
+import java.util.Objects;
+
/**
* <p>Java class for executable-validationType complex type.
@@ -87,11 +89,7 @@ public class ExecutableValidationType {
*
*/
public boolean getEnabled() {
- if (enabled == null) {
- return true;
- } else {
- return enabled;
- }
+ return Objects.requireNonNullElse(enabled, true);
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
index 03448499b0..92a9949de8 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/bval/ValidationConfigType.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.bval;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -365,11 +367,7 @@ public class ValidationConfigType {
*
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ClientInterceptors.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ClientInterceptors.java
index 8a28b82877..1f47544201 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ClientInterceptors.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/ClientInterceptors.java
@@ -26,6 +26,8 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Objects;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -53,11 +55,7 @@ public class ClientInterceptors {
* {@link String }
*/
public String getExposeContainer() {
- if (exposeContainer == null) {
- return "false";
- } else {
- return exposeContainer;
- }
+ return Objects.requireNonNullElse(exposeContainer, "false");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java
index 7251da9fa6..dba4b8af04 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jba/Interceptor.java
@@ -19,6 +19,8 @@ package org.apache.openejb.jee.jba;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAnyElement;
@@ -59,11 +61,7 @@ public class Interceptor {
* {@link String }
*/
public String getTransaction() {
- if (transaction == null) {
- return "Both";
- } else {
- return transaction;
- }
+ return Objects.requireNonNullElse(transaction, "Both");
}
/**
@@ -83,11 +81,7 @@ public class Interceptor {
* {@link String }
*/
public String getMetricsEnabled() {
- if (metricsEnabled == null) {
- return "false";
- } else {
- return metricsEnabled;
- }
+ return Objects.requireNonNullElse(metricsEnabled, "false");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
index 06a69aaca8..a04a724091 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/EntityMappings.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -487,11 +489,7 @@ public class EntityMappings {
* {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/fragment/PersistenceFragment.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/fragment/PersistenceFragment.java
index 20e37f7a1c..94b5d96765 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/fragment/PersistenceFragment.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/fragment/PersistenceFragment.java
@@ -24,8 +24,10 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -93,11 +95,7 @@ public class PersistenceFragment {
* {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "1.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "1.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java
index a62f3b9d1e..cfbd8fbea6 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.jpa.unit;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -151,11 +153,7 @@ public class Persistence {
* {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "1.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "1.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java
index a92dca7423..30abd1e455 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java
@@ -24,8 +24,10 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
@@ -53,11 +55,7 @@ public class Cache {
protected List<CacheMapping> cacheMapping;
public String getMaxEntries() {
- if (maxEntries == null) {
- return "4096";
- } else {
- return maxEntries;
- }
+ return Objects.requireNonNullElse(maxEntries, "4096");
}
public void setMaxEntries(final String value) {
@@ -65,11 +63,7 @@ public class Cache {
}
public String getTimeoutInSeconds() {
- if (timeoutInSeconds == null) {
- return "30";
- } else {
- return timeoutInSeconds;
- }
+ return Objects.requireNonNullElse(timeoutInSeconds, "30");
}
public void setTimeoutInSeconds(final String value) {
@@ -77,11 +71,7 @@ public class Cache {
}
public String getEnabled() {
- if (enabled == null) {
- return "true";
- } else {
- return enabled;
- }
+ return Objects.requireNonNullElse(enabled, "true");
}
public void setEnabled(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java
index dc88f3caf6..6e776cb5ef 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java
@@ -23,8 +23,10 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {"property"})
@@ -49,11 +51,7 @@ public class ClassLoader {
}
public String getDelegate() {
- if (delegate == null) {
- return "true";
- } else {
- return delegate;
- }
+ return Objects.requireNonNullElse(delegate, "true");
}
public void setDelegate(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintField.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintField.java
index 300e5dce67..45c556c317 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintField.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintField.java
@@ -24,8 +24,10 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {"constraintFieldValue"})
@@ -54,11 +56,7 @@ public class ConstraintField {
}
public String getScope() {
- if (scope == null) {
- return "request.parameter";
- } else {
- return scope;
- }
+ return Objects.requireNonNullElse(scope, "request.parameter");
}
public void setScope(final String value) {
@@ -66,11 +64,7 @@ public class ConstraintField {
}
public String getCacheOnMatch() {
- if (cacheOnMatch == null) {
- return "true";
- } else {
- return cacheOnMatch;
- }
+ return Objects.requireNonNullElse(cacheOnMatch, "true");
}
public void setCacheOnMatch(final String value) {
@@ -78,11 +72,7 @@ public class ConstraintField {
}
public String getCacheOnMatchFailure() {
- if (cacheOnMatchFailure == null) {
- return "false";
- } else {
- return cacheOnMatchFailure;
- }
+ return Objects.requireNonNullElse(cacheOnMatchFailure, "false");
}
public void setCacheOnMatchFailure(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintFieldValue.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintFieldValue.java
index df9ef7778a..1815941b44 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintFieldValue.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ConstraintFieldValue.java
@@ -24,6 +24,8 @@ import jakarta.xml.bind.annotation.XmlValue;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Objects;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {"value"})
public class ConstraintFieldValue {
@@ -40,11 +42,7 @@ public class ConstraintFieldValue {
protected String value;
public String getMatchExpr() {
- if (matchExpr == null) {
- return "equals";
- } else {
- return matchExpr;
- }
+ return Objects.requireNonNullElse(matchExpr, "equals");
}
public void setMatchExpr(final String value) {
@@ -52,11 +50,7 @@ public class ConstraintFieldValue {
}
public String getCacheOnMatch() {
- if (cacheOnMatch == null) {
- return "true";
- } else {
- return cacheOnMatch;
- }
+ return Objects.requireNonNullElse(cacheOnMatch, "true");
}
public void setCacheOnMatch(final String value) {
@@ -64,11 +58,7 @@ public class ConstraintFieldValue {
}
public String getCacheOnMatchFailure() {
- if (cacheOnMatchFailure == null) {
- return "false";
- } else {
- return cacheOnMatchFailure;
- }
+ return Objects.requireNonNullElse(cacheOnMatchFailure, "false");
}
public void setCacheOnMatchFailure(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/IdempotentUrlPattern.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/IdempotentUrlPattern.java
index 7d9374bcab..2f9e62363f 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/IdempotentUrlPattern.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/IdempotentUrlPattern.java
@@ -23,6 +23,8 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Objects;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
public class IdempotentUrlPattern {
@@ -42,11 +44,7 @@ public class IdempotentUrlPattern {
}
public String getNumOfRetries() {
- if (numOfRetries == null) {
- return "-1";
- } else {
- return numOfRetries;
- }
+ return Objects.requireNonNullElse(numOfRetries, "-1");
}
public void setNumOfRetries(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/KeyField.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/KeyField.java
index 12bcb78d74..284d9faa87 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/KeyField.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/KeyField.java
@@ -24,6 +24,8 @@ import
jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Objects;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
public class KeyField {
@@ -43,11 +45,7 @@ public class KeyField {
}
public String getScope() {
- if (scope == null) {
- return "request.parameter";
- } else {
- return scope;
- }
+ return Objects.requireNonNullElse(scope, "request.parameter");
}
public void setScope(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/RefreshField.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/RefreshField.java
index 010c7aed88..eb8ba5230c 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/RefreshField.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/RefreshField.java
@@ -24,6 +24,8 @@ import
jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Objects;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "")
public class RefreshField {
@@ -43,11 +45,7 @@ public class RefreshField {
}
public String getScope() {
- if (scope == null) {
- return "request.parameter";
- } else {
- return scope;
- }
+ return Objects.requireNonNullElse(scope, "request.parameter");
}
public void setScope(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SessionManager.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SessionManager.java
index 7ff1529d02..7824549b31 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SessionManager.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SessionManager.java
@@ -24,6 +24,8 @@ import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Objects;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {"managerProperties", "storeProperties"})
public class SessionManager {
@@ -36,11 +38,7 @@ public class SessionManager {
protected StoreProperties storeProperties;
public String getPersistenceType() {
- if (persistenceType == null) {
- return "memory";
- } else {
- return persistenceType;
- }
+ return Objects.requireNonNullElse(persistenceType, "memory");
}
public void setPersistenceType(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SunWebApp.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SunWebApp.java
index 132f37d8d7..621367b8f4 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SunWebApp.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/SunWebApp.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.sun;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -91,11 +93,7 @@ public class SunWebApp {
protected List<WebserviceDescription> webserviceDescription;
public String getErrorUrl() {
- if (errorUrl == null) {
- return "";
- } else {
- return errorUrl;
- }
+ return Objects.requireNonNullElse(errorUrl, "");
}
public void setErrorUrl(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Timeout.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Timeout.java
index 8b3053c88c..19d82f52ab 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Timeout.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Timeout.java
@@ -25,6 +25,8 @@ import
jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import jakarta.xml.bind.annotation.adapters.NormalizedStringAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.Objects;
+
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {"value"})
public class Timeout {
@@ -46,11 +48,7 @@ public class Timeout {
}
public String getScope() {
- if (scope == null) {
- return "request.attribute";
- } else {
- return scope;
- }
+ return Objects.requireNonNullElse(scope, "request.attribute");
}
public void setScope(final String value) {
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
index 82e5c7e7d8..ba7ab3a0a1 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Description.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -202,11 +204,7 @@ public class Description {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
index 6afb64691c..8e34bcb90f 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DescriptionGroup.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -249,11 +251,7 @@ public class DescriptionGroup {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
index 9e5d99aa8d..2db9a23124 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/DisplayName.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -209,11 +211,7 @@ public class DisplayName {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
index c089d2d887..5d4239f3b5 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EjbRef.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -317,11 +319,7 @@ public class EjbRef {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
index c0eabf1308..ea40647daa 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/EnvEntry.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -273,11 +275,7 @@ public class EnvEntry {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
index 8ae604cfb4..c770545085 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/IconType.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -218,11 +220,7 @@ public class IconType {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
index 215f0b47ed..e801197c65 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/Identity.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -228,11 +230,7 @@ public class Identity {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
index 8db5aa9c02..cc043bf7c9 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/MessageDestinationRef.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -302,11 +304,7 @@ public class MessageDestinationRef {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
index 0f6f0bcc94..65dca6f59d 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ParamValue.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -248,11 +250,7 @@ public class ParamValue {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
index fc26b86324..43607a9727 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/QName.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -230,11 +232,7 @@ public class QName {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
index 1139915d2e..e828d18368 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceEnvRef.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -305,11 +307,7 @@ public class ResourceEnvRef {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
index 2f5e6f37cf..f73c677c5d 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/ResourceRef.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -326,11 +328,7 @@ public class ResourceRef {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
index 971d66ed15..67ecf07d2a 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityIdentity.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -208,11 +210,7 @@ public class SecurityIdentity {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
index fa6915c0b4..cf2c50d439 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRole.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -248,11 +250,7 @@ public class SecurityRole {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
index be1b3560b9..60e503bb4c 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/common/SecurityRoleRef.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.common;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -251,11 +253,7 @@ public class SecurityRoleRef {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
index 1c2ea5402b..13e62e1a16 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/AbstractAuthData.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.commonbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -37,11 +39,9 @@ import org.apache.openejb.jee.was.v6.xmi.Extension;
* model is Basic Authentication; however, other authentication types such as
* certificates and tokens are expected to be extended off this type in the
* advanced and enterprise layers.
- *
- *
+ * <p>
* Java class for AbstractAuthData complex type.
- *
- *
+ * <p>
* The following schema fragment specifies the expected content contained
within
* this class.
*
@@ -84,15 +84,13 @@ public class AbstractAuthData {
protected String uuid;
/**
- * Gets the value of the extensions property.
- *
- *
+ * Gets the value of the {@code extensions} property.
+ * <p>
* This accessor method returns a reference to the live list, not a
- * snapshot. Therefore any modification you make to the returned list will
+ * snapshot. Therefore, any modification you make to the returned list will
* be present inside the JAXB object. This is why there is not a
- * <CODE>set</CODE> method for the extensions property.
- *
- *
+ * <CODE>set</CODE> method for the {@code extensions} property.
+ * <p>
* For example, to add a new item, do as follows:
*
* <pre>
@@ -153,11 +151,7 @@ public class AbstractAuthData {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
index 9eebc4ac95..b6d9ff6aec 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/EjbRefBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.commonbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -224,11 +226,7 @@ public class EjbRefBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
index 65a7429095..6b19140146 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/MessageDestinationRefBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.commonbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -226,11 +228,7 @@ public class MessageDestinationRefBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
index f79329f6ff..b36436593d 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/Property.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.commonbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -210,11 +212,7 @@ public class Property {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
index 292f29cfa8..f6b274cd7f 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceEnvRefBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.commonbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -226,11 +228,7 @@ public class ResourceEnvRefBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
index 778ee55a2d..2cbaa47138 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/commonbnd/ResourceRefBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.commonbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -311,11 +313,7 @@ public class ResourceRefBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
index d8bd80d4cf..6500a034b0 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EObject.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ecore;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -147,11 +149,7 @@ public class EObject {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
index 47ea4b68f8..357d3d9ee8 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ecore/EStringToStringMapEntry.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ecore;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -189,11 +191,7 @@ public class EStringToStringMapEntry {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
index 55a580c457..157519b137 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfig.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -227,11 +229,7 @@ public class ActivationConfig {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
index 65fbfc6d8f..a8ceaa0e2e 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ActivationConfigProperty.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -196,11 +198,7 @@ public class ActivationConfigProperty {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
index 035a8c1fd4..67f73b2b66 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/AssemblyDescriptor.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -323,11 +325,7 @@ public class AssemblyDescriptor {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
index a3d66d62dd..0c9abcc82a 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBMethodCategory.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -151,11 +153,7 @@ public class EJBMethodCategory {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
index c215e09404..ff7d4276c7 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelation.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -273,11 +275,7 @@ public class EJBRelation {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
index 9c5d7cdbf0..174fc86746 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/EJBRelationshipRole.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -382,11 +384,7 @@ public class EJBRelationshipRole {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
index 203a208657..73d969add0 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/ExcludeList.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -243,11 +245,7 @@ public class ExcludeList {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
index 80f46ddadf..d130f983d5 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MessageDrivenDestination.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -196,11 +198,7 @@ public class MessageDrivenDestination {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
index 1a2219b0e4..c02228a135 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodElement.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -518,11 +520,7 @@ public class MethodElement {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
index 643b487e0f..33ca5bf6ce 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodPermission.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -320,11 +322,7 @@ public class MethodPermission {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
index 8ad451523b..702a4872e1 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/MethodTransaction.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -263,11 +265,7 @@ public class MethodTransaction {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
index 1f7292c8a5..5566e153cb 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Query.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -289,11 +291,7 @@ public class Query {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
index df58a60af2..d95170ddd9 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/Relationships.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -242,11 +244,7 @@ public class Relationships {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
index 882a74b757..2107c0668a 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejb/RoleSource.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejb;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -264,11 +266,7 @@ public class RoleSource {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
index 7d75691c31..5230a5fc4e 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/CMPConnectionFactoryBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejbbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -245,11 +247,7 @@ public class CMPConnectionFactoryBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
index de99b6f387..af8f815da1 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EJBJarBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejbbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -324,11 +326,7 @@ public class EJBJarBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
index 644644fe3e..6652d843d4 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/ejbbnd/EnterpriseBeanBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.ejbbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -480,11 +482,7 @@ public class EnterpriseBeanBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
index 7a4ad1918b..6b6cf149cb 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Block.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.java;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -222,11 +224,7 @@ public class Block {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
index 240da36807..3832d1b254 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/java/Initializer.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.java;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -223,11 +225,7 @@ public class Initializer {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
index a1fcd699d9..8e34ed41c5 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/webservice/clientbnd/ServiceRefBinding.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.webservice.clientbnd;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -226,11 +228,7 @@ public class ServiceRefBinding {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
index cc48c57eae..81381cfbf5 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/ComponentScopedRefs.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.wsclient;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -205,11 +207,7 @@ public class ComponentScopedRefs {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
index 338ff5405f..e9b94c8780 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/PortComponentRef.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.wsclient;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -232,11 +234,7 @@ public class PortComponentRef {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
index fb2a8a157d..930d53cea7 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/wsclient/WebServicesClient.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.wsclient;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -216,11 +218,7 @@ public class WebServicesClient {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
index edeef49cfa..7e6d96db99 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Difference.java
@@ -20,6 +20,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAnyAttribute;
@@ -266,11 +268,7 @@ public class Difference {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
index d0930f29a0..79f67b27a3 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Documentation.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.xmi;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -461,11 +463,7 @@ public class Documentation {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
index c648b1a44e..d1e22fb2fa 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/Extension.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.xmi;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAnyElement;
@@ -163,11 +165,7 @@ public class Extension {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
index 00d7216db7..a9d744004f 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/PackageReference.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.xmi;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
@@ -173,11 +175,7 @@ public class PackageReference {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
index 70d85404d9..2080c57a44 100644
---
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
+++
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/was/v6/xmi/XMI.java
@@ -18,6 +18,8 @@ package org.apache.openejb.jee.was.v6.xmi;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAnyElement;
@@ -121,11 +123,7 @@ public class XMI {
* @return possible object is {@link String }
*/
public String getVersion() {
- if (version == null) {
- return "2.0";
- } else {
- return version;
- }
+ return Objects.requireNonNullElse(version, "2.0");
}
/**
diff --git
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java
index b8ee97c943..1b0f499f5c 100644
---
a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java
+++
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java
@@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Objects;
import static java.util.Arrays.asList;
@@ -80,11 +81,7 @@ public final class CommonsFileUploadPartFactory {
try {
String encoding = request.getCharacterEncoding();
if (encoding == null) {
- if (enc == null) {
- encoding = "UTF-8";
- } else {
- encoding = enc;
- }
+ encoding = Objects.requireNonNullElse(enc,
"UTF-8");
}
value = part.getString(encoding);
} catch (final IOException uee) {
