Skip to content

Commit e9aae74

Browse files
Konstantin PankratovKonstantin Pankratov
authored andcommitted
Fix formatting. Remove dev profile
1 parent 23c7b8c commit e9aae74

35 files changed

+233
-234
lines changed

server/src/main/java/com/studybuddies/server/configuration/CORS.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
@Configuration
1212
public class CORS {
13+
1314
@Bean
1415
public CorsConfigurationSource cors() {
1516
CorsConfiguration conf = new CorsConfiguration();

server/src/main/java/com/studybuddies/server/configuration/DevConfig.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

server/src/main/java/com/studybuddies/server/configuration/DevProfileListener.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

server/src/main/java/com/studybuddies/server/configuration/JwtAuthConverter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public class JwtAuthConverter implements Converter<Jwt, AbstractAuthenticationTo
2525
@Override
2626
public AbstractAuthenticationToken convert(Jwt source) {
2727
Collection<GrantedAuthority> auths = Stream.concat(
28-
jwtGrantedAuthoritiesConverter.convert(source).stream(),
29-
extractRoles(source).stream())
30-
.collect(Collectors.toSet());
28+
jwtGrantedAuthoritiesConverter.convert(source).stream(),
29+
extractRoles(source).stream())
30+
.collect(Collectors.toSet());
3131

3232
return new JwtAuthenticationToken(source, auths);
3333
}
@@ -54,7 +54,7 @@ private Collection<? extends GrantedAuthority> extractRoles(Jwt jwt) {
5454

5555
// Convert to Spring Security GrantedAuthorities with "ROLE_" prefix
5656
return roles.stream()
57-
.map(role -> new SimpleGrantedAuthority("ROLE_" + role.toUpperCase()))
58-
.collect(Collectors.toSet());
57+
.map(role -> new SimpleGrantedAuthority("ROLE_" + role.toUpperCase()))
58+
.collect(Collectors.toSet());
5959
}
6060
}

server/src/main/java/com/studybuddies/server/configuration/OpenAPIConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010

1111
@Configuration
1212
public class OpenAPIConfiguration {
13+
1314
@Bean
1415
public OpenAPI openAPI() {
1516
return new OpenAPI().addSecurityItem(new SecurityRequirement().
1617
addList("Bearer Authentication"))
1718
.components(new Components().addSecuritySchemes
1819
("Bearer Authentication", createAPIKeyScheme()));
1920
}
21+
2022
private SecurityScheme createAPIKeyScheme() {
2123
return new SecurityScheme().type(SecurityScheme.Type.HTTP)
2224
.bearerFormat("JWT")

server/src/main/java/com/studybuddies/server/configuration/SecurityConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
2424
http.cors(c -> c.configurationSource(corsConfigurationSource));
2525
http.
2626
authorizeHttpRequests(auth ->
27-
auth.requestMatchers("/swagger-ui/**", "/h2-console/**", "/api-docs/**", "/v3/**").permitAll()
27+
auth.requestMatchers("/swagger-ui/**", "/h2-console/**", "/api-docs/**", "/v3/**")
28+
.permitAll()
2829
)
2930
.oauth2ResourceServer(oauth2 ->
3031
oauth2.jwt(jwt ->

server/src/main/java/com/studybuddies/server/domain/StudyGroupEntity.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
@Builder
1414
public class StudyGroupEntity {
1515

16-
@EmbeddedId
17-
private StudyGroupId id;
16+
@EmbeddedId
17+
private StudyGroupId id;
1818

19-
@MapsId("userId")
20-
@ManyToOne
21-
@JoinColumn(name = "user_id", nullable = false)
22-
private UserEntity user;
19+
@MapsId("userId")
20+
@ManyToOne
21+
@JoinColumn(name = "user_id", nullable = false)
22+
private UserEntity user;
2323

24-
@MapsId("meetingId")
25-
@ManyToOne
26-
@JoinColumn(name = "meeting_id", nullable = false)
27-
private MeetingEntity meeting;
24+
@MapsId("meetingId")
25+
@ManyToOne
26+
@JoinColumn(name = "meeting_id", nullable = false)
27+
private MeetingEntity meeting;
2828
}

server/src/main/java/com/studybuddies/server/domain/UserEntity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@Getter
1414
@RequiredArgsConstructor
1515
public class UserEntity {
16+
1617
@Id
1718
UUID uuid;
1819

server/src/main/java/com/studybuddies/server/persistance/MeetingRepository.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99

1010
@Repository
1111
public interface MeetingRepository extends CrudRepository<MeetingEntity, UUID> {
12-
void deleteById(UUID id);
13-
List<MeetingEntity> findBySuperId(UUID superId);
14-
Optional<MeetingEntity> findById(UUID id);
12+
13+
void deleteById(UUID id);
14+
15+
List<MeetingEntity> findBySuperId(UUID superId);
16+
17+
Optional<MeetingEntity> findById(UUID id);
1518
}

server/src/main/java/com/studybuddies/server/persistance/StudyGroupId.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
@NoArgsConstructor
1616
@AllArgsConstructor
1717
public class StudyGroupId implements Serializable {
18-
private UUID userId;
19-
private UUID meetingId;
18+
19+
private UUID userId;
20+
private UUID meetingId;
2021
}

0 commit comments

Comments
 (0)