-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
Fix project build, fix for tse.csv #23
Open
dhaeb
wants to merge
3
commits into
opencore:master
Choose a base branch
from
Lodgit:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Main-Class: com.opencore.dsfinvk.cli.DsfinvkTool | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 108 additions & 5 deletions
113
dsfinvk-models/src/main/java/com/opencore/dsfinvk/models/stammdaten/StammTse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,127 @@ | ||
| package com.opencore.dsfinvk.models.stammdaten; | ||
|
|
||
| import java.util.StringJoiner; | ||
|
|
||
| import javax.validation.constraints.Size; | ||
|
|
||
| import com.opencore.dsfinvk.models.BaseModel; | ||
| import com.opencore.gdpdu.index.annotations.Column; | ||
| import com.opencore.gdpdu.index.models.DataType; | ||
|
|
||
| // TODO: Fertig stellen, hier gibt es Probleme wg. der Enums und vor allem der "dynamischen" TSE_ZERTIFIKAT* Spalten | ||
| public class StammTse extends BaseModel { | ||
|
|
||
| public static final String FILENAME = "tse.csv"; | ||
|
|
||
| @Column(value = "TSE_ID", type = DataType.Numeric) | ||
| private long tseId; | ||
|
|
||
|
|
||
| @Size(max = 68) | ||
| @Column(value = "TSE_SERIAL", type = DataType.AlphaNumeric) | ||
| private String tseSerial; | ||
|
|
||
| private TseSigAlgo tseSigAlgo; | ||
| @Size(max = 21) | ||
| @Column(value = "TSE_SIG_ALGO", type = DataType.AlphaNumeric) | ||
| private String tseSigAlgo; | ||
|
|
||
| @Size(max = 31) | ||
| @Column(value = "TSE_ZEITFORMAT", type = DataType.AlphaNumeric) | ||
| private String tseZeitformat; | ||
|
|
||
| private TsePdEncoding tsePdEncoding; | ||
| @Size(max = 5) | ||
| @Column(value = "TSE_PD_ENCODING", type = DataType.AlphaNumeric) | ||
| private String tsePdEncoding; | ||
|
|
||
| @Size(max = 512) | ||
| @Column(value = "TSE_PUBLIC_KEY", type = DataType.AlphaNumeric) | ||
| private String tsePublicKey; | ||
|
|
||
|
|
||
| @Size(max = 1000) | ||
| @Column(value = "TSE_ZERTIFIKAT_I", type = DataType.AlphaNumeric) | ||
| private String tseZertifikatI; | ||
|
|
||
|
|
||
| @Size(max = 1000) | ||
| @Column(value = "TSE_ZERTIFIKAT_II", type = DataType.AlphaNumeric) | ||
| private String tseZertifikatII; | ||
|
|
||
| public String getTseSigAlgo() { | ||
| return tseSigAlgo; | ||
| } | ||
|
|
||
| public void setTseSigAlgo(String tseSigAlgo) { | ||
| this.tseSigAlgo = tseSigAlgo; | ||
| } | ||
|
|
||
| public long getTseId() { | ||
| return tseId; | ||
| } | ||
|
|
||
| public void setTseId(long tseId) { | ||
| this.tseId = tseId; | ||
| } | ||
|
|
||
| public String getTseSerial() { | ||
| return tseSerial; | ||
| } | ||
|
|
||
| public void setTseSerial(String tseSerial) { | ||
| this.tseSerial = tseSerial; | ||
| } | ||
|
|
||
| public String getTseZeitformat() { | ||
| return tseZeitformat; | ||
| } | ||
|
|
||
| public void setTseZeitformat(String tseZeitformat) { | ||
| this.tseZeitformat = tseZeitformat; | ||
| } | ||
|
|
||
| public String getTsePdEncoding() { | ||
| return tsePdEncoding; | ||
| } | ||
|
|
||
| public void setTsePdEncoding(String tsePdEncoding) { | ||
| this.tsePdEncoding = tsePdEncoding; | ||
| } | ||
|
|
||
| public String getTsePublicKey() { | ||
| return tsePublicKey; | ||
| } | ||
|
|
||
| public void setTsePublicKey(String tsePublicKey) { | ||
| this.tsePublicKey = tsePublicKey; | ||
| } | ||
|
|
||
| public String getTseZertifikatI() { | ||
| return tseZertifikatI; | ||
| } | ||
|
|
||
| public void setTseZertifikatI(String tseZertifikatI) { | ||
| this.tseZertifikatI = tseZertifikatI; | ||
| } | ||
|
|
||
| public String getTseZertifikatII() { | ||
| return tseZertifikatII; | ||
| } | ||
|
|
||
| public void setTseZertifikatII(String tseZertifikatII) { | ||
| this.tseZertifikatII = tseZertifikatII; | ||
| } | ||
|
|
||
| public String toString(){ | ||
| return new StringJoiner(", ", StammTse.class.getSimpleName() + "[", "]") | ||
| .add("tseId='" + tseId + "'") | ||
| .add("tseSerial='" + tseSerial + "'") | ||
| .add("tseSigAlgo='" + tseSigAlgo + "'") | ||
| .add("tseZeitformat='" + tseZeitformat + "'") | ||
| .add("tsePdEncoding='" + tsePdEncoding + "'") | ||
| .add("tsePublicKey='" + tsePublicKey + "'") | ||
| .add("tseZertifikatI='" + tseZertifikatI + "'") | ||
| .add("tseZertifikatII='" + tseZertifikatII + "'") | ||
| .add("zKasseId='" + getzKasseId() + "'") | ||
| .add("zErstellung=" + getzErstellung()) | ||
| .add("zNr=" + getzNr()) | ||
| .toString(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| module com.opencore.dsfinvk.parser { | ||
|
|
||
| requires com.opencore.gdpdu.common; | ||
| requires com.opencore.gdpdu.data; | ||
| requires com.opencore.gdpdu.models; | ||
| requires com.opencore.gdpdu.index; | ||
| requires commons.csv; | ||
|
|
||
| requires java.validation; | ||
| requires java.xml; | ||
| requires java.desktop; | ||
| requires com.opencore.dsfinvk.models; | ||
| requires gdpdu.common; | ||
| requires gdpdu.data.parser; | ||
| requires gdpdu.index.parser; | ||
| requires gdpdu.models; | ||
| requires org.slf4j; | ||
|
|
||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needed to comment out due to wrong validation results.