-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added tests and documentation for REST interfaces.
- Loading branch information
Showing
53 changed files
with
848 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
common/src/main/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package org.dhis2.fhir.adapter.converter; | ||
|
|
||
| /* | ||
| * Copyright (c) 2004-2018, 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 javax.annotation.Nonnull; | ||
| import javax.annotation.Nullable; | ||
| import java.time.ZoneId; | ||
| import java.time.ZonedDateTime; | ||
| import java.util.Date; | ||
|
|
||
| /** | ||
| * Converts a zoned date time to a date with system time zone. | ||
| * | ||
| * @author volsch | ||
| */ | ||
| public class ZonedDateTimeToDateConverter extends TypedConverter<ZonedDateTime, Date> | ||
| { | ||
| private final ZoneId zoneId = ZoneId.systemDefault(); | ||
|
|
||
| public ZonedDateTimeToDateConverter() | ||
| { | ||
| super( ZonedDateTime.class, Date.class ); | ||
| } | ||
|
|
||
| @Override | ||
| @Nullable | ||
| public Date doConvert( @Nonnull ZonedDateTime source ) | ||
| { | ||
| return Date.from( source.toInstant() ); | ||
| } | ||
| } |
78 changes: 78 additions & 0 deletions
78
common/src/main/java/org/dhis2/fhir/adapter/jackson/JacksonConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| package org.dhis2.fhir.adapter.jackson; | ||
|
|
||
| /* | ||
| * Copyright (c) 2004-2018, 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 com.fasterxml.jackson.databind.SerializationFeature; | ||
| import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; | ||
| import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; | ||
| import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; | ||
| import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; | ||
| import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.core.annotation.Order; | ||
| import org.springframework.validation.annotation.Validated; | ||
|
|
||
| import java.time.ZoneId; | ||
| import java.time.format.DateTimeFormatter; | ||
|
|
||
| /** | ||
| * Configures Jackson for the application. | ||
| * | ||
| * @author volsch | ||
| */ | ||
| @Configuration | ||
| @Validated | ||
| public class JacksonConfig | ||
| { | ||
| @Bean | ||
| @Order( 1 ) | ||
| public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() | ||
| { | ||
| return jacksonObjectMapperBuilder -> { | ||
| final ZoneId zoneId = ZoneId.systemDefault(); | ||
| jacksonObjectMapperBuilder | ||
| .serializers( | ||
| new ZonedDateTimeSerializer(), | ||
| new LocalDateSerializer( DateTimeFormatter.ISO_LOCAL_DATE ) ) | ||
| .deserializers( | ||
| new ZonedDateTimeDeserializer(), | ||
| new LocalDateDeserializer( DateTimeFormatter.ISO_LOCAL_DATE ) ); | ||
| jacksonObjectMapperBuilder.filters( new SimpleFilterProvider() | ||
| .addFilter( SecuredPropertyFilter.FILTER_NAME, new SecuredPropertyFilter() ) | ||
| .addFilter( ToManyPropertyFilter.FILTER_NAME, new SimpleBeanPropertyFilter() | ||
| { | ||
| } ) | ||
| .addFilter( ToOnePropertyFilter.FILTER_NAME, new SimpleBeanPropertyFilter() | ||
| { | ||
| } ) ); | ||
| jacksonObjectMapperBuilder.featuresToDisable( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS ); | ||
| }; | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
common/src/test/java/org/dhis2/fhir/adapter/converter/ZonedDateTimeToDateConverterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package org.dhis2.fhir.adapter.converter; | ||
|
|
||
| /* | ||
| * Copyright (c) 2004-2018, 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 org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.time.ZoneId; | ||
| import java.time.ZonedDateTime; | ||
| import java.util.Date; | ||
| import java.util.GregorianCalendar; | ||
|
|
||
| /** | ||
| * Unit tests for {@link ZonedDateTimeToDateConverter}. | ||
| * | ||
| * @author volsch | ||
| */ | ||
| public class ZonedDateTimeToDateConverterTest | ||
| { | ||
| private ZonedDateTimeToDateConverter converter = new ZonedDateTimeToDateConverter(); | ||
|
|
||
| @Test | ||
| public void docConvert() | ||
| { | ||
| final Date date = new GregorianCalendar( 2018, 7, 15, 17, 24, 23 ).getTime(); | ||
| Assert.assertEquals( date, converter.convert( ZonedDateTime.of( 2018, 8, 15, 17, 24, 23, 0, ZoneId.systemDefault() ) ) ); | ||
| } | ||
|
|
||
| @Test | ||
| public void doConvertNull() | ||
| { | ||
| Assert.assertNull( converter.convert( null ) ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.