Skip to content

ES-75: Added apache pdfbox in reg-client #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release-1.3.x
Choose a base branch
from
Open

ES-75: Added apache pdfbox in reg-client #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions registration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<mosip.core.kernel.version>1.3.0-beta.2</mosip.core.kernel.version>
<mosip.biometric.util.version>1.3.0-beta.1</mosip.biometric.util.version>
<mosip.commons.packet.manager.version>1.3.0-beta.1</mosip.commons.packet.manager.version>
<mosip.kernel.pdfgenerator.version>1.3.0-SNAPSHOT</mosip.kernel.pdfgenerator.version>
<mosip.kernel.virusscanner.version>1.1.3</mosip.kernel.virusscanner.version>

<!-- -->
Expand Down Expand Up @@ -292,8 +293,8 @@
</dependency>
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-pdfgenerator-itext</artifactId>
<version>${mosip.core.kernel.version}</version>
<artifactId>kernel-pdfgenerator</artifactId>
<version>${mosip.kernel.pdfgenerator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Expand Down
2 changes: 1 addition & 1 deletion registration/registration-services/src/main/java/io/mosip/registration/config/AppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"io.mosip.kernel.idvalidator", "io.mosip.kernel.ridgenerator", "io.mosip.kernel.qrcode",
"io.mosip.kernel.crypto", "io.mosip.kernel.jsonvalidator", "io.mosip.kernel.idgenerator",
"io.mosip.kernel.virusscanner", "io.mosip.kernel.transliteration", "io.mosip.kernel.applicanttype",
"io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.itext.impl",
"io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.impl",
"io.mosip.kernel.idobjectvalidator.impl", "io.mosip.kernel.biosdk.provider.impl",
"io.mosip.kernel.biosdk.provider.factory", "io.mosip.commons.packet",
"io.mosip.registration.api.config" })
Expand Down
270 changes: 130 additions & 140 deletions ...tration-services/src/test/java/io/mosip/registration/bio/service/test/BioServiceTest.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../registration-services/src/test/java/io/mosip/registration/test/config/TestDaoConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"io.mosip.kernel.idvalidator", "io.mosip.kernel.ridgenerator", "io.mosip.kernel.qrcode",
"io.mosip.kernel.crypto", "io.mosip.kernel.jsonvalidator", "io.mosip.kernel.idgenerator",
"io.mosip.kernel.virusscanner", "io.mosip.kernel.transliteration", "io.mosip.kernel.applicanttype",
"io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.itext.impl",
"io.mosip.kernel.core.pdfgenerator.spi", "io.mosip.kernel.pdfgenerator.impl",
"io.mosip.kernel.idobjectvalidator.impl", "io.mosip.kernel.biosdk.provider.impl",
"io.mosip.kernel.biosdk.provider.factory", "io.mosip.commons.packet",
"io.mosip.registration.api.config"})
Expand Down
3 changes: 0 additions & 3 deletions ...ion-services/src/test/java/io/mosip/registration/test/template/TemplateGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

import com.hazelcast.spi.impl.eventservice.impl.Registration;

import io.mosip.biometrics.util.iris.IrisDecoder;
import io.mosip.kernel.core.qrcodegenerator.spi.QrCodeGenerator;
import io.mosip.kernel.core.templatemanager.spi.TemplateManagerBuilder;
Expand Down
2 changes: 0 additions & 2 deletions ...ervices/src/test/java/io/mosip/registration/test/update/ClientIntegrityValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

import com.itextpdf.text.pdf.hyphenation.TernaryTree.Iterator;

import io.mosip.kernel.core.util.FileUtils;
import io.mosip.kernel.core.util.HMACUtils2;
import io.mosip.registration.context.ApplicationContext;
Expand Down
7 changes: 2 additions & 5 deletions ...n-services/src/test/java/io/mosip/registration/test/update/SoftwareUpdateHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.jar.Attributes;
import java.util.jar.Manifest;

import io.mosip.kernel.core.exception.IOException;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
Expand All @@ -28,8 +29,6 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.test.util.ReflectionTestUtils;

import com.itextpdf.io.IOException;

import io.mosip.kernel.core.util.FileUtils;
import io.mosip.registration.constants.RegistrationConstants;
import io.mosip.registration.context.ApplicationContext;
Expand Down Expand Up @@ -138,9 +137,7 @@ public void updateDerbyDBRollBackTest() throws Exception {
Mockito.when(ApplicationContext.getStringValueFromApplicationMap(Mockito.anyString())).thenReturn("1.2.0-SNAPSHOT");
Mockito.when(ApplicationContext.getStringValueFromApplicationMap(RegistrationConstants.SOFTWARE_BACKUP_FOLDER)).thenReturn("src/test/resources/sql");
Mockito.doNothing().when(globalParamService).update(Mockito.anyString(), Mockito.anyString());
Mockito.doThrow(IOException.class).when(jdbcTemplate).execute("----- create new tables\n" +
" \n" +
" CREATE TABLE \"REG\".\"LOC_HIERARCHY_LIST\"(\"HIERARCHY_LEVEL\" INTEGER NOT NULL, \"HIERARCHY_LEVEL_NAME\" VARCHAR(36) NOT NULL, \"LANG_CODE\" VARCHAR(3) NOT NULL, \"IS_ACTIVE\" BOOLEAN NOT NULL, \"CR_BY\" VARCHAR(256) NOT NULL, \"CR_DTIMES\" TIMESTAMP NOT NULL, \"UPD_BY\" VARCHAR(256), \"UPD_DTIMES\" TIMESTAMP)");
Mockito.doThrow(new RuntimeException("Database update failed")).when(jdbcTemplate).execute(Mockito.anyString());
PowerMockito.doNothing().when(FileUtils.class, "copyDirectory", Mockito.any(File.class), Mockito.any(File.class));
File backUpFile = new File("src/test/resources/sql");
PowerMockito.doNothing().when(FileUtils.class, "copyFile", new File(backUpFile.getAbsolutePath() + "/MANIFEST.MF"), new File("MANIFEST.MF"));
Expand Down
2 changes: 0 additions & 2 deletions registration/registration-test/src/main/java/registrationtest/pages/UploadPacketPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import javafx.scene.control.TextField;
import registrationtest.controls.Alerts;

//import com.itextpdf.text.log.SysoCounter;

import registrationtest.utility.PropertiesUtil;
import registrationtest.utility.RobotActions;
import registrationtest.utility.WaitsUtil;
Expand Down