[Git][ultreiaio/ird-observe][develop-7.x] * migration du code pour être compatible avec java > 8

27 Feb 2020


      Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe


Commits:
d96c7c6b by tchemit at 2020-02-27T13:26:05+01:00
* migration du code pour être compatible avec java > 8
* mise à jour de jaxx (à tester plus en profondeur)

- - - - -


14 changed files:

- client-core/pom.xml
- client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIInitializer.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java
- persistence/pom.xml
- pom.xml
- server-core/pom.xml
- server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
- services-client/pom.xml
- − services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java


Changes:

=====================================
client-core/pom.xml
=====================================
@@ -618,7 +618,7 @@
     </dependency>
     <dependency>
       <groupId>com.vladsch.flexmark</groupId>
-      <artifactId>flexmark-util</artifactId>
+      <artifactId>flexmark-util-ast</artifactId>
     </dependency>
 
     <!-- Logging -->


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIInitializer.java
=====================================
@@ -273,8 +273,8 @@ public class AdminTabUIInitializer<UI extends AdminTabUI> {
         beanList.setI18nPrefix("observe.common.");
         Class referenceType = beanList.getBeanType();
 //        beanList.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType));
-        beanList.getAddButton().setFocusable(false);
-        beanList.getRemoveButton().setFocusable(false);
+        beanList.getAddAction().setFocusable(false);
+        beanList.getRemoveAction().setFocusable(false);
 
         log.debug("init list for " + beanList.getBeanType());
     }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java
=====================================
@@ -477,8 +477,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>>
         beanList.setI18nPrefix("observe.common.");
         Class referenceType = beanList.getBeanType();
 //        beanList.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType));
-        beanList.getAddButton().setFocusable(false);
-        beanList.getRemoveButton().setFocusable(false);
+        beanList.getAddAction().setFocusable(false);
+        beanList.getRemoveAction().setFocusable(false);
 
         log.debug("init list for " + beanList.getBeanType());
 


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java
=====================================
@@ -429,9 +429,9 @@ public class NavigationTree extends JXTree {
         if (deep) {
             // repaint childs nodes
             @SuppressWarnings("unchecked")
-            Enumeration<NavigationTreeNodeSupport<?>> e = node.children();
+            Enumeration e = node.children();
             while (e.hasMoreElements()) {
-                NavigationTreeNodeSupport<?> child = e.nextElement();
+                NavigationTreeNodeSupport<?> child = (NavigationTreeNodeSupport<?>)e.nextElement();
                 reloadNode(child, true);
             }
         }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java
=====================================
@@ -133,9 +133,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor
             // au final le noeud est une feuille, donc ne convient pas
             return null;
         }
-        Enumeration<NavigationTreeNodeSupport> children = children();
+        Enumeration children = children();
         while (children.hasMoreElements()) {
-            NavigationTreeNodeSupport node = children.nextElement();
+            NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) children.nextElement();
             if (id.equals(node.getId()) || (node.getUserObject() instanceof String && id.equals(node.getUserObject()))) {
                 return node;
             }
@@ -163,9 +163,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor
             // au final le noeud est une feuille, donc ne convient pas
             return null;
         }
-        Enumeration<NavigationTreeNodeSupport<?>> children = children();
+        Enumeration children = children();
         while (children.hasMoreElements()) {
-            NavigationTreeNodeSupport<?> node = children.nextElement();
+            NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement();
             if (childType.isAssignableFrom(node.getClass())) {
                 return node;
             }
@@ -187,9 +187,9 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor
             // au final le noeud est une feuille, donc ne convient pas
             return null;
         }
-        Enumeration<NavigationTreeNodeSupport<?>> children = children();
+        Enumeration children = children();
         while (children.hasMoreElements()) {
-            NavigationTreeNodeSupport<?> node = children.nextElement();
+            NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement();
             if (childType.isAssignableFrom(node.getDataType())) {
                 return node;
             }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java
=====================================
@@ -77,6 +77,6 @@ public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNo
 
     @Override
     public Iterator<TripLonglineNavigationTreeNode> iterator() {
-        return EnumerationUtils.toList(children()).iterator();
+        return (Iterator)EnumerationUtils.toList(children()).iterator();
     }
 }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java
=====================================
@@ -76,6 +76,6 @@ public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeS
 
     @Override
     public Iterator<TripSeineNavigationTreeNode> iterator() {
-        return EnumerationUtils.toList(children()).iterator();
+        return (Iterator)EnumerationUtils.toList(children()).iterator();
     }
 }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java
=====================================
@@ -66,13 +66,8 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode
 
     public abstract void setSelected(boolean selected);
 
-    @Override
-    public Enumeration<SelectionTreeNodeSupport> children() {
-        return (Enumeration) super.children();
-    }
-
     public ReferenceSelectionTreeNodeSupport findById(String id) {
-        Enumeration<SelectionTreeNodeSupport> children = children();
+        Enumeration children = children();
         while (children.hasMoreElements()) {
             ReferenceSelectionTreeNodeSupport<?, ?> child = (ReferenceSelectionTreeNodeSupport) children.nextElement();
             if (id.equals(child.getData().getId())) {


=====================================
persistence/pom.xml
=====================================
@@ -183,6 +183,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
   </dependencies>
 
   <build>


=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2020.8.7</version>
+    <version>2020.3</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -163,7 +163,7 @@
     <!--can't use 1.4.197 (date has changed + blob also-->
     <lib.version.h2>1.4.196</lib.version.h2>
     <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene>
-    <lib.version.java4all.jaxx>3.0-alpha-56</lib.version.java4all.jaxx>
+<!--    <lib.version.java4all.jaxx>3.0-alpha-56</lib.version.java4all.jaxx>-->
     <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->
     <lib.version.java4all.topia>1.1.16</lib.version.java4all.topia>
     <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>
@@ -483,7 +483,6 @@
                 <reports>
                   <report>dependency-updates-report</report>
                   <report>plugin-updates-report</report>
-                  <report>property-updates-report</report>
                 </reports>
               </reportSet>
             </reportSets>


=====================================
server-core/pom.xml
=====================================
@@ -156,6 +156,12 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>com.thoughtworks.paranamer</groupId>
+      <artifactId>paranamer</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
@@ -185,6 +191,11 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
   </dependencies>
 


=====================================
server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
=====================================
@@ -29,8 +29,8 @@ import org.apache.logging.log4j.Logger;
 import org.debux.webmotion.server.call.Call;
 import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
 import org.debux.webmotion.server.mapping.Mapping;
-import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
 
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.Objects;
@@ -74,7 +74,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I
                 String[] values = (String[]) parameterTree.getValue();
                 StringBuilder value = new StringBuilder(values[0]);
                 if ((value.length() > 0) && !value.toString().contains("[")) {
-                    if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) {
+                    if (((ParameterizedType) generic).getActualTypeArguments()[0].equals(String.class)) {
                         value = new StringBuilder();
                         for (String s : values) {
                             value.append(", \"").append(s).append("\"");


=====================================
services-client/pom.xml
=====================================
@@ -140,7 +140,11 @@
       <artifactId>junit</artifactId>
     </dependency>
 
-
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>


=====================================
services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java deleted
=====================================
@@ -1,42 +0,0 @@
-package fr.ird.observe.services.client.referential;
-
-/*-
- * #%L
- * ObServe :: Services client implementation
- * %%
- * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import fr.ird.observe.dto.reference.ReferentialDtoReference;
-import fr.ird.observe.dto.referential.ReferentialDto;
-import org.apache.http.HttpStatus;
-
-import java.util.concurrent.TimeUnit;
-
-public class ReferentialServiceClient extends GeneratedReferentialServiceClient {
-
-    @Override
-    public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> R loadReference(Class<R> type, String id) {
-        return executeRequest(create("loadReference")
-                                      .addParameter("type", type)
-                                      .addParameter("id", id)
-                                      .addAuthToken()
-                                      .setTimeout(TimeUnit.MINUTES, 1)
-                                      .get(), HttpStatus.SC_OK).toJson(type);
-    }
-}



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d96c7c6be4cbe889bf42c4355b...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d96c7c6be4cbe889bf42c4355b...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)