java_gen: adapt to of_g removal, new ir
diff --git a/java_gen/codegen.py b/java_gen/codegen.py
index 0b3ed35..c01ba68 100644
--- a/java_gen/codegen.py
+++ b/java_gen/codegen.py
@@ -85,7 +85,7 @@
if not os.path.exists(dirname):
os.makedirs(dirname)
prefix = '//::(?=[ \t]|$)'
- print "filename: %s" % filename
+ logger.debug("rendering filename: %s" % filename)
with open(filename, "w") as f:
template_utils.render_template(f, template, [self.templates_dir], context, prefix=prefix)
@@ -94,7 +94,7 @@
cleaner.find_used_imports()
cleaner.rewrite_file(filename)
except:
- print 'Cannot clean imports from file %s' % filename
+ logger.info('Cannot clean imports from file %s' % filename)
def create_of_const_enums(self):
for enum in self.java_model.enums:
@@ -104,7 +104,7 @@
template='const.java', enum=enum, all_versions=self.java_model.versions)
for version in enum.versions:
- clazz = java_model.OFGenericClass(package="org.projectfloodlight.openflow.protocol.ver{}".format(version.of_version), name="{}SerializerVer{}".format(enum.name, version.of_version))
+ clazz = java_model.OFGenericClass(package="org.projectfloodlight.openflow.protocol.ver{}".format(version.dotless_version), name="{}SerializerVer{}".format(enum.name, version.dotless_version))
if enum.is_bitmask:
self.render_class(clazz=clazz, template="const_set_serializer.java", enum=enum, version=version)
@@ -137,9 +137,9 @@
template='of_virtual_class.java', version=java_class.version, msg=java_class,
impl_class=java_class.name, model=self.java_model)
else:
- print "Class %s virtual but no discriminator" % java_class.name
+ logger.warn("Class %s virtual but no discriminator" % java_class.name)
else:
- print "Class %s ignored by generate_class" % java_class.name
+ logger.info("Class %s ignored by generate_class" % java_class.name)
def create_unit_test(self, unit_tests):
if unit_tests.has_test_data:
@@ -162,4 +162,4 @@
def copy_prewrite_tree(basedir):
""" Recursively copy the directory structure from ./java_gen/pre-write
into $basedir"""
- print "Copying pre-written files into %s" % basedir
+ logger.info("Copying pre-written files into %s" % basedir)