Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
java-training-project-complete
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Abdul Qadeer Farooqui
java-training-project-complete
Commits
a547329f
Commit
a547329f
authored
Aug 03, 2022
by
Muhammad Abdul Qadeer Farooqui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test for TeacherService
parent
0a62c47d
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
354 additions
and
28 deletions
+354
-28
workspace.xml
.idea/workspace.xml
+8
-20
workspace.xml
student-service/student-service/.idea/workspace.xml
+21
-1
FeignService.java
...src/main/java/com/example/student/feign/FeignService.java
+2
-2
StudentMapper.java
...c/main/java/com/example/student/mapper/StudentMapper.java
+0
-1
uiDesigner.xml
teacher-service/teacher-service/.idea/uiDesigner.xml
+124
-0
pom.xml
teacher-service/teacher-service/pom.xml
+14
-0
TeacherController.java
...ava/com/example/teacher/controller/TeacherController.java
+2
-1
ControllerAdvisor.java
...java/com/example/teacher/exception/ControllerAdvisor.java
+16
-0
ResourceNotFoundCustomException.java
...le/teacher/exception/ResourceNotFoundCustomException.java
+7
-0
TeacherService.java
...main/java/com/example/teacher/service/TeacherService.java
+7
-2
TeacherControllerTest.java
...com/example/teacher/controller/TeacherControllerTest.java
+11
-0
TeacherServiceTest.java
.../java/com/example/teacher/service/TeacherServiceTest.java
+141
-0
TeacherController.class
...es/com/example/teacher/controller/TeacherController.class
+0
-0
ControllerAdvisor.class
...ses/com/example/teacher/exception/ControllerAdvisor.class
+0
-0
ResourceNotFoundCustomException.class
...e/teacher/exception/ResourceNotFoundCustomException.class
+0
-0
TeacherService.class
.../classes/com/example/teacher/service/TeacherService.class
+0
-0
TeacherMapperImpl.java
...tations/com/example/teacher/mapper/TeacherMapperImpl.java
+1
-1
TeacherControllerTest.class
...om/example/teacher/controller/TeacherControllerTest.class
+0
-0
TeacherServiceTest.class
...sses/com/example/teacher/service/TeacherServiceTest.class
+0
-0
No files found.
.idea/workspace.xml
View file @
a547329f
...
...
@@ -2,20 +2,8 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"93915b5b-eeab-4656-8b9a-933619ebc5f0"
name=
"Changes"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/constant/Constant.java"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/dto/ErrorDto.java"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/dto/StudentDto.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/.gitignore"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/controller/StudentController.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/controller/StudentController.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/controller/StudentTeacherResponseVO.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/responseobject/StudentTeacherResponseVO.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/dto/TeacherDto.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/dto/TeacherDto.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/feign/FeignFallBack.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/feign/FeignFallBack.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/feign/FeignService.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/feign/FeignService.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/model/Student.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/model/Student.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/service/StudentService.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/service/StudentService.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/teacher-service/.idea/.gitignore"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/teacher-service/teacher-service/.gitignore"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/mapper/StudentMapper.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/student-service/student-service/src/main/java/com/example/student/mapper/StudentMapper.java"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -30,13 +18,13 @@
<option
name=
"hideEmptyMiddlePackages"
value=
"true"
/>
<option
name=
"showLibraryContents"
value=
"true"
/>
</component>
<component
name=
"PropertiesComponent"
>
<![CDATA[
{
"keyToString"
: {
"RunOnceActivity.OpenProjectViewOnStart": "true"
,
"RunOnceActivity.ShowReadmeOnStart": "true"
,
"last_opened_file_path": "/Users/aqadeer/Desktop/java-training-project-complete"
<component
name=
"PropertiesComponent"
>
{
"
keyToString
"
: {
"
RunOnceActivity.OpenProjectViewOnStart
"
:
"
true
"
,
"
RunOnceActivity.ShowReadmeOnStart
"
:
"
true
"
,
"
last_opened_file_path
"
:
"
/Users/aqadeer/Desktop/java-training-project-complete
"
}
}
]]>
</component>
}
</component>
<component
name=
"SpellCheckerSettings"
RuntimeDictionaries=
"0"
Folders=
"0"
CustomDictionaries=
"0"
DefaultDictionary=
"application-level"
UseSingleDictionary=
"true"
transferred=
"true"
/>
<component
name=
"TaskManager"
>
<task
active=
"true"
id=
"Default"
summary=
"Default task"
>
...
...
student-service/student-service/.idea/workspace.xml
View file @
a547329f
...
...
@@ -5,10 +5,19 @@
</component>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"bd185af2-024c-4245-af2c-5893b8b011d9"
name=
"Changes"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/.idea/uiDesigner.xml"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/exception/ControllerAdvisor.java"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/exception/ResourceNotFoundCustomException.java"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/test/java/com/example/teacher/controller/TeacherControllerTest.java"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/test/java/com/example/teacher/service/TeacherServiceTest.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../../.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../../.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/TeacherServiceApplication.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/TeacherServiceApplication.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/main/java/com/example/student/feign/FeignService.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/main/java/com/example/student/feign/FeignService.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/main/java/com/example/student/mapper/StudentMapper.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/main/java/com/example/student/mapper/StudentMapper.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/controller/TeacherController.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/controller/TeacherController.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/service/TeacherService.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/src/main/java/com/example/teacher/service/TeacherService.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/target/generated-sources/annotations/com/example/teacher/mapper/TeacherMapperImpl.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/../../teacher-service/teacher-service/target/generated-sources/annotations/com/example/teacher/mapper/TeacherMapperImpl.java"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -26,6 +35,17 @@
<component
name=
"Git.Settings"
>
<option
name=
"RECENT_GIT_ROOT_PATH"
value=
"$PROJECT_DIR$/../.."
/>
</component>
<component
name=
"HighlightingSettingsPerFile"
>
<setting
file=
"file://$PROJECT_DIR$/pom.xml"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/java/com/example/student/constant/Constant.java"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/java/com/example/student/controller/StudentController.java"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/java/com/example/student/dto/TeacherDto.java"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/java/com/example/student/feign/FeignFallBack.java"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/java/com/example/student/feign/FeignService.java"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/java/com/example/student/mapper/StudentMapper.java"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/java/com/example/student/service/StudentService.java"
root0=
"FORCE_HIGHLIGHTING"
/>
<setting
file=
"file://$PROJECT_DIR$/src/main/resources/application.properties"
root0=
"FORCE_HIGHLIGHTING"
/>
</component>
<component
name=
"MarkdownSettingsMigration"
>
<option
name=
"stateVersion"
value=
"1"
/>
</component>
...
...
student-service/student-service/src/main/java/com/example/student/feign/FeignService.java
View file @
a547329f
...
...
@@ -14,8 +14,8 @@ import static com.example.student.constant.Constant.FEIGN_URL;
public
interface
FeignService
{
@GetMapping
(
"/name/{teacherName}"
)
public
ResponseEntity
<
TeacherDto
>
findTeacherByName
(
@PathVariable
String
teacherName
);
ResponseEntity
<
TeacherDto
>
findTeacherByName
(
@PathVariable
String
teacherName
);
@GetMapping
(
"/age/{age}"
)
public
ResponseEntity
<
List
<
TeacherDto
>>
findTeacherByAge
(
@PathVariable
int
age
);
ResponseEntity
<
List
<
TeacherDto
>>
findTeacherByAge
(
@PathVariable
int
age
);
}
student-service/student-service/src/main/java/com/example/student/mapper/StudentMapper.java
View file @
a547329f
...
...
@@ -5,7 +5,6 @@ import com.example.student.model.Student;
import
org.mapstruct.Mapper
;
import
java.util.List
;
import
java.util.Optional
;
@Mapper
(
componentModel
=
"spring"
)
public
interface
StudentMapper
{
...
...
teacher-service/teacher-service/.idea/uiDesigner.xml
0 → 100644
View file @
a547329f
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"Palette2"
>
<group
name=
"Swing"
>
<item
class=
"com.intellij.uiDesigner.HSpacer"
tooltip-text=
"Horizontal Spacer"
icon=
"/com/intellij/uiDesigner/icons/hspacer.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"1"
hsize-policy=
"6"
anchor=
"0"
fill=
"1"
/>
</item>
<item
class=
"com.intellij.uiDesigner.VSpacer"
tooltip-text=
"Vertical Spacer"
icon=
"/com/intellij/uiDesigner/icons/vspacer.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"1"
anchor=
"0"
fill=
"2"
/>
</item>
<item
class=
"javax.swing.JPanel"
icon=
"/com/intellij/uiDesigner/icons/panel.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"3"
hsize-policy=
"3"
anchor=
"0"
fill=
"3"
/>
</item>
<item
class=
"javax.swing.JScrollPane"
icon=
"/com/intellij/uiDesigner/icons/scrollPane.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"7"
hsize-policy=
"7"
anchor=
"0"
fill=
"3"
/>
</item>
<item
class=
"javax.swing.JButton"
icon=
"/com/intellij/uiDesigner/icons/button.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"3"
anchor=
"0"
fill=
"1"
/>
<initial-values>
<property
name=
"text"
value=
"Button"
/>
</initial-values>
</item>
<item
class=
"javax.swing.JRadioButton"
icon=
"/com/intellij/uiDesigner/icons/radioButton.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"3"
anchor=
"8"
fill=
"0"
/>
<initial-values>
<property
name=
"text"
value=
"RadioButton"
/>
</initial-values>
</item>
<item
class=
"javax.swing.JCheckBox"
icon=
"/com/intellij/uiDesigner/icons/checkBox.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"3"
anchor=
"8"
fill=
"0"
/>
<initial-values>
<property
name=
"text"
value=
"CheckBox"
/>
</initial-values>
</item>
<item
class=
"javax.swing.JLabel"
icon=
"/com/intellij/uiDesigner/icons/label.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"0"
anchor=
"8"
fill=
"0"
/>
<initial-values>
<property
name=
"text"
value=
"Label"
/>
</initial-values>
</item>
<item
class=
"javax.swing.JTextField"
icon=
"/com/intellij/uiDesigner/icons/textField.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"6"
anchor=
"8"
fill=
"1"
>
<preferred-size
width=
"150"
height=
"-1"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JPasswordField"
icon=
"/com/intellij/uiDesigner/icons/passwordField.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"6"
anchor=
"8"
fill=
"1"
>
<preferred-size
width=
"150"
height=
"-1"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JFormattedTextField"
icon=
"/com/intellij/uiDesigner/icons/formattedTextField.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"6"
anchor=
"8"
fill=
"1"
>
<preferred-size
width=
"150"
height=
"-1"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JTextArea"
icon=
"/com/intellij/uiDesigner/icons/textArea.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"6"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"150"
height=
"50"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JTextPane"
icon=
"/com/intellij/uiDesigner/icons/textPane.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"6"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"150"
height=
"50"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JEditorPane"
icon=
"/com/intellij/uiDesigner/icons/editorPane.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"6"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"150"
height=
"50"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JComboBox"
icon=
"/com/intellij/uiDesigner/icons/comboBox.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"2"
anchor=
"8"
fill=
"1"
/>
</item>
<item
class=
"javax.swing.JTable"
icon=
"/com/intellij/uiDesigner/icons/table.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"6"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"150"
height=
"50"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JList"
icon=
"/com/intellij/uiDesigner/icons/list.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"2"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"150"
height=
"50"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JTree"
icon=
"/com/intellij/uiDesigner/icons/tree.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"6"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"150"
height=
"50"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JTabbedPane"
icon=
"/com/intellij/uiDesigner/icons/tabbedPane.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"3"
hsize-policy=
"3"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"200"
height=
"200"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JSplitPane"
icon=
"/com/intellij/uiDesigner/icons/splitPane.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"3"
hsize-policy=
"3"
anchor=
"0"
fill=
"3"
>
<preferred-size
width=
"200"
height=
"200"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JSpinner"
icon=
"/com/intellij/uiDesigner/icons/spinner.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"true"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"6"
anchor=
"8"
fill=
"1"
/>
</item>
<item
class=
"javax.swing.JSlider"
icon=
"/com/intellij/uiDesigner/icons/slider.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"6"
anchor=
"8"
fill=
"1"
/>
</item>
<item
class=
"javax.swing.JSeparator"
icon=
"/com/intellij/uiDesigner/icons/separator.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"6"
anchor=
"0"
fill=
"3"
/>
</item>
<item
class=
"javax.swing.JProgressBar"
icon=
"/com/intellij/uiDesigner/icons/progressbar.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"6"
anchor=
"0"
fill=
"1"
/>
</item>
<item
class=
"javax.swing.JToolBar"
icon=
"/com/intellij/uiDesigner/icons/toolbar.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"6"
anchor=
"0"
fill=
"1"
>
<preferred-size
width=
"-1"
height=
"20"
/>
</default-constraints>
</item>
<item
class=
"javax.swing.JToolBar$Separator"
icon=
"/com/intellij/uiDesigner/icons/toolbarSeparator.svg"
removable=
"false"
auto-create-binding=
"false"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"0"
hsize-policy=
"0"
anchor=
"0"
fill=
"1"
/>
</item>
<item
class=
"javax.swing.JScrollBar"
icon=
"/com/intellij/uiDesigner/icons/scrollbar.svg"
removable=
"false"
auto-create-binding=
"true"
can-attach-label=
"false"
>
<default-constraints
vsize-policy=
"6"
hsize-policy=
"0"
anchor=
"0"
fill=
"2"
/>
</item>
</group>
</component>
</project>
\ No newline at end of file
teacher-service/teacher-service/pom.xml
View file @
a547329f
...
...
@@ -55,6 +55,20 @@
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-validation
</artifactId>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.13.2
</version>
<scope>
test
</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
<dependency>
<groupId>
org.mockito
</groupId>
<artifactId>
mockito-core
</artifactId>
<version>
4.6.1
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
<build>
...
...
teacher-service/teacher-service/src/main/java/com/example/teacher/controller/TeacherController.java
View file @
a547329f
...
...
@@ -2,6 +2,7 @@ package com.example.teacher.controller;
import
com.example.teacher.dto.TeacherDto
;
import
com.example.teacher.exception.ResourceNotFoundCustomException
;
import
com.example.teacher.model.Teacher
;
import
com.example.teacher.service.TeacherService
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -32,7 +33,7 @@ public class TeacherController {
// GET methods
@GetMapping
(
"/id-array"
)
public
ResponseEntity
<
List
<
Teacher
>>
findTeacherById
(
@RequestParam
int
[]
id
)
throws
InterruptedException
{
public
ResponseEntity
<
List
<
Teacher
>>
findTeacherById
(
@RequestParam
int
[]
id
)
throws
InterruptedException
,
ResourceNotFoundCustomException
{
List
<
Teacher
>
teacherList
=
new
ArrayList
<>();
for
(
int
x:
id
)
{
Optional
<
Teacher
>
myTeacher
=
teacherService
.
findTeacherById
(
x
);
...
...
teacher-service/teacher-service/src/main/java/com/example/teacher/exception/ControllerAdvisor.java
0 → 100644
View file @
a547329f
package
com
.
example
.
teacher
.
exception
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.web.bind.annotation.ExceptionHandler
;
import
org.springframework.web.bind.annotation.ResponseStatus
;
import
org.springframework.web.bind.annotation.RestControllerAdvice
;
@RestControllerAdvice
public
class
ControllerAdvisor
{
@ExceptionHandler
(
ResourceNotFoundCustomException
.
class
)
@ResponseStatus
(
HttpStatus
.
NOT_FOUND
)
public
String
handleResourceNotFoundCustomException
()
{
return
"Teacher does not exist"
;
}
}
teacher-service/teacher-service/src/main/java/com/example/teacher/exception/ResourceNotFoundCustomException.java
0 → 100644
View file @
a547329f
package
com
.
example
.
teacher
.
exception
;
public
class
ResourceNotFoundCustomException
extends
Exception
{
public
ResourceNotFoundCustomException
(
String
message
)
{
super
(
message
);
}
}
teacher-service/teacher-service/src/main/java/com/example/teacher/service/TeacherService.java
View file @
a547329f
...
...
@@ -2,6 +2,7 @@ package com.example.teacher.service;
import
com.example.teacher.dto.ErrorDto
;
import
com.example.teacher.dto.TeacherDto
;
import
com.example.teacher.exception.ResourceNotFoundCustomException
;
import
com.example.teacher.mapper.TeacherMapper
;
import
com.example.teacher.model.Teacher
;
import
com.example.teacher.repository.TeacherRepository
;
...
...
@@ -42,14 +43,18 @@ public class TeacherService {
}
// GET Teacher By ID Synchronously
public
Optional
<
Teacher
>
findTeacherById
(
int
id
)
throws
InterruptedException
{
public
Optional
<
Teacher
>
findTeacherById
(
int
id
)
throws
InterruptedException
,
ResourceNotFoundCustomException
{
Thread
.
sleep
(
500
);
log
.
info
(
"GET Teacher of id "
+
id
+
" by Thread "
+
Thread
.
currentThread
().
getName
());
Optional
<
Teacher
>
myTeacher
=
teacherRepository
.
findById
(
id
);
// return Optional.of(myTeacher.filter(Teacher::isActive).orElseThrow(() -> new ResourceNotFoundCustomException("Teacher does not exist")));
if
(
myTeacher
.
isPresent
()
&&
myTeacher
.
get
().
isActive
()){
return
myTeacher
;
}
return
Optional
.
empty
();
else
{
throw
new
ResourceNotFoundCustomException
(
"Teacher does not exist"
);
}
// return Optional.empty();
}
// GET Teacher By ID Asynchronously
...
...
teacher-service/teacher-service/src/test/java/com/example/teacher/controller/TeacherControllerTest.java
0 → 100644
View file @
a547329f
package
com
.
example
.
teacher
.
controller
;
import
org.junit.runner.RunWith
;
import
org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
;
import
org.springframework.test.context.junit4.SpringRunner
;
@RunWith
(
SpringRunner
.
class
)
@WebMvcTest
(
TeacherController
.
class
)
public
class
TeacherControllerTest
{
}
teacher-service/teacher-service/src/test/java/com/example/teacher/service/TeacherServiceTest.java
0 → 100644
View file @
a547329f
package
com
.
example
.
teacher
.
service
;
import
com.example.teacher.dto.TeacherDto
;
import
com.example.teacher.exception.ResourceNotFoundCustomException
;
import
com.example.teacher.mapper.TeacherMapper
;
import
com.example.teacher.model.Teacher
;
import
com.example.teacher.repository.TeacherRepository
;
import
org.assertj.core.api.DateAssert
;
import
org.junit.Assert
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.jupiter.api.AfterEach
;
import
org.mockito.InjectMocks
;
import
org.mockito.Mock
;
import
org.mockito.Mockito
;
import
org.mockito.MockitoAnnotations
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Optional
;
//@RunWith(MockitoJUnitRunner.class)
public
class
TeacherServiceTest
{
@Mock
private
TeacherRepository
teacherRepository
;
@Mock
private
TeacherMapper
teacherMapper
;
@InjectMocks
private
TeacherService
teacherService
;
private
Teacher
myTeacher
;
private
List
<
Teacher
>
teacherList
;
private
TeacherDto
myTeacherDto
;
private
Date
date
;
AutoCloseable
openMocks
;
@Before
public
void
setup
()
{
// initializes a mock object for those fields that have @Mock on them.
openMocks
=
MockitoAnnotations
.
openMocks
(
this
);
}
@Before
public
void
createTeacher
()
throws
ParseException
{
// create a dummy object
date
=
new
SimpleDateFormat
(
"yyyy:MM:dd"
).
parse
(
"11:11:2011"
);
myTeacher
=
new
Teacher
(
0
,
"Teacher"
,
25
,
"maths"
,
date
,
true
);
myTeacherDto
=
new
TeacherDto
(
0
,
"Teacher"
,
25
,
"maths"
,
date
,
null
);
teacherList
=
new
ArrayList
<>();
teacherList
.
add
(
myTeacher
);
}
@Test
public
void
getAllTeachersTest
()
{
// run this instead of calling the actual repository method
Mockito
.
when
(
teacherRepository
.
findAll
()).
thenReturn
(
teacherList
);
List
<
Teacher
>
mockTeacherList
=
teacherService
.
findAllTeachers
();
// assert statements checks if the results are as we expected.
Assert
.
assertEquals
(
mockTeacherList
.
get
(
0
),
teacherList
.
get
(
0
));
}
@Test
public
void
findTeacherByIdTest
()
throws
InterruptedException
,
ResourceNotFoundCustomException
{
Mockito
.
when
(
teacherRepository
.
findById
(
0
)).
thenReturn
(
Optional
.
of
(
myTeacher
));
Optional
<
Teacher
>
returnedTeacher
=
teacherService
.
findTeacherById
(
0
);
Assert
.
assertEquals
(
returnedTeacher
.
get
(),
myTeacher
);
}
@Test
public
void
findTeacherByWrongIdTest
()
throws
InterruptedException
{
Mockito
.
when
(
teacherRepository
.
findById
(
0
)).
thenReturn
(
Optional
.
empty
());
try
{
Optional
<
Teacher
>
returnedTeacher
=
teacherService
.
findTeacherById
(
0
);
}
catch
(
ResourceNotFoundCustomException
e
)
{
Assert
.
assertEquals
(
e
.
getMessage
(),
"Teacher does not exist"
);
}
}
@Test
public
void
findTeacherByWrongIdTest1
()
throws
InterruptedException
{
Mockito
.
when
(
teacherRepository
.
findById
(
0
)).
thenReturn
(
Optional
.
empty
());
Exception
exception
=
Assert
.
assertThrows
(
ResourceNotFoundCustomException
.
class
,
()
->
teacherService
.
findTeacherById
(
0
));
Assert
.
assertEquals
(
exception
.
getMessage
(),
"Teacher does not exist"
);
}
@Test
(
expected
=
ResourceNotFoundCustomException
.
class
)
public
void
findTeacherByWrongIdTest2
()
throws
InterruptedException
,
ResourceNotFoundCustomException
{
Mockito
.
when
(
teacherRepository
.
findById
(
0
)).
thenReturn
(
Optional
.
empty
());
Optional
<
Teacher
>
returnedTeacher
=
teacherService
.
findTeacherById
(
0
);
}
@Test
public
void
findTeacherByNameTest
()
throws
ParseException
{
Mockito
.
when
(
teacherRepository
.
findTeacherByName
(
"Teacher"
)).
thenReturn
(
myTeacher
);
Mockito
.
when
(
teacherMapper
.
entityToDto
(
myTeacher
)).
thenReturn
(
myTeacherDto
);
TeacherDto
returnedTeacher
=
teacherService
.
findTeacherByName
(
"Teacher"
);
Assert
.
assertEquals
(
returnedTeacher
.
getName
(),
myTeacherDto
.
getName
());
Assert
.
assertEquals
(
returnedTeacher
.
getAge
(),
myTeacherDto
.
getAge
());
// // assertEquals will check the reference of the object instead of its attributes.
// Assert.assertEquals(returnedTeacher, myTeacherDto);
Assert
.
assertEquals
(
returnedTeacher
.
getDateOfJoining
(),
date
);
}
@Test
public
void
findTeacherByAgeTest
()
{
Mockito
.
when
(
teacherRepository
.
findTeacherByAge
(
25
)).
thenReturn
(
teacherList
);
List
<
Teacher
>
returnedTeacherList
=
teacherService
.
findTeacherByAge
(
25
);
Assert
.
assertEquals
(
returnedTeacherList
,
teacherList
);
}
@Test
public
void
deleteTeacherByIdTest
()
{
Teacher
myDeletedTeacher
=
new
Teacher
(
0
,
"Teacher"
,
25
,
"maths"
,
new
Date
(),
false
);
Mockito
.
when
(
teacherRepository
.
findTeacherById
(
0
)).
thenReturn
(
myTeacher
);
boolean
isDeleted
=
teacherService
.
deleteTeacherById
(
0
);
Assert
.
assertTrue
(
isDeleted
);
}
@Test
public
void
deleteTeacherByWrongIdTest
()
{
Teacher
myDeletedTeacher
=
new
Teacher
(
0
,
"Teacher"
,
25
,
"maths"
,
new
Date
(),
false
);
Mockito
.
when
(
teacherRepository
.
findTeacherById
(
0
)).
thenReturn
(
null
);
boolean
isDeleted
=
teacherService
.
deleteTeacherById
(
0
);
Assert
.
assertFalse
(
isDeleted
);
}
@AfterEach
public
void
tearDown
()
throws
Exception
{
openMocks
.
close
();
}
}
\ No newline at end of file
teacher-service/teacher-service/target/classes/com/example/teacher/controller/TeacherController.class
View file @
a547329f
No preview for this file type
teacher-service/teacher-service/target/classes/com/example/teacher/exception/ControllerAdvisor.class
0 → 100644
View file @
a547329f
File added
teacher-service/teacher-service/target/classes/com/example/teacher/exception/ResourceNotFoundCustomException.class
0 → 100644
View file @
a547329f
File added
teacher-service/teacher-service/target/classes/com/example/teacher/service/TeacherService.class
View file @
a547329f
No preview for this file type
teacher-service/teacher-service/target/generated-sources/annotations/com/example/teacher/mapper/TeacherMapperImpl.java
View file @
a547329f
...
...
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
@Generated
(
value
=
"org.mapstruct.ap.MappingProcessor"
,
date
=
"2022-0
7-14T16:43:13
+0500"
,
date
=
"2022-0
8-03T10:51:27
+0500"
,
comments
=
"version: 1.4.2.Final, compiler: javac, environment: Java 18.0.1.1 (Oracle Corporation)"
)
@Component
...
...
teacher-service/teacher-service/target/test-classes/com/example/teacher/controller/TeacherControllerTest.class
0 → 100644
View file @
a547329f
File added
teacher-service/teacher-service/target/test-classes/com/example/teacher/service/TeacherServiceTest.class
0 → 100644
View file @
a547329f
File added
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment