Skip to content
This repository has been archived by the owner on Apr 12, 2019. It is now read-only.

Commit

Permalink
Merge pull request #131 from open-prevo/feature/35_hub_persistence
Browse files Browse the repository at this point in the history
Persistence of notifications sent from the hub
  • Loading branch information
mikaelkalt committed Jul 20, 2018
2 parents 6e4651b + b6b10ca commit 26f588c
Show file tree
Hide file tree
Showing 20 changed files with 458 additions and 302 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,6 @@ target/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
**/bin/

# OpenPrevo-DB
**/openprevo.mv.db
23 changes: 15 additions & 8 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,18 @@ task prepareHub(dependsOn: prepareHubDockerConfig, type: Copy) {
into "${buildDir}/demo/Hub"
doLast {
def javaCmd = "java -Dserver.port=8859 -Dopen.prevo.hub.config.file=file:demo-nodes.yml -jar ${project(":hub").bootJar.archiveName}"
def batFile = new File("${buildDir}/demo/Hub/start.bat")
batFile.text = javaCmd
batFile.executable = true
def shFile = new File("${buildDir}/demo/Hub/start.sh")
shFile.text = javaCmd
shFile.executable = true
def startBatFile = new File("${buildDir}/demo/Hub/start.bat")
startBatFile.text = javaCmd
startBatFile.executable = true
def cleanBatFile = new File("${buildDir}/demo/Hub/clean-db.bat")
cleanBatFile.text = 'del openprevo.mv.db'
cleanBatFile.executable = true
def startShFile = new File("${buildDir}/demo/Hub/start.sh")
startShFile.text = "#!/usr/bin/env bash\n${javaCmd}"
startShFile.executable = true
def cleanDbShFile = new File("${buildDir}/demo/Hub/clean-db.sh")
cleanDbShFile.text = '#!/usr/bin/env bash\nrm openprevo.mv.db'
cleanDbShFile.executable = true
}
}

Expand Down Expand Up @@ -73,11 +79,12 @@ def createTask(node) {
into "${buildDir}/demo/${node.name}"

doLast {
def javaCmd = getJavaCommandLineForNode(node)
def batFile = new File("${buildDir}/demo/${node.name}/start.bat")
batFile.text = getJavaCommandLineForNode(node)
batFile.text = javaCmd
batFile.executable = true
def shFile = new File("${buildDir}/demo/${node.name}/start.sh")
shFile.text = getJavaCommandLineForNode(node)
shFile.text = "#!/usr/bin/env bash\n${javaCmd}"
shFile.executable = true
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,119 +1,26 @@
package ch.prevo.open.encrypted.model;

import java.time.LocalDate;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

import java.time.LocalDate;

/**
* Matching notification sent to an OpenPrevo Node.
*/
public class MatchForCommencement {

private String encryptedOasiNumber;
private String retirementFundUid;
private String previousRetirementFundUid;
private LocalDate commencementDate;
private LocalDate terminationDate;

public MatchForCommencement() {}

public MatchForCommencement(String encryptedOasiNumber,
String retirementFundUid,
String previousRetirementFundUid,
LocalDate commencementDate,
LocalDate terminationDate) {
this.encryptedOasiNumber = encryptedOasiNumber;
this.retirementFundUid = retirementFundUid;
this.previousRetirementFundUid = previousRetirementFundUid;
this.commencementDate = commencementDate;
this.terminationDate = terminationDate;
}

public String getEncryptedOasiNumber() {
return encryptedOasiNumber;
}

public void setEncryptedOasiNumber(String encryptedOasiNumber) {
this.encryptedOasiNumber = encryptedOasiNumber;
}

public String getRetirementFundUid() {
return retirementFundUid;
}

public void setRetirementFundUid(String retirementFundUid) {
this.retirementFundUid = retirementFundUid;
}
public class MatchForCommencement extends MatchNotification {

public String getPreviousRetirementFundUid() {
return previousRetirementFundUid;
public MatchForCommencement() {
}

public void setPreviousRetirementFundUid(String previousRetirementFundUid) {
this.previousRetirementFundUid = previousRetirementFundUid;
}

public LocalDate getCommencementDate() {
return commencementDate;
}

public void setCommencementDate(LocalDate commencementDate) {
this.commencementDate = commencementDate;
}

public LocalDate getTerminationDate() {
return terminationDate;
}

public void setTerminationDate(LocalDate terminationDate) {
this.terminationDate = terminationDate;
public MatchForCommencement(String encryptedOasiNumber, String previousRetirementFundUid, String newRetirementFundUid, LocalDate commencementDate, LocalDate terminationDate) {
super(encryptedOasiNumber, previousRetirementFundUid, newRetirementFundUid, commencementDate, terminationDate);
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("encryptedOasiNumber", encryptedOasiNumber)
.append("retirementFundUid", retirementFundUid)
.append("previousRetirementFundUid", previousRetirementFundUid)
.append("commencementDate", commencementDate)
.append("terminationDate", terminationDate)
.appendSuper(super.toString())
.toString();
}

@Override
public boolean equals(Object o) {
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;

MatchForCommencement that = (MatchForCommencement) o;

if (encryptedOasiNumber != null ?
!encryptedOasiNumber.equals(that.encryptedOasiNumber) :
that.encryptedOasiNumber != null)
return false;
if (retirementFundUid != null ?
!retirementFundUid.equals(that.retirementFundUid) :
that.retirementFundUid != null)
return false;
if (previousRetirementFundUid != null ?
!previousRetirementFundUid.equals(that.previousRetirementFundUid) :
that.previousRetirementFundUid != null)
return false;
if (commencementDate != null ? !commencementDate.equals(that.commencementDate) : that.commencementDate != null)
return false;
return terminationDate != null ? terminationDate.equals(that.terminationDate) : that.terminationDate == null;
}

@Override
public int hashCode() {
int result = encryptedOasiNumber != null ? encryptedOasiNumber.hashCode() : 0;
result = 31 * result + (retirementFundUid != null ? retirementFundUid.hashCode() : 0);
result = 31 * result + (previousRetirementFundUid != null ? previousRetirementFundUid.hashCode() : 0);
result = 31 * result + (commencementDate != null ? commencementDate.hashCode() : 0);
result = 31 * result + (terminationDate != null ? terminationDate.hashCode() : 0);
return result;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package ch.prevo.open.encrypted.model;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

Expand All @@ -8,67 +10,19 @@
/**
* Matching notification sent to an OpenPrevo Node.
*/
public class MatchForTermination {
public class MatchForTermination extends MatchNotification {

private String encryptedOasiNumber;
private String previousRetirementFundUid;
private String newRetirementFundUid;
private LocalDate commencementDate;
private LocalDate terminationDate;
private EncryptedData transferInformation;


public MatchForTermination() {
}

public MatchForTermination(String encryptedOasiNumber, String previousRetirementFundUid, String newRetirementFundUid, LocalDate commencementDate, LocalDate terminationDate, EncryptedData transferInformation) {
this.encryptedOasiNumber = encryptedOasiNumber;
this.previousRetirementFundUid = previousRetirementFundUid;
this.newRetirementFundUid = newRetirementFundUid;
this.commencementDate = commencementDate;
this.terminationDate = terminationDate;
super(encryptedOasiNumber, previousRetirementFundUid, newRetirementFundUid, commencementDate, terminationDate);
this.transferInformation = transferInformation;
}

public String getEncryptedOasiNumber() {
return encryptedOasiNumber;
}

public void setEncryptedOasiNumber(String encryptedOasiNumber) {
this.encryptedOasiNumber = encryptedOasiNumber;
}

public String getPreviousRetirementFundUid() {
return previousRetirementFundUid;
}

public void setPreviousRetirementFundUid(String previousRetirementFundUid) {
this.previousRetirementFundUid = previousRetirementFundUid;
}

public String getNewRetirementFundUid() {
return newRetirementFundUid;
}

public void setNewRetirementFundUid(String newRetirementFundUid) {
this.newRetirementFundUid = newRetirementFundUid;
}

public LocalDate getCommencementDate() {
return commencementDate;
}

public void setCommencementDate(LocalDate commencementDate) {
this.commencementDate = commencementDate;
}

public LocalDate getTerminationDate() {
return terminationDate;
}

public void setTerminationDate(LocalDate terminationDate) {
this.terminationDate = terminationDate;
}

public EncryptedData getTransferInformation() {
return transferInformation;
}
Expand All @@ -77,62 +31,33 @@ public void setTransferInformation(EncryptedData transferInformation) {
this.transferInformation = transferInformation;
}

/**
* I.E. are all attributes except the encrypted transfer info equal
*/
public boolean isSameMatch(MatchForTermination that) {
if (this == that) return true;
if (that == null) return false;

if (encryptedOasiNumber != null ? !encryptedOasiNumber.equals(that.encryptedOasiNumber) : that.encryptedOasiNumber != null)
return false;
if (previousRetirementFundUid != null ? !previousRetirementFundUid.equals(that.previousRetirementFundUid) : that.previousRetirementFundUid != null)
return false;
if (newRetirementFundUid != null ? !newRetirementFundUid.equals(that.newRetirementFundUid) : that.newRetirementFundUid != null)
return false;
if (commencementDate != null ? !commencementDate.equals(that.commencementDate) : that.commencementDate != null) return false;
return terminationDate != null ? terminationDate.equals(that.terminationDate) : that.terminationDate == null;
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("encryptedOasiNumber", encryptedOasiNumber)
.append("previousRetirementFundUid", previousRetirementFundUid)
.append("newRetirementFundUid", newRetirementFundUid)
.append("commencementDate", commencementDate)
.append("terminationDate", terminationDate)
.append("transferInformation", transferInformation)
.toString();
}

@Override
public boolean equals(Object o) {
if (this == o) return true;

if (o == null || getClass() != o.getClass()) return false;

MatchForTermination that = (MatchForTermination) o;

if (encryptedOasiNumber != null ? !encryptedOasiNumber.equals(that.encryptedOasiNumber) : that.encryptedOasiNumber != null)
return false;
if (previousRetirementFundUid != null ? !previousRetirementFundUid.equals(that.previousRetirementFundUid) : that.previousRetirementFundUid != null)
return false;
if (newRetirementFundUid != null ? !newRetirementFundUid.equals(that.newRetirementFundUid) : that.newRetirementFundUid != null)
return false;
if (commencementDate != null ? !commencementDate.equals(that.commencementDate) : that.commencementDate != null) return false;
if (terminationDate != null ? !terminationDate.equals(that.terminationDate) : that.terminationDate != null) return false;
return transferInformation != null ? transferInformation.equals(that.transferInformation) : that.transferInformation == null;
return new EqualsBuilder()
.appendSuper(super.equals(o))
.append(transferInformation, that.transferInformation)
.isEquals();
}

@Override
public int hashCode() {
int result = encryptedOasiNumber != null ? encryptedOasiNumber.hashCode() : 0;
result = 31 * result + (previousRetirementFundUid != null ? previousRetirementFundUid.hashCode() : 0);
result = 31 * result + (newRetirementFundUid != null ? newRetirementFundUid.hashCode() : 0);
result = 31 * result + (commencementDate != null ? commencementDate.hashCode() : 0);
result = 31 * result + (terminationDate != null ? terminationDate.hashCode() : 0);
result = 31 * result + (transferInformation != null ? transferInformation.hashCode() : 0);
return result;
return new HashCodeBuilder(17, 37)
.appendSuper(super.hashCode())
.append(transferInformation)
.toHashCode();
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.appendSuper(super.toString())
.append("transferInformation", transferInformation)
.toString();
}
}

0 comments on commit 26f588c

Please sign in to comment.