Move JpegToPngRenderer from docx4j to renditions

#226

spring-content-autoconfigure/src/main/java/internal/org/springframework/content/renditions/boot/autoconfigure/RenditionsContentAutoConfiguration.java

@@ -2,12 +2,12 @@
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.content.docx4j.config.Docx4jConfiguration;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.content.renditions.config.RenditionsConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@ComponentScan("org.springframework.content.renditions.renderers")
+@Import(RenditionsConfiguration.class)
 public class RenditionsContentAutoConfiguration {
 
     @Configuration

spring-content-autoconfigure/src/test/java/org/springframework/content/renditions/boot/ContentRenditionsAutoConfigurationTest.java

@@ -2,7 +2,7 @@
 
 import com.github.paulcwarren.ginkgo4j.Ginkgo4jConfiguration;
 import com.github.paulcwarren.ginkgo4j.Ginkgo4jRunner;
-import internal.org.springframework.content.docx4j.JpegToPngRenditionProvider;
+import org.springframework.content.renditions.renderers.JpegToPngRenditionProvider;
 import internal.org.springframework.content.docx4j.WordToHtmlRenditionProvider;
 import internal.org.springframework.content.docx4j.WordToPdfRenditionProvider;
 import internal.org.springframework.content.docx4j.WordToTextRenditionProvider;

spring-content-docx4j/src/main/java/org/springframework/content/docx4j/config/Docx4jConfiguration.java

@@ -1,10 +1,10 @@
 package org.springframework.content.docx4j.config;
 
-import internal.org.springframework.content.docx4j.JpegToPngRenditionProvider;
+import internal.org.springframework.content.docx4j.WordToPdfRenditionProvider;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(basePackageClasses = JpegToPngRenditionProvider.class)
+@ComponentScan(basePackageClasses = WordToPdfRenditionProvider.class)
 public class Docx4jConfiguration {
 }

spring-content-renditions/src/main/java/org/springframework/content/renditions/config/RenditionsConfiguration.java

@@ -0,0 +1,10 @@
+package org.springframework.content.renditions.config;
+
+import org.springframework.content.renditions.renderers.PdfToJpegRenderer;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan(basePackageClasses= PdfToJpegRenderer.class)
+public class RenditionsConfiguration {
+}

spring-content-docx4j/src/main/java/internal/org/springframework/content/docx4j/JpegToPngRenditionProvider.java → spring-content-renditions/src/main/java/org/springframework/content/renditions/renderers/JpegToPngRenditionProvider.java

@@ -1,4 +1,4 @@
-package internal.org.springframework.content.docx4j;
+package org.springframework.content.renditions.renderers;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;

spring-content-docx4j/src/test/java/internal/org/springframework/content/docx4j/JpegToPngRenditionProviderTest.java → spring-content-renditions/src/test/java/org/springframework/content/renditions/renderers/JpegToPngRenditionProviderTest.java

@@ -1,4 +1,4 @@
-package internal.org.springframework.content.docx4j;
+package org.springframework.content.renditions.renderers;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -14,8 +14,6 @@
 import org.springframework.content.commons.io.ObservableInputStream;
 import org.springframework.content.commons.renditions.RenditionProvider;
 
-import internal.org.springframework.content.docx4j.JpegToPngRenditionProvider;
-
 public class JpegToPngRenditionProviderTest {
 
 	private RenditionProvider service;
@@ -33,8 +31,7 @@ public void testCanConvert() {
 
 	@Test
 	public void testConvert() throws Exception {
-		InputStream converted = service.convert(
-				this.getClass().getResourceAsStream("/sample.jpeg"), "image/png");
+		InputStream converted = service.convert(this.getClass().getResourceAsStream("/sample.jpeg"), "image/png");
 
 		assertThat(converted.available(), is(greaterThan(0)));
 		assertThat(((ObservableInputStream)converted).getObservers(), hasItem(is(instanceOf(FileRemover.class))));