Add missing newline at end of file

V2-V3-BREAKING-CHANGES.rst

@@ -5,4 +5,4 @@ Known breaking changes
   - V2 - first layer is bottom layer of the map.
   - V3 - first layer is top layer of the map.
  - Scales, DPI moved from configuration to template/attributes in config.yaml file
- - http allowed hosts, headers, etc... moved to Http processors
+ - http allowed hosts, headers, etc... moved to Http processors

core/jettyRunExtraFiles/mapfish-spring-application-context-override.xml

@@ -14,4 +14,4 @@
     <beans:bean id="mapPrinterFactory" class="org.mapfish.print.servlet.ServletMapPrinterFactory">
         <beans:property name="appsRootDirectory" value="${path_to_examples}" />
     </beans:bean>
-</beans:beans>
+</beans:beans>

core/libs/Readme.rst

@@ -1,2 +1,2 @@
 The jars in this directory are jars that have problems in the maven repositories because of bad descriptors or some other reason and
-sometimes fail to download (for example by travis).
+sometimes fail to download (for example by travis).

core/src/main/java/org/mapfish/print/ApplicationContextProvider.java

@@ -20,4 +20,4 @@ public static ApplicationContext getApplicationContext() {
     public final void setApplicationContext(final ApplicationContext ctx) {
         context = ctx;
     }
-}
+}

core/src/main/java/org/mapfish/print/map/geotools/function/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Package containing Custom geotools functions for mapfish print.
  */
-package org.mapfish.print.map.geotools.function;
+package org.mapfish.print.map.geotools.function;

core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java

@@ -51,4 +51,4 @@ public interface PrintJobEntry {
      */
     void assertAccess();
 
-}
+}

core/src/main/java/org/mapfish/print/servlet/job/PrintJobResult.java

@@ -33,4 +33,4 @@ public interface PrintJobResult {
      */
     String getReportURIString();
 
-}
+}

core/src/main/java/org/mapfish/print/servlet/job/PrintJobStatus.java

@@ -121,4 +121,4 @@ enum Status {
      */
     void setWaitingTime(long waitingTime);
 
-}
+}

core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java

@@ -104,4 +104,4 @@ public final int[] sqlTypes() {
         return SQL_TYPES;
     }
 
-}
+}

core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java

@@ -105,4 +105,4 @@ public final int[] sqlTypes() {
         return SQL_TYPES;
     }
 
-}
+}

core/src/main/resources/META-INF/services/org.geotools.filter.FunctionFactory

@@ -1 +1 @@
-org.mapfish.print.map.geotools.function.FunctionFactory
+org.mapfish.print.map.geotools.function.FunctionFactory

core/src/main/resources/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory

@@ -1 +1 @@
-org.mapfish.print.map.CustomEPSGCodes
+org.mapfish.print.map.CustomEPSGCodes

core/src/main/resources/epsg.properties

@@ -1,2 +1,2 @@
 #This file is used to define EPSG codes that are custom to your project.  The 900913 code is just an example because the EPSG:3857 is the correct google mercator projection definition and is used for both 900913 and 3857.
-900913=PROJCS["Google Mercator",GEOGCS["WGS 84",DATUM["World Geodetic System 1984",SPHEROID["WGS 84", 6378137.0, 298.257223563, AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]],UNIT["degree", 0.017453292519943295],AXIS["Geodetic latitude", NORTH],AXIS["Geodetic longitude", EAST],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["semi_minor", 6378137.0],PARAMETER["latitude_of_origin", 0.0],PARAMETER["central_meridian", 0.0],PARAMETER["scale_factor", 1.0],PARAMETER["false_easting", 0.0],PARAMETER["false_northing", 0.0],UNIT["m", 1.0],AXIS["Easting", EAST],AXIS["Northing", NORTH],AUTHORITY["EPSG","900913"]]
+900913=PROJCS["Google Mercator",GEOGCS["WGS 84",DATUM["World Geodetic System 1984",SPHEROID["WGS 84", 6378137.0, 298.257223563, AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]],UNIT["degree", 0.017453292519943295],AXIS["Geodetic latitude", NORTH],AXIS["Geodetic longitude", EAST],AUTHORITY["EPSG","4326"]],PROJECTION["Mercator_1SP"],PARAMETER["semi_minor", 6378137.0],PARAMETER["latitude_of_origin", 0.0],PARAMETER["central_meridian", 0.0],PARAMETER["scale_factor", 1.0],PARAMETER["false_easting", 0.0],PARAMETER["false_northing", 0.0],UNIT["m", 1.0],AXIS["Easting", EAST],AXIS["Northing", NORTH],AUTHORITY["EPSG","900913"]]

core/src/main/resources/mapfish-cli-spring-application-context.xml

@@ -6,4 +6,4 @@
     <bean id="servletContext" class="org.mapfish.print.cli.CliServletContext"/>
     <bean id="main" class="org.mapfish.print.cli.Main"/>
 
-</beans>
+</beans>

core/src/main/resources/mapfish-spring-security.xml

@@ -36,4 +36,4 @@
             </user-service>
         </authentication-provider>
     </authentication-manager>
-</beans:beans>
+</beans:beans>

core/src/main/resources/org/mapfish/print/map/renderers/svgZoomOut.xsl

@@ -52,4 +52,4 @@
     <xsl:template match="text()">
         <xsl:value-of select="." />
     </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

core/src/main/resources/org/mapfish/print/processor/map/License.md

@@ -1,2 +1,2 @@
 The north arrow graphic 'NorthArrow_10.svg' was borrowed from QGIS:
-https://github.com/qgis/QGIS/tree/d1cdc2085c/images/svg/arrows/
+https://github.com/qgis/QGIS/tree/d1cdc2085c/images/svg/arrows/

core/src/main/webapp/WEB-INF/mapfish-print-printer-factory.xml

@@ -5,4 +5,4 @@
     <bean id="mapPrinterFactory" class="org.mapfish.print.servlet.ServletMapPrinterFactory">
         <property name="appsRootDirectory" value="servlet:///print-apps" />
     </bean>
-</beans>
+</beans>

core/src/scripts/print

@@ -161,4 +161,4 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $MAPFISH_PRINT_V_OPTS
 
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.mapfish.print.cli.Main "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.mapfish.print.cli.Main "$@"

core/src/scripts/print.bat

@@ -87,4 +87,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java

@@ -63,4 +63,4 @@ public void testAllPrintClientConfig() throws Exception {
 
         // no exception... good
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java

@@ -66,4 +66,4 @@ public void testParseRequest() throws Exception {
         assertEquals(3, table1.data[1].size());
         assertEquals(4, table2.data[0].size());
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/FeaturesAttributeTest.java

@@ -4,4 +4,4 @@ public class FeaturesAttributeTest extends AbstractAttributeTest {
     protected FeaturesAttribute createAttribute() {
         return new FeaturesAttribute();
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/FloatAttributeTest.java

@@ -6,4 +6,4 @@ public class FloatAttributeTest extends AbstractAttributeTest {
     protected FloatAttribute createAttribute() {
         return new FloatAttribute();
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/HttpRequestHeadersAttributeTest.java

@@ -6,4 +6,4 @@ public class HttpRequestHeadersAttributeTest extends AbstractAttributeTest {
     protected Attribute createAttribute() {
         return new HttpRequestHeadersAttribute();
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/IntegerAttributeTest.java

@@ -6,4 +6,4 @@ public class IntegerAttributeTest extends AbstractAttributeTest {
     protected Attribute createAttribute() {
         return new IntegerAttribute();
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/LegendAttributeTest.java

@@ -6,4 +6,4 @@ public class LegendAttributeTest extends AbstractAttributeTest {
     protected Attribute createAttribute() {
         return new LegendAttribute();
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java

@@ -78,4 +78,4 @@ static class JsonArrayParamIllegal {
     }
     static class Empty {
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java

@@ -62,4 +62,4 @@ public void testWrongType() throws Exception {
     private PJsonObject loadJsonRequestData() throws IOException {
         return parseJSONObjectFromFile(StringArrayAttributeTest.class, BASE_DIR + "requestData.json");
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java

@@ -54,4 +54,4 @@ private PJsonObject loadJsonRequestData() throws IOException {
     private PJsonObject loadJsonRequestDataError() throws IOException {
         return parseJSONObjectFromFile(StringArrayAttributeTest.class, BASE_DIR + "requestDataError.json");
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/TableAttributeTest.java

@@ -6,4 +6,4 @@ public class TableAttributeTest extends AbstractAttributeTest {
     protected Attribute createAttribute() {
         return new TableAttribute();
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/map/BasicMapAttributeTest.java

@@ -13,4 +13,4 @@ protected Attribute createAttribute() {
         mapAttribute.setMaxDpi(1232.0);
         return mapAttribute;
     }
-}
+}

core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java

@@ -138,4 +138,4 @@ private void assertEmbedded(JSONObject required, boolean hasDefault, String attN
     }
 
 
-}
+}

core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java

@@ -34,4 +34,4 @@ public void testMarshalUnmarshal() throws Exception {
         }
     }
 
-}
+}

core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java

@@ -9,4 +9,4 @@ public void testAssertAccess() throws Exception {
         // as long as not error then we are good
         AlwaysAllowAssertion.INSTANCE.assertAccess("blah", this);
     }
-}
+}

core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java

@@ -69,4 +69,4 @@ public void testMarshalUnmarshal() throws Exception {
         }
 
     }
-}
+}

core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java

@@ -152,4 +152,4 @@ public void testValidate() throws Exception {
         assertion.validate(errors, null);
         assertEquals(0, errors.size());
     }
-}
+}

core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java

@@ -164,4 +164,4 @@ public void testCreateRequestIllegalFile() throws Exception {
 
         request.execute();
     }
-}
+}

core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java

@@ -140,4 +140,4 @@ public void handle(HttpExchange httpExchange) throws IOException {
         final String target = "https://" + HttpProxyTest.LOCALHOST + ":" + HTTPS_PROXY_PORT;
         HttpProxyTest.assertCorrectResponse(this.configurationFactory, this.requestFactory, credential, message, target, path);
     }
-}
+}

core/src/test/java/org/mapfish/print/http/HttpProxyTest.java

@@ -321,4 +321,4 @@ public void configure(HttpsParameters params) {
 
         return httpsServer;
     }
-}
+}

core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl_ResponseTest.java

@@ -58,4 +58,4 @@ public void handle(HttpExchange httpExchange) throws IOException {
         final ClientHttpResponse response = request.execute();
         assertEquals("application/json; charset=utf8", response.getHeaders().getFirst("Content-Type"));
     }
-}
+}

core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java

@@ -214,4 +214,4 @@ public boolean apply(@Nullable File input) {
             }
         });
     }
-}
+}

core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java

@@ -107,4 +107,4 @@ public void testParseSpacingAndOrigin() throws Exception {
     }
 
 
-}
+}

core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java

@@ -131,4 +131,4 @@ public void testMakeWmsGetLayerRequestDpiGeoServerAdd() throws Exception {
         final String mapResolution = finalParams.get("format_options").iterator().next();
         assertEquals("antialiasing:on;dpi:300", mapResolution);
     }
-}
+}

core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java

@@ -31,4 +31,4 @@ public void testToColor() throws Exception {
     public void testToRGB() {
         assertEquals("rgb(1, 2, 3)", ColorParser.toRGB(ColorParser.toColor("rgb(1, 2, 3)")));
     }
-}
+}

core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java

@@ -26,4 +26,4 @@ public void testResolveAllValues() throws Exception {
         assertEquals("${doesNotExist}", updated.get("val5"));
     }
 
-}
+}

core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java

@@ -83,4 +83,4 @@ public static PJsonObject loadJsonRequestData() throws IOException {
     public static PJsonObject loadTableJsonRequestData() throws IOException {
         return parseJSONObjectFromFile(JasperReportOutputFormatSimpleMapTest.class, TABLE_BASE_DIR + "requestData.json");
     }
-}
+}

core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java

@@ -144,4 +144,4 @@ private void assertAllMethodsCalled(PDFConfig pdfConfigSpy) {
     public static PJsonObject loadJsonRequestData() throws IOException {
         return parseJSONObjectFromFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR + "requestData.json");
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java

@@ -169,4 +169,4 @@ private void assertNumErrors(Map<String, Object> attributeMap, int expectedNumEr
         pdfConfigurationProcessor.validate(errors, configuration);
         assertEquals(expectedNumErrors, errors.size());
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java

@@ -61,4 +61,4 @@ private void notMatching(TestParam values) throws Exception {
             assertEquals(0, request.getHeaders().size());
         }
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java

@@ -66,4 +66,4 @@ public Void execute(TestParam values, ExecutionContext context) throws Exception
             return null;
         }
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java

@@ -48,4 +48,4 @@ public Void execute(TestParam values, ExecutionContext context) throws Exception
             return null;
         }
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java

@@ -92,4 +92,4 @@ private RestrictUrisProcessor createDenyInternal() {
         processor.setMatchers(matchers);
         return processor;
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java

@@ -115,4 +115,4 @@ private void testImplicitPortMapping(TestParam values) throws IOException, URISy
             assertEquals(fragment, request.getURI().getFragment());
         }
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java

@@ -16,4 +16,4 @@ public void testAccepts() throws Exception {
         assertMatch(matcher, true, new URI("http://www.camptocamp.com"), HttpMethod.GET);
         assertMatch(matcher, true, new URI("http://www.camptocamp.com"), HttpMethod.POST);
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java

@@ -54,4 +54,4 @@ public void testAccepts() throws Exception {
         assertMatch(addressHostMatcher, false, new URI("http://127.0.0.1:8080/print/"), HttpMethod.GET);
         assertMatch(addressHostMatcher, false, new URI("http://127.0.0.1:8080/pdf"), HttpMethod.GET);
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java

@@ -52,4 +52,4 @@ public void testAccepts() throws Exception {
         assertMatch(dnsHostMatcher, false, new URI("http://www.camptocamp.com:80/print"), HttpMethod.GET);
         assertMatch(dnsHostMatcher, false, new URI("http://www.camptocamp.com:80"), HttpMethod.GET);
     }
-}
+}

core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java

@@ -69,4 +69,4 @@ public void testLoopback() throws URISyntaxException, SocketException, UnknownHo
     }
 
 
-}
+}