Support for class fields

neo4j · May 17, 2016 · 5013957 · 5013957
1 parent 148abfb
commit 5013957
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/community/codegen/src/main/java/org/neo4j/codegen/ByteCodeUtils.java b/community/codegen/src/main/java/org/neo4j/codegen/ByteCodeUtils.java
@@ -34,7 +34,7 @@ public static String byteCodeName( String javaName )
         return javaName.replaceAll( "\\.", "\\/" );
     }
 
-    public static String type( TypeReference reference )
+    public static String typeName( TypeReference reference )
     {
         StringBuilder builder = new StringBuilder();
         internalType( builder, reference, false );

diff --git a/community/codegen/src/main/java/org/neo4j/codegen/source/ClassByteCodeWriter.java b/community/codegen/src/main/java/org/neo4j/codegen/source/ClassByteCodeWriter.java
@@ -45,6 +45,7 @@
 import static org.neo4j.codegen.ByteCodeUtils.desc;
 import static org.neo4j.codegen.ByteCodeUtils.exceptions;
 import static org.neo4j.codegen.ByteCodeUtils.signature;
+import static org.neo4j.codegen.ByteCodeUtils.typeName;
 import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
 import static org.objectweb.asm.Opcodes.ACC_STATIC;
 import static org.objectweb.asm.Opcodes.ACC_SUPER;
@@ -88,7 +89,7 @@ public void field( FieldReference field, Expression value )
             staticFields.put( field, value );
         }
         FieldVisitor fieldVisitor = classWriter
-                .visitField( field.modifiers(), "string", "Ljava/lang/String;", signature( field.type() ), null );
+                .visitField( field.modifiers(), field.name(), typeName( field.type() ), signature( field.type() ), null );
         fieldVisitor.visitEnd();
     }
 

diff --git a/community/codegen/src/test/java/org/neo4j/codegen/ByteCodeUtilsTest.java b/community/codegen/src/test/java/org/neo4j/codegen/ByteCodeUtilsTest.java
@@ -29,7 +29,7 @@
 import static org.neo4j.codegen.ByteCodeUtils.desc;
 import static org.neo4j.codegen.ByteCodeUtils.exceptions;
 import static org.neo4j.codegen.ByteCodeUtils.signature;
-import static org.neo4j.codegen.ByteCodeUtils.type;
+import static org.neo4j.codegen.ByteCodeUtils.typeName;
 import static org.neo4j.codegen.MethodDeclaration.method;
 import static org.neo4j.codegen.Parameter.param;
 import static org.neo4j.codegen.TypeReference.extending;
@@ -45,7 +45,7 @@ public void shouldTranslateIntToByteCode()
         TypeReference reference = typeReference( int.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "I" ) );
@@ -58,7 +58,7 @@ public void shouldTranslateShortToByteCode()
         TypeReference reference = typeReference( short.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "S" ) );
@@ -71,7 +71,7 @@ public void shouldTranslateCharToByteCode()
         TypeReference reference = typeReference( char.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "C" ) );
@@ -84,7 +84,7 @@ public void shouldTranslateLongToByteCode()
         TypeReference reference = typeReference( long.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "J" ) );
@@ -97,7 +97,7 @@ public void shouldTranslateFloatToByteCode()
         TypeReference reference = typeReference( float.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "F" ) );
@@ -110,7 +110,7 @@ public void shouldTranslateDoubleToByteCode()
         TypeReference reference = typeReference( double.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "D" ) );
@@ -123,7 +123,7 @@ public void shouldTranslateBooleanToByteCode()
         TypeReference reference = typeReference( boolean.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "Z" ) );
@@ -136,7 +136,7 @@ public void shouldTranslateVoidToByteCode()
         TypeReference reference = typeReference( void.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "V" ) );
@@ -149,7 +149,7 @@ public void shouldTranslateReferenceTypeToByteCode()
         TypeReference reference = typeReference( String.class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "Ljava/lang/String;" ) );
@@ -162,7 +162,7 @@ public void shouldTranslateArrayTypeToByteCode()
         TypeReference reference = typeReference( boolean[].class );
 
         // WHEN
-        String byteCodeName = type( reference );
+        String byteCodeName = typeName( reference );
 
         // THEN
         assertThat( byteCodeName, equalTo( "[Z" ) );