Skip to content

Codecrew / Moya

Go to a project
Commit 18cb7652 by Tuukka Kivilahti
Options

Merge branch 'findbugs-fixes' into 'master' 

Findbugs fixes

See merge request !407
2 parents 02b7fa30 9091cd98
Inline Side-by-side
Showing with 69 additions and 92 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ApiApplicationBean.java
...@@ -88,7 +88,7 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal { ...@@ -88,7 +88,7 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal {
String authname = permissionBean.getCurrentUser().getLogin() + "_" + application.getName() + "_" + currevent.getId() + "_" + currevent.getName(); String authname = permissionBean.getCurrentUser().getLogin() + "_" + application.getName() + "_" + currevent.getId() + "_" + currevent.getName();
// Replace all non-valid characters with '_' // Replace all non-valid characters with '_'
authname.replaceAll("[^a-zA-Z0-9._]", "_"); authname = authname.replaceAll("[^a-zA-Z0-9._]", "_");
// Ensure authname is unique; // Ensure authname is unique;
final String origAuthname = authname; final String origAuthname = authname;
......
code/moya-utils/src/main/java/fi/codecrew/moya/utilities/GitRepositoryState.java
...@@ -41,8 +41,9 @@ public class GitRepositoryState { ...@@ -41,8 +41,9 @@ public class GitRepositoryState {
private GitRepositoryState() { private GitRepositoryState() {
logger.info("Initializing git status"); logger.info("Initializing git status");
this.properties = new Properties(); this.properties = new Properties();
InputStream resource = null;
try { try {
InputStream resource = getClass().getResourceAsStream("/git.properties"); resource = getClass().getResourceAsStream("/git.properties");
if (resource == null) { if (resource == null) {
logger.warn("Resource not found!"); logger.warn("Resource not found!");
...@@ -53,6 +54,14 @@ public class GitRepositoryState { ...@@ -53,6 +54,14 @@ public class GitRepositoryState {
logger.info("Git keys:", this.properties.keys()); logger.info("Git keys:", this.properties.keys());
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error initializing git proerties", e); logger.warn("Error initializing git proerties", e);
} finally {
if (resource != null) {
try {
resource.close();
} catch (IOException e) {
// Error clsoing resource in finally.. Eat the error.
}
}
} }
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/MapManageView.java
...@@ -32,6 +32,7 @@ import javax.faces.event.ActionEvent; ...@@ -32,6 +32,7 @@ import javax.faces.event.ActionEvent;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.web.helpers.FileUploadUtils;
import org.primefaces.model.DefaultStreamedContent; import org.primefaces.model.DefaultStreamedContent;
import org.primefaces.model.StreamedContent; import org.primefaces.model.StreamedContent;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
...@@ -130,16 +131,11 @@ public class MapManageView extends GenericCDIView { ...@@ -130,16 +131,11 @@ public class MapManageView extends GenericCDIView {
public String submitBg() { public String submitBg() {
byte[] bytes = bgFile.getContents(); byte[] bytes = FileUploadUtils.getFileContents(bgFile);
if (bytes == null && bgFile.getSize() > 0) { if (bytes == null || bytes.length == 0) {
bytes = new byte[(int) bgFile.getSize()];
try {
bgFile.getInputstream().read(bytes);
} catch (IOException e) {
super.addFaceMessage("mapManage.errorUploadingBackground"); super.addFaceMessage("mapManage.errorUploadingBackground");
return null; return null;
} }
}
map.setMapData(bytes); map.setMapData(bytes);
map.setMimeType(bgFile.getContentType()); map.setMimeType(bgFile.getContentType());
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventPropertyView.java
...@@ -29,6 +29,7 @@ import javax.faces.model.ListDataModel; ...@@ -29,6 +29,7 @@ import javax.faces.model.ListDataModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.web.helpers.FileUploadUtils;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -131,20 +132,9 @@ public class EventPropertyView extends GenericCDIView { ...@@ -131,20 +132,9 @@ public class EventPropertyView extends GenericCDIView {
public String savePrivateProperty() { public String savePrivateProperty() {
logger.info("Saving property {}, eventorg {}, key {}", new Object[]{privateProperty.getEvent(), privateProperty.getEventorg(), privateProperty.getKey()}); logger.info("Saving property {}, eventorg {}, key {}", new Object[]{privateProperty.getEvent(), privateProperty.getEventorg(), privateProperty.getKey()});
if (privateProperty.getKey().isData() && file != null) { if (privateProperty.getKey().isData() && file != null) {
byte[] contents = null; byte[] contents = FileUploadUtils.getFileContents(file);
if (file.getContents() != null) {
contents = file.getContents();
} else {
contents = new byte[(int) file.getSize()];
try {
file.getInputstream().read(contents);
} catch (IOException e) {
logger.warn("Error reading file from stream", e);
contents = null;
}
}
if (contents == null) { if (contents == null || contents.length == 0) {
super.addFaceMessage("eventProperty.errorUploadingFile"); super.addFaceMessage("eventProperty.errorUploadingFile");
return null; return null;
} }
...@@ -187,20 +177,9 @@ public class EventPropertyView extends GenericCDIView { ...@@ -187,20 +177,9 @@ public class EventPropertyView extends GenericCDIView {
logger.debug("Is data: {} File {}", property.getKey().isData(), file); logger.debug("Is data: {} File {}", property.getKey().isData(), file);
if (property.getKey().isData() && file != null) { if (property.getKey().isData() && file != null) {
logger.info("saving data values type: {}, length {}", file.getContentType(), file.getSize()); logger.info("saving data values type: {}, length {}", file.getContentType(), file.getSize());
byte[] contents = null; byte[] contents = FileUploadUtils.getFileContents(file);
if (file.getContents() != null) {
contents = file.getContents();
} else {
contents = new byte[(int) file.getSize()];
try {
file.getInputstream().read(contents);
} catch (IOException e) {
logger.warn("Error reading file from stream", e);
contents = null;
}
}
if (contents == null) { if (contents == null || contents.length == 0) {
super.addFaceMessage("eventProperty.errorUploadingFile"); super.addFaceMessage("eventProperty.errorUploadingFile");
return null; return null;
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/CardView.java
...@@ -27,6 +27,7 @@ import javax.enterprise.context.ConversationScoped; ...@@ -27,6 +27,7 @@ import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.web.helpers.FileUploadUtils;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -95,20 +96,9 @@ public class CardView extends GenericCDIView { ...@@ -95,20 +96,9 @@ public class CardView extends GenericCDIView {
try { try {
logger.info("Templateimage: {}", getTemplateImage()); logger.info("Templateimage: {}", getTemplateImage());
byte[] contents = null; byte[] contents = null;
UploadedFile file = getTemplateImage(); contents = FileUploadUtils.getFileContents(getTemplateImage());
if (file.getContents() != null) {
contents = file.getContents();
} else {
contents = new byte[(int) file.getSize()];
try {
file.getInputstream().read(contents);
} catch (IOException e) {
logger.warn("Error reading file from stream", e);
contents = null;
}
}
if (contents == null) { if (contents == null || contents.length == 0) {
super.addFaceMessage("eventProperty.errorUploadingFile"); super.addFaceMessage("eventProperty.errorUploadingFile");
return null; return null;
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/ImportView.java
...@@ -27,6 +27,7 @@ import javax.ejb.EJB; ...@@ -27,6 +27,7 @@ import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.web.helpers.FileUploadUtils;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -82,19 +83,10 @@ public class ImportView extends GenericCDIView { ...@@ -82,19 +83,10 @@ public class ImportView extends GenericCDIView {
{ {
ArrayList<ImportWrapper> ret = new ArrayList<ImportWrapper>(); ArrayList<ImportWrapper> ret = new ArrayList<ImportWrapper>();
byte[] bytes = file.getContents(); byte[] bytes = FileUploadUtils.getFileContents(file);
if (bytes == null && file.getSize() > 0)
{
bytes = new byte[(int) file.getSize()];
try {
file.getInputstream().read(bytes);
} catch (IOException e) {
super.addFaceMessage("import.erroruploading");
return null;
}
}
if (bytes == null) { if (bytes == null || bytes.length == 0) {
super.addFaceMessage("import.erroruploading");
return null; return null;
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoView.java
...@@ -26,6 +26,7 @@ import javax.enterprise.inject.Produces; ...@@ -26,6 +26,7 @@ import javax.enterprise.inject.Produces;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.web.helpers.FileUploadUtils;
import org.primefaces.event.RateEvent; import org.primefaces.event.RateEvent;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -169,23 +170,9 @@ public class CompoView extends GenericCDIView { ...@@ -169,23 +170,9 @@ public class CompoView extends GenericCDIView {
return null; return null;
} }
byte[] contents = null; byte[] contents = FileUploadUtils.getFileContents(file);
if (file.getContents() != null) {
contents = file.getContents();
logger.info("Got file contents from .confents()");
} else {
contents = new byte[(int) file.getSize()];
logger.info("Read {} bytes from stream in file {}", file.getSize(), file.getFileName());
try {
file.getInputstream().read(contents);
} catch (IOException e) {
logger.warn("Error reading file from stream", e);
contents = null;
}
}
if (contents == null) if (contents == null || contents.length == 0) {
{
super.addFaceMessage("compo.fileuploadFailed"); super.addFaceMessage("compo.fileuploadFailed");
return null; return null;
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/VotingCompoAddEntryView.java
...@@ -25,6 +25,7 @@ import javax.enterprise.context.RequestScoped; ...@@ -25,6 +25,7 @@ import javax.enterprise.context.RequestScoped;
import javax.inject.Named; import javax.inject.Named;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import fi.codecrew.moya.web.helpers.FileUploadUtils;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -108,27 +109,14 @@ public class VotingCompoAddEntryView extends GenericCDIView { ...@@ -108,27 +109,14 @@ public class VotingCompoAddEntryView extends GenericCDIView {
UploadedFile file = getUploadedFile(); UploadedFile file = getUploadedFile();
if (file == null) if (file == null) {
{
super.addFaceMessage("compo.fileuploadFailed"); super.addFaceMessage("compo.fileuploadFailed");
return null; return null;
} }
byte[] contents = null; byte[] contents = FileUploadUtils.getFileContents(file);
if (file.getContents() != null) {
contents = file.getContents();
} else {
contents = new byte[(int) file.getSize()];
try {
file.getInputstream().read(contents);
} catch (IOException e) {
logger.warn("Error reading file from stream", e);
contents = null;
}
}
if (contents == null) if (contents == null || contents.length == 0) {
{
super.addFaceMessage("compo.fileuploadFailed"); super.addFaceMessage("compo.fileuploadFailed");
return null; return null;
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/FileUploadUtils.java 0 → 100644
package fi.codecrew.moya.web.helpers;
import org.apache.commons.io.IOUtils;
import org.primefaces.model.UploadedFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
public class FileUploadUtils {
private static final Logger logger = LoggerFactory.getLogger(FileUploadUtils.class);
public static byte[] getFileContents(UploadedFile file) {
if (file.getContents() != null) {
return file.getContents();
} else {
InputStream istream = null;
try {
istream = file.getInputstream();
return IOUtils.toByteArray(istream);
} catch (IOException e) {
logger.warn("Error reading file from stream", e);
} finally {
if (istream != null) {
try {
istream.close();
} catch (IOException e) {
logger.warn("Error closing UploadFile inputstream");
}
}
}
}
return null;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!