Skip to content
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

Feature/ehrbase/project management/issues/288 sdt #67

Merged
merged 29 commits into from
Aug 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
475ddf1
fist demo implementation
stefanspiska Jun 19, 2020
db06cb7
added choice Nodes
stefanspiska Jun 22, 2020
d2111ab
marshalling to flat json
stefanspiska Jul 23, 2020
510c0f2
Merge branch 'develop' into feature/ehrbase/project_management/issues…
stefanspiska Jul 23, 2020
e9bee53
Merge branch 'develop' into feature/ehrbase/project_management/issues…
stefanspiska Jul 23, 2020
0f4fdda
fix test
stefanspiska Jul 23, 2020
b4ac721
added FlatJsonUnmarschaller
stefanspiska Jul 24, 2020
caf47db
added RMUnmarshaller
stefanspiska Jul 28, 2020
3a59c9c
fix test
stefanspiska Jul 28, 2020
bbaa4e4
new Postprozessor
stefanspiska Jul 28, 2020
51bafb5
fix it test config
stefanspiska Jul 29, 2020
cd0b557
rmove name from introspect
stefanspiska Jul 30, 2020
312331b
fix example file names
stefanspiska Jul 30, 2020
b3bd59a
fix example file names
stefanspiska Jul 30, 2020
bca6af4
fix duplicate classes
stefanspiska Jul 30, 2020
b69762e
new FlatJson
stefanspiska Jul 30, 2020
6ab0090
removed origin von flat-jason
stefanspiska Jul 30, 2020
e64631e
code cleanup
stefanspiska Jul 30, 2020
b93961f
add PartySelf
stefanspiska Jul 30, 2020
253a33e
fix choice Node handling
stefanspiska Jul 31, 2020
166df54
code cleanup
stefanspiska Aug 3, 2020
7d56c89
code cleanup
stefanspiska Aug 4, 2020
9ec29f7
fix CoronaTestIT
stefanspiska Aug 13, 2020
3946b9c
added javadoc
stefanspiska Aug 13, 2020
90b1dfd
added javadoc and cleanup
stefanspiska Aug 14, 2020
c6714b0
Merge branch 'develop' into feature/ehrbase/project_management/issues…
stefanspiska Aug 14, 2020
34a18fc
added javadoc and cleanup
stefanspiska Aug 14, 2020
98b325f
refactor review
stefanspiska Aug 14, 2020
d993c63
Fixes
jakesmolka Aug 18, 2020
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
7 changes: 7 additions & 0 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<groupId>com.github.ehrbase.openEHR_SDK</groupId>
<artifactId>terminology</artifactId>
</dependency>

<dependency>
<groupId>com.github.ehrbase.openEHR_SDK</groupId>
<artifactId>response-dto</artifactId>
Expand Down Expand Up @@ -90,9 +91,15 @@
<groupId>com.github.ehrbase.openEHR_SDK</groupId>
<artifactId>test-data</artifactId>
</dependency>
<dependency>
<groupId>com.github.ehrbase.openEHR_SDK</groupId>
<artifactId>validation</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ public abstract class BinaryLogicalOperator implements Condition {
private final Condition condition1;
private final Condition condition2;

BinaryLogicalOperator(Condition condition1, Condition condition2) {
this.condition1 = condition1;
this.condition2 = condition2;
}
BinaryLogicalOperator(Condition condition1, Condition condition2) {
this.condition1 = condition1;
this.condition2 = condition2;
}

@Override
public String buildAql() {
Expand Down
758 changes: 379 additions & 379 deletions client/src/main/java/org/ehrbase/client/aql/query/Query.java

Large diffs are not rendered by default.

252 changes: 126 additions & 126 deletions client/src/main/java/org/ehrbase/client/aql/record/AbstractRecordImp.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,171 +3,171 @@
import org.ehrbase.client.aql.field.AqlField;

abstract class AbstractRecordImp<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> implements Record1<T1>, Record2<T1, T2>, Record3<T1, T2, T3>, Record4<T1, T2, T3, T4>, Record5<T1, T2, T3, T4, T5>, Record6<T1, T2, T3, T4, T5, T6>, Record7<T1, T2, T3, T4, T5, T6, T7>, Record8<T1, T2, T3, T4, T5, T6, T7, T8>, Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>, Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>, Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>, Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>, Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>, Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>, Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>, Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>, Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>, Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>, Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>, Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>, Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> {
public T1 value1() {
return (T1) value(0);
}
public T1 value1() {
return (T1) value(0);
}

public AqlField<T1> field1() {
return (AqlField<T1>) field(0);
}
public AqlField<T1> field1() {
return (AqlField<T1>) field(0);
}

public T2 value2() {
return (T2) value(1);
}
public T2 value2() {
return (T2) value(1);
}

public AqlField<T2> field2() {
return (AqlField<T2>) field(1);
}
public AqlField<T2> field2() {
return (AqlField<T2>) field(1);
}

public T3 value3() {
return (T3) value(2);
}
public T3 value3() {
return (T3) value(2);
}

public AqlField<T3> field3() {
return (AqlField<T3>) field(2);
}
public AqlField<T3> field3() {
return (AqlField<T3>) field(2);
}

public T4 value4() {
return (T4) value(3);
}
public T4 value4() {
return (T4) value(3);
}

public AqlField<T4> field4() {
return (AqlField<T4>) field(3);
}
public AqlField<T4> field4() {
return (AqlField<T4>) field(3);
}

public T5 value5() {
return (T5) value(4);
}
public T5 value5() {
return (T5) value(4);
}

public AqlField<T5> field5() {
return (AqlField<T5>) field(4);
}
public AqlField<T5> field5() {
return (AqlField<T5>) field(4);
}

public T6 value6() {
return (T6) value(5);
}
public T6 value6() {
return (T6) value(5);
}

public AqlField<T6> field6() {
return (AqlField<T6>) field(5);
}
public AqlField<T6> field6() {
return (AqlField<T6>) field(5);
}

public T7 value7() {
return (T7) value(6);
}
public T7 value7() {
return (T7) value(6);
}

public AqlField<T7> field7() {
return (AqlField<T7>) field(6);
}
public AqlField<T7> field7() {
return (AqlField<T7>) field(6);
}

public T8 value8() {
return (T8) value(7);
}
public T8 value8() {
return (T8) value(7);
}

public AqlField<T8> field8() {
return (AqlField<T8>) field(7);
}
public AqlField<T8> field8() {
return (AqlField<T8>) field(7);
}

public T9 value9() {
return (T9) value(8);
}
public T9 value9() {
return (T9) value(8);
}

public AqlField<T9> field9() {
return (AqlField<T9>) field(8);
}
public AqlField<T9> field9() {
return (AqlField<T9>) field(8);
}

public T10 value10() {
return (T10) value(9);
}
public T10 value10() {
return (T10) value(9);
}

public AqlField<T10> field10() {
return (AqlField<T10>) field(9);
}
public AqlField<T10> field10() {
return (AqlField<T10>) field(9);
}

public T11 value11() {
return (T11) value(10);
}
public T11 value11() {
return (T11) value(10);
}

public AqlField<T11> field11() {
return (AqlField<T11>) field(10);
}
public AqlField<T11> field11() {
return (AqlField<T11>) field(10);
}

public T12 value12() {
return (T12) value(11);
}
public T12 value12() {
return (T12) value(11);
}

public AqlField<T12> field12() {
return (AqlField<T12>) field(11);
}
public AqlField<T12> field12() {
return (AqlField<T12>) field(11);
}

public T13 value13() {
return (T13) value(12);
}
public T13 value13() {
return (T13) value(12);
}

public AqlField<T13> field13() {
return (AqlField<T13>) field(12);
}
public AqlField<T13> field13() {
return (AqlField<T13>) field(12);
}

public T14 value14() {
return (T14) value(13);
}
public T14 value14() {
return (T14) value(13);
}

public AqlField<T14> field14() {
return (AqlField<T14>) field(13);
}
public AqlField<T14> field14() {
return (AqlField<T14>) field(13);
}

public T15 value15() {
return (T15) value(14);
}
public T15 value15() {
return (T15) value(14);
}

public AqlField<T15> field15() {
return (AqlField<T15>) field(14);
}
public AqlField<T15> field15() {
return (AqlField<T15>) field(14);
}

public T16 value16() {
return (T16) value(15);
}
public T16 value16() {
return (T16) value(15);
}

public AqlField<T16> field16() {
return (AqlField<T16>) field(15);
}
public AqlField<T16> field16() {
return (AqlField<T16>) field(15);
}

public T17 value17() {
return (T17) value(16);
}
public T17 value17() {
return (T17) value(16);
}

public AqlField<T17> field17() {
return (AqlField<T17>) field(16);
}
public AqlField<T17> field17() {
return (AqlField<T17>) field(16);
}

public T18 value18() {
return (T18) value(17);
}
public T18 value18() {
return (T18) value(17);
}

public AqlField<T18> field18() {
return (AqlField<T18>) field(17);
}
public AqlField<T18> field18() {
return (AqlField<T18>) field(17);
}

public T19 value19() {
return (T19) value(18);
}
public T19 value19() {
return (T19) value(18);
}

public AqlField<T19> field19() {
return (AqlField<T19>) field(18);
}
public AqlField<T19> field19() {
return (AqlField<T19>) field(18);
}

public T20 value20() {
return (T20) value(19);
}
public T20 value20() {
return (T20) value(19);
}

public AqlField<T20> field20() {
return (AqlField<T20>) field(19);
}
public AqlField<T20> field20() {
return (AqlField<T20>) field(19);
}

public T21 value21() {
return (T21) value(20);
}
public T21 value21() {
return (T21) value(20);
}

public AqlField<T21> field21() {
return (AqlField<T21>) field(20);
}
public AqlField<T21> field21() {
return (AqlField<T21>) field(20);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.ehrbase.client.aql.field.AqlField;

public interface Record1<T1> extends Record {
T1 value1();
T1 value1();

AqlField<T1> field1();
AqlField<T1> field1();
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import org.ehrbase.client.aql.field.AqlField;

public interface Record2<T1, T2> extends Record {
T1 value1();
T1 value1();

AqlField<T1> field1();
AqlField<T1> field1();

T2 value2();
T2 value2();

AqlField<T2> field2();
AqlField<T2> field2();
}
16 changes: 8 additions & 8 deletions client/src/main/java/org/ehrbase/client/aql/record/Record4.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
import org.ehrbase.client.aql.field.AqlField;

public interface Record4<T1, T2, T3, T4> extends Record {
T1 value1();
T1 value1();

AqlField<T1> field1();
AqlField<T1> field1();

T2 value2();
T2 value2();

AqlField<T2> field2();
AqlField<T2> field2();

T3 value3();
T3 value3();

AqlField<T3> field3();
AqlField<T3> field3();

T4 value4();
T4 value4();

AqlField<T4> field4();
AqlField<T4> field4();
}
Loading