Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ jobs:
path: ~/.m2
key: 'm2-cache'

- name: Install Xvfb
run: sudo apt-get update && sudo apt-get install -y xvfb libgtk-3-0

- name: Build
run: mvn -V -B clean install
run: xvfb-run -a mvn -V -B clean install

- name: Publish to NodePit
# https://stackoverflow.com/questions/58139406/only-run-job-on-specific-branch-with-github-actions
Expand Down
2 changes: 1 addition & 1 deletion application/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JSON node documentation generator
Bundle-SymbolicName: de.philippkatz.knime.jsondocgen.application;singleton:=true
Bundle-Version: 1.16.0.qualifier
Bundle-Version: 1.16.1.qualifier
Bundle-Vendor: Philipp Katz; Selenium Nodes
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,5.0.0)",
Expand Down
4 changes: 2 additions & 2 deletions application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

<modelVersion>4.0.0</modelVersion>
<artifactId>de.philippkatz.knime.jsondocgen.application</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<parent>
<groupId>de.philippkatz.knime.jsondocgen</groupId>
<artifactId>de.philippkatz.knime.jsondocgen</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
</parent>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,9 @@ private static void processPorts(Collection<Class<? extends PortObject>> portObj
* been skipped
*/
@SuppressWarnings({ "restriction", "unchecked" })
private boolean generate(final IRepositoryObject current, final IRepositoryObject parent,
CategoryDocBuilder parentCategory, Set<String> hiddenNodeFactoryIds) throws TransformerException, Exception {
/* package */ boolean generate(final IRepositoryObject current, final IRepositoryObject parent,
CategoryDocBuilder parentCategory, Set<String> hiddenNodeFactoryIds)
throws TransformerException, Exception {

if (current instanceof NodeTemplate nodeTemplate) {

Expand Down Expand Up @@ -514,14 +515,14 @@ private boolean generate(final IRepositoryObject current, final IRepositoryObjec
List<DynamicPortGroup> dynamicOutPorts = getDynamicPorts(factory, PortDirection.Out);
builder.setDynamicInPorts(mergeDynamicPortInfo(builder.build().dynamicInPorts, dynamicInPorts, current.getID()));
builder.setDynamicOutPorts(mergeDynamicPortInfo(builder.build().dynamicOutPorts, dynamicOutPorts, current.getID()));

Node node = new Node((NodeFactory<NodeModel>) factory);
var nodeDescription = node.invokeGetNodeDescription();
builder.setKeywords(Arrays.asList(nodeDescription.getKeywords()));
builder.setSinceVersion(nodeDescription.getSinceVersion().map(v -> v.toString()).orElse(null));
} catch (Throwable t) {
LOGGER.warn(String.format("Could not create NodeModel for %s", factory.getClass().getName()), t);
}

Node node = new Node((NodeFactory<NodeModel>) factory);
var nodeDescription = node.invokeGetNodeDescription();
builder.setKeywords(Arrays.asList(nodeDescription.getKeywords()));
builder.setSinceVersion(nodeDescription.getSinceVersion().map(v -> v.toString()).orElse(null));

builder.setHasModernDialog(hasModernDialog(factory));
// since KNIME 5.5; https://github.com/knime/knime-core-ui/commit/8769e99ab4df0a435fb90936d664fdc6c6ac2b6d
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,9 @@ public Set<String> getAllContributingPlugins() {
}
return result;
}

public List<NodeDoc> getNodes() {
return nodes;
}

}
2 changes: 1 addition & 1 deletion feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="de.philippkatz.knime.jsondocgen.feature"
label="NodePit JSON Documentation Generator"
version="1.16.0.qualifier"
version="1.16.1.qualifier"
provider-name="seleniumnodes.com; Philipp Katz">

<plugin
Expand Down
4 changes: 2 additions & 2 deletions feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

<modelVersion>4.0.0</modelVersion>
<artifactId>de.philippkatz.knime.jsondocgen.feature</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<parent>
<groupId>de.philippkatz.knime.jsondocgen</groupId>
<artifactId>de.philippkatz.knime.jsondocgen</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
</parent>

</project>
4 changes: 2 additions & 2 deletions p2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

<modelVersion>4.0.0</modelVersion>
<artifactId>de.philippkatz.knime.jsondocgen.p2</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<parent>
<groupId>de.philippkatz.knime.jsondocgen</groupId>
<artifactId>de.philippkatz.knime.jsondocgen</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
</parent>

</project>
19 changes: 17 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.philippkatz.knime.jsondocgen</groupId>
<artifactId>de.philippkatz.knime.jsondocgen</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand All @@ -17,6 +17,7 @@
</modules>

<properties>
<eclipserun.jvm.flags/>
<tycho-version>4.0.8</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand All @@ -39,7 +40,7 @@
<artifact>
<groupId>de.philippkatz.knime.jsondocgen</groupId>
<artifactId>de.philippkatz.knime.jsondocgen.targetplatform</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
</artifact>
</target>
<environments>
Expand Down Expand Up @@ -87,4 +88,18 @@
</plugins>
</build>

<profiles>
<profile>
<id>macosx-jvm-flags</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<properties>
<eclipserun.jvm.flags>-XstartOnFirstThread</eclipserun.jvm.flags>
</properties>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion targetplatform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>de.philippkatz.knime.jsondocgen</groupId>
<artifactId>de.philippkatz.knime.jsondocgen</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
</parent>

</project>
4 changes: 2 additions & 2 deletions tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JSON node documentation generator tests
Bundle-SymbolicName: de.philippkatz.knime.jsondocgen.tests;singleton:=true
Bundle-Version: 1.16.0.qualifier
Bundle-Version: 1.16.1.qualifier
Bundle-Vendor: Philipp Katz; Selenium Nodes
Bundle-RequiredExecutionEnvironment: JavaSE-17
Fragment-Host: de.philippkatz.knime.jsondocgen.application;bundle-version="1.16.0"
Fragment-Host: de.philippkatz.knime.jsondocgen.application;bundle-version="1.16.1"
Require-Bundle: org.junit;bundle-version="4.12.0"
12 changes: 10 additions & 2 deletions tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

<modelVersion>4.0.0</modelVersion>
<artifactId>de.philippkatz.knime.jsondocgen.tests</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>

<parent>
<groupId>de.philippkatz.knime.jsondocgen</groupId>
<artifactId>de.philippkatz.knime.jsondocgen</artifactId>
<version>1.16.0-SNAPSHOT</version>
<version>1.16.1-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -31,6 +31,14 @@
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<argLine>${eclipserun.jvm.flags}</argLine>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package de.philippkatz.knime.jsondocgen;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.util.Collections;

import javax.xml.transform.TransformerException;

import org.junit.Test;
import org.knime.core.node.NodeDialogPane;
import org.knime.core.node.NodeFactory;
import org.knime.core.node.NodeModel;
import org.knime.core.node.NodeView;
import org.knime.core.node.NodeFactory.NodeType;
import org.knime.workbench.repository.RepositoryManager;
import org.knime.workbench.repository.model.DefaultNodeTemplate;
import org.knime.workbench.repository.model.IRepositoryObject;

import de.philippkatz.knime.jsondocgen.docs.CategoryDoc.CategoryDocBuilder;

public class JsonNodeDocuGeneratorTest_NoClassDefFound_Test {

public static class MyNodeFactory extends NodeFactory<NodeModel> {

@Override
public NodeModel createNodeModel() {
throw new NoClassDefFoundError("org/RDKit/ROMol");
}

@Override
protected int getNrNodeViews() {
return 0;
}

@Override
public NodeView<NodeModel> createNodeView(int viewIndex, NodeModel nodeModel) {
return null;
}

@Override
protected boolean hasDialog() {
return false;
}

@Override
protected NodeDialogPane createNodeDialogPane() {
return null;
}

}

@SuppressWarnings("unchecked")
@Test
public void test() throws TransformerException, Exception {
var parentCategory = new CategoryDocBuilder();
var parent = RepositoryManager.INSTANCE.getRoot();
NodeFactory<NodeModel> factory = new MyNodeFactory();
var current = new DefaultNodeTemplate( //
(Class<NodeFactory<? extends NodeModel>>) factory.getClass(), //
"Bad Node", //
"de.philippkatz.knime.nodes.plugin", //
"/", //
NodeType.Other);

var result = new JsonNodeDocuGenerator().generate(current, parent, parentCategory, Collections.emptySet());

assertTrue(result);

var nodes = parentCategory.build().getNodes();
assertEquals(1, nodes.size());
assertEquals("Bad Node", nodes.get(0).name);
}

}