adapt Taxeditor test data to model update

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / eu / etaxonomy / taxeditor / remoting / cache / CdmModelCacher.java

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java
index af18a29a979ff7aefd45a9e53dad26eedf018461..6400566194c0ef20ca1b0408e6371239e337ae60 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacher.java
@@ -83,7 +83,7 @@ public class CdmModelCacher {
                        .configure(HB_CONFIG_FILE_PATH) // configures settings from hibernate.cfg.xml
                        .build();
        SessionFactory sessionFactory = null;
-       Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<String, CdmModelFieldPropertyFromClass>();
+       Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<>();
        try {
 //             ConnectionProvider connectionProvider = registry.getService(ConnectionProvider.class);
 //             DatasourceConnectionProviderImpl providerImpl = registry.getService(DatasourceConnectionProviderImpl.class);
@@ -158,12 +158,16 @@ public class CdmModelCacher {
         CdmModelCacher cdmModelCacher = new CdmModelCacher();
         Map<String, CdmModelFieldPropertyFromClass> modelClassMap = cdmModelCacher.generateModelClassMap();
         try{
-
-            FileOutputStream fout = new FileOutputStream(CDM_MAP_SER_DIR + "cdm.map.ser");
-            ObjectOutputStream oos = new ObjectOutputStream(fout);
-            oos.writeObject(modelClassMap);
-            oos.close();
-            System.out.println("CDM Map serialized");
+               if (!modelClassMap.isEmpty()){
+                       FileOutputStream fout = new FileOutputStream(CDM_MAP_SER_DIR + "cdm.map.ser");
+                       ObjectOutputStream oos = new ObjectOutputStream(fout);
+                       oos.writeObject(modelClassMap);
+                       oos.close();
+                       System.out.println("CDM Map serialized");
+               }else{
+                       String message = "CDM Map was empty. Model cache update NOT successful";
+                       System.out.println(message);
+               }
 
         }catch(Exception ex){
             ex.printStackTrace();