Make Instructions.modL0Lambda(short) deprecated
Integrate static factory method for indexed lambda and OCh
Change-Id: I80074f7ce2e1703a4ebc7d6f552b52bffc970193
diff --git a/core/api/src/main/java/org/onosproject/net/IndexedLambda.java b/core/api/src/main/java/org/onosproject/net/IndexedLambda.java
index e350b47..5a0077b 100644
--- a/core/api/src/main/java/org/onosproject/net/IndexedLambda.java
+++ b/core/api/src/main/java/org/onosproject/net/IndexedLambda.java
@@ -22,20 +22,29 @@
*/
public class IndexedLambda implements Lambda {
- private final long lambda;
+ private final long index;
/**
* Creates an instance representing the wavelength specified by the given index number.
*
- * @param lambda index number of wavelength
+ * @param index index number of wavelength
*/
- IndexedLambda(long lambda) {
- this.lambda = lambda;
+ IndexedLambda(long index) {
+ this.index = index;
+ }
+
+ /**
+ * Returns the index number of lambda.
+ *
+ * @return the index number of lambda
+ */
+ public long index() {
+ return index;
}
@Override
public int hashCode() {
- return (int) (lambda ^ (lambda >>> 32));
+ return (int) (index ^ (index >>> 32));
}
@Override
@@ -48,13 +57,13 @@
}
final IndexedLambda that = (IndexedLambda) obj;
- return this.lambda == that.lambda;
+ return this.index == that.index;
}
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
- .add("lambda", lambda)
+ .add("lambda", index)
.toString();
}
}