Skip to content

Commit

Permalink
Merge pull request #417 from it-at-m/403-entfernung-von-unnötigen-lee…
Browse files Browse the repository at this point in the history
…rzeilen-zu-beginn-einer-methode

403 entfernung von unnötigen leerzeilen zu beginn einer methode
  • Loading branch information
dragonfly28 authored Sep 25, 2024
2 parents 8fcc8f5 + 91be92b commit 8950141
Show file tree
Hide file tree
Showing 43 changed files with 4 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ public KonfigurierterWahltagModel getKonfigurierterWahltag() throws WlsException

@Override
public BasisdatenModel loadBasisdaten(WahltagWithNummer wahltagWithNummer) throws WlsException {

return new BasisdatenModel(
Set.of(new BasisstrukturdatenModel("wahlID1", "szgID", "wahlbezirkID1_1", wahltagWithNummer.wahltag()),
new BasisstrukturdatenModel("wahlID1", "szgID", "wahlbezirkID1_2", wahltagWithNummer.wahltag()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public class KonfigurierterWahltagClientImpl implements KonfigurierterWahltagCli

@Override
public KonfigurierterWahltagModel getKonfigurierterWahltag() throws WlsException {

final KonfigurierterWahltagDTO konfigurierterWahltagDTO;
try {
konfigurierterWahltagDTO = konfigurierterWahltagControllerApi.getKonfigurierterWahltag();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public class WahldatenClientImpl implements WahldatenClient {

@Override
public BasisdatenModel loadBasisdaten(WahltagWithNummer wahltagWithNummer) throws WlsException {

final BasisdatenDTO basisdatenDTO;
try {
basisdatenDTO = wahldatenControllerApi.loadBasisdaten(wahltagWithNummer.wahltag(), wahltagWithNummer.wahltagNummer());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public class WahltageClientImpl implements WahltageClient {

@Override
public List<WahltagModel> getWahltage(LocalDate tag) throws WlsException {

final Set<WahltagDTO> wahltageDTO;
try {
wahltageDTO = (Set<WahltagDTO>) wahldatenControllerApi.loadWahltageSinceIncluding(tag);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ protected KopfdatenModel initKopfdata(String wahlID, String wahlbezirkID, Basisd
}

private KopfdatenModel createKopfdaten(WahlModel wahl, WahlbezirkModel wahlbezirk, StimmzettelgebietModel stimmzettelgebiet) {

val bezirkUndWahlID = new BezirkUndWahlID(wahl.wahlID(), wahlbezirk.wahlbezirkID());
val gemeinde = "LHM";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package de.muenchen.oss.wahllokalsystem.basisdatenservice.clients;

import static org.mockito.ArgumentMatchers.any;

import de.muenchen.oss.wahllokalsystem.basisdatenservice.eai.aou.client.WahldatenControllerApi;
import de.muenchen.oss.wahllokalsystem.basisdatenservice.eai.aou.model.WahltagDTO;
import de.muenchen.oss.wahllokalsystem.basisdatenservice.exception.ExceptionConstants;
Expand Down Expand Up @@ -80,7 +81,6 @@ void controllerApiExceptionIsMapped() {
}

private Set<de.muenchen.oss.wahllokalsystem.basisdatenservice.eai.aou.model.WahltagDTO> createClientWahltageDTO() {

val wahltag1 = new de.muenchen.oss.wahllokalsystem.basisdatenservice.eai.aou.model.WahltagDTO();
wahltag1.setIdentifikator("identifikatorWahltag1");
wahltag1.setBeschreibung("beschreibungWahltag1");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_NO_SECURITY_PROFILE;
import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_TEST_PROFILE;

import de.muenchen.oss.wahllokalsystem.basisdatenservice.MicroServiceApplication;
import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.kopfdaten.Kopfdaten;
import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.kopfdaten.KopfdatenRepository;
Expand Down Expand Up @@ -47,7 +48,6 @@ public void kopfdatenRepositorySave() {

@Test
public void kopfdatenRepositoryDeleteAllByBezirkUndWahlID_WahlID() {

val kopfdaten_1 = MockDataFactory.createKopfdatenEntityFor("wahlID1", "wahlbezirkID1",
Stimmzettelgebietsart.SG, "101", "München-Hadern", "Landtagswahl", "1901");
val kopfdaten_2 = MockDataFactory.createKopfdatenEntityFor("wahlID1", "wahlbezirkID2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@

@Builder
public record UrnenwahlSchliessungsUhrzeitWriteDTO(@NotNull LocalDateTime schliessungsuhrzeit) {

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public record UrnenwahlvorbereitungDTO(@NotNull String wahlbezirkID,
@NotNull @Size(min = 1) List<WahlurneDTO> urnenAnzahl) {

public UrnenwahlvorbereitungDTO(final String wahlbezirkID, final long anzahlWahlkabinen, final long anzahlWahltische, final long anzahlNebenraeume,
final List<WahlurneDTO> urnenAnzahl) {
final List<WahlurneDTO> urnenAnzahl) {
this.wahlbezirkID = wahlbezirkID;
this.anzahlWahlkabinen = anzahlWahlkabinen;
this.anzahlWahltische = anzahlWahltische;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public record UrnenwahlvorbereitungWriteDTO(@Schema(requiredMode = Schema.Requir
@NotNull @Size(min = 1) List<WahlurneDTO> urnenAnzahl) {

public UrnenwahlvorbereitungWriteDTO(final long anzahlWahlkabinen, final long anzahlWahltische, final long anzahlNebenraeume,
final List<WahlurneDTO> urnenAnzahl) {
final List<WahlurneDTO> urnenAnzahl) {
this.anzahlWahlkabinen = anzahlWahlkabinen;
this.anzahlWahltische = anzahlWahltische;
this.anzahlNebenraeume = anzahlNebenraeume;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public class UnicodeConfiguration {

@Bean
public FilterRegistrationBean<NfcRequestFilter> nfcRequestFilterRegistration(final NfcRequestFilter nfcRequestFilter) {

final FilterRegistrationBean<NfcRequestFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(nfcRequestFilter);
registration.setName(NFC_FILTER_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public NfcReader(final Reader original) {
}

private void convert() {

if (converted != null) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ public Collection<Part> getParts() throws IOException, ServletException {

@Override
public ServletInputStream getInputStream() throws IOException {

final String encoding = getOriginalRequest().getCharacterEncoding();

String content = null;
Expand Down

0 comments on commit 8950141

Please sign in to comment.