misc

build.gradle

@@ -54,6 +54,8 @@ apply plugin: 'application'
 mainClassName = "com.jbalint.jora.proto.JarDirToRdf"
 
 run {
+    doLast {
 	standardInput = System.in
 	args "$jardir", "$outfile"
+    }
 }

src/main/java/com/jbalint/jcfl/ClassFileParser.java

@@ -107,15 +107,15 @@ private static FieldOrMethodInfo parseFieldOrMethodInfo(ClassFile cf, UnsignedDa
 		return info;
 	}
 
-	public static ClassFile parser(File file) throws IOException {
-		return parser(new FileInputStream(file));
+	public static ClassFile parse(File file) throws IOException {
+		return parse(new FileInputStream(file));
 	}
 
 	/**
 	 * Load and parse a Java class file.
 	 */
 	// alias shell='java -Xcheck:jni -esa -agentlib:yt -classpath build/classes/main java.util.prefs.Base64'
-	public static ClassFile parser(InputStream fileInputStream) throws IOException {
+	public static ClassFile parse(InputStream fileInputStream) throws IOException {
 		ClassFile cf = new ClassFile();
 		try (UnsignedDataInputStream is = new UnsignedDataInputStream(fileInputStream)) {
 			cf.magic = is.readInt();

src/main/java/com/jbalint/jora/proto/ClassToRdf.java → src/main/java/com/jbalint/jora/proto/ClassFileToRdf.java

@@ -38,7 +38,7 @@
 /**
  * Serialize a (parsed) Class to RDF
  */
-public class ClassToRdf {
+public class ClassFileToRdf {
 
 	static IRI methodIri(String className, String methodName, String methodSignature) {
 		return JcflVocab.JAVAP(className + "." + methodName + methodSignature.replaceAll("/", "."));

src/main/java/com/jbalint/jora/proto/JarDirToRdf.java

@@ -35,8 +35,8 @@ static Set<Statement> jarToRdf(File rawFile) {
 					continue;
 				}
 				InputStream is = f.getInputStream(e);
-				ClassFile cf = ClassFileParser.parser(is);
-				ClassToRdf.toRdf(model, cf);
+				ClassFile cf = ClassFileParser.parse(is);
+				ClassFileToRdf.toRdf(model, cf);
 			}
 
 			return model;
@@ -57,7 +57,7 @@ public static void main(String args[]) throws IOException {
 		                    .depthFirstPostOrder(dir))
 		       .filter(f -> f.isFile() && f.getName().endsWith(".jar"))
 		       .map(JarDirToRdf::jarToRdf)
-		       .forEach(m -> ClassToRdf.writeTurtleString(m, fos));
+		       .forEach(m -> ClassFileToRdf.writeTurtleString(m, fos));
 
 		fos.close();
 	}

src/main/java/com/jbalint/jora/proto/JarToRdf.java

@@ -32,13 +32,13 @@ public static void main(String args[]) throws IOException {
 				continue;
 			}
 			InputStream is = f.getInputStream(e);
-			ClassFile cf = ClassFileParser.parser(is);
-			ClassToRdf.toRdf(model, cf);
+			ClassFile cf = ClassFileParser.parse(is);
+			ClassFileToRdf.toRdf(model, cf);
 		}
 
 		String outfile = "output/" + new java.io.File(args[0]).getName() + ".javap.ttl";
 		FileOutputStream fos = new FileOutputStream(outfile);
-		ClassToRdf.writeTurtleString(model, fos);
+		ClassFileToRdf.writeTurtleString(model, fos);
 		fos.close();
 	}
 }

src/main/java/com/jbalint/jora/proto/SerializeAttributes.java

@@ -92,16 +92,22 @@ private void addElementValue(Resource subject, RuntimeAnnotation.ElementValue el
 		switch (elementValue.valueType) {
 			case ConstantValue:
 				// TODO :
-				throw new UnsupportedOperationException();
+				System.err.println("Ignoring " + subject + " " + elementValue);
+//				throw new UnsupportedOperationException();
+				break;
 			case ClassName:
 				mModel.add(Values.statement(subject, JcflVocab.JAVAP("hasClass"), JcflVocab.classIri(elementValue.className)));
 				break;
 			case EnumConstant:
 				// TODO :
-				throw new UnsupportedOperationException();
+				System.err.println("Ignoring " + subject + " " + elementValue);
+//				throw new UnsupportedOperationException();
+				break;
 			case Annotation:
 				// TODO :
-				throw new UnsupportedOperationException();
+				System.err.println("Ignoring " + subject + " " + elementValue);
+//				throw new UnsupportedOperationException();
+				break;
 			case Array:
 				BNode array = Values.bnode();
 				mModel.add(Values.statement(subject, JcflVocab.JAVAP("hasArrayValue"), array));

src/test/java/com/jbalint/jcfl/ParseClassFile.java

@@ -0,0 +1,14 @@
+package com.jbalint.jcfl;
+
+import java.io.File;
+
+/**
+ * Utility to parse a class file
+ */
+public class ParseClassFile {
+
+	public static void main(String args[]) throws Exception {
+		ClassFile parse = ClassFileParser.parse(new File(args[0]));
+		System.err.println(parse);
+	}
+}

src/test/java/com/jbalint/jcfl/UnreachableTestsTest.java

@@ -15,10 +15,8 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.Sets;
-import com.google.common.io.CharSource;
-import com.google.common.io.CharStreams;
 import com.google.common.io.Files;
-import com.jbalint.jora.proto.ClassToRdf;
+import com.jbalint.jora.proto.ClassFileToRdf;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -49,9 +47,9 @@ public void findReachableTests() throws IOException {
 			File dir = new File("out/test/jcfl/com/jbalint/jcfl/testcode");
 			conn.begin();
 			for (File file : dir.listFiles()) {
-				ClassFile cf = ClassFileParser.parser(file);
-				conn.add().graph(ClassToRdf.toRdf(cf));
-				ClassToRdf.writeTurtleString(ClassToRdf.toRdf(cf), System.err);
+				ClassFile cf = ClassFileParser.parse(file);
+				conn.add().graph(ClassFileToRdf.toRdf(cf));
+				ClassFileToRdf.writeTurtleString(ClassFileToRdf.toRdf(cf), System.err);
 			}
 			conn.commit();