Juan Hernandez has uploaded a new change for review.
Change subject: restapi: Move providers to implementation module
......................................................................
restapi: Move providers to implementation module
Currently the implementations of the providers (JAXB, JSON and PDF) are
part of the "definition" module, but this module should contain only the
contracts of the RESTAPI, not the implementations. This patch moves
these implementations to the "jaxrs" module.
Change-Id: I810fbfafef5454fe0e1fadcba85fa522d42bbbfa
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M backend/manager/modules/restapi/interface/definition/pom.xml
M
backend/manager/modules/restapi/interface/definition/src/main/modules/org/ovirt/engine/api/restapi-definition/main/module.xml
D
backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
M backend/manager/modules/restapi/jaxrs/pom.xml
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomBeanFactory.java
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomObjectMapper.java
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/JSONProvider.java
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/pdf/FOPMessageBodyWriter.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ExpectationHelper.java
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBValidationEventHandler.java
M
backend/manager/modules/restapi/jaxrs/src/main/modules/org/ovirt/engine/api/restapi-jaxrs/main/module.xml
R
backend/manager/modules/restapi/jaxrs/src/main/resources/GlusterVolumeProfileDetailsAsPdf.xsl
A
backend/manager/modules/restapi/jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
16 files changed, 50 insertions(+), 49 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/39966/1
diff --git a/backend/manager/modules/restapi/interface/definition/pom.xml
b/backend/manager/modules/restapi/interface/definition/pom.xml
index aa196d2..fe5483d 100644
--- a/backend/manager/modules/restapi/interface/definition/pom.xml
+++ b/backend/manager/modules/restapi/interface/definition/pom.xml
@@ -14,28 +14,10 @@
<dependencies>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${jackson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>${jackson.version}</version>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
</dependency>
<dependency>
@@ -63,13 +45,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- <version>${fop.version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/modules/org/ovirt/engine/api/restapi-definition/main/module.xml
b/backend/manager/modules/restapi/interface/definition/src/main/modules/org/ovirt/engine/api/restapi-definition/main/module.xml
index a69455f..7993b56 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/modules/org/ovirt/engine/api/restapi-definition/main/module.xml
+++
b/backend/manager/modules/restapi/interface/definition/src/main/modules/org/ovirt/engine/api/restapi-definition/main/module.xml
@@ -26,13 +26,7 @@
<module name="javax.api"/>
<module name="javax.ws.rs.api"/>
<module name="javax.xml.bind.api"/>
- <module name="org.apache.commons.codec"/>
<module name="org.apache.commons.lang"/>
- <module name="org.apache.xmlgraphics.fop"/>
- <module name="org.codehaus.jackson.jackson-core-asl"/>
- <module name="org.codehaus.jackson.jackson-jaxrs"/>
- <module name="org.codehaus.jackson.jackson-mapper-asl"/>
- <module name="org.codehaus.jackson.jackson-xc"/>
<module name="org.ovirt.engine.core.common"/>
<module name="org.ovirt.engine.core.uutils"/>
<module name="org.slf4j"/>
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
b/backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
deleted file mode 100644
index 7e89479..0000000
---
a/backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
+++ /dev/null
@@ -1,3 +0,0 @@
-org.ovirt.engine.api.json.JSONProvider
-org.ovirt.engine.api.xml.JAXBProvider
-org.ovirt.engine.api.pdf.FOPMessageBodyWriter
diff --git a/backend/manager/modules/restapi/jaxrs/pom.xml
b/backend/manager/modules/restapi/jaxrs/pom.xml
index 4b33dcd..1d63ec6 100644
--- a/backend/manager/modules/restapi/jaxrs/pom.xml
+++ b/backend/manager/modules/restapi/jaxrs/pom.xml
@@ -71,8 +71,18 @@
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
@@ -106,7 +116,6 @@
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
<version>${fop.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -142,6 +151,24 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
</dependencies>
<build>
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomBeanFactory.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomBeanFactory.java
similarity index 95%
rename from
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomBeanFactory.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomBeanFactory.java
index 52a3d4c..3fc94cd 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomBeanFactory.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomBeanFactory.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.api.json;
+package org.ovirt.engine.api.restapi.json;
import java.util.List;
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomObjectMapper.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomObjectMapper.java
similarity index 98%
rename from
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomObjectMapper.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomObjectMapper.java
index 9984e94..e944c1f 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomObjectMapper.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/CustomObjectMapper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.ovirt.engine.api.json;
+package org.ovirt.engine.api.restapi.json;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.DeserializationConfig;
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/JSONProvider.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/JSONProvider.java
similarity index 95%
rename from
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/JSONProvider.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/JSONProvider.java
index 64e5e75..2af820c 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/JSONProvider.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/json/JSONProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.ovirt.engine.api.json;
+package org.ovirt.engine.api.restapi.json;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/pdf/FOPMessageBodyWriter.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/pdf/FOPMessageBodyWriter.java
similarity index 98%
rename from
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/pdf/FOPMessageBodyWriter.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/pdf/FOPMessageBodyWriter.java
index ea9f599..1749393 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/pdf/FOPMessageBodyWriter.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/pdf/FOPMessageBodyWriter.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.api.pdf;
+package org.ovirt.engine.api.restapi.pdf;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
index 95ac4ac..1010733 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
@@ -16,7 +16,7 @@
import org.ovirt.engine.api.common.util.StatusUtils;
import org.ovirt.engine.api.model.ActionableResource;
import org.ovirt.engine.api.model.BaseResource;
-import org.ovirt.engine.api.utils.ExpectationHelper;
+import org.ovirt.engine.api.restapi.util.ExpectationHelper;
import org.ovirt.engine.api.utils.LinkHelper;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
index 213519a..3888f6b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
@@ -21,7 +21,7 @@
import org.ovirt.engine.api.restapi.resource.validation.Validator;
import org.ovirt.engine.api.restapi.util.ErrorMessageHelper;
import org.ovirt.engine.api.restapi.util.SessionHelper;
-import org.ovirt.engine.api.utils.ExpectationHelper;
+import org.ovirt.engine.api.restapi.util.ExpectationHelper;
import org.ovirt.engine.api.utils.LinkHelper;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ExpectationHelper.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ExpectationHelper.java
similarity index 97%
rename from
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ExpectationHelper.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ExpectationHelper.java
index 8f7f9cd..f39ba34 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ExpectationHelper.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ExpectationHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.ovirt.engine.api.utils;
+package org.ovirt.engine.api.restapi.util;
import java.util.HashSet;
import java.util.List;
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/xml/JAXBProvider.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java
similarity index 98%
rename from
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/xml/JAXBProvider.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java
index 89c05f5..370b97d 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/xml/JAXBProvider.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.ovirt.engine.api.xml;
+package org.ovirt.engine.api.restapi.xml;
import java.io.IOException;
import java.io.InputStream;
@@ -60,7 +60,7 @@
/**
* The logger used by this class.
*/
- private Logger log = LoggerFactory.getLogger(JAXBProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(JAXBProvider.class);
/**
* The factory used to create JAXB elements.
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/xml/JAXBValidationEventHandler.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBValidationEventHandler.java
similarity index 96%
rename from
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/xml/JAXBValidationEventHandler.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBValidationEventHandler.java
index 8c55f5e..b5eb224 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/xml/JAXBValidationEventHandler.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBValidationEventHandler.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.ovirt.engine.api.xml;
+package org.ovirt.engine.api.restapi.xml;
import javax.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler;
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/modules/org/ovirt/engine/api/restapi-jaxrs/main/module.xml
b/backend/manager/modules/restapi/jaxrs/src/main/modules/org/ovirt/engine/api/restapi-jaxrs/main/module.xml
index 788d0c1..e40ca0b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/modules/org/ovirt/engine/api/restapi-jaxrs/main/module.xml
+++
b/backend/manager/modules/restapi/jaxrs/src/main/modules/org/ovirt/engine/api/restapi-jaxrs/main/module.xml
@@ -26,9 +26,14 @@
<module name="javax.api"/>
<module name="javax.ws.rs.api"/>
<module name="javax.xml.bind.api"/>
+ <module name="org.apache.commons.codec"/>
<module name="org.apache.commons.collections"/>
<module name="org.apache.commons.lang"/>
+ <module name="org.apache.xmlgraphics.fop"/>
<module name="org.codehaus.jackson.jackson-core-asl"/>
+ <module name="org.codehaus.jackson.jackson-jaxrs"/>
+ <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+ <module name="org.codehaus.jackson.jackson-xc"/>
<module name="org.jboss.resteasy.resteasy-jaxb-provider"/>
<module name="org.jboss.resteasy.resteasy-jaxrs"/>
<module name="org.ovirt.engine.api.interface-common-jaxrs"/>
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/GlusterVolumeProfileDetailsAsPdf.xsl
b/backend/manager/modules/restapi/jaxrs/src/main/resources/GlusterVolumeProfileDetailsAsPdf.xsl
similarity index 100%
rename from
backend/manager/modules/restapi/interface/definition/src/main/resources/GlusterVolumeProfileDetailsAsPdf.xsl
rename to
backend/manager/modules/restapi/jaxrs/src/main/resources/GlusterVolumeProfileDetailsAsPdf.xsl
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
b/backend/manager/modules/restapi/jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
new file mode 100644
index 0000000..72713da
--- /dev/null
+++
b/backend/manager/modules/restapi/jaxrs/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
@@ -0,0 +1,3 @@
+org.ovirt.engine.api.restapi.json.JSONProvider
+org.ovirt.engine.api.restapi.xml.JAXBProvider
+org.ovirt.engine.api.restapi.pdf.FOPMessageBodyWriter
--
To view, visit https://gerrit.ovirt.org/39966
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I810fbfafef5454fe0e1fadcba85fa522d42bbbfa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
