lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into MECS-1454_Search_filter_improvements

Browse Source
This commit is contained in:
venu1278
2016-02-03 12:49:18 +05:30
parent 973a5dd72a 5331a9c06e
commit ee7603b8c2
51 changed files with 2007 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/push/AsyncVaadinServletConfiguration.java
View File

@@ -32,6 +32,7 @@ import com.vaadin.spring.boot.internal.VaadinServletConfigurationProperties;
@Import(VaadinServletConfiguration.class)
public class AsyncVaadinServletConfiguration extends VaadinServletConfiguration {
@Override
@Bean
protected ServletRegistrationBean vaadinServletRegistration() {
return createServletRegistrationBean();

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java
View File

@@ -210,7 +210,7 @@ public class HawkbitUI extends DefaultHawkbitUI implements DetachListener {
navigator.addView(EMPTY_VIEW, new Navigator.EmptyView());
// set locale is required for I18N class also, to get the locale from
// cookie
final String locale = getLocaleId(SPUIDefinitions.AVAILABLE_LOCALES);
final String locale = getLocaleId(SPUIDefinitions.getAvailableLocales());
setLocale(new Locale(locale));
UI.getCurrent().setErrorHandler(new SPUIErrorHandler());

10
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/CustomFile.java
View File

@@ -72,7 +72,7 @@ public class CustomFile implements Serializable {
/**
* Initialize details.
*
*
* @param fileName
* uploaded file name
* @param baseSoftwareModuleName
@@ -138,7 +138,7 @@ public class CustomFile implements Serializable {
}
/**
*
*
* @return the isValid
*/
public Boolean getIsValid() {
@@ -170,11 +170,11 @@ public class CustomFile implements Serializable {
/*
* (non-Javadoc)
*
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
public int hashCode() { // NOSONAR - as this is generated
final int prime = 31;
int result = 1;
result = prime * result + (fileName == null ? 0 : fileName.hashCode());
@@ -183,7 +183,7 @@ public class CustomFile implements Serializable {
/*
* (non-Javadoc)
*
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override

23
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java
View File

@@ -8,9 +8,6 @@
*/
package org.eclipse.hawkbit.ui.management.dstable;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -39,8 +36,6 @@ import com.google.common.base.Strings;
* Simple implementation of generics bean query which dynamically loads a batch
* of beans.
*
*
*
*/
public class DistributionBeanQuery extends AbstractBeanQuery<ProxyDistribution> {
@@ -55,7 +50,7 @@ public class DistributionBeanQuery extends AbstractBeanQuery<ProxyDistribution>
/**
* Bean query for retrieving beans/objects of type.
*
*
* @param definition
* query definition
* @param queryConfig
@@ -92,8 +87,9 @@ public class DistributionBeanQuery extends AbstractBeanQuery<ProxyDistribution>
/**
* Load all the Distribution set.
*
* @parm startIndex as page start
*
* @param startIndex
* as page start
* @param count
* as total data
*/
@@ -193,15 +189,4 @@ public class DistributionBeanQuery extends AbstractBeanQuery<ProxyDistribution>
return distributionSetManagement;
}
private void writeObject(final ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
out.writeObject(firstPageDistributionSets);
}
@SuppressWarnings("unchecked")
private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
firstPageDistributionSets = (Page<DistributionSet>) in.readObject();
}
}

72
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
View File

@@ -14,6 +14,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.nio.charset.Charset;
@@ -62,15 +63,13 @@ import com.vaadin.ui.Upload.SucceededListener;
/**
* Bulk target upload handler.
*
*
*
*/
public class BulkUploadHandler extends CustomComponent
implements SucceededListener, FailedListener, Receiver, StartedListener {
/**
* *
*
*/
private static final long serialVersionUID = -1273494705754674501L;
private static final Logger LOG = LoggerFactory.getLogger(BulkUploadHandler.class);
@@ -103,7 +102,7 @@ public class BulkUploadHandler extends CustomComponent
final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout;
/**
*
*
* @param targetBulkUpdateWindowLayout
* @param targetManagement
* @param managementUIState
@@ -152,7 +151,7 @@ public class BulkUploadHandler extends CustomComponent
/*
* (non-Javadoc)
*
*
* @see com.vaadin.ui.Upload.Receiver#receiveUpload(java.lang.String,
* java.lang.String)
*/
@@ -173,7 +172,7 @@ public class BulkUploadHandler extends CustomComponent
/*
* (non-Javadoc)
*
*
* @see
* com.vaadin.ui.Upload.FailedListener#uploadFailed(com.vaadin.ui.Upload.
* FailedEvent)
@@ -185,7 +184,7 @@ public class BulkUploadHandler extends CustomComponent
/*
* (non-Javadoc)
*
*
* @see
* com.vaadin.ui.Upload.SucceededListener#uploadSucceeded(com.vaadin.ui.
* Upload.SucceededEvent)
@@ -199,7 +198,7 @@ public class BulkUploadHandler extends CustomComponent
final SucceededEvent event;
/**
*
*
* @param event
*/
public UploadAsync(final SucceededEvent event) {
@@ -208,15 +207,18 @@ public class BulkUploadHandler extends CustomComponent
@Override
public void run() {
BufferedReader reader = null;
long innerCounter = 0;
String line;
if (tempFile != null) {
try {
if (tempFile == null) {
return;
}
try (InputStream tempStream = new FileInputStream(tempFile)) {
try (BufferedReader reader = new BufferedReader(
new InputStreamReader(tempStream, Charset.defaultCharset()))) {
LOG.info("Bulk file upload started");
final double totalFileSize = getTotalNumberOfLines();
reader = new BufferedReader(
new InputStreamReader(new FileInputStream(tempFile), Charset.defaultCharset()));
/**
* Once control is in upload succeeded method automatically
* upload button is re-enabled. To disable the button firing
@@ -232,21 +234,16 @@ public class BulkUploadHandler extends CustomComponent
// Clearing after assignments are done
managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated().clear();
} catch (final FileNotFoundException e) {
LOG.error("File not found with name {}", tempFile.getName(), e);
} catch (final IOException e) {
LOG.error("Error reading file {}", tempFile.getName(), e);
} finally {
try {
if (null != reader) {
reader.close();
resetCounts();
deleteFile();
}
} catch (final IOException e) {
LOG.error("Error while reading file ", e);
}
resetCounts();
deleteFile();
}
} catch (final FileNotFoundException e) {
LOG.error("Temporary file not found with name {}", tempFile.getName(), e);
} catch (final IOException e) {
LOG.error("Error while opening temorary file ", e);
}
}
@@ -307,24 +304,19 @@ public class BulkUploadHandler extends CustomComponent
}
private double getTotalNumberOfLines() {
InputStreamReader inputStreamReader;
BufferedReader readerForSize = null;
double totalFileSize = 0;
try {
inputStreamReader = new InputStreamReader(new FileInputStream(tempFile), Charset.defaultCharset());
readerForSize = new BufferedReader(inputStreamReader);
totalFileSize = readerForSize.lines().count();
try (InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(tempFile),
Charset.defaultCharset())) {
try (BufferedReader readerForSize = new BufferedReader(inputStreamReader)) {
totalFileSize = readerForSize.lines().count();
}
} catch (final FileNotFoundException e) {
LOG.error("Error reading file {}", tempFile.getName(), e);
} finally {
if (readerForSize != null) {
try {
readerForSize.close();
} catch (final IOException e) {
LOG.error("Error while closing reader of file {}", tempFile.getName(), e);
}
}
} catch (final IOException e) {
LOG.error("Error while closing reader of file {}", tempFile.getName(), e);
}
return totalFileSize;
}
@@ -449,7 +441,7 @@ public class BulkUploadHandler extends CustomComponent
private static class NullOutputStream extends OutputStream {
/**
* null output stream.
*
*
* @param i
* byte
*/
@@ -468,7 +460,7 @@ public class BulkUploadHandler extends CustomComponent
/*
* (non-Javadoc)
*
*
* @see
* com.vaadin.ui.Upload.StartedListener#uploadStarted(com.vaadin.ui.Upload
* .StartedEvent)

11
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java
View File

@@ -26,7 +26,7 @@ public final class SPUIDefinitions {
/**
* Available locales.
*/
public static final Set<String> AVAILABLE_LOCALES = Stream.of("en", "de").collect(Collectors.toSet());
private static final Set<String> AVAILABLE_LOCALES = Stream.of("en", "de").collect(Collectors.toSet());
/**
* Default locale.
@@ -953,4 +953,13 @@ public final class SPUIDefinitions {
private SPUIDefinitions() {
}
/**
* Get the locales
*
* @return the availableLocales
*/
public static Set<String> getAvailableLocales() {
return AVAILABLE_LOCALES;
}
}