Project

General

Profile

« Previous | Next » 

Revision 3fbb8717

Added by Andreas Müller almost 4 years ago

Adapt ICdmEntitySession to new includeIgnored parameter

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
116 116

  
117 117
    @Override
118 118
    public <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase) {
119
        return debug(Arrays.asList(cdmBase));
119
        return debug(Arrays.asList(cdmBase), true);
120 120
    }
121 121

  
122 122
    @Override
123
    public <T extends CdmBase> eu.etaxonomy.cdm.cache.EntityCacherDebugResult debug(Collection<T> cdmBases) {
123
    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> rootEntities, boolean includeIgnored) {
124 124
        EntityCacherDebugResult entityCacherDebugResult =
125
                new EntityCacherDebugResult(cdmTransientEntityCacher, cdmBases);
125
                new EntityCacherDebugResult(cdmTransientEntityCacher, rootEntities, includeIgnored);
126 126
        return entityCacherDebugResult;
127 127
    }
128 128

  
129 129
    @Override
130
    public <T extends CdmBase> EntityCacherDebugResult debug() {
131
        return debug(getRootEntities());
130
    public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored) {
131
        return debug(getRootEntities(), includeIgnored);
132 132
    }
133 133

  
134 134
    @Override
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
30 30

  
31 31
	public <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase);
32 32

  
33
	public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase);
33
	public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase, boolean includeIgnored);
34 34

  
35
	public <T extends CdmBase> EntityCacherDebugResult debug();
35
	public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored);
36 36

  
37 37
	public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList, boolean update);
38 38

  
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
23 23
/**
24 24
 * @author cmathew
25 25
 * @date 30 Jul 2015
26
 *
27 26
 */
28 27
public class NullSession implements ICdmEntitySession {
29 28

  
......
39 38
        this.sessionOwner = sessionOwner;
40 39
    }
41 40

  
42
    /* (non-Javadoc)
43
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getOwner()
44
     */
45 41
    @Override
46 42
    public ICdmEntitySessionEnabled getOwner() {
47 43
        return sessionOwner;
48 44
    }
49 45

  
50
    /* (non-Javadoc)
51
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getCacheStatistics()
52
     */
53 46
    @Override
54 47
    public LiveCacheStatistics getCacheStatistics() {
55
        // TODO Auto-generated method stub
56 48
        return null;
57 49
    }
58 50

  
59
    /* (non-Javadoc)
60
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.lang.Object, boolean)
61
     */
62 51
    @Override
63 52
    public <O> O load(O obj, boolean update) {
64 53
        return obj;
65 54
    }
66 55

  
67
    /* (non-Javadoc)
68
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.model.common.CdmBase, boolean)
69
     */
70 56
    @Override
71 57
    public <T extends CdmBase> T load(T cdmBase, boolean update) {
72 58
        return cdmBase;
73 59
    }
74 60

  
75
    /* (non-Javadoc)
76
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.api.service.UpdateResult, boolean)
77
     */
78 61
    @Override
79 62
    public UpdateResult load(UpdateResult updateResult, boolean update) {
80 63
        return updateResult;
81 64
    }
82 65

  
83
    /* (non-Javadoc)
84
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(eu.etaxonomy.cdm.model.common.CdmBase)
85
     */
86 66
    @Override
87 67
    public <T extends CdmBase> EntityCacherDebugResult debug(T cdmBase) {
88 68
        return null;
89 69
    }
90 70

  
91
    /* (non-Javadoc)
92
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug(java.util.Collection)
93
     */
94 71
    @Override
95
    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase) {
72
    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase, boolean includeIgnored) {
96 73
        return null;
97 74
    }
98 75

  
99
    /* (non-Javadoc)
100
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#debug()
101
     */
102 76
    @Override
103
    public <T extends CdmBase> EntityCacherDebugResult debug() {
77
    public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored) {
104 78
        return null;
105 79
    }
106 80

  
107
    /* (non-Javadoc)
108
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(java.util.Collection, boolean)
109
     */
110 81
    @Override
111 82
    public <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList, boolean update) {
112 83
        return cdmBaseList;
113 84
    }
114 85

  
115
    /* (non-Javadoc)
116
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#setEntitiesAsLatest()
117
     */
118 86
    @Override
119 87
    public void setEntitiesAsLatest() {
120 88

  
121 89
    }
122 90

  
123
    /* (non-Javadoc)
124
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getRootEntities()
125
     */
126 91
    @Override
127 92
    public <T extends CdmBase> Collection<T> getRootEntities() {
128 93
        return null;
129 94
    }
130 95

  
131
    /* (non-Javadoc)
132
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#dispose()
133
     */
134 96
    @Override
135 97
    public void dispose() {
136 98
        cdmEntitySessionManager.remove(sessionOwner);
137 99
    }
138 100

  
139
    /* (non-Javadoc)
140
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#bind()
141
     */
142 101
    @Override
143 102
    public void bind() {
144 103
        cdmEntitySessionManager.bindNullSession();
145 104
    }
146 105

  
147
    /* (non-Javadoc)
148
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteLoad(eu.etaxonomy.cdm.api.service.IService, java.util.UUID)
149
     */
150 106
    @Override
151 107
    public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid) {
152 108
        T cdmBase = service.load(uuid);
153 109
        return load(cdmBase, false);
154 110
    }
155 111

  
156
    /* (non-Javadoc)
157
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteLoad(eu.etaxonomy.cdm.api.service.IService, java.util.UUID, java.util.List)
158
     */
159 112
    @Override
160 113
    public <T extends CdmBase> T remoteLoad(IService<T> service, UUID uuid, List<String> propertyPaths) {
161 114
        T cdmBase = service.load(uuid, propertyPaths);
162 115
        return load(cdmBase, false);
163 116
    }
164 117

  
165
    /* (non-Javadoc)
166
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteSave(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
167
     */
168 118
    @Override
169 119
    public <T extends CdmBase> UUID remoteSave(IService<T> service, T cdmBase) {
170 120
        UUID uuid = service.save(cdmBase).getUuid();
......
172 122
        return uuid;
173 123
    }
174 124

  
175
    /* (non-Javadoc)
176
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#remoteUpdate(eu.etaxonomy.cdm.api.service.IService, eu.etaxonomy.cdm.model.common.CdmBase)
177
     */
178 125
    @Override
179 126
    public <T extends CdmBase> T remoteUpdate(IService<T> service, T cdmBase) {
180 127
        T mergedCdmBase = service.merge(cdmBase, true).getMergedEntity();
181 128
        return mergedCdmBase;
182 129
    }
183 130

  
184
    /* (non-Javadoc)
185
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#isActive()
186
     */
187 131
    @Override
188 132
    public boolean isActive() {
189 133
        return cdmEntitySessionManager.getActiveSession() == this;
190 134
    }
191 135

  
192
    /* (non-Javadoc)
193
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#update()
194
     */
195 136
    @Override
196 137
    public <T extends CdmBase> void update() {
197 138

  
198 139
    }
199 140

  
200
    /* (non-Javadoc)
201
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#getPropertyPaths(java.lang.Object)
202
     */
203 141
    @Override
204 142
    public List<String> getPropertyPaths(Object obj) {
205 143
        if(sessionOwner == null) {
......
212 150
        return propertyPathsMap.get(obj);
213 151
    }
214 152

  
215
    /* (non-Javadoc)
216
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#addNewCdmEntity(eu.etaxonomy.cdm.model.common.CdmBase)
217
     */
218 153
    @Override
219 154
    public void addNewCdmEntity(CdmBase newEntity) {
220
        // TODO Auto-generated method stub
221 155

  
222 156
    }
223 157

  
224
    /* (non-Javadoc)
225
     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySession#load(eu.etaxonomy.cdm.persistence.dto.MergeResult, boolean)
226
     */
227 158
    @Override
228 159
    public <T extends CdmBase> MergeResult<T> load(MergeResult<T> mergeResult, boolean update) {
229 160
        return mergeResult;
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
101 101
    }
102 102

  
103 103
    @Override
104
    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase) {
105

  
104
    public <T extends CdmBase> EntityCacherDebugResult debug(Collection<T> cdmBase, boolean includeIgnored) {
106 105
        return null;
107 106
    }
108 107

  
109 108
    @Override
110
    public <T extends CdmBase> EntityCacherDebugResult debug() {
109
    public <T extends CdmBase> EntityCacherDebugResult debug(boolean includeIgnored) {
111 110
        return null;
112 111
    }
113 112

  

Also available in: Unified diff