Skip to content

Commit

Permalink
Remove code related to pdfbox
Browse files Browse the repository at this point in the history
  • Loading branch information
e-zhavoronok authored and MaximPlusov committed Feb 21, 2025
1 parent ab36229 commit bb8cfab
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 408 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@ jobs:
with:
name: gui-report
path: gui/target/site/jacoco/
- name: Upload PDFBox coverage report
if: matrix.java-version == 8
uses: actions/upload-artifact@v4
with:
name: pdfbox-report
path: pdfbox-apps/target/site/jacoco/

coverage:
name: Quality Assurance
Expand All @@ -82,22 +76,17 @@ jobs:
with:
name: gui-report
path: gui/target/site/jacoco/
- name: Download PDFBox coverage report
uses: actions/download-artifact@v4
with:
name: pdfbox-report
path: pdfbox-apps/target/site/jacoco/
- name: Codecov coverage reporting
uses: codecov/codecov-action@v2
with:
files: greenfield-apps/target/site/jacoco/jacoco.xml, gui/target/site/jacoco/jacoco.xml, pdfbox-apps/target/site/jacoco/jacoco.xml
files: greenfield-apps/target/site/jacoco/jacoco.xml, gui/target/site/jacoco/jacoco.xml
fail_ci_if_error: true # optional (default = false)
verbose: true # optional (default = false)
token: ${{ secrets.CODECOV_TOKEN }}
- name: Codacy coverage reporting
uses: codacy/codacy-coverage-reporter-action@v1
with:
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
coverage-reports: greenfield-apps/target/site/jacoco/jacoco.xml, gui/target/site/jacoco/jacoco.xml, pdfbox-apps/target/site/jacoco/jacoco.xml
coverage-reports: greenfield-apps/target/site/jacoco/jacoco.xml, gui/target/site/jacoco/jacoco.xml
- name: Codacy analysis reporting
uses: codacy/codacy-analysis-cli-action@master
5 changes: 0 additions & 5 deletions gui/src/main/java/org/verapdf/apps/SoftwareUpdater.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ public interface SoftwareUpdater {
*/
public SemanticVersionNumber getLatestAppsVersion();

/**
* @return the latest available version of the PDFBox veraPDF apps package
*/
public SemanticVersionNumber getLatestPdfBoxAppsVersion();

/**
* @return true if there's a later version of the apps available
*/
Expand Down
8 changes: 1 addition & 7 deletions gui/src/main/java/org/verapdf/apps/SoftwareUpdaterImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
public class SoftwareUpdaterImpl implements SoftwareUpdater {
private static final Logger logger = Logger.getLogger(SoftwareUpdaterImpl.class.getCanonicalName());
private static final String latestGF = "https://search.maven.org/solrsearch/select?q=g:org.verapdf.apps+AND+a:greenfield-apps-arlington&core=gav&rows=1&wt=xml";
private static final String latestPDFBox = "https://search.maven.org/solrsearch/select?q=g:org.verapdf.apps+AND+a:pdfbox-apps&core=gav&rows=1&wt=xml";
private final String currentVersion = Applications.getAppDetails().getVersion();

/**
Expand Down Expand Up @@ -88,11 +87,6 @@ public SemanticVersionNumber getLatestAppsVersion() {
return getLatestVersionFromUrl(latestGF);
}

@Override
public SemanticVersionNumber getLatestPdfBoxAppsVersion() {
return getLatestVersionFromUrl(latestPDFBox);
}

@Override
public boolean isUpdateAvailable() {
return isUpdateAvailable(Applications.getAppDetails());
Expand Down Expand Up @@ -145,6 +139,6 @@ private static SemanticVersionNumber getLatestVersionFromUrl(final String endpoi
}

private static String getEndpointForVersion(final String versionString) {
return versionString.endsWith(Versions.PDFBOX_BUILD_INFO) ? latestPDFBox : latestGF;
return latestGF;
}
}
13 changes: 0 additions & 13 deletions gui/src/main/java/org/verapdf/cli/commands/VeraCliArgParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.verapdf.gui.utils.GUIConstants;
import org.verapdf.metadata.fixer.FixerFactory;
import org.verapdf.metadata.fixer.MetadataFixerConfig;
import org.verapdf.pdfa.Foundries;
import org.verapdf.pdfa.flavours.PDFAFlavour;
import org.verapdf.pdfa.validation.profiles.Profiles;
import org.verapdf.pdfa.validation.profiles.ValidationProfile;
Expand Down Expand Up @@ -743,14 +742,6 @@ public void checkParametersCompatibility() {
&& this.format != FormatOption.HTML && this.addLogs) {
LOGGER.log(Level.WARNING, "Log messages in report are supported only in xml (mrr), json and html formats.");
}
if (Foundries.defaultParserIsPDFBox() && this.fixMetadata) {
LOGGER.log(Level.WARNING, "Fixing metadata is not supported in PDFBox validator.");
this.fixMetadata = false;
}
if (Foundries.defaultParserIsPDFBox() && !this.disableErrorMessages) {
LOGGER.log(Level.WARNING, "Detailed error messages are not supported in PDFBox validator.");
this.disableErrorMessages = true;
}
if (this.fixMetadata && this.maxFailures > 0) {
LOGGER.log(Level.WARNING, "Option maxfailures is ignored when option fixmetadata is enabled");
this.maxFailures = -1;
Expand All @@ -759,10 +750,6 @@ public void checkParametersCompatibility() {
LOGGER.log(Level.WARNING, "Argument " + maxFailuresDisplayed + " of option maxfailuresdisplayed is not supported and changed to 1");
this.maxFailuresDisplayed = 1;
}
if (Foundries.defaultParserIsPDFBox() && this.password != null) {
LOGGER.log(Level.WARNING, "Password handling for encrypted files is not supported in PDFBox validator.");
this.password = null;
}
if (getPdfPaths().size() > 1 && this.password != null) {
LOGGER.log(Level.WARNING, "Password handling for encrypted files is not supported for batch processing.");
this.password = null;
Expand Down
16 changes: 4 additions & 12 deletions gui/src/main/java/org/verapdf/gui/CheckerPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.verapdf.apps.utils.ApplicationUtils;
import org.verapdf.core.utils.FileUtils;
import org.verapdf.gui.utils.*;
import org.verapdf.pdfa.Foundries;
import org.verapdf.pdfa.flavours.PDFAFlavour;
import org.verapdf.pdfa.flavours.PDFFlavours;
import org.verapdf.pdfa.flavours.PDFAFlavours;
Expand Down Expand Up @@ -321,12 +320,7 @@ private void setupProcessTypesBox(final GridBagLayout gbl, final GridBagConstrai
private void setupFixMetadataCheckBox(final GridBagLayout gbl, final GridBagConstraints gbc) {
this.fixMetadata = new JCheckBox(GUIConstants.FIX_METADATA_LABEL_TEXT);
this.fixMetadata.setHorizontalTextPosition(SwingConstants.LEFT);
if (Foundries.defaultParserIsPDFBox()) {
this.fixMetadata.setSelected(false);
this.fixMetadata.setEnabled(false);
} else {
this.fixMetadata.setSelected(false);
}
this.fixMetadata.setSelected(false);
setGridBagConstraintsParameters(gbc, GUIConstants.FIX_METADATA_CHECKBOX_CONSTRAINT_GRID_X,
GUIConstants.FIX_METADATA_CHECKBOX_CONSTRAINT_GRID_Y,
GUIConstants.FIX_METADATA_CHECKBOX_CONSTRAINT_WEIGHT_X,
Expand Down Expand Up @@ -530,17 +524,15 @@ public void actionPerformed(final ActionEvent e) {
ProcessType item = (ProcessType) CheckerPanel.this.processTypes.getSelectedItem();
switch (item) {
case VALIDATE:
updateEnabling(!Foundries.defaultParserIsPDFBox(), false);
case VALIDATE_EXTRACT:
updateEnabling(true, false);
break;
case EXTRACT:
CheckerPanel.this.fixMetadata.setSelected(false);
updateEnabling(false, false);
break;
case VALIDATE_EXTRACT:
updateEnabling(!Foundries.defaultParserIsPDFBox(), false);
break;
case POLICY:
updateEnabling(!Foundries.defaultParserIsPDFBox(), true);
updateEnabling(true, true);
break;
default:
break;
Expand Down
8 changes: 1 addition & 7 deletions gui/src/main/java/org/verapdf/gui/SettingsPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import javax.swing.border.EmptyBorder;

import org.verapdf.gui.utils.GUIConstants;
import org.verapdf.pdfa.Foundries;
import org.verapdf.pdfa.flavours.PDFAFlavour;
import org.verapdf.pdfa.validation.profiles.Profiles;
import org.verapdf.pdfa.validation.validators.ValidatorConfig;
Expand Down Expand Up @@ -274,12 +273,7 @@ boolean showDialog(Component parent, String title, ConfigManager settings) {
ValidatorConfig validatorConfig = settings.getValidatorConfig();
this.hidePassedRules.setSelected(validatorConfig.isRecordPasses());

if (Foundries.defaultParserIsPDFBox()) {
this.showErrorMessages.setSelected(false);
this.showErrorMessages.setEnabled(false);
} else {
this.showErrorMessages.setSelected(validatorConfig.showErrorMessages());
}
this.showErrorMessages.setSelected(validatorConfig.showErrorMessages());

this.logs.setSelected(validatorConfig.isLogsEnabled());

Expand Down
28 changes: 1 addition & 27 deletions installer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,7 @@
<profile>
<id>greenfield-apps</id>
<activation>
<property>
<name>!pdfbox.apps</name>
</property>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
Expand All @@ -330,30 +328,6 @@
</dependency>
</dependencies>
</profile>

<profile>
<id>pdfbox-apps</id>
<activation>
<property>
<name>pdfbox.apps</name>
</property>
</activation>
<properties>
<installer.zip.prefix>verapdf-pdfbox</installer.zip.prefix>
<installer.output.filename>verapdf-izpack-pdfbox-installer-${project.version}.jar</installer.output.filename>
<verapdf.apps.package>pdfbox-apps</verapdf.apps.package>
<verapdf.wrapper.gui>org.verapdf.apps.PdfBoxGuiWrapper</verapdf.wrapper.gui>
<verapdf.wrapper.cli>org.verapdf.apps.PdfBoxCliWrapper</verapdf.wrapper.cli>
<verapdf.apps.package.name>PDFBox</verapdf.apps.package.name>
</properties>
<dependencies>
<dependency>
<groupId>org.verapdf.apps</groupId>
<artifactId>pdfbox-apps</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
117 changes: 0 additions & 117 deletions pdfbox-apps/pom.xml

This file was deleted.

57 changes: 0 additions & 57 deletions pdfbox-apps/src/main/java/org/verapdf/apps/PdfBoxCliWrapper.java

This file was deleted.

Loading

0 comments on commit bb8cfab

Please sign in to comment.