Skip to content

Commit a35b03c

Browse files
author
Jorgen-5
committed
Create constants
1 parent 0a4b93a commit a35b03c

File tree

1 file changed

+56
-41
lines changed

1 file changed

+56
-41
lines changed

‎klass-api/src/main/java/no/ssb/klass/api/services/IndexServiceImpl.java‎

Lines changed: 56 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -212,86 +212,101 @@ private void updateElasticsearch(SoftDeletable entity, Map<String, Object> doc)
212212

213213
/** Inner class to handle document mapping from domain entities to search documents */
214214
private static class DocumentMapper {
215+
private static final String ITEM_ID = "itemid";
216+
private static final String UUID = "uuid";
217+
private static final String LANGUAGE = "language";
218+
private static final String TYPE = "type";
219+
private static final String TITLE = "title";
220+
private static final String DESCRIPTION = "description";
221+
private static final String COPYRIGHTED = "copyrighted";
222+
private static final String PUBLISHED = "published";
223+
private static final String SECTION = "section";
224+
private static final String CODES = "codes";
225+
private static final String FAMILY = "family";
226+
private static final String CLASSIFICATION_ID = "classificationId";
227+
private static final String LEGAL_BASE = "legalBase";
228+
private static final String PUBLICATIONS = "publications";
229+
private static final String DERIVED_FROM = "derivedFrom";
215230

216231
public Map<String, Object> mapClassificationSeries(
217232
ClassificationSeries classification, Language language) {
218233
Map<String, Object> doc = new HashMap<>();
219-
doc.put("itemid", classification.getId());
220-
doc.put("uuid", buildUuid(language, classification.getUuid()));
221-
doc.put("language", language.getLanguageCode());
222-
doc.put("type", classification.getClassificationType().getDisplayName(Language.EN));
223-
doc.put("copyrighted", classification.isCopyrighted());
224-
doc.put("published", classification.isPublished(language));
225-
doc.put("title", classification.getName(language));
226-
doc.put("description", classification.getDescription(language));
227-
doc.put("family", classification.getClassificationFamily().getName(language));
228-
doc.put("section", classification.getContactPerson().getSection());
234+
doc.put(ITEM_ID, classification.getId());
235+
doc.put(UUID, buildUuid(language, classification.getUuid()));
236+
doc.put(LANGUAGE, language.getLanguageCode());
237+
doc.put(TYPE, classification.getClassificationType().getDisplayName(Language.EN));
238+
doc.put(COPYRIGHTED, classification.isCopyrighted());
239+
doc.put(PUBLISHED, classification.isPublished(language));
240+
doc.put(TITLE, classification.getName(language));
241+
doc.put(DESCRIPTION, classification.getDescription(language));
242+
doc.put(FAMILY, classification.getClassificationFamily().getName(language));
243+
doc.put(SECTION, classification.getContactPerson().getSection());
229244

230245
List<String> codes =
231246
classification.getClassificationVersions().stream()
232247
.flatMap(version -> version.getAllClassificationItems().stream())
233248
.map(item -> formatClassificationItem(language, item))
234249
.collect(Collectors.toList());
235-
doc.put("codes", codes);
250+
doc.put(CODES, codes);
236251

237252
return doc;
238253
}
239254

240255
public Map<String, Object> mapVersion(ClassificationVersion version, Language language) {
241256
Map<String, Object> doc = new HashMap<>();
242-
doc.put("itemid", version.getId());
243-
doc.put("uuid", buildUuid(language, version.getUuid()));
244-
doc.put("classificationId", version.getClassification().getId());
245-
doc.put("language", language.getLanguageCode());
246-
doc.put("type", "Version");
247-
doc.put("title", version.getName(language));
248-
doc.put("legalBase", version.getLegalBase(language));
249-
doc.put("publications", version.getPublications(language));
250-
doc.put("derivedFrom", version.getDerivedFrom(language));
251-
doc.put("description", version.getIntroduction(language));
252-
doc.put("section", version.getContactPerson().getSection());
253-
doc.put("copyrighted", version.getOwnerClassification().isCopyrighted());
254-
doc.put("published", version.isPublished(language));
257+
doc.put(ITEM_ID, version.getId());
258+
doc.put(UUID, buildUuid(language, version.getUuid()));
259+
doc.put(CLASSIFICATION_ID, version.getClassification().getId());
260+
doc.put(LANGUAGE, language.getLanguageCode());
261+
doc.put(TYPE, "Version");
262+
doc.put(TITLE, version.getName(language));
263+
doc.put(LEGAL_BASE, version.getLegalBase(language));
264+
doc.put(PUBLICATIONS, version.getPublications(language));
265+
doc.put(DERIVED_FROM, version.getDerivedFrom(language));
266+
doc.put(DESCRIPTION, version.getIntroduction(language));
267+
doc.put(SECTION, version.getContactPerson().getSection());
268+
doc.put(COPYRIGHTED, version.getOwnerClassification().isCopyrighted());
269+
doc.put(PUBLISHED, version.isPublished(language));
255270

256271
List<String> codes =
257272
version.getAllClassificationItems().stream()
258273
.map(item -> formatClassificationItem(language, item))
259274
.collect(Collectors.toList());
260-
doc.put("codes", codes);
275+
doc.put(CODES, codes);
261276

262277
return doc;
263278
}
264279

265280
public Map<String, Object> mapVariant(ClassificationVariant variant, Language language) {
266281
Map<String, Object> doc = new HashMap<>();
267-
doc.put("itemid", variant.getId());
268-
doc.put("uuid", buildUuid(language, variant.getUuid()));
269-
doc.put("language", language.getLanguageCode());
270-
doc.put("type", "Variant");
271-
doc.put("title", variant.getFullName(language));
272-
doc.put("copyrighted", variant.getOwnerClassification().isCopyrighted());
273-
doc.put("published", variant.isPublished(language));
274-
doc.put("description", variant.getIntroduction(language));
275-
doc.put("section", variant.getContactPerson().getSection());
282+
doc.put(ITEM_ID, variant.getId());
283+
doc.put(UUID, buildUuid(language, variant.getUuid()));
284+
doc.put(LANGUAGE, language.getLanguageCode());
285+
doc.put(TYPE, "Variant");
286+
doc.put(TITLE, variant.getFullName(language));
287+
doc.put(COPYRIGHTED, variant.getOwnerClassification().isCopyrighted());
288+
doc.put(PUBLISHED, variant.isPublished(language));
289+
doc.put(DESCRIPTION, variant.getIntroduction(language));
290+
doc.put(SECTION, variant.getContactPerson().getSection());
276291

277292
List<String> codes =
278293
variant.getAllClassificationItems().stream()
279294
.map(item -> formatClassificationItem(language, item))
280295
.collect(Collectors.toList());
281-
doc.put("codes", codes);
296+
doc.put(CODES, codes);
282297

283298
return doc;
284299
}
285300

286301
public Map<String, Object> mapCorrespondenceTable(
287302
CorrespondenceTable table, Language language) {
288303
Map<String, Object> doc = new HashMap<>();
289-
doc.put("itemid", table.getId());
290-
doc.put("uuid", buildUuid(language, table.getUuid()));
291-
doc.put("language", language.getLanguageCode());
292-
doc.put("type", "Correspondencetable");
293-
doc.put("title", table.getName(language));
294-
doc.put("description", table.getDescription(language));
304+
doc.put(ITEM_ID, table.getId());
305+
doc.put(UUID, buildUuid(language, table.getUuid()));
306+
doc.put(LANGUAGE, language.getLanguageCode());
307+
doc.put(TYPE, "Correspondencetable");
308+
doc.put(TITLE, table.getName(language));
309+
doc.put(DESCRIPTION, table.getDescription(language));
295310
return doc;
296311
}
297312

0 commit comments

Comments
 (0)