Project

General

Profile

« Previous | Next » 

Revision 56415

removing not necessary incapsulation

View differences:

modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/bulktag/Constraints.java
1 1
package eu.dnetlib.data.bulktag;
2 2

  
3
import com.google.common.reflect.TypeToken;
3 4
import com.google.gson.Gson;
4 5
import eu.dnetlib.data.bulktag.selectioncriteria.VerbResolver;
5 6
import org.apache.commons.logging.Log;
......
8 9

  
9 10
import java.io.Serializable;
10 11
import java.lang.reflect.InvocationTargetException;
12
import java.lang.reflect.Type;
13
import java.util.Collection;
11 14
import java.util.List;
12 15
import java.util.Map;
13 16

  
......
16 19
 */
17 20
public class Constraints implements Serializable {
18 21
    private static final Log log = LogFactory.getLog(Constraints.class);
19
    private ConstraintEncapsulator ce;
20
    //private List<Constraint> ce;
22
    //private ConstraintEncapsulator ce;
23
    private List<Constraint> constraint;
21 24

  
22 25

  
23 26
    public Constraints() {
24 27
    }
28
    public List<Constraint> getConstraint() {
29
        return constraint;
30
    }
25 31

  
26
    public ConstraintEncapsulator getCe() {
32
    public void setConstraint(List<Constraint> constraint) {
33
        this.constraint = constraint;
34
    }
35

  
36
    public void setSc(String json){
37
        Type collectionType = new TypeToken<Collection<Constraint>>(){}.getType();
38
        constraint = new Gson().fromJson(json, collectionType);
39

  
40
    }
41

  
42
    void setSelection(VerbResolver resolver) {
43
        for(Constraint st: constraint){
44

  
45
            try {
46
                st.setSelection(resolver);
47
            } catch (NoSuchMethodException e) {
48
                log.error(e.getMessage());
49
            } catch (IllegalAccessException e) {
50
                log.error(e.getMessage());
51
            } catch (InvocationTargetException e) {
52
                log.error(e.getMessage());
53
            } catch (InstantiationException e) {
54
                log.error(e.getMessage());
55
            }
56
        }
57

  
58
    }
59

  
60
//    //Constraint in and
61
//    public boolean verifyCriteria(Map<String,String> param){
62
//        for(Constraint constraint: constraint){
63
//            if(!constraint.verifyCriteria(param.get(constraint.getField())))
64
//                return false;
65
//        }
66
//        return true;
67
//    }
68

  
69
    //Constraint in and
70
    public boolean verifyCriteria(Map<String,List<String>> param){
71

  
72
        for(Constraint sc: constraint){
73
            boolean verified = false;
74
            for(String value : param.get(sc.getField())){
75
                if (sc.verifyCriteria(value.trim())){
76
                    verified = true;
77
                }
78
            }
79
            if(!verified)
80
                return verified;
81
        }
82
        return true;
83
    }
84
  /*  public ConstraintEncapsulator getCe() {
27 85
        return ce;
28 86
    }
29 87

  
......
31 89
        this.ce = ce;
32 90
    }
33 91

  
34
    public void setSc(String json){
92
    public void setConstraint(String json){
35 93

  
36 94
        ce = new Gson().fromJson(json, ConstraintEncapsulator.class);
37 95

  
......
66 124

  
67 125
    //Constraint in and
68 126
    public boolean verifyCriteria(Map<String,List<String>> param) throws NullPointerException {
69
        for(Constraint sc: ce.getConstraint()){
127
        for(Constraint constraint: ce.getConstraint()){
70 128
            boolean verified = false;
71
            for(String value : param.get(sc.getField())){
129
            for(String value : param.get(constraint.getField())){
72 130
                try {
73
                    if (sc.verifyCriteria(value.trim())) {
131
                    if (constraint.verifyCriteria(value.trim())) {
74 132
                        verified = true;
75 133
                    }
76 134
                }catch(NullPointerException npe){
......
83 141
                return verified;
84 142
        }
85 143
        return true;
86
    }
144
    }*/
87 145
}
modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/bulktag/Datasource.java
1 1
package eu.dnetlib.data.bulktag;
2 2

  
3 3

  
4
import com.google.common.reflect.TypeToken;
5 4
import com.google.gson.Gson;
6 5
import eu.dnetlib.data.bulktag.selectioncriteria.VerbResolver;
7 6
import org.dom4j.Node;
8 7

  
9
import java.lang.reflect.Type;
10
import java.util.Collection;
11
import java.util.List;
12
import java.util.Map;
13

  
14 8
/**
15 9
 * Created by miriam on 01/08/2018.
16 10
 */
......
18 12

  
19 13
    private String openaireId;
20 14

  
21
    private SelectionConstraints sc;
15
    private SelectionConstraints selectionConstraints;
22 16

  
23 17

  
24 18
    public SelectionConstraints getSelCriteria() {
25
        return sc;
19
        return selectionConstraints;
26 20
    }
27 21

  
22
    public SelectionConstraints getSelectionConstraints() {
23
        return selectionConstraints;
24
    }
28 25

  
26
    public void setSelectionConstraints(SelectionConstraints selectionConstraints) {
27
        this.selectionConstraints = selectionConstraints;
28
    }
29 29

  
30 30
    public void setSelCriteria(SelectionConstraints selCriteria) {
31
        this.sc = selCriteria;
31
        this.selectionConstraints = selCriteria;
32 32
    }
33 33

  
34 34
    public String getOpenaireId() {
......
40 40
    }
41 41

  
42 42
    private void setSelCriteria(String json, VerbResolver resolver){
43
        sc = new Gson().fromJson(json, SelectionConstraints.class);
44
        sc.setSelection(resolver);
43
        selectionConstraints = new Gson().fromJson(json, SelectionConstraints.class);
44
        selectionConstraints.setSelection(resolver);
45 45
    }
46 46

  
47 47
    public void setSelCriteria(Node n, VerbResolver resolver){
48 48
        try{
49 49
            setSelCriteria(n.getText(),resolver);
50 50
        }catch(Exception e) {
51
            sc=null;
51
            selectionConstraints =null;
52 52
        }
53 53

  
54 54
    }
modules/dnet-openaireplus-mapping-utils/trunk/src/main/java/eu/dnetlib/data/bulktag/SelectionConstraints.java
1 1
package eu.dnetlib.data.bulktag;
2 2

  
3
import com.google.common.reflect.TypeToken;
3 4
import com.google.gson.Gson;
4 5
import eu.dnetlib.data.bulktag.selectioncriteria.VerbResolver;
5 6

  
6 7
import java.io.Serializable;
8
import java.lang.reflect.Type;
9
import java.util.Collection;
7 10
import java.util.List;
8 11
import java.util.Map;
9 12

  
10 13
public class SelectionConstraints implements Serializable {
11
    private ConstraintsList cl;
14
    private List<Constraints> criteria;
12 15

  
13
   // private List<Constraints>cl;
14

  
15

  
16 16
    public SelectionConstraints() {
17 17
    }
18 18

  
19
    public ConstraintsList getCl() {
20
        return cl;
19

  
20
    public List<Constraints> getCriteria() {
21
        return criteria;
21 22
    }
22 23

  
23
    public void setCl(ConstraintsList cl) {
24
        this.cl = cl;
24
    public void setCriteria(List<Constraints> criteria) {
25
        this.criteria = criteria;
25 26
    }
26 27

  
27 28
    public void setSc(String json){
28

  
29
        cl = new Gson().fromJson(json, ConstraintsList.class);
29
        Type collectionType = new TypeToken<Collection<Constraints>>(){}.getType();
30
        criteria = new Gson().fromJson(json, collectionType);
30 31
    }
31 32

  
32

  
33
    //Constraints in or
33 34
    public boolean verifyCriteria(Map<String,List<String>> param){
34
        for(Constraints selc: cl.getCriteria()){
35
        for(Constraints selc: criteria){
35 36
            if(selc.verifyCriteria(param)){
36 37
                return true;
37 38
            }
......
40 41
    }
41 42
    public void setSelection(VerbResolver resolver) {
42 43

  
43
        for(Constraints cs : cl.getCriteria()){
44
        for(Constraints cs : criteria){
44 45
            cs.setSelection(resolver);
45 46
        }
46 47
    }

Also available in: Unified diff