project update

Author: springdoc

springdoc-openapi-core/src/main/java/org/springdoc/api/OpenApiResource.java

@@ -115,6 +115,7 @@ private boolean isRestController(Map<String, Object> restControllers, HandlerMet
 
 private void calculateServerUrl(HttpServletRequest request, String apiDocsUrl) {
 StringBuffer requestUrl = request.getRequestURL();
+
 String serverBaseUrl = requestUrl.substring(0, requestUrl.length() - apiDocsUrl.length());
 generalInfoBuilder.setServerBaseUrl(serverBaseUrl);
 }

springdoc-openapi-core/src/test/java/test/org/springdoc/api/app4/SpringDocApp4Test.java

@@ -1,55 +1,8 @@
 package test.org.springdoc.api.app4;
 
-import static org.hamcrest.Matchers.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import test.org.springdoc.api.AbstractSpringDocTest;
 
-import org.hamcrest.Matchers;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springdoc.core.Constants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.servlet.MockMvc;
+public class SpringDocApp4Test extends AbstractSpringDocTest {
 
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@ActiveProfiles("test")
-@AutoConfigureMockMvc
-public class SpringDocApp4Test {
 
-@Autowired
-private MockMvc mockMvc;
-
-@Test
-public void testApp4() throws Exception {
-mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk())
-.andExpect(jsonPath("$.openapi", is("3.0.1")))
-.andExpect(jsonPath("$.info.title", is("OpenAPI definition")))
-.andExpect(jsonPath("$.info.version", is("v0")))
-.andExpect(jsonPath("$.paths./values/data.post.operationId", is("list")))
-.andExpect(jsonPath("$.paths./values/data.post.requestBody.content.['*/*'].schema.['$ref']",
-is("#/components/schemas/TrackerData")))
-.andExpect(jsonPath("$.paths./values/data.post.responses.200.content.['*/*'].schema.['$ref']",
-is("#/components/schemas/TrackerData")))
-.andExpect(
-jsonPath("$.paths./values/data.post.responses.200.description", is("default response")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.required")
-.value(Matchers.containsInAnyOrder("timestamp", "trackerId", "value")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.type", is("object")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.properties.trackerId.type", is("string")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.properties.timestamp.type", is("string")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.properties.value.type", is("number")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.properties.timestamp.format", is("date-time")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.properties.value.format", is("double")))
-.andExpect(
-jsonPath("$.components.schemas.TrackerData.properties.trackerId.example", is("the-tracker-id")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.properties.timestamp.example",
-is("2018-01-01T00:00:00Z")))
-.andExpect(jsonPath("$.components.schemas.TrackerData.properties.value.example", is(19.0)));
-}
-
-}
+}

springdoc-openapi-core/src/test/resources/results/app4.json

@@ -0,0 +1,70 @@
+{
+"openapi": "3.0.1",
+"info": {
+"title": "OpenAPI definition",
+"version": "v0"
+},
+"servers": [
+{
+"url": "http://localhost",
+"description": "Generated server url"
+}
+],
+"paths": {
+"/values/data": {
+"post": {
+"operationId": "list",
+"requestBody": {
+"content": {
+"*/*": {
+"schema": {
+"$ref": "#/components/schemas/TrackerData"
+}
+}
+}
+},
+"responses": {
+"200": {
+"description": "default response",
+"content": {
+"*/*": {
+"schema": {
+"$ref": "#/components/schemas/TrackerData"
+}
+}
+}
+}
+}
+}
+}
+},
+"components": {
+"schemas": {
+"TrackerData": {
+"required": [
+"timestamp",
+"trackerId",
+"value"
+],
+"type": "object",
+"properties": {
+"trackerId": {
+"type": "string",
+"example": "the-tracker-id"
+},
+"timestamp": {
+"type": "string",
+"format": "date-time",
+"example": "2018-01-01T00:00:00Z"
+},
+"value": {
+"type": "number",
+"description": "The data value",
+"format": "double",
+"example": 19.0
+}
+}
+}
+}
+}
+}