Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
67e24cc8
Commit
67e24cc8
authored
Feb 12, 2026
by
Luna Riegel
Browse files
Refactor: Move functions
parent
d187ac0f
Changes
2
Show whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java
View file @
67e24cc8
...
@@ -542,57 +542,10 @@ public class Checker {
...
@@ -542,57 +542,10 @@ public class Checker {
excludeFilters
=
Collections
.
emptyList
();
excludeFilters
=
Collections
.
emptyList
();
return
;
return
;
}
}
excludeFilters
=
buildExcludeFilters
(
filterConfig
);
excludeFilters
=
filterConfig
.
buildExcludeFilters
();
includeFilters
=
buildIncludeFilters
(
filterConfig
);
includeFilters
=
filterConfig
.
buildIncludeFilters
();
}
}
private
List
<
Filter
>
buildExcludeFilters
(
FilterConfiguration
filterConfig
)
{
if
(
filterConfig
==
null
)
{
return
Collections
.
emptyList
();
}
ExcludeFilterConfiguration
excludeConfig
=
filterConfig
.
getExclude
();
if
(
excludeConfig
==
null
)
{
return
Collections
.
emptyList
();
}
else
{
List
<
Filter
>
filters
=
new
ArrayList
<>();
if
(
excludeConfig
.
getTypes
()
!=
null
)
{
for
(
FeatureType
excludeType
:
excludeConfig
.
getTypes
())
{
filters
.
add
(
new
TypeFilter
(
excludeType
));
}
}
if
(
excludeConfig
.
getIds
()
!=
null
)
{
for
(
String
excludePattern
:
excludeConfig
.
getIds
())
{
Filter
f
=
new
EqualsIgnoreCaseFilter
(
excludePattern
);
filters
.
add
(
f
);
}
}
return
filters
;
}
}
private
List
<
Filter
>
buildIncludeFilters
(
FilterConfiguration
filterConfig
)
{
if
(
filterConfig
==
null
)
{
return
Collections
.
emptyList
();
}
IncludeFilterConfiguration
includeConfig
=
filterConfig
.
getInclude
();
if
(
includeConfig
==
null
)
{
return
Collections
.
emptyList
();
}
else
{
List
<
Filter
>
filters
=
new
ArrayList
<>();
if
(
includeConfig
.
getTypes
()
!=
null
)
{
for
(
FeatureType
includeType
:
includeConfig
.
getTypes
())
{
filters
.
add
(
new
TypeFilter
(
includeType
));
}
}
if
(
includeConfig
.
getIds
()
!=
null
)
{
for
(
String
includePattern
:
includeConfig
.
getIds
())
{
Filter
f
=
new
EqualsIgnoreCaseFilter
(
includePattern
);
filters
.
add
(
f
);
}
}
return
filters
;
}
}
private
void
setValidationConfig
(
ValidationConfiguration
config
)
{
private
void
setValidationConfig
(
ValidationConfiguration
config
)
{
if
(
config
==
null
)
{
if
(
config
==
null
)
{
...
...
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/FilterConfiguration.java
View file @
67e24cc8
...
@@ -18,8 +18,13 @@
...
@@ -18,8 +18,13 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.check
;
package
de.hft.stuttgart.citydoctor2.check
;
import
de.hft.stuttgart.citydoctor2.datastructure.FeatureType
;
import
java.io.Serial
;
import
java.io.Serial
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
/**
/**
* Filter configuration container for the yaml configuration file. Has include
* Filter configuration container for the yaml configuration file. Has include
...
@@ -52,4 +57,46 @@ public class FilterConfiguration implements Serializable {
...
@@ -52,4 +57,46 @@ public class FilterConfiguration implements Serializable {
this
.
include
=
include
;
this
.
include
=
include
;
}
}
public
List
<
Filter
>
buildExcludeFilters
()
{
ExcludeFilterConfiguration
excludeConfig
=
this
.
getExclude
();
if
(
excludeConfig
==
null
)
{
return
Collections
.
emptyList
();
}
else
{
List
<
Filter
>
filters
=
new
ArrayList
<>();
if
(
excludeConfig
.
getTypes
()
!=
null
)
{
for
(
FeatureType
excludeType
:
excludeConfig
.
getTypes
())
{
filters
.
add
(
new
TypeFilter
(
excludeType
));
}
}
if
(
excludeConfig
.
getIds
()
!=
null
)
{
for
(
String
excludePattern
:
excludeConfig
.
getIds
())
{
Filter
f
=
new
EqualsIgnoreCaseFilter
(
excludePattern
);
filters
.
add
(
f
);
}
}
return
filters
;
}
}
public
List
<
Filter
>
buildIncludeFilters
()
{
IncludeFilterConfiguration
includeConfig
=
this
.
getInclude
();
if
(
includeConfig
==
null
)
{
return
Collections
.
emptyList
();
}
else
{
List
<
Filter
>
filters
=
new
ArrayList
<>();
if
(
includeConfig
.
getTypes
()
!=
null
)
{
for
(
FeatureType
includeType
:
includeConfig
.
getTypes
())
{
filters
.
add
(
new
TypeFilter
(
includeType
));
}
}
if
(
includeConfig
.
getIds
()
!=
null
)
{
for
(
String
includePattern
:
includeConfig
.
getIds
())
{
Filter
f
=
new
EqualsIgnoreCaseFilter
(
includePattern
);
filters
.
add
(
f
);
}
}
return
filters
;
}
}
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment