logging/instrumentation: address review comments, remove InstrumentationOptions
diff --git a/java_gen/templates/of_class.java b/java_gen/templates/of_class.java
index ee38beb..36d407c 100644
--- a/java_gen/templates/of_class.java
+++ b/java_gen/templates/of_class.java
@@ -220,9 +220,8 @@
return null;
}
//:: if genopts.instrument:
- if(OFInstrumentationOptions.TRACE_READS)
- if(logger.isTraceEnabled())
- logger.trace("readFrom - length={}", ${prop.name});
+ if(logger.isTraceEnabled())
+ logger.trace("readFrom - length={}", ${prop.name});
//:: #endif
//:: elif prop.is_fixed_value:
// fixed value property ${prop.name} == ${prop.value}
@@ -255,16 +254,14 @@
[ prop.name for prop in msg.data_members])}
);
//:: if genopts.instrument:
- if(OFInstrumentationOptions.TRACE_READS)
- if(logger.isTraceEnabled())
- logger.trace("readFrom - read={}", ${msg.variable_name});
+ if(logger.isTraceEnabled())
+ logger.trace("readFrom - read={}", ${msg.variable_name});
//:: #endif
return ${msg.variable_name};
//:: else:
//:: if genopts.instrument:
- if(OFInstrumentationOptions.TRACE_READS)
- if(logger.isTraceEnabled())
- logger.trace("readFrom - returning shared instance={}", INSTANCE);
+ if(logger.isTraceEnabled())
+ logger.trace("readFrom - returning shared instance={}", INSTANCE);
//:: #endif
return INSTANCE;
//:: #endif