This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 5ee44132 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

minor technical fixes in java code

parent 20e6b816
Branches
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
Hide whitespace changes
Inline Side-by-side
Showing
with 90 additions and 61 deletions
src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
+ 2
− 2
View file @ 5ee44132
package at.ac.uibk.gitsearch.config;
import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
import java.net.URI;
import java.util.Collections;
import java.util.HashMap;
......@@ -9,7 +11,6 @@ import java.util.Optional;
import java.util.Set;
import javax.servlet.DispatcherType;
import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
......@@ -78,7 +79,6 @@ import at.ac.uibk.gitsearch.security.oauth2.UserDetailsFetcher;
import at.ac.uibk.gitsearch.service.UserService;
import at.ac.uibk.gitsearch.service.dto.UserDTO;
import at.ac.uibk.gitsearch.service.mapper.UserMapper;
import io.github.jhipster.config.JHipsterDefaults.Security.Authentication.Jwt;
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
......
src/main/java/at/ac/uibk/gitsearch/config/WebConfigurer.java
+ 16
− 12
View file @ 5ee44132
package at.ac.uibk.gitsearch.config;
import io.github.jhipster.config.JHipsterConstants;
import io.github.jhipster.config.JHipsterProperties;
import io.github.jhipster.config.h2.H2ConfigurationHelper;
import static java.net.URLDecoder.decode;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.web.server.*;
import org.springframework.boot.web.server.MimeMappings;
import org.springframework.boot.web.server.WebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
import org.springframework.context.annotation.Bean;
......@@ -17,14 +26,9 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import javax.servlet.*;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;
import java.util.*;
import static java.net.URLDecoder.decode;
import io.github.jhipster.config.JHipsterConstants;
import io.github.jhipster.config.JHipsterProperties;
import io.github.jhipster.config.h2.H2ConfigurationHelper;
/**
* Configuration of web application with Servlet 3.0 APIs.
......
src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
+ 2
− 2
View file @ 5ee44132
......@@ -22,17 +22,16 @@ import org.gitlab4j.api.GitLabApi;
import org.gitlab4j.api.GitLabApiException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.User;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import at.ac.uibk.gitsearch.repository.gitlab.GitLabRepository;
import at.ac.uibk.gitsearch.repository.search.MetaDataRepository;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum;
import at.ac.uibk.gitsearch.security.jwt.TokenProvider;
import at.ac.uibk.gitsearch.security.jwt.TokenProvider.GitLabAccessInfo;
import at.ac.uibk.gitsearch.service.dto.AutoCompleteEntry;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants.AuthoritiesConstantEnum;
/**
* Service for exercise/course search results
......@@ -207,6 +206,7 @@ public class SearchService {
final boolean isJava = metaData.getMetadata().getProgrammingLanguage() != null && Arrays
.stream(metaData.getMetadata().getProgrammingLanguage()).anyMatch(s -> s.startsWith("JAVA"))
&& metaData.hashCode() % 2 == 0; // nur um ein wenig Abwechslung zu bekommen :-)
@SuppressWarnings("unused")
final boolean isLatexFormat = metaData.getMetadata().getFormat() != null
&& Arrays.stream(metaData.getMetadata().getFormat()).anyMatch(s -> s.startsWith("latex"));
final boolean isPython = metaData.getMetadata().getProgrammingLanguage() != null && Arrays
......
src/main/java/at/ac/uibk/gitsearch/web/rest/AccountResource.java
+ 26
− 12
View file @ 5ee44132
package at.ac.uibk.gitsearch.web.rest;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.repository.UserRepository;
import at.ac.uibk.gitsearch.security.SecurityUtils;
......@@ -7,20 +24,12 @@ import at.ac.uibk.gitsearch.service.MailService;
import at.ac.uibk.gitsearch.service.UserService;
import at.ac.uibk.gitsearch.service.dto.PasswordChangeDTO;
import at.ac.uibk.gitsearch.service.dto.UserDTO;
import at.ac.uibk.gitsearch.web.rest.errors.*;
import at.ac.uibk.gitsearch.web.rest.errors.EmailAlreadyUsedException;
import at.ac.uibk.gitsearch.web.rest.errors.InvalidPasswordException;
import at.ac.uibk.gitsearch.web.rest.errors.LoginAlreadyUsedException;
import at.ac.uibk.gitsearch.web.rest.vm.KeyAndPasswordVM;
import at.ac.uibk.gitsearch.web.rest.vm.ManagedUserVM;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.*;
/**
* REST controller for managing the current user's account.
*/
......@@ -29,7 +38,12 @@ import java.util.*;
public class AccountResource {
public static class AccountResourceException extends RuntimeException {
public AccountResourceException(String message) {
/**
*
*/
private static final long serialVersionUID = 5875604197924631116L;
public AccountResourceException(String message) {
super(message);
}
}
......
src/test/java/at/ac/uibk/gitsearch/config/ElasticsearchTestConfiguration.java
+ 2
− 4
View file @ 5ee44132
package at.ac.uibk.gitsearch.config;
import java.io.File;
import org.assertj.core.util.Files;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import java.io.File;
@Configuration
public class ElasticsearchTestConfiguration {
......
src/test/java/at/ac/uibk/gitsearch/config/WebConfigurerTest.java
+ 27
− 15
View file @ 5ee44132
package at.ac.uibk.gitsearch.config;
import io.github.jhipster.config.JHipsterConstants;
import io.github.jhipster.config.JHipsterProperties;
import io.github.jhipster.web.filter.CachingHttpHeadersFilter;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import javax.servlet.Filter;
import javax.servlet.FilterRegistration;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.ServletRegistration;
import org.h2.server.web.WebServlet;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
......@@ -13,18 +35,8 @@ import org.springframework.mock.web.MockServletContext;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import javax.servlet.*;
import java.io.File;
import java.util.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import io.github.jhipster.config.JHipsterConstants;
import io.github.jhipster.config.JHipsterProperties;
/**
* Unit tests for the {@link WebConfigurer} class.
......
src/test/java/at/ac/uibk/gitsearch/service/SearchServiceIT.java
+ 2
− 1
View file @ 5ee44132
......@@ -275,7 +275,8 @@ public class SearchServiceIT {
assertThat(contributorAutoComplete, contains(hasProperty("target", is("Daniel Bastta"))));
}
@Test
@SuppressWarnings("unchecked")
@Test
public void testArtemisExportActionFilteringForAuthorizedUser() throws IOException, GitLabApiException {
GitLabApi mockedGitLabApi = mock(GitLabApi.class);
when(gitLabRepository.getGitLabApi(any(Optional.class))).thenReturn(mockedGitLabApi);
......
src/test/java/at/ac/uibk/gitsearch/web/rest/AuditResourceIT.java
+ 13
− 13
View file @ 5ee44132
package at.ac.uibk.gitsearch.web.rest;
import at.ac.uibk.gitsearch.GitsearchApp;
import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.Matchers.hasItem;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.time.Instant;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
import org.springframework.http.MediaType;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.transaction.annotation.Transactional;
import java.time.Instant;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.Matchers.hasItem;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import at.ac.uibk.gitsearch.GitsearchApp;
import at.ac.uibk.gitsearch.domain.PersistentAuditEvent;
import at.ac.uibk.gitsearch.repository.PersistenceAuditEventRepository;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
/**
* Integration tests for the {@link AuditResource} REST controller.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment