Skip to content
This repository was archived by the owner on Jul 2, 2025. It is now read-only.

Resolve imports - #24

Open
ThilinaManamgoda wants to merge 15 commits into
apache:cwl-browsefrom
ThilinaManamgoda:resolve-imports
Open

Resolve imports#24
ThilinaManamgoda wants to merge 15 commits into
apache:cwl-browsefrom
ThilinaManamgoda:resolve-imports

Conversation

@ThilinaManamgoda

Copy link
Copy Markdown
Member

No description provided.

@stain

stain commented Apr 18, 2017

Copy link
Copy Markdown
Member

What are all those changes to .gitignore? Which lines of those are really needed for IntelliJ? They seem to be copy-pasted from elsewhere and I'm not sure if you are able to contribute it directly.

@ThilinaManamgoda

Copy link
Copy Markdown
Member Author

Sorry, my mistake. It's fixed now.

@stain stain left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this effort! I've not got as far as testing the build yet, but the changes look OK, except where noted in comments. Would you be able to address those before merging?

@@ -0,0 +1,26 @@
package org.apache.taverna.cwl.utilities.preprocessing;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a license header here?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@@ -0,0 +1,31 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one or more

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick:
indentation error in header. This seems to be true for all of your added files.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@@ -0,0 +1,39 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one or more

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation error in header :)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

/**
* This class provides abstract between node importing and how it's imported
*/
public class ImportNodeImpl implements ImportNode {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain the reasoning for ImportNode vs ImportData? I don't think it's wrong, just a bit confused.. is it in a way so that the ImportNode is kind of the instruction to import, and ImportData the imported data?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's bit confusing I see it now. Let's keep ImportNode and remove ImportData

@Override
public JsonNode importData(URI uri) {

try (BufferedInputStream inputStream = new BufferedInputStream(uri.toURL().openStream())) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, I think this will support Taverna's username/password mechanism if Basic Auth is needed, or SSL certification checks if arbitrary certificates are used.

I think this would however also support climbing out and say import file:///etc/passwd
or http://intranet15:1313/ - let's see afterwards how we can be more selective about which hosts are OK to use for imports (e.g. browser-like same-origin checking and UI pop-up to confirm)

@@ -0,0 +1,16 @@
# Root logger option

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add ASF license header, presumably using # as comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

#################################################################################


cwlVersion: v1.0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the origin of these test workflows? Did you make them, or did they come from the commonwl.org site?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made them for testing.

@@ -0,0 +1,3 @@
hello:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ASF license header missing (even if this file is really tiny..)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Comment thread .gitignore Outdated
*~


# Created by https://www.gitignore.io/api/intellij,intellij+iml

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the license of the output of gitignore.io? Also I don't think we really need all these ignores for intelliJ -- would not a one line ignore of .idea/ be sufficient?

<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SnakeYAML is Apache License 2.0 - so OK to use. (Why not 1.18?)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version is updated

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants