From c299cde0798f576f54403fc3b3da7a0cb0849fe1 Mon Sep 17 00:00:00 2001 From: Chao Zhang Date: Wed, 20 Jun 2018 13:58:55 -0400 Subject: [PATCH] Changes made to run code in HIG --- .classpath | 5 ++-- .vscode/launch.json | 27 +++++++++++++++++++ pom.xml | 4 +-- .../java/com/czhang/cpms/SwaggerConfig.java | 3 --- .../controller/ProblemRestApiController.java | 2 -- .../controller/UserRestApiController.java | 2 -- .../com/czhang/cpms/model/db/RoleDAO.java | 2 +- .../com/czhang/cpms/model/db/UserDAO.java | 2 +- .../com/czhang/cpms/model/domain/Problem.java | 2 -- .../cpms/repositories/ProblemRepository.java | 3 --- .../czhang/cpms/service/ProblemService.java | 2 -- .../cpms/service/ProblemServiceImpl.java | 4 --- src/main/resources/application.yml | 6 ++--- 13 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.classpath b/.classpath index 6d7587a..441d9c3 100644 --- a/.classpath +++ b/.classpath @@ -15,14 +15,15 @@ + - + - + diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..cd9cbdb --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + { + "type": "java", + "name": "Debug (Launch)-SpringBootCRUDApp", + "request": "launch", + "cwd": "${workspaceFolder}", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "com.czhang.cpms.SpringBootCRUDApp", + "projectName": "SpringBootCRUDApplicationExample", + "args": "" + }, + { + "type": "java", + "name": "Debug (Attach)", + "request": "attach", + "hostName": "localhost", + "port": 0 + } + ] +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6c9ca18..f09207b 100644 --- a/pom.xml +++ b/pom.xml @@ -70,13 +70,13 @@ ojdbc7 12.1.0 - + --> com.oracle ojdbc6 11.2.0 - --> + org.postgresql postgresql diff --git a/src/main/java/com/czhang/cpms/SwaggerConfig.java b/src/main/java/com/czhang/cpms/SwaggerConfig.java index 74c8d5d..07c702c 100644 --- a/src/main/java/com/czhang/cpms/SwaggerConfig.java +++ b/src/main/java/com/czhang/cpms/SwaggerConfig.java @@ -5,9 +5,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; - import com.google.common.base.Predicate; import springfox.documentation.builders.ApiInfoBuilder; diff --git a/src/main/java/com/czhang/cpms/controller/ProblemRestApiController.java b/src/main/java/com/czhang/cpms/controller/ProblemRestApiController.java index 84e2449..0596791 100644 --- a/src/main/java/com/czhang/cpms/controller/ProblemRestApiController.java +++ b/src/main/java/com/czhang/cpms/controller/ProblemRestApiController.java @@ -1,7 +1,6 @@ package com.czhang.cpms.controller; import java.util.List; -import java.util.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +20,6 @@ import com.czhang.cpms.model.domain.Problem; import com.czhang.cpms.model.response.ProblemResponse; import com.czhang.cpms.service.ProblemService; -import com.czhang.cpms.util.ProblemServiceHelper; @CrossOrigin(origins = { "*" }, allowCredentials = "false", allowedHeaders = "*") @RestController diff --git a/src/main/java/com/czhang/cpms/controller/UserRestApiController.java b/src/main/java/com/czhang/cpms/controller/UserRestApiController.java index 06bddfc..093ee64 100644 --- a/src/main/java/com/czhang/cpms/controller/UserRestApiController.java +++ b/src/main/java/com/czhang/cpms/controller/UserRestApiController.java @@ -16,11 +16,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.util.UriComponentsBuilder; -import com.czhang.cpms.model.db.RoleDAO; import com.czhang.cpms.model.db.UserDAO; import com.czhang.cpms.model.domain.User; import com.czhang.cpms.model.response.UserResponse; -import com.czhang.cpms.service.RoleService; import com.czhang.cpms.service.UserService; @CrossOrigin(origins = { "*" }, allowCredentials = "false", allowedHeaders = "*") diff --git a/src/main/java/com/czhang/cpms/model/db/RoleDAO.java b/src/main/java/com/czhang/cpms/model/db/RoleDAO.java index ec2c9ef..4ff682b 100644 --- a/src/main/java/com/czhang/cpms/model/db/RoleDAO.java +++ b/src/main/java/com/czhang/cpms/model/db/RoleDAO.java @@ -9,7 +9,7 @@ @Table(name="app_role") public class RoleDAO { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + //@GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @Column(name="role_name") diff --git a/src/main/java/com/czhang/cpms/model/db/UserDAO.java b/src/main/java/com/czhang/cpms/model/db/UserDAO.java index b0b0468..4dbc893 100644 --- a/src/main/java/com/czhang/cpms/model/db/UserDAO.java +++ b/src/main/java/com/czhang/cpms/model/db/UserDAO.java @@ -11,7 +11,7 @@ @Table(name = "app_user") public class UserDAO { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + //@GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Long id; diff --git a/src/main/java/com/czhang/cpms/model/domain/Problem.java b/src/main/java/com/czhang/cpms/model/domain/Problem.java index bd3ead3..617ee62 100644 --- a/src/main/java/com/czhang/cpms/model/domain/Problem.java +++ b/src/main/java/com/czhang/cpms/model/domain/Problem.java @@ -1,8 +1,6 @@ package com.czhang.cpms.model.domain; import java.util.Base64; -import java.util.List; - import com.czhang.cpms.model.db.ProblemDAO; import com.czhang.cpms.util.Constants; import com.czhang.cpms.util.ProblemServiceHelper; diff --git a/src/main/java/com/czhang/cpms/repositories/ProblemRepository.java b/src/main/java/com/czhang/cpms/repositories/ProblemRepository.java index 76dc6bd..0f0fb89 100644 --- a/src/main/java/com/czhang/cpms/repositories/ProblemRepository.java +++ b/src/main/java/com/czhang/cpms/repositories/ProblemRepository.java @@ -1,8 +1,5 @@ package com.czhang.cpms.repositories; -import java.util.UUID; - -import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/czhang/cpms/service/ProblemService.java b/src/main/java/com/czhang/cpms/service/ProblemService.java index 45310e8..1ff61ea 100644 --- a/src/main/java/com/czhang/cpms/service/ProblemService.java +++ b/src/main/java/com/czhang/cpms/service/ProblemService.java @@ -1,8 +1,6 @@ package com.czhang.cpms.service; import java.util.List; -import java.util.UUID; - import com.czhang.cpms.model.db.ProblemDAO; import com.czhang.cpms.model.domain.Problem; diff --git a/src/main/java/com/czhang/cpms/service/ProblemServiceImpl.java b/src/main/java/com/czhang/cpms/service/ProblemServiceImpl.java index b8e6e82..d00300e 100644 --- a/src/main/java/com/czhang/cpms/service/ProblemServiceImpl.java +++ b/src/main/java/com/czhang/cpms/service/ProblemServiceImpl.java @@ -1,13 +1,9 @@ package com.czhang.cpms.service; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import java.util.UUID; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a70052f..5730d3e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -32,7 +32,7 @@ datasource: dialect: org.hibernate.dialect.PostgreSQLDialect --- spring: - profiles: local,default + profiles: Heroku datasource: sampleapp: url: ${JDBC_DATABASE_URL} @@ -48,12 +48,12 @@ datasource: dialect: org.hibernate.dialect.PostgreSQLDialect --- spring: - profiles: oracle + profiles: local,default datasource: sampleapp: url: jdbc:oracle:thin:@localhost:1521:xe username: czhang - password: 78320 + password: Dec31tgb driverClassName: jdbc.driver.OracleDriver defaultSchema: czhang maxPoolSize: 10