Skip to content

Commit

Permalink
Add CSVLoaderNewSearch jar and refine Java formatting
Browse files Browse the repository at this point in the history
Added the CSVLoaderNewSearch jar to the Dockerfile and updated the Maven build process in pom.xml to include its packaging. Additionally, cleaned up Java code formatting by removing an unnecessary semicolon and adjusting spacing for consistency. These changes enhance the ETL process and maintain code readability.
  • Loading branch information
Gcolon021 committed Dec 4, 2024
1 parent 4900506 commit 2dc5d21
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.io.Serializable;
import java.util.List;


@JsonInclude(JsonInclude.Include.NON_NULL)
public class ColumnMeta implements Serializable{
public class ColumnMeta implements Serializable {

private static final long serialVersionUID = -124111104912063811L;
private String name;
Expand Down
1 change: 1 addition & 0 deletions docker/pic-sure-hpds-etl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ RUN apk add --no-cache --purge -uU curl wget unzip gnupg openssl
ADD create_key.sh .
ADD SQLLoader-jar-with-dependencies.jar .
ADD CSVLoader-jar-with-dependencies.jar .
ADD CSVLoaderNewSearch-jar-with-dependencies.jar .
ADD CSVDumper-jar-with-dependencies.jar .
ADD VCFLocalLoader-jar-with-dependencies.jar .
ADD VariantMetadataLoader-jar-with-dependencies.jar .
Expand Down
20 changes: 20 additions & 0 deletions etl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,26 @@
<goal>single</goal>
</goals>
</execution>
<execution>
<id>buildCSVLoaderNewSearch</id>
<configuration>
<archive>
<manifest>
<mainClass>edu.harvard.hms.dbmi.avillach.hpds.etl.phenotype.CSVLoaderNewSearch</mainClass>
</manifest>
</archive>
<outputDirectory>${project.basedir}/../docker/pic-sure-hpds-etl</outputDirectory>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<classifier>CSVLoaderNewSearch</classifier>
<finalName>CSVLoaderNewSearch</finalName>
</configuration>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
<execution>
<id>buildCSVLoader</id>
<configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void dumpStats() {
*/
public void dumpStatsAndColumnMeta(String hpdsDirectory) {
try (ObjectInputStream objectInputStream =
new ObjectInputStream(new GZIPInputStream(new FileInputStream(hpdsDirectory + "columnMeta.javabin")));){
new ObjectInputStream(new GZIPInputStream(new FileInputStream(hpdsDirectory + "columnMeta.javabin")))){
TreeMap<String, ColumnMeta> metastore = (TreeMap<String, ColumnMeta>) objectInputStream.readObject();
try(BufferedWriter writer = Files.newBufferedWriter(Paths.get(hpdsDirectory + "columnMeta.csv"), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {
CSVPrinter printer = new CSVPrinter(writer, CSVFormat.DEFAULT);
Expand Down

0 comments on commit 2dc5d21

Please sign in to comment.