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

sfiorani · web-flow · commit 81007a9e76a8 · 2024-10-18T11:42:34.000+02:00
* refactor: updated name of position service api

Signed-off-by: SimoneFiorani &lt;simone.fiorani@abinsula.com&gt;

* fix: jaxrs repaired

Signed-off-by: SimoneFiorani &lt;simone.fiorani@abinsula.com&gt;

* test: added missing import

Signed-off-by: SimoneFiorani &lt;simone.fiorani@abinsula.com&gt;

---------

Signed-off-by: SimoneFiorani &lt;simone.fiorani@abinsula.com&gt;
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
@@ -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/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<GNSSType> getGnssType() {
-        return this.nmeaParser.getGnssType();
+    public synchronized Set<GNSSType> 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
@@ -171,7 +171,7 @@ public PositionProviderType getType() {
     }
 
     @Override
-    public Set<GNSSType> getGnssType() {
+    public Set<GNSSType> 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
@@ -440,7 +440,7 @@ public char getLongitudeHemisphere() {
         return this.longitudeHemisphere;
     }
 
-    public Set<GNSSType> getGnssType() {
+    public Set<GNSSType> 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
@@ -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/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<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/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<GNSSType> getGnssType() {
-        return this.gpsDevice.getGnssType();
+    public Set<GNSSType> 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
@@ -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
@@ -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/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<GNSSType> 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public LocalDateTime getDateTime() {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`@Override`
`249`		`- public Set<GNSSType> getGnssType() {`
	`249`	`+ public Set<GNSSType> getGnssTypes() {`
`250`	`250`	`return new HashSet<>(Arrays.asList(GNSSType.GPS));`
`251`	`251`	`}`
`252`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public interface PositionService {`
`121`	`121`	`*`
`122`	`122`	`* @since 2.8`
`123`	`123`	`*/`
`124`		`- public Set<GNSSType> getGnssType();`
	`124`	`+ public Set<GNSSType> getGnssTypes();`
`125`	`125`
`126`	`126`	`/**`
`127`	`127`	`* Registers position listener`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ public synchronized String getTimeNmea() {`
`83`	`83`	`return this.nmeaParser.getTimeNmea();`
`84`	`84`	`}`
`85`	`85`
`86`		`- public synchronized Set<GNSSType> getGnssType() {`
`87`		`- return this.nmeaParser.getGnssType();`
	`86`	`+ public synchronized Set<GNSSType> getGnssTypes() {`
	`87`	`+ return this.nmeaParser.getGnssTypes();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public void disconnect() {`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public PositionProviderType getType() {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`@Override`
`174`		`- public Set<GNSSType> getGnssType() {`
	`174`	`+ public Set<GNSSType> getGnssTypes() {`
`175`	`175`	`return this.gnssType.get();`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ public char getLongitudeHemisphere() {`
`440`	`440`	`return this.longitudeHemisphere;`
`441`	`441`	`}`
`442`	`442`
`443`		`- public Set<GNSSType> getGnssType() {`
	`443`	`+ public Set<GNSSType> getGnssTypes() {`
`444`	`444`	`return this.gnssType;`
`445`	`445`	`}`
`446`	`446`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ public void init(PositionServiceOptions configuration, Listener gpsDeviceListene`
`46`	`46`
`47`	`47`	`public PositionProviderType getType();`
`48`	`48`
`49`		`- public Set<GNSSType> getGnssType();`
	`49`	`+ public Set<GNSSType> getGnssTypes();`
`50`	`50`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,11 @@ public LocalDateTime getDateTime() {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`@Override`
`216`		`- public Set<GNSSType> getGnssType() {`
	`216`	`+ public Set<GNSSType> getGnssTypes() {`
`217`	`217`	`if (this.options.isEnabled()) {`
`218`	`218`
`219`	`219`	`if (!this.options.isStatic() && this.currentProvider != null) {`
`220`		`- return this.currentProvider.getGnssType();`
	`220`	`+ return this.currentProvider.getGnssTypes();`
`221`	`221`	`} else if (this.options.isStatic()) {`
`222`	`222`	`return new HashSet<>(Arrays.asList(this.staticGnssType));`
`223`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,8 @@ public PositionProviderType getType() {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`@Override`
`233`		`- public Set<GNSSType> getGnssType() {`
`234`		`- return this.gpsDevice.getGnssType();`
	`233`	`+ public Set<GNSSType> getGnssTypes() {`
	`234`	`+ return this.gpsDevice.getGnssTypes();`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`protected GpsDevice getGpsDevice() {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public void unsetRequestHandlerRegistry(final RequestHandlerRegistry registry) {`
`84`	`84`	`@Produces(MediaType.APPLICATION_JSON)`
`85`	`85`	`public PositionDTO getPosition() {`
`86`	`86`	`if (positionServiceImpl.isLocked()) {`
`87`		`- return new PositionDTO(positionServiceImpl.getPosition(), positionServiceImpl.getGnssType());`
	`87`	`+ return new PositionDTO(positionServiceImpl.getPosition(), positionServiceImpl.getGnssTypes());`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`throw DefaultExceptionHandler.toWebApplicationException(`