refactor(position): updated name of position service api (#5456)

* refactor: updated name of position service api Signed-off-by: SimoneFiorani <[email protected]> * fix: jaxrs repaired Signed-off-by: SimoneFiorani <[email protected]> * test: added missing import Signed-off-by: SimoneFiorani <[email protected]> --------- Signed-off-by: SimoneFiorani <[email protected]>
eclipse-kura · Oct 18, 2024 · 81007a9 · 81007a9
1 parent 608c818
commit 81007a9
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/...ulator.position/src/main/java/org/eclipse/kura/emulator/position/PositionServiceImpl.java b/...ulator.position/src/main/java/org/eclipse/kura/emulator/position/PositionServiceImpl.java
@@ -246,7 +246,7 @@ public LocalDateTime getDateTime() {
     }
 
     @Override
-    public Set<GNSSType> getGnssType() {
+    public Set<GNSSType> 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
@@ -121,7 +121,7 @@ public interface PositionService {
      * 
      * @since 2.8
      */
-    public Set<GNSSType> getGnssType();
+    public Set<GNSSType> getGnssTypes();
 
     /**
      * Registers position listener

diff --git a/....eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java b/....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<GNSSType> getGnssType() {
-        return this.nmeaParser.getGnssType();
+    public synchronized Set<GNSSType> getGnssTypes() {
+        return this.nmeaParser.getGnssTypes();
     }
 
     public void disconnect() {

diff --git a/...ra.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java b/...ra.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java
@@ -171,7 +171,7 @@ public PositionProviderType getType() {
     }
 
     @Override
-    public Set<GNSSType> getGnssType() {
+    public Set<GNSSType> getGnssTypes() {
         return this.gnssType.get();
     }
 

diff --git a/...eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java b/...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<GNSSType> getGnssType() {
+    public Set<GNSSType> getGnssTypes() {
         return this.gnssType;
     }
 

diff --git a/...e.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java b/...e.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<GNSSType> getGnssType();
+    public Set<GNSSType> getGnssTypes();
 
 }
diff --git a/...ura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java b/...ura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java
@@ -213,11 +213,11 @@ public LocalDateTime getDateTime() {
     }
 
     @Override
-    public Set<GNSSType> getGnssType() {
+    public Set<GNSSType> 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/....position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java b/....position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java
@@ -230,8 +230,8 @@ public PositionProviderType getType() {
     }
 
     @Override
-    public Set<GNSSType> getGnssType() {
-        return this.gpsDevice.getGnssType();
+    public Set<GNSSType> getGnssTypes() {
+        return this.gpsDevice.getGnssTypes();
     }
 
     protected GpsDevice getGpsDevice() {

diff --git a/...n.provider/src/main/java/org/eclipse/kura/internal/rest/position/PositionRestService.java b/...n.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/...inux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java b/...inux.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> gnssType = fixture.ps.getGnssType();
+        final Set<GNSSType> 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/...ition.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java b/...ition.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java
@@ -306,7 +306,7 @@ private void thenPositionIsLocked() {
     }
 
     private void thenGnssTypeIs(Set<GNSSType> types) {
-        assertEquals(types, this.gpsdPositionProvider.getGnssType());
+        assertEquals(types, this.gpsdPositionProvider.getGnssTypes());
     }
 
     private void gpsdPositionProviderStart() {

diff --git a/...t/src/main/java/org/eclipse/kura/rest/position/provider/test/PositionRestServiceTest.java b/...t/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) {