Small cleanup, e.g. reduce commons-lang usage

oehf · Dec 2, 2023 · 62fe083 · 62fe083
1 parent f596528
commit 62fe083
Show file tree

Hide file tree

Showing 76 changed files with 405 additions and 411 deletions.
diff --git a/...s/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/XdsRuntimeException.java b/...s/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/XdsRuntimeException.java
@@ -15,6 +15,8 @@
  */
 package org.openehealth.ipf.commons.ihe.xds.core;
 
+import java.util.Objects;
+
 import org.apache.commons.lang3.Validate;
 import org.openehealth.ipf.commons.ihe.xds.core.responses.ErrorCode;
 import org.openehealth.ipf.commons.ihe.xds.core.responses.Severity;
@@ -37,9 +39,9 @@ public XdsRuntimeException(
             String location)
     {
         super();
-        this.errorCode   = Validate.notNull(errorCode);
+        this.errorCode   = Objects.requireNonNull(errorCode);
         this.codeContext = Validate.notEmpty(codeContext);
-        this.severity    = Validate.notNull(severity);
+        this.severity    = Objects.requireNonNull(severity);
         this.location    = location;
     }
 

diff --git a/...h/ipf/commons/ihe/xds/core/audit/XdsNonconstructiveDocumentSetRequestAuditStrategy30.java b/...h/ipf/commons/ihe/xds/core/audit/XdsNonconstructiveDocumentSetRequestAuditStrategy30.java
@@ -15,7 +15,6 @@
  */
 package org.openehealth.ipf.commons.ihe.xds.core.audit;
 
-import org.openehealth.ipf.commons.audit.codes.EventOutcomeIndicator;
 import org.openehealth.ipf.commons.ihe.xds.core.audit.XdsNonconstructiveDocumentSetRequestAuditDataset.Document;
 import org.openehealth.ipf.commons.ihe.xds.core.audit.XdsNonconstructiveDocumentSetRequestAuditDataset.Status;
 import org.openehealth.ipf.commons.ihe.xds.core.ebxml.ebxml30.RetrieveDocumentSetRequestType;

diff --git a/...java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLAdhocQueryRequest30.java b/...java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLAdhocQueryRequest30.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2009 the original author or authors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
- *     
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,7 @@
  */
 package org.openehealth.ipf.commons.ihe.xds.core.ebxml.ebxml30;
 
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 
 import lombok.experimental.Delegate;
 import org.openehealth.ipf.commons.ihe.xds.core.ebxml.EbXMLAdhocQueryRequest;
@@ -27,23 +27,22 @@
  */
 public class EbXMLAdhocQueryRequest30 implements EbXMLAdhocQueryRequest {
     private final AdhocQueryRequest request;
-    
+
     /**
      * Constructs the wrapper using the real object.
      * @param request
      *          the ebXML 3.0 object.
      */
     public EbXMLAdhocQueryRequest30(AdhocQueryRequest request) {
-        notNull(request, "request cannot be null");
-        this.request = request;
+        this.request = requireNonNull(request, "request cannot be null");;
     }
-    
+
     @Override
     public String getReturnType() {
         var responseOption = request.getResponseOption();
         return responseOption != null ? responseOption.getReturnType() : null;
     }
-    
+
     @Override
     public void setReturnType(String returnType) {
         request.getResponseOption().setReturnType(returnType);
@@ -53,7 +52,7 @@ public void setReturnType(String returnType) {
     public String getId() {
         return request.getAdhocQuery().getId();
     }
-    
+
     @Override
     public void setId(String id) {
         request.getAdhocQuery().setId(id);

diff --git a/...in/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLClassification30.java b/...in/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLClassification30.java
@@ -22,7 +22,7 @@
 
 import java.util.UUID;
 
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Encapsulation of {@link ClassificationType}.
@@ -37,7 +37,7 @@ public class EbXMLClassification30 implements EbXMLClassification {
      *          the object to wrap.
      */
     public EbXMLClassification30(ClassificationType classification) {
-        notNull(classification, "classification cannot be null");
+        requireNonNull(classification, "classification cannot be null");
         classification.setObjectType(CLASSIFICATION_OBJECT_TYPE);
         this.classification = classification;
     }

diff --git a/...ava/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLExternalIdentifier30.java b/...ava/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLExternalIdentifier30.java
@@ -15,7 +15,7 @@
  */
 package org.openehealth.ipf.commons.ihe.xds.core.ebxml.ebxml30;
 
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 
 import org.openehealth.ipf.commons.ihe.xds.core.ebxml.EbXMLExternalIdentifier;
 import org.openehealth.ipf.commons.ihe.xds.core.ebxml.EbXMLInternationalString;
@@ -33,7 +33,7 @@ public class EbXMLExternalIdentifier30 implements EbXMLExternalIdentifier {
      *          the object to wrap.
      */
     public EbXMLExternalIdentifier30(ExternalIdentifierType externalIdentifierType) {
-        notNull(externalIdentifierType, "externalIdentifierType cannot be null");
+        requireNonNull(externalIdentifierType, "externalIdentifierType cannot be null");
         externalIdentifierType.setObjectType(EXTERNAL_IDENTIFIER_OBJECT_TYPE);
         externalIdentifier = externalIdentifierType;
     }

diff --git a/...va/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLInternationalString30.java b/...va/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLInternationalString30.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2009 the original author or authors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
- *     
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -75,14 +75,14 @@ public LocalizedString getLocalizedString(int idx) {
         if (localizedEbRS30 == null) {
             return null;
         }
-        
+
         return createLocalizedString(localizedEbRS30);
     }
 
     @Override
     public List<LocalizedString> getLocalizedStrings() {
         if (international == null) {
-            return Collections.emptyList(); 
+            return Collections.emptyList();
         }
 
         var list = international.getLocalizedString();
@@ -98,10 +98,10 @@ public LocalizedString getSingleLocalizedString() {
         }
 
         var locals = international.getLocalizedString();
-        if (locals == null || locals.size() == 0) {
+        if (locals == null || locals.isEmpty()) {
             return null;
         }
-        
+
         return createLocalizedString(locals.get(0));
     }
 

diff --git a/...alth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLNonconstructiveDocumentSetRequest30.java b/...alth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLNonconstructiveDocumentSetRequest30.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2009 the original author or authors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
- *     
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,7 @@
  */
 package org.openehealth.ipf.commons.ihe.xds.core.ebxml.ebxml30;
 
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,10 +37,9 @@ public class EbXMLNonconstructiveDocumentSetRequest30<T extends RetrieveDocument
      *          the object to wrap.
      */
     public EbXMLNonconstructiveDocumentSetRequest30(T request) {
-        notNull(request, "request cannot be null");
-        this.request = request;
+        this.request = requireNonNull(request, "request cannot be null");;
     }
-    
+
     @Override
     public T getInternal() {
         return request;

diff --git a/...n/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLObjectContainer30.java b/...n/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLObjectContainer30.java
@@ -16,7 +16,7 @@
 package org.openehealth.ipf.commons.ihe.xds.core.ebxml.ebxml30;
 
 import static org.apache.commons.lang3.Validate.noNullElements;
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 import org.openehealth.ipf.commons.ihe.xds.core.ebxml.*;
 import org.openehealth.ipf.commons.ihe.xds.core.stub.ebrs30.rim.*;
 
@@ -57,7 +57,7 @@ protected void fillObjectLibrary() {
      *          the object library to use.
      */
     EbXMLObjectContainer30(EbXMLObjectLibrary objectLibrary) {
-        notNull(objectLibrary, "objLibrary cannot be null");
+        requireNonNull(objectLibrary, "objLibrary cannot be null");
         this.objectLibrary = objectLibrary;
     }
 
@@ -146,7 +146,7 @@ public List<EbXMLExtrinsicObject> getExtrinsicObjects() {
 
     @Override
     public List<EbXMLRegistryPackage> getRegistryPackages(String classificationNode) {
-        notNull(classificationNode, "classificationNode cannot be null");
+        requireNonNull(classificationNode, "classificationNode cannot be null");
 
         var acceptedIds = getAcceptedIds(classificationNode);
 

diff --git a/...h/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLProvideAndRegisterDocumentSetRequest30.java b/...h/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLProvideAndRegisterDocumentSetRequest30.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2009 the original author or authors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
- *     
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,7 +15,7 @@
  */
 package org.openehealth.ipf.commons.ihe.xds.core.ebxml.ebxml30;
 
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -48,8 +48,7 @@ public class EbXMLProvideAndRegisterDocumentSetRequest30 extends EbXMLObjectCont
      */
     public EbXMLProvideAndRegisterDocumentSetRequest30(ProvideAndRegisterDocumentSetRequestType request, EbXMLObjectLibrary objectLibrary) {
         super(objectLibrary);
-        notNull(request, "request cannot be null");
-        this.request = request;
+        this.request = requireNonNull(request, "request cannot be null");;
     }
 
     /**

diff --git a/...ain/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLQueryResponse30.java b/...ain/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLQueryResponse30.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Encapsulation of {@link AdhocQueryResponse}.
@@ -48,7 +48,7 @@ public class EbXMLQueryResponse30 extends EbXMLObjectContainer30 implements EbXM
      */
     public EbXMLQueryResponse30(AdhocQueryResponse response, EbXMLObjectLibrary objectLibrary) {
         super(objectLibrary);
-        notNull(response, "response cannot be null");
+        requireNonNull(response, "response cannot be null");
         this.response = response;
     }
 

diff --git a/...ain/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLRegistryError30.java b/...ain/java/org/openehealth/ipf/commons/ihe/xds/core/ebxml/ebxml30/EbXMLRegistryError30.java
@@ -15,7 +15,8 @@
  */
 package org.openehealth.ipf.commons.ihe.xds.core.ebxml.ebxml30;
 
-import org.apache.commons.lang3.Validate;
+import static java.util.Objects.requireNonNull;
+
 import org.openehealth.ipf.commons.ihe.xds.core.ebxml.EbXMLRegistryError;
 import org.openehealth.ipf.commons.ihe.xds.core.responses.Severity;
 import org.openehealth.ipf.commons.ihe.xds.core.stub.ebrs30.rs.RegistryError;
@@ -27,8 +28,7 @@ public class EbXMLRegistryError30 implements EbXMLRegistryError {
     private final RegistryError error;
 
     public EbXMLRegistryError30(RegistryError error) {
-        Validate.notNull(error, "registry error object cannot be null");
-        this.error = error;
+        this.error = requireNonNull(error, "registry error object cannot be null");;
     }
 
     @Override