From 81007a9e76a8d91bdaad60cec69997700d8b43d3 Mon Sep 17 00:00:00 2001 From: sfiorani <109297780+sfiorani@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:42:34 +0200 Subject: [PATCH] refactor(position): updated name of position service api (#5456) * refactor: updated name of position service api Signed-off-by: SimoneFiorani * fix: jaxrs repaired Signed-off-by: SimoneFiorani * test: added missing import Signed-off-by: SimoneFiorani --------- Signed-off-by: SimoneFiorani --- .../kura/emulator/position/PositionServiceImpl.java | 2 +- .../java/org/eclipse/kura/position/PositionService.java | 2 +- .../java/org/eclipse/kura/linux/position/GpsDevice.java | 4 ++-- .../eclipse/kura/linux/position/GpsdPositionProvider.java | 2 +- .../java/org/eclipse/kura/linux/position/NMEAParser.java | 2 +- .../org/eclipse/kura/linux/position/PositionProvider.java | 2 +- .../eclipse/kura/linux/position/PositionServiceImpl.java | 4 ++-- .../kura/linux/position/SerialDevicePositionProvider.java | 4 ++-- .../kura/internal/rest/position/PositionRestService.java | 2 +- .../eclipse/kura/linux/position/PositionServiceTest.java | 8 ++++---- .../kura/linux/position/UseGpsdPositionProviderTest.java | 2 +- .../position/provider/test/PositionRestServiceTest.java | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kura/emulator/org.eclipse.kura.emulator.position/src/main/java/org/eclipse/kura/emulator/position/PositionServiceImpl.java b/kura/emulator/org.eclipse.kura.emulator.position/src/main/java/org/eclipse/kura/emulator/position/PositionServiceImpl.java index 130315f103c..ca8c873dfbe 100644 --- a/kura/emulator/org.eclipse.kura.emulator.position/src/main/java/org/eclipse/kura/emulator/position/PositionServiceImpl.java +++ b/kura/emulator/org.eclipse.kura.emulator.position/src/main/java/org/eclipse/kura/emulator/position/PositionServiceImpl.java @@ -246,7 +246,7 @@ public LocalDateTime getDateTime() { } @Override - public Set getGnssType() { + public Set getGnssTypes() { return new HashSet<>(Arrays.asList(GNSSType.GPS)); } } diff --git a/kura/org.eclipse.kura.api/src/main/java/org/eclipse/kura/position/PositionService.java b/kura/org.eclipse.kura.api/src/main/java/org/eclipse/kura/position/PositionService.java index 9feff8c34e2..90e5ae17e68 100644 --- a/kura/org.eclipse.kura.api/src/main/java/org/eclipse/kura/position/PositionService.java +++ b/kura/org.eclipse.kura.api/src/main/java/org/eclipse/kura/position/PositionService.java @@ -121,7 +121,7 @@ public interface PositionService { * * @since 2.8 */ - public Set getGnssType(); + public Set getGnssTypes(); /** * Registers position listener diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java index 9b166e25b2f..c8997bcb121 100644 --- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java +++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java @@ -83,8 +83,8 @@ public synchronized String getTimeNmea() { return this.nmeaParser.getTimeNmea(); } - public synchronized Set getGnssType() { - return this.nmeaParser.getGnssType(); + public synchronized Set getGnssTypes() { + return this.nmeaParser.getGnssTypes(); } public void disconnect() { diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java index c5333f1d6c3..e4f06d5f5b7 100644 --- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java +++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java @@ -171,7 +171,7 @@ public PositionProviderType getType() { } @Override - public Set getGnssType() { + public Set getGnssTypes() { return this.gnssType.get(); } diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java index 06b63db113a..b2e9535c1eb 100644 --- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java +++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java @@ -440,7 +440,7 @@ public char getLongitudeHemisphere() { return this.longitudeHemisphere; } - public Set getGnssType() { + public Set getGnssTypes() { return this.gnssType; } diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java index 43fb0997461..cf263e58930 100644 --- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java +++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java @@ -46,6 +46,6 @@ public void init(PositionServiceOptions configuration, Listener gpsDeviceListene public PositionProviderType getType(); - public Set getGnssType(); + public Set getGnssTypes(); } diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java index 2ff42cdc3c0..9bc65c33a50 100644 --- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java +++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java @@ -213,11 +213,11 @@ public LocalDateTime getDateTime() { } @Override - public Set getGnssType() { + public Set getGnssTypes() { if (this.options.isEnabled()) { if (!this.options.isStatic() && this.currentProvider != null) { - return this.currentProvider.getGnssType(); + return this.currentProvider.getGnssTypes(); } else if (this.options.isStatic()) { return new HashSet<>(Arrays.asList(this.staticGnssType)); } diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java index f1039c82656..a358011ad30 100644 --- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java +++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java @@ -230,8 +230,8 @@ public PositionProviderType getType() { } @Override - public Set getGnssType() { - return this.gpsDevice.getGnssType(); + public Set getGnssTypes() { + return this.gpsDevice.getGnssTypes(); } protected GpsDevice getGpsDevice() { diff --git a/kura/org.eclipse.kura.rest.position.provider/src/main/java/org/eclipse/kura/internal/rest/position/PositionRestService.java b/kura/org.eclipse.kura.rest.position.provider/src/main/java/org/eclipse/kura/internal/rest/position/PositionRestService.java index 6d4ac29e7a5..52153a10b15 100644 --- a/kura/org.eclipse.kura.rest.position.provider/src/main/java/org/eclipse/kura/internal/rest/position/PositionRestService.java +++ b/kura/org.eclipse.kura.rest.position.provider/src/main/java/org/eclipse/kura/internal/rest/position/PositionRestService.java @@ -84,7 +84,7 @@ public void unsetRequestHandlerRegistry(final RequestHandlerRegistry registry) { @Produces(MediaType.APPLICATION_JSON) public PositionDTO getPosition() { if (positionServiceImpl.isLocked()) { - return new PositionDTO(positionServiceImpl.getPosition(), positionServiceImpl.getGnssType()); + return new PositionDTO(positionServiceImpl.getPosition(), positionServiceImpl.getGnssTypes()); } throw DefaultExceptionHandler.toWebApplicationException( diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java index 78f45f7bbc4..6747919bc58 100644 --- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java +++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java @@ -242,7 +242,7 @@ public void testActivateStatic() throws IOException { assertEquals(300.0d, position.getAltitude().getValue(), EPS); assertNotNull(fixture.ps.getDateTime()); - assertEquals(new HashSet<>(Arrays.asList(GNSSType.GPS)), fixture.ps.getGnssType()); + assertEquals(new HashSet<>(Arrays.asList(GNSSType.GPS)), fixture.ps.getGnssTypes()); final NmeaPosition nmeaPosition = fixture.ps.getNmeaPosition(); @@ -452,7 +452,7 @@ public void testSwitchToStatic() throws IOException { assertEquals(40.0d, position.getAltitude().getValue(), EPS); assertNotNull(fixture.ps.getDateTime()); - assertEquals(new HashSet<>(Arrays.asList(GNSSType.GLONASS)), fixture.ps.getGnssType()); + assertEquals(new HashSet<>(Arrays.asList(GNSSType.GLONASS)), fixture.ps.getGnssTypes()); verify(fixture.eventAdmin, times(1)).postEvent(argThat(isPositionLockedEvent)); } @@ -533,7 +533,7 @@ public void testPositionDataFromGps() throws IOException, InterruptedException { final String date = fixture.ps.getNmeaDate(); final String time = fixture.ps.getNmeaTime(); final String lastSentence = fixture.ps.getLastSentence(); - final Set gnssType = fixture.ps.getGnssType(); + final Set gnssTypes = fixture.ps.getGnssTypes(); // from GGA assertEquals(1, nmeaPosition.getFixQuality()); @@ -564,7 +564,7 @@ public void testPositionDataFromGps() throws IOException, InterruptedException { assertEquals("$GNVTG,,,,,,,12.34,,,,*4a\n", lastSentence); - assertEquals(new HashSet<>(Arrays.asList(GNSSType.GPS, GNSSType.GLONASS)), gnssType); + assertEquals(new HashSet<>(Arrays.asList(GNSSType.GPS, GNSSType.GLONASS)), gnssTypes); fixture.ps.deactivate(); diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java index f768daa27aa..bfc2abd30c5 100644 --- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java +++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java @@ -306,7 +306,7 @@ private void thenPositionIsLocked() { } private void thenGnssTypeIs(Set types) { - assertEquals(types, this.gpsdPositionProvider.getGnssType()); + assertEquals(types, this.gpsdPositionProvider.getGnssTypes()); } private void gpsdPositionProviderStart() { diff --git a/kura/test/org.eclipse.kura.rest.position.provider.test/src/main/java/org/eclipse/kura/rest/position/provider/test/PositionRestServiceTest.java b/kura/test/org.eclipse.kura.rest.position.provider.test/src/main/java/org/eclipse/kura/rest/position/provider/test/PositionRestServiceTest.java index e18070f6d93..d03b8d2720c 100644 --- a/kura/test/org.eclipse.kura.rest.position.provider.test/src/main/java/org/eclipse/kura/rest/position/provider/test/PositionRestServiceTest.java +++ b/kura/test/org.eclipse.kura.rest.position.provider.test/src/main/java/org/eclipse/kura/rest/position/provider/test/PositionRestServiceTest.java @@ -154,7 +154,7 @@ private void givenPosition(Double longitude, Double latitude, Double altitude, D trackMesurment); when(positionService.getPosition()).thenReturn(testPosition); - when(positionService.getGnssType()).thenReturn(gnssTypeSet); + when(positionService.getGnssTypes()).thenReturn(gnssTypeSet); } private void givenLocalDateTime(String zonedDateTime) {