Révision 96454bcd
Ajouté par Sylvain Sauvage il y a plus de 11 ans
DELTa/src/main/java/fr/unicaen/iota/validator/model/AggregationEvent.java | ||
---|---|---|
*/
|
||
package fr.unicaen.iota.validator.model;
|
||
|
||
import fr.unicaen.iota.application.model.EPCISEvent;
|
||
import fr.unicaen.iota.mu.EPCISEventTypeHelper;
|
||
import java.sql.Timestamp;
|
||
import java.util.ArrayList;
|
||
import java.util.Collection;
|
||
import java.util.List;
|
||
import org.fosstrak.epcis.model.ActionType;
|
||
import org.fosstrak.epcis.model.EPCISEventType;
|
||
import org.jdom.Element;
|
||
|
||
/**
|
||
... | ... | |
}
|
||
|
||
@Override
|
||
public boolean isContainedIn(Collection<EPCISEvent> list) {
|
||
for (EPCISEvent event : list) {
|
||
public boolean isContainedIn(Collection<EPCISEventType> list) {
|
||
for (EPCISEventType evt : list) {
|
||
EPCISEventTypeHelper event = new EPCISEventTypeHelper(evt);
|
||
for (String epc : event.getChildren()) {
|
||
if (!getChildEpcs().contains(epc)) {
|
||
return false;
|
||
}
|
||
}
|
||
return event.getAction().equals(getAction().value())
|
||
&& event.getBizLoc().equals(getInfrastructure().getBizLoc())
|
||
return event.getAction() == getAction()
|
||
&& event.getBizLocation().equals(getInfrastructure().getBizLoc())
|
||
&& event.getBizStep().equals(getBizStep())
|
||
&& event.getDisposition().equals(getDisposition())
|
||
&& event.getParentID().equals(getParentId());
|
||
... | ... | |
return false;
|
||
}
|
||
}
|
||
return aggEvt.getAction().value().equals(getAction().value())
|
||
return aggEvt.getAction() == getAction()
|
||
&& aggEvt.getInfrastructure().getBizLoc().equals(getInfrastructure().getBizLoc())
|
||
&& aggEvt.getBizStep().equals(getBizStep())
|
||
&& aggEvt.getDisposition().equals(getDisposition())
|
Formats disponibles : Unified diff
Version 1.9-mock
This is version 1.9-mock. 1.9 because the API still have changes pending
(principally relative to the Discovery Services). “mock” because TLS
configuration is not yet available and the signatures (SigMa) are not fully
implemented.
- code cleaned and refactored
- lots of bugs fixed
- dependencies checked and trimmed
- documentation added
- Identity handling added
- code refactored
- new, better APIs
- Identity handling added
- use EPCglobal and DS events (no proxy types anymore)
- ETa-Callback modules are now available as web applications
- filtering rules: if a part of an event is not allowed, now the whole
event is deleted from the result (before only the rejectd part was)
- new temporary User web service
- new Xi module: XACML Interrogation web service (was two modules: TCP and
servlet)
- ETa and its Callback modules
- ActiveMQ
- SigMa
- certificate/signing key
- new simplified figures (sans IoTa and simplified IoTa)
- new figure for ETa modules
- show 3rd party clients
- data flows specified
- TLS and link security added
- IDs and trusted IDs added
- color adjusted for printing
- GREYC logo added