Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ MOSIP-35378 ] selected handles in uin generator stage. #1920

Merged
merged 9 commits into from
Sep 20, 2024
+105 −29
Merged

[ MOSIP-35378 ] selected handles in uin generator stage. #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a782bdd
adding SelectedHandel
Khuddusshariff0022 Sep 1, 2024
26d08a8
[ RCF-921 ] changes fof selected handel
Khuddusshariff0022 Sep 12, 2024
62f790a
removing branch name rom git action trigger list
Khuddusshariff0022 Sep 13, 2024
0333a60
changes for selected handels
Khuddusshariff0022 Sep 18, 2024
8f785af
changes for selected handels
Khuddusshariff0022 Sep 18, 2024
5132b74
changes for selected handels
Khuddusshariff0022 Sep 18, 2024
732526a
changes for selected handels
Khuddusshariff0022 Sep 19, 2024
5167cdd
changes for selected handels
Khuddusshariff0022 Sep 19, 2024
4ed866a
changes for selected handels for docker file. adding ARG and LABEL
Khuddusshariff0022 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions registration-processor/core-processor/registration-processor-abis/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM openjdk:11

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
ARG BUILD_TIME
LABEL source=${SOURCE}
LABEL commit_hash=${COMMIT_HASH}
LABEL commit_id=${COMMIT_ID}
LABEL build_time=${BUILD_TIME}

#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine

Expand Down
71 changes: 42 additions & 29 deletions ...ain/java/io/mosip/registration/processor/stages/uingenerator/stage/UinGeneratorStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,35 +463,48 @@ public MessageDTO process(MessageDTO object) {
return object;
}

private void loadDemographicIdentity(Map<String, String> fieldMap, JSONObject demographicIdentity) throws IOException, JSONException {
for (Map.Entry e : fieldMap.entrySet()) {
if (e.getValue() != null) {
String value = e.getValue().toString();
if (value != null) {
Object json = new JSONTokener(value).nextValue();
if (json instanceof org.json.JSONObject) {
HashMap<String, Object> hashMap = objectMapper.readValue(value, HashMap.class);
demographicIdentity.putIfAbsent(e.getKey(), hashMap);
}
else if (json instanceof JSONArray) {
List jsonList = new ArrayList<>();
JSONArray jsonArray = new JSONArray(value);
for (int i = 0; i < jsonArray.length(); i++) {
Object obj = jsonArray.get(i);
HashMap<String, Object> hashMap = objectMapper.readValue(obj.toString(), HashMap.class);
if(trimWhitespaces && hashMap.get("value") instanceof String) {
hashMap.put("value",((String)hashMap.get("value")).trim());
}
jsonList.add(hashMap);
}
demographicIdentity.putIfAbsent(e.getKey(), jsonList);
} else
demographicIdentity.putIfAbsent(e.getKey(), value);
} else
demographicIdentity.putIfAbsent(e.getKey(), value);
}
}
}
private void loadDemographicIdentity(Map<String, String> fieldMap, JSONObject demographicIdentity) throws IOException, JSONException {
for (Map.Entry e : fieldMap.entrySet()) {
if (e.getValue() == null) {
continue;
}

String value = e.getValue().toString();
if (value == null) {
demographicIdentity.putIfAbsent(e.getKey(), value);
continue;
}

Object json = new JSONTokener(value).nextValue();
if (json instanceof org.json.JSONObject) {
HashMap<String, Object> hashMap = objectMapper.readValue(value, HashMap.class);
demographicIdentity.putIfAbsent(e.getKey(), hashMap);
continue;
}

if (json instanceof JSONArray) {
List jsonList = new ArrayList<>();
JSONArray jsonArray = new JSONArray(value);
for (int i = 0; i < jsonArray.length(); i++) {
Object obj = jsonArray.get(i);
if (obj instanceof String) {
jsonList.add(obj);
} else {
HashMap<String, Object> hashMap = objectMapper.readValue(obj.toString(), HashMap.class);

if (trimWhitespaces && hashMap.containsKey("value") && hashMap.get("value") instanceof String) {
hashMap.put("value", ((String) hashMap.get("value")).trim());
}
jsonList.add(hashMap);
}
}
demographicIdentity.putIfAbsent(e.getKey(), jsonList);
}
else {
demographicIdentity.putIfAbsent(e.getKey(), value);
}
}
}

/**
* Send id repo with uin.
Expand Down
9 changes: 9 additions & 0 deletions registration-processor/init/registration-processor-dmz-packet-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM nginx

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
ARG BUILD_TIME
LABEL source=${SOURCE}
LABEL commit_hash=${COMMIT_HASH}
LABEL commit_id=${COMMIT_ID}
LABEL build_time=${BUILD_TIME}

VOLUME /home/mosip

COPY nginx.conf /etc/nginx/nginx.conf
Expand Down
9 changes: 9 additions & 0 deletions registration-processor/init/registration-processor-registration-status-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM openjdk:11

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
ARG BUILD_TIME
LABEL source=${SOURCE}
LABEL commit_hash=${COMMIT_HASH}
LABEL commit_id=${COMMIT_ID}
LABEL build_time=${BUILD_TIME}

#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine

Expand Down
9 changes: 9 additions & 0 deletions ...ocessor/post-processor/registration-processor-registration-transaction-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM openjdk:11

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
ARG BUILD_TIME
LABEL source=${SOURCE}
LABEL commit_hash=${COMMIT_HASH}
LABEL commit_id=${COMMIT_ID}
LABEL build_time=${BUILD_TIME}

#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine

Expand Down
9 changes: 9 additions & 0 deletions registration-processor/registration-processor-landing-zone/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM openjdk:11

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
ARG BUILD_TIME
LABEL source=${SOURCE}
LABEL commit_hash=${COMMIT_HASH}
LABEL commit_id=${COMMIT_ID}
LABEL build_time=${BUILD_TIME}

#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine

Expand Down
9 changes: 9 additions & 0 deletions registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM openjdk:11

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
ARG BUILD_TIME
LABEL source=${SOURCE}
LABEL commit_hash=${COMMIT_HASH}
LABEL commit_id=${COMMIT_ID}
LABEL build_time=${BUILD_TIME}

#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine

Expand Down
9 changes: 9 additions & 0 deletions ...tion-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM openjdk:11

ARG SOURCE
ARG COMMIT_HASH
ARG COMMIT_ID
ARG BUILD_TIME
LABEL source=${SOURCE}
LABEL commit_hash=${COMMIT_HASH}
LABEL commit_id=${COMMIT_ID}
LABEL build_time=${BUILD_TIME}

#Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image
#FROM openjdk:8-jdk-alpine

Expand Down
Loading