diff --git a/src/main/java/org/appng/application/manager/business/ClusterState.java b/src/main/java/org/appng/application/manager/business/ClusterState.java index a783e6e..ecc96cc 100644 --- a/src/main/java/org/appng/application/manager/business/ClusterState.java +++ b/src/main/java/org/appng/application/manager/business/ClusterState.java @@ -65,7 +65,7 @@ public DataContainer getData(Site site, Application application, org.appng.api.E LocalNodeState localNode = getLocalNode(site, environment); LocalNodeState currentNode = localNode; - Set items = new HashSet(); + Set items = new HashSet<>(); items.add(localNode); boolean clusterAvailable = null != nodeStates; diff --git a/src/main/java/org/appng/application/manager/business/Dictionary.java b/src/main/java/org/appng/application/manager/business/Dictionary.java index f1069e2..a77226b 100644 --- a/src/main/java/org/appng/application/manager/business/Dictionary.java +++ b/src/main/java/org/appng/application/manager/business/Dictionary.java @@ -53,7 +53,7 @@ public class Dictionary extends ServiceAware implements DataProvider { public DataContainer getData(Site site, Application application, Environment environment, Options options, Request request, FieldProcessor fp) { ResourceBundle bundle = null; - List properties = new ArrayList(); + List properties = new ArrayList<>(); Integer applicationId = options.getInteger("application", "id"); Locale locale = environment.getLocale(); diff --git a/src/main/java/org/appng/application/manager/business/Installation.java b/src/main/java/org/appng/application/manager/business/Installation.java index 559235f..7a66140 100644 --- a/src/main/java/org/appng/application/manager/business/Installation.java +++ b/src/main/java/org/appng/application/manager/business/Installation.java @@ -31,7 +31,6 @@ import org.appng.application.manager.MessageConstants; import org.appng.application.manager.service.Service; import org.appng.application.manager.service.ServiceAware; -import org.appng.core.model.InstallablePackage; import org.appng.xml.platform.Selection; import org.appng.xml.platform.SelectionGroup; import org.appng.xml.platform.SelectionType; @@ -106,7 +105,7 @@ public DataContainer getData(Site site, Application application, Environment env data = service.searchPackageVersions(request, fp, repositoryId, applicationName); } } catch (BusinessException ex) { - data.setPage(new ArrayList(), fp.getPageable()); + data.setPage(new ArrayList<>(), fp.getPageable()); } return data; } diff --git a/src/main/java/org/appng/application/manager/business/Jars.java b/src/main/java/org/appng/application/manager/business/Jars.java index c694824..2301118 100644 --- a/src/main/java/org/appng/application/manager/business/Jars.java +++ b/src/main/java/org/appng/application/manager/business/Jars.java @@ -54,11 +54,7 @@ public DataContainer getData(Site site, Application application, Environment env jars = new ArrayList(); File baseFolder = new File(System.getProperty("catalina.base"), "lib"); File homeFolder = new File(System.getProperty("catalina.home"), "lib"); - FilenameFilter jarFilter = new FilenameFilter() { - public boolean accept(File dir, String name) { - return name.endsWith(".jar"); - } - }; + FilenameFilter jarFilter = (dir, name) -> name.endsWith(".jar"); for (String jarfile : baseFolder.list(jarFilter)) { jars.add(JarInfoBuilder.getJarInfo(new File(baseFolder, jarfile))); } diff --git a/src/main/java/org/appng/application/manager/business/Properties.java b/src/main/java/org/appng/application/manager/business/Properties.java index 82286e1..7b3a235 100644 --- a/src/main/java/org/appng/application/manager/business/Properties.java +++ b/src/main/java/org/appng/application/manager/business/Properties.java @@ -159,6 +159,7 @@ public class PropertyWrapper extends PropertyImpl { this.hidePassword = hidePassword; } + @Override public String getActualString() { if (hidePassword && Property.Type.PASSWORD.equals(getType())) { return property.getActualString().replaceAll("\\.", "*"); @@ -166,6 +167,7 @@ public String getActualString() { return property.getActualString(); } + @Override public Boolean getChangedValue() { return property.getChangedValue(); } @@ -174,10 +176,12 @@ public String getShortName() { return getName().substring(getName().lastIndexOf('.') + 1); } + @Override public String getString() { return property.getString(); } + @Override public Boolean getBoolean() { return property.getBoolean(); } @@ -186,6 +190,7 @@ public void setBoolean(Boolean value) { property.setActualString(value.toString()); } + @Override public Integer getInteger() { return property.getInteger(); } @@ -194,46 +199,57 @@ public void setInteger(Integer value) { property.setActualString(value.toString()); } + @Override public Float getFloat() { return property.getFloat(); } + @Override public Double getDouble() { return property.getDouble(); } + @Override public byte[] getBlob() { return property.getBlob(); } + @Override public String getClob() { return property.getClob(); } + @Override public String getName() { return property.getName(); } + @Override public boolean isMandatory() { return property.isMandatory(); } + @Override public String getDefaultString() { return property.getDefaultString(); } + @Override public Type getType() { return property.getType(); } + @Override public Object getValue() { return property.getValue(); } + @Override public void setValue(Object value) { property.setValue(value); } + @Override public String getDescription() { return property.getDescription(); } diff --git a/src/main/java/org/appng/application/manager/business/Sessions.java b/src/main/java/org/appng/application/manager/business/Sessions.java index 268adf6..210bd09 100644 --- a/src/main/java/org/appng/application/manager/business/Sessions.java +++ b/src/main/java/org/appng/application/manager/business/Sessions.java @@ -162,7 +162,7 @@ protected List getSessions(Options options, Request request, Boolean cu final String fAgnt, String fUsr, final Date fcrBfDate, final Date fcrAfDate, final String fLgn) { Integer siteId = options.getInteger("site", "id"); String currentSiteName = null == siteId ? null : getService().getNameForSite(siteId); - List sessions = new ArrayList(); + List sessions = new ArrayList<>(); for (Session session : imutableSessions) { String userAgent = session.getUserAgent(); if (StringUtils.isBlank(userAgent)) { diff --git a/src/main/java/org/appng/application/manager/business/SqlExecutor.java b/src/main/java/org/appng/application/manager/business/SqlExecutor.java index e55b2dc..2d9a016 100644 --- a/src/main/java/org/appng/application/manager/business/SqlExecutor.java +++ b/src/main/java/org/appng/application/manager/business/SqlExecutor.java @@ -182,7 +182,7 @@ public void setHasError(boolean hasError) { } public List getQueries(String sql, DatabaseConnection connection) { - List queries = new ArrayList(); + List queries = new ArrayList<>(); try (Database db = DatabaseFactory .createDatabase(new FluentConfiguration().dataSource(connection.getDataSource()), true)) { SqlScript sqlScript = new SqlScript(db.createSqlStatementBuilderFactory(), new StringResource(sql), false); diff --git a/src/main/java/org/appng/application/manager/business/webservice/FastAccessFile.java b/src/main/java/org/appng/application/manager/business/webservice/FastAccessFile.java index 5485bf1..c008af2 100644 --- a/src/main/java/org/appng/application/manager/business/webservice/FastAccessFile.java +++ b/src/main/java/org/appng/application/manager/business/webservice/FastAccessFile.java @@ -86,8 +86,9 @@ public String next() { return sb.toString(); } + @Override public void remove() { - + // not needed } } diff --git a/src/main/java/org/appng/application/manager/business/webservice/SystemReport.java b/src/main/java/org/appng/application/manager/business/webservice/SystemReport.java index e318f75..5e62192 100644 --- a/src/main/java/org/appng/application/manager/business/webservice/SystemReport.java +++ b/src/main/java/org/appng/application/manager/business/webservice/SystemReport.java @@ -19,7 +19,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; @@ -123,8 +122,7 @@ public byte[] processRequest(Site site, Application application, Environment env return new byte[0]; } - private void addFile(ArchiveOutputStream os, File srcFile, String currentFolder) - throws FileNotFoundException, IOException { + private void addFile(ArchiveOutputStream os, File srcFile, String currentFolder) throws IOException { if (null != srcFile && srcFile.exists()) { for (File file : srcFile.listFiles()) { String path = currentFolder + "/" + file.getName(); @@ -145,12 +143,11 @@ private void addProperties(ArchiveOutputStream os, String name, Map map) t addArchiveEntry(os, name, new ByteArrayInputStream(propsOut.toByteArray()), null); } - private void addArchiveEntry(ArchiveOutputStream os, File file) throws FileNotFoundException, IOException { + private void addArchiveEntry(ArchiveOutputStream os, File file) throws IOException { addArchiveEntry(os, file.getName(), file); } - private void addArchiveEntry(ArchiveOutputStream os, String name, File file) - throws FileNotFoundException, IOException { + private void addArchiveEntry(ArchiveOutputStream os, String name, File file) throws IOException { if (file.exists()) { addArchiveEntry(os, name, new FileInputStream(file), file.lastModified()); } diff --git a/src/main/java/org/appng/application/manager/form/GrantForm.java b/src/main/java/org/appng/application/manager/form/GrantForm.java index efa3beb..b2bcc89 100644 --- a/src/main/java/org/appng/application/manager/form/GrantForm.java +++ b/src/main/java/org/appng/application/manager/form/GrantForm.java @@ -28,7 +28,7 @@ public class GrantForm { private boolean showGrantedBy = false; public GrantForm() { - this.grantedSiteIds = new HashSet(); + this.grantedSiteIds = new HashSet<>(); } public GrantForm(SiteApplication siteApplication) { diff --git a/src/main/java/org/appng/application/manager/form/GroupForm.java b/src/main/java/org/appng/application/manager/form/GroupForm.java index b5553a8..d202a92 100644 --- a/src/main/java/org/appng/application/manager/form/GroupForm.java +++ b/src/main/java/org/appng/application/manager/form/GroupForm.java @@ -37,7 +37,7 @@ public class GroupForm { private GroupImpl group; - private List roleIds = new ArrayList(); + private List roleIds = new ArrayList<>(); public GroupForm() { this(new GroupImpl()); diff --git a/src/main/java/org/appng/application/manager/form/ResourceForm.java b/src/main/java/org/appng/application/manager/form/ResourceForm.java index 1206f1c..31f7466 100644 --- a/src/main/java/org/appng/application/manager/form/ResourceForm.java +++ b/src/main/java/org/appng/application/manager/form/ResourceForm.java @@ -15,7 +15,7 @@ */ package org.appng.application.manager.form; -import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import org.appng.api.model.Resource; import org.appng.api.model.ResourceType; @@ -28,8 +28,6 @@ */ public class ResourceForm { - public static final String ENCODING = "UTF-8"; - private Integer id; private String name; private ResourceType type; @@ -37,11 +35,7 @@ public class ResourceForm { public ResourceForm(Resource resource) { if (!ResourceType.JAR.equals(resource.getResourceType())) { - try { - this.content = new String(resource.getBytes(), ENCODING); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } + this.content = new String(resource.getBytes(), StandardCharsets.UTF_8); } this.id = resource.getId(); this.name = resource.getName(); diff --git a/src/main/java/org/appng/application/manager/form/RoleForm.java b/src/main/java/org/appng/application/manager/form/RoleForm.java index 44dfd1a..ef8ec74 100644 --- a/src/main/java/org/appng/application/manager/form/RoleForm.java +++ b/src/main/java/org/appng/application/manager/form/RoleForm.java @@ -36,9 +36,9 @@ public class RoleForm { private RoleImpl role; - private List permissionIds = new ArrayList(); - private List groupIds = new ArrayList(); - private List userIds = new ArrayList(); + private List permissionIds = new ArrayList<>(); + private List groupIds = new ArrayList<>(); + private List userIds = new ArrayList<>(); public RoleForm() { this(new RoleImpl()); diff --git a/src/main/java/org/appng/application/manager/job/DatabaseReportJob.java b/src/main/java/org/appng/application/manager/job/DatabaseReportJob.java index 4817ec6..ea6aa49 100644 --- a/src/main/java/org/appng/application/manager/job/DatabaseReportJob.java +++ b/src/main/java/org/appng/application/manager/job/DatabaseReportJob.java @@ -25,6 +25,7 @@ import org.appng.application.manager.business.PlatformEvents.EventFilter; import org.appng.application.manager.service.PlatformEventService; import org.appng.application.manager.service.RoleService; +import org.appng.core.domain.SubjectImpl; import org.appng.core.service.DatabaseService; import org.appng.mail.Mail; import org.appng.mail.Mail.RecipientType; @@ -50,7 +51,7 @@ public void execute(Site site, Application application) throws Exception { Properties properties = application.getProperties(); List receivers = properties.getList(ManagerSettings.DATABASE_REPORT_RECEIVERS, ";"); - Collection reportReceivers = roleService.getSubjectsForRole(application, + Collection reportReceivers = roleService.getSubjectsForRole(application, ROLE_DATABASE_REPORT_RECEIVER); if (!(receivers.isEmpty() && reportReceivers.isEmpty())) { diff --git a/src/main/java/org/appng/application/manager/job/PlatformEventReportJob.java b/src/main/java/org/appng/application/manager/job/PlatformEventReportJob.java index f0c7137..616e4d4 100644 --- a/src/main/java/org/appng/application/manager/job/PlatformEventReportJob.java +++ b/src/main/java/org/appng/application/manager/job/PlatformEventReportJob.java @@ -27,6 +27,7 @@ import org.appng.application.manager.business.PlatformEvents.EventFilter; import org.appng.application.manager.service.PlatformEventService; import org.appng.application.manager.service.RoleService; +import org.appng.core.domain.SubjectImpl; import org.appng.mail.Mail; import org.appng.mail.Mail.RecipientType; import org.appng.mail.MailTransport; @@ -51,7 +52,7 @@ public void execute(Site site, Application application) throws Exception { Properties properties = application.getProperties(); List receivers = properties.getList(ManagerSettings.EVENT_REPORT_RECEIVERS, ";"); - Collection reportReceivers = roleService.getSubjectsForRole(application, + Collection reportReceivers = roleService.getSubjectsForRole(application, ROLE_EVENT_REPORT_RECEIVER); if (!(receivers.isEmpty() && reportReceivers.isEmpty())) { diff --git a/src/main/java/org/appng/application/manager/service/ManagerService.java b/src/main/java/org/appng/application/manager/service/ManagerService.java index f0c7443..1482db3 100644 --- a/src/main/java/org/appng/application/manager/service/ManagerService.java +++ b/src/main/java/org/appng/application/manager/service/ManagerService.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -346,9 +346,9 @@ private Selection getSubjectSelection(Collection subjects, St private Selection getRoleSelection(Group group, Integer siteId) { SiteImpl site = siteRepository.findOne(siteId); Selection selection = selectionFactory.fromObjects("roles", "roles", new Object[0], (Selector) null); - for (Application application : sortByName(new ArrayList(site.getApplications()))) { + for (Application application : sortByName(new ArrayList<>(site.getApplications()))) { String name = application.getName(); - List roles = new ArrayList(application.getRoles()); + List roles = new ArrayList<>(application.getRoles()); OptionGroup roleGroup = optionGroupFactory.fromNamed(name, name, sortByName(roles), group.getRoles()); selection.getOptionGroups().add(roleGroup); } @@ -357,12 +357,7 @@ private Selection getRoleSelection(Group group, Integer siteId) { } private List sortByName(List items) { - Comparator nameComparator = new Comparator() { - public int compare(Nameable n1, Nameable n2) { - return n1.getName().compareTo(n2.getName()); - } - }; - Collections.sort(items, nameComparator); + Collections.sort(items, (n1, n2) -> n1.getName().compareTo(n2.getName())); return items; } @@ -394,7 +389,7 @@ public DataContainer searchInstallablePackages(Request request, FieldProcessor f try { if (null != repository) { Page applications = applicationRepository.search(fp.getPageable()); - List identifiers = new ArrayList(applications.getContent()); + List identifiers = new ArrayList<>(applications.getContent()); List templates = getInstalledTemplates(); identifiers.addAll(templates); @@ -438,7 +433,7 @@ public DataContainer searchPackageVersions(Request request, FieldProcessor fp, I if ((null != repositoryId) && (StringUtils.isNotBlank(packageName))) { RepositoryImpl repository = repoRepository.findOne(repositoryId); if (null != repository) { - List packages = new ArrayList(applicationRepository.findAll()); + List packages = new ArrayList<>(applicationRepository.findAll()); List templates = getInstalledTemplates(); packages.addAll(templates); @@ -566,9 +561,9 @@ public DataContainer searchResources(Request request, Site site, FieldProcessor comparatorChain.addComparator(new PropertyComparator("name", true, isAsc)); List resources = null; if (null == type) { - resources = new ArrayList(resourceHolder.getResources()); + resources = new ArrayList<>(resourceHolder.getResources()); } else { - resources = new ArrayList(resourceHolder.getResources(type)); + resources = new ArrayList<>(resourceHolder.getResources(type)); } Collections.sort(resources, comparatorChain); data.setPage(resources, fp.getPageable()); @@ -607,7 +602,7 @@ public String updateResource(Request request, Site site, Integer appId, Resource errorMessage = request.getMessage(MessageConstants.RESOURCE_UPDATED_FILEBASED_ERROR, fileName); File resourceFolder = getResourceFolder(request.getEnvironment(), application.getName(), type); File original = new File(resourceFolder, fileName); - FileUtils.write(original, form.getContent(), ResourceForm.ENCODING, false); + FileUtils.write(original, form.getContent(), StandardCharsets.UTF_8, false); okMessage = request.getMessage(MessageConstants.RESOURCE_UPDATED_FILEBASED, fileName, FileUtils.sizeOf(original)); createEvent(Type.UPDATE, @@ -748,14 +743,14 @@ private Selection getPermissionSelection(Integer appId, RoleImpl role) { Set permissionsFromRole = role.getPermissions(); List allPermissions = permissionRepository.findByApplicationId(appId, new Sort(Direction.ASC, "name")); - Map> permissionGroups = new HashMap>(); + Map> permissionGroups = new HashMap<>(); Pattern pattern = Pattern.compile("([^\\.]+)((.)*)"); for (Permission permission : allPermissions) { Matcher matcher = pattern.matcher(permission.getName()); if (matcher.matches()) { String group = matcher.group(1); if (!permissionGroups.containsKey(group)) { - permissionGroups.put(group, new ArrayList()); + permissionGroups.put(group, new ArrayList<>()); } permissionGroups.get(group).add(permission); } @@ -763,7 +758,7 @@ private Selection getPermissionSelection(Integer appId, RoleImpl role) { Selection permissionSelection = selectionFactory.fromObjects("permissions", "permissions", new Object[0], (Selector) null); - List groupNames = new ArrayList(permissionGroups.keySet()); + List groupNames = new ArrayList<>(permissionGroups.keySet()); Collections.sort(groupNames); for (String permissionGroup : groupNames) { List permissions = sortByName(permissionGroups.get(permissionGroup)); @@ -842,7 +837,7 @@ public DataContainer searchApplications(FieldProcessor fp, Integer siteId, Integ data.setPage(applications); } else { Page allApplications = applicationRepository.search(pageable); - List applications = new ArrayList(); + List applications = new ArrayList<>(); Site site = siteRepository.findOne(siteId); for (Application application : allApplications) { SiteApplication siteApplication = ((SiteImpl) site).getSiteApplication(application.getName()); @@ -1003,7 +998,7 @@ public DataContainer searchSites(Environment environment, FieldProcessor fp, Int private void addSelectionsForSite(final SiteImpl site, DataContainer data) { initSiteProperties(site); - List templateNames = new ArrayList(); + List templateNames = new ArrayList<>(); for (Identifier identifier : getInstalledTemplates()) { templateNames.add(identifier.getDisplayName()); } @@ -1059,10 +1054,8 @@ private void updateSiteTemplate(SiteImpl currentSite, String template) { } private void checkSite(Request request, Site site, FieldProcessor fp, Site currentSite) throws BusinessException { - if (fp.hasField("site.name")) { - if (!siteRepository.isUnique(site.getId(), "name", site.getName())) { - fp.addErrorMessage(fp.getField("site.name"), request.getMessage(MessageConstants.SITE_NAME_EXISTS)); - } + if (fp.hasField("site.name") && !siteRepository.isUnique(site.getId(), "name", site.getName())) { + fp.addErrorMessage(fp.getField("site.name"), request.getMessage(MessageConstants.SITE_NAME_EXISTS)); } if (!siteRepository.isUnique(site.getId(), "host", site.getHost())) { fp.addErrorMessage(fp.getField("site.host"), request.getMessage(MessageConstants.SITE_HOST_EXISTS)); @@ -1179,7 +1172,7 @@ private Selection getTimezoneSelection(Locale locale, String timeZone) { timezoneSelection.setType(SelectionType.SELECT); List ids = Arrays.asList(TimeZone.getAvailableIDs()); Collections.sort(ids); - List timeZones = new ArrayList(); + List timeZones = new ArrayList<>(); for (String id : ids) { if (id.matches("(Africa|America|Antarctica|Asia|Atlantic|Australia|Europe|Indian|Pacific).*")) { timeZones.add(TimeZone.getTimeZone(id)); @@ -1219,21 +1212,13 @@ private Selection getTimezoneSelection(Locale locale, String timeZone) { opt.setSelected(id.equals(timeZone)); group.getOptions().add(opt); - Collections.sort(group.getOptions(), new Comparator