Skip to content

Commit 5791dfa

Browse files
gnugomezgnugomez
committed
refactor(changes): centralize active/state/lastUpdated mapping in toExtensionVersionFull
Assisted-By: anthropic:claude-opus-4-7[1m]
1 parent 1b69cee commit 5791dfa

1 file changed

Lines changed: 22 additions & 8 deletions

File tree

‎server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionJooqRepository.java‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,9 @@ private ExtensionVersion toExtensionVersionFull(
460460
extVersion.setBugs(row.get(extensionVersionMapper.map(EXTENSION_VERSION.BUGS)));
461461
extVersion.setMarkdown(row.get(extensionVersionMapper.map(EXTENSION_VERSION.MARKDOWN)));
462462
extVersion.setQna(row.get(extensionVersionMapper.map(EXTENSION_VERSION.QNA)));
463+
extVersion.setActive(row.get(extensionVersionMapper.map(EXTENSION_VERSION.ACTIVE)));
464+
extVersion.setState(ExtensionVersion.State.valueOf(row.get(extensionVersionMapper.map(EXTENSION_VERSION.STATE))));
465+
extVersion.setLastUpdated(row.get(extensionVersionMapper.map(EXTENSION_VERSION.LAST_UPDATED)));
463466

464467
if(extension == null) {
465468
var newExtension = extVersion.getExtension();
@@ -845,6 +848,7 @@ public List<ExtensionVersion> findLatest(Collection<Long> extensionIds) {
845848
EXTENSION_VERSION.VERSION,
846849
EXTENSION_VERSION.POTENTIALLY_MALICIOUS,
847850
EXTENSION_VERSION.TARGET_PLATFORM,
851+
EXTENSION_VERSION.ACTIVE,
848852
EXTENSION_VERSION.PREVIEW,
849853
EXTENSION_VERSION.PRE_RELEASE,
850854
EXTENSION_VERSION.TIMESTAMP,
@@ -866,6 +870,8 @@ public List<ExtensionVersion> findLatest(Collection<Long> extensionIds) {
866870
EXTENSION_VERSION.QNA,
867871
EXTENSION_VERSION.DEPENDENCIES,
868872
EXTENSION_VERSION.BUNDLED_EXTENSIONS,
873+
EXTENSION_VERSION.STATE,
874+
EXTENSION_VERSION.LAST_UPDATED,
869875
EXTENSION_VERSION.SIGNATURE_KEY_PAIR_ID,
870876
EXTENSION_VERSION.PUBLISHED_WITH_ID
871877
);
@@ -890,6 +896,7 @@ public List<ExtensionVersion> findLatest(Collection<Long> extensionIds) {
890896
latest.field(EXTENSION_VERSION.POTENTIALLY_MALICIOUS),
891897
latest.field(EXTENSION_VERSION.VERSION),
892898
latest.field(EXTENSION_VERSION.TARGET_PLATFORM),
899+
latest.field(EXTENSION_VERSION.ACTIVE),
893900
latest.field(EXTENSION_VERSION.PREVIEW),
894901
latest.field(EXTENSION_VERSION.PRE_RELEASE),
895902
latest.field(EXTENSION_VERSION.TIMESTAMP),
@@ -911,6 +918,8 @@ public List<ExtensionVersion> findLatest(Collection<Long> extensionIds) {
911918
latest.field(EXTENSION_VERSION.QNA),
912919
latest.field(EXTENSION_VERSION.DEPENDENCIES),
913920
latest.field(EXTENSION_VERSION.BUNDLED_EXTENSIONS),
921+
latest.field(EXTENSION_VERSION.STATE),
922+
latest.field(EXTENSION_VERSION.LAST_UPDATED),
914923
SIGNATURE_KEY_PAIR.PUBLIC_ID,
915924
USER_DATA.ID,
916925
USER_DATA.ROLE,
@@ -1006,6 +1015,7 @@ public List<ExtensionVersion> findLatest(UserData user) {
10061015
EXTENSION_VERSION.VERSION,
10071016
EXTENSION_VERSION.POTENTIALLY_MALICIOUS,
10081017
EXTENSION_VERSION.TARGET_PLATFORM,
1018+
EXTENSION_VERSION.ACTIVE,
10091019
EXTENSION_VERSION.PREVIEW,
10101020
EXTENSION_VERSION.PRE_RELEASE,
10111021
EXTENSION_VERSION.TIMESTAMP,
@@ -1027,6 +1037,8 @@ public List<ExtensionVersion> findLatest(UserData user) {
10271037
EXTENSION_VERSION.QNA,
10281038
EXTENSION_VERSION.DEPENDENCIES,
10291039
EXTENSION_VERSION.BUNDLED_EXTENSIONS,
1040+
EXTENSION_VERSION.STATE,
1041+
EXTENSION_VERSION.LAST_UPDATED,
10301042
EXTENSION_VERSION.SIGNATURE_KEY_PAIR_ID,
10311043
EXTENSION_VERSION.PUBLISHED_WITH_ID
10321044
);
@@ -1054,6 +1066,7 @@ public List<ExtensionVersion> findLatest(UserData user) {
10541066
latest.field(EXTENSION_VERSION.POTENTIALLY_MALICIOUS),
10551067
latest.field(EXTENSION_VERSION.VERSION),
10561068
latest.field(EXTENSION_VERSION.TARGET_PLATFORM),
1069+
latest.field(EXTENSION_VERSION.ACTIVE),
10571070
latest.field(EXTENSION_VERSION.PREVIEW),
10581071
latest.field(EXTENSION_VERSION.PRE_RELEASE),
10591072
latest.field(EXTENSION_VERSION.TIMESTAMP),
@@ -1075,6 +1088,8 @@ public List<ExtensionVersion> findLatest(UserData user) {
10751088
latest.field(EXTENSION_VERSION.QNA),
10761089
latest.field(EXTENSION_VERSION.DEPENDENCIES),
10771090
latest.field(EXTENSION_VERSION.BUNDLED_EXTENSIONS),
1091+
latest.field(EXTENSION_VERSION.STATE),
1092+
latest.field(EXTENSION_VERSION.LAST_UPDATED),
10781093
SIGNATURE_KEY_PAIR.PUBLIC_ID,
10791094
USER_DATA.ID,
10801095
USER_DATA.ROLE,
@@ -1108,6 +1123,7 @@ public ExtensionVersion findLatest(UserData user, String namespace, String exten
11081123
EXTENSION_VERSION.VERSION,
11091124
EXTENSION_VERSION.POTENTIALLY_MALICIOUS,
11101125
EXTENSION_VERSION.TARGET_PLATFORM,
1126+
EXTENSION_VERSION.ACTIVE,
11111127
EXTENSION_VERSION.PREVIEW,
11121128
EXTENSION_VERSION.PRE_RELEASE,
11131129
EXTENSION_VERSION.TIMESTAMP,
@@ -1129,6 +1145,8 @@ public ExtensionVersion findLatest(UserData user, String namespace, String exten
11291145
EXTENSION_VERSION.QNA,
11301146
EXTENSION_VERSION.DEPENDENCIES,
11311147
EXTENSION_VERSION.BUNDLED_EXTENSIONS,
1148+
EXTENSION_VERSION.STATE,
1149+
EXTENSION_VERSION.LAST_UPDATED,
11321150
EXTENSION_VERSION.SIGNATURE_KEY_PAIR_ID,
11331151
EXTENSION_VERSION.PUBLISHED_WITH_ID
11341152
);
@@ -1156,6 +1174,7 @@ public ExtensionVersion findLatest(UserData user, String namespace, String exten
11561174
latest.field(EXTENSION_VERSION.POTENTIALLY_MALICIOUS),
11571175
latest.field(EXTENSION_VERSION.VERSION),
11581176
latest.field(EXTENSION_VERSION.TARGET_PLATFORM),
1177+
latest.field(EXTENSION_VERSION.ACTIVE),
11591178
latest.field(EXTENSION_VERSION.PREVIEW),
11601179
latest.field(EXTENSION_VERSION.PRE_RELEASE),
11611180
latest.field(EXTENSION_VERSION.TIMESTAMP),
@@ -1177,6 +1196,8 @@ public ExtensionVersion findLatest(UserData user, String namespace, String exten
11771196
latest.field(EXTENSION_VERSION.QNA),
11781197
latest.field(EXTENSION_VERSION.DEPENDENCIES),
11791198
latest.field(EXTENSION_VERSION.BUNDLED_EXTENSIONS),
1199+
latest.field(EXTENSION_VERSION.STATE),
1200+
latest.field(EXTENSION_VERSION.LAST_UPDATED),
11801201
SIGNATURE_KEY_PAIR.PUBLIC_ID,
11811202
USER_DATA.ID,
11821203
USER_DATA.ROLE,
@@ -1503,14 +1524,7 @@ public Page<ExtensionVersion> findChanges(LocalDateTime since, LocalDateTime bef
15031524
query.addLimit(size);
15041525
query.addOffset(offset);
15051526

1506-
var content = query.fetch().map(row -> {
1507-
var extVersion = toExtensionVersionFull(row);
1508-
extVersion.setActive(row.get(EXTENSION_VERSION.ACTIVE));
1509-
extVersion.setState(ExtensionVersion.State.valueOf(row.get(EXTENSION_VERSION.STATE)));
1510-
extVersion.setLastUpdated(row.get(EXTENSION_VERSION.LAST_UPDATED));
1511-
return extVersion;
1512-
});
1513-
1527+
var content = query.fetch().map(this::toExtensionVersionFull);
15141528
return new PageImpl<>(content, Pageable.unpaged(), total != null ? total : 0);
15151529
}
15161530

0 commit comments

Comments
 (0)