upgrande to 7.11.0 + refactoring

This commit is contained in:
Nicolas Héron 2018-09-13 20:51:38 +02:00
commit 300ea58a2a
7 changed files with 5692 additions and 6 deletions

View file

@ -15,5 +15,20 @@ thomas=analyst,oney
christopheev=analyst,oney christopheev=analyst,oney
#probtp #probtp
pascal=analyst,probtp pascal=analyst,probtp
#training
student01a=analyst,groupe01
student01b=analyst,groupe01
student02a=analyst,groupe02
student02b=analyst,groupe02
student03a=analyst,groupe03
student03b=analyst,groupe03
student04a=analyst,groupe04
student04b=analyst,groupe04
student05a=analyst,groupe05
student05b=analyst,groupe05
student06a=analyst,groupe06
student06b=analyst,groupe06
student07a=analyst,groupe07
student07b=analyst,groupe07
student08a=analyst,groupe08
student08b=analyst,groupe08

View file

@ -12,4 +12,21 @@ florian=auchan
thomas=oney thomas=oney
christopheev=oney christopheev=oney
# probtp # probtp
pascal=probtp pascal=probtp
#training
student01a=pymma
student01b=pymma
student02a=pymma
student02b=pymma
student03a=pymma
student03b=pymma
student04a=pymma
student04b=pymma
student05a=pymma
student05b=pymma
student06a=pymma
student06b=pymma
student07a=pymma
student07b=pymma
student08a=pymma
student08b=pymma

5626
configuration/toto.json Normal file

File diff suppressed because it is too large Load diff

View file

@ -9,6 +9,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>drools-framework-swimming-pool-model</artifactId> <artifactId>drools-framework-swimming-pool-model</artifactId>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View file

@ -15,6 +15,8 @@
*/ */
package org.training.leisure.swimmingpool; package org.training.leisure.swimmingpool;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
@ -30,7 +32,8 @@ public class CalculatedAttribute {
private String stringValue; private String stringValue;
private BigDecimal bigDecimalValue; private BigDecimal bigDecimalValue;
private Integer integerValue; private Integer integerValue;
@JsonIgnore
private BaseElement father;
public CalculatedAttribute() { public CalculatedAttribute() {
} }
@ -83,6 +86,14 @@ public class CalculatedAttribute {
this.integerValue = integerValue; this.integerValue = integerValue;
} }
public BaseElement getFather() {
return father;
}
public void setFather(BaseElement father) {
this.father = father;
}
@Override @Override
public String toString() { public String toString() {
final StringBuffer sb = new StringBuffer("CalculatedAttribute{"); final StringBuffer sb = new StringBuffer("CalculatedAttribute{");

View file

@ -15,6 +15,8 @@
*/ */
package org.training.leisure.swimmingpool; package org.training.leisure.swimmingpool;
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -22,7 +24,8 @@ public class Price {
private BigDecimal amount; private BigDecimal amount;
private String description; private String description;
private String priceType; private String priceType;
@JsonIgnore
private Person person;
public Price() { public Price() {
} }
@ -50,6 +53,14 @@ public class Price {
this.priceType = priceType; this.priceType = priceType;
} }
public Person getPerson() {
return person;
}
public void setPerson(Person person) {
this.person = person;
}
@Override @Override
public String toString() { public String toString() {
final StringBuffer sb = new StringBuffer("Price{"); final StringBuffer sb = new StringBuffer("Price{");

View file

@ -22,7 +22,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<jbpm.version>7.10.0.Final</jbpm.version> <jbpm.version>7.11.0.Final</jbpm.version>
<spring.boot.version>1.5.9.Release</spring.boot.version> <spring.boot.version>1.5.9.Release</spring.boot.version>
<spring.version>4.3.3.Release</spring.version> <spring.version>4.3.3.Release</spring.version>
</properties> </properties>