Skip to content

Commit 3f362f9

Browse files
committed
[NAE-2418] Verify @transient handling across persistence layers in nae-spring-core-adapter
- created new arc classes in spring core adapter - refactored existing arc class to be abstract - added transient to arcs
1 parent 17e7be8 commit 3f362f9

10 files changed

Lines changed: 127 additions & 10 deletions

File tree

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/ArcFactory.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.netgrif.application.engine.petrinet.service;
22

3+
import com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.InhibitorArc;
4+
import com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.ReadArc;
5+
import com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.ResetArc;
36
import com.netgrif.application.engine.objects.petrinet.domain.arcs.Arc;
4-
import com.netgrif.application.engine.objects.petrinet.domain.arcs.InhibitorArc;
5-
import com.netgrif.application.engine.objects.petrinet.domain.arcs.ReadArc;
6-
import com.netgrif.application.engine.objects.petrinet.domain.arcs.ResetArc;
77
import com.netgrif.application.engine.objects.petrinet.domain.arcs.reference.Reference;
8-
import com.netgrif.application.engine.objects.petrinet.domain.arcs.reference.Type;
98
import org.springframework.stereotype.Component;
109

1110
@Component
@@ -14,15 +13,15 @@ public final class ArcFactory {
1413
public Arc getArc(com.netgrif.application.engine.objects.importer.model.Arc arc) throws IllegalArgumentException {
1514
switch (arc.getType()) {
1615
case REGULAR:
17-
return new Arc();
16+
return new com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.Arc();
1817
case RESET:
1918
return new ResetArc();
2019
case INHIBITOR:
2120
return new InhibitorArc();
2221
case READ:
2322
return new ReadArc();
2423
case VARIABLE:
25-
Arc varArc = new Arc();
24+
Arc varArc = new com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.Arc();
2625
Reference ref = new Reference();
2726
ref.setReference(String.valueOf(arc.getMultiplicity()));
2827
varArc.setReference(ref);

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/PetriNetEventHandler.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.springframework.beans.factory.annotation.Autowired;
99
import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
1010
import org.springframework.data.mongodb.core.mapping.event.AfterDeleteEvent;
11+
import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
1112
import org.springframework.stereotype.Component;
1213

1314
@Slf4j
@@ -17,6 +18,11 @@ public class PetriNetEventHandler extends AbstractMongoEventListener<PetriNet> {
1718
@Autowired
1819
private IElasticPetriNetService service;
1920

21+
@Override
22+
public void onAfterLoad(AfterLoadEvent<PetriNet> event) {
23+
24+
}
25+
2026
@Override
2127
public void onAfterDelete(AfterDeleteEvent<PetriNet> event) {
2228
Document document = event.getDocument();

nae-object-library/src/main/java/com/netgrif/application/engine/objects/petrinet/domain/arcs/Arc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.ArrayList;
1111
import java.util.List;
1212

13-
public class Arc extends PetriNetObject {
13+
public abstract class Arc extends PetriNetObject {
1414

1515
protected Node source;
1616

nae-object-library/src/main/java/com/netgrif/application/engine/objects/petrinet/domain/arcs/InhibitorArc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* <b><i>m(p) &lt; w</i></b><br>
99
* <a href="https://books.google.sk/books?id=A45rCQAAQBAJ&dq=petri+net+read+arc&hl=sk">More info</a>
1010
*/
11-
public class InhibitorArc extends PTArc {
11+
public abstract class InhibitorArc extends PTArc {
1212

1313
public InhibitorArc() {
1414
super();

nae-object-library/src/main/java/com/netgrif/application/engine/objects/petrinet/domain/arcs/ReadArc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* <center><b><i>m(p) &ge; w</i></b><br></center>
99
* <a href="https://books.google.sk/books?id=A45rCQAAQBAJ&dq=petri+net+read+arc&hl=sk">More info</a>
1010
*/
11-
public class ReadArc extends PTArc {
11+
public abstract class ReadArc extends PTArc {
1212

1313
public ReadArc() {
1414
super();

nae-object-library/src/main/java/com/netgrif/application/engine/objects/petrinet/domain/arcs/ResetArc.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* </ul>
1111
* <a href="https://books.google.sk/books?id=A45rCQAAQBAJ&dq=petri+net+read+arc&hl=sk">More info</a>
1212
*/
13-
public class ResetArc extends PTArc {
13+
public abstract class ResetArc extends PTArc {
1414

1515
public ResetArc() {
1616
super();
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs;
2+
3+
import com.netgrif.application.engine.objects.petrinet.domain.Node;
4+
import org.springframework.data.annotation.Transient;
5+
6+
public class Arc extends com.netgrif.application.engine.objects.petrinet.domain.arcs.Arc {
7+
8+
public Arc() {
9+
super();
10+
}
11+
12+
public Arc(Arc arc) {
13+
super(arc);
14+
}
15+
16+
public Arc(Node source, Node destination, int multiplicity) {
17+
super(source, destination, multiplicity);
18+
}
19+
20+
@Override
21+
@Transient
22+
public Node getDestination() {
23+
return super.getDestination();
24+
}
25+
26+
@Override
27+
@Transient
28+
public Node getSource() {
29+
return super.getSource();
30+
}
31+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs;
2+
3+
import com.netgrif.application.engine.objects.petrinet.domain.Node;
4+
import org.springframework.data.annotation.Transient;
5+
6+
public class InhibitorArc extends com.netgrif.application.engine.objects.petrinet.domain.arcs.InhibitorArc {
7+
8+
public InhibitorArc() {
9+
super();
10+
}
11+
12+
public InhibitorArc(InhibitorArc arc) {
13+
super(arc);
14+
}
15+
16+
@Override
17+
@Transient
18+
public Node getDestination() {
19+
return super.getDestination();
20+
}
21+
22+
@Override
23+
@Transient
24+
public Node getSource() {
25+
return super.getSource();
26+
}
27+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs;
2+
3+
import com.netgrif.application.engine.objects.petrinet.domain.Node;
4+
import org.springframework.data.annotation.Transient;
5+
6+
public class ReadArc extends com.netgrif.application.engine.objects.petrinet.domain.arcs.ReadArc {
7+
8+
public ReadArc() {
9+
super();
10+
}
11+
12+
public ReadArc(ReadArc readArc) {
13+
super(readArc);
14+
}
15+
16+
@Override
17+
@Transient
18+
public Node getDestination() {
19+
return super.getDestination();
20+
}
21+
22+
@Override
23+
@Transient
24+
public Node getSource() {
25+
return super.getSource();
26+
}
27+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs;
2+
3+
import com.netgrif.application.engine.objects.petrinet.domain.Node;
4+
import org.springframework.data.annotation.Transient;
5+
6+
public class ResetArc extends com.netgrif.application.engine.objects.petrinet.domain.arcs.ResetArc {
7+
8+
public ResetArc() {
9+
super();
10+
}
11+
12+
public ResetArc(ResetArc arc) {
13+
super(arc);
14+
}
15+
16+
@Override
17+
@Transient
18+
public Node getDestination() {
19+
return super.getDestination();
20+
}
21+
22+
@Override
23+
@Transient
24+
public Node getSource() {
25+
return super.getSource();
26+
}
27+
}

0 commit comments

Comments
 (0)