6th init

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version '2.6.3'
+    id 'org.springframework.boot' version '2.7.1'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java'
 }
@@ -21,7 +21,7 @@ dependencies {
     implementation 'net.rakugakibox.spring.boot:logback-access-spring-boot-starter:2.7.1'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'io.rest-assured:rest-assured:4.2.0'
+    testImplementation 'io.rest-assured:rest-assured:4.5.1'
 
     runtimeOnly 'com.h2database:h2'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/nextstep/subway/domain/Station.java → src/main/java/subway/Station.java

@@ -1,15 +1,13 @@
-package nextstep.subway.domain;
+package subway;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @Entity
 public class Station {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    @Column(length = 20, nullable = false)
     private String name;
 
     public Station() {

src/main/java/nextstep/subway/ui/StationController.java → src/main/java/subway/StationController.java

@@ -1,9 +1,5 @@
-package nextstep.subway.ui;
+package subway;
 
-import nextstep.subway.applicaion.StationService;
-import nextstep.subway.applicaion.dto.StationRequest;
-import nextstep.subway.applicaion.dto.StationResponse;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +20,7 @@ public ResponseEntity<StationResponse> createStation(@RequestBody StationRequest
         return ResponseEntity.created(URI.create("/stations/" + station.getId())).body(station);
     }
 
-    @GetMapping(value = "/stations", produces = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "/stations")
     public ResponseEntity<List<StationResponse>> showStations() {
         return ResponseEntity.ok().body(stationService.findAllStations());
     }

src/main/java/nextstep/subway/domain/StationRepository.java → src/main/java/subway/StationRepository.java

@@ -1,4 +1,4 @@
-package nextstep.subway.domain;
+package subway;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/nextstep/subway/applicaion/dto/StationRequest.java → src/main/java/subway/StationRequest.java

@@ -1,4 +1,4 @@
-package nextstep.subway.applicaion.dto;
+package subway;
 
 public class StationRequest {
     private String name;

src/main/java/nextstep/subway/applicaion/dto/StationResponse.java → src/main/java/subway/StationResponse.java

@@ -1,4 +1,4 @@
-package nextstep.subway.applicaion.dto;
+package subway;
 
 public class StationResponse {
     private Long id;

src/main/java/nextstep/subway/applicaion/StationService.java → src/main/java/subway/StationService.java

@@ -1,9 +1,5 @@
-package nextstep.subway.applicaion;
+package subway;
 
-import nextstep.subway.applicaion.dto.StationRequest;
-import nextstep.subway.applicaion.dto.StationResponse;
-import nextstep.subway.domain.Station;
-import nextstep.subway.domain.StationRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/nextstep/subway/SubwayApplication.java → src/main/java/subway/SubwayApplication.java

@@ -1,4 +1,4 @@
-package nextstep.subway;
+package subway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/resources/logback-access.xml

@@ -4,6 +4,5 @@
             <pattern>%fullRequest%n%n%fullResponse</pattern>
         </encoder>
     </appender>
-
     <appender-ref ref="STDOUT"/>
 </configuration>

src/test/java/subway/RestAssuredTest.java

@@ -0,0 +1,23 @@
+package subway;
+
+import io.restassured.response.ExtractableResponse;
+import io.restassured.response.Response;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpStatus;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class RestAssuredTest {
+
+    @DisplayName("구글 페이지 접근 테스트")
+    @Test
+    void accessGoogle() {
+        // TODO: 구글 페이지 요청 구현
+        ExtractableResponse<Response> response = null;
+
+        assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value());
+    }
+}

src/test/java/nextstep/subway/acceptance/StationAcceptanceTest.java → src/test/java/subway/StationAcceptanceTest.java

@@ -1,13 +1,11 @@
-package nextstep.subway.acceptance;
+package subway;
 
 import io.restassured.RestAssured;
 import io.restassured.response.ExtractableResponse;
 import io.restassured.response.Response;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
@@ -18,16 +16,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisplayName("지하철역 관련 기능")
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 public class StationAcceptanceTest {
-    @LocalServerPort
-    int port;
-
-    @BeforeEach
-    public void setUp() {
-        RestAssured.port = port;
-    }
-
     /**
      * When 지하철역을 생성하면
      * Then 지하철역이 생성된다