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.

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

fix: Fix Javadoc generation #464

Merged
merged 1 commit into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
cache: maven
- name: Build and generate Javadoc
run: |
mvn clean install javadoc:javadoc
mvn clean install javadoc:javadoc -DskipTests
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Deploy to GitHub Pages
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand All @@ -119,7 +118,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>

<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/lpvs/controller/LPVSWebController.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.util.HtmlUtils;

import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -234,7 +234,7 @@ public ResponseEntity<HistoryEntity> newHistoryPageByUser(
for (LPVSPullRequest pr : lpvsPullRequests) {
String[] pullNumberTemp = pr.getPullRequestUrl().split("/");
LocalDateTime localDateTime =
new Timestamp(pr.getDate().getTime()).toLocalDateTime();
pr.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
String formattingDateTime = lpvsLoginCheckService.dateTimeFormatting(localDateTime);

// Validate and sanitize user inputs to prevent XSS attacks
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/lpvs/service/LPVSStatisticsService.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;

import java.sql.Date;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;

/**
Expand Down Expand Up @@ -122,7 +122,6 @@ public Dashboard getDashboardEntity(String type, String name, Authentication aut
int totalIssueCount = 0;
int totalParticipantsCount = 0;
int totalRepositoryCount = 0;
Set<String> participantsSet = new HashSet<>();

List<LPVSPullRequest> prList = pathCheck(type, name, authentication);
Map<String, Integer> licenseCountMap = new HashMap<>();
Expand All @@ -137,7 +136,8 @@ public Dashboard getDashboardEntity(String type, String name, Authentication aut
Set<String> totalSenderSet = new HashSet<>();
Set<String> totalRepositorySet = new HashSet<>();
for (LPVSPullRequest pr : prList) {
LocalDate localDate = new Date(pr.getDate().getTime()).toLocalDate();
LocalDate localDate =
pr.getDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
List<LPVSPullRequest> datePrMapValue = datePrMap.get(localDate);
if (datePrMapValue == null) {
datePrMapValue = new ArrayList<>();
Expand Down
Loading