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

Commits:

23 changed files:

Changes:

  • application-swing-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>application-swing-configuration</artifactId>

  • application-swing-decoration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>application-swing-decoration</artifactId>

  • application-swing-validation/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>application-swing-validation</artifactId>

  • application-swing/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>application-swing</artifactId>

  • application-web-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>application-web-configuration</artifactId>

  • application-web/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    30 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>application-web</artifactId>

  • common/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    30 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>common</artifactId>

  • observe/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>observe</artifactId>

  • persistence/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>persistence</artifactId>

  • pom.xml
    ... ... @@ -31,7 +31,7 @@
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    33 33 
       <artifactId>ird-observe</artifactId>
    34 
    -  <version>7.0-RC-3-SNAPSHOT</version>
    34 
    +  <version>7.0-RC-2-SNAPSHOT</version>
    35 35 
       <packaging>pom</packaging>
    36 36
    37 37 
       <name>ObServe :: Pom</name>

  • services-binder/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    30 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-binder</artifactId>

  • services-rest/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    30 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-rest</artifactId>

  • services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilder.java
    ... ... @@ -39,12 +39,7 @@ import static fr.ird.observe.services.configuration.rest.ObserveDataSourceConfig
    39 39 
      */
    40 40 
     public class ObserveRequestBuilder extends HRequestBuilder {
    41 41
    42 
    -    private ObserveServiceRestClientContext serviceContext;
    43 
    -
    44 
    -    ObserveRequestBuilder setServiceContext(ObserveServiceRestClientContext serviceContext) {
    45 
    -        this.serviceContext = serviceContext;
    46 
    -        return this;
    47 
    -    }
    42 
    +    private final ObserveServiceRestClientContext serviceContext;
    48 43
    49 44 
         @Override
    50 45 
         protected void setAuthTokenInRequest() {
    ... ... @@ -70,7 +65,8 @@ public class ObserveRequestBuilder extends HRequestBuilder {
    70 65 
             addHeader(REQUEST_SPECIES_LIST_CONFIGURATION, serviceContext.getSpeciesListConfigurationAsString());
    71 66 
         }
    72 67
    73 
    -    ObserveRequestBuilder(String baseUrl) {
    74 
    -        super(baseUrl);
    68 
    +    ObserveRequestBuilder(ObserveServiceRestClientContext serviceContext, String baseUrl) {
    69 
    +        super(serviceContext.getServiceUrl()+baseUrl);
    70 
    +        this.serviceContext=serviceContext;
    75 71 
         }
    76 72 
     }

  • services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilderFactory.java
    ... ... @@ -23,6 +23,7 @@ package fr.ird.observe.services.rest;
    23 23 
      */
    24 24
    25 25 
     import io.ultreia.java4all.http.HRequestBuilderFactory;
    26 
    +import org.apache.commons.lang3.NotImplementedException;
    26 27
    27 28 
     /**
    28 29 
      * Created by tchemit on 17/07/17.
    ... ... @@ -33,7 +34,11 @@ public class ObserveRequestBuilderFactory implements HRequestBuilderFactory {
    33 34
    34 35 
         @Override
    35 36 
         public ObserveRequestBuilder create(String baseUrl) {
    36 
    -        return new ObserveRequestBuilder(baseUrl);
    37 
    +        throw new NotImplementedException("create");
    38 
    +    }
    39 
    +
    40 
    +    public ObserveRequestBuilder create(ObserveServiceRestClientContext serviceContext,String baseUrl) {
    41 
    +        return new ObserveRequestBuilder(serviceContext, baseUrl);
    37 42 
         }
    38 43
    39 44 
     }

  • services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java
    ... ... @@ -53,7 +53,7 @@ public class ObserveServiceRestClientSupport implements HRestClientService, Obse
    53 53
    54 54 
         @Override
    55 55 
         public HRequestBuilder create(String baseUrl) {
    56 
    -        return getRequestBuilderFactory().create(baseUrl).setServiceContext(serviceContext);
    56 
    +        return getRequestBuilderFactory().create(serviceContext, baseUrl);
    57 57 
         }
    58 58
    59 59 
         @Override

  • services-runner/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    30 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-runner</artifactId>

  • services-topia/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    30 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-topia</artifactId>

  • services-validation/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>services-validation</artifactId>

  • services/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    30 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services</artifactId>

  • test/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>test</artifactId>

  • toolbox-maven-plugin/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>toolbox-maven-plugin</artifactId>

  • topia-extension/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>topia-extension</artifactId>

  • topia-templates-extension/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>7.0-RC-3-SNAPSHOT</version>
    29 
    +    <version>7.0-RC-2-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>topia-templates-extension</artifactId>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.