Skip to content

Add parameters lost during Java 21 migration #554

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
TharmiganK merged 3 commits into from
Jan 31, 2025
Merged

Add parameters lost during Java 21 migration #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5455b62
Add parameters lost during migration
ravinperera00 Jan 31, 2025
85deb8d
Add suggestions from code review
ravinperera00 Jan 31, 2025
221d3e8
Update test case
ravinperera00 Jan 31, 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
6 changes: 3 additions & 3 deletions ballerina/tests/directory-listener-test.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ boolean deleteInvoke = false;
service Service "filesystem" on localFolder {

remote function onCreate(FileEvent m) {
createInvoke = true;
createInvoke = m.operation == "create";
}

remote function onModify(FileEvent m) {
modifyInvoke = true;
modifyInvoke = m.operation == "modify";
}

remote function onDelete(FileEvent m) {
deleteInvoke = true;
deleteInvoke = m.operation == "delete";
}
}

Expand Down
20 changes: 19 additions & 1 deletion native/src/main/java/io/ballerina/stdlib/file/service/FSListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,24 @@

import io.ballerina.runtime.api.Runtime;
import io.ballerina.runtime.api.concurrent.StrandMetadata;
import io.ballerina.runtime.api.creators.ValueCreator;
import io.ballerina.runtime.api.types.MethodType;
import io.ballerina.runtime.api.types.ObjectType;
import io.ballerina.runtime.api.utils.StringUtils;
import io.ballerina.runtime.api.utils.TypeUtils;
import io.ballerina.runtime.api.values.BMap;
import io.ballerina.runtime.api.values.BObject;
import io.ballerina.runtime.api.values.BString;
import io.ballerina.stdlib.file.utils.FileConstants;
import io.ballerina.stdlib.file.utils.ModuleUtils;
import org.wso2.transport.localfilesystem.server.connector.contract.LocalFileSystemEvent;
import org.wso2.transport.localfilesystem.server.connector.contract.LocalFileSystemListener;

import java.util.HashMap;
import java.util.Map;

import static io.ballerina.stdlib.file.service.DirectoryListenerConstants.FILE_SYSTEM_EVENT;

/**
* File System connector listener for Ballerina.
*/
Expand All @@ -45,19 +53,29 @@ public FSListener(Runtime runtime) {
@Override
public void onMessage(LocalFileSystemEvent fileEvent) {
Thread.startVirtualThread(() -> {
Object balFileEvent = createBallerinaFileEvent(fileEvent);
for (Map.Entry<BObject, Map<String, MethodType>> serviceEntry: serviceRegistry.entrySet()) {
MethodType serviceFunction = serviceEntry.getValue().get(fileEvent.getEvent());
if (serviceFunction != null) {
String functionName = serviceFunction.getName();
BObject service = serviceEntry.getKey();
ObjectType type = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(service));
boolean isConcurrentSafe = type.isIsolated() && type.isIsolated(functionName);
runtime.callMethod(service, functionName, new StrandMetadata(isConcurrentSafe, null));
runtime.callMethod(service, functionName, new StrandMetadata(isConcurrentSafe, null), balFileEvent);
}
}
});
}

private Object createBallerinaFileEvent(LocalFileSystemEvent fileEvent) {
BMap<BString, Object> eventStruct = ValueCreator.createRecordValue(ModuleUtils.getModule(), FILE_SYSTEM_EVENT);
eventStruct.put(StringUtils.fromString(FileConstants.FILE_EVENT_NAME),
StringUtils.fromString(fileEvent.getFileName()));
eventStruct.put(StringUtils.fromString(FileConstants.FILE_EVENT_OPERATION),
StringUtils.fromString(fileEvent.getEvent()));
return eventStruct;
}

public void addService(BObject service, Map<String, MethodType> attachedFunctions) {
this.serviceRegistry.put(service, attachedFunctions);
}
Expand Down