Commit 0ee5be3d authored by Noel Alonso's avatar Noel Alonso
Browse files

Limpia código de mapper y test

parent 5c50e759

vessels-view/src/main/java/es/redmic/vesselsview/mapper/vessel/VesselESMapper.java

+0 −8
Original line number Diff line number Diff line
@@ -4,16 +4,8 @@ import org.springframework.stereotype.Component; 


import es.redmic.vesselslib.dto.vessel.VesselDTO;

import es.redmic.vesselsview.model.vessel.Vessel;

import es.redmic.vesselsview.model.vesseltype.VesselType;

import ma.glasnost.orika.CustomMapper;

import ma.glasnost.orika.MappingContext;



@Component

public class VesselESMapper extends CustomMapper<Vessel, VesselDTO> {



	@Override

	public void mapBtoA(VesselDTO b, Vessel a, MappingContext context) {



		a.setType(mapperFacade.map(b.getType(), VesselType.class));

	}

}

vessels-view/src/main/java/es/redmic/vesselsview/mapper/vesseltype/VesselTypeESMapper.java

+0 −13
Original line number Diff line number Diff line
@@ -5,20 +5,7 @@ import org.springframework.stereotype.Component; 
import es.redmic.vesselslib.dto.vesseltype.VesselTypeDTO;

import es.redmic.vesselsview.model.vesseltype.VesselType;

import ma.glasnost.orika.CustomMapper;

import ma.glasnost.orika.MappingContext;



@Component

public class VesselTypeESMapper extends CustomMapper<VesselType, VesselTypeDTO> {



	@Override

	public void mapBtoA(VesselTypeDTO b, VesselType a, MappingContext context) {



		super.mapBtoA(b, a, context);

	}



	@Override

	public void mapAtoB(VesselType a, VesselTypeDTO b, MappingContext context) {



		super.mapAtoB(a, b, context);

	}

}

vessels-view/src/test/java/es/redmic/test/vesselsview/unit/mapper/VesselMapperTest.java

+1 −6
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import es.redmic.testutils.utils.JsonToBeanTestUtil; 
import es.redmic.vesselslib.dto.vessel.VesselDTO;

import es.redmic.vesselsview.config.MapperScanBean;

import es.redmic.vesselsview.mapper.vessel.VesselESMapper;

import es.redmic.vesselsview.mapper.vesseltype.VesselTypeESMapper;

import es.redmic.vesselsview.model.vessel.Vessel;

import es.redmic.viewlib.common.mapper.es2dto.DataCollectionESMapper;

import es.redmic.viewlib.common.mapper.es2dto.DataItemESMapper;
@@ -37,9 +36,6 @@ public class VesselMapperTest { 
	@InjectMocks

	DataItemESMapper dataItemMapper;



	@InjectMocks

	VesselTypeESMapper vesselTypeESMapper;



	protected MapperScanBean factory = new MapperScanBean().build();



	// @formatter:off
@@ -57,7 +53,6 @@ public class VesselMapperTest { 
		factory.addMapper(mapper);

		factory.addMapper(dataCollectionMapper);

		factory.addMapper(dataItemMapper);

		factory.addMapper(vesselTypeESMapper);

	}



	@Test
@@ -70,7 +65,7 @@ public class VesselMapperTest { 
		String modelStringExpected = JsonToBeanTestUtil.getJsonString(modelPath);

		String modelString = JsonToBeanTestUtil.writeValueAsString(modelOut);



		JSONAssert.assertEquals(modelString, modelStringExpected, false);

		JSONAssert.assertEquals(modelStringExpected, modelString, false);

	}



	@Test

vessels-view/src/test/java/es/redmic/test/vesselsview/unit/mapper/VesselTypeMapperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class VesselTypeMapperTest { 
		String modelStringExpected = JsonToBeanTestUtil.getJsonString(modelPath);

		String modelString = JsonToBeanTestUtil.writeValueAsString(modelOut);



		JSONAssert.assertEquals(modelString, modelStringExpected, false);

		JSONAssert.assertEquals(modelStringExpected, modelString, false);

	}



	@Test