Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
java-training-project-2
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
Arham Shafiq
java-training-project-2
Commits
a9828549
Commit
a9828549
authored
Jul 04, 2022
by
Muhammad Abdul Qadeer Farooqui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user-service update
parent
da0fa865
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
161 additions
and
28 deletions
+161
-28
vcs.xml
create-file/.idea/vcs.xml
+6
-0
merged.txt
create-file/merged.txt
+3
-3
Main.java
create-file/src/main/java/Main.java
+14
-0
MyFileMerger.java
create-file/src/main/java/MyFileMerger.java
+5
-0
Main.class
create-file/target/classes/Main.class
+0
-0
MyFileMerger.class
create-file/target/classes/MyFileMerger.class
+0
-0
update.txt
create-file/update.txt
+5
-0
UserController.java
.../main/java/com/qadeer/user/controller/UserController.java
+15
-9
User.java
user-service/src/main/java/com/qadeer/user/model/User.java
+41
-1
BankService.java
...ce/src/main/java/com/qadeer/user/service/BankService.java
+0
-8
UserService.java
...ce/src/main/java/com/qadeer/user/service/UserService.java
+72
-7
No files found.
create-file/.idea/vcs.xml
0 → 100644
View file @
a9828549
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"VcsDirectoryMappings"
>
<mapping
directory=
"$PROJECT_DIR$/.."
vcs=
"Git"
/>
</component>
</project>
\ No newline at end of file
create-file/merged.txt
View file @
a9828549
1, Ahmed, 23,
job
, false, hbl, 231234123, false
1, Ahmed, 23,
business
, false, hbl, 231234123, false
2, Qadeer, 23, job, false, hbl, 231234123, false
2, Qadeer, 23, job, false, hbl, 231234123, false
3, Sahal, 23, job, false, hbl, 231234123, false
3, Sahal, 23, job, false, hbl, 231234123, false
4, Arham, 23,
job, false, hbl, 231234123, fals
e
4, Arham, 23,
business, false, hbl, 231234123, tru
e
5, Naveed, 23,
job
, false, hbl, 231234123, false
5, Naveed, 23,
banker
, false, hbl, 231234123, false
create-file/src/main/java/Main.java
0 → 100644
View file @
a9828549
import
java.util.ArrayList
;
import
java.util.List
;
public
class
Main
{
public
static
void
main
(
String
[]
args
)
{
List
<
Integer
>
integerList
=
new
ArrayList
<>();
integerList
.
add
(
1
);
integerList
.
add
(
2
);
integerList
.
add
(
3
);
integerList
.
add
(
4
);
System
.
out
.
println
(
integerList
.
toString
().
replace
(
"["
,
""
).
replace
(
"]"
,
""
));
System
.
out
.
println
(
integerList
);
}
}
create-file/src/main/java/MyFileMerger.java
View file @
a9828549
...
@@ -66,6 +66,11 @@ public class MyFileMerger
...
@@ -66,6 +66,11 @@ public class MyFileMerger
List
<
String
>
present
;
List
<
String
>
present
;
present
=
bankMap
.
get
(
id
);
present
=
bankMap
.
get
(
id
);
if
(
present
!=
null
)
{
if
(
present
!=
null
)
{
// List<String> userList = userMap.get(id);
// List<String> bankList = bankMap.get(id);
// pw.println(id + " " + userList.toString().replace("[", "").replace("]", "") + " " +
// bankList.toString().replace("[", "").replace("]", ""));
pw
.
println
(
id
+
", "
+
userMap
.
get
(
id
).
get
(
0
)
+
", "
+
userMap
.
get
(
id
).
get
(
1
)
+
", "
+
userMap
.
get
(
id
).
get
(
2
)
+
", "
+
userMap
.
get
(
id
).
get
(
3
)
+
", "
+
pw
.
println
(
id
+
", "
+
userMap
.
get
(
id
).
get
(
0
)
+
", "
+
userMap
.
get
(
id
).
get
(
1
)
+
", "
+
userMap
.
get
(
id
).
get
(
2
)
+
", "
+
userMap
.
get
(
id
).
get
(
3
)
+
", "
+
bankMap
.
get
(
id
).
get
(
0
)
+
", "
+
bankMap
.
get
(
id
).
get
(
1
)
+
", "
+
bankMap
.
get
(
id
).
get
(
2
));
bankMap
.
get
(
id
).
get
(
0
)
+
", "
+
bankMap
.
get
(
id
).
get
(
1
)
+
", "
+
bankMap
.
get
(
id
).
get
(
2
));
}
}
...
...
create-file/target/classes/Main.class
0 → 100644
View file @
a9828549
File added
create-file/target/classes/MyFileMerger.class
View file @
a9828549
No preview for this file type
create-file/update.txt
0 → 100644
View file @
a9828549
1, Ahmed, 23, business, false, hbl, 231234123, false
2, Qadeer, 23, job, false, hbl, 231234123, false
3, Sahal, 23, job, false, hbl, 231234123, false
4, Arham, 23, business, false, hbl, 231234123, false
5, Naveed, 23, job, false, hbl, 231234123, false
user-service/src/main/java/com/qadeer/user/controller/UserController.java
View file @
a9828549
package
com
.
qadeer
.
user
.
controller
;
package
com
.
qadeer
.
user
.
controller
;
import
com.qadeer.user.model.User
;
import
com.qadeer.user.model.User
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
...
@@ -7,8 +8,6 @@ import org.springframework.http.ResponseEntity;
...
@@ -7,8 +8,6 @@ import org.springframework.http.ResponseEntity;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
com.qadeer.user.service.UserService
;
import
com.qadeer.user.service.UserService
;
import
javax.validation.Valid
;
import
java.io.BufferedReader
;
import
java.io.IOException
;
import
java.io.IOException
;
@RestController
@RestController
...
@@ -17,14 +16,21 @@ public class UserController {
...
@@ -17,14 +16,21 @@ public class UserController {
@Autowired
@Autowired
private
UserService
userService
;
private
UserService
userService
;
// POST methods
@GetMapping
(
"/get"
)
// GET methods
public
String
createTeacher
()
throws
IOException
{
@GetMapping
(
"/{id}"
)
return
userService
.
getUser
();
public
ResponseEntity
<
User
>
getUserById
(
@PathVariable
int
id
)
throws
IOException
{
User
user
=
userService
.
getUserById
(
id
);
if
(
user
!=
null
)
{
return
new
ResponseEntity
<
User
>(
user
,
HttpStatus
.
FOUND
);
}
return
new
ResponseEntity
<>(
HttpStatus
.
NO_CONTENT
);
}
}
@GetMapping
// POST methods
public
String
hello
()
{
@PutMapping
(
"/update/{id}"
)
return
"Hello"
;
public
ResponseEntity
<
String
>
updateUserById
(
@PathVariable
int
id
,
@RequestBody
String
status
)
throws
IOException
{
String
message
=
userService
.
updateUserById
(
id
,
status
);
return
new
ResponseEntity
<
String
>(
message
,
HttpStatus
.
OK
);
}
}
}
}
user-service/src/main/java/com/qadeer/user/model/User.java
View file @
a9828549
...
@@ -2,8 +2,48 @@ package com.qadeer.user.model;
...
@@ -2,8 +2,48 @@ package com.qadeer.user.model;
public
class
User
{
public
class
User
{
private
int
id
;
private
int
id
;
private
int
name
;
private
String
name
;
private
int
age
;
private
int
age
;
private
String
profession
;
private
String
profession
;
private
boolean
martialStatus
;
private
boolean
martialStatus
;
public
int
getId
()
{
return
id
;
}
public
void
setId
(
int
id
)
{
this
.
id
=
id
;
}
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
int
getAge
()
{
return
age
;
}
public
void
setAge
(
int
age
)
{
this
.
age
=
age
;
}
public
String
getProfession
()
{
return
profession
;
}
public
void
setProfession
(
String
profession
)
{
this
.
profession
=
profession
;
}
public
boolean
isMartialStatus
()
{
return
martialStatus
;
}
public
void
setMartialStatus
(
boolean
martialStatus
)
{
this
.
martialStatus
=
martialStatus
;
}
}
}
user-service/src/main/java/com/qadeer/user/service/BankService.java
deleted
100644 → 0
View file @
da0fa865
package
com
.
qadeer
.
user
.
service
;
import
org.springframework.stereotype.Service
;
@Service
public
class
BankService
{
}
user-service/src/main/java/com/qadeer/user/service/UserService.java
View file @
a9828549
package
com
.
qadeer
.
user
.
service
;
package
com
.
qadeer
.
user
.
service
;
import
com.qadeer.user.model.User
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.io.
BufferedReader
;
import
java.io.
*
;
import
java.
io.FileNotFoundException
;
import
java.
util.Arrays
;
import
java.
io.FileReader
;
import
java.
util.List
;
import
java.io.IOException
;
@Service
@Service
public
class
UserService
{
public
class
UserService
{
BufferedReader
br
=
new
BufferedReader
(
new
FileReader
(
"/Users/aqadeer/Desktop/java-training-project-2/create-file/bank.txt"
));
public
UserService
()
throws
FileNotFoundException
{
public
UserService
()
throws
FileNotFoundException
{
}
}
public
String
getUser
()
throws
IOException
{
public
User
getUserById
(
int
id
)
throws
IOException
{
return
br
.
readLine
();
BufferedReader
br
=
new
BufferedReader
(
new
FileReader
(
"/Users/aqadeer/Desktop/java-training-project-2/create-file/merged.txt"
));
String
myLine
=
br
.
readLine
();
while
(
myLine
!=
null
)
{
if
(
Integer
.
parseInt
(
String
.
valueOf
(
myLine
.
charAt
(
0
)))
==
id
)
{
User
user
=
new
User
();
List
<
String
>
userList
=
Arrays
.
asList
(
myLine
.
split
(
","
));
user
.
setId
(
id
);
user
.
setName
(
userList
.
get
(
1
).
trim
());
user
.
setAge
(
Integer
.
parseInt
(
userList
.
get
(
2
).
trim
()));
user
.
setProfession
(
userList
.
get
(
3
).
trim
());
user
.
setMartialStatus
(
Boolean
.
parseBoolean
(
userList
.
get
(
4
)));
return
user
;
}
myLine
=
br
.
readLine
();
}
return
null
;
}
public
String
updateUserById
(
int
id
,
String
status
)
throws
IOException
{
boolean
flag
=
false
;
BufferedReader
br
=
new
BufferedReader
(
new
FileReader
(
"/Users/aqadeer/Desktop/java-training-project-2/create-file/merged.txt"
));
String
myLine
=
br
.
readLine
();
StringBuilder
myString
=
new
StringBuilder
();
StringBuilder
result
=
new
StringBuilder
();
myString
.
append
(
myLine
);
myString
.
append
(
"\n"
);
while
(
myLine
!=
null
)
{
List
<
String
>
myStringList
=
Arrays
.
asList
(
myLine
.
split
(
","
));
int
myId
=
Integer
.
parseInt
(
myStringList
.
get
(
0
));
String
profession
=
myStringList
.
get
(
3
).
trim
();
int
x
=
Integer
.
parseInt
(
String
.
valueOf
(
myLine
.
charAt
(
0
)));
if
(
x
==
id
&&
(
profession
.
equals
(
"business"
)
||
profession
.
equals
(
"banker"
)))
{
String
someStr
=
String
.
valueOf
(
myString
).
replaceAll
(
" [^,]*$"
,
" "
+
status
);
result
.
append
(
someStr
);
result
.
append
(
"\n"
);
flag
=
true
;
}
else
{
result
.
append
(
myString
);
}
myLine
=
br
.
readLine
();
if
(
myLine
==
null
)
{
break
;
}
myString
=
new
StringBuilder
();
myString
.
append
(
myLine
);
myString
.
append
(
"\n"
);
}
if
(
flag
)
{
PrintWriter
pw
=
new
PrintWriter
(
"/Users/aqadeer/Desktop/java-training-project-2/create-file/merged.txt"
);
int
last
=
result
.
lastIndexOf
(
"\n"
);
if
(
last
>=
0
)
{
result
.
delete
(
last
,
result
.
length
());
}
pw
.
println
(
String
.
valueOf
(
result
));
pw
.
flush
();
pw
.
close
();
return
"user updated."
;
}
return
"not allowed"
;
}
}
}
}
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