[07/34] incubator-geode git commit: adding unit tests for REST API

[kl...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9b55879e/geode-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java
deleted file mode 100644
index 0406831..0000000
--- a/geode-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java
+++ /dev/null
@@ -1,110 +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 com.gemstone.gemfire.rest.internal.web.controllers;
-
-import java.net.URI;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.http.converter.ByteArrayHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.ResourceHttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-
-
-/**
- * The RestTestUtils class contains core functionality for Spring REST Template
- * <p/>
- * 
- * @author Nilkanth Patel
- * @see org.springframework.context.ApplicationContext
- * @see org.springframework.data.gemfire.GemfireTemplate
- * @since 8.0
- */
-public class RestTestUtils  {
-
-  public static final String BASE_URL = "http://localhost:8080";
-  public static final String GEMFIRE_REST_API_CONTEXT = "/gemfire-api";
-  public static final String GEMFIRE_REST_API_VERSION = "/v1";
-
-  public static final URI GEMFIRE_REST_API_WEB_SERVICE_URL = URI
-      .create(BASE_URL + GEMFIRE_REST_API_CONTEXT + GEMFIRE_REST_API_VERSION);
-
-  private static RestTemplate restTemplate;
-
-  public static RestTemplate getRestTemplate() {
-    if (restTemplate == null) {
-      restTemplate = new RestTemplate();
-
-      final List<HttpMessageConverter<?>> messageConverters = new ArrayList<HttpMessageConverter<?>>();
-
-      messageConverters.add(new ByteArrayHttpMessageConverter());
-      messageConverters.add(new ResourceHttpMessageConverter());
-      messageConverters.add(new StringHttpMessageConverter());
-      messageConverters.add(createMappingJackson2HttpMessageConverter());
-      
-      restTemplate.setMessageConverters(messageConverters);
-    }
-    return restTemplate;
-  }
-
-  public static HttpMessageConverter<Object> createMappingJackson2HttpMessageConverter() {
-    final Jackson2ObjectMapperFactoryBean objectMapperFactoryBean = new Jackson2ObjectMapperFactoryBean();
-
-    objectMapperFactoryBean.setFailOnEmptyBeans(true);
-    objectMapperFactoryBean.setIndentOutput(true);
-    objectMapperFactoryBean.setDateFormat(new SimpleDateFormat("MM/dd/yyyy"));
-    objectMapperFactoryBean
-        .setFeaturesToDisable(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-    objectMapperFactoryBean
-        .setFeaturesToEnable(
-            com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_COMMENTS,
-            com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_SINGLE_QUOTES,
-            com.fasterxml.jackson.databind.DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-    objectMapperFactoryBean.afterPropertiesSet();
-
-    final MappingJackson2HttpMessageConverter httpMessageConverter = new MappingJackson2HttpMessageConverter();
-    httpMessageConverter.setObjectMapper(objectMapperFactoryBean.getObject());
-    return httpMessageConverter;
-  }
-  
-  /*
-  protected static HttpMessageConverter<Object> createMarshallingHttpMessageConverter() {
-    final Jaxb2Marshaller jaxbMarshaller = new Jaxb2Marshaller();
-
-    jaxbMarshaller.setContextPaths("com.gemstone.gemfire.web.rest.domain",
-        "com.gemstone.gemfire.web.controllers.support");
-    jaxbMarshaller.setMarshallerProperties(Collections.singletonMap(
-        "jaxb.formatted.output", Boolean.TRUE));
-
-    return new MarshallingHttpMessageConverter(jaxbMarshaller);
-  }
-  */
-  
-  public static URI toUri(final String... pathSegments) {
-    return toUri(GEMFIRE_REST_API_WEB_SERVICE_URL, pathSegments);
-  }
-
-  public static URI toUri(final URI baseUrl, final String... pathSegments) {
-    return UriComponentsBuilder.fromUri(baseUrl).pathSegment(pathSegments)
-        .build().toUri();
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9b55879e/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 5012608..8a533f6 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -45,6 +45,8 @@ hamcrest-all.version = 1.3
 hbase.version = 0.94.27
 hibernate.version = 3.5.5-Final
 hibernate-commons-annotations.version = 3.2.0.Final
+httpclient.version = 4.3.3
+httpcore.version = 4.3.3
 httpunit.version = 1.7.2
 hsqldb.version = 2.0.0
 jackson.version = 2.2.0