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 ] Release 1.2.0.x adding to release #1931

Merged
merged 15 commits into from
Nov 8, 2024
Merged

[ MOSIP-35378 ] Release 1.2.0.x adding to release #1931

Changes from 13 commits
Commits
Show all changes
15 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
cfe71a5
Merge pull request #1920 from Khuddusshariff0022/v1.2.0.1-selectedHan…
ase-101 Sep 20, 2024
80ab1f4
changes for selected handels for docker file. adding ARG and LABEL
Khuddusshariff0022 Sep 23, 2024
b5544e6
Merge pull request #1921 from Khuddusshariff0022/v1.2.0.1-selectedHan…
ckm007 Sep 23, 2024
6d677fd
MOSIP-35378 merging selected handel changes to release-1.2.0.x branch
Khuddusshariff0022 Nov 7, 2024
a8a4071
adding testcase for array of string data type
Khuddusshariff0022 Nov 7, 2024
cdc871a
adding testcase for array of string data type
Khuddusshariff0022 Nov 7, 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
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);
}
}
Khuddusshariff0022 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
* Send id repo with uin.
Expand Down