-
Notifications
You must be signed in to change notification settings - Fork 13
[fhir-tools] Add Generation of Extensions to the Health-Tool and Minor Bug Fixes #129
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b79b51f
fix version bump issues in workflow.
isuruh15 8124e1d
minor bug fixes for health tool
Sanjana-Attanayake 04c04ac
add extensions generation for packages
Sanjana-Attanayake 8f87849
Merge branch 'ballerina-platform:main' into main
Sanjana-Attanayake 84f7a4f
fix PR review comments
Sanjana-Attanayake a57aa1c
Merge branch 'main' of https://github.com/Sanjana-Attanayake/fhir-tools
Sanjana-Attanayake d8813f6
update codegen versions
Sanjana-Attanayake ab0cd24
fix id datatype override error
Sanjana-Attanayake File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...va/org/wso2/healthcare/fhir/ballerina/packagegen/tool/model/ExtensionTemplateContext.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you 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. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.wso2.healthcare.fhir.ballerina.packagegen.tool.model; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.TreeMap; | ||
| import java.util.HashMap; | ||
|
|
||
| public class ExtensionTemplateContext { | ||
| private Map<String, DatatypeTemplateContext> extensionDatatypes; | ||
| private Map<String, Set<String>> extensionSlices; | ||
| private Map<String, Set<String>> extensionResources; | ||
|
|
||
| public ExtensionTemplateContext() { | ||
| extensionDatatypes = new TreeMap<>(); | ||
| extensionSlices = new HashMap<>(); | ||
| extensionResources = new HashMap<>(); | ||
| } | ||
|
|
||
| public Map<String, DatatypeTemplateContext> getExtensionDatatypes() { | ||
| return extensionDatatypes; | ||
| } | ||
|
|
||
| public void setExtensionDatatypes(Map<String, DatatypeTemplateContext> extensionDatatypes) { | ||
| this.extensionDatatypes = extensionDatatypes; | ||
| } | ||
|
|
||
| public Map<String, Set<String>> getExtensionSlices() { | ||
| return extensionSlices; | ||
| } | ||
|
|
||
| public void setExtensionSlices(Map<String, Set<String>> extensionSlices) { | ||
| this.extensionSlices = extensionSlices; | ||
| } | ||
|
|
||
| public Map<String, Set<String>> getExtensionResources() { | ||
| return extensionResources; | ||
| } | ||
|
|
||
| public void setExtensionResources(Map<String, Set<String>> extensionResources) { | ||
| this.extensionResources = extensionResources; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
...healthcare/fhir/ballerina/packagegen/tool/modelgen/AbstractExtensionContextGenerator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you 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. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.wso2.healthcare.fhir.ballerina.packagegen.tool.modelgen; | ||
|
|
||
| import org.apache.commons.logging.Log; | ||
| import org.apache.commons.logging.LogFactory; | ||
| import org.wso2.healthcare.codegen.tool.framework.fhir.core.common.FHIRSpecificationData; | ||
| import org.wso2.healthcare.codegen.tool.framework.fhir.core.model.FHIRDataTypeDef; | ||
| import org.wso2.healthcare.fhir.ballerina.packagegen.tool.DataTypesRegistry; | ||
| import org.wso2.healthcare.fhir.ballerina.packagegen.tool.model.DatatypeTemplateContext; | ||
| import org.wso2.healthcare.fhir.ballerina.packagegen.tool.model.ExtensionTemplateContext; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.HashSet; | ||
| import java.util.HashMap; | ||
|
|
||
| public abstract class AbstractExtensionContextGenerator { | ||
Sanjana-Attanayake marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private static final Log LOG = LogFactory.getLog(AbstractExtensionContextGenerator.class); | ||
| private final Map<String, FHIRDataTypeDef> extensionDefnMap; | ||
| private final ExtensionTemplateContext extensionTemplateContext; | ||
|
|
||
| public AbstractExtensionContextGenerator(FHIRSpecificationData fhirSpecificationData) { | ||
| LOG.info("Started: Extensions Generation"); | ||
|
|
||
| this.extensionDefnMap = fhirSpecificationData.getDataTypes(); | ||
| this.extensionTemplateContext = new ExtensionTemplateContext(); | ||
|
|
||
| populateExtensionTemplateContext(); | ||
|
|
||
| LOG.info("Ended: Extensions Generation"); | ||
| } | ||
|
|
||
| protected Map<String, FHIRDataTypeDef> getExtensionDefnMap() { | ||
| return extensionDefnMap; | ||
| } | ||
|
|
||
| public ExtensionTemplateContext getExtensionTemplateContext() { | ||
| return extensionTemplateContext; | ||
| } | ||
|
|
||
| private void populateExtensionTemplateContext() { | ||
| populateBaseExtensionContext(); | ||
| populateSliceExtensionContext(); | ||
| populateExtensionSliceMap(); | ||
| } | ||
|
|
||
| protected abstract void populateBaseExtensionContext(); | ||
|
|
||
| protected abstract void populateSliceExtensionContext(); | ||
|
|
||
| protected abstract void populateExtensionResourceMap(String identifier, FHIRDataTypeDef extensionDef); | ||
|
|
||
| protected void populateExtensionSliceMap() { | ||
| Map<String, Set<String>> childExtensionMap = new HashMap<>(); | ||
| Set<String> searchKeys = new HashSet<>(); | ||
| Map<String, DatatypeTemplateContext> extensionDatatypeMap = extensionTemplateContext.getExtensionDatatypes(); | ||
|
|
||
| for (Map.Entry<String, DatatypeTemplateContext> contextEntry : extensionDatatypeMap.entrySet()) { | ||
| if (contextEntry.getKey().contains("http://")) { | ||
| /// Set Base Extension | ||
| searchKeys.add(contextEntry.getValue().getName()); | ||
| String extensionArrName = contextEntry.getValue().getName() + "Extensions"; | ||
| childExtensionMap.putIfAbsent(extensionArrName, new HashSet<>()); | ||
| DataTypesRegistry.getInstance().addDataType(extensionArrName); | ||
| } | ||
| } | ||
|
|
||
| for (Map.Entry<String, DatatypeTemplateContext> contextEntry : extensionDatatypeMap.entrySet()) { | ||
| /// Add Slice Extensions | ||
| /// Ensure that http:// keys are processed first | ||
| for (String key : searchKeys) { | ||
| if (contextEntry.getKey().contains(key.toLowerCase())) { | ||
| childExtensionMap.get(key + "Extensions").add(contextEntry.getValue().getName()); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| childExtensionMap.entrySet().removeIf(entry -> entry.getValue().isEmpty()); | ||
| extensionTemplateContext.setExtensionSlices(childExtensionMap); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.