You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/04/14 20:30:44 UTC

[42/90] [abbrv] [partial] AIRAVATA-1124

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
----------------------------------------------------------------------
diff --git a/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java b/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
deleted file mode 100644
index 969ca02..0000000
--- a/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
+++ /dev/null
@@ -1,1141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.airavata.rest.client;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.airavata.registry.api.PasswordCallback;
-import org.apache.airavata.rest.mappings.resourcemappings.ConfigurationList;
-import org.apache.airavata.rest.mappings.resourcemappings.URLList;
-import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.rest.utils.ClientConstant;
-import org.apache.airavata.rest.utils.CookieManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.core.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class ConfigurationResourceClient {
-    private WebResource webResource;
-    private final static Logger logger = LoggerFactory.getLogger(ConfigurationResourceClient.class);
-    private String userName;
-    private PasswordCallback callback;
-    private String baseURI;
-    private Cookie cookie;
-    private WebResource.Builder builder;
-    private ClientResponse response;
-    private String gateway;
-//    private CookieManager cookieManager = new CookieManager();
-
-    public ConfigurationResourceClient(String userName,
-                                       String gateway,
-                                       String seriveURI,
-                                       PasswordCallback callback,
-                                       Cookie cookie) {
-        this.userName = userName;
-        this.callback = callback;
-        this.baseURI = seriveURI;
-        this.gateway = gateway;
-        this.cookie = cookie;
-    }
-
-    private URI getBaseURI() {
-        logger.debug("Creating Base URI");
-        return UriBuilder.fromUri(baseURI).build();
-    }
-
-    private WebResource getConfigurationBaseResource() {
-        ClientConfig config = new DefaultClientConfig();
-        config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING,
-                Boolean.TRUE);
-        Client client = Client.create(config);
-        WebResource baseWebResource = client.resource(getBaseURI());
-        webResource = baseWebResource.path(ResourcePathConstants.
-                ConfigResourcePathConstants.CONFIGURATION_REGISTRY_RESOURCE);
-        return webResource;
-    }
-
-
-    public Object getConfiguration(String configKey) {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.GET_CONFIGURATION);
-        MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("key", configKey);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-
-        response = builder.get(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = builder.get(ClientResponse.class);
-
-            status = response.getStatus();
-
-            if (status == ClientConstant.HTTP_NO_CONTENT) {
-                return null;
-            }
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else  if (status == ClientConstant.HTTP_NO_CONTENT) {
-            return null;
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-        String output = response.getEntity(String.class);
-        return output;
-    }
-
-    public List<Object> getConfigurationList(String configKey) {
-        List<Object> configurationValueList = new ArrayList<Object>();
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.GET_CONFIGURATION_LIST);
-        MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("key", configKey);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-
-        response = builder.accept(
-                MediaType.APPLICATION_JSON).get(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = webResource.queryParams(queryParams).accept(
-                    MediaType.APPLICATION_JSON).get(ClientResponse.class);
-
-
-            status = response.getStatus();
-
-            if (status == ClientConstant.HTTP_NO_CONTENT) {
-                return configurationValueList;
-            }
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else if (status == ClientConstant.HTTP_NO_CONTENT) {
-            return configurationValueList;
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-
-        ConfigurationList configurationList = response.getEntity(ConfigurationList.class);
-        Object[] configValList = configurationList.getConfigValList();
-        for (Object configVal : configValList) {
-            configurationValueList.add(configVal);
-        }
-
-        return configurationValueList;
-    }
-
-    public void setConfiguration(String configKey, String configVal, Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = dateFormat.format(date);
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.SAVE_CONFIGURATION);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("key", configKey);
-        formData.add("value", configVal);
-        formData.add("date", formattedDate);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).post(
-                ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).post(
-                    ClientResponse.class, formData);
-
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void addConfiguration(String configKey, String configVal, Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = dateFormat.format(date);
-        webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                ConfigResourcePathConstants.UPDATE_CONFIGURATION);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("key", configKey);
-        formData.add("value", configVal);
-        formData.add("date", formattedDate);
-        builder = BasicAuthHeaderUtil.getBuilder(webResource, null,
-                userName, null, cookie, gateway);
-
-        response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).
-                post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(webResource, null,
-                    userName, callback.getPassword(userName), null, gateway);
-            response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).
-                    post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void removeAllConfiguration(String key) {
-        webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                ConfigResourcePathConstants.DELETE_ALL_CONFIGURATION);
-        MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("key", key);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void removeConfiguration(String key, String value) {
-        webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                ConfigResourcePathConstants.DELETE_CONFIGURATION);
-        MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("key", key);
-        queryParams.add("value", value);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public List<URI> getGFacURIs() {
-        List<URI> uriList = new ArrayList<URI>();
-        try {
-            webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                    ConfigResourcePathConstants.GET_GFAC_URI_LIST);
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, null, cookie, gateway);
-
-            response = builder.get(ClientResponse.class);
-            int status = response.getStatus();
-
-            if (status == ClientConstant.HTTP_OK) {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-                builder = BasicAuthHeaderUtil.getBuilder(
-                        webResource, null, userName, callback.getPassword(userName), null, gateway);
-                response = builder.get(ClientResponse.class);
-                status = response.getStatus();
-
-                if (status == ClientConstant.HTTP_NO_CONTENT) {
-                    return uriList;
-                }
-
-                if (status != ClientConstant.HTTP_OK) {
-                    logger.error(response.getEntity(String.class));
-                    throw new RuntimeException("Failed : HTTP error code : "
-                            + status);
-                } else {
-                    if (response.getCookies().size() > 0) {
-                        cookie = response.getCookies().get(0).toCookie();
-                        CookieManager.setCookie(cookie);
-                    }
-                }
-            } else if (status == ClientConstant.HTTP_NO_CONTENT) {
-                return uriList;
-            } else {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            }
-
-            URLList urlList = response.getEntity(URLList.class);
-            String[] uris = urlList.getUris();
-            for (String url : uris) {
-                URI uri = new URI(url);
-                uriList.add(uri);
-            }
-        } catch (URISyntaxException e) {
-            logger.error("URI syntax is not correct...");
-            return null;
-        }
-        return uriList;
-    }
-
-    public List<URI> getWorkflowInterpreterURIs() {
-        List<URI> uriList = new ArrayList<URI>();
-        try {
-            webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                    ConfigResourcePathConstants.GET_WFINTERPRETER_URI_LIST);
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, null, cookie, gateway);
-
-            response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
-            int status = response.getStatus();
-
-            if (status == ClientConstant.HTTP_OK) {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-                builder = BasicAuthHeaderUtil.getBuilder(
-                        webResource, null, userName, callback.getPassword(userName), null, gateway);
-                response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
-                status = response.getStatus();
-
-                if (status == ClientConstant.HTTP_NO_CONTENT) {
-                    return uriList;
-                }
-
-                if (status != ClientConstant.HTTP_OK) {
-                    logger.error(response.getEntity(String.class));
-                    throw new RuntimeException("Failed : HTTP error code : "
-                            + status);
-                } else {
-                    if (response.getCookies().size() > 0) {
-                        cookie = response.getCookies().get(0).toCookie();
-                        CookieManager.setCookie(cookie);
-                    }
-                }
-            } else if (status == ClientConstant.HTTP_NO_CONTENT) {
-                return uriList;
-            } else {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            }
-
-            URLList urlList = response.getEntity(URLList.class);
-            String[] uris = urlList.getUris();
-            for (String url : uris) {
-                URI uri = new URI(url);
-                uriList.add(uri);
-            }
-        } catch (URISyntaxException e) {
-            return null;
-        }
-        return uriList;
-    }
-
-
-    public URI getEventingURI() {
-        try {
-            webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                    ConfigResourcePathConstants.GET_EVENTING_URI);
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, null, cookie, gateway);
-
-            response = builder.get(ClientResponse.class);
-            int status = response.getStatus();
-
-            if (status == ClientConstant.HTTP_OK) {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-                builder = BasicAuthHeaderUtil.getBuilder(
-                        webResource, null, userName, callback.getPassword(userName), null, gateway);
-                response = builder.get(ClientResponse.class);
-                status = response.getStatus();
-
-                if (status == ClientConstant.HTTP_NO_CONTENT) {
-                    return null;
-                }
-
-                if (status != ClientConstant.HTTP_OK) {
-                    logger.error(response.getEntity(String.class));
-                    throw new RuntimeException("Failed : HTTP error code : "
-                            + status);
-                } else {
-                    if (response.getCookies().size() > 0) {
-                        cookie = response.getCookies().get(0).toCookie();
-                        CookieManager.setCookie(cookie);
-                    }
-                }
-            } else if (status == ClientConstant.HTTP_NO_CONTENT) {
-                return null;
-            } else {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            }
-
-            String uri = response.getEntity(String.class);
-            URI eventingURI = new URI(uri);
-            return eventingURI;
-        } catch (URISyntaxException e) {
-            return null;
-        }
-    }
-
-    public URI getMsgBoxURI() {
-        try {
-            webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                    ConfigResourcePathConstants.GET_MESSAGE_BOX_URI);
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, null, cookie, gateway);
-
-            response = builder.get(ClientResponse.class);
-            int status = response.getStatus();
-
-            if (status == ClientConstant.HTTP_OK) {
-                if (response.getCookies().size() > 0) {
-                    if (response.getCookies().size() > 0) {
-                        cookie = response.getCookies().get(0).toCookie();
-                        CookieManager.setCookie(cookie);
-                    }
-                }
-            } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-                builder = BasicAuthHeaderUtil.getBuilder(
-                        webResource, null, userName, callback.getPassword(userName), null, gateway);
-                response = builder.get(ClientResponse.class);
-                status = response.getStatus();
-
-                if (status == ClientConstant.HTTP_NO_CONTENT) {
-                    return null;
-                }
-
-                if (status != ClientConstant.HTTP_OK) {
-                    logger.error(response.getEntity(String.class));
-                    throw new RuntimeException("Failed : HTTP error code : "
-                            + status);
-                } else {
-                    if (response.getCookies().size() > 0) {
-                        cookie = response.getCookies().get(0).toCookie();
-                        CookieManager.setCookie(cookie);
-                    }
-                }
-            } else if (status == ClientConstant.HTTP_NO_CONTENT) {
-                return null;
-            } else {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            }
-
-            String uri = response.getEntity(String.class);
-            URI msgBoxURI = new URI(uri);
-            return msgBoxURI;
-        } catch (URISyntaxException e) {
-            return null;
-        }
-    }
-
-    public void addGFacURI(URI uri) {
-        webResource = getConfigurationBaseResource().path(ResourcePathConstants.
-                ConfigResourcePathConstants.ADD_GFAC_URI);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.accept(MediaType.TEXT_PLAIN).
-                post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void addWFInterpreterURI(URI uri) {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.ADD_WFINTERPRETER_URI);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, callback.getPassword(userName), null, gateway);
-
-        response = builder.accept(MediaType.TEXT_PLAIN).post(
-                ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void setEventingURI(URI uri) {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.ADD_EVENTING_URI);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.accept(
-                MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void setMessageBoxURI(URI uri) {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.ADD_MESSAGE_BOX_URI);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.accept(
-                MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void addGFacURIByDate(URI uri, Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = dateFormat.format(date);
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.ADD_GFAC_URI_DATE);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        formData.add("date", formattedDate);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.accept(
-                MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void addWorkflowInterpreterURI(URI uri, Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = dateFormat.format(date);
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.ADD_WFINTERPRETER_URI_DATE);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        formData.add("date", formattedDate);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.accept(
-                MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void setEventingURIByDate(URI uri, Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = dateFormat.format(date);
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.ADD_EVENTING_URI_DATE);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        formData.add("date", formattedDate);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.accept(
-                MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void setMessageBoxURIByDate(URI uri, Date date) {
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = dateFormat.format(date);
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.ADD_MSG_BOX_URI_DATE);
-        MultivaluedMap formData = new MultivaluedMapImpl();
-        formData.add("uri", uri.toString());
-        formData.add("date", formattedDate);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void removeGFacURI(URI uri) {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.DELETE_GFAC_URI);
-        MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("uri", uri.toString());
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void removeAllGFacURI() {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.DELETE_ALL_GFAC_URIS);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void removeWorkflowInterpreterURI(URI uri) {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.DELETE_WFINTERPRETER_URI);
-        MultivaluedMap queryParams = new MultivaluedMapImpl();
-        queryParams.add("uri", uri.toString());
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK && status != ClientConstant.HTTP_UNAUTHORIZED) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void removeAllWorkflowInterpreterURI() {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.DELETE_ALL_WFINTERPRETER_URIS);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void unsetEventingURI() {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.DELETE_EVENTING_URI);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public void unsetMessageBoxURI() {
-        webResource = getConfigurationBaseResource().path(
-                ResourcePathConstants.ConfigResourcePathConstants.DELETE_MSG_BOX_URI);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-
-        response = builder.delete(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.delete(ClientResponse.class);
-            status = response.getStatus();
-
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/rest/client/src/main/java/org/apache/airavata/rest/client/CredentialStoreResourceClient.java
----------------------------------------------------------------------
diff --git a/modules/rest/client/src/main/java/org/apache/airavata/rest/client/CredentialStoreResourceClient.java b/modules/rest/client/src/main/java/org/apache/airavata/rest/client/CredentialStoreResourceClient.java
deleted file mode 100644
index 29fbef9..0000000
--- a/modules/rest/client/src/main/java/org/apache/airavata/rest/client/CredentialStoreResourceClient.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.airavata.rest.client;
-
-import java.net.URI;
-
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriBuilder;
-
-import org.apache.airavata.registry.api.PasswordCallback;
-import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.rest.utils.BasicAuthHeaderUtil;
-import org.apache.airavata.rest.utils.ClientConstant;
-import org.apache.airavata.rest.utils.CookieManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-
-public class CredentialStoreResourceClient {
-    private WebResource webResource;
-    private final static Logger logger = LoggerFactory.getLogger(CredentialStoreResourceClient.class);
-    private String userName;
-    private PasswordCallback callback;
-    private String baseURI;
-    private Cookie cookie;
-    private WebResource.Builder builder;
-    private String gateway;
-
-    public CredentialStoreResourceClient(String userName,
-                                    String gateway,
-                                    String serviceURL,
-                                    PasswordCallback callback,
-                                    Cookie cookie) {
-        this.userName = userName;
-        this.callback = callback;
-        this.baseURI = serviceURL;
-        this.gateway = gateway;
-        this.cookie = cookie;
-    }
-
-    private URI getBaseURI() {
-        logger.debug("Creating Base URI");
-        return UriBuilder.fromUri(baseURI).build();
-    }
-
-    private WebResource getCredentialStoreRegistryBaseResource() {
-        ClientConfig config = new DefaultClientConfig();
-        config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING,
-                Boolean.TRUE);
-        Client client = Client.create(config);
-        WebResource baseWebResource = client.resource(getBaseURI());
-        webResource = baseWebResource.path(
-                ResourcePathConstants.CredentialResourceConstants.REGISTRY_API_CREDENTIALREGISTRY);
-        return webResource;
-    }
-
-    public boolean isCredentialExist(String gatewayId, String tokenId) {
-    	webResource = getCredentialStoreRegistryBaseResource().path(
-                ResourcePathConstants.CredentialResourceConstants.SSH_CREDENTIAL_EXIST);
-        MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
-        queryParams.add("gatewayId", gatewayId);
-        queryParams.add("tokenId", tokenId);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-        ClientResponse response = builder.accept(
-                MediaType.TEXT_PLAIN).get(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-            String exists = response.getEntity(String.class);
-            if (exists.equalsIgnoreCase("true")) {
-                return true;
-            } else {
-                return false;
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
-            status = response.getStatus();
-            if (status == ClientConstant.HTTP_OK) {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-            String exists = response.getEntity(String.class);
-            if (exists.equalsIgnoreCase("true")) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-    }
-
-    public String getCredentialPublicKey(String gatewayId, String tokenId) {
-        webResource = getCredentialStoreRegistryBaseResource().path(
-                ResourcePathConstants.CredentialResourceConstants.SSH_CREDENTIAL);
-        MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
-        queryParams.add("gatewayId", gatewayId);
-        queryParams.add("tokenId", tokenId);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, queryParams, userName, null, cookie, gateway);
-        ClientResponse response = builder.accept(
-                MediaType.TEXT_PLAIN).get(ClientResponse.class);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, queryParams, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
-            status = response.getStatus();
-            if (status == ClientConstant.HTTP_NO_CONTENT) {
-                return null;
-            }
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else if (status == ClientConstant.HTTP_NO_CONTENT) {
-            return null;
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-
-        String publicKey = response.getEntity(String.class);
-        return publicKey;
-    }
-    
-    public String createCredential(String gatewayId, String tokenId) {
-    	return this.createCredential(gatewayId, tokenId, null);
-    }
-    
-    public String createCredential(String gatewayId, String tokenId, String username) {
-    	webResource = getCredentialStoreRegistryBaseResource().path(
-                ResourcePathConstants.CredentialResourceConstants.SSH_CREDENTIAL);
-        MultivaluedMap<String, String> formParams = new MultivaluedMapImpl();
-        formParams.add("gatewayId", gatewayId);
-        formParams.add("tokenId", tokenId);
-        if(username!=null)
-        	formParams.add("username", username);
-        builder = BasicAuthHeaderUtil.getBuilder(
-                webResource, null, userName, null, cookie, gateway);
-        ClientResponse response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
-        int status = response.getStatus();
-
-        if (status == ClientConstant.HTTP_OK) {
-            if (response.getCookies().size() > 0) {
-                cookie = response.getCookies().get(0).toCookie();
-                CookieManager.setCookie(cookie);
-            }
-        } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
-            builder = BasicAuthHeaderUtil.getBuilder(
-                    webResource, null, userName, callback.getPassword(userName), null, gateway);
-            response = builder.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
-            status = response.getStatus();
-            if (status != ClientConstant.HTTP_OK) {
-                logger.error(response.getEntity(String.class));
-                throw new RuntimeException("Failed : HTTP error code : "
-                        + status);
-            } else {
-                if (response.getCookies().size() > 0) {
-                    cookie = response.getCookies().get(0).toCookie();
-                    CookieManager.setCookie(cookie);
-                }
-            }
-        } else {
-            logger.error(response.getEntity(String.class));
-            throw new RuntimeException("Failed : HTTP error code : "
-                    + status);
-        }
-        
-        String publicKey = response.getEntity(String.class);
-        return publicKey;
-    }
-
-}