simplified logic statement

datasharingframework · Feb 19, 2024 · 6ccd70d · 6ccd70d
1 parent 9f2dae0
commit 6ccd70d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganization.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganization.java
@@ -18,8 +18,7 @@ public SearchSetOrganization(int defaultPageCount)
 	protected Row toRow(ElementId id, Organization resource)
 	{
 		boolean active = resource.hasActiveElement() && resource.getActiveElement().hasValue()
-				? Boolean.TRUE.equals(resource.getActiveElement().getValue())
-				: false;
+				&& Boolean.TRUE.equals(resource.getActiveElement().getValue());
 
 		String identifier = getIdentifierValues(resource, Organization::hasIdentifier, Organization::getIdentifier,
 				NAMING_SYSTEM_ORGANIZATION_IDENTIFIER);

diff --git a/.../dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganizationAffiliation.java b/.../dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganizationAffiliation.java
@@ -21,8 +21,7 @@ public SearchSetOrganizationAffiliation(int defaultPageCount)
 	protected Row toRow(ElementId id, OrganizationAffiliation resource)
 	{
 		boolean active = resource.hasActiveElement() && resource.getActiveElement().hasValue()
-				? Boolean.TRUE.equals(resource.getActiveElement().getValue())
-				: false;
+				&& Boolean.TRUE.equals(resource.getActiveElement().getValue());
 
 		ElementId parentOrganization = ElementId.from(resource, OrganizationAffiliation::hasOrganization,
 				OrganizationAffiliation::getOrganization);