Changeset 389 for tapas/service

Timestamp:

03/02/12 18:07:28 (12 years ago)

Author:

rboipsl

Message:

 

Location:

tapas/service

Files:

• implementation/com/ether/TapasServiceImpl.java (modified) (3 diffs)
• implementation/service-context.xml (modified) (1 diff)
• implementation/service-context_test.xml (copied) (copied from tapas/service/implementation/service-context.xml) (1 diff)
• interface/com/ether/TapasService.java (modified) (2 diffs)
• test/com/ether/EtherTest.java (modified) (3 diffs)
• test/com/ether/OtherTest.java (modified) (2 diffs)
• test/com/ether/ServiceEtherTest.java (modified) (1 diff)
• test/com/ether/ServiceTestHelper.java (modified) (1 diff)

tapas/service/implementation/com/ether/TapasServiceImpl.java

@@ -5 +5 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jdom.*;
+import org.jdom.output.Format;
+import org.jdom.output.XMLOutputter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -10 +13 @@
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.FileOutputStream;
 import java.util.List;
+import java.util.prefs.Preferences;
 
 /**
- * @author vmipsl
- * @date 07 mar 2011
+ * @author rboipsl
+ * @date 2 mars 2012
  */
 public class TapasServiceImpl
         implements TapasService
 {
+
+    public void createXMLRequest()
+
+    {
+        String idF = "Ether_TAPAS_0000001";
+        String idRF = "1";
+        String validFF = "ASCII";
+        String validRF = "YES";
+
+        String xvalidFF = "ASCII,FITS,NETCDF";
+        String xvalidRF = "YES,NO";
+        String fichier = "request1.xml";
+
+        final Element racine = new Element( "tapas" );
+        final Element request = new Element( "request" );
+        final Element preferences = new Element( "preferences" );
+        final Element format = new Element( "format" );
+        final Element rayleighExtinction = new Element( "rayleigh_extinction" );
+
+        //On crée un nouveau Document JDOM basé sur la racine que l'on vient de créer
+        final Document document = new Document( racine );
+
+        final Attribute id = new Attribute( "Id", idF );
+        racine.setAttribute( id );
+
+        final Attribute idR = new Attribute( "Id", idRF );
+        request.setAttribute( idR );
+
+        racine.addContent( request );
+        request.addContent( preferences );
+
+        final Attribute validF = new Attribute( "valid", xvalidFF );
+        format.setAttribute( validF );
+        format.setText( validFF );
+
+        final Attribute validR = new Attribute( "valid", xvalidRF );
+        rayleighExtinction.setAttribute( validR );
+        rayleighExtinction.setText( validRF );
+
+        createXMLFile( fichier, document );
+    }
+
+
+    public void createXMLFile( final String fichier, final Document document )
+    {
+        try
+        {
+            //On utilise ici un affichage classique avec getPrettyFormat()
+            final XMLOutputter sortie = new XMLOutputter( Format.getPrettyFormat() );
+            //Remarquez qu'il suffit simplement de créer une instance de FileOutputStream
+            //avec en argument le nom du fichier pour effectuer la sérialisation.
+            sortie.output( document, new FileOutputStream( fichier ) );
+        }
+        catch( java.io.IOException ignored )
+        {
+        }
+    }
+
+
     @Nullable
     @Transactional(readOnly = true)
@@ -83 +147 @@
     private PlateformDAO _plateformDAO;
     private ParameterDAO _parameterDAO;
+
 }

tapas/service/implementation/service-context.xml

@@ -4 +4 @@
 <beans>
         <bean id="tapasServiceTarget" class="com.ether.TapasServiceImpl">
-                <property name="plateformDAO" ref="refPlateformDAO" />
-                <property name="parameterDAO" ref="refParameterDAO" />
+                <!--<property name="plateformDAO" ref="refPlateformDAO" />
+                <property name="parameterDAO" ref="refParameterDAO" />-->
         </bean>
 

tapas/service/implementation/service-context_test.xml

@@ -3 +3 @@
 
 <beans>
-        <bean id="tapasServiceTarget" class="com.ether.TapasServiceImpl">
-                <property name="plateformDAO" ref="refPlateformDAO" />
-                <property name="parameterDAO" ref="refParameterDAO" />
+        <bean id="tapasService" class="com.ether.TapasServiceImpl">
+                <!--<property name="plateformDAO" ref="refPlateformDAO" />
+                <property name="parameterDAO" ref="refParameterDAO" />-->
         </bean>
 
-        <bean id="tapasService" parent="transactionProxy">
-                <property name="target">
-                        <ref bean="tapasServiceTarget" />
-                </property>
-                <property name="transactionAttributeSource">
-                        <bean class="org.springframework.transaction.annotation.AnnotationTransactionAttributeSource" />
-                </property>
-        </bean>
 
 </beans>

tapas/service/interface/com/ether/TapasService.java

@@ -1 +1 @@
 package com.ether;
 
+import org.jdom.Document;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -13 +14 @@
         extends Service
 {
+
+    public void createXMLRequest();
+
+    public void createXMLFile( final String fichier, final Document document );
+
         @Nullable
         List<Plateform> getAllPlateforms() throws ServiceException;

tapas/service/test/com/ether/EtherTest.java

@@ -2 +2 @@
 
 import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import org.junit.Test;
 
 import javax.imageio.ImageIO;
@@ -9 +11 @@
 import java.io.File;
 import java.io.Serializable;
+import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 /**
@@ -16 +22 @@
  */
 public class EtherTest
+        extends ServiceEtherTest
 {
+    @Test
+    public void testCreateXML()
+            throws Exception
+    {
+
+        getService().createXMLRequest();
+
+    }
+
+
     @NotNull
     protected double[] createDataArray( @NotNull final Integer size, @NotNull final Integer begin )

tapas/service/test/com/ether/OtherTest.java

@@ -20 +20 @@
 {
     @Test
-    public void testDatesMoisPlusUn()
+    public void testCreateXML()
             throws Exception
     {
+
         final DateFormat shortDateFormat = new SimpleDateFormat( "MMyyyy" );
         final DateFormat completDateFormat = new SimpleDateFormat( "dd-MM-yyyy" );
@@ -37 +38 @@
     }
 
-    @Test
-    public void testDates()
-            throws Exception
-    {
-        List<Date> dates = new ArrayList<Date>();
-        final DateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
 
-        dates.add( dateFormat.parse( "2007-01-01" ) );
-        dates.add( dateFormat.parse( "2007-01-02" ) );
 
-        final DateFormat shortFormat = new SimpleDateFormat( "yyyy" );
-        Set<String> shortDates = new HashSet<String>();
-        for ( final Date aDate : dates )
-        {
-            shortDates.add( shortFormat.format( aDate ) );
-        }
-    }
 }

tapas/service/test/com/ether/ServiceEtherTest.java

@@ -10 +10 @@
     public ServiceEtherTest()
     {
-        super( "etherService" );
+        super( "tapasService" );
     }
 

tapas/service/test/com/ether/ServiceTestHelper.java

@@ -19 +19 @@
     {
                 return new String[] { 
-                                "classpath:dao-context.xml",
-                                "classpath:service-context.xml",
-                                "classpath:hibernate_test.cfg.xml", };
+//                              "classpath:dao-context.xml",
+                                "classpath:service-context_test.xml",
+//                              "classpath:hibernate_test.cfg.xml",
+        };
     }