Skip to content

Commit 490d10a

Browse files
committed
AP-23915: Adapt to port converter extension changes
AP-23915 (Change Python Extension Port registry so that the imported module can be a submodule)
1 parent ee4306a commit 490d10a

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

org.knime.python3.nodes/plugin.xml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,21 @@
4646
</extension>
4747
<extension
4848
point="org.knime.python3.types.PythonPortObjectConverter">
49-
<KnimeToPythonPortObjectConverter
50-
JavaConverterClass="org.knime.python3.nodes.ports.converters.credentials.CredentialPythonConverter"
51-
PythonConverterClass="CredentialConverter"
52-
PythonModule="src/main/python/_port_impl.py">
53-
</KnimeToPythonPortObjectConverter>
54-
<PythonToKnimePortObjectConverter
55-
JavaConverterClass="org.knime.python3.nodes.ports.converters.credentials.CredentialPythonConverter"
56-
PythonConverterClass="CredentialConverter"
57-
PythonModule="src/main/python/_port_impl.py">
58-
</PythonToKnimePortObjectConverter>
59-
<KnimeToPythonPortObjectConverter
60-
JavaConverterClass="org.knime.python3.nodes.ports.converters.credentials.HubCredentialPythonConverter"
61-
PythonConverterClass="HubAuthenticationConverter"
62-
PythonModule="src/main/python/_port_impl.py">
63-
</KnimeToPythonPortObjectConverter>
49+
<Module
50+
moduleName="_port_impl"
51+
modulePath="src/main/python/">
52+
<KnimeToPythonPortObjectConverter
53+
JavaConverterClass="org.knime.python3.nodes.ports.converters.credentials.CredentialPythonConverter"
54+
PythonConverterClass="CredentialConverter">
55+
</KnimeToPythonPortObjectConverter>
56+
<PythonToKnimePortObjectConverter
57+
JavaConverterClass="org.knime.python3.nodes.ports.converters.credentials.CredentialPythonConverter"
58+
PythonConverterClass="CredentialConverter">
59+
</PythonToKnimePortObjectConverter>
60+
<KnimeToPythonPortObjectConverter
61+
JavaConverterClass="org.knime.python3.nodes.ports.converters.credentials.HubCredentialPythonConverter"
62+
PythonConverterClass="HubAuthenticationConverter">
63+
</KnimeToPythonPortObjectConverter>
64+
</Module>
6465
</extension>
6566
</plugin>

org.knime.python3.nodes/src/main/java/org/knime/python3/nodes/PortObjectExtensionPointUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static PortObjectExtensionPointUtils getInstance() {
8787
public Stream<Path> getPythonPaths() {
8888
return Stream.concat(m_knimeToPy.stream(), m_pyToKnime.stream())//
8989
.map(PythonPortObjectConverterExtension::pythonImplementation)//
90-
.map(PythonImplementation::parentFolder);
90+
.map(PythonImplementation::pythonModulePath);
9191
}
9292

9393
public void registerPortObjectConverters(final KnimeNodeBackend backend) {
@@ -126,7 +126,7 @@ private static void registerKnimeToPyPortObjectConverter(final PythonPortObjectC
126126
final KnimeNodeBackend backend) {
127127
var converter = extension.converter();
128128
var pythonImplementation = extension.pythonImplementation();
129-
var moduleName = pythonImplementation.moduleName();
129+
var moduleName = pythonImplementation.pythonModuleName();
130130
var pythonConverter = pythonImplementation.pythonClassName();
131131
var objClass = converter.getPortObjectClass();
132132
var objClassName = objClass.getName();
@@ -140,7 +140,7 @@ private static void registerPyToKnimePortObjectConverter(final PythonPortObjectC
140140
final KnimeNodeBackend backend) {
141141
var converter = extension.converter();
142142
var pythonImplementation = extension.pythonImplementation();
143-
var moduleName = pythonImplementation.moduleName();
143+
var moduleName = pythonImplementation.pythonModuleName();
144144
var pythonConverter = pythonImplementation.pythonClassName();
145145
Class<? extends PortObject> objClass = converter.getPortObjectClass();
146146
var objClassName = objClass.getName();

0 commit comments

Comments
 (0)