/*
 * Copyright 2014-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.cordvtn;

import com.google.common.base.MoreObjects;

import java.util.Objects;

import static com.google.common.base.Preconditions.checkNotNull;

/**
 * Representation of service identifier.
 */
public final class CordServiceId {

    private final String id;

    /**
     * Default constructor.
     *
     * @param id service identifier
     */
    private CordServiceId(String id) {
        this.id = id;
    }

    /**
     * Returns the CordServiceId with value.
     *
     * @param id service id
     * @return CordServiceId
     */
    public static CordServiceId of(String id) {
        checkNotNull(id);
        return new CordServiceId(id);
    }

    /**
     * Returns service identifier.
     *
     * @return service id
     */
    public String id() {
        return id;
    }

    @Override
    public int hashCode() {
        return Objects.hash(id);
    }

    @Override
    public boolean equals(Object obj) {
        if (this == obj) {
            return true;
        }
        if (!(obj instanceof CordServiceId)) {
            return false;
        }
        final CordServiceId other = (CordServiceId) obj;
        return Objects.equals(this.id, other.id);
    }

    @Override
    public String toString() {
        return MoreObjects.toStringHelper(this)
                .add("id", id)
                .toString();
    }
}

@@ -653,69 +653,33 @@
 ort 
-com.google.common.base.MoreObjects;%0A%0Aimport java.util.Objects
+org.onlab.util.Identifier
 ;%0A%0Ai
@@ -829,40 +829,36 @@
 eId 
-%7B%0A%0A    private final 
+extends Identifier%3C
 String
- id;%0A
+%3E %7B
 %0A   
@@ -992,20 +992,17 @@
     
-this.id = id
+super(id)
 ;%0A  
@@ -1201,24 +1201,24 @@
 otNull(id);%0A
+
         retu
@@ -1252,697 +1252,7 @@
    %7D
-%0A%0A    /**%0A     * Returns service identifier.%0A     *%0A     * @return service id%0A     */%0A    public String id() %7B%0A        return id;%0A    %7D%0A%0A    @Override%0A    public int hashCode() %7B%0A        return Objects.hash(id);%0A    %7D%0A%0A    @Override%0A    public boolean equals(Object obj) %7B%0A        if (this == obj) %7B%0A            return true;%0A        %7D%0A        if (!(obj instanceof CordServiceId)) %7B%0A            return false;%0A        %7D%0A        final CordServiceId other = (CordServiceId) obj;%0A        return Objects.equals(this.id, other.id);%0A    %7D%0A%0A    @Override%0A    public String toString() %7B%0A        return MoreObjects.toStringHelper(this)%0A                .add(%22id%22, id)%0A                .toString();%0A    %7D
 %0A%7D%0A

Refactor *Id classes to extend from Identifier class