Commit 2315db72 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Añade comprobación de tipos restringidos vacio

See merge request redmic-project/server/kafka-streams/vessel-restriction-checker!5
parents e06dec3d baca97fd

src/main/java/es/redmic/vesselrestrictionchecker/VesselRestrictionCheckerApplication.java

+3 −2
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ public class VesselRestrictionCheckerApplication extends StreamsApplicationBase 
				fulfillSpeedConstraintResult = fulfillSpeedConstraint(vesselSpeed, maxSpeed);



		return (fulfillVesselTypeConstraintResult && fulfillSpeedConstraintResult)

				|| (vesselTypesRestricted == null && maxSpeed != null && fulfillSpeedConstraintResult);

				|| ((vesselTypesRestricted == null || vesselTypesRestricted.size() == 0) && maxSpeed != null

						&& fulfillSpeedConstraintResult);

	}



	private boolean fulfillVesselTypeConstraint(Integer vesselType, List<?> vesselTypesRestricted) {
@@ -277,7 +278,7 @@ public class VesselRestrictionCheckerApplication extends StreamsApplicationBase 
	}



	private boolean fulfillSpeedConstraint(Double vesselSpeed, Double maxSpeed) {

		return maxSpeed == null || vesselSpeed != null && (vesselSpeed + SPEED_TOLERANCE <= maxSpeed);

		return maxSpeed == null || (vesselSpeed != null && (vesselSpeed + SPEED_TOLERANCE <= maxSpeed));

	}



	public static void main(String[] args) {

src/test/java/es/redmic/vesselrestrictionchecker/streams/VesselRestrictionCheckerApplicationTest.java

+2 −2
Original line number Diff line number Diff line
@@ -293,13 +293,13 @@ public class VesselRestrictionCheckerApplicationTest { 


		AISTrackingDTO ais = getAISTrackingDTO(2, 28.123415162762214, -16.89305824790779);



		Double maxSpeed = 30.0;

		Double maxSpeed = 18.0;



		AreaDTO area = getAreaDTO("22",

				"POLYGON((-17.115923627143275 28.26107051182232,-16.86186478925265 28.268327827045535,"

						+ "-16.7053096134714 27.970373554893733,-17.047259076362025 27.974012125154626,"

						+ "-17.115923627143275 28.26107051182232))",

				maxSpeed, null);

				maxSpeed, new ArrayList<>());



		testDriver.pipeInput(areaDTORecordFactory.create(AREAS_TOPIC, area.getId(), area));