| commit | 03d4253f20220e440f2ee6589ccadd1bc8db4b91 | [log] [tgz] |
|---|---|---|
| author | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Mon Nov 23 17:16:30 2015 -0800 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Tue Nov 24 20:10:39 2015 +0000 |
| tree | d03553d38a3ca01a7b70d892ed147018daadeaed | |
| parent | 4ffab0d4907cc951d47b4cb4f084470a3388b695 [diff] |
Avoid double wrap of IndexedLambda Change-Id: I2acaa255529949e8443542904df465e6b0fbb72a
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java index 91a7576..40c553d 100644 --- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java +++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java
@@ -32,7 +32,6 @@ import org.onosproject.net.intent.constraint.LinkTypeConstraint; import org.onosproject.net.intent.constraint.ObstacleConstraint; import org.onosproject.net.intent.constraint.WaypointConstraint; -import org.onosproject.net.resource.link.LambdaResource; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -105,7 +104,7 @@ ConstraintCodec.LAMBDA + ConstraintCodec.MISSING_MEMBER_MESSAGE) .asLong(); - return new LambdaConstraint(LambdaResource.valueOf(new IndexedLambda(lambda))); + return new LambdaConstraint(new IndexedLambda(lambda)); } /**
diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EncodeConstraintCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/EncodeConstraintCodecHelper.java index bd6ab7d..ec4ee44 100644 --- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeConstraintCodecHelper.java +++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeConstraintCodecHelper.java
@@ -142,7 +142,7 @@ (LambdaConstraint) constraint; return context.mapper().createObjectNode() - .put("lambda", lambdaConstraint.lambda().toInt()); + .put("lambda", lambdaConstraint.lambda().index()); } /**