Skip to content

Commit 91cb1d0

Browse files
committed
Sonarqube
1 parent 8f4a360 commit 91cb1d0

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

src/main/java/edu/ie3/datamodel/io/source/TimeSeriesMappingSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class TimeSeriesMappingSource {
2323

2424
private final TimeSeriesMappingFactory mappingFactory;
2525

26-
public TimeSeriesMappingSource() {
26+
protected TimeSeriesMappingSource() {
2727
this.mappingFactory = new TimeSeriesMappingFactory();
2828
}
2929

src/main/java/edu/ie3/datamodel/io/source/csv/CsvIdCoordinateSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class CsvIdCoordinateSource implements IdCoordinateSource {
3434

3535
protected static final Logger log = LoggerFactory.getLogger(CsvIdCoordinateSource.class);
3636

37-
private static final String coordinateIdMapping = "coordinate id mapping";
37+
private static final String COORDINATE_ID_MAPPING = "coordinate id mapping";
3838

3939
/** Mapping in both ways (id -> coordinate) and (coordinate -> id) have to be unique */
4040
private final Map<Integer, Point> idToCoordinate;
@@ -167,15 +167,15 @@ protected Stream<Map<String, String>> buildStreamWithFieldsToAttributesMap() {
167167
fieldToValues -> fieldToValues.get(factory.getIdField());
168168
Set<Map<String, String>> withDistinctCoordinateId =
169169
dataSource.distinctRowsWithLog(
170-
allRows, idExtractor, coordinateIdMapping, "coordinate id");
170+
allRows, idExtractor, COORDINATE_ID_MAPPING, "coordinate id");
171171
Function<Map<String, String>, String> coordinateExtractor =
172172
fieldToValues ->
173173
fieldToValues
174174
.get(factory.getLatField())
175175
.concat(fieldToValues.get(factory.getLonField()));
176176
return dataSource
177177
.distinctRowsWithLog(
178-
withDistinctCoordinateId, coordinateExtractor, coordinateIdMapping, "coordinate")
178+
withDistinctCoordinateId, coordinateExtractor, COORDINATE_ID_MAPPING, "coordinate")
179179
.parallelStream();
180180
} catch (IOException e) {
181181
log.error("Cannot read the file for coordinate id to coordinate mapping.", e);

src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ public CsvTimeSeriesSource(
9595
/* Read in the full time series */
9696
try {
9797
this.timeSeries =
98-
buildIndividualTimeSeries(
99-
timeSeriesUuid, filePath, fieldToValue -> this.createTimeBasedValue(fieldToValue));
98+
buildIndividualTimeSeries(timeSeriesUuid, filePath, this::createTimeBasedValue);
10099
} catch (SourceException e) {
101100
throw new IllegalArgumentException(
102101
"Unable to obtain time series with UUID '"

src/main/java/edu/ie3/datamodel/io/source/sql/SqlDataSource.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ public class SqlDataSource implements DataSource {
2424

2525
protected static final Logger log = LoggerFactory.getLogger(SqlDataSource.class);
2626

27-
private static final String errorSQL = "Error during execution of query {}";
28-
2927
protected final SqlConnector connector;
3028
protected final DatabaseNamingStrategy databaseNamingStrategy;
3129
protected String schemaName;
@@ -164,7 +162,7 @@ protected Stream<Map<String, String>> executeQuery(String query, AddParams addPa
164162
ResultSet resultSet = ps.executeQuery();
165163
return connector.extractFieldMaps(resultSet).stream();
166164
} catch (SQLException e) {
167-
log.error(errorSQL, query, e);
165+
log.error("Error during execution of query {}", query, e);
168166
}
169167
return Stream.empty();
170168
}

0 commit comments

Comments
 (0)