Skip to content

Commit

Permalink
Code refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
mbruno authored and mbruno committed Dec 3, 2019
1 parent 68dd18f commit 853df2a
Show file tree
Hide file tree
Showing 10 changed files with 2,173 additions and 2,173 deletions.
122 changes: 61 additions & 61 deletions src/main/java/it/istat/is2/app/bean/SessionBean.java
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
/**
* Copyright 2019 ISTAT
*
* Licensed under the EUPL, Version 1.1 or – as soon they will be approved by
* the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use this work except in compliance with the Licence. You may
* obtain a copy of the Licence at:
*
* http://ec.europa.eu/idabc/eupl5
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* Licence for the specific language governing permissions and limitations under
* the Licence.
*
* @author Francesco Amato <framato @ istat.it>
* @author Mauro Bruno <mbruno @ istat.it>
* @author Paolo Francescangeli <pafrance @ istat.it>
* @author Renzo Iannacone <iannacone @ istat.it>
* @author Stefano Macone <macone @ istat.it>
* @version 1.0
*/
package it.istat.is2.app.bean;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

import lombok.Data;

@Data
public class SessionBean implements Serializable {

private static final long serialVersionUID = 1L;

private Long id;
private String name;
private List<String> file;
private List<String> ruleset;
private Long dataProcessingId;
private String dataProcessingName;
private BusinessProcessParentBean businessProcess;
private BusinessFunctionBean businessFunction;
private Long rulesetType;
private Long dataset;

public SessionBean(Long id, String name) {
this.id = id;
this.name = name;
this.file = new ArrayList<>();
this.ruleset = new ArrayList<>();
this.dataProcessingId = new Long(0);
}

public SessionBean() {
//this.file = new ArrayList<>();
//this.ruleset = new ArrayList<>();
this.dataProcessingId = new Long(0);
}
}
/**
* Copyright 2019 ISTAT
*
* Licensed under the EUPL, Version 1.1 or – as soon they will be approved by
* the European Commission - subsequent versions of the EUPL (the "Licence");
* You may not use this work except in compliance with the Licence. You may
* obtain a copy of the Licence at:
*
* http://ec.europa.eu/idabc/eupl5
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* Licence for the specific language governing permissions and limitations under
* the Licence.
*
* @author Francesco Amato <framato @ istat.it>
* @author Mauro Bruno <mbruno @ istat.it>
* @author Paolo Francescangeli <pafrance @ istat.it>
* @author Renzo Iannacone <iannacone @ istat.it>
* @author Stefano Macone <macone @ istat.it>
* @version 1.0
*/
package it.istat.is2.app.bean;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

import lombok.Data;

@Data
public class SessionBean implements Serializable {

private static final long serialVersionUID = 1L;

private Long id;
private String name;
private List<String> file;
private List<String> ruleset;
private Long dataProcessingId;
private String dataProcessingName;
private BusinessProcessParentBean businessProcess;
private BusinessFunctionBean businessFunction;
private Long rulesetType;
private Long dataset;

public SessionBean(Long id, String name) {
this.id = id;
this.name = name;
this.file = new ArrayList<>();
this.ruleset = new ArrayList<>();
this.dataProcessingId = Long.valueOf(0);
}

public SessionBean() {
//this.file = new ArrayList<>();
//this.ruleset = new ArrayList<>();
this.dataProcessingId = Long.valueOf(0);
}
}
2 changes: 1 addition & 1 deletion src/main/java/it/istat/is2/app/util/FileHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public static HashMap<Integer, ArrayList<String>> getArrayListFromCsv(String url
CSVRecord riga = itr2.next();
HashMap<Integer, ArrayList<String>> campiMap = new HashMap<Integer, ArrayList<String>>();
for (int i = 0; i < riga.size(); i++) {
campiMap.put(new Integer(i), new ArrayList<String>());
campiMap.put(Integer.valueOf(i), new ArrayList<String>());
}
if (itr.hasNext()) {
// Salta l'intestazione
Expand Down
Loading

0 comments on commit 853df2a

Please sign in to comment.