Skip to content

Commit

Permalink
Couple fixes
Browse files Browse the repository at this point in the history
- FTP encoding fix - was using ascii by default
- Handle NPE for snap apps
  • Loading branch information
sree-cfa committed Jan 25, 2024
1 parent 450db8d commit 8cbf24a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/main/java/org/ladocuploader/app/cli/FtpsClientImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.commons.net.ftp.FTPSClient;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -50,6 +51,7 @@ public void uploadFile(String zipFilename, byte[] data) throws IOException {
ftp.execPBSZ(0);
ftp.execPROT("P");
ftp.enterLocalPassiveMode();
ftp.setFileType(FTP.BINARY_FILE_TYPE);
ftp.pasv();
InputStream local = new ByteArrayInputStream(data);
boolean isComplete = ftp.storeFile(zipFilename, local);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package org.ladocuploader.app.preparers;

import static java.util.Collections.emptyList;

import formflow.library.data.Submission;
import formflow.library.pdf.PdfMap;
import formflow.library.pdf.SingleField;
import formflow.library.pdf.SubmissionField;
import formflow.library.pdf.SubmissionFieldPreparer;
import org.springframework.stereotype.Component;

import java.util.HashMap;
import java.util.Map;
import org.springframework.stereotype.Component;

@Component
public class ExpeditedSnapPreparer implements SubmissionFieldPreparer {
Expand All @@ -18,7 +17,7 @@ public class ExpeditedSnapPreparer implements SubmissionFieldPreparer {
public Map<String, SubmissionField> prepareSubmissionFields(Submission submission, PdfMap pdfMap) {
Map<String, SubmissionField> results = new HashMap<>();

String isEligibleForExpeditedSnap = submission.getInputData().get("isEligibleForExpeditedSnap").toString();
var isEligibleForExpeditedSnap = submission.getInputData().getOrDefault("isEligibleForExpeditedSnap", "false");
if (isEligibleForExpeditedSnap.equals("true")) {
String householdIncomeLast30Days = submission.getInputData().getOrDefault("householdIncomeLast30Days", "0").toString();
results.put("expeditedSnapIncome", new SingleField("expeditedSnapIncome", householdIncomeLast30Days, null));
Expand Down

0 comments on commit 8cbf24a

Please sign in to comment.