1. Removed type serializers, added (write|read)[0-9]*Byte[s]?(ChannelBuffer) method to value types instead.
2. Updated Masked fields for IPv4, IPv6 with specific string methods.
3. Added value types for other fields from the spec
4. Updated unit tests accordingly
5. Changed java_type.py to support multiple read/write operations per type, per OF version.
diff --git a/java_gen/pre-written/src/main/java/org/openflow/protocol/match/Match.java b/java_gen/pre-written/src/main/java/org/openflow/protocol/match/Match.java
index 5c1e7b5..fa42737 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/protocol/match/Match.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/protocol/match/Match.java
@@ -1,21 +1,20 @@
package org.openflow.protocol.match;
import org.openflow.protocol.OFObject;
+import org.openflow.types.OFValueType;
public interface Match extends OFObject {
- public <F> F get(MatchField<F, ?> match);
+ public <F extends OFValueType> F get(MatchField<F> match);
- public <M> M getMasked(MatchField<?, M> match);
+ public boolean supports(MatchField<?> field);
- public boolean supports(MatchField<?, ?> field);
+ public boolean supportsMasked(MatchField<?> field);
- public boolean supportsMasked(MatchField<?, ?> field);
+ public boolean isExact(MatchField<?> field);
- public boolean isExact(MatchField<?, ?> field);
+ public boolean isFullyWildcarded(MatchField<?> field);
- public boolean isFullyWildcarded(MatchField<?, ?> field);
-
- public boolean isPartiallyMasked(MatchField<?, ?> field);
+ public boolean isPartiallyMasked(MatchField<?> field);
public MatchBuilder getBuilder();
}