Make all leaf intent classes immutable

Change-Id: I45a9ac42a401b707c0c0d91f2e55294f3571ca25

@@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableList;
 /**
 /**
  * Abstraction of MPLS label-switched connectivity.
  * Abstraction of MPLS label-switched connectivity.
  */
  */
-public class MplsIntent extends ConnectivityIntent {
+public final class MplsIntent extends ConnectivityIntent {
 
 
     private final ConnectPoint ingressPoint;
     private final ConnectPoint ingressPoint;
     private final Optional<MplsLabel> ingressLabel;
     private final Optional<MplsLabel> ingressLabel;

@@ -18,10 +18,10 @@ import org.onosproject.net.flow.TrafficTreatment;
  * Abstraction of explicit MPLS label-switched path.
  * Abstraction of explicit MPLS label-switched path.
  */
  */
 
 
-public class MplsPathIntent extends PathIntent {
+public final class MplsPathIntent extends PathIntent {
 
 
-    private Optional<MplsLabel> ingressLabel;
-    private Optional<MplsLabel> egressLabel;
+    private final Optional<MplsLabel> ingressLabel;
+    private final Optional<MplsLabel> egressLabel;
 
 
     /**
     /**
      * Creates a new point-to-point intent with the supplied ingress/egress
      * Creates a new point-to-point intent with the supplied ingress/egress

@@ -24,9 +24,9 @@ import java.util.Collections;
  * An optical layer intent for connectivity from one transponder port to another
  * An optical layer intent for connectivity from one transponder port to another
  * transponder port. No traffic selector or traffic treatment are needed.
  * transponder port. No traffic selector or traffic treatment are needed.
  */
  */
-public class OpticalConnectivityIntent extends Intent {
-    protected final ConnectPoint src;
-    protected final ConnectPoint dst;
+public final class OpticalConnectivityIntent extends Intent {
+    private final ConnectPoint src;
+    private final ConnectPoint dst;
 
 
     /**
     /**
      * Creates an optical connectivity intent between the specified
      * Creates an optical connectivity intent between the specified

@@ -24,7 +24,7 @@ import org.onosproject.net.Path;
 
 
 import java.util.Collection;
 import java.util.Collection;
 
 
-public class OpticalPathIntent extends Intent {
+public final class OpticalPathIntent extends Intent {
 
 
     private final ConnectPoint src;
     private final ConnectPoint src;
     private final ConnectPoint dst;
     private final ConnectPoint dst;

@@ -33,7 +33,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
 /**
  * Abstraction of point-to-point connectivity.
  * Abstraction of point-to-point connectivity.
  */
  */
-public class PointToPointIntent extends ConnectivityIntent {
+public final class PointToPointIntent extends ConnectivityIntent {
 
 
     private final ConnectPoint ingressPoint;
     private final ConnectPoint ingressPoint;
     private final ConnectPoint egressPoint;
     private final ConnectPoint egressPoint;

@@ -33,7 +33,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
 /**
  * Abstraction of single source, multiple destination connectivity intent.
  * Abstraction of single source, multiple destination connectivity intent.
  */
  */
-public class SinglePointToMultiPointIntent extends ConnectivityIntent {
+public final class SinglePointToMultiPointIntent extends ConnectivityIntent {
 
 
     private final ConnectPoint ingressPoint;
     private final ConnectPoint ingressPoint;
     private final Set<ConnectPoint> egressPoints;
     private final Set<ConnectPoint> egressPoints;

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.intent;
+
+import org.junit.Test;
+
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+
+/**
+ * Unit tests for the MplsIntent class.
+ */
+
+public class MplsIntentTest {
+
+    /**
+     * Checks that the MplsIntent class is immutable.
+     */
+    @Test
+    public void testImmutability() {
+        assertThatClassIsImmutable(MplsIntent.class);
+    }
+
+}

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.intent;
+
+import org.junit.Test;
+
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+
+/**
+ * Unit tests for the MplsPathIntent class.
+ */
+public class MplsPathIntentTest {
+
+    /**
+     * Checks that the MplsPathIntent class is immutable.
+     */
+    @Test
+    public void testImmutability() {
+        assertThatClassIsImmutable(MplsPathIntent.class);
+    }
+
+}

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.intent;
+
+import org.junit.Test;
+
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+
+/**
+ * Unit tests for the OpticalConnectivityIntent class.
+ */
+public class OpticalConnectivityIntentTest {
+
+    /**
+     * Checks that the HostToHostIntent class is immutable.
+     */
+    @Test
+    public void testImmutability() {
+        assertThatClassIsImmutable(OpticalConnectivityIntent.class);
+    }
+
+}

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.intent;
+
+import org.junit.Test;
+
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+
+public class OpticalPathIntentTest {
+
+    /**
+     * Checks that the OpticalPathIntent class is immutable.
+     */
+    @Test
+    public void testImmutability() {
+        assertThatClassIsImmutable(OpticalPathIntent.class);
+    }
+
+}

@@ -18,12 +18,21 @@ package org.onosproject.net.intent;
 import org.junit.Test;
 import org.junit.Test;
 
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertEquals;
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
 
 
 /**
 /**
  * Suite of tests of the single-to-multi point intent descriptor.
  * Suite of tests of the single-to-multi point intent descriptor.
  */
  */
 public class SinglePointToMultiPointIntentTest extends ConnectivityIntentTest {
 public class SinglePointToMultiPointIntentTest extends ConnectivityIntentTest {
 
 
+    /**
+     * Checks that the SinglePointToMultiPointIntent class is immutable.
+     */
+    @Test
+    public void testImmutability() {
+        assertThatClassIsImmutable(SinglePointToMultiPointIntent.class);
+    }
+
     @Test
     @Test
     public void basics() {
     public void basics() {
         SinglePointToMultiPointIntent intent = createOne();
         SinglePointToMultiPointIntent intent = createOne();

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.intent;
+
+import org.junit.Test;
+
+import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
+
+/**
+ * Unit tests for the TwoWayP2PIntent class.
+ */
+public class TwoWayP2PIntentTest {
+
+    /**
+     * Checks that the TwoWayP2PIntent class is immutable.
+     */
+    @Test
+    public void testImmutability() {
+        assertThatClassIsImmutable(TwoWayP2PIntent.class);
+    }
+
+}