Révision 96454bcd
Ajouté par Sylvain Sauvage il y a plus de 11 ans
DELTa/src/main/java/fr/unicaen/iota/validator/operations/DSEntryComparator.java | ||
---|---|---|
|
||
import fr.unicaen.iota.application.model.DSEvent;
|
||
import fr.unicaen.iota.application.rmi.AccessInterface;
|
||
import fr.unicaen.iota.tau.model.Identity;
|
||
import fr.unicaen.iota.validator.Configuration;
|
||
import fr.unicaen.iota.validator.IOTA;
|
||
import fr.unicaen.iota.validator.model.DSLink;
|
||
... | ... | |
*/
|
||
public class DSEntryComparator {
|
||
|
||
private AccessInterface applicationLevelInterface;
|
||
private IOTA iota;
|
||
private final AccessInterface applicationLevelInterface;
|
||
private final IOTA iota;
|
||
private final Identity identity;
|
||
private static final Log log = LogFactory.getLog(DSEntryComparator.class);
|
||
|
||
public DSEntryComparator(AccessInterface applicationLevelInterface, IOTA iota) {
|
||
public DSEntryComparator(Identity identity, AccessInterface applicationLevelInterface, IOTA iota) {
|
||
this.applicationLevelInterface = applicationLevelInterface;
|
||
this.iota = iota;
|
||
this.identity = identity;
|
||
}
|
||
|
||
public Map<EPC, List<DSEvent>> getEventNotVerified(EPC container, List<EPC> list) {
|
||
... | ... | |
tmp.add(link.getDsAddress());
|
||
Date d1 = new Date();
|
||
eventList.addAll(applicationLevelInterface.queryDS(container.getEpc(),
|
||
link.getDsAddress(), link.getLogin(), link.getPassword(), Configuration.DS_SERVICE_TYPE_FOR_EPCIS));
|
||
link.getDsAddress(), identity, Configuration.DS_SERVICE_TYPE_FOR_EPCIS));
|
||
Date d2 = new Date();
|
||
link.addTimeResponse(d2.getTime() - d1.getTime());
|
||
}
|
||
... | ... | |
List<DSEvent> dsEventList = new ArrayList<DSEvent>();
|
||
List<Infrastructure> infrastructures = container.getInfrastructures();
|
||
List<String> dsLinks = new ArrayList<String>();
|
||
String referentDS = applicationLevelInterface.getReferenteDS(container.getEpc());
|
||
String referentDS = applicationLevelInterface.getReferentDS(container.getEpc());
|
||
for (Infrastructure infra : infrastructures) {
|
||
if (!iota.get(infra.getBizLoc()).getDSLink().isActiveAnalyse()) {
|
||
continue;
|
||
... | ... | |
}
|
||
if (link.getDsAddress().equals(referentDS)) {
|
||
Date d1 = new Date();
|
||
List<DSEvent> list = applicationLevelInterface.queryDS(container.getEpc(), link.getDsAddress(), link.getLogin(), link.getPassword(), Configuration.DS_SERVICE_TYPE_FOR_DS);
|
||
List<DSEvent> list = applicationLevelInterface.queryDS(container.getEpc(), link.getDsAddress(), identity, Configuration.DS_SERVICE_TYPE_FOR_DS);
|
||
Date d2 = new Date();
|
||
link.addTimeResponse(d2.getTime() - d1.getTime());
|
||
for (DSEvent dSEvent : list) {
|
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