Skip to content

Commit dfcc465

Browse files
committed
Rename sharpen configs to work with jar exclusion
DEVSIX-8853
1 parent ad7ff4b commit dfcc465

File tree

32 files changed

+40
-75
lines changed

32 files changed

+40
-75
lines changed

barcodes/src/sharpenconfig/java/com/itextpdf/barcodes/SharpenMapping.java renamed to barcodes/src/sharpenconfig/java/com/itextpdf/barcodes/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 15;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.barcodes.SharpenMapping
1+
com.itextpdf.barcodes.SharpenConfigMapping

bouncy-castle-adapter/src/sharpenconfig/java/com/itextpdf/bouncycastle/SharpenMapping.java renamed to bouncy-castle-adapter/src/sharpenconfig/java/com/itextpdf/bouncycastle/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 15;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.bouncycastle.SharpenMapping
1+
com.itextpdf.bouncycastle.SharpenConfigMapping

bouncy-castle-connector/src/sharpenconfig/java/com/itextpdf/bouncycastleconnector/SharpenMapping.java renamed to bouncy-castle-connector/src/sharpenconfig/java/com/itextpdf/bouncycastleconnector/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 16;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.bouncycastleconnector.SharpenMapping
1+
com.itextpdf.bouncycastleconnector.SharpenConfigMapping

bouncy-castle-fips-adapter/src/sharpenconfig/java/com/itextpdf/bouncycastlefips/SharpenMapping.java renamed to bouncy-castle-fips-adapter/src/sharpenconfig/java/com/itextpdf/bouncycastlefips/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This file is part of the iText (R) project.
3333
import java.util.Collections;
3434
import java.util.List;
3535

36-
public class SharpenMapping implements MappingConfiguration {
36+
public class SharpenConfigMapping implements MappingConfiguration {
3737
@Override
3838
public int getMappingPriority() {
3939
return 15;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.bouncycastlefips.SharpenMapping
1+
com.itextpdf.bouncycastlefips.SharpenConfigMapping

commons/src/sharpenconfig/java/com/itextpdf/commons/SharpenMapping.java renamed to commons/src/sharpenconfig/java/com/itextpdf/commons/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This file is part of the iText (R) project.
3333
import sharpen.config.ModulesConfigurator;
3434
import sharpen.config.OptionsConfigurator;
3535

36-
public class SharpenMapping implements MappingConfiguration {
36+
public class SharpenConfigMapping implements MappingConfiguration {
3737
@Override
3838
public int getMappingPriority() {
3939
return 15;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.commons.SharpenMapping
1+
com.itextpdf.commons.SharpenConfigMapping

forms/src/sharpenconfig/java/com/itextpdf/forms/SharpenMapping.java renamed to forms/src/sharpenconfig/java/com/itextpdf/forms/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 15;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.forms.SharpenMapping
1+
com.itextpdf.forms.SharpenConfigMapping

io/src/sharpenconfig/java/com/itextpdf/io/SharpenMapping.java renamed to io/src/sharpenconfig/java/com/itextpdf/io/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This file is part of the iText (R) project.
3333
import sharpen.config.ModulesConfigurator;
3434
import sharpen.config.OptionsConfigurator;
3535

36-
public class SharpenMapping implements MappingConfiguration {
36+
public class SharpenConfigMapping implements MappingConfiguration {
3737
@Override
3838
public int getMappingPriority() {
3939
return 17;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.io.SharpenMapping
1+
com.itextpdf.io.SharpenConfigMapping

kernel/src/sharpenconfig/java/com/itextpdf/kernel/ITextSharpCustomMembers.java renamed to kernel/src/sharpenconfig/java/com/itextpdf/kernel/SharpenConfigCustomMembers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.kernel;
2424

25-
public class ITextSharpCustomMembers {
25+
public class SharpenConfigCustomMembers {
2626
public static final String enumeratorToList;
2727
public static final String deviceRgbDrawingConstructor;
2828
public static final String encryptionPropertiesRandomBytes;

kernel/src/sharpenconfig/java/com/itextpdf/kernel/SharpenMapping.java renamed to kernel/src/sharpenconfig/java/com/itextpdf/kernel/SharpenConfigMapping.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This file is part of the iText (R) project.
3434
import java.util.Collections;
3535
import java.util.List;
3636

37-
public class SharpenMapping implements MappingConfiguration {
37+
public class SharpenConfigMapping implements MappingConfiguration {
3838
@Override
3939
public int getMappingPriority() {
4040
return 18;
@@ -142,12 +142,12 @@ public void applyMappingConfiguration(MappingConfigurator configurator) {
142142
configurator.removeMethod("com.itextpdf.kernel.xmp.properties.XMPPropertyInfo.getValue");
143143
configurator.removeMethod("com.itextpdf.kernel.xmp.properties.XMPPropertyInfo.getOptions");
144144
configurator.mapMethod("com.itextpdf.kernel.xmp.impl.Utils.normalizeLangValue", "iText.Kernel.XMP.Impl.Utils.NormalizeLangValue");
145-
configurator.mapMethodToCustomMember("com.itextpdf.kernel.pdf.canvas.PdfCanvas.iteratorToList", "EnumeratorToList", ITextSharpCustomMembers.enumeratorToList);
146-
configurator.mapMethodToCustomMember("com.itextpdf.kernel.pdf.EncryptionProperties.randomBytes", "RandomBytes", ITextSharpCustomMembers.encryptionPropertiesRandomBytes);
145+
configurator.mapMethodToCustomMember("com.itextpdf.kernel.pdf.canvas.PdfCanvas.iteratorToList", "EnumeratorToList", SharpenConfigCustomMembers.enumeratorToList);
146+
configurator.mapMethodToCustomMember("com.itextpdf.kernel.pdf.EncryptionProperties.randomBytes", "RandomBytes", SharpenConfigCustomMembers.encryptionPropertiesRandomBytes);
147147
configurator.addCustomUsingDeclaration("com.itextpdf.kernel.pdf.EncryptionProperties", Arrays.asList("System.Security.Cryptography"));
148148
configurator.mapVariableType("com.itextpdf.kernel.colors.DeviceRgbTest.colorByAWTColorTest.color", "System.Drawing.Color");
149-
configurator.mapMethodToCustomMember("com.itextpdf.kernel.geom.Rectangle.clone", "Clone", ITextSharpCustomMembers.cloneRectangle);
150-
configurator.mapMethodToCustomMember("com.itextpdf.kernel.geom.AffineTransform.clone", "Clone", ITextSharpCustomMembers.cloneAffineTransform);
149+
configurator.mapMethodToCustomMember("com.itextpdf.kernel.geom.Rectangle.clone", "Clone", SharpenConfigCustomMembers.cloneRectangle);
150+
configurator.mapMethodToCustomMember("com.itextpdf.kernel.geom.AffineTransform.clone", "Clone", SharpenConfigCustomMembers.cloneAffineTransform);
151151

152152
}
153153

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.kernel.SharpenMapping
1+
com.itextpdf.kernel.SharpenConfigMapping

layout/src/sharpenconfig/java/com/itextpdf/layout/ITextSharpCustomMembers.java renamed to layout/src/sharpenconfig/java/com/itextpdf/layout/SharpenConfigCustomMembers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This file is part of the iText (R) project.
2222
*/
2323
package com.itextpdf.layout;
2424

25-
public class ITextSharpCustomMembers {
25+
public class SharpenConfigCustomMembers {
2626
public static final String getTypographyClass;
2727
public static final String cloneLayoutArea;
2828
public static final String cloneMarginsCollapse;

layout/src/sharpenconfig/java/com/itextpdf/layout/SharpenMapping.java renamed to layout/src/sharpenconfig/java/com/itextpdf/layout/SharpenConfigMapping.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 15;
@@ -72,9 +72,9 @@ public void applyMappingConfiguration(MappingConfigurator configurator) {
7272
configurator.ignoreSuperInterface("java.lang.Cloneable", "com.itextpdf.layout.layout.LayoutArea");
7373
configurator.ignoreSuperInterface("java.lang.Cloneable", "com.itextpdf.layout.layout.RootLayoutArea");
7474
configurator.ignoreSuperInterface("java.lang.Cloneable", "com.itextpdf.layout.margincollapse.MarginsCollapse");
75-
configurator.mapMethodToCustomMember("com.itextpdf.layout.renderer.TypographyUtils.getTypographyClass", "GetTypographyClass", ITextSharpCustomMembers.getTypographyClass);
76-
configurator.mapMethodToCustomMember("com.itextpdf.layout.layout.LayoutArea.clone", "Clone", ITextSharpCustomMembers.cloneLayoutArea);
77-
configurator.mapMethodToCustomMember("com.itextpdf.layout.margincollapse.MarginsCollapse.clone", "Clone", ITextSharpCustomMembers.cloneMarginsCollapse);
75+
configurator.mapMethodToCustomMember("com.itextpdf.layout.renderer.TypographyUtils.getTypographyClass", "GetTypographyClass", SharpenConfigCustomMembers.getTypographyClass);
76+
configurator.mapMethodToCustomMember("com.itextpdf.layout.layout.LayoutArea.clone", "Clone", SharpenConfigCustomMembers.cloneLayoutArea);
77+
configurator.mapMethodToCustomMember("com.itextpdf.layout.margincollapse.MarginsCollapse.clone", "Clone", SharpenConfigCustomMembers.cloneMarginsCollapse);
7878
}
7979

8080
@Override
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.layout.SharpenMapping
1+
com.itextpdf.layout.SharpenConfigMapping

pdfa/src/sharpenconfig/java/com/itextpdf/pdfa/SharpenMapping.java renamed to pdfa/src/sharpenconfig/java/com/itextpdf/pdfa/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 15;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.pdfa.SharpenMapping
1+
com.itextpdf.pdfa.SharpenConfigMapping

pdfua/src/sharpenconfig/java/com/itextpdf/pdfua/SharpenMapping.java renamed to pdfua/src/sharpenconfig/java/com/itextpdf/pdfua/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 12;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.pdfua.SharpenMapping
1+
com.itextpdf.pdfua.SharpenConfigMapping

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
<!-- svg -->
324324
<sourceFileExclude>com/itextpdf/svg/utils/SvgCoordinateUtils.java</sourceFileExclude>
325325
<!-- sharpen mapping -->
326-
<sourceFileExclude>**/SharpenMapping.java</sourceFileExclude>
326+
<sourceFileExclude>**/sharpenconfig/**</sourceFileExclude>
327327
</sourceFileExcludes>
328328
<groups>
329329
<group>
@@ -845,7 +845,7 @@
845845
<phase>package</phase>
846846
<configuration>
847847
<excludes>
848-
<exclude>**/SharpenMapping.class</exclude>
848+
<exclude>**/SharpenConfig*.class</exclude>
849849
<exclude>**/sharpen.config.MappingConfiguration</exclude>
850850
</excludes>
851851
</configuration>
@@ -859,7 +859,7 @@
859859
<configuration>
860860
<classifier>sharpen-configuration</classifier>
861861
<includes>
862-
<include>**/SharpenMapping.class</include>
862+
<include>**/SharpenConfig*.class</include>
863863
<include>**/sharpen.config.MappingConfiguration</include>
864864
</includes>
865865
</configuration>

sign/src/sharpenconfig/java/com/itextpdf/signatures/SharpenMapping.java renamed to sign/src/sharpenconfig/java/com/itextpdf/signatures/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This file is part of the iText (R) project.
3333
import java.util.Collections;
3434
import java.util.List;
3535

36-
public class SharpenMapping implements MappingConfiguration {
36+
public class SharpenConfigMapping implements MappingConfiguration {
3737
@Override
3838
public int getMappingPriority() {
3939
return 12;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.signatures.SharpenMapping
1+
com.itextpdf.signatures.SharpenConfigMapping

styled-xml-parser/src/sharpenconfig/java/com/itextpdf/styledxmlparser/ITextSharpCustomMembers.java

-35
This file was deleted.

styled-xml-parser/src/sharpenconfig/java/com/itextpdf/styledxmlparser/SharpenMapping.java renamed to styled-xml-parser/src/sharpenconfig/java/com/itextpdf/styledxmlparser/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This file is part of the iText (R) project.
3333
import sharpen.config.ModulesConfigurator;
3434
import sharpen.config.OptionsConfigurator;
3535

36-
public class SharpenMapping implements MappingConfiguration {
36+
public class SharpenConfigMapping implements MappingConfiguration {
3737
@Override
3838
public int getMappingPriority() {
3939
return 15;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.styledxmlparser.SharpenMapping
1+
com.itextpdf.styledxmlparser.SharpenConfigMapping

svg/src/sharpenconfig/java/com/itextpdf/svg/SharpenMapping.java renamed to svg/src/sharpenconfig/java/com/itextpdf/svg/SharpenConfigMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This file is part of the iText (R) project.
3232
import sharpen.config.ModulesConfigurator;
3333
import sharpen.config.OptionsConfigurator;
3434

35-
public class SharpenMapping implements MappingConfiguration {
35+
public class SharpenConfigMapping implements MappingConfiguration {
3636
@Override
3737
public int getMappingPriority() {
3838
return 11;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
com.itextpdf.svg.SharpenMapping
1+
com.itextpdf.svg.SharpenConfigMapping

0 commit comments

Comments
 (0)