Merge branch 'master' of https://github.com/elwyncrestha/AAOS into CP…

…-Documentation
elwyncrestha · Jul 25, 2019 · 4420f0a · 4420f0a
2 parents aeb8479 + fd0f2cc
commit 4420f0a
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 72 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
  <h2>1.4.199</h2>
  <hamcrest.core>2.1</hamcrest.core>
  <hibernate.core>5.4.1.Final</hibernate.core>
- <jackson.databind>2.9.9</jackson.databind>
+ <jackson.databind>2.9.9.1</jackson.databind>
  <javax.mail>1.6.2</javax.mail>
  <javax.mail.api>1.6.2</javax.mail.api>
  <jstl>1.2</jstl>

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/BatchDto.java b/src/main/java/com/elvin/aaos/core/model/dto/BatchDto.java
@@ -1,15 +1,14 @@
 package com.elvin.aaos.core.model.dto;
 
-import com.elvin.aaos.core.model.enums.Status;
+import java.util.Date;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import com.elvin.aaos.core.model.enums.Status;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/BuildingRoomDto.java b/src/main/java/com/elvin/aaos/core/model/dto/BuildingRoomDto.java
@@ -9,7 +9,7 @@
 
 @Getter
 @Setter
-public class BuildingRoomDto {
+public class BuildingRoomDto extends BaseDto<Long> {
 
  private String name;
 

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/CourseDto.java b/src/main/java/com/elvin/aaos/core/model/dto/CourseDto.java
@@ -1,13 +1,12 @@
 package com.elvin.aaos.core.model.dto;
 
-import com.elvin.aaos.core.model.enums.Status;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import java.util.HashSet;
-import java.util.Set;
+import com.elvin.aaos.core.model.enums.Status;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/ModuleDto.java b/src/main/java/com/elvin/aaos/core/model/dto/ModuleDto.java
@@ -1,13 +1,12 @@
 package com.elvin.aaos.core.model.dto;
 
-import com.elvin.aaos.core.model.enums.Status;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import java.util.HashSet;
-import java.util.Set;
+import com.elvin.aaos.core.model.enums.Status;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/OrganizationDto.java b/src/main/java/com/elvin/aaos/core/model/dto/OrganizationDto.java
@@ -1,18 +1,16 @@
 package com.elvin.aaos.core.model.dto;
 
+import java.util.Date;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class OrganizationDto extends BaseDto<Long>{
+public class OrganizationDto extends BaseDto<Long> {
 
  private String name;
 

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/RoomDto.java b/src/main/java/com/elvin/aaos/core/model/dto/RoomDto.java
@@ -1,12 +1,10 @@
 package com.elvin.aaos.core.model.dto;
 
-import com.elvin.aaos.core.model.enums.RoomType;
-import com.elvin.aaos.core.model.enums.Status;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashSet;
-import java.util.Set;
+import com.elvin.aaos.core.model.enums.RoomType;
+import com.elvin.aaos.core.model.enums.Status;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/RoomScheduleDto.java b/src/main/java/com/elvin/aaos/core/model/dto/RoomScheduleDto.java
@@ -1,16 +1,15 @@
 package com.elvin.aaos.core.model.dto;
 
-import com.elvin.aaos.core.model.enums.Status;
+import java.time.DayOfWeek;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import java.time.DayOfWeek;
-import java.util.Date;
+import com.elvin.aaos.core.model.enums.Status;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/StudentProfileDto.java b/src/main/java/com/elvin/aaos/core/model/dto/StudentProfileDto.java
@@ -1,14 +1,14 @@
 package com.elvin.aaos.core.model.dto;
 
-import com.elvin.aaos.core.model.enums.Gender;
+import java.util.Date;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import java.util.Date;
-import java.util.Set;
+import com.elvin.aaos.core.model.enums.Gender;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/elvin/aaos/core/model/dto/TeacherProfileDto.java b/src/main/java/com/elvin/aaos/core/model/dto/TeacherProfileDto.java
@@ -1,13 +1,12 @@
 package com.elvin.aaos.core.model.dto;
 
-import com.elvin.aaos.core.model.enums.Gender;
+import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import com.elvin.aaos.core.model.enums.Gender;
 
 @Getter
 @Setter

diff --git a/src/main/java/com/elvin/aaos/core/model/entity/Batch.java b/src/main/java/com/elvin/aaos/core/model/entity/Batch.java
@@ -9,7 +9,6 @@
 
 import javax.persistence.*;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Set;
 
 @Entity

diff --git a/src/main/java/com/elvin/aaos/core/model/entity/Building.java b/src/main/java/com/elvin/aaos/core/model/entity/Building.java
@@ -7,8 +7,6 @@
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.HashSet;
-import java.util.Set;
 
 @Entity
 @Table(name = "building")

diff --git a/src/main/java/com/elvin/aaos/core/model/entity/Course.java b/src/main/java/com/elvin/aaos/core/model/entity/Course.java
@@ -7,8 +7,6 @@
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.HashSet;
-import java.util.Set;
 
 @Entity
 @Table(name = "course")

diff --git a/src/main/java/com/elvin/aaos/core/model/entity/Module.java b/src/main/java/com/elvin/aaos/core/model/entity/Module.java
@@ -7,8 +7,6 @@
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.HashSet;
-import java.util.Set;
 
 @Entity
 @Table(name = "module")

diff --git a/src/main/java/com/elvin/aaos/core/model/entity/Room.java b/src/main/java/com/elvin/aaos/core/model/entity/Room.java
@@ -8,8 +8,6 @@
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.HashSet;
-import java.util.Set;
 
 @Entity
 @Table(name = "room")

diff --git a/src/main/java/com/elvin/aaos/core/model/entity/StudentProfile.java b/src/main/java/com/elvin/aaos/core/model/entity/StudentProfile.java
@@ -9,7 +9,6 @@
 
 import javax.persistence.*;
 import java.util.Date;
-import java.util.Set;
 
 @Entity
 @Table(name = "studentProfile")

diff --git a/src/main/java/com/elvin/aaos/core/model/entity/TeacherProfile.java b/src/main/java/com/elvin/aaos/core/model/entity/TeacherProfile.java
@@ -9,8 +9,6 @@
 
 import javax.persistence.*;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 
 @Entity
 @Table(name = "teacherProfile")

diff --git a/src/main/java/com/elvin/aaos/core/model/mapper/BuildingMapper.java b/src/main/java/com/elvin/aaos/core/model/mapper/BuildingMapper.java
@@ -1,10 +1,9 @@
 package com.elvin.aaos.core.model.mapper;
 
+import org.mapstruct.Mapper;
+
 import com.elvin.aaos.core.model.dto.BuildingDto;
-import com.elvin.aaos.core.model.dto.BuildingRoomDto;
-import com.elvin.aaos.core.model.dto.RoomBuildingDto;
 import com.elvin.aaos.core.model.entity.Building;
-import org.mapstruct.Mapper;
 
 @Mapper(componentModel = BaseMapper.SPRING_MODEL)
 public abstract class BuildingMapper extends BaseMapper<Building, BuildingDto> {

diff --git a/src/main/java/com/elvin/aaos/core/model/repository/BuildingRepository.java b/src/main/java/com/elvin/aaos/core/model/repository/BuildingRepository.java
@@ -2,7 +2,6 @@
 
 import com.elvin.aaos.core.model.entity.Building;
 import com.elvin.aaos.core.model.enums.BuildingStatus;
-import com.elvin.aaos.core.model.enums.Status;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 

diff --git a/src/main/java/com/elvin/aaos/core/service/impl/BatchServiceImpl.java b/src/main/java/com/elvin/aaos/core/service/impl/BatchServiceImpl.java
@@ -1,9 +1,14 @@
 package com.elvin.aaos.core.service.impl;
 
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.elvin.aaos.core.model.dto.BatchCourseDto;
 import com.elvin.aaos.core.model.dto.BatchDto;
 import com.elvin.aaos.core.model.dto.BatchExamDto;
-import com.elvin.aaos.core.model.dto.CourseDto;
 import com.elvin.aaos.core.model.entity.Batch;
 import com.elvin.aaos.core.model.entity.User;
 import com.elvin.aaos.core.model.enums.Status;
@@ -13,13 +18,6 @@
 import com.elvin.aaos.core.model.repository.BatchRepository;
 import com.elvin.aaos.core.service.BatchService;
 import com.elvin.aaos.web.utility.StringConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
 
 @Service
 public class BatchServiceImpl implements BatchService {
@@ -30,11 +28,11 @@ public class BatchServiceImpl implements BatchService {
  private final BatchExamMapper batchExamMapper;
 
  public BatchServiceImpl(
-  @Autowired BatchRepository batchRepository,
-  @Autowired BatchMapper batchMapper,
-  @Autowired BatchCourseMapper batchCourseMapper,
-  @Autowired BatchExamMapper batchExamMapper
-  ) {
+ @Autowired BatchRepository batchRepository,
+ @Autowired BatchMapper batchMapper,
+ @Autowired BatchCourseMapper batchCourseMapper,
+ @Autowired BatchExamMapper batchExamMapper
+ ) {
  this.batchRepository = batchRepository;
  this.batchMapper = batchMapper;
  this.batchCourseMapper = batchCourseMapper;

diff --git a/src/main/java/com/elvin/aaos/web/utility/auth/AuthenticationUtil.java b/src/main/java/com/elvin/aaos/web/utility/auth/AuthenticationUtil.java
@@ -1,6 +1,5 @@
 package com.elvin.aaos.web.utility.auth;
 
-import com.elvin.aaos.core.model.dto.UserDto;
 import com.elvin.aaos.core.model.enums.UserType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.core.Authentication;