Improved OSGi support (#1137)

* Fixed exported packages * Fixed OSGi tests * Refactored to avoid split packages * Fixed OSGi tests
rest-assured · Feb 16, 2019 · e79d531 · e79d531
1 parent cf3f6bd
commit e79d531
Show file tree

Hide file tree

Showing 52 changed files with 116 additions and 74 deletions.
diff --git a/...est-assured-itest-java-osgi/src/test/java/io/restassured/test/osgi/JsonPathOSGiITest.java b/...est-assured-itest-java-osgi/src/test/java/io/restassured/test/osgi/JsonPathOSGiITest.java
@@ -52,9 +52,16 @@ public static Option[] configure() throws Exception {
                         Some of these need to be wrapped because they are not available as OSGi bundles */
                         mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(),
                         wrappedBundle(mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-all").version("2.4.15")),
+                        wrappedBundle(mavenBundle("javax.xml.bind", "jaxb-api").versionAsInProject()),
+                        wrappedBundle(mavenBundle("org.apache.httpcomponents", "httpclient").versionAsInProject()),
+                        wrappedBundle(mavenBundle("org.apache.httpcomponents", "httpmime").versionAsInProject()),
+                        wrappedBundle(mavenBundle("org.apache.httpcomponents", "httpcore").versionAsInProject()),
+                        wrappedBundle(mavenBundle().groupId("org.ccil.cowan.tagsoup").artifactId("tagsoup").versionAsInProject()),
 
                         /* Rest Assured dependencies needed in the Pax Exam container to be able to execute the tests below */
                         mavenBundle("io.rest-assured", "json-path").versionAsInProject(),
+                        mavenBundle("io.rest-assured", "xml-path").versionAsInProject(),
+                        mavenBundle("io.rest-assured", "rest-assured").versionAsInProject(),
                         mavenBundle("io.rest-assured", "rest-assured-common").versionAsInProject()
                 };
     }

diff --git a/...-assured-itest-java-osgi/src/test/java/io/restassured/test/osgi/RestAssuredOSGiITest.java b/...-assured-itest-java-osgi/src/test/java/io/restassured/test/osgi/RestAssuredOSGiITest.java
@@ -57,7 +57,10 @@ public static Option[] configure() throws Exception {
                         wrappedBundle(mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-all").version("2.4.15")),
 
                         /* Rest Assured dependencie needed in the Pax Exam container to be able to execute the test below */
-                        mavenBundle("io.rest-assured", "rest-assured").versionAsInProject()
+                        mavenBundle("io.rest-assured", "json-path").versionAsInProject(),
+                        mavenBundle("io.rest-assured", "xml-path").versionAsInProject(),
+                        mavenBundle("io.rest-assured", "rest-assured").versionAsInProject(),
+                        mavenBundle("io.rest-assured", "rest-assured-common").versionAsInProject()
                 };
     }
 

diff --git a/...rest-assured-itest-java-osgi/src/test/java/io/restassured/test/osgi/XmlPathOSGiITest.java b/...rest-assured-itest-java-osgi/src/test/java/io/restassured/test/osgi/XmlPathOSGiITest.java
@@ -54,9 +54,14 @@ public static Option[] configure() throws Exception {
                         wrappedBundle(mavenBundle("javax.xml.bind", "jaxb-api").versionAsInProject()),
                         wrappedBundle(mavenBundle("javax.activation", "activation").version("1.1.1")),
                         wrappedBundle(mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-all").version("2.4.15")),
+                        wrappedBundle(mavenBundle("org.apache.httpcomponents", "httpclient").versionAsInProject()),
+                        wrappedBundle(mavenBundle("org.apache.httpcomponents", "httpmime").versionAsInProject()),
+                        wrappedBundle(mavenBundle("org.apache.httpcomponents", "httpcore").versionAsInProject()),
 
                         /* Rest Assured dependencies needed in the Pax Exam container to be able to execute the tests below */
+                        mavenBundle("io.rest-assured", "json-path").versionAsInProject(),
                         mavenBundle("io.rest-assured", "xml-path").versionAsInProject(),
+                        mavenBundle("io.rest-assured", "rest-assured").versionAsInProject(),
                         mavenBundle("io.rest-assured", "rest-assured-common").versionAsInProject()
                 };
     }

diff --git a/...-assured-itest-java/src/test/java/io/restassured/itest/java/CustomObjectMappingITest.java b/...-assured-itest-java/src/test/java/io/restassured/itest/java/CustomObjectMappingITest.java
@@ -26,7 +26,8 @@
 import io.restassured.mapper.ObjectMapper;
 import io.restassured.mapper.ObjectMapperDeserializationContext;
 import io.restassured.mapper.ObjectMapperSerializationContext;
-import io.restassured.mapper.factory.GsonObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.GsonObjectMapperFactory;
+
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...assured-itest-java/src/test/java/io/restassured/itest/java/GivenWhenThenExtractITest.java b/...assured-itest-java/src/test/java/io/restassured/itest/java/GivenWhenThenExtractITest.java
@@ -16,8 +16,8 @@
 
 package io.restassured.itest.java;
 
+import io.restassured.common.mapper.TypeRef;
 import io.restassured.itest.java.support.WithJetty;
-import io.restassured.mapper.TypeRef;
 import io.restassured.response.Response;
 import org.junit.Test;
 

diff --git a/...rest-assured-itest-java/src/test/java/io/restassured/itest/java/MultiPartUploadITest.java b/...rest-assured-itest-java/src/test/java/io/restassured/itest/java/MultiPartUploadITest.java
@@ -28,7 +28,7 @@
 import io.restassured.itest.java.support.MyEnum;
 import io.restassured.itest.java.support.WithJetty;
 import io.restassured.mapper.ObjectMapperType;
-import io.restassured.mapper.factory.DefaultJackson2ObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.DefaultJackson2ObjectMapperFactory;
 import io.restassured.specification.RequestSpecification;
 import org.apache.commons.io.IOUtils;
 import org.junit.Rule;

diff --git a/json-path/pom.xml b/json-path/pom.xml
@@ -44,13 +44,12 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>io.restassured.*</Export-Package>
+                        <Export-Package>io.restassured.path.json.*</Export-Package>
                         <Import-Package>
 							groovy.*;version="${groovy.range}",
                             org.codehaus.groovy.*;version="${groovy.range}",
                             *
 						</Import-Package>
-                        <Private-Package />
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...h/src/main/groovy/io/restassured/internal/path/json/mapping/JsonObjectDeserializer.groovy b/...h/src/main/groovy/io/restassured/internal/path/json/mapping/JsonObjectDeserializer.groovy
@@ -20,12 +20,12 @@
 package io.restassured.internal.path.json.mapping
 
 import io.restassured.internal.mapper.ObjectDeserializationContextImpl
-import io.restassured.mapper.DataToDeserialize
-import io.restassured.mapper.ObjectDeserializationContext
-import io.restassured.mapper.factory.GsonObjectMapperFactory
-import io.restassured.mapper.factory.Jackson1ObjectMapperFactory
-import io.restassured.mapper.factory.Jackson2ObjectMapperFactory
-import io.restassured.mapper.resolver.ObjectMapperResolver
+import io.restassured.common.mapper.DataToDeserialize
+import io.restassured.common.mapper.ObjectDeserializationContext
+import io.restassured.path.json.mapper.factory.GsonObjectMapperFactory
+import io.restassured.path.json.mapper.factory.Jackson1ObjectMapperFactory
+import io.restassured.path.json.mapper.factory.Jackson2ObjectMapperFactory
+import io.restassured.common.mapper.resolver.ObjectMapperResolver
 import io.restassured.path.json.config.JsonParserType
 import io.restassured.path.json.config.JsonPathConfig
 import org.apache.commons.lang3.Validate

diff --git a/...in/groovy/io/restassured/internal/path/json/mapping/JsonPathGsonObjectDeserializer.groovy b/...in/groovy/io/restassured/internal/path/json/mapping/JsonPathGsonObjectDeserializer.groovy
@@ -20,8 +20,8 @@
 
 package io.restassured.internal.path.json.mapping
 
-import io.restassured.mapper.ObjectDeserializationContext
-import io.restassured.mapper.factory.GsonObjectMapperFactory
+import io.restassured.common.mapper.ObjectDeserializationContext
+import io.restassured.path.json.mapper.factory.GsonObjectMapperFactory
 import io.restassured.path.json.mapping.JsonPathObjectDeserializer
 
 import static io.restassured.internal.assertion.AssertParameter.notNull

diff --git a/...roovy/io/restassured/internal/path/json/mapping/JsonPathJackson1ObjectDeserializer.groovy b/...roovy/io/restassured/internal/path/json/mapping/JsonPathJackson1ObjectDeserializer.groovy
@@ -18,8 +18,8 @@
 
 package io.restassured.internal.path.json.mapping
 
-import io.restassured.mapper.ObjectDeserializationContext
-import io.restassured.mapper.factory.Jackson1ObjectMapperFactory
+import io.restassured.common.mapper.ObjectDeserializationContext
+import io.restassured.path.json.mapper.factory.Jackson1ObjectMapperFactory
 import io.restassured.path.json.mapping.JsonPathObjectDeserializer
 import org.codehaus.jackson.type.JavaType
 

diff --git a/...roovy/io/restassured/internal/path/json/mapping/JsonPathJackson2ObjectDeserializer.groovy b/...roovy/io/restassured/internal/path/json/mapping/JsonPathJackson2ObjectDeserializer.groovy
@@ -20,8 +20,8 @@ package io.restassured.internal.path.json.mapping
 
 import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.ObjectMapper
-import io.restassured.mapper.ObjectDeserializationContext
-import io.restassured.mapper.factory.Jackson2ObjectMapperFactory
+import io.restassured.common.mapper.ObjectDeserializationContext
+import io.restassured.path.json.mapper.factory.Jackson2ObjectMapperFactory
 import io.restassured.path.json.mapping.JsonPathObjectDeserializer
 
 import java.lang.reflect.Type

diff --git a/json-path/src/main/java/io/restassured/path/json/JsonPath.java b/json-path/src/main/java/io/restassured/path/json/JsonPath.java
@@ -18,19 +18,19 @@
 
 import groovy.json.JsonBuilder;
 import groovy.json.JsonOutput;
+import io.restassured.common.mapper.TypeRef;
 import io.restassured.internal.assertion.AssertParameter;
 import io.restassured.internal.path.ObjectConverter;
 import io.restassured.internal.path.json.ConfigurableJsonSlurper;
 import io.restassured.internal.path.json.JSONAssertion;
 import io.restassured.internal.path.json.JsonPrettifier;
 import io.restassured.internal.path.json.mapping.JsonObjectDeserializer;
-import io.restassured.mapper.TypeRef;
-import io.restassured.mapper.factory.GsonObjectMapperFactory;
-import io.restassured.mapper.factory.Jackson1ObjectMapperFactory;
-import io.restassured.mapper.factory.Jackson2ObjectMapperFactory;
 import io.restassured.path.json.config.JsonParserType;
 import io.restassured.path.json.config.JsonPathConfig;
 import io.restassured.path.json.exception.JsonPathException;
+import io.restassured.path.json.mapper.factory.GsonObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.Jackson1ObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.Jackson2ObjectMapperFactory;
 
 import java.io.*;
 import java.net.URL;

diff --git a/json-path/src/main/java/io/restassured/path/json/config/JsonPathConfig.java b/json-path/src/main/java/io/restassured/path/json/config/JsonPathConfig.java
@@ -16,7 +16,13 @@
 
 package io.restassured.path.json.config;
 
-import io.restassured.mapper.factory.*;
+import io.restassured.common.mapper.factory.*;
+import io.restassured.path.json.mapper.factory.DefaultGsonObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.DefaultJackson1ObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.DefaultJackson2ObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.GsonObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.Jackson1ObjectMapperFactory;
+import io.restassured.path.json.mapper.factory.Jackson2ObjectMapperFactory;
 import io.restassured.path.json.mapping.JsonPathObjectDeserializer;
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/json-path/src/main/java/io/restassured/path/json/exception/JsonPathException.java b/json-path/src/main/java/io/restassured/path/json/exception/JsonPathException.java
@@ -16,7 +16,7 @@
 
 package io.restassured.path.json.exception;
 
-import io.restassured.exception.PathException;
+import io.restassured.common.exception.PathException;
 
 public class JsonPathException extends PathException {
 

diff --git a/...ctory/DefaultGsonObjectMapperFactory.java → ...ctory/DefaultGsonObjectMapperFactory.java b/...ctory/DefaultGsonObjectMapperFactory.java → ...ctory/DefaultGsonObjectMapperFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.factory;
+package io.restassured.path.json.mapper.factory;
 
 import com.google.gson.Gson;
 

diff --git a/...y/DefaultJackson1ObjectMapperFactory.java → ...y/DefaultJackson1ObjectMapperFactory.java b/...y/DefaultJackson1ObjectMapperFactory.java → ...y/DefaultJackson1ObjectMapperFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.factory;
+package io.restassured.path.json.mapper.factory;
 
 import org.codehaus.jackson.map.ObjectMapper;
 

diff --git a/...y/DefaultJackson2ObjectMapperFactory.java → ...y/DefaultJackson2ObjectMapperFactory.java b/...y/DefaultJackson2ObjectMapperFactory.java → ...y/DefaultJackson2ObjectMapperFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.factory;
+package io.restassured.path.json.mapper.factory;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...pper/factory/GsonObjectMapperFactory.java → ...pper/factory/GsonObjectMapperFactory.java b/...pper/factory/GsonObjectMapperFactory.java → ...pper/factory/GsonObjectMapperFactory.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.factory;
+package io.restassured.path.json.mapper.factory;
 
 import com.google.gson.Gson;
 
+import io.restassured.common.mapper.factory.ObjectMapperFactory;
+
 /**
  * Interface for Gson object mappers. Implement this class and register it to the ObjectMapperConfig if you
  * want to override default settings for the Gson object mapper.

diff --git a/.../factory/Jackson1ObjectMapperFactory.java → .../factory/Jackson1ObjectMapperFactory.java b/.../factory/Jackson1ObjectMapperFactory.java → .../factory/Jackson1ObjectMapperFactory.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.factory;
+package io.restassured.path.json.mapper.factory;
 
 import org.codehaus.jackson.map.ObjectMapper;
 
+import io.restassured.common.mapper.factory.ObjectMapperFactory;
+
 /**
  * Interface for Jackson 1.0 based object mappers. Implement this class and register it to the ObjectMapperConfig if you
  * want to override default settings for the Jackson object mapper.

diff --git a/.../factory/Jackson2ObjectMapperFactory.java → .../factory/Jackson2ObjectMapperFactory.java b/.../factory/Jackson2ObjectMapperFactory.java → .../factory/Jackson2ObjectMapperFactory.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.factory;
+package io.restassured.path.json.mapper.factory;
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.restassured.common.mapper.factory.ObjectMapperFactory;
+
 /**
  * Interface for Jackson 2.0 based object mappers. Implement this class and register it to the ObjectMapperConfig if you
  * want to override default settings for the Jackson 2.0 object mapper.

diff --git a/json-path/src/main/java/io/restassured/path/json/mapping/JsonPathObjectDeserializer.java b/json-path/src/main/java/io/restassured/path/json/mapping/JsonPathObjectDeserializer.java
@@ -16,7 +16,7 @@
 
 package io.restassured.path.json.mapping;
 
-import io.restassured.mapper.ObjectDeserializationContext;
+import io.restassured.common.mapper.ObjectDeserializationContext;
 
 /**
  * Interface for all JsonPath object deserializers. It's possible to roll your own implementation if the pre-defined

diff --git a/json-path/src/test/java/io/restassured/path/json/JsonPathObjectDeserializationTest.java b/json-path/src/test/java/io/restassured/path/json/JsonPathObjectDeserializationTest.java
@@ -16,7 +16,7 @@
 
 package io.restassured.path.json;
 
-import io.restassured.mapper.ObjectDeserializationContext;
+import io.restassured.common.mapper.ObjectDeserializationContext;
 import io.restassured.path.json.config.JsonPathConfig;
 import io.restassured.path.json.mapping.JsonPathObjectDeserializer;
 import io.restassured.path.json.support.Greeting;

diff --git a/json-path/src/test/java/io/restassured/path/json/JsonPathTest.java b/json-path/src/test/java/io/restassured/path/json/JsonPathTest.java
@@ -16,7 +16,7 @@
 
 package io.restassured.path.json;
 
-import io.restassured.mapper.TypeRef;
+import io.restassured.common.mapper.TypeRef;
 import io.restassured.path.json.config.JsonPathConfig;
 import io.restassured.path.json.exception.JsonPathException;
 import io.restassured.path.json.support.Book;

diff --git a/rest-assured-common/pom.xml b/rest-assured-common/pom.xml
@@ -45,13 +45,12 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>io.restassured.*</Export-Package>
+                        <Export-Package>io.restassured.common.*</Export-Package>
                         <Import-Package>
 							groovy.*;version="${groovy.range}",
                             org.codehaus.groovy.*;version="${groovy.range}",
                             *
 						</Import-Package>
-                        <Private-Package />
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...on/src/main/groovy/io/restassured/internal/mapper/ObjectDeserializationContextImpl.groovy b/...on/src/main/groovy/io/restassured/internal/mapper/ObjectDeserializationContextImpl.groovy
@@ -19,8 +19,8 @@
 
 package io.restassured.internal.mapper
 
-import io.restassured.mapper.DataToDeserialize
-import io.restassured.mapper.ObjectDeserializationContext
+import io.restassured.common.mapper.DataToDeserialize
+import io.restassured.common.mapper.ObjectDeserializationContext
 
 import java.lang.reflect.Type
 

diff --git a/.../restassured/exception/PathException.java → ...sured/common/exception/PathException.java b/.../restassured/exception/PathException.java → ...sured/common/exception/PathException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.exception;
+package io.restassured.common.exception;
 
 public abstract class PathException extends RuntimeException {
 

diff --git a/...restassured/mapper/DataToDeserialize.java → ...ured/common/mapper/DataToDeserialize.java b/...restassured/mapper/DataToDeserialize.java → ...ured/common/mapper/DataToDeserialize.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper;
+package io.restassured.common.mapper;
 
 import java.io.InputStream;
 

diff --git a/.../mapper/ObjectDeserializationContext.java → .../mapper/ObjectDeserializationContext.java b/.../mapper/ObjectDeserializationContext.java → .../mapper/ObjectDeserializationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper;
+package io.restassured.common.mapper;
 
 import java.lang.reflect.Type;
 

diff --git a/...n/java/io/restassured/mapper/TypeRef.java → ...io/restassured/common/mapper/TypeRef.java b/...n/java/io/restassured/mapper/TypeRef.java → ...io/restassured/common/mapper/TypeRef.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.restassured.mapper;
+package io.restassured.common.mapper;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

diff --git a/...d/mapper/factory/ObjectMapperFactory.java → ...n/mapper/factory/ObjectMapperFactory.java b/...d/mapper/factory/ObjectMapperFactory.java → ...n/mapper/factory/ObjectMapperFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.factory;
+package io.restassured.common.mapper.factory;
 
 import java.lang.reflect.Type;
 

diff --git a/...mapper/resolver/ObjectMapperResolver.java → ...mapper/resolver/ObjectMapperResolver.java b/...mapper/resolver/ObjectMapperResolver.java → ...mapper/resolver/ObjectMapperResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.restassured.mapper.resolver;
+package io.restassured.common.mapper.resolver;
 
 import static io.restassured.internal.classpath.ClassPathResolver.existInCP;
 

diff --git a/rest-assured/pom.xml b/rest-assured/pom.xml
@@ -47,13 +47,17 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>io.restassured.*</Export-Package>
+                        <Export-Package>
+                        	!io.restassured.path.xml.*,
+                        	!io.restassured.path.json.*,
+                        	!io.restassured.common.*,
+                        	io.restassured.*
+                        </Export-Package>
                         <Import-Package>
 							groovy.*;version="${groovy.range}",
                             org.codehaus.groovy.*;version="${groovy.range}",
                             *
 						</Import-Package>
-                        <Private-Package />
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/...sured/src/main/groovy/io/restassured/internal/RestAssuredResponseOptionsGroovyImpl.groovy b/...sured/src/main/groovy/io/restassured/internal/RestAssuredResponseOptionsGroovyImpl.groovy
@@ -33,6 +33,7 @@ import io.restassured.internal.mapping.ObjectMapping
 import io.restassured.internal.print.ResponsePrinter
 import io.restassured.internal.support.CloseHTTPClientConnectionInputStreamWrapper
 import io.restassured.internal.support.Prettifier
+import io.restassured.common.mapper.*
 import io.restassured.mapper.*
 import io.restassured.path.json.JsonPath
 import io.restassured.path.json.config.JsonPathConfig