ajout des commandes au webservices :

- récupération de tous les thésaurus - récupération de toutes les langues d'un thésaurus
miledrousset · Apr 10, 2020 · b2a2f06 · b2a2f06
1 parent 926b7bc
commit b2a2f06
Show file tree

Hide file tree

Showing 11 changed files with 377 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 <!-- ici c'est pour la version du WAR, pour la version d'Opentheso, il faut modifier le fichier web.xml-->
     <groupId>trd</groupId>
     <artifactId>opentheso</artifactId>
-    <version>4.5.8</version>
+    <version>4.5.9</version>
     <packaging>war</packaging>
 
     <name>opentheso</name>

diff --git a/src/main/java/mom/trd/opentheso/SelectedBeans/SelectedTerme.java b/src/main/java/mom/trd/opentheso/SelectedBeans/SelectedTerme.java
@@ -8,16 +8,24 @@
 import com.k_int.IR.Searchable;
 import com.k_int.IR.TimeoutExceededException;
 import com.k_int.hss.HeterogeneousSetOfSearchable;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import mom.trd.opentheso.bdd.tools.AsciiUtils;
 import java.io.Serializable;
+import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.text.DateFormat;
@@ -41,8 +49,16 @@
 import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonException;
+import javax.json.JsonNumber;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
+import javax.json.JsonString;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 
 import mom.trd.opentheso.core.alignment.AlignmentQuery;
 import mom.trd.opentheso.bdd.datas.Concept;
@@ -82,6 +98,7 @@
 import mom.trd.opentheso.bdd.tools.StringPlus;
 import mom.trd.opentheso.beans.vuegroups.TreeNodeData;
 import mom.trd.opentheso.core.alignment.AlignementSource;
+import mom.trd.opentheso.ws.handle.HandleClient;
 import org.primefaces.PrimeFaces;
 import org.primefaces.event.NodeExpandEvent;
 import org.primefaces.event.NodeSelectEvent;
@@ -511,16 +528,24 @@ private void majNoticeBdd() {
         } else {
             urlNotice = urlNotice.replace("##value##", nom);
         }
-
+       
         // récupération du total des notices 
-        String urlCounterBdd = roleOnTheso.getNodePreference().getUrlCounterBdd();
-        urlCounterBdd = urlCounterBdd.replace("##conceptId##", idC);
+    //    String urlCounterBdd = roleOnTheso.getNodePreference().getUrlCounterBdd();
+    //    urlCounterBdd = urlCounterBdd.replace("##conceptId##", idC);
 
+            nbNotices = getCountOfResources();
+            if(nbNotices < 0)
+                nbNotices = 0;
+
+
+        ///// à revoir par #MR    
+
+
         //urlCounterBdd = "http://healthandco.test.o2sources.com/concept/40/total";
         // exemple des données récupérées 
         // "{\"content\":[{\"nb_notices\":\"s7\"}],\"debug\":\"\",\"error\":0}\" ";   
         //{"content":[{"nb_notices":"7"}],"debug":"","error":0}
-
+       /* 
         URL url;
         try {
             url = new URL(urlCounterBdd);
@@ -554,13 +579,99 @@ private void majNoticeBdd() {
         } catch (IOException ex) {
             Logger.getLogger(SelectedTerme.class.getName()).log(Level.SEVERE, null, ex);
         }
+        */
+
 
         // try {
         //  urlNotice = URLEncoder.encode(urlNotice);
         // } catch (UnsupportedEncodingException ex) {
         //     Logger.getLogger(SelectedTerme.class.getName()).log(Level.SEVERE, null, ex);
         // }
     }
+
+    private int getCountOfResources() {
+
+        String output;
+        String json = "";
+
+        TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
+            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                return null;
+            }
+
+            public void checkClientTrusted(X509Certificate[] certs, String authType) {
+            }
+
+            public void checkServerTrusted(X509Certificate[] certs, String authType) {
+            }
+        }
+        };
+
+        // Install the all-trusting trust manager
+        SSLContext sc;
+        try {
+            sc = SSLContext.getInstance("SSL");
+            sc.init(null, trustAllCerts, new java.security.SecureRandom());
+            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+        } catch (NoSuchAlgorithmException ex) {
+            Logger.getLogger(SelectedTerme.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (KeyManagementException ex) {
+            Logger.getLogger(SelectedTerme.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        // Create all-trusting host name verifier
+        HostnameVerifier allHostsValid = new HostnameVerifier() {
+            public boolean verify(String hostname, SSLSession session) {
+                return true;
+            }
+        };
+        // Install the all-trusting host verifier
+        HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);        
+
+
+        // récupération du total des notices 
+        String urlCounterBdd = roleOnTheso.getNodePreference().getUrlCounterBdd();
+        urlCounterBdd = urlCounterBdd.replace("##conceptId##", idC);
+
+        try {
+            urlCounterBdd = urlCounterBdd.replace("http://", "https://");
+            URL url = new URL(urlCounterBdd);
+
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+            conn.setRequestProperty("Content-Type", "application/json");
+            conn.setUseCaches(false);
+            conn.setDoInput(true);
+            conn.setDoOutput(true);
+            int status = conn.getResponseCode();
+            InputStream in = status >= 400 ? conn.getErrorStream() : conn.getInputStream();
+
+            BufferedReader br = new BufferedReader(new InputStreamReader(in));
+            while ((output = br.readLine()) != null) {
+                json += output;
+            }
+            return getCountFromJson(json);            
+
+        } catch (UnsupportedEncodingException ex) {
+            Logger.getLogger(HandleClient.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (MalformedURLException ex) {
+            Logger.getLogger(HandleClient.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (IOException ex) {
+            Logger.getLogger(HandleClient.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (Exception ex) {
+            Logger.getLogger(HandleClient.class.getName()).log(Level.SEVERE, null, ex);
+        } 
+        return 0;
+    }
+    private int getCountFromJson(String jsonText) {
+        if(jsonText == null) return 0;
+        JsonObject jsonObject;
+        try ( //{"responseCode":1,"handle":"20.500.11942/opentheso443"}
+            JsonReader reader = Json.createReader(new StringReader(jsonText))) {
+            jsonObject = reader.readObject();
+            return jsonObject.getInt("count");            
+        }
+    }    
+
 
     private void majTAsso() {
         termesAssocies = new ArrayList<>();

diff --git a/src/main/java/mom/trd/opentheso/bdd/helper/ConceptHelper.java b/src/main/java/mom/trd/opentheso/bdd/helper/ConceptHelper.java
@@ -3930,19 +3930,23 @@ public ArrayList<NodeConceptExport> exportAllConcepts(HikariDataSource ds,
         if (nodeConcept == null || nodeConcept.getConcept() == null) {
             System.err.println("Attention Null proche de = : " + idConcept);
             return null;
-        }
-
-        nodeConceptExports.add(nodeConcept);
+        } else 
+            nodeConceptExports.add(nodeConcept);
 
         for (String listIdsOfConceptChildren1 : listIdsOfConceptChildren) {
             nodeConcept = conceptHelper.getConceptForExport(ds, listIdsOfConceptChildren1, idThesaurus, false);
-            nodeConceptExports.add(nodeConcept);
-            if (!nodeConcept.getNodeListOfNT().isEmpty()) {
-                for (int j = 0; j < nodeConcept.getNodeListOfNT().size(); j++) {
+            if (nodeConcept == null || nodeConcept.getConcept() == null) {
+                System.err.println("Attention Null proche de = : " + idConcept);
+                return null;
+            } else {
+                nodeConceptExports.add(nodeConcept);
+                if (!nodeConcept.getNodeListOfNT().isEmpty()) {
+                    for (int j = 0; j < nodeConcept.getNodeListOfNT().size(); j++) {
 
-                    exportAllConcepts(ds,
-                            nodeConcept.getNodeListOfNT().get(j).getUri().getIdConcept(),
-                            idThesaurus, nodeConceptExports);
+                        exportAllConcepts(ds,
+                                nodeConcept.getNodeListOfNT().get(j).getUri().getIdConcept(),
+                                idThesaurus, nodeConceptExports);
+                    }
                 }
             }
         }

diff --git a/src/main/java/mom/trd/opentheso/core/alignment/GpsQuery.java b/src/main/java/mom/trd/opentheso/core/alignment/GpsQuery.java
@@ -20,15 +20,11 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static javax.management.Query.lt;
-import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import mom.trd.opentheso.bdd.helper.nodes.NodeAlignment;
 import mom.trd.opentheso.bdd.helper.nodes.NodeLang;
-import mom.trd.opentheso.core.exports.privatesdatas.importxml.importxml;
 import org.jdom2.Document;
 import org.jdom2.Element;
 import org.jdom2.JDOMException;

diff --git a/src/main/java/mom/trd/opentheso/core/json/helper/JsonHelper.java b/src/main/java/mom/trd/opentheso/core/json/helper/JsonHelper.java
@@ -35,6 +35,14 @@ public void addJsonData(String uri, String value) {
 
     }
 
+
+    public void addJsonObject(
+            String id, String value){
+        JsonObjectBuilder builder = Json.createObjectBuilder();
+        builder.add(id, value);
+        jab.add(builder);
+    }
+
     public JsonArray getBuilder() {
         if(jab != null)
             return jab.build();