r1317 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-dto/src/main/java/org/nuiton/wikitty/dto wikitty-dto/src/test/java/org/nuiton/wikitty/dto - Wikitty-commits

12 Jan 2012

Author: jcouteau
Date: 2012-01-12 15:02:29 +0100 (Thu, 12 Jan 2012)
New Revision: 1317

Url: http://nuiton.org/repositories/revision/wikitty/1317

Log:
DTOHelper do not use deprecated API anymore


Modified:
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java
   trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java
   trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java
===================================================================

--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java	2012-01-12 13:55:21 UTC (rev 1316)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java	2012-01-12 14:02:29 UTC (rev 1317)
@@ -515,8 +515,8 @@
      * Null field are not used in search request.
      *
      * @param e sample wikitty
-     * @param firstIndex
-     * @param endIndex
+     * @param first
+     * @param limit
      * @param fieldFacet
      * @return
      */

Modified: trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java
===================================================================
--- trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java	2012-01-12 13:55:21 UTC (rev 1316)
+++ trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java	2012-01-12 14:02:29 UTC (rev 1317)
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.ObjectUtil;
-import org.nuiton.wikitty.WikittyProxy;
+import org.nuiton.wikitty.WikittyClient;
 import org.nuiton.wikitty.WikittyUtil;
 import org.nuiton.wikitty.entities.BusinessEntity;
 import org.nuiton.wikitty.entities.Wikitty;
@@ -59,16 +59,15 @@
         return result;
     }
 
-    public static <E extends BusinessEntity> E fromDto(WikittyProxy proxy, Class<E> clazz, E dto) {
+    public static <E extends BusinessEntity> E fromDto(WikittyClient client, Class<E> clazz, E dto) {
 
-        E result = proxy.restore(clazz, dto.getWikittyId());
+        E result = client.restore(clazz, dto.getWikittyId());
 
         if (result == null){
             try {
                 String wikittyId = dto.getWikittyId();
                 Wikitty wikitty = new WikittyImpl(wikittyId);
-                result = WikittyUtil.newInstance( proxy.getSecurityToken(),
-                        proxy.getWikittyService(), clazz, wikitty);
+                result = WikittyUtil.newInstance(clazz, wikitty);
             } catch (Exception eee) {
                 log.error("Could not transform DTO to Wikitty", eee);
             }

Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java
===================================================================
--- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java	2012-01-12 13:55:21 UTC (rev 1316)
+++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java	2012-01-12 14:02:29 UTC (rev 1317)
@@ -24,34 +24,25 @@
  */
 package org.nuiton.wikitty.dto;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.nuiton.wikitty.WikittyConfig;
-import org.nuiton.wikitty.WikittyProxy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Assert;
 import org.nuiton.util.ApplicationConfig;
-import org.nuiton.wikitty.WikittyService;
-import org.nuiton.wikitty.WikittyServiceFactory;
+import org.nuiton.wikitty.WikittyClient;
+import org.nuiton.wikitty.WikittyConfig;
 import org.nuiton.wikitty.WikittyUtil;
 import org.nuiton.wikitty.entities.WikittyLabel;
 import org.nuiton.wikitty.entities.WikittyLabelImpl;
 
 public class WikittyDTOTest {
 
-    static private Log log = LogFactory.getLog(WikittyDTOTest.class);
+    WikittyClient client;
 
-    WikittyProxy proxy;
-
     @Before
     public void clear() throws Exception {
 
-        ApplicationConfig config = WikittyConfig.getConfig("refcomp-test.properties");
-
-        WikittyService ws = WikittyServiceFactory.buildWikittyService(config);
-        ws.clear(null);
-        proxy = new WikittyProxy(ws);
+        ApplicationConfig config = WikittyConfig.getConfig();
+        client = new WikittyClient(config);
     }
 
     @Test
@@ -73,7 +64,7 @@
 
         //First dto=>entity conversion test, no modification
         //make conversion to wikitty
-        WikittyLabel secondLabel = DTOHelper.fromDto(proxy, WikittyLabel.class, dto);
+        WikittyLabel secondLabel = DTOHelper.fromDto(client, WikittyLabel.class, dto);
 
         //check that dto fields are the same than the wikitty ones
         Assert.assertNotNull(secondLabel);
@@ -88,7 +79,7 @@
         dto.addLabels("toto");
 
         //make conversion to wikitty
-        WikittyLabel thirdLabel = DTOHelper.fromDto(proxy,WikittyLabel.class,dto);
+        WikittyLabel thirdLabel = DTOHelper.fromDto(client,WikittyLabel.class,dto);
 
         //check that dto fields are the same than the wikitty ones
         Assert.assertNotNull(thirdLabel);

    

r1317 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-dto/src/main/java/org/nuiton/wikitty/dto wikitty-dto/src/test/java/org/nuiton/wikitty/dto

jcouteau＠users.nuiton.org

tags

participants (1)