Skip to content

Reduce Code Duplication #92

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.

Sign up for GitHub

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

Merged
Weltraumschaf merged 18 commits into from
Sep 4, 2023
Merged

Reduce Code Duplication #92

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3a251f5
#36 Add issue id to fixme tags
Weltraumschaf Sep 1, 2023
83caaa8
#36 Make the default name a constant
Weltraumschaf Sep 1, 2023
5fe20e9
#36 Remove obsolete comment
Weltraumschaf Sep 1, 2023
68e93a9
Revert "#36 Extract network side effect into interface so we can mock…
Weltraumschaf Sep 1, 2023
fe5d649
#36 Add class to hold proxy configuration
Weltraumschaf Sep 2, 2023
79108cb
#36 Fix robert's lastname
Weltraumschaf Sep 3, 2023
185028f
#36 Add facotry to create proxy config from system properties
Weltraumschaf Sep 3, 2023
35d1856
#36 Marke methods deprecated which will be removed after code refacto…
Weltraumschaf Sep 3, 2023
d87455e
#36 Use new proxy config in import scan service
Weltraumschaf Sep 3, 2023
4fa891d
#36 Extract config name enum in own file forbetter readability
Weltraumschaf Sep 3, 2023
c7bc277
#36 Extract exception for missingproxy config in own file forbetter r…
Weltraumschaf Sep 3, 2023
482662b
#36 Start to extract duplicated code
Weltraumschaf Sep 3, 2023
dc255d6
#36 Add a old version because did to many refactorings so that's hard…
Weltraumschaf Sep 3, 2023
bd237d2
#36 Make the code identical to duplicated one
Weltraumschaf Sep 3, 2023
d3ea3e6
#36 Extract duplicated code to create rest template
Weltraumschaf Sep 3, 2023
8d4cd06
#36 Add missing SPDX headers
Weltraumschaf Sep 4, 2023
40c0ba3
#36 Fix license header to meet SPDX spec
Weltraumschaf Sep 4, 2023
a87c80e
#36 Add missing SPDX headers
Weltraumschaf Sep 4, 2023
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
Prev Previous commit
Next Next commit
#36 Marke methods deprecated which will be removed after code refacto… 
…ring

Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>
  • Loading branch information
@Weltraumschaf
Weltraumschaf committed Sep 3, 2023
commit 35d185675c1f83cec40b6ddefda61a3bd132edf6
3 changes: 3 additions & 0 deletions src/main/java/io/securecodebox/persistence/defectdojo/service/DefaultImportScanService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class DefaultImportScanService implements ImportScanService {
new FormHttpMessageConverter(),
new ResourceHttpMessageConverter(),
new MappingJackson2HttpMessageConverter());
@Deprecated
private final SystemPropertyFinder properties = new SystemPropertyFinder();
@Getter
private final String defectDojoUrl;
Expand Down Expand Up @@ -230,6 +231,7 @@ ClientHttpRequestFactory createRequestFactoryWithProxyAuthConfig() {
return factory;
}

@Deprecated
private static class SystemPropertyFinder {
private boolean hasProperty(@NonNull final ProxyConfigNames name) {
return System.getProperty(name.getLiterat()) != null;
Expand All @@ -244,6 +246,7 @@ private String getProperty(@NonNull final ProxyConfigNames name) {
}
}

@Deprecated
final static class MissingProxyAuthenticationConfig extends RuntimeException {
MissingProxyAuthenticationConfig(ProxyConfigNames name) {
super(String.format("Expected System property '%s' not set!", name.getLiterat()));
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/securecodebox/persistence/defectdojo/service/ImportScanService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class ImportScanResponse {
* or none of them!
* </p>
*/
@Deprecated
enum ProxyConfigNames {
HTTP_PROXY_HOST("http.proxyHost"),
HTTP_PROXY_PORT("http.proxyPort"),
Expand Down
5 changes: 5 additions & 0 deletions ...st/java/io/securecodebox/persistence/defectdojo/service/DefaultImportScanServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ void shouldConfigureProxySettings_trueIfUserAndPasswordSet() {
}

@Test
@Deprecated
void createRequestFactoryWithProxyAuthConfig_throesExceptionIfUserNotSet() {
System.clearProperty(ProxyConfigNames.HTTP_PROXY_USER.getLiterat());
System.setProperty(ProxyConfigNames.HTTP_PROXY_PASSWORD.getLiterat(), "password");
Expand All @@ -121,6 +122,7 @@ void createRequestFactoryWithProxyAuthConfig_throesExceptionIfUserNotSet() {
}

@Test
@Deprecated
void createRequestFactoryWithProxyAuthConfig_throesExceptionIfPasswordNotSet() {
System.setProperty(ProxyConfigNames.HTTP_PROXY_USER.getLiterat(), "user");
System.clearProperty(ProxyConfigNames.HTTP_PROXY_PASSWORD.getLiterat());
Expand All @@ -135,6 +137,7 @@ void createRequestFactoryWithProxyAuthConfig_throesExceptionIfPasswordNotSet() {
}

@Test
@Deprecated
void createRequestFactoryWithProxyAuthConfig_throesExceptionIfHostNotSet() {
System.setProperty(ProxyConfigNames.HTTP_PROXY_USER.getLiterat(), "user");
System.setProperty(ProxyConfigNames.HTTP_PROXY_PASSWORD.getLiterat(), "password");
Expand All @@ -149,6 +152,7 @@ void createRequestFactoryWithProxyAuthConfig_throesExceptionIfHostNotSet() {
}

@Test
@Deprecated
void createRequestFactoryWithProxyAuthConfig_throesExceptionIfPortNotSet() {
System.setProperty(ProxyConfigNames.HTTP_PROXY_USER.getLiterat(), "user");
System.setProperty(ProxyConfigNames.HTTP_PROXY_PASSWORD.getLiterat(), "password");
Expand All @@ -163,6 +167,7 @@ void createRequestFactoryWithProxyAuthConfig_throesExceptionIfPortNotSet() {
}

@Test
@Deprecated
void createRequestFactoryWithProxyAuthConfig_throesExceptionIfPortIsNotInteger() {
System.setProperty(ProxyConfigNames.HTTP_PROXY_USER.getLiterat(), "user");
System.setProperty(ProxyConfigNames.HTTP_PROXY_PASSWORD.getLiterat(), "password");
Expand Down