[Echobase-commits] 05/08: amelioration code

21 Jan 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository echobase.

See http://git.codelutin.com/echobase.git

commit 6309fb7481f61a43114a85795385efd8cc0e0252
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Jan 21 18:04:06 2015 +0100

    amelioration code
---
 .../echobase/services/service/CoserIndicators.java |  32 ++++
 .../services/service/UserDbPersistenceService.java | 173 +++++++++------------
 2 files changed, 108 insertions(+), 97 deletions(-)

diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java
new file mode 100644
index 0000000..de4edfb
--- /dev/null
+++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java
@@ -0,0 +1,32 @@
+package fr.ifremer.echobase.services.service;
+
+import fr.ifremer.echobase.entities.references.DataMetadata;
+
+import java.util.List;
+
+/**
+* Created on 1/21/15.
+*
+* @author Tony Chemit - chemit@codelutin.com
+* @since 2.9
+*/
+public class CoserIndicators {
+
+    final List<DataMetadata> communityDataMetadatasList;
+
+    final List<DataMetadata> populationDataMetadatasList;
+
+    public CoserIndicators(List<DataMetadata> communityDataMetadatasList, List<DataMetadata> populationDataMetadatasList) {
+        this.communityDataMetadatasList = communityDataMetadatasList;
+        this.populationDataMetadatasList = populationDataMetadatasList;
+    }
+
+    public List<DataMetadata> getCommunityDataMetadatasList() {
+        return communityDataMetadatasList;
+    }
+
+    public List<DataMetadata> getPopulationDataMetadatasList() {
+        return populationDataMetadatasList;
+    }
+
+}
diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java
index 9d7f942..7e4939d 100644
--- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java
+++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java
@@ -107,6 +107,9 @@ import java.util.zip.GZIPOutputStream;
  */
 public class UserDbPersistenceService extends EchoBaseServiceSupport {
 
+    /** Logger. */
+    private static final Log log = LogFactory.getLog(UserDbPersistenceService.class);
+
     @Inject
     private EchoBaseUserPersistenceContext persistenceContext;
 
@@ -326,6 +329,79 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport {
         return persistenceContext.getDataMetadataDao().forNameIn(names).findAll();
     }
 
+    public CoserIndicators getRegionIndicators(String missionId, List<DataMetadata> dataMetadatas) {
+
+        if (log.isInfoEnabled()) {
+            for (DataMetadata dataMetadata : dataMetadatas) {
+                log.info("Possible indicator: " + dataMetadata.getName());
+            }
+        }
+
+        Predicate<Species> communityIndicatorSpeciesPredicate = Species2.newCommunityIndicatorSpeciesPredicate();
+        Predicate<Species> populationIndicatorSpeciesPredicate = Species2.newPopulationIndicatorSpeciesPredicate();
+
+        Set<DataMetadata> communityDataMetadatasSet = new HashSet<>();
+        Set<DataMetadata> populationDataMetadatasSet = new HashSet<>();
+
+        Mission mission = getMission(missionId);
+        List<Voyage> voyagesForMission = getVoyagesForMission(mission);
+
+        for (Voyage voyage : voyagesForMission) {
+
+            if (log.isInfoEnabled()) {
+                log.info("Scan voyage: " + voyage.getName());
+            }
+
+            for (Cell cell : voyage.getRegionCells()) {
+
+                for (Result result : cell.getResult()) {
+
+                    Species species = result.getCategory().getSpeciesCategory().getSpecies();
+
+                    if (communityIndicatorSpeciesPredicate.apply(species)) {
+
+                        communityDataMetadatasSet.add(result.getDataMetadata());
+
+                    } else if (populationIndicatorSpeciesPredicate.apply(species)) {
+
+                        populationDataMetadatasSet.add(result.getDataMetadata());
+
+                    }
+
+                }
+            }
+        }
+
+        List<DataMetadata> communityDataMetadatasList = new ArrayList<>(communityDataMetadatasSet);
+        if (log.isInfoEnabled()) {
+            for (DataMetadata dataMetadata : communityDataMetadatasList) {
+                boolean willUse = dataMetadatas.contains(dataMetadata);
+                if (willUse) {
+                    log.info("Community indicator accepted: " + dataMetadata.getName());
+                } else {
+                    log.info("Community indicator rejected: " + dataMetadata.getName());
+                }
+            }
+        }
+        communityDataMetadatasList.retainAll(dataMetadatas);
+
+        List<DataMetadata> populationDataMetadatasList = new ArrayList<>(populationDataMetadatasSet);
+        if (log.isInfoEnabled()) {
+            for (DataMetadata dataMetadata : populationDataMetadatasList) {
+                boolean willUse = dataMetadatas.contains(dataMetadata);
+                if (willUse) {
+                    log.info("Population indicator accepted: " + dataMetadata.getName());
+                } else {
+                    log.info("Population indicator rejected: " + dataMetadata.getName());
+                }
+            }
+        }
+        populationDataMetadatasList.retainAll(dataMetadatas);
+
+        return new CoserIndicators(communityDataMetadatasList, populationDataMetadatasList);
+
+    }
+
     //------------------------------------------------------------------------//
     //--- DataProcessing -----------------------------------------------------//
     //------------------------------------------------------------------------//
@@ -881,103 +957,6 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport {
 
     }
 
-    public static class RegionIndicators {
-
-        final List<DataMetadata> communityDataMetadatasList;
-
-        final List<DataMetadata> populationDataMetadatasList;
-
-        public RegionIndicators(List<DataMetadata> communityDataMetadatasList, List<DataMetadata> populationDataMetadatasList) {
-            this.communityDataMetadatasList = communityDataMetadatasList;
-            this.populationDataMetadatasList = populationDataMetadatasList;
-        }
-
-        public List<DataMetadata> getCommunityDataMetadatasList() {
-            return communityDataMetadatasList;
-        }
-
-        public List<DataMetadata> getPopulationDataMetadatasList() {
-            return populationDataMetadatasList;
-        }
-
-    }
-
-    /** Logger. */
-    private static final Log log = LogFactory.getLog(UserDbPersistenceService.class);
-
-    public RegionIndicators getRegionIndicators(String missionId, List<DataMetadata> dataMetadatas) {
-
-        if (log.isInfoEnabled()) {
-            for (DataMetadata dataMetadata : dataMetadatas) {
-                log.info("Possible indicator: " + dataMetadata.getName());
-            }
-        }
-
-        Predicate<Species> communityIndicatorSpeciesPredicate = Species2.newCommunityIndicatorSpeciesPredicate();
-        Predicate<Species> populationIndicatorSpeciesPredicate = Species2.newPopulationIndicatorSpeciesPredicate();
-
-        Set<DataMetadata> communityDataMetadatasSet = new HashSet<>();
-        Set<DataMetadata> populationDataMetadatasSet = new HashSet<>();
-
-        Mission mission = getMission(missionId);
-        List<Voyage> voyagesForMission = getVoyagesForMission(mission);
-
-        for (Voyage voyage : voyagesForMission) {
-
-            if (log.isInfoEnabled()) {
-                log.info("Scan voyage: " + voyage.getName());
-            }
-
-            for (Cell cell : voyage.getRegionCells()) {
-
-                for (Result result : cell.getResult()) {
-
-                    Species species = result.getCategory().getSpeciesCategory().getSpecies();
-
-                    if (communityIndicatorSpeciesPredicate.apply(species)) {
-
-                        communityDataMetadatasSet.add(result.getDataMetadata());
-
-                    } else if (populationIndicatorSpeciesPredicate.apply(species)) {
-
-                        populationDataMetadatasSet.add(result.getDataMetadata());
-
-                    }
-
-                }
-            }
-        }
-
-        List<DataMetadata> communityDataMetadatasList = new ArrayList<>(communityDataMetadatasSet);
-        if (log.isInfoEnabled()) {
-            for (DataMetadata dataMetadata : communityDataMetadatasList) {
-                boolean willUse = dataMetadatas.contains(dataMetadata);
-                if (willUse) {
-                    log.info("Community indicator accepted: " + dataMetadata.getName());
-                } else {
-                    log.info("Community indicator rejected: " + dataMetadata.getName());
-                }
-            }
-        }
-        communityDataMetadatasList.retainAll(dataMetadatas);
-
-        List<DataMetadata> populationDataMetadatasList = new ArrayList<>(populationDataMetadatasSet);
-        if (log.isInfoEnabled()) {
-            for (DataMetadata dataMetadata : populationDataMetadatasList) {
-                boolean willUse = dataMetadatas.contains(dataMetadata);
-                if (willUse) {
-                    log.info("Population indicator accepted: " + dataMetadata.getName());
-                } else {
-                    log.info("Population indicator rejected: " + dataMetadata.getName());
-                }
-            }
-        }
-        populationDataMetadatasList.retainAll(dataMetadatas);
-
-        return new RegionIndicators(communityDataMetadatasList, populationDataMetadatasList);
-
-    }
-
     private static class CountTableRows extends TopiaSqlQuery<Long> {
 
         public final String tableName;

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Echobase-commits] 05/08: amelioration code

codelutin.com scm