You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/08/05 18:32:16 UTC
[01/11] incubator-taverna-language git commit: Ro bundle validator
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 0e9bffebc -> eb1e3be5c
Ro bundle validator
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/ed7e7788
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ed7e7788
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ed7e7788
Branch: refs/heads/master
Commit: ed7e778811a2d722a5c04d345ebeddeabcedb537
Parents: 70720f8
Author: Menaka Madushanka <me...@gmail.com>
Authored: Wed Jul 22 00:02:21 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Wed Jul 22 00:02:21 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/robundle/validator/RoValidator.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ed7e7788/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
new file mode 100644
index 0000000..961fb66
--- /dev/null
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
@@ -0,0 +1,5 @@
+package org.apache.taverna.robundle.validator;
+
+public class RoValidator {
+
+}
[11/11] incubator-taverna-language git commit: Merge remote-tracking
branch 'menaka/rovalidator'
Posted by st...@apache.org.
Merge remote-tracking branch 'menaka/rovalidator'
Contributed by Menaka Madushanka
This closes #20
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/eb1e3be5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/eb1e3be5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/eb1e3be5
Branch: refs/heads/master
Commit: eb1e3be5c8ffc352d3c914f819a1e971005ca1f8
Parents: 0e9bffe 59db9db
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Aug 5 17:31:41 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Aug 5 17:31:41 2015 +0100
----------------------------------------------------------------------
.../taverna/robundle/validator/RoValidator.java | 162 +++++++++++++++++++
.../robundle/validator/ValidationReport.java | 113 +++++++++++++
.../robundle/validator/ValidatorTest.java | 43 +++++
3 files changed, 318 insertions(+)
----------------------------------------------------------------------
[10/11] incubator-taverna-language git commit: Temperory test
Posted by st...@apache.org.
Temperory test
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/59db9dbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/59db9dbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/59db9dbf
Branch: refs/heads/master
Commit: 59db9dbfd45451858f5b5aac0210a376c3ac3c26
Parents: a4c2318
Author: Menaka Madushanka <me...@gmail.com>
Authored: Sat Jul 25 03:53:01 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Sat Jul 25 03:53:01 2015 +0530
----------------------------------------------------------------------
.../taverna/robundle/validator/ValidatorTest.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/59db9dbf/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
index 94f7b1d..9cbba1f 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
@@ -21,13 +21,23 @@ package org.apache.taverna.robundle.validator;
import static org.junit.Assert.*;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
import org.junit.Test;
public class ValidatorTest {
+ private Path path = Paths.get("src/test/resources/workflowrun.bundle.zip");
+
@Test
public void test() {
- fail("Not yet implemented");
+ RoValidator validator = new RoValidator(path);
+ ValidationReport r = validator.check();
+
+ System.out.println(r.getErrorList());
+ System.out.println(r.getInfoWarnings());
+ System.out.println(r.getWarnings());
}
}
[04/11] incubator-taverna-language git commit: more explained way
Posted by st...@apache.org.
more explained way
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/81fee894
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/81fee894
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/81fee894
Branch: refs/heads/master
Commit: 81fee89451f9c600a18d43da443f16d1839b7776
Parents: 3e5b436
Author: Menaka Madushanka <me...@gmail.com>
Authored: Fri Jul 24 02:43:15 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Fri Jul 24 02:43:15 2015 +0530
----------------------------------------------------------------------
.../taverna/robundle/validator/RoValidator.java | 84 ++++++++++++++++++++
1 file changed, 84 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/81fee894/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
index 1098bf0..18bf218 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
@@ -19,6 +19,90 @@ package org.apache.taverna.robundle.validator;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import javax.swing.event.ListSelectionEvent;
+
+import org.apache.taverna.robundle.Bundle;
+import org.apache.taverna.robundle.Bundles;
+import org.apache.taverna.robundle.manifest.Manifest;
+import org.apache.taverna.robundle.manifest.PathAnnotation;
+import org.apache.taverna.robundle.manifest.PathMetadata;
+
+
+
+
+/*
+ * Validation Process:
+ * The class validates RO bundles for manifest and aggregates.
+ * Aggregate validation:
+ * There are 03 cases,
+ * 1. If the aggregates are listed in manifest but not found in the container: AggregatenotFound Error
+ * 2. If aggregates contain an external uri, there will be a warning
+ * 3. If aggregate is not listed but included in the container, info-level warning.
+ *
+ * Also in annotations....
+ * If the about contain a /-based resource which is not listed or not in the container, there will be an error.
+ */
public class RoValidator {
+ private Path p;
+ //Store all aggregates to be checked
+ private List<PathMetadata> aggr;
+
+ //Store all the annotations
+ private List<PathAnnotation> anno;
+
+
+ //ArrayList for errors :- If aggregate is listed in manifest but not in bundle
+ private ArrayList<String> errorList = new ArrayList<>();
+
+ //ArrayList for warnings :- If files not listed in the manifest are included in bundle
+ private ArrayList<String> warningList = new ArrayList<String>();
+
+
+ public RoValidator(Path path){
+ this.p = path;
+ }
+
+ public void validate(){
+ Bundle bundle;
+ ArrayList<String> items = new ArrayList<String>();
+ try {
+ bundle = Bundles.openBundle(this.p);
+ Manifest manifest = bundle.getManifest();
+ this.aggr = manifest.getAggregates();
+ this.anno = manifest.getAnnotations();
+
+
+ ZipFile zip = new ZipFile(new File(this.p.toString()));
+ Enumeration<? extends ZipEntry> ent = zip.entries();
+ while(ent.hasMoreElements()){
+ ZipEntry entry = ent.nextElement();
+ if(!entry.isDirectory()){
+ items.add("/"+entry.getName());
+ }
+ }
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ check(items);
+
+ }
+
+ public void check(ArrayList<String> list){
+
+ }
+
}
[02/11] incubator-taverna-language git commit: Apache license header
Posted by st...@apache.org.
Apache license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/0077fb69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/0077fb69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/0077fb69
Branch: refs/heads/master
Commit: 0077fb69eb86d1285ae308cf86e704c6a9cd26ff
Parents: ed7e778
Author: Menaka Madushanka <me...@gmail.com>
Authored: Wed Jul 22 00:06:22 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Wed Jul 22 00:06:22 2015 +0530
----------------------------------------------------------------------
.../taverna/robundle/validator/RoValidator.java | 21 +++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0077fb69/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
index 961fb66..1098bf0 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
@@ -1,5 +1,24 @@
package org.apache.taverna.robundle.validator;
-public class RoValidator {
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+public class RoValidator {
+
}
[05/11] incubator-taverna-language git commit: Validation report class
Posted by st...@apache.org.
Validation report class
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/6c6dfa6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/6c6dfa6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/6c6dfa6c
Branch: refs/heads/master
Commit: 6c6dfa6c70797299d2a762da66f7b2abf9753787
Parents: 81fee89
Author: Menaka Madushanka <me...@gmail.com>
Authored: Fri Jul 24 03:54:35 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Fri Jul 24 03:54:35 2015 +0530
----------------------------------------------------------------------
.../robundle/validator/ValidationReport.java | 38 ++++++++++++++++++++
1 file changed, 38 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/6c6dfa6c/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
new file mode 100644
index 0000000..6217039
--- /dev/null
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
@@ -0,0 +1,38 @@
+package org.apache.taverna.robundle.validator;
+
+import java.util.ArrayList;
+
+public class ValidationReport {
+
+ private ArrayList<String> errorList;
+
+ private ArrayList<String> infoWarnings;
+
+ private ArrayList<String> warnings;
+
+ public ArrayList<String> getErrorList() {
+ return errorList;
+ }
+
+ public void setErrorList(ArrayList<String> errorList) {
+ this.errorList = errorList;
+ }
+
+ public ArrayList<String> getInfoWarnings() {
+ return infoWarnings;
+ }
+
+ public void setInfoWarnings(ArrayList<String> infoWarnings) {
+ this.infoWarnings = infoWarnings;
+ }
+
+ public ArrayList<String> getWarnings() {
+ return warnings;
+ }
+
+ public void setWarnings(ArrayList<String> warnings) {
+ this.warnings = warnings;
+ }
+
+
+}
[09/11] incubator-taverna-language git commit: Issue fixed : have
some performance considerations
Posted by st...@apache.org.
Issue fixed : have some performance considerations
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/a4c23189
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/a4c23189
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/a4c23189
Branch: refs/heads/master
Commit: a4c23189c7a1033c6c94c6550a728857ea7d9fdf
Parents: 57dd0ee
Author: Menaka Madushanka <me...@gmail.com>
Authored: Sat Jul 25 03:36:18 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Sat Jul 25 03:36:18 2015 +0530
----------------------------------------------------------------------
.../taverna/robundle/validator/RoValidator.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/a4c23189/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
index 062134a..c1dedd5 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
@@ -25,7 +25,9 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -129,15 +131,19 @@ public class RoValidator {
* There are default files: mimetype and LICENSE
* */
+
+ //FIX ME : performance ???
+ Set<String> set = new HashSet<>();
+ for(PathMetadata p : this.aggr){
+ set.add(p.toString());
+ }
+
for(String s : this.items){
-// s = s.toLowerCase();
- PathMetadata p = new PathMetadata(s);
-// System.out.println(p);
- if(s.contains("mimetype")||s.toLowerCase().contains("license")){
+ if(s.contains("mimetype")||s.toLowerCase().contains("license")||s.contains(".ro")){
//This is ok and skip
}else{
- if(!this.aggr.contains(p)){
+ if(!set.contains(s)){
this.infoWarningList.add(p.toString());
}
}
[08/11] incubator-taverna-language git commit: Stage 1 : Issue info
level warning
Posted by st...@apache.org.
Stage 1 : Issue info level warning
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/57dd0eee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/57dd0eee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/57dd0eee
Branch: refs/heads/master
Commit: 57dd0eee16814385dbea60ad7478e28a96c160da
Parents: 76e1039
Author: Menaka Madushanka <me...@gmail.com>
Authored: Sat Jul 25 03:11:27 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Sat Jul 25 03:11:27 2015 +0530
----------------------------------------------------------------------
.../taverna/robundle/validator/RoValidator.java | 30 ++++++++--------
.../robundle/validator/ValidationReport.java | 36 ++++++++++++--------
2 files changed, 35 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/57dd0eee/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
index ce340cd..062134a 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
@@ -37,9 +37,6 @@ import org.apache.taverna.robundle.manifest.Manifest;
import org.apache.taverna.robundle.manifest.PathAnnotation;
import org.apache.taverna.robundle.manifest.PathMetadata;
-
-
-
/*
* Validation Process:
* The class validates RO bundles for manifest and aggregates.
@@ -52,6 +49,7 @@ import org.apache.taverna.robundle.manifest.PathMetadata;
* Also in annotations....
* If the about contain a /-based resource which is not listed or not in the container, there will be an error.
*/
+
public class RoValidator {
private Path p;
@@ -61,6 +59,9 @@ public class RoValidator {
//Store all the annotations
private List<PathAnnotation> anno;
+ //List of resources in the bundle
+ private ArrayList<String> items = new ArrayList<String>();
+
//ArrayList for errors :- If aggregate is listed in manifest but not in bundle
private ArrayList<String> errorList = new ArrayList<>();
@@ -79,14 +80,13 @@ public class RoValidator {
public void validate(){
Bundle bundle;
- ArrayList<String> items = new ArrayList<String>();
+
try {
bundle = Bundles.openBundle(this.p);
Manifest manifest = bundle.getManifest();
this.aggr = manifest.getAggregates();
this.anno = manifest.getAnnotations();
-
ZipFile zip = new ZipFile(new File(this.p.toString()));
Enumeration<? extends ZipEntry> ent = zip.entries();
while(ent.hasMoreElements()){
@@ -100,20 +100,17 @@ public class RoValidator {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
- check(items);
-
-
+
}
- public ValidationReport check(ArrayList<String> list){
+ public ValidationReport check(){
ValidationReport report = new ValidationReport();
for(PathMetadata pm : this.aggr){
-
+// System.out.println("Path metedata " + pm);
//If aggregates listed in manifest are not found in bundle...
- if(!list.contains(pm.toString())){
+ if(!this.items.contains(pm.toString())){
/*
* Here it can be a external url or the file is missing
@@ -132,15 +129,16 @@ public class RoValidator {
* There are default files: mimetype and LICENSE
* */
- for(String s : list){
+ for(String s : this.items){
- s = s.toLowerCase();
+// s = s.toLowerCase();
PathMetadata p = new PathMetadata(s);
- if(s.contains("mimetype")||s.contains("license")){
+// System.out.println(p);
+ if(s.contains("mimetype")||s.toLowerCase().contains("license")){
//This is ok and skip
}else{
if(!this.aggr.contains(p)){
- this.infoWarningList.add(s);
+ this.infoWarningList.add(p.toString());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/57dd0eee/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
index a8b03ac..03f2b59 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
@@ -51,57 +51,63 @@ public class ValidationReport {
public ValidationReport(){
}
+
+ public void setWarnings(ArrayList<String> warnings) {
+ this.warnings = warnings;
+ }
+
+ public void setInfoWarnings(ArrayList<String> infoWarnings) {
+ this.infoWarnings = infoWarnings;
+ }
+
+ public void setErrorList(ArrayList<String> errorList) {
+ this.errorList = errorList;
+ }
+
public String getErrorList() {
String errors = "";
if(this.errorList.size()!=0){
for(String e : this.errorList){
- errors += e + "\n";
+ errors += "Aggregate not found error: " + e + "\n";
}
}else{
- return "The ro bundle has no errors";
+ return "The bundle has no errors";
}
return "Aggregate not found errors: " +"\n"+ errors;
}
- public void setErrorList(ArrayList<String> errorList) {
- this.errorList = errorList;
- }
+
public String getInfoWarnings() {
String warning = "";
if(this.warnings.size()!=0){
for(String w : this.warnings){
- warning += w + "\n";
+ warning += "Warning: " +w + " is an external URL \n";
}
}else{
return "The bundle has no warnings";
}
- return "Warnings" + "\n" + warning;
+ return warning;
}
- public void setInfoWarnings(ArrayList<String> infoWarnings) {
- this.infoWarnings = infoWarnings;
- }
+
public String getWarnings() {
String infoWarning = "";
if(this.infoWarnings.size()!=0){
for(String iw : this.infoWarnings){
- infoWarning += iw + "\n";
+ infoWarning += "Warning (info) "+iw + "\n";
}
}else{
return "The Bundle has no Info level warnings";
}
- return "Info-Level warnings: " +"\n"+infoWarning;
+ return infoWarning;
}
- public void setWarnings(ArrayList<String> warnings) {
- this.warnings = warnings;
- }
}
[07/11] incubator-taverna-language git commit: Validation report
complete
Posted by st...@apache.org.
Validation report complete
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/76e10395
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/76e10395
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/76e10395
Branch: refs/heads/master
Commit: 76e10395b217163ebda5f1540001610855001a12
Parents: 06bef78
Author: Menaka Madushanka <me...@gmail.com>
Authored: Sat Jul 25 00:37:04 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Sat Jul 25 00:37:04 2015 +0530
----------------------------------------------------------------------
.../robundle/validator/ValidationReport.java | 77 ++++++++++++++++++--
1 file changed, 71 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/76e10395/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
index 04f6539..a8b03ac 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
@@ -1,37 +1,102 @@
package org.apache.taverna.robundle.validator;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.ArrayList;
+
+/*
+ * Class for the validation report
+ * There are basically 3 types of errors.
+ * 1. Errors :- If listed aggregate/s are not found in the bundle
+ * 2. Warnings :- If there are any external url is listed under aggregates.
+ * 3. Info level warning :- If there are resources which are not included in the manifest
+ *
+ * Output format
+ * To get the output, the get methods must be called.
+ * If there are no specific errors/ warnings then, "The bundle has no warnings/ errors" will be returned
+ * If there are errors or warnings,
+ * Aggregates not found errors: List of aggregates which are not found
+ * Info level warning : list of files/ resources
+ * Warnings: list of urls
+ * */
public class ValidationReport {
+ //For aggregate not found errors
private ArrayList<String> errorList;
+ //For info level warnings
private ArrayList<String> infoWarnings;
+ //For warnings
private ArrayList<String> warnings;
public ValidationReport(){
}
- public ArrayList<String> getErrorList() {
- return errorList;
+ public String getErrorList() {
+ String errors = "";
+ if(this.errorList.size()!=0){
+ for(String e : this.errorList){
+ errors += e + "\n";
+ }
+ }else{
+ return "The ro bundle has no errors";
+ }
+
+ return "Aggregate not found errors: " +"\n"+ errors;
}
public void setErrorList(ArrayList<String> errorList) {
this.errorList = errorList;
}
- public ArrayList<String> getInfoWarnings() {
- return infoWarnings;
+ public String getInfoWarnings() {
+ String warning = "";
+ if(this.warnings.size()!=0){
+ for(String w : this.warnings){
+ warning += w + "\n";
+ }
+ }else{
+ return "The bundle has no warnings";
+ }
+ return "Warnings" + "\n" + warning;
}
public void setInfoWarnings(ArrayList<String> infoWarnings) {
this.infoWarnings = infoWarnings;
}
- public ArrayList<String> getWarnings() {
- return warnings;
+ public String getWarnings() {
+ String infoWarning = "";
+
+ if(this.infoWarnings.size()!=0){
+ for(String iw : this.infoWarnings){
+ infoWarning += iw + "\n";
+ }
+ }else{
+ return "The Bundle has no Info level warnings";
+ }
+ return "Info-Level warnings: " +"\n"+infoWarning;
+
}
public void setWarnings(ArrayList<String> warnings) {
[03/11] incubator-taverna-language git commit: Validator test
Posted by st...@apache.org.
Validator test
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/3e5b4363
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/3e5b4363
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/3e5b4363
Branch: refs/heads/master
Commit: 3e5b4363d926b4f9b92d9e3a7a9cdc5d0e42e363
Parents: 0077fb6
Author: Menaka Madushanka <me...@gmail.com>
Authored: Wed Jul 22 01:41:17 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Wed Jul 22 01:41:17 2015 +0530
----------------------------------------------------------------------
.../robundle/validator/ValidatorTest.java | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/3e5b4363/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
new file mode 100644
index 0000000..94f7b1d
--- /dev/null
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/validator/ValidatorTest.java
@@ -0,0 +1,33 @@
+package org.apache.taverna.robundle.validator;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ValidatorTest {
+
+ @Test
+ public void test() {
+ fail("Not yet implemented");
+ }
+
+}
[06/11] incubator-taverna-language git commit: Report structure
Posted by st...@apache.org.
Report structure
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/06bef782
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/06bef782
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/06bef782
Branch: refs/heads/master
Commit: 06bef782020e1de371d26b7a761905034b1d82d9
Parents: 6c6dfa6
Author: Menaka Madushanka <me...@gmail.com>
Authored: Fri Jul 24 04:00:27 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Fri Jul 24 04:00:27 2015 +0530
----------------------------------------------------------------------
.../taverna/robundle/validator/RoValidator.java | 54 +++++++++++++++++++-
.../robundle/validator/ValidationReport.java | 4 ++
2 files changed, 56 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/06bef782/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
index 18bf218..ce340cd 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/RoValidator.java
@@ -66,11 +66,15 @@ public class RoValidator {
private ArrayList<String> errorList = new ArrayList<>();
//ArrayList for warnings :- If files not listed in the manifest are included in bundle
- private ArrayList<String> warningList = new ArrayList<String>();
+ private ArrayList<String> infoWarningList = new ArrayList<String>();
+
+ //If there are external urls
+ private ArrayList<String> warning = new ArrayList<String>();
public RoValidator(Path path){
this.p = path;
+ this.validate();
}
public void validate(){
@@ -99,10 +103,56 @@ public class RoValidator {
check(items);
+
}
- public void check(ArrayList<String> list){
+ public ValidationReport check(ArrayList<String> list){
+
+ ValidationReport report = new ValidationReport();
+
+ for(PathMetadata pm : this.aggr){
+
+ //If aggregates listed in manifest are not found in bundle...
+ if(!list.contains(pm.toString())){
+
+ /*
+ * Here it can be a external url or the file is missing
+ * */
+ //If the aggregate is a external URL...
+ if(pm.toString().contains("http://") || pm.toString().contains(".com")){
+ this.warning.add(pm.toString());
+ }else{
+ this.errorList.add(pm.toString());
+ }
+ }
+ }
+
+ /*
+ * There could be files in the bundle, which are not included as aggregates.
+ * There are default files: mimetype and LICENSE
+ * */
+ for(String s : list){
+
+ s = s.toLowerCase();
+ PathMetadata p = new PathMetadata(s);
+ if(s.contains("mimetype")||s.contains("license")){
+ //This is ok and skip
+ }else{
+ if(!this.aggr.contains(p)){
+ this.infoWarningList.add(s);
+ }
+ }
+ }
+
+ report.setErrorList(this.errorList);
+ report.setInfoWarnings(this.infoWarningList);
+ report.setWarnings(this.warning);
+
+ return report;
}
+
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/06bef782/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
index 6217039..04f6539 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/validator/ValidationReport.java
@@ -9,6 +9,10 @@ public class ValidationReport {
private ArrayList<String> infoWarnings;
private ArrayList<String> warnings;
+
+ public ValidationReport(){
+
+ }
public ArrayList<String> getErrorList() {
return errorList;