Skip to content

Commit 62a3912

Browse files
Apply pre-commit fix
From the artifact of the previous workflow run
1 parent b1ff8f0 commit 62a3912

File tree

77 files changed

+105
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+105
-105
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.mapfish.print;
22

3+
import jakarta.annotation.Nonnull;
34
import java.io.ByteArrayInputStream;
45
import java.io.File;
56
import java.io.IOException;
@@ -10,7 +11,6 @@
1011
import java.util.Set;
1112
import java.util.SortedSet;
1213
import java.util.TreeSet;
13-
import jakarta.annotation.Nonnull;
1414
import org.json.JSONException;
1515
import org.json.JSONObject;
1616
import org.json.JSONWriter;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.mapfish.print;
22

3+
import jakarta.annotation.Nullable;
4+
import jakarta.annotation.PostConstruct;
5+
import jakarta.servlet.ServletContext;
36
import java.io.FileInputStream;
47
import java.io.FileNotFoundException;
58
import java.io.IOException;
69
import java.io.InputStream;
710
import java.util.jar.Attributes;
811
import java.util.jar.Manifest;
9-
import jakarta.annotation.Nullable;
10-
import jakarta.annotation.PostConstruct;
11-
import jakarta.servlet.ServletContext;
1212
import org.slf4j.Logger;
1313
import org.slf4j.LoggerFactory;
1414
import org.springframework.beans.factory.annotation.Autowired;

core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.mapfish.print.attribute;
22

3+
import jakarta.annotation.Nonnull;
4+
import jakarta.annotation.Nullable;
35
import java.util.HashMap;
46
import java.util.List;
57
import java.util.Map;
6-
import jakarta.annotation.Nonnull;
7-
import jakarta.annotation.Nullable;
88
import org.json.JSONException;
99
import org.json.JSONWriter;
1010
import org.mapfish.print.PrintException;

core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.mapfish.print.attribute;
22

3+
import jakarta.annotation.Nonnull;
34
import java.io.ByteArrayInputStream;
45
import java.nio.charset.StandardCharsets;
56
import java.util.List;
6-
import jakarta.annotation.Nonnull;
77
import net.sf.jasperreports.engine.JRException;
88
import net.sf.jasperreports.json.data.JsonDataSource;
99
import org.json.JSONException;

core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mapfish.print.attribute;
22

3-
import java.util.List;
43
import jakarta.annotation.Nonnull;
4+
import java.util.List;
55
import org.json.JSONException;
66
import org.json.JSONObject;
77
import org.json.JSONWriter;

core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import static org.mapfish.print.parser.MapfishParser.stringRepresentation;
44

55
import com.google.common.annotations.VisibleForTesting;
6+
import jakarta.annotation.Nonnull;
7+
import jakarta.annotation.PostConstruct;
68
import java.lang.reflect.Field;
79
import java.lang.reflect.InvocationTargetException;
810
import java.util.Collection;
@@ -11,8 +13,6 @@
1113
import java.util.Map;
1214
import java.util.Optional;
1315
import java.util.Set;
14-
import jakarta.annotation.Nonnull;
15-
import jakarta.annotation.PostConstruct;
1616
import org.json.JSONArray;
1717
import org.json.JSONException;
1818
import org.json.JSONObject;

core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.mapfish.print.attribute.map;
22

3+
import jakarta.annotation.Nonnull;
34
import java.io.ByteArrayInputStream;
45
import java.io.IOException;
56
import java.io.InputStream;
6-
import jakarta.annotation.Nonnull;
77
import org.geotools.api.feature.simple.SimpleFeature;
88
import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
99
import org.geotools.data.simple.SimpleFeatureCollection;

core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.mapfish.print.attribute.map;
22

3+
import jakarta.annotation.Nonnull;
34
import java.util.ArrayList;
45
import java.util.List;
56
import java.util.function.Function;
6-
import jakarta.annotation.Nonnull;
77
import org.geotools.api.referencing.FactoryException;
88
import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
99
import org.json.JSONArray;

core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.mapfish.print.attribute.map;
22

3+
import jakarta.annotation.Nonnull;
4+
import jakarta.annotation.Nullable;
35
import java.awt.Dimension;
46
import java.awt.Rectangle;
57
import java.awt.geom.AffineTransform;
68
import java.awt.geom.Rectangle2D;
7-
import jakarta.annotation.Nonnull;
8-
import jakarta.annotation.Nullable;
99
import org.geotools.geometry.jts.ReferencedEnvelope;
1010
import org.mapfish.print.FloatingPointUtil;
1111
import org.mapfish.print.map.Scale;

core/src/main/java/org/mapfish/print/cli/CliServletContext.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package org.mapfish.print.cli;
22

3-
import java.io.InputStream;
4-
import java.net.URL;
5-
import java.util.Enumeration;
6-
import java.util.EventListener;
7-
import java.util.Map;
8-
import java.util.Set;
93
import jakarta.servlet.Filter;
104
import jakarta.servlet.FilterRegistration;
115
import jakarta.servlet.RequestDispatcher;
@@ -15,6 +9,12 @@
159
import jakarta.servlet.SessionCookieConfig;
1610
import jakarta.servlet.SessionTrackingMode;
1711
import jakarta.servlet.descriptor.JspConfigDescriptor;
12+
import java.io.InputStream;
13+
import java.net.URL;
14+
import java.util.Enumeration;
15+
import java.util.EventListener;
16+
import java.util.Map;
17+
import java.util.Set;
1818

1919
/**
2020
* An essentially non-functional servlet context that is used by the CLI application to satisfy the

0 commit comments

Comments
 (0)