iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Karan Khanna 2018-06-07 21:29:38 +02:00
parent 8080f07c6c
commit 11ae9c438c
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
javax-servlets/src/main/java/com/baeldung/model/Employee.java
View File

@ -5,9 +5,9 @@ public class Employee {
private int id; private int id;
private String name; private String name;
private String department; private String department;
private Double salary; private long salary;
public Employee(int id, String name, String department, Double salary) { public Employee(int id, String name, String department, long salary) {
super(); super();
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -61,11 +61,11 @@ public class Employee {
this.department = department; this.department = department;
} }
public Double getSalary() { public long getSalary() {
return salary; return salary;
} }
public void setSalary(Double salary) { public void setSalary(long salary) {
this.salary = salary; this.salary = salary;
} }

13
javax-servlets/src/main/java/com/baeldung/servlets/EmployeeServlet.java
View File

@ -15,17 +15,14 @@ import com.google.gson.Gson;
@WebServlet(name = "EmployeeServlet", urlPatterns = "/employeeServlet") @WebServlet(name = "EmployeeServlet", urlPatterns = "/employeeServlet")
public class EmployeeServlet extends HttpServlet { public class EmployeeServlet extends HttpServlet {
private Gson gson = new Gson();
@Override @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException { throws IOException {
int id = Integer.parseInt(request.getParameter("id")); Employee employee = new Employee(1, "Karan", "IT", 5000);
String name = request.getParameter("name"); String employeeJsonString = this.gson.toJson(employee);
String department = request.getParameter("department");
Double salary = Double.parseDouble(request.getParameter("salary"));
Employee employee = new Employee(id, name, department, salary);
String employeeJsonString = new Gson().toJson(employee);
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
response.setContentType("application/json"); response.setContentType("application/json");

10
javax-servlets/src/test/java/com/baeldung/servlets/EmployeeServletIntegrationTest.java
View File

@ -36,21 +36,15 @@ public class EmployeeServletIntegrationTest {
int id = 1; int id = 1;
String name = "Karan Khanna"; String name = "Karan Khanna";
String department = "IT"; String department = "IT";
Double salary = 5000.0; long salary = 5000;
employee = new Employee(id, name, department, salary); employee = new Employee(id, name, department, salary);
//when
when(httpServletRequest.getParameter("id")).thenReturn(String.valueOf(id));
when(httpServletRequest.getParameter("name")).thenReturn(name);
when(httpServletRequest.getParameter("department")).thenReturn(department);
when(httpServletRequest.getParameter("salary")).thenReturn(String.valueOf(salary));
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw); PrintWriter pw = new PrintWriter(sw);
when(httpServletResponse.getWriter()).thenReturn(pw); when(httpServletResponse.getWriter()).thenReturn(pw);
EmployeeServlet employeeServlet = new EmployeeServlet(); EmployeeServlet employeeServlet = new EmployeeServlet();
employeeServlet.doPost(httpServletRequest, httpServletResponse); employeeServlet.doGet(httpServletRequest, httpServletResponse);
String employeeJsonString = sw.getBuffer().toString().trim(); String employeeJsonString = sw.getBuffer().toString().trim();
Employee fetchedEmployee = new Gson().fromJson(employeeJsonString, Employee.class); Employee fetchedEmployee = new Gson().fromJson(employeeJsonString, Employee.class);