Skip to content

Compare moduleInfo in validating dependent type signatures in cache #432

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.

Sign up for GitHub

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
NipunaRanasinghe merged 4 commits into from
Oct 25, 2025
Merged

Compare moduleInfo in validating dependent type signatures in cache #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
987db3d
Compare moduleInfo in validating dependent type signatures
pasindufernando1 Oct 20, 2025
d748b89
Address PR suggestions
pasindufernando1 Oct 20, 2025
c763545
Update intermittent failing test cases
pasindufernando1 Oct 21, 2025
4df82c2
Address PR suggestion
pasindufernando1 Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ...del-generator-ls-extension/src/test/resources/data_mapper_model/config/function_def6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,11 @@
"1373151159": {
"fields": [
{
"fields": [],
"name": "info",
"displayName": "info",
"typeName": "Info",
"kind": "record",
"optional": false,
"ref": "1372788890"
"name": "firstName",
"displayName": "firstName",
"typeName": "string",
"kind": "string",
"optional": false
}
],
"typeName": "User",
Expand Down
20 changes: 0 additions & 20 deletions ...low-model-generator-ls-extension/src/test/resources/data_mapper_model/config/query20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,6 @@
}
},
"refs": {
"-782972947": {
"fields": [
{
"name": "code",
"displayName": "code",
"typeName": "string",
"kind": "string",
"optional": false
},
{
"name": "number",
"displayName": "number",
"typeName": "string",
"kind": "string",
"optional": false
}
],
"typeName": "SecondaryPhones",
"kind": "record"
},
"1372788890": {
"fields": [
{
Expand Down
22 changes: 18 additions & 4 deletions ...src/main/java/org/ballerinalang/diagramutil/connector/models/connector/ReferenceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static RefType fromSemanticSymbol(Symbol symbol, List<Symbol> typeDefSymb
}
RefType type = fromSemanticSymbol(typeSymbol, name, moduleId, typeDefSymbols);

if (type.dependentTypes == null) {
if (type.dependentTypes == null && !type.dependentTypeKeys.isEmpty()) {
type.dependentTypes = new HashMap<>();
for (String dependentTypeKey : type.dependentTypeKeys) {
RefType dependentType = visitedTypeMap.get(dependentTypeKey);
Expand Down Expand Up @@ -442,15 +442,29 @@ private static void validateDependentTypes(RefType type, List<Symbol> typeDefSym
String depTypeKey = entry.getKey();
RefType depType = entry.getValue();
Symbol depSymbol = typeDefSymbols.stream()
.filter(sym -> depType.name.equals(sym.getName().orElse("")))
.filter(sym -> {
if (!depType.name.equals(sym.getName().orElse(""))) {
return false;
}
ModuleInfo depModuleInfo = depType.moduleInfo;
if (depModuleInfo != null) {
ModuleID symModuleId = getModuleID(sym);
if (symModuleId != null) {
return depModuleInfo.orgName.equals(symModuleId.orgName()) &&
depModuleInfo.moduleName.equals(symModuleId.moduleName()) &&
depModuleInfo.version.equals(symModuleId.version());
}
}
return true;
})
.findFirst()
.orElse(null);

if (depSymbol != null) {
TypeDefinitionSymbol typeDefSymbol = (TypeDefinitionSymbol) depSymbol;
TypeSymbol typeDesc = typeDefSymbol.typeDescriptor();
String moduleId = typeDefSymbol.getModule().isPresent() ?
typeDefSymbol.getModule().get().id().toString() : null;
String moduleId = typeDesc.getModule().isPresent() ?
typeDesc.getModule().get().id().toString() : null;
String updatedHashCode = String.valueOf(Objects.hash(
moduleId,
typeDefSymbol.getName().orElse(""),
Expand Down
1 change: 0 additions & 1 deletion misc/diagram-util/src/test/resources/RefTypeTest/TestData/recordSample1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"key": "441557406",
"name": "SampleType",
"typeName": "record",
"dependentTypes": {},
"moduleInfo": {
"orgName": "ballerinax",
"moduleName": "health.ccda.r1",
Expand Down
Loading