Project

General

Profile

Revision 2df2798e

ID2df2798e1a3daa0e8394293b4fcb8918a9a4d4d6
Parent e79b94a3
Child 77290918

Added by Andreas Müller over 3 years ago

cleanup

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DeleteResult.java
26 26
 */
27 27
public class DeleteResult extends UpdateResult{
28 28

  
29
	@SuppressWarnings("unused")
30
	private static final Logger logger = Logger.getLogger(DeleteResult.class);
29
    private static final long serialVersionUID = 8856465763413085548L;
31 30

  
31
    @SuppressWarnings("unused")
32
	private static final Logger logger = Logger.getLogger(DeleteResult.class);
32 33

  
33 34

  
34
	private final List<Exception> exceptions = new ArrayList<Exception>();
35
	private final List<Exception> exceptions = new ArrayList<>();
35 36

  
36
	private final Set<CdmBase> relatedObjects = new HashSet<CdmBase>();
37
	private final Set<CdmBase> relatedObjects = new HashSet<>();
37 38

  
38
//	private Set<PersistPair> objectsToDelete = new HashSet<PersistPair>();
39
//	private Set<PersistPair> objectsToDelete = new HashSet<>();
39 40
//
40
//	private Set<PersistPair> objectsToSave = new HashSet<DeleteResult.PersistPair>();
41
//	private Set<PersistPair> objectsToSave = new HashSet<>();
41 42

  
42 43
//	protected class PersistPair{
43 44
//		protected CdmBase objectToPersist;
......
49 50
//***************************** GETTER /SETTER /ADDER *************************/
50 51

  
51 52

  
52

  
53 53
	/**
54 54
	 * Related objects that prevent the delete action to take place.
55 55
	 * @return
......
75 75
    }
76 76

  
77 77

  
78

  
79

  
80

  
81

  
82

  
83

  
84

  
85

  
86 78
}
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UpdateResult.java
31 31
 */
32 32
public class UpdateResult implements Serializable{
33 33

  
34
    private static final long serialVersionUID = 1L;
34
    private static final long serialVersionUID = -7040027587709706700L;
35 35

  
36 36
    @SuppressWarnings("unused")
37 37
    private static final Logger logger = Logger.getLogger(UpdateResult.class);
......
41 41
    @SuppressWarnings("unchecked")
42 42
    private final Collection<Exception> exceptions = new CircularFifoBuffer(10);
43 43

  
44
    private Set<CdmBase> updatedObjects = new HashSet<CdmBase>();
44
    private Set<CdmBase> updatedObjects = new HashSet<>();
45 45

  
46
    private final Set<CdmEntityIdentifier> updatedCdmIds = new HashSet<CdmEntityIdentifier>();
46
    private final Set<CdmEntityIdentifier> updatedCdmIds = new HashSet<>();
47 47

  
48
    private final Set<CdmBase> unchangedObjects = new HashSet<CdmBase>();
48
    private final Set<CdmBase> unchangedObjects = new HashSet<>();
49 49

  
50 50
    private CdmBase cdmEntity;
51 51

  
52 52

  
53
    //		private Set<PersistPair> objectsToDelete = new HashSet<PersistPair>();
53
    //		private Set<PersistPair> objectsToDelete = new HashSet<>();
54 54
    //
55
    //		private Set<PersistPair> objectsToSave = new HashSet<DeleteResult.PersistPair>();
55
    //		private Set<PersistPair> objectsToSave = new HashSet<>();
56 56

  
57 57
    //		protected class PersistPair{
58 58
    //			protected CdmBase objectToPersist;
......
226 226
        if(relatedObjectString.endsWith(separator)){
227 227
            relatedObjectString = relatedObjectString.substring(0, relatedObjectString.length()-separator.length());
228 228
        }
229
        return "[DeleteResult]\n" +
229
        return "[UpdateResult]\n" +
230 230
        "Status: " + status.toString()+"\n" +
231 231
        "Exceptions: " + exceptionString+"\n" +
232 232
        "Related Objects: "+relatedObjectString;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)