dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #16606
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6351: Removed last traces of Jaxb2Utils, also removed the class itself
------------------------------------------------------------
revno: 6351
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-03-22 15:54:13 +0100
message:
Removed last traces of Jaxb2Utils, also removed the class itself
removed:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementController.java 2012-03-14 08:13:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementController.java 2012-03-22 14:54:13 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.api.utils.IdentifiableObjectParams;
import org.hisp.dhis.api.utils.ObjectPersister;
import org.hisp.dhis.api.utils.WebLinkPopulator;
-import org.hisp.dhis.api.view.Jaxb2Utils;
import org.hisp.dhis.common.Pager;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementService;
@@ -129,8 +128,8 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_DATAELEMENT_ADD')" )
public void postDataElementXML( HttpServletResponse response, InputStream input ) throws Exception
{
- DataElement dataElement = Jaxb2Utils.unmarshal( DataElement.class, input );
- postDataElement( dataElement, response );
+ //DataElement dataElement = Jaxb2Utils.unmarshal( DataElement.class, input );
+ //postDataElement( dataElement, response );
}
@RequestMapping( method = RequestMethod.POST, headers = {"Content-Type=application/json"} )
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java 2012-03-14 08:13:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupController.java 2012-03-22 14:54:13 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.api.utils.IdentifiableObjectParams;
import org.hisp.dhis.api.utils.ObjectPersister;
import org.hisp.dhis.api.utils.WebLinkPopulator;
-import org.hisp.dhis.api.view.Jaxb2Utils;
import org.hisp.dhis.common.Pager;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementGroups;
@@ -126,8 +125,8 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_DATAELEMENTGROUP_ADD')" )
public void postDataElementGroupXML( HttpServletResponse response, InputStream input ) throws Exception
{
- DataElementGroup dataElementGroup = Jaxb2Utils.unmarshal( DataElementGroup.class, input );
- postDataElementGroup( dataElementGroup, response );
+ //DataElementGroup dataElementGroup = Jaxb2Utils.unmarshal( DataElementGroup.class, input );
+ //postDataElementGroup( dataElementGroup, response );
}
@RequestMapping( method = RequestMethod.POST, headers = {"Content-Type=application/json"} )
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java 2012-03-14 08:13:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataElementGroupSetController.java 2012-03-22 14:54:13 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.api.utils.IdentifiableObjectParams;
import org.hisp.dhis.api.utils.ObjectPersister;
import org.hisp.dhis.api.utils.WebLinkPopulator;
-import org.hisp.dhis.api.view.Jaxb2Utils;
import org.hisp.dhis.common.Pager;
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.dataelement.DataElementGroupSets;
@@ -129,8 +128,8 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_DATAELEMENTGROUPSET_ADD')" )
public void postDataElementGroupSetXML( HttpServletResponse response, InputStream input ) throws Exception
{
- DataElementGroupSet dataElementGroupSet = Jaxb2Utils.unmarshal( DataElementGroupSet.class, input );
- postDataElementGroupSet( dataElementGroupSet, response );
+ //DataElementGroupSet dataElementGroupSet = Jaxb2Utils.unmarshal( DataElementGroupSet.class, input );
+ //postDataElementGroupSet( dataElementGroupSet, response );
}
@RequestMapping( method = RequestMethod.POST, headers = {"Content-Type=application/json"} )
@@ -161,8 +160,7 @@
response.setStatus( HttpServletResponse.SC_CREATED );
response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + dataElementGroupSet.getUid() );
}
- }
- catch ( Exception e )
+ } catch ( Exception e )
{
response.setStatus( HttpServletResponse.SC_CONFLICT );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java 2012-03-13 18:15:31 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitController.java 2012-03-22 14:54:13 +0000
@@ -3,7 +3,6 @@
import org.hisp.dhis.api.utils.IdentifiableObjectParams;
import org.hisp.dhis.api.utils.ObjectPersister;
import org.hisp.dhis.api.utils.WebLinkPopulator;
-import org.hisp.dhis.api.view.Jaxb2Utils;
import org.hisp.dhis.common.Pager;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -101,8 +100,8 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_ORGANISATIONUNIT_ADD')" )
public void postOrganisationUnitXML( HttpServletResponse response, InputStream input ) throws Exception
{
- OrganisationUnit organisationUnit = Jaxb2Utils.unmarshal( OrganisationUnit.class, input );
- postOrganisationUnit( organisationUnit, response );
+ //OrganisationUnit organisationUnit = Jaxb2Utils.unmarshal( OrganisationUnit.class, input );
+ //postOrganisationUnit( organisationUnit, response );
}
@RequestMapping( method = RequestMethod.POST, headers = {"Content-Type=application/json"} )
@@ -133,8 +132,7 @@
response.setStatus( HttpServletResponse.SC_CREATED );
response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + organisationUnit.getUid() );
}
- }
- catch ( Exception ex )
+ } catch ( Exception ex )
{
response.setStatus( HttpServletResponse.SC_CONFLICT );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java 2012-03-13 18:15:31 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupController.java 2012-03-22 14:54:13 +0000
@@ -3,7 +3,6 @@
import org.hisp.dhis.api.utils.IdentifiableObjectParams;
import org.hisp.dhis.api.utils.ObjectPersister;
import org.hisp.dhis.api.utils.WebLinkPopulator;
-import org.hisp.dhis.api.view.Jaxb2Utils;
import org.hisp.dhis.common.Pager;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
@@ -101,8 +100,8 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_ORGUNITGROUP_ADD')" )
public void postOrganisationUnitGroupXML( HttpServletResponse response, InputStream input ) throws Exception
{
- OrganisationUnitGroup organisationUnitGroup = Jaxb2Utils.unmarshal( OrganisationUnitGroup.class, input );
- postOrganisationUnitGroup( organisationUnitGroup, response );
+ //OrganisationUnitGroup organisationUnitGroup = Jaxb2Utils.unmarshal( OrganisationUnitGroup.class, input );
+ //postOrganisationUnitGroup( organisationUnitGroup, response );
}
@RequestMapping( method = RequestMethod.POST, headers = {"Content-Type=application/json"} )
@@ -133,8 +132,7 @@
response.setStatus( HttpServletResponse.SC_CREATED );
response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + organisationUnitGroup.getUid() );
}
- }
- catch ( Exception ex )
+ } catch ( Exception ex )
{
response.setStatus( HttpServletResponse.SC_CONFLICT );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java 2012-03-13 18:15:31 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OrganisationUnitGroupSetController.java 2012-03-22 14:54:13 +0000
@@ -30,7 +30,6 @@
import org.hisp.dhis.api.utils.IdentifiableObjectParams;
import org.hisp.dhis.api.utils.ObjectPersister;
import org.hisp.dhis.api.utils.WebLinkPopulator;
-import org.hisp.dhis.api.view.Jaxb2Utils;
import org.hisp.dhis.common.Pager;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
@@ -128,8 +127,8 @@
@PreAuthorize( "hasRole('ALL') or hasRole('F_ORGUNITGROUPSET_ADD')" )
public void postOrganisationUnitGroupSetXML( HttpServletResponse response, InputStream input ) throws Exception
{
- OrganisationUnitGroupSet organisationUnitGroupSet = Jaxb2Utils.unmarshal( OrganisationUnitGroupSet.class, input );
- postOrganisationUnitGroupSet( organisationUnitGroupSet, response );
+ //OrganisationUnitGroupSet organisationUnitGroupSet = Jaxb2Utils.unmarshal( OrganisationUnitGroupSet.class, input );
+ //postOrganisationUnitGroupSet( organisationUnitGroupSet, response );
}
@RequestMapping( method = RequestMethod.POST, headers = {"Content-Type=application/json"} )
@@ -160,8 +159,7 @@
response.setStatus( HttpServletResponse.SC_CREATED );
response.setHeader( "Location", DataElementController.RESOURCE_PATH + "/" + organisationUnitGroupSet.getUid() );
}
- }
- catch ( Exception e )
+ } catch ( Exception e )
{
response.setStatus( HttpServletResponse.SC_CONFLICT );
}
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java 2012-02-21 11:39:05 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java 1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-package org.hisp.dhis.api.view;
-
-/*
- * Copyright (c) 2004-2011, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-
-public class Jaxb2Utils
-{
- public static Marshaller createMarshaller( Object domainModel )
- throws JAXBException
- {
- JAXBContext context = JAXBContext.newInstance( domainModel.getClass() );
-
- Marshaller marshaller = context.createMarshaller();
- marshaller.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, false );
- marshaller.setProperty( Marshaller.JAXB_ENCODING, "UTF-8" );
-
- return marshaller;
- }
-
- public static void marshal( Object domainModel, OutputStream output )
- throws JAXBException
- {
- createMarshaller( domainModel ).marshal( domainModel, output );
- }
-
- public static Unmarshaller createUnmarshaller( Class<?> clazz )
- throws JAXBException
- {
- JAXBContext context = JAXBContext.newInstance( clazz );
-
- Unmarshaller unmarshaller = context.createUnmarshaller();
-
- return unmarshaller;
- }
-
- @SuppressWarnings("unchecked")
- public static <T> T unmarshal( Class<?> clazz, InputStream input )
- throws JAXBException
- {
- return (T) createUnmarshaller( clazz ).unmarshal( input );
- }
-}
