commit f497b07545d808dd62caef1ad325d9e229f99981
author abat <abat@bigswitch.com> Sun Oct 20 13:53:40 2013 -0700
committer abat <abat@bigswitch.com> Sun Oct 20 13:53:40 2013 -0700
tree 5cf26b0bd3a42e0f8d6f32b118dcf6d7e11beb3b
parent 6c9efd8ee5d819bc676ee8a02e5d1218eaaed67d
parent b47d7e8e2ad198c02fb42f661de765537aa34d71

Merge into master from pull request #97:
A few fixes in openflow_input for enums, and add support for type OFGroup in java_gen (https://github.com/floodlight/loxigen/pull/97)

java_gen/pre-written/pom.xml

diff --git a/java_gen/pre-written/pom.xml b/java_gen/pre-written/pom.xml
index ea9a43f..a0edc39 100644
--- a/java_gen/pre-written/pom.xml
+++ b/java_gen/pre-written/pom.xml
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>14.0.1</version>
+            <version>15.0</version>
         </dependency>
     </dependencies>
     <build>

java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java

diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
index f58d658..660ff7c 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
@@ -1,5 +1,6 @@
 package org.projectfloodlight.openflow.types;
 
+import org.projectfloodlight.openflow.annotations.Immutable;
 import org.projectfloodlight.openflow.util.HexString;
 
 import com.google.common.primitives.Longs;
@@ -7,10 +8,11 @@
 
 /**
  * Abstraction of a datapath ID that can be set and/or accessed as either a
- * long value or a colon-separated string.
+ * long value or a colon-separated string. Immutable
  *
  * @author Rob Vaterlaus <rob.vaterlaus@bigswitch.com>
  */
+@Immutable
 public class DatapathId implements Comparable<DatapathId> {
 
     public static final DatapathId NONE = new DatapathId(0);