Modify license information.

JIRA:https://jira.open-o.org/browse/OCS-46

Change-Id: Iff62c4f5a9f29e20ab6f54772f60b1ab7ea65b1a
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

fix  the build error.

Change-Id: Iecab881eaad2442d48da9a162f2207f742e6982c
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

fix the build error.

Change-Id: Iecab881eaad2442d48da9a162f2207f742e6982c
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

19 files changed, 126 insertions, 750 deletions

diff --git a/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java b/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java
index 40dd2b1..6c92f23 100644
--- a/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java
+++ b/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -22,7 +22,7 @@ package org.openo.baseservice.remoteservice.exception;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class ExceptionArgs {
 
@@ -51,7 +51,7 @@ public class ExceptionArgs {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     public ExceptionArgs() {
         // default constructor.
@@ -62,7 +62,7 @@ public class ExceptionArgs {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param descArgs: descriptions.
      * @param reasonArgs: reasons.
      * @param detailArgs: details.
diff --git a/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java b/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java
index e64d914..91f6acf 100644
--- a/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java
+++ b/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -23,7 +23,7 @@ import java.text.MessageFormat;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class ServiceException extends Exception {
 
@@ -54,7 +54,7 @@ public class ServiceException extends Exception {
      * This method is only used as deserialized, in other cases, use parameterized constructor.
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     public ServiceException() {
         super("");
@@ -65,7 +65,7 @@ public class ServiceException extends Exception {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param id: details.
      * @param cause: reason.
      */
@@ -79,7 +79,7 @@ public class ServiceException extends Exception {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param message: details.
      */
     public ServiceException(final String message) {
@@ -91,7 +91,7 @@ public class ServiceException extends Exception {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param id: exception id.
      * @param message: details.
      */
@@ -105,7 +105,7 @@ public class ServiceException extends Exception {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param id: exception id.
      * @param httpCode: http status code.
      */
@@ -120,7 +120,7 @@ public class ServiceException extends Exception {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param id: exception id.
      * @param httpCode: http code.
      * @param exceptionArgs: Exception handling frame parameters.
@@ -138,7 +138,7 @@ public class ServiceException extends Exception {
      * Have a placeholder exception, use args formatted message.
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param id: exception id.
      * @param message: details.
      * @param args: Placeholders for parameters
@@ -155,7 +155,7 @@ public class ServiceException extends Exception {
      * Have a placeholder exception, use args formatted message
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param id: exception id.
      * @param message: details.
      * @param cause: reason.
@@ -172,7 +172,7 @@ public class ServiceException extends Exception {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param id: exception id.
      * @param message: details.
      * @param cause: reason.
@@ -187,7 +187,7 @@ public class ServiceException extends Exception {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param cause: reason.
      */
     public ServiceException(final Throwable cause) {
@@ -198,7 +198,7 @@ public class ServiceException extends Exception {
      * Get exceptoin id.<br/>
      * 
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String getId() {
         if(id == null || id.isEmpty()) {
@@ -223,7 +223,7 @@ public class ServiceException extends Exception {
      * Obtain the ROA exception handling framework parameters<br/>
      * 
      * @return exception args.
-     * @since SDNO 0.5
+     * @since  
      */
     public ExceptionArgs getExceptionArgs() {
         return exceptionArgs;
@@ -237,7 +237,7 @@ public class ServiceException extends Exception {
      * Gets the parameter information<br/>
      * 
      * @return parameter list.
-     * @since SDNO 0.5
+     * @since  
      */
     protected Object[] getArgs() {
         if(args == null || args.length == 0 || DEFAULT_ID.equals(getId())) {
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java
index 86124cf..85e4f56 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -25,7 +25,7 @@ import java.io.Reader;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 31-May-2016
+ * @version   31-May-2016
  */
 public class ReaderHelper {
 
@@ -36,7 +36,7 @@ public class ReaderHelper {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param reader
      */
     public ReaderHelper(final Reader reader) {
@@ -50,7 +50,7 @@ public class ReaderHelper {
      * Gets the next line.<br/>
      * 
      * @return line if present else null.
-     * @since SDNO 0.5
+     * @since  
      */
     public String getLine() {
         if(ite != null && ite.hasNext()) {
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/ServiceUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/ServiceUtil.java
deleted file mode 100644
index aca60c0..0000000
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/ServiceUtil.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
- *
- * 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.openo.baseservice.roa.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Service connection configuration util.<br/>
- * <p>
- * Get host and port from the Client Configure the connection environment and service Configure
- * profile
- * </p>
- * 
- * @author
- * @version SDNO 0.5 28-May-2016
- */
-public class ServiceUtil {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ServiceUtil.class);
-
-    private final Properties allConfigure = new Properties();
-
-    private final Properties serviceConfigure;
-
-    private String serviceStage;
-
-    private String serviceName;
-
-    /**
-     * Constructor<br/>
-     * <p>
-     * Load profile information.
-     * </p>
-     * 
-     * @since SDNO 0.5
-     * @param serviceName user-specified service name.
-     * @param url invoked service url.
-     */
-    public ServiceUtil(final String serviceName, final String url) {
-        final String fomattedUrl = formatUrl(url);
-        serviceConfigure = loadProperties("service-configure.properties");
-        if(null == serviceName || serviceName.isEmpty()) {
-            this.serviceName = getServiceNameWhitUrl(fomattedUrl);
-        } else {
-            this.serviceName = serviceName;
-        }
-        loadPropertyFile();
-    }
-
-    /**
-     * Get the service user-specified host.
-     * <br/>
-     * 
-     * @return host
-     * @since SDNO 0.5
-     */
-    public String getServiceHost() {
-        final String host = allConfigure.getProperty(serviceName + "." + serviceStage + ".host");
-        if(null == host) {
-            return "";
-        }
-        return host;
-    }
-
-    /**
-     * Get the service user-specified port.
-     * <br/>
-     * 
-     * @return port
-     * @since SDNO 0.5
-     */
-    public int getServicePort() {
-        final String portStr = allConfigure.getProperty(serviceName + "." + serviceStage + ".port");
-        if(null == portStr) {
-            return -1;
-        }
-        return Integer.parseInt(portStr);
-    }
-
-    private String getServiceNameWhitUrl(final String url) {
-        final Enumeration<?> keys = serviceConfigure.propertyNames();
-        while(keys.hasMoreElements()) {
-            final String key = (String)keys.nextElement();
-            if(key.endsWith("urls")) {
-                final String urls = serviceConfigure.getProperty(key);
-                for(String tempUrl : urls.split(",")) {
-                    tempUrl = formatUrl(tempUrl);
-                    if(url.startsWith(tempUrl)) {
-                        return key.split("\\.")[0];
-                    }
-                }
-
-            }
-        }
-        return "";
-    }
-
-    private static String formatUrl(final String url) {
-        String outUrl = url;
-        if(outUrl.contains("?")) {
-            outUrl = outUrl.split("\\?")[0];
-        }
-        outUrl = outUrl.replace("\\", "/");
-        outUrl = outUrl.replaceAll("[/]{2,}", "/");
-        outUrl = outUrl.endsWith("/") ? outUrl.substring(0, outUrl.length() - 1) : outUrl;
-        outUrl = outUrl.endsWith("/*") ? outUrl.substring(0, outUrl.length() - 2) : outUrl;
-        return outUrl;
-    }
-
-    /**
-     * Loads the client and service configuration files.
-     * <br/>
-     * 
-     * @since SDNO 0.5
-     */
-    private void loadPropertyFile() {
-        final Properties clientConfigure = loadProperties(serviceName + "-client-configure.properties");
-        allConfigure.putAll(clientConfigure);
-        allConfigure.putAll(serviceConfigure);
-        serviceStage = allConfigure.getProperty(serviceName + ".stage");
-    }
-
-    /**
-     * Loads the client and service configuration files.
-     * <br/>
-     * 
-     * @param classProperties: service profile file name.
-     * @return Service configuration.
-     * @since SDNO 0.5
-     */
-    private Properties loadProperties(final String classProperties) {
-        final Properties properties = new Properties();
-        InputStream inputStream = null;
-        ClassLoader classloader = null;
-        try {
-            classloader = this.getClass().getClassLoader();
-            if(classloader != null) {
-                inputStream = classloader.getResourceAsStream(classProperties);
-            }
-            if(inputStream != null) {
-                properties.load(inputStream);
-                inputStream.close();
-            }
-        } catch(final IOException e) {
-            LOG.error("load file error: ", e);
-        } finally {
-            if(inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch(final IOException ee) {
-                    LOG.error("close inputStream  error: ", ee);
-                }
-                inputStream = null;
-            }
-        }
-        return properties;
-    }
-}
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/HttpUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/HttpUtil.java
deleted file mode 100644
index 3c6493c..0000000
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/HttpUtil.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
- *
- * 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.openo.baseservice.roa.util.clientsdk;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Collection;
-import java.util.Date;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Http utilities.
- * <br/>
- * <p>
- * </p>
- * 
- * @author
- * @version SDNO 0.5 28-May-2016
- */
-public class HttpUtil {
-
-    /**
-     * 
-     */
-    private static final String APPLICATION_JSON = "application/json";
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpUtil.class);
-
-    private HttpUtil() {
-
-    }
-
-    /**
-     * Check if the given array contains the given value (with case-insensitive comparison).
-     * <br/>
-     * 
-     * @param array The array
-     * @param value The value to search
-     * @return true if the array contains the value
-     * @since SDNO 0.5
-     */
-    public static boolean containsIgnoreCase(final String[] array, final String value) {
-        for(final String str : array) {
-            if(value == null && str == null) {
-                return true;
-            }
-            if(value != null && value.equalsIgnoreCase(str)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Join an array of strings with the given separator.
-     * <br/>
-     * 
-     * @param array The array of strings
-     * @param separator The separator
-     * @return the resulting string
-     * @since SDNO 0.5
-     */
-    public static String join(final String[] array, final String separator) {
-        final int len = array.length;
-        if(len == 0) {
-            return "";
-        }
-        final StringBuilder out = new StringBuilder();
-        out.append(array[0]);
-        for(int i = 1; i < len; i++) {
-            out.append(separator).append(array[i]);
-        }
-        return out.toString();
-    }
-
-    /**
-     * Format the given parameter object into string.
-     * <br/>
-     * 
-     * @param param param input
-     * @return query param string
-     * @since SDNO 0.5
-     */
-    public static String parameterToString(final Object param) {
-        if(param == null) {
-            return "";
-        } else if(param instanceof Date) {
-            return Long.toString(((Date)param).getTime());
-        } else if(param instanceof Collection) {
-            final StringBuilder b = new StringBuilder();
-            for(final Object o : (Collection)param) {
-                if(b.length() > 0) {
-                    b.append(',');
-                }
-                b.append(String.valueOf(o));
-            }
-            return b.toString();
-        } else {
-            return String.valueOf(param);
-        }
-    }
-
-    /**
-     * get accept header
-     * <br/>
-     * 
-     * @param accepts accepts accept types
-     * @return the accepts string
-     * @since SDNO 0.5
-     */
-    public static String selectHeaderAccept(final String[] accepts) {
-        if(accepts.length == 0) {
-            return null;
-        }
-        if(HttpUtil.containsIgnoreCase(accepts, APPLICATION_JSON)) {
-            return APPLICATION_JSON;
-        }
-        return HttpUtil.join(accepts, ",");
-    }
-
-    /**
-     * select head content type
-     * <br/>
-     * 
-     * @param contentTypes contentTypes content types
-     * @return the json string or the first content type
-     * @since SDNO 0.5
-     */
-    public static String selectHeaderContentType(final String[] contentTypes) {
-        if(contentTypes.length == 0) {
-            return APPLICATION_JSON;
-        }
-        if(HttpUtil.containsIgnoreCase(contentTypes, APPLICATION_JSON)) {
-            return APPLICATION_JSON;
-        }
-        return contentTypes[0];
-    }
-
-    /**
-     * Escape the given string to be used as URL query value.<br/>
-     * 
-     * @param str str param str
-     * @return escape string
-     * @since SDNO 0.5
-     */
-    public static String escapeString(final String str) {
-        try {
-            return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
-        } catch(final UnsupportedEncodingException e) {
-            LOGGER.info("UTF8 is not supported", e);
-            return str;
-        }
-    }
-}
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/JsonUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/JsonUtil.java
deleted file mode 100644
index 2234e19..0000000
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/JsonUtil.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
- *
- * 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.openo.baseservice.roa.util.clientsdk;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
-
-import net.sf.json.JSON;
-
-import java.io.IOException;
-
-/**
- * JSON parse utilities.
- * <br/>
- * <p>
- * </p>
- * 
- * @author
- * @version SDNO 0.5 28-May-2016
- */
-public final class JsonUtil {
-
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-
-    static {
-        MAPPER.setDeserializationConfig(MAPPER.getDeserializationConfig()
-                .without(org.codehaus.jackson.map.DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES));
-    }
-
-    private JsonUtil() {
-    }
-
-    /**
-     * Parse JSON formated string.<br/>
-     * 
-     * @param jsonstr: JSON formated string.
-     * @param type: result type.
-     * @return parsed object.
-     * @throws IOException incase error.
-     * @since SDNO 0.5
-     */
-    public static <T> T unMarshal(final String jsonstr, final Class<T> type) throws IOException {
-        return MAPPER.readValue(jsonstr, type);
-    }
-
-    /**
-     * Parse JSON formatted string (for a generic target type).
-     * <br/>
-     * 
-     * @param jsonstr request data.
-     * @param type target type.
-     * @return result object.
-     * @throws IOException incase error.
-     * @since SDNO 0.5
-     */
-    public static <T> T unMarshal(final String jsonstr, final TypeReference<T> type) throws IOException {
-        return MAPPER.readValue(jsonstr, type);
-    }
-
-    /**
-     * Convert object to JSON format string.
-     * <br/>
-     * 
-     * @param srcObj source object.
-     * @return JSON format string.
-     * @throws IOException incase of error.
-     * @since SDNO 0.5
-     */
-    public static String marshal(final Object srcObj) throws IOException {
-        if(srcObj instanceof JSON) {
-            return srcObj.toString();
-        }
-        return MAPPER.writeValueAsString(srcObj);
-    }
-
-    /**
-     * Get parsing mapper
-     * <br/>
-     * 
-     * @return parsing mapper
-     * @since SDNO 0.5
-     */
-    public static ObjectMapper getMapper() {
-        return MAPPER;
-    }
-}
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/RestClientUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/RestClientUtil.java
deleted file mode 100644
index b769f0a..0000000
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/RestClientUtil.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
- *
- * 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.openo.baseservice.roa.util.clientsdk;
-
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.Restful;
-import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Rest Client Tools.
- * <br/>
- * <p>
- * </p>
- * 
- * @author
- * @version SDNO 0.5 28-May-2016
- */
-public class RestClientUtil {
-
-    private static Set<Class<?>> ret = new HashSet<>();
-
-    static {
-        ret.add(Boolean.class);
-        ret.add(Character.class);
-        ret.add(Byte.class);
-        ret.add(Short.class);
-        ret.add(Integer.class);
-        ret.add(Long.class);
-        ret.add(Float.class);
-        ret.add(Double.class);
-        ret.add(Void.class);
-        ret.add(String.class);
-    }
-
-    private RestClientUtil() {
-
-    }
-
-    /**
-     * Processing HTTP requests.
-     * <br/>
-     * 
-     * @param method method name.
-     * @param path request path.
-     * @param parameters parameters.
-     * @param restFull ReST request instance
-     * @return The ReST response.
-     * @throws ServiceException Exception information.
-     * @since SDNO 0.5
-     */
-    public static RestfulResponse invokeMethod(final String method, final String path,
-            final RestfulParametes parameters, final Restful restFull) throws ServiceException {
-        RestfulResponse response;
-        if("get".equalsIgnoreCase(method)) {
-            response = restFull.get(path, parameters);
-        } else if("put".equalsIgnoreCase(method)) {
-            response = restFull.put(path, parameters);
-        } else if("post".equalsIgnoreCase(method)) {
-            response = restFull.post(path, parameters);
-        } else if("delete".equalsIgnoreCase(method)) {
-            response = restFull.delete(path, parameters);
-        } else if("patch".equalsIgnoreCase(method)) {
-            response = restFull.patch(path, parameters);
-        } else {
-            throw new ServiceException("NotSuppertMethod", 400);
-        }
-        return response;
-    }
-
-    /**
-     * An asynchronous HTTP request.
-     * <br/>
-     * 
-     * @param method http method.
-     * @param path request path.
-     * @param parameters request parameters.
-     * @param restFull restFull instance.
-     * @param callback callback function.
-     * @throws ServiceException in case error.
-     * @since SDNO 0.5
-     */
-    public static void invokeAsyncMethod(final String method, final String path, final RestfulParametes parameters,
-            final Restful restFull, final RestfulAsyncCallback callback) throws ServiceException {
-        if("get".equalsIgnoreCase(method)) {
-            restFull.asyncGet(path, parameters, callback);
-        } else if("put".equalsIgnoreCase(method)) {
-            restFull.asyncPut(path, parameters, callback);
-        } else if("post".equalsIgnoreCase(method)) {
-            restFull.asyncPost(path, parameters, callback);
-        } else if("delete".equalsIgnoreCase(method)) {
-            restFull.asyncDelete(path, parameters, callback);
-        } else if("patch".equalsIgnoreCase(method)) {
-            restFull.asyncPatch(path, parameters, callback);
-        } else {
-            throw new ServiceException("NotSuppertMethod", 400);
-        }
-    }
-
-    /**
-     * Determine whether a class is a native.<br/>
-     * 
-     * @param clazz: class type.
-     * @return whether primitive or not.
-     * @since SDNO 0.5
-     */
-    public static boolean isPrimitive(final Class<?> clazz) {
-        if(clazz.isPrimitive()) {
-            return true;
-        }
-        if(ret.contains(clazz)) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java
index 8195b0d..81adeb6 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -21,7 +21,7 @@ package org.openo.baseservice.roa.util.restclient;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class DefaultAsyncCallback implements RestfulAsyncCallback {
 
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java
index 4f58778..3e64937 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -31,7 +31,6 @@ import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpExchange;
 import org.eclipse.jetty.http.HttpMethods;
 import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.ServiceUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +40,7 @@ import org.slf4j.LoggerFactory;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 Aug 9, 2016
+ * @version   Aug 9, 2016
  */
 public abstract class HttpBaseRest implements Restful {
 
@@ -68,7 +67,7 @@ public abstract class HttpBaseRest implements Restful {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     public HttpBaseRest() {
         super();
@@ -145,7 +144,7 @@ public abstract class HttpBaseRest implements Restful {
      * @param callback
      * @return
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     protected RestfulResponse sendHttpRequest(final String method, final String servicePath,
             final RestfulParametes restParametes, final RestfulOptions options, final RestfulAsyncCallback callback)
@@ -193,23 +192,6 @@ public abstract class HttpBaseRest implements Restful {
         } else {
             String host = defaultIP;
             int iPort = defaultPort;
-            String calledServiceName = null;
-            if(options != null) {
-                calledServiceName = options.getCalledServicName();
-            }
-            final ServiceUtil serviceUtil = new ServiceUtil(calledServiceName, url.toString());
-            final String configHost = serviceUtil.getServiceHost();
-            final int configPort = serviceUtil.getServicePort();
-            if(!configHost.isEmpty() && configPort > 0) {
-                if(options != null) {
-                    options.setHost(configHost);
-                    options.setPort(configPort);
-                } else {
-                    host = configHost;
-
-                    iPort = configPort;
-                }
-            }
             if(options != null) {
                 host = options.getHost();
                 if(host.isEmpty()) {
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java
index 50a3538..047f20e 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 Aug 9, 2016
+ * @version   Aug 9, 2016
  */
 public class HttpRest extends HttpBaseRest {
 
@@ -40,7 +40,7 @@ public class HttpRest extends HttpBaseRest {
      * 
      * @param options: rest options.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     public void initHttpRest(final RestfulOptions option) throws ServiceException {
         if(option == null) {
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java
index 85118ce..99328a7 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -43,7 +43,7 @@ import java.util.zip.GZIPInputStream;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class RestHttpContentExchange extends ContentExchange {
 
@@ -58,7 +58,7 @@ public class RestHttpContentExchange extends ContentExchange {
      * <p>
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param cacheFields whether to cache response header.
      * @param asyncCallback callback method.
      */
@@ -74,7 +74,7 @@ public class RestHttpContentExchange extends ContentExchange {
      * @param data GZipped data.
      * @return Uncompressed data.
      * @throws IOException
-     * @since SDNO 0.5
+     * @since  
      */
     public String decompressGzipToStr(final byte[] data) throws IOException {
         if(data == null) {
@@ -125,7 +125,7 @@ public class RestHttpContentExchange extends ContentExchange {
      * @param name buffer
      * @param value value
      * @throws IOException
-     * @since SDNO 0.5
+     * @since  
      */
     @Override
     protected synchronized void onResponseHeader(final Buffer name, final Buffer value) throws IOException {
@@ -203,7 +203,7 @@ public class RestHttpContentExchange extends ContentExchange {
      * 
      * @return response object.
      * @throws IOException
-     * @since SDNO 0.5
+     * @since  
      */
     public RestfulResponse getResponse() throws IOException {
         final RestfulResponse rsp = new RestfulResponse();
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java
index 7a7c11e..8527e68 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -23,7 +23,7 @@ import org.openo.baseservice.remoteservice.exception.ServiceException;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public interface Restful {
 
@@ -34,7 +34,7 @@ public interface Restful {
      * @param restParametes: query parameters.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse get(String servicePath, RestfulParametes restParametes) throws ServiceException;
 
@@ -46,7 +46,7 @@ public interface Restful {
      * @param options: request options.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse head(String servicePath, RestfulParametes restParametes, RestfulOptions options)
             throws ServiceException;
@@ -58,7 +58,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse head(String servicePath, RestfulParametes restParametes) throws ServiceException;
 
@@ -70,7 +70,7 @@ public interface Restful {
      * @param options: request options.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse get(String servicePath, RestfulParametes restParametes, RestfulOptions options)
             throws ServiceException;
@@ -82,7 +82,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncGet(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
             throws ServiceException;
@@ -95,7 +95,7 @@ public interface Restful {
      * @param options: request options.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncGet(String servicePath, RestfulParametes restParametes, RestfulOptions options,
             RestfulAsyncCallback callback) throws ServiceException;
@@ -107,7 +107,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse put(String servicePath, RestfulParametes restParametes) throws ServiceException;
 
@@ -119,7 +119,7 @@ public interface Restful {
      * @param options: request options.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse put(String servicePath, RestfulParametes restParametes, RestfulOptions options)
             throws ServiceException;
@@ -131,7 +131,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncPut(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
             throws ServiceException;
@@ -144,7 +144,7 @@ public interface Restful {
      * @param options: request options.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncPut(String servicePath, RestfulParametes restParametes, RestfulOptions options,
             RestfulAsyncCallback callback) throws ServiceException;
@@ -156,7 +156,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse post(String servicePath, RestfulParametes restParametes) throws ServiceException;
 
@@ -168,7 +168,7 @@ public interface Restful {
      * @param options: request options.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse post(String servicePath, RestfulParametes restParametes, RestfulOptions options)
             throws ServiceException;
@@ -180,7 +180,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncPost(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
             throws ServiceException;
@@ -193,7 +193,7 @@ public interface Restful {
      * @param options: request options.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncPost(String servicePath, RestfulParametes restParametes, RestfulOptions options,
             RestfulAsyncCallback callback) throws ServiceException;
@@ -205,7 +205,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse delete(String servicePath, RestfulParametes restParametes) throws ServiceException;
 
@@ -217,7 +217,7 @@ public interface Restful {
      * @param options: request options.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse delete(String servicePath, RestfulParametes restParametes, RestfulOptions options)
             throws ServiceException;
@@ -229,7 +229,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncDelete(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
             throws ServiceException;
@@ -242,7 +242,7 @@ public interface Restful {
      * @param options: request options.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncDelete(String servicePath, RestfulParametes restParametes, RestfulOptions options,
             RestfulAsyncCallback callback) throws ServiceException;
@@ -254,7 +254,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse patch(String servicePath, RestfulParametes restParametes) throws ServiceException;
 
@@ -266,7 +266,7 @@ public interface Restful {
      * @param options: request options.
      * @return response.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     RestfulResponse patch(String servicePath, RestfulParametes restParametes, RestfulOptions options)
             throws ServiceException;
@@ -278,7 +278,7 @@ public interface Restful {
      * @param restParametes: request parameters.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncPatch(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
             throws ServiceException;
@@ -291,7 +291,7 @@ public interface Restful {
      * @param options: request options.
      * @param callback: response callback method.
      * @throws ServiceException
-     * @since SDNO 0.5
+     * @since  
      */
     void asyncPatch(String servicePath, RestfulParametes restParametes, RestfulOptions options,
             RestfulAsyncCallback callback) throws ServiceException;
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java
index bf11c16..bf461c9 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -21,7 +21,7 @@ package org.openo.baseservice.roa.util.restclient;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public interface RestfulAsyncCallback {
 
@@ -29,7 +29,7 @@ public interface RestfulAsyncCallback {
      * Response callback.<br/>
      * 
      * @param response: response of ReST call.
-     * @since SDNO 0.5
+     * @since  
      */
     void callback(RestfulResponse response);
 
@@ -37,7 +37,7 @@ public interface RestfulAsyncCallback {
      * Exceptoin callback.<br/>
      * 
      * @param e: ReST call exception.
-     * @since SDNO 0.5
+     * @since  
      */
     void handleExcepion(Throwable e);
 }
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java
index ef02b7d..a3b6581 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -21,7 +21,7 @@ package org.openo.baseservice.roa.util.restclient;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class RestfulClientConst {
 
@@ -37,8 +37,6 @@ public class RestfulClientConst {
 
     public static final String SERVER_KEY_NAME = "defaulServer";
 
-    public static final String CALLED_SERVICE_NAME = "serviceName";
-
     public static final String HOST_KEY_NAME = "host";
 
     public static final String PORT_KEY_NAME = "port";
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java
index 3d0a0ff..3ce6859 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -33,7 +33,7 @@ import net.sf.json.JSONObject;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class RestfulConfigure {
 
@@ -47,7 +47,7 @@ public class RestfulConfigure {
      * Use the default path initialization http Rest options.
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     public RestfulConfigure() {
         final String config = "/etc/conf/restclient.json";
@@ -72,7 +72,7 @@ public class RestfulConfigure {
      * Use the specified file to initialize http Rest options.
      * </p>
      * 
-     * @since SDNO 0.5
+     * @since  
      * @param configfile
      */
     public RestfulConfigure(final String configfile) {
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java
index e53bab1..5b94374 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -29,7 +29,7 @@ import java.util.Map;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class RestfulFactory {
 
@@ -57,7 +57,7 @@ public class RestfulFactory {
      * 
      * @param protocol protocol. currently only support 'http'.
      * @return restful instance.
-     * @since SDNO 0.5
+     * @since  
      */
     public static synchronized Restful getRestInstance(final String protocol) {
         Restful rest = INSTANCES.get(protocol);
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java
index 912abf5..6e5812f 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -24,7 +24,7 @@ import java.util.Map;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class RestfulOptions {
 
@@ -35,36 +35,10 @@ public class RestfulOptions {
     private final Map<String, Object> optionsMap = new HashMap<>();
 
     /**
-     * Set called service name.<br/>
-     * 
-     * @param serviceName service name.
-     * @return true.
-     * @since SDNO 0.5
-     */
-    public boolean setCalledServiceName(final String serviceName) {
-        this.setOption(RestfulClientConst.CALLED_SERVICE_NAME, serviceName);
-        return true;
-    }
-
-    /**
-     * Get called service name.<br/>
-     * 
-     * @return
-     * @since SDNO 0.5
-     */
-    public String getCalledServicName() {
-        final Object obj = this.getOption(RestfulClientConst.CALLED_SERVICE_NAME);
-        if(null == obj) {
-            return "";
-        }
-        return (String)obj;
-    }
-
-    /**
      * Get port.<br/>
      * 
      * @return port.
-     * @since SDNO 0.5
+     * @since  
      */
     public int getPort() {
         final Object obj = this.getOption(RestfulClientConst.PORT_KEY_NAME);
@@ -79,7 +53,7 @@ public class RestfulOptions {
      * 
      * @param port port to set.
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public boolean setPort(final int port) {
         this.setOption(RestfulClientConst.PORT_KEY_NAME, port);
@@ -90,7 +64,7 @@ public class RestfulOptions {
      * Get host.<br/>
      * 
      * @return the host.
-     * @since SDNO 0.5
+     * @since  
      */
     public String getHost() {
         final Object obj = this.getOption(RestfulClientConst.HOST_KEY_NAME);
@@ -105,7 +79,7 @@ public class RestfulOptions {
      * 
      * @param host host to set.
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public boolean setHost(final String host) {
         this.setOption(RestfulClientConst.HOST_KEY_NAME, host);
@@ -117,7 +91,7 @@ public class RestfulOptions {
      * 
      * @param timeout time-out to set in seconds.
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public boolean setRestTimeout(final int timeout) {
         if(0 < timeout && REST_OPTIONS_TIMEOUT_MAXTIMEOUT >= timeout) {
@@ -131,7 +105,7 @@ public class RestfulOptions {
      * Get time-out.<br/>
      * 
      * @return time-out in seconds.
-     * @since SDNO 0.5
+     * @since  
      */
     public int getRestTimeout() {
         final Object obj = this.getOption(REST_OPTIONS_NAME_TIMEOUT);
@@ -146,7 +120,7 @@ public class RestfulOptions {
      * 
      * @param optionName option name.
      * @return option
-     * @since SDNO 0.5
+     * @since  
      */
     public Object getOption(final String optionName) {
         return optionsMap.get(optionName);
@@ -157,7 +131,7 @@ public class RestfulOptions {
      * 
      * @param optionName option name.
      * @return option value as int.
-     * @since SDNO 0.5
+     * @since  
      */
     public int getIntOption(final String optionName) {
         final Object obj = this.getOption(optionName);
@@ -172,7 +146,7 @@ public class RestfulOptions {
      * 
      * @param optionName option name.
      * @return option value as string.
-     * @since SDNO 0.5
+     * @since  
      */
     public String getStringOption(final String optionName) {
         final Object obj = this.getOption(optionName);
@@ -188,7 +162,7 @@ public class RestfulOptions {
      * @param option option name.
      * @param optionsValue option value.
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public Object setOption(final String option, final Object optionsValue) {
         return optionsMap.put(option, optionsValue);
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java
index c6c5933..aea8753 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -25,7 +25,7 @@ import java.util.Map;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 Aug 9, 2016
+ * @version   Aug 9, 2016
  */
 public class RestfulParametes {
 
@@ -40,7 +40,7 @@ public class RestfulParametes {
      * 
      * @param key
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String get(final String key) {
         return paramMap.get(key);
@@ -50,7 +50,7 @@ public class RestfulParametes {
      * <br/>
      * 
      * @param data
-     * @since SDNO 0.5
+     * @since  
      */
     public void setRawData(final String data) {
         this.rawData = data;
@@ -60,7 +60,7 @@ public class RestfulParametes {
      * <br/>
      * 
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String getRawData() {
         return this.rawData;
@@ -72,7 +72,7 @@ public class RestfulParametes {
      * @param key
      * @param value
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String put(final String key, final String value) {
         return paramMap.put(key, value);
@@ -84,7 +84,7 @@ public class RestfulParametes {
      * @param key
      * @param value
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String putHttpContextHeader(final String key, final String value) {
         return headerMap.put(key, value);
@@ -96,7 +96,7 @@ public class RestfulParametes {
      * @param key
      * @param value
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String putHttpContextHeader(final String key, final int value) {
         return this.putHttpContextHeader(key, String.valueOf(value));
@@ -107,7 +107,7 @@ public class RestfulParametes {
      * 
      * @param key
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String getHttpContextHeader(final String key) {
         return headerMap.get(key);
@@ -117,7 +117,7 @@ public class RestfulParametes {
      * <br/>
      * 
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public Map<String, String> getParamMap() {
         return paramMap;
@@ -127,7 +127,7 @@ public class RestfulParametes {
      * <br/>
      * 
      * @param paramMap
-     * @since SDNO 0.5
+     * @since  
      */
     public void setParamMap(final Map<String, String> paramMap) {
         this.paramMap = paramMap;
@@ -137,7 +137,7 @@ public class RestfulParametes {
      * <br/>
      * 
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public Map<String, String> getHeaderMap() {
         return this.headerMap;
@@ -147,7 +147,7 @@ public class RestfulParametes {
      * <br/>
      * 
      * @param headerMap
-     * @since SDNO 0.5
+     * @since  
      */
     public void setHeaderMap(final Map<String, String> headerMap) {
         this.headerMap = headerMap;
diff --git a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java
index 28a0c6d..25105b7 100644
--- a/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java
+++ b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * 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
+ *     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,
@@ -24,7 +24,7 @@ import java.util.Map;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 28-May-2016
+ * @version   28-May-2016
  */
 public class RestfulResponse {
 
@@ -38,7 +38,7 @@ public class RestfulResponse {
      * <br/>
      * 
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public int getStatus() {
         return status;
@@ -48,7 +48,7 @@ public class RestfulResponse {
      * <br/>
      * 
      * @param status
-     * @since SDNO 0.5
+     * @since  
      */
     public void setStatus(final int status) {
         this.status = status;
@@ -58,7 +58,7 @@ public class RestfulResponse {
      * <br/>
      * 
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public Map<String, String> getRespHeaderMap() {
         return respHeaderMap;
@@ -68,7 +68,7 @@ public class RestfulResponse {
      * <br/>
      * 
      * @param header
-     * @since SDNO 0.5
+     * @since  
      */
     public void setRespHeaderMap(final Map<String, String> header) {
         this.respHeaderMap = header;
@@ -79,7 +79,7 @@ public class RestfulResponse {
      * 
      * @param key header param name.
      * @return header param value as integer. (-1 if error)
-     * @since SDNO 0.5
+     * @since  
      */
     public int getRespHeaderInt(final String key) {
         if(respHeaderMap != null) {
@@ -96,7 +96,7 @@ public class RestfulResponse {
      * 
      * @param key header param name.
      * @return value as long. -1 if no value.
-     * @since SDNO 0.5
+     * @since  
      */
     public long getRespHeaderLong(final String key) {
         if(respHeaderMap != null) {
@@ -113,7 +113,7 @@ public class RestfulResponse {
      * 
      * @param key header name.
      * @return header value.
-     * @since SDNO 0.5
+     * @since  
      */
     public String getRespHeaderStr(final String key) {
         if(respHeaderMap != null) {
@@ -126,7 +126,7 @@ public class RestfulResponse {
      * <br/>
      * 
      * @return
-     * @since SDNO 0.5
+     * @since  
      */
     public String getResponseContent() {
         return responseContent;
@@ -136,7 +136,7 @@ public class RestfulResponse {
      * <br/>
      * 
      * @param responseString
-     * @since SDNO 0.5
+     * @since  
      */
     public void setResponseJson(final String responseString) {
         this.responseContent = responseString;