Skip to content

Commit a6bd0ee

Browse files
SelahattinSertSelahattinSert
committed
Rename metric service as CameraMetricService
1 parent ebee12f commit a6bd0ee

File tree

10 files changed

+63
-63
lines changed

10 files changed

+63
-63
lines changed

src/main/java/com/onboarding/camera/cameraonboarding/service/MetricsService.java renamed to src/main/java/com/onboarding/camera/cameraonboarding/service/CameraMetricService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.onboarding.camera.cameraonboarding.service;
22

3-
public interface MetricsService {
3+
public interface CameraMetricService {
44

55
/**
66
* Increments the counter for successful camera onboarding.

src/main/java/com/onboarding/camera/cameraonboarding/service/impl/MetricsServiceImpl.java renamed to src/main/java/com/onboarding/camera/cameraonboarding/service/impl/CameraMetricServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.onboarding.camera.cameraonboarding.service.impl;
22

3-
import com.onboarding.camera.cameraonboarding.service.MetricsService;
3+
import com.onboarding.camera.cameraonboarding.service.CameraMetricService;
44
import io.micrometer.core.instrument.Counter;
55
import io.micrometer.core.instrument.MeterRegistry;
66
import lombok.RequiredArgsConstructor;
@@ -12,7 +12,7 @@
1212

1313
@Service
1414
@RequiredArgsConstructor
15-
public class MetricsServiceImpl implements MetricsService {
15+
public class CameraMetricServiceImpl implements CameraMetricService {
1616

1717
private final MeterRegistry meterRegistry;
1818

‎src/main/java/com/onboarding/camera/cameraonboarding/service/impl/CameraServiceImpl.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import com.onboarding.camera.cameraonboarding.exception.LocationNotAddedException;
1515
import com.onboarding.camera.cameraonboarding.repository.CameraRepository;
1616
import com.onboarding.camera.cameraonboarding.service.BlobStorageService;
17+
import com.onboarding.camera.cameraonboarding.service.CameraMetricService;
1718
import com.onboarding.camera.cameraonboarding.service.CameraService;
18-
import com.onboarding.camera.cameraonboarding.service.MetricsService;
1919
import com.onboarding.camera.cameraonboarding.util.DateTimeFactory;
2020
import io.micrometer.core.annotation.Timed;
2121
import lombok.RequiredArgsConstructor;
@@ -38,7 +38,7 @@ public class CameraServiceImpl implements CameraService {
3838

3939
private final BlobStorageService blobStorageService;
4040

41-
private final MetricsService metricsService;
41+
private final CameraMetricService cameraMetricService;
4242

4343
@Override
4444
@Timed("camera.onboarding")
@@ -49,11 +49,11 @@ public Camera handleSaveCamera(Camera camera) {
4949
camera.setOnboardedAt(dateTimeFactory.now());
5050
Camera savedCamera = cameraRepository.save(camera);
5151
log.info("Camera saved with ID: {}", savedCamera.getCamId());
52-
metricsService.incrementCameraOnboardingSuccess();
52+
cameraMetricService.incrementCameraOnboardingSuccess();
5353
return savedCamera;
5454
} catch (Exception ex) {
5555
log.error("Exception occurred while saving camera: {}", ex.getMessage());
56-
metricsService.incrementCameraOnboardingFailure();
56+
cameraMetricService.incrementCameraOnboardingFailure();
5757
throw new CameraNotCreatedException(String.format("Error occurred while saving camera: %s", ex.getMessage()));
5858
}
5959
}
@@ -70,10 +70,10 @@ public void handleInitializeCamera(UUID cameraId) {
7070
camera.setInitializedAt(dateTimeFactory.now());
7171
cameraRepository.save(camera);
7272
log.info("Camera initialized with ID: {}", cameraId);
73-
metricsService.incrementCameraInitializationSuccess();
73+
cameraMetricService.incrementCameraInitializationSuccess();
7474
} catch (Exception ex) {
7575
log.error("Exception occurred while initializing camera with ID: {}", cameraId, ex);
76-
metricsService.incrementCameraInitializationFailure();
76+
cameraMetricService.incrementCameraInitializationFailure();
7777
throw new CameraNotInitializedException(String.format("Error occurred while initializing camera: %s", ex.getMessage()));
7878
}
7979
}
@@ -99,14 +99,14 @@ public void handleUploadImage(UUID cameraId, UUID imageId, byte[] imageData) {
9999
log.info("Uploading image with ID: {}", imageId);
100100
blobStorageService.uploadFile(blobStorageService.getContainerName(), imageId.toString(), imageData);
101101
cameraRepository.save(camera);
102-
metricsService.incrementImageUploadSuccess();
102+
cameraMetricService.incrementImageUploadSuccess();
103103
} catch (ImageAlreadyUploadedException ex) {
104104
log.error("Exception occurred while uploading image");
105-
metricsService.incrementImageUploadFailure();
105+
cameraMetricService.incrementImageUploadFailure();
106106
throw new ImageAlreadyUploadedException(String.format("Camera already have image with id: %s", camera.getImageId()));
107107
} catch (Exception ex) {
108108
log.error("Exception occurred while uploading image:{}:ex:{}", imageId, ex.getMessage());
109-
metricsService.incrementImageUploadFailure();
109+
cameraMetricService.incrementImageUploadFailure();
110110
throw new ImageNotUploadedException(String.format("Error occurred while uploading image: %s", ex.getMessage()));
111111
}
112112
}
@@ -126,15 +126,15 @@ public byte[] handleDownloadImage(UUID cameraId) {
126126
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
127127
blobStorageService.getBlob(outputStream, blobStorageService.getContainerName(), camera.getImageId().toString());
128128

129-
metricsService.incrementImageDownloadSuccess();
129+
cameraMetricService.incrementImageDownloadSuccess();
130130
return outputStream.toByteArray();
131131
} catch (ImageNotFoundException ex) {
132132
log.error("Image is not found by given cameraId: '{}'", cameraId);
133-
metricsService.incrementImageDownloadFailure();
133+
cameraMetricService.incrementImageDownloadFailure();
134134
throw new ImageNotFoundException(String.format("Image is not found by given cameraId: %s", cameraId));
135135
} catch (Exception ex) {
136136
log.error("Exception occurred while downloading image, camera:{}:ex:{}", cameraId, ex.getMessage());
137-
metricsService.incrementImageDownloadFailure();
137+
cameraMetricService.incrementImageDownloadFailure();
138138
throw new ImageNotDownloadedException(String.format("Error occurred while downloading image: %s", ex.getMessage()));
139139
}
140140
}
@@ -156,11 +156,11 @@ public Camera handleAddLocation(UUID cameraId, LocationDto locationDto) {
156156

157157
cameraRepository.save(camera);
158158
log.info("Location added/updated successfully for Camera ID: {}", cameraId);
159-
metricsService.incrementLocationAddSuccess();
159+
cameraMetricService.incrementLocationAddSuccess();
160160
return camera;
161161
} catch (Exception ex) {
162162
log.error("Exception occurred while adding location, camera:{}:ex:{}", cameraId, ex.getMessage());
163-
metricsService.incrementLocationAddFailure();
163+
cameraMetricService.incrementLocationAddFailure();
164164
throw new LocationNotAddedException(String.format("Error occurred while adding location: %s", ex.getMessage()));
165165
}
166166
}

‎src/main/java/com/onboarding/camera/cameraonboarding/service/impl/LightSensorService.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.onboarding.camera.cameraonboarding.exception.SensorNotFoundException;
99
import com.onboarding.camera.cameraonboarding.exception.SensorNotUpdatedException;
1010
import com.onboarding.camera.cameraonboarding.repository.LightSensorRepository;
11+
import com.onboarding.camera.cameraonboarding.service.CameraMetricService;
1112
import com.onboarding.camera.cameraonboarding.service.CameraService;
12-
import com.onboarding.camera.cameraonboarding.service.MetricsService;
1313
import com.onboarding.camera.cameraonboarding.service.SensorService;
1414
import io.micrometer.core.annotation.Timed;
1515
import lombok.RequiredArgsConstructor;
@@ -29,7 +29,7 @@ public class LightSensorService implements SensorService<LightSensor> {
2929

3030
private final CameraService cameraService;
3131

32-
private final MetricsService metricsService;
32+
private final CameraMetricService cameraMetricService;
3333

3434
@Override
3535
@Transactional
@@ -39,15 +39,15 @@ public LightSensor handleCreateSensor(UUID cameraId, LightSensor sensor) {
3939
sensor.setCamera(cameraService.getCameraById(cameraId));
4040
LightSensor createdSensor = lightSensorRepository.save(sensor);
4141
log.info("Creating sensor: {}", createdSensor);
42-
metricsService.incrementSensorCreateSuccess(SensorType.LIGHT.name());
42+
cameraMetricService.incrementSensorCreateSuccess(SensorType.LIGHT.name());
4343
return createdSensor;
4444
} catch (CameraNotFoundException ex) {
4545
log.error("Camera not found, cameraId:{}", cameraId);
46-
metricsService.incrementSensorCreateFailure(SensorType.LIGHT.name());
46+
cameraMetricService.incrementSensorCreateFailure(SensorType.LIGHT.name());
4747
throw ex;
4848
} catch (Exception ex) {
4949
log.error("Failed to create sensor, camera:{}:ex:{}", cameraId, ex.getMessage());
50-
metricsService.incrementSensorCreateFailure(SensorType.LIGHT.name());
50+
cameraMetricService.incrementSensorCreateFailure(SensorType.LIGHT.name());
5151
throw new SensorNotCreatedException(String.format("Failed to create sensor: %s", ex.getMessage()));
5252
}
5353
}
@@ -83,19 +83,19 @@ public LightSensor handleUpdateSensor(UUID cameraId, UUID sensorId, LightSensor
8383
existingSensor.setVersion(sensor.getVersion());
8484
existingSensor.setData(sensor.getData());
8585
log.info("Updating sensor: {}", existingSensor);
86-
metricsService.incrementSensorUpdateSuccess(SensorType.LIGHT.name());
86+
cameraMetricService.incrementSensorUpdateSuccess(SensorType.LIGHT.name());
8787
return lightSensorRepository.save(existingSensor);
8888
} catch (SensorNotFoundException ex) {
8989
log.error("Sensor not found while updating, sensorId: {}", sensorId);
90-
metricsService.incrementSensorUpdateFailure(SensorType.LIGHT.name());
90+
cameraMetricService.incrementSensorUpdateFailure(SensorType.LIGHT.name());
9191
throw ex;
9292
} catch (CameraNotFoundException ex) {
9393
log.error("Camera not found, cameraId:{}", cameraId);
94-
metricsService.incrementSensorUpdateFailure(SensorType.LIGHT.name());
94+
cameraMetricService.incrementSensorUpdateFailure(SensorType.LIGHT.name());
9595
throw ex;
9696
} catch (Exception ex) {
9797
log.error("Exception occurred while updating sensor, sensorId:{}", sensorId);
98-
metricsService.incrementSensorUpdateFailure(SensorType.LIGHT.name());
98+
cameraMetricService.incrementSensorUpdateFailure(SensorType.LIGHT.name());
9999
throw new SensorNotUpdatedException(String.format("Error occurred while updating sensors: %s", ex.getMessage()));
100100
}
101101
}
@@ -121,18 +121,18 @@ public void handleDeleteSensor(UUID cameraId, UUID sensorId) {
121121
camera.getSensors().remove(sensor);
122122
lightSensorRepository.delete(sensor);
123123
log.info("Deleted sensor: {}", sensorId);
124-
metricsService.incrementSensorDeleteSuccess(SensorType.LIGHT.name());
124+
cameraMetricService.incrementSensorDeleteSuccess(SensorType.LIGHT.name());
125125
} catch (CameraNotFoundException ex) {
126126
log.error("Camera not found, cameraId:{}", cameraId);
127-
metricsService.incrementSensorDeleteFailure(SensorType.LIGHT.name());
127+
cameraMetricService.incrementSensorDeleteFailure(SensorType.LIGHT.name());
128128
throw ex;
129129
} catch (SensorNotFoundException ex) {
130130
log.error("Sensor not found while deleting, sensorId: {}", sensorId);
131-
metricsService.incrementSensorDeleteFailure(SensorType.LIGHT.name());
131+
cameraMetricService.incrementSensorDeleteFailure(SensorType.LIGHT.name());
132132
throw ex;
133133
} catch (Exception ex) {
134134
log.error("Exception occurred while deleting sensor, sensorId:{}", sensorId);
135-
metricsService.incrementSensorDeleteFailure(SensorType.LIGHT.name());
135+
cameraMetricService.incrementSensorDeleteFailure(SensorType.LIGHT.name());
136136
throw new SensorNotUpdatedException(String.format("Error occurred while deleting sensor: %s", ex.getMessage()));
137137
}
138138
}

‎src/main/java/com/onboarding/camera/cameraonboarding/service/impl/MotionSensorService.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.onboarding.camera.cameraonboarding.exception.SensorNotFoundException;
99
import com.onboarding.camera.cameraonboarding.exception.SensorNotUpdatedException;
1010
import com.onboarding.camera.cameraonboarding.repository.MotionSensorRepository;
11+
import com.onboarding.camera.cameraonboarding.service.CameraMetricService;
1112
import com.onboarding.camera.cameraonboarding.service.CameraService;
12-
import com.onboarding.camera.cameraonboarding.service.MetricsService;
1313
import com.onboarding.camera.cameraonboarding.service.SensorService;
1414
import io.micrometer.core.annotation.Timed;
1515
import lombok.RequiredArgsConstructor;
@@ -29,7 +29,7 @@ public class MotionSensorService implements SensorService<MotionSensor> {
2929

3030
private final CameraService cameraService;
3131

32-
private final MetricsService metricsService;
32+
private final CameraMetricService cameraMetricService;
3333

3434
@Override
3535
@Transactional
@@ -39,15 +39,15 @@ public MotionSensor handleCreateSensor(UUID cameraId, MotionSensor sensor) {
3939
sensor.setCamera(cameraService.getCameraById(cameraId));
4040
MotionSensor createdSensor = motionSensorRepository.save(sensor);
4141
log.info("Creating sensor: {}", createdSensor);
42-
metricsService.incrementSensorCreateSuccess(SensorType.MOTION.name());
42+
cameraMetricService.incrementSensorCreateSuccess(SensorType.MOTION.name());
4343
return createdSensor;
4444
} catch (CameraNotFoundException ex) {
4545
log.error("Camera not found, cameraId:{}", cameraId);
46-
metricsService.incrementSensorCreateFailure(SensorType.MOTION.name());
46+
cameraMetricService.incrementSensorCreateFailure(SensorType.MOTION.name());
4747
throw ex;
4848
} catch (Exception ex) {
4949
log.error("Failed to create sensor, camera:{}:ex:{}", cameraId, ex.getMessage());
50-
metricsService.incrementSensorCreateFailure(SensorType.MOTION.name());
50+
cameraMetricService.incrementSensorCreateFailure(SensorType.MOTION.name());
5151
throw new SensorNotCreatedException(String.format("Failed to create sensor: %s", ex.getMessage()));
5252
}
5353
}
@@ -83,19 +83,19 @@ public MotionSensor handleUpdateSensor(UUID cameraId, UUID sensorId, MotionSenso
8383
existingSensor.setVersion(sensor.getVersion());
8484
existingSensor.setData(sensor.getData());
8585
log.info("Updating sensor: {}", existingSensor);
86-
metricsService.incrementSensorUpdateSuccess(SensorType.MOTION.name());
86+
cameraMetricService.incrementSensorUpdateSuccess(SensorType.MOTION.name());
8787
return motionSensorRepository.save(existingSensor);
8888
} catch (CameraNotFoundException ex) {
8989
log.error("Camera not found, cameraId:{}", cameraId);
90-
metricsService.incrementSensorUpdateFailure(SensorType.MOTION.name());
90+
cameraMetricService.incrementSensorUpdateFailure(SensorType.MOTION.name());
9191
throw ex;
9292
} catch (SensorNotFoundException ex) {
9393
log.error("Sensor not found while updating, sensorId: {}", sensorId);
94-
metricsService.incrementSensorUpdateFailure(SensorType.MOTION.name());
94+
cameraMetricService.incrementSensorUpdateFailure(SensorType.MOTION.name());
9595
throw ex;
9696
} catch (Exception ex) {
9797
log.error("Exception occurred while updating sensor, sensorId:{}", sensorId);
98-
metricsService.incrementSensorUpdateFailure(SensorType.MOTION.name());
98+
cameraMetricService.incrementSensorUpdateFailure(SensorType.MOTION.name());
9999
throw new SensorNotUpdatedException(String.format("Error occurred while updating sensors: %s", ex.getMessage()));
100100
}
101101
}
@@ -121,18 +121,18 @@ public void handleDeleteSensor(UUID cameraId, UUID sensorId) {
121121
camera.getSensors().remove(sensor);
122122
motionSensorRepository.delete(sensor);
123123
log.info("Deleted sensor: {}", sensorId);
124-
metricsService.incrementSensorDeleteSuccess(SensorType.MOTION.name());
124+
cameraMetricService.incrementSensorDeleteSuccess(SensorType.MOTION.name());
125125
} catch (CameraNotFoundException ex) {
126126
log.error("Camera not found, cameraId:{}", cameraId);
127-
metricsService.incrementSensorDeleteFailure(SensorType.MOTION.name());
127+
cameraMetricService.incrementSensorDeleteFailure(SensorType.MOTION.name());
128128
throw ex;
129129
} catch (SensorNotFoundException ex) {
130130
log.error("Sensor not found while deleting, sensorId: {}", sensorId);
131-
metricsService.incrementSensorDeleteFailure(SensorType.MOTION.name());
131+
cameraMetricService.incrementSensorDeleteFailure(SensorType.MOTION.name());
132132
throw ex;
133133
} catch (Exception ex) {
134134
log.error("Exception occurred while deleting sensor, sensorId:{}", sensorId);
135-
metricsService.incrementSensorDeleteFailure(SensorType.MOTION.name());
135+
cameraMetricService.incrementSensorDeleteFailure(SensorType.MOTION.name());
136136
throw new SensorNotUpdatedException(String.format("Error occurred while deleting sensor: %s", ex.getMessage()));
137137
}
138138
}

0 commit comments

Comments
 (0)