Skip to content

Commit 271b9a3

Browse files
SelahattinSertSelahattinSert
committed
Merge branch 'main' into dependabot/maven/org.springdoc-springdoc-openapi-starter-webmvc-ui-2.8.13
2 parents e480596 + b179d0f commit 271b9a3

File tree

4 files changed

+43
-40
lines changed

4 files changed

+43
-40
lines changed

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.8</version>
8+
<version>3.5.6</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com.onboarding.camera</groupId>
@@ -16,7 +16,7 @@
1616

1717
<properties>
1818
<java.version>21</java.version>
19-
<spring-cloud-azure.version>5.18.0</spring-cloud-azure.version>
19+
<spring-cloud-azure.version>6.0.0</spring-cloud-azure.version>
2020
</properties>
2121

2222
<dependencies>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>org.projectlombok</groupId>
5252
<artifactId>lombok</artifactId>
53-
<version>1.18.38</version>
53+
<version>1.18.42</version>
5454
<optional>true</optional>
5555
</dependency>
5656

@@ -159,7 +159,7 @@
159159
<plugin>
160160
<groupId>org.liquibase</groupId>
161161
<artifactId>liquibase-maven-plugin</artifactId>
162-
<version>4.28.0</version>
162+
<version>4.33.0</version>
163163
</plugin>
164164

165165
<plugin>

‎src/test/java/com/onboarding/camera/cameraonboarding/repository/LightSensorRepositoryTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,8 @@ public void expect_deleteCamera_removesAssociatedSensors() {
129129

130130
// Arrange
131131
Camera camera = new Camera();
132-
camera.setCamId(CAMERA_ID);
133132
camera.setCameraName(CAMERA_NAME);
134133
camera.setFirmwareVersion(FIRMWARE_VERSION);
135-
camera = cameraRepository.save(camera);
136134

137135
LightSensor sensor1 = new LightSensor();
138136
sensor1.setName(SENSOR_NAME);
@@ -147,37 +145,40 @@ public void expect_deleteCamera_removesAssociatedSensors() {
147145
camera.getSensors().add(sensor1);
148146
camera.getSensors().add(sensor2);
149147

150-
lightSensorRepository.save(sensor1);
151-
lightSensorRepository.save(sensor2);
148+
Camera savedCamera = cameraRepository.save(camera);
149+
UUID savedCameraId = savedCamera.getCamId();
150+
152151

153152
// Act
154-
cameraRepository.delete(camera);
153+
cameraRepository.deleteById(savedCameraId);
155154

156155
// Assert
157-
Assertions.assertThat(lightSensorRepository.findLightSensorByCamera(camera)).isEmpty();
156+
Assertions.assertThat(lightSensorRepository.findById(sensor1.getId())).isEmpty();
157+
Assertions.assertThat(lightSensorRepository.findById(sensor2.getId())).isEmpty();
158+
Assertions.assertThat(cameraRepository.findById(savedCameraId)).isEmpty();
158159
}
159160

160161
@Test
161162
public void expect_findLightSensorsByCamera_returnsLightSensors() {
162163
// Arrange
163164
Camera camera = new Camera();
164-
camera.setCamId(CAMERA_ID);
165165
camera.setCameraName(CAMERA_NAME);
166166
camera.setFirmwareVersion(FIRMWARE_VERSION);
167-
Camera savedCamera = cameraRepository.save(camera);
168167

169168
LightSensor sensor1 = new LightSensor();
170169
sensor1.setName(SENSOR_NAME);
171170
sensor1.setSensorType(SENSOR_TYPE);
172-
sensor1.setCamera(savedCamera);
171+
sensor1.setCamera(camera);
173172

174173
LightSensor sensor2 = new LightSensor();
175174
sensor2.setName(SENSOR_NAME_2);
176175
sensor2.setSensorType(SENSOR_TYPE);
177-
sensor2.setCamera(savedCamera);
176+
sensor2.setCamera(camera);
178177

179-
lightSensorRepository.save(sensor1);
180-
lightSensorRepository.save(sensor2);
178+
camera.getSensors().add(sensor1);
179+
camera.getSensors().add(sensor2);
180+
181+
Camera savedCamera = cameraRepository.save(camera);
181182

182183
// Act
183184
List<LightSensor> sensors = lightSensorRepository.findLightSensorByCamera(savedCamera);

‎src/test/java/com/onboarding/camera/cameraonboarding/repository/MotionSensorRepositoryTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,8 @@ public void expect_deleteCamera_removesAssociatedSensors() {
129129

130130
// Arrange
131131
Camera camera = new Camera();
132-
camera.setCamId(CAMERA_ID);
133132
camera.setCameraName(CAMERA_NAME);
134133
camera.setFirmwareVersion(FIRMWARE_VERSION);
135-
camera = cameraRepository.save(camera);
136134

137135
MotionSensor sensor1 = new MotionSensor();
138136
sensor1.setName(SENSOR_NAME);
@@ -147,37 +145,40 @@ public void expect_deleteCamera_removesAssociatedSensors() {
147145
camera.getSensors().add(sensor1);
148146
camera.getSensors().add(sensor2);
149147

150-
motionSensorRepository.save(sensor1);
151-
motionSensorRepository.save(sensor2);
148+
Camera savedCamera = cameraRepository.save(camera);
149+
UUID savedCameraId = savedCamera.getCamId();
150+
152151

153152
// Act
154-
cameraRepository.delete(camera);
153+
cameraRepository.deleteById(savedCameraId);
155154

156155
// Assert
157-
Assertions.assertThat(motionSensorRepository.findMotionSensorByCamera(camera)).isEmpty();
156+
Assertions.assertThat(motionSensorRepository.findById(sensor1.getId())).isEmpty();
157+
Assertions.assertThat(motionSensorRepository.findById(sensor2.getId())).isEmpty();
158+
Assertions.assertThat(cameraRepository.findById(savedCameraId)).isEmpty();
158159
}
159160

160161
@Test
161162
public void expect_findMotionSensorsByCamera_returnsMotionSensors() {
162163
// Arrange
163164
Camera camera = new Camera();
164-
camera.setCamId(CAMERA_ID);
165165
camera.setCameraName(CAMERA_NAME);
166166
camera.setFirmwareVersion(FIRMWARE_VERSION);
167-
Camera savedCamera = cameraRepository.save(camera);
168167

169168
MotionSensor sensor1 = new MotionSensor();
170169
sensor1.setName(SENSOR_NAME);
171170
sensor1.setSensorType(SENSOR_TYPE);
172-
sensor1.setCamera(savedCamera);
171+
sensor1.setCamera(camera);
173172

174173
MotionSensor sensor2 = new MotionSensor();
175174
sensor2.setName(SENSOR_NAME_2);
176175
sensor2.setSensorType(SENSOR_TYPE);
177-
sensor2.setCamera(savedCamera);
176+
sensor2.setCamera(camera);
178177

179-
motionSensorRepository.save(sensor1);
180-
motionSensorRepository.save(sensor2);
178+
camera.getSensors().add(sensor1);
179+
camera.getSensors().add(sensor2);
180+
181+
Camera savedCamera = cameraRepository.save(camera);
181182

182183
// Act
183184
List<MotionSensor> sensors = motionSensorRepository.findMotionSensorByCamera(savedCamera);

‎src/test/java/com/onboarding/camera/cameraonboarding/repository/TemperatureSensorRepositoryTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,8 @@ public void expect_deleteCamera_removesAssociatedSensors() {
129129

130130
// Arrange
131131
Camera camera = new Camera();
132-
camera.setCamId(CAMERA_ID);
133132
camera.setCameraName(CAMERA_NAME);
134133
camera.setFirmwareVersion(FIRMWARE_VERSION);
135-
camera = cameraRepository.save(camera);
136134

137135
TemperatureSensor sensor1 = new TemperatureSensor();
138136
sensor1.setName(SENSOR_NAME);
@@ -147,37 +145,40 @@ public void expect_deleteCamera_removesAssociatedSensors() {
147145
camera.getSensors().add(sensor1);
148146
camera.getSensors().add(sensor2);
149147

150-
temperatureSensorRepository.save(sensor1);
151-
temperatureSensorRepository.save(sensor2);
148+
Camera savedCamera = cameraRepository.save(camera);
149+
UUID savedCameraId = savedCamera.getCamId();
150+
152151

153152
// Act
154-
cameraRepository.delete(camera);
153+
cameraRepository.deleteById(savedCameraId);
155154

156155
// Assert
157-
Assertions.assertThat(temperatureSensorRepository.findTemperatureSensorByCamera(camera)).isEmpty();
156+
Assertions.assertThat(temperatureSensorRepository.findById(sensor1.getId())).isEmpty();
157+
Assertions.assertThat(temperatureSensorRepository.findById(sensor2.getId())).isEmpty();
158+
Assertions.assertThat(cameraRepository.findById(savedCameraId)).isEmpty();
158159
}
159160

160161
@Test
161162
public void expect_findTemperatureSensorsByCamera_returnsTemperatureSensors() {
162163
// Arrange
163164
Camera camera = new Camera();
164-
camera.setCamId(CAMERA_ID);
165165
camera.setCameraName(CAMERA_NAME);
166166
camera.setFirmwareVersion(FIRMWARE_VERSION);
167-
Camera savedCamera = cameraRepository.save(camera);
168167

169168
TemperatureSensor sensor1 = new TemperatureSensor();
170169
sensor1.setName(SENSOR_NAME);
171170
sensor1.setSensorType(SENSOR_TYPE);
172-
sensor1.setCamera(savedCamera);
171+
sensor1.setCamera(camera);
173172

174173
TemperatureSensor sensor2 = new TemperatureSensor();
175174
sensor2.setName(SENSOR_NAME_2);
176175
sensor2.setSensorType(SENSOR_TYPE);
177-
sensor2.setCamera(savedCamera);
176+
sensor2.setCamera(camera);
178177

179-
temperatureSensorRepository.save(sensor1);
180-
temperatureSensorRepository.save(sensor2);
178+
camera.getSensors().add(sensor1);
179+
camera.getSensors().add(sensor2);
180+
181+
Camera savedCamera = cameraRepository.save(camera);
181182

182183
// Act
183184
List<TemperatureSensor> sensors = temperatureSensorRepository.findTemperatureSensorByCamera(savedCamera);

0 commit comments

Comments
 (0)