Merge tag 'v0.0.1' into develop

release v0.0.1

pom.xml

@@ -23,12 +23,6 @@
 			<artifactId>spring-boot-starter-logging</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.jayway.jsonpath</groupId>
-			<artifactId>json-path</artifactId>
-			<version>2.4.0</version>
-		</dependency>
-
 		<dependency>
 			<groupId>net.sourceforge.plantuml</groupId>
 			<artifactId>plantuml</artifactId>
@@ -55,6 +49,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 
@@ -69,6 +69,4 @@
 		</plugins>
 	</build>
 
-
-
 </project>

src/main/java/com/yame/uml/Application.java

@@ -2,12 +2,8 @@ package com.yame.uml;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 
 @SpringBootApplication
-@Configuration
-
 public class Application {
 
 	public static void main(String[] args) {

src/main/java/com/yame/uml/control/api.java

@@ -19,13 +19,12 @@ import net.sourceforge.plantuml.FileFormat;
 import net.sourceforge.plantuml.FileFormatOption;
 import net.sourceforge.plantuml.SourceStringReader;
 import net.sourceforge.plantuml.core.Diagram;
-import net.sourceforge.plantuml.core.UmlSource;
 import net.sourceforge.plantuml.error.PSystemError;
 
 @RestController
 @RequestMapping("/api")
 @Slf4j
-public class API {
+public class api {
 
     static public String getUmlSource(String source) {
         // encapsulate the UML syntax if necessary
@@ -55,14 +54,9 @@ public class API {
 
         Result result = new Result();
 
-        if (srcblocks.size() != 0 && dstblocks.size() != 0) {
+        if(srcblocks.size() != 0 && dstblocks.size() != 0) {
-            BlockUml sblock = srcblocks.get(0);
+
-            BlockUml dblock = srcblocks.get(0);
-            Diagram d1 = sblock.getDiagram();
-            Diagram d2 = dblock.getDiagram();
                
-            UmlSource s1 = d1.getSource();
-            UmlSource s2 = d2.getSource();
         }
         result.setType(ResultType.ErrorMegreUML2SVG);
         return result;

src/test/java/com/yame/control/TestAPI.java

@@ -1,63 +1,12 @@
 package com.yame.control;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.jayway.jsonpath.DocumentContext;
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.ReadContext;
-import com.yame.uml.Application;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * TestAPI
  */
-
+@SpringBootTest
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Slf4j
 public class TestAPI {
 
-    @LocalServerPort
-    String port;
     
-    @Autowired
-    TestRestTemplate rest;
-
-    String domain;
-
-    @Before
-    public void init() {
-        domain = "http://localhost:" + port;
-    }
-    
-    @Test
-    public void uml2SVG() {
- 
-        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
-        map.add("data", "123");
-        String resp = rest.postForObject(domain + "/api/v1/uml2svg", map, String.class);
-        ReadContext cxt = JsonPath.parse(resp);
-        assertEquals(cxt.read("$.type").toString(), "{desc=Error Source2SVG, code=-102, success=false}");
-
-        log.info(resp.toString());
-    }
 }