diff --git a/.travis.yml b/.travis.yml index e358d2576..9bcf99945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: java jdk: - - oraclejdk7 + - oraclejdk8 diff --git a/README.md b/README.md index 0067392c6..360cee1bd 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Bennu covers the following core features: mvn archetype:generate \ -DarchetypeGroupId=org.fenixedu \ -DarchetypeArtifactId=bennu-webapp-archetype \ - -DarchetypeVersion=3.2.0 \ + -DarchetypeVersion=3.3.0 \ -DarchetypeRepository=https://fenix-ashes.ist.utl.pt/nexus/content/groups/fenix-ashes-maven-repository ``` Make sure to supply the information required by the archetype. @@ -53,7 +53,7 @@ Make sure to supply the information required by the archetype. mvn archetype:generate \ -DarchetypeGroupId=org.fenixedu \ -DarchetypeArtifactId=bennu-project-archetype \ - -DarchetypeVersion=3.2.0 \ + -DarchetypeVersion=3.3.0 \ -DarchetypeRepository=https://fenix-ashes.ist.utl.pt/nexus/content/groups/fenix-ashes-maven-repository ``` diff --git a/bennu-portal/pom.xml b/bennu-portal/pom.xml index 277a2ec9e..65a528808 100644 --- a/bennu-portal/pom.xml +++ b/bennu-portal/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu - 3.2.0 + 3.3.0 bennu-portal diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/BennuPortalConfiguration.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/BennuPortalConfiguration.java new file mode 100644 index 000000000..38804ca05 --- /dev/null +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/BennuPortalConfiguration.java @@ -0,0 +1,22 @@ +package org.fenixedu.bennu.portal; + +import org.fenixedu.commons.configuration.ConfigurationInvocationHandler; +import org.fenixedu.commons.configuration.ConfigurationManager; +import org.fenixedu.commons.configuration.ConfigurationProperty; + +public class BennuPortalConfiguration { + + @ConfigurationManager(description = "Bennu Portal Configuration") + public static interface ConfigurationProperties { + + @ConfigurationProperty(key = "theme.development.mode", defaultValue = "false", + description = "Disables Theme Caching and allows live-reloading of themes") + public Boolean themeDevelopmentMode(); + + } + + public static ConfigurationProperties getConfiguration() { + return ConfigurationInvocationHandler.getConfiguration(ConfigurationProperties.class); + } + +} diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/client/ClientSidePortalBackend.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/client/ClientSidePortalBackend.java index 42b7a88c8..9d56b52f1 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/client/ClientSidePortalBackend.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/client/ClientSidePortalBackend.java @@ -1,13 +1,8 @@ package org.fenixedu.bennu.portal.client; -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletResponse; -import org.fenixedu.bennu.portal.domain.MenuFunctionality; import org.fenixedu.bennu.portal.servlet.PortalBackend; import org.fenixedu.bennu.portal.servlet.SemanticURLHandler; @@ -17,14 +12,15 @@ public class ClientSidePortalBackend implements PortalBackend { @Override public SemanticURLHandler getSemanticURLHandler() { - return new SemanticURLHandler() { - @Override - public void handleRequest(MenuFunctionality functionality, HttpServletRequest request, HttpServletResponse response, - FilterChain chain) throws IOException, ServletException { - String forwardUrl = - "/" + functionality.getParent().getPath() + "/" - + (functionality.getPath().startsWith("#") ? "" : functionality.getPath()); - request.getRequestDispatcher(forwardUrl).forward(request, response); + return (functionality, request, response, chain) -> { + String forwardUrl = + "/" + functionality.getParent().getPath() + "/" + + (functionality.getPath().startsWith("#") ? "" : functionality.getPath()); + RequestDispatcher requestDispatcher = request.getRequestDispatcher(forwardUrl); + if (requestDispatcher != null) { + requestDispatcher.forward(request, response); + } else { + response.sendError(HttpServletResponse.SC_NOT_FOUND, "No forward url could be processed"); } }; } diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/MenuContainer.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/MenuContainer.java index f1353471f..8e8e2da92 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/MenuContainer.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/MenuContainer.java @@ -3,6 +3,8 @@ import java.util.Collections; import java.util.Set; import java.util.TreeSet; +import java.util.stream.Collector; +import java.util.stream.Stream; import org.fenixedu.bennu.core.domain.User; import org.fenixedu.bennu.portal.model.Application; @@ -131,6 +133,14 @@ public Set getOrderedChild() { return Collections.unmodifiableSet(new TreeSet<>(getChildSet())); } + /** + * Returns a {@link Set} containing all the children of this container, that are available to the + * current user. + * + * @deprecated + * Use {@link MenuContainer#getUserMenuStream()} and apply a {@link Collector}. + */ + @Deprecated public Set getUserMenu() { return FluentIterable.from(getChildSet()).filter(new Predicate() { @Override @@ -143,7 +153,11 @@ public boolean apply(MenuItem menu) { /** * Returns an {@link Iterable} containing all the child {@link MenuContainer}s of this container, that are available to the * current user. + * + * @deprecated + * Use {@link MenuContainer#getUserMenuStream()} and apply another filter */ + @Deprecated public Iterable getAvailableChildContainers() { return FluentIterable.from(getChildSet()).filter(MenuContainer.class).filter(new Predicate() { @Override @@ -153,6 +167,17 @@ public boolean apply(MenuContainer container) { }).toSortedList(Ordering.natural()); } + /** + * Returns the User Menu as a lazy {@link Stream}. This method is preferred + * to the alternatives (returning {@link Set}), as it allows further optimizations. + * + * @return + * The User's Menu as a Stream + */ + public Stream getUserMenuStream() { + return getChildSet().stream().filter((item) -> item.isVisible() && item.isItemAvailableForCurrentUser()).sorted(); + } + /** * Deletes this container, as well as all its children. */ diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/PortalConfiguration.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/PortalConfiguration.java index 7e41867f5..c32ed4135 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/PortalConfiguration.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/domain/PortalConfiguration.java @@ -35,28 +35,25 @@ private PortalConfiguration() { setApplicationCopyright(new LocalizedString(I18N.getLocale(), "Organization Copyright")); setHtmlTitle(getApplicationTitle()); setTheme("default"); - InputStream stream = this.getClass().getResourceAsStream("/img/bennu-logo.png"); - if (stream == null) { - logger.error("Default logo not found in: img/bennu-logo.png"); - } else { - try { + try (InputStream stream = this.getClass().getResourceAsStream("/img/logo_bennu.svg")) { + if (stream == null) { + logger.error("Default logo not found in: img/logo_bennu.svg"); + } else { setLogo(ByteStreams.toByteArray(stream)); - setLogoType("image/png"); - } catch (IOException e) { - logger.error("Default logo could not be read from: img/bennu-logo.png"); + setLogoType("image/svg+xml"); } + } catch (IOException e) { + logger.error("Default logo could not be read from: img/logo_bennu.svg"); } - - stream = this.getClass().getResourceAsStream("/img/bennu-favicon.png"); - if (stream == null) { - logger.error("Default favicon not found in: img/bennu-favicon.png"); - } else { - try { + try (InputStream stream = this.getClass().getResourceAsStream("/img/favicon_bennu.png")) { + if (stream == null) { + logger.error("Default favicon not found in: img/favicon_bennu.png"); + } else { setFavicon(ByteStreams.toByteArray(stream)); setFaviconType("image/png"); - } catch (IOException e) { - logger.error("Default logo could not be read from: img/bennu-favicon.png"); } + } catch (IOException e) { + logger.error("Default logo could not be read from: img/favicon_bennu.png"); } new MenuContainer(this); } diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/PortalMenuViewer.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/PortalMenuViewer.java index 6fd5e181b..473541dca 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/PortalMenuViewer.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/PortalMenuViewer.java @@ -11,7 +11,7 @@ public class PortalMenuViewer extends PortalConfigurationAdapter { public JsonElement view(PortalConfiguration configuration, JsonBuilder ctx) { final JsonObject view = super.view(configuration, ctx).getAsJsonObject(); if (configuration.getMenu() != null) { - view.add("menu", ctx.view(configuration.getMenu().getUserMenu())); + view.add("menu", ctx.view(configuration.getMenu().getUserMenuStream())); } return view; } diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/UserMenuViewer.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/UserMenuViewer.java index 171d742fb..fc0f57fc7 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/UserMenuViewer.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/rest/json/UserMenuViewer.java @@ -27,7 +27,7 @@ public JsonElement view(MenuItem obj, JsonBuilder ctx) { if (container.isRoot()) { json.add("title", ctx.view(PortalConfiguration.getInstance().getApplicationTitle())); } - json.add("menu", ctx.view(container.getUserMenu())); + json.add("menu", ctx.view(container.getUserMenuStream())); } return json; } diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/ForwarderPortalBackend.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/ForwarderPortalBackend.java index b6ca35ada..72f6d9b5a 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/ForwarderPortalBackend.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/ForwarderPortalBackend.java @@ -1,10 +1,6 @@ package org.fenixedu.bennu.portal.servlet; -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletResponse; import org.fenixedu.bennu.portal.domain.MenuFunctionality; @@ -18,17 +14,18 @@ */ public class ForwarderPortalBackend implements PortalBackend { - private static final SemanticURLHandler HANDLER = new SemanticURLHandler() { - @Override - public void handleRequest(MenuFunctionality functionality, HttpServletRequest request, HttpServletResponse response, - FilterChain chain) throws IOException, ServletException { - request.getRequestDispatcher(functionality.getItemKey()).forward(request, response); - } - }; - @Override public SemanticURLHandler getSemanticURLHandler() { - return HANDLER; + return (functionality, request, response, chain) -> { + // Remove the functionality, allowing the target to choose the proper one + BennuPortalDispatcher.selectFunctionality(request, null); + RequestDispatcher requestDispatcher = request.getRequestDispatcher(functionality.getItemKey()); + if (requestDispatcher != null) { + requestDispatcher.forward(request, response); + } else { + response.sendError(HttpServletResponse.SC_NOT_FOUND, "No forward url could be processed"); + } + }; } @Override diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/LazyForTokenParser.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/LazyForTokenParser.java new file mode 100644 index 000000000..d7187d141 --- /dev/null +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/LazyForTokenParser.java @@ -0,0 +1,136 @@ +package org.fenixedu.bennu.portal.servlet; + +import java.io.IOException; +import java.io.Writer; +import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Stream; + +import com.mitchellbosecke.pebble.error.ParserException; +import com.mitchellbosecke.pebble.error.PebbleException; +import com.mitchellbosecke.pebble.extension.NodeVisitor; +import com.mitchellbosecke.pebble.lexer.Token; +import com.mitchellbosecke.pebble.lexer.TokenStream; +import com.mitchellbosecke.pebble.node.AbstractRenderableNode; +import com.mitchellbosecke.pebble.node.BodyNode; +import com.mitchellbosecke.pebble.node.RenderableNode; +import com.mitchellbosecke.pebble.node.expression.Expression; +import com.mitchellbosecke.pebble.template.EvaluationContext; +import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import com.mitchellbosecke.pebble.tokenParser.AbstractTokenParser; +import com.mitchellbosecke.pebble.tokenParser.TokenParser; + +/** + * {@link TokenParser} for the 'lazyFor' node. + * + * This node allow lazy iteration over a {@link Stream}, without + * invoking extraneous terminal operations. In practice, this node + * is a wrapper for {@link Stream#forEach(java.util.function.Consumer)}. + * + * Unlike the regular 'for' node, no extra variables are defined, only + * the iteration variable, named in the token's usage. + * + * Accepted arguments are instance of {@link Stream}, {@link Collection} or arrays. + * + * Example: + * + * 
+ *    {% lazyFor item in itemStream %}
+ *      {{item.name}}
+ *    {% endLazyFor %}
+ *
+ * + * @author João Carvalho (joao.pedro.carvalho@tecnico.ulisboa.pt) + * + * @since 3.3 + * + */ +public class LazyForTokenParser extends AbstractTokenParser { + + @Override + public RenderableNode parse(Token token) throws ParserException { + TokenStream stream = this.parser.getStream(); + int lineNumber = token.getLineNumber(); + + // skip the 'lazyFor' token + stream.next(); + + // get the iteration variable + String iterationVariable = this.parser.getExpressionParser().parseNewVariableName(); + + stream.expect(Token.Type.NAME, "in"); + + // get the iterable variable + Expression iterable = this.parser.getExpressionParser().parseExpression(); + + stream.expect(Token.Type.EXECUTE_END); + + BodyNode body = this.parser.subparse((test) -> test.test(Token.Type.NAME, "endLazyFor")); + + // skip the 'endLazyFor' token + stream.next(); + + stream.expect(Token.Type.EXECUTE_END); + + return new ForNode(lineNumber, iterationVariable, iterable, body); + } + + private static final class ForNode extends AbstractRenderableNode { + + private final String variableName; + private final Expression iterableExpression; + private final BodyNode body; + + public ForNode(int lineNumber, String variableName, Expression iterableExpression, BodyNode body) { + super(lineNumber); + this.variableName = variableName; + this.iterableExpression = iterableExpression; + this.body = body; + } + + @Override + public void render(PebbleTemplateImpl self, Writer writer, EvaluationContext context) throws PebbleException, IOException { + Object value = iterableExpression.evaluate(self, context); + if (value == null) { + return; + } + + Stream stream = getStream(value); + + context.pushScope(); + stream.forEach((obj) -> { + try { + context.put(variableName, obj); + body.render(self, writer, context); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + context.popScope(); + } + + private Stream getStream(Object obj) { + if (obj instanceof Stream) { + return (Stream) obj; + } else if (obj instanceof Collection) { + return ((Collection) obj).stream(); + } else if (obj.getClass().isArray()) { + return Arrays.stream((Object[]) obj); + } else { + throw new ClassCastException(obj + " cannot be cast to Stream"); + } + } + + @Override + public void accept(NodeVisitor visitor) { + visitor.visit(this); + } + + } + + @Override + public String getTag() { + return "lazyFor"; + } + +} diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExceptionHandler.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExceptionHandler.java index 9a2c054b0..a7194a8d7 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExceptionHandler.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExceptionHandler.java @@ -20,12 +20,12 @@ import org.fenixedu.bennu.core.security.Authenticate; import org.fenixedu.bennu.core.servlets.ExceptionHandlerFilter.ExceptionHandler; +import org.fenixedu.bennu.portal.BennuPortalConfiguration; import org.fenixedu.bennu.portal.domain.PortalConfiguration; import org.fenixedu.commons.i18n.I18N; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Joiner; import com.mitchellbosecke.pebble.PebbleEngine; import com.mitchellbosecke.pebble.error.LoaderException; import com.mitchellbosecke.pebble.error.PebbleException; @@ -66,6 +66,9 @@ public Reader getReader(String themeName) throws LoaderException { protected PortalExceptionHandler(Loader loader) { this.engine = new PebbleEngine(loader); engine.addExtension(new PortalExtension()); + if (BennuPortalConfiguration.getConfiguration().themeDevelopmentMode()) { + engine.setTemplateCache(null); + } } @Override @@ -118,7 +121,7 @@ private Object getParameters(HttpServletRequest req) { Enumeration names = req.getParameterNames(); while (names.hasMoreElements()) { String name = names.nextElement(); - params.put(name, Joiner.on(" | ").join(req.getParameterValues(name))); + params.put(name, String.join(" | ", req.getParameterValues(name))); } return params.entrySet(); } diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExtension.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExtension.java index 7909a8882..e0297af24 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExtension.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalExtension.java @@ -14,6 +14,7 @@ import com.mitchellbosecke.pebble.extension.Filter; import com.mitchellbosecke.pebble.extension.Function; import com.mitchellbosecke.pebble.extension.Test; +import com.mitchellbosecke.pebble.tokenParser.TokenParser; class PortalExtension extends AbstractExtension { @@ -87,4 +88,9 @@ public boolean apply(Object input, Map args) { } } + @Override + public List getTokenParsers() { + return Collections.singletonList(new LazyForTokenParser()); + } + } diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLayoutInjector.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLayoutInjector.java index 4b6705da7..057c06093 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLayoutInjector.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLayoutInjector.java @@ -21,6 +21,7 @@ import org.fenixedu.bennu.core.security.Authenticate; import org.fenixedu.bennu.core.util.CoreConfiguration; +import org.fenixedu.bennu.portal.BennuPortalConfiguration; import org.fenixedu.bennu.portal.domain.MenuFunctionality; import org.fenixedu.bennu.portal.domain.MenuItem; import org.fenixedu.bennu.portal.domain.PortalConfiguration; @@ -71,6 +72,11 @@ public Reader getReader(String templateName) throws LoaderException { // Disable auto-escaping engine.getExtension(EscaperExtension.class).setAutoEscaping(false); engine.addExtension(new PortalExtension()); + + if (BennuPortalConfiguration.getConfiguration().themeDevelopmentMode()) { + logger.info("Theme Development Mode Enabled!"); + engine.setTemplateCache(null); + } } @Override diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLoginServlet.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLoginServlet.java index b89b03267..b40571193 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLoginServlet.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/PortalLoginServlet.java @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse; import org.fenixedu.bennu.core.util.CoreConfiguration; +import org.fenixedu.bennu.portal.BennuPortalConfiguration; import org.fenixedu.bennu.portal.domain.PortalConfiguration; import org.fenixedu.commons.i18n.I18N; @@ -102,7 +103,7 @@ public void showLoginPage(HttpServletRequest req, HttpServletResponse resp, Stri * @author João Carvalho (joao.pedro.carvalho@tecnico.ulisboa.pt) * */ - private static class LocalLoginStrategy implements PortalLoginStrategy { + public static class LocalLoginStrategy implements PortalLoginStrategy { private volatile PebbleEngine engine; @@ -147,6 +148,9 @@ public Reader getReader(String themeName) throws LoaderException { } }); pebble.addExtension(new PortalExtension()); + if (BennuPortalConfiguration.getConfiguration().themeDevelopmentMode()) { + pebble.setTemplateCache(null); + } this.engine = pebble; return pebble; } diff --git a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/RedirectPortalBackend.java b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/RedirectPortalBackend.java index c8d9b070c..74f42fe55 100644 --- a/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/RedirectPortalBackend.java +++ b/bennu-portal/src/main/java/org/fenixedu/bennu/portal/servlet/RedirectPortalBackend.java @@ -1,12 +1,5 @@ package org.fenixedu.bennu.portal.servlet; -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.fenixedu.bennu.portal.domain.MenuFunctionality; /** @@ -18,17 +11,9 @@ */ public class RedirectPortalBackend implements PortalBackend { - private static final SemanticURLHandler HANDLER = new SemanticURLHandler() { - @Override - public void handleRequest(MenuFunctionality functionality, HttpServletRequest request, HttpServletResponse response, - FilterChain chain) throws IOException, ServletException { - response.sendRedirect(functionality.getItemKey()); - } - }; - @Override public SemanticURLHandler getSemanticURLHandler() { - return HANDLER; + return (functionality, request, response, chain) -> response.sendRedirect(functionality.getItemKey()); } @Override diff --git a/bennu-portal/src/main/resources/img/bennu-favicon.png b/bennu-portal/src/main/resources/img/bennu-favicon.png deleted file mode 100644 index 0d599177f..000000000 Binary files a/bennu-portal/src/main/resources/img/bennu-favicon.png and /dev/null differ diff --git a/bennu-portal/src/main/resources/img/bennu-logo.png b/bennu-portal/src/main/resources/img/bennu-logo.png deleted file mode 100644 index 8aa575508..000000000 Binary files a/bennu-portal/src/main/resources/img/bennu-logo.png and /dev/null differ diff --git a/bennu-portal/src/main/resources/img/favicon_bennu.png b/bennu-portal/src/main/resources/img/favicon_bennu.png new file mode 100644 index 000000000..dba6ebb86 Binary files /dev/null and b/bennu-portal/src/main/resources/img/favicon_bennu.png differ diff --git a/bennu-portal/src/main/resources/img/logo_bennu.svg b/bennu-portal/src/main/resources/img/logo_bennu.svg new file mode 100644 index 000000000..e42373739 --- /dev/null +++ b/bennu-portal/src/main/resources/img/logo_bennu.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bennu + + Framework + + diff --git a/bennu-portal/src/main/webapp/bennu-portal/debugExceptionPage.html b/bennu-portal/src/main/webapp/bennu-portal/debugExceptionPage.html index 905212834..4485836e5 100644 --- a/bennu-portal/src/main/webapp/bennu-portal/debugExceptionPage.html +++ b/bennu-portal/src/main/webapp/bennu-portal/debugExceptionPage.html @@ -1,190 +1,298 @@ - - {{i18n('resources.BennuPortalResources', 'label.error.occurred')}} - - - - - -
-
-
-

{{exception.class.name}}

- {{exception.localizedMessage}} -
-
-

Bennu Framework

- Development Mode -
-
-
-
-

Request Information

-
-
Request URI
-
{{request.requestURI}}
-
-
-
Request URL
-
{{request.requestURL}}
-
-
-
Query String
-
{{request.queryString}}
-
-
-
Method
-
{{request.method}}
-
-
-
User Agent
-
{{userAgent}}
-
-
-
Referer
-
{{referer}}
-
-
-
-

User Information

-
-
Username
-
{{loggedUser.username}}
-
-
-
Locale
-
{{locale}}
-
-
-
-

Request Parameters

- {% for attr in parameters %} -
-
{{attr.key}}
-
{{attr.value}}
-
- {% endfor %} -
-
-

Session Parameters

- {% for attr in session %} -
-
{{attr.key}}
-
{{attr.value}}
-
- {% endfor %} -
-
-

Request Attributes

- {% for attr in attributes %} -
-
{{attr.key}}
-
{{attr.value}}
-
- {% endfor %} -
- -
-

Exception Information

-
- {% for stack in throwableInfos %} -
- - {% if stack.cause %} - Caused by: - {% else %} -
Exception in thread {{threadName}}:
- {% endif %} - - {{stack.subject.class.package.name}}.{{stack.subject.class.simpleName}}: {{stack.localizedMessage | raw}} -
- {% for element in stack.subjectInfo %} -
- at: - {{element.packageName}}.{{element.simpleClassName}}.{{element.element.methodName}} - - {% if element.element.fileName != null %} - ({{element.element.fileName}}:{{element.element.lineNumber}}) - {% else %} - -->) - {% endif %} - {% else %} - {% if element.element.nativeMethod %} - (Native Method) - {% else %} - (Unknown Source) - {% endif %} - {% endif %} -
- {% endfor %} - {% endfor %} -
-
-
-
- - + + {{i18n('resources.BennuPortalResources', 'label.error.occurred')}} + + + + + + +
+
+
+
+
+

{{exception.class.name}}

+ {{exception.localizedMessage}} +
+
+
+
+

Request Information

+ +
+
Request URI
+
{{request.requestURI}}
+
+
+
Request URL
+
{{request.requestURL}}
+
+
+
Query String
+
{{request.queryString}}
+
+
+
Method
+
{{request.method}}
+
+
+
User Agent
+
{{userAgent}}
+
+
+
Referer
+
{{referer}}
+
+
+
+

User Information

+ +
+
Username
+
{{loggedUser.username}}
+
+
+
Locale
+
{{locale}}
+
+
+
+

Request Parameters

+ {% for attr in parameters %} +
+
{{attr.key}}
+
{{attr.value}}
+
+ {% endfor %} +
+
+

Session Parameters

+ {% for attr in session %} +
+
{{attr.key}}
+
{{attr.value}}
+
+ {% endfor %} +
+
+

Request Attributes

+ {% for attr in attributes %} +
+
{{attr.key}}
+
{{attr.value}}
+
+ {% endfor %} +
+ +
+

Exception Information

+ +
+ {% for stack in throwableInfos %} +
+ + {% if stack.cause %} + Caused by: + {% else %} +
Exception in thread {{threadName}}:
+ {% endif %} + + {{stack.subject.class.package.name}}.{{stack.subject.class.simpleName}}: + {{stack.localizedMessage | raw}} +
+ {% for element in stack.subjectInfo %} +
+ at: + {{element.packageName}}.{{element.simpleClassName}}.{{element.element.methodName}} + + {% if element.element.fileName != null %} + + ({{element.element.fileName}}:{{element.element.lineNumber}}) + {% else %} + -->) + {% endif %} + {% else %} + {% if element.element.nativeMethod %} + (Native Method) + {% else %} + (Unknown Source) + {% endif %} + {% endif %} +
+ {% endfor %} + {% endfor %} +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/bennu-portal/src/main/webapp/bennu-portal/login.html b/bennu-portal/src/main/webapp/bennu-portal/login.html index 305eb12c0..e60617781 100644 --- a/bennu-portal/src/main/webapp/bennu-portal/login.html +++ b/bennu-portal/src/main/webapp/bennu-portal/login.html @@ -34,7 +34,7 @@
- +
diff --git a/client/bennu-admin/pom.xml b/client/bennu-admin/pom.xml index b7e8fcce2..50bcbfbab 100644 --- a/client/bennu-admin/pom.xml +++ b/client/bennu-admin/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-client-aggregator - 3.2.0 + 3.3.0 bennu-admin diff --git a/client/bennu-io-ui/pom.xml b/client/bennu-io-ui/pom.xml index 526329645..4a3edbc43 100644 --- a/client/bennu-io-ui/pom.xml +++ b/client/bennu-io-ui/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-client-aggregator - 3.2.0 + 3.3.0 bennu-io-ui diff --git a/client/bennu-io-ui/src/main/webapp/bennu-io-ui/js/app.js b/client/bennu-io-ui/src/main/webapp/bennu-io-ui/js/app.js index 1de8e5a9a..926f63df6 100644 --- a/client/bennu-io-ui/src/main/webapp/bennu-io-ui/js/app.js +++ b/client/bennu-io-ui/src/main/webapp/bennu-io-ui/js/app.js @@ -40,6 +40,11 @@ bennuIO.controller('StorageCtrl', ['$scope', '$http', function ($scope, $http) { $scope.convert = function(storage) { $http.put(contextPath + '/api/bennu-io/storage/convert/' + storage.id); } + $scope.setDefault = function(storage) { + $http.post(contextPath + '/api/bennu-io/storage/default/' + storage.id).success(function (data) { + $scope.storages = data.storages; + }).error(function (data) { $scope.error = data; }); + } }]); bennuIO.controller('ConfigurationCtrl', ['$scope', '$http', function ($scope, $http) { diff --git a/client/bennu-io-ui/src/main/webapp/bennu-io-ui/template/Storage.html b/client/bennu-io-ui/src/main/webapp/bennu-io-ui/template/Storage.html index 5b0073975..64860d29d 100644 --- a/client/bennu-io-ui/src/main/webapp/bennu-io-ui/template/Storage.html +++ b/client/bennu-io-ui/src/main/webapp/bennu-io-ui/template/Storage.html @@ -28,6 +28,8 @@

Storages

+ + diff --git a/client/bennu-scheduler-ui/pom.xml b/client/bennu-scheduler-ui/pom.xml index 4714d2ae8..43a9b1dbf 100644 --- a/client/bennu-scheduler-ui/pom.xml +++ b/client/bennu-scheduler-ui/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-client-aggregator - 3.2.0 + 3.3.0 bennu-scheduler-ui diff --git a/client/bundle/pom.xml b/client/bundle/pom.xml index 0a3b65e52..2e042bc6d 100644 --- a/client/bundle/pom.xml +++ b/client/bundle/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-client-aggregator - 3.2.0 + 3.3.0 bennu-client diff --git a/client/pom.xml b/client/pom.xml index 195af3634..95e567ffe 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -5,12 +5,12 @@ org.fenixedu web-library-project - 1.3.2 + 2.1.0 bennu-client-aggregator - 3.2.0 + 3.3.0 Bennu Framework Client Components Aggregating Pom pom diff --git a/maven/archetypes/bennu-project-archetype/pom.xml b/maven/archetypes/bennu-project-archetype/pom.xml index 9f6b39182..25959da3e 100644 --- a/maven/archetypes/bennu-project-archetype/pom.xml +++ b/maven/archetypes/bennu-project-archetype/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-archetypes - 3.2.0 + 3.3.0 bennu-project-archetype diff --git a/maven/archetypes/bennu-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven/archetypes/bennu-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index b2303960f..08973b30b 100644 --- a/maven/archetypes/bennu-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/maven/archetypes/bennu-project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -5,7 +5,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - 3.2.0 + 3.3.0 diff --git a/maven/archetypes/bennu-project-archetype/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/bennu-project-archetype/src/main/resources/archetype-resources/pom.xml index d211181eb..fbfc7a6c8 100644 --- a/maven/archetypes/bennu-project-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven/archetypes/bennu-project-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,7 +5,7 @@ org.fenixedu fenix-framework-project - 1.3.2 + 2.1.0 @@ -35,4 +35,4 @@ https://fenix-ashes.ist.utl.pt/nexus/content/groups/fenix-ashes-maven-repository - \ No newline at end of file + diff --git a/maven/archetypes/bennu-webapp-archetype/pom.xml b/maven/archetypes/bennu-webapp-archetype/pom.xml index fbe61a3e8..4f0632138 100644 --- a/maven/archetypes/bennu-webapp-archetype/pom.xml +++ b/maven/archetypes/bennu-webapp-archetype/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-archetypes - 3.2.0 + 3.3.0 bennu-webapp-archetype diff --git a/maven/archetypes/bennu-webapp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven/archetypes/bennu-webapp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 9b8987861..688aca65b 100644 --- a/maven/archetypes/bennu-webapp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/maven/archetypes/bennu-webapp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -3,7 +3,7 @@ name="fenix-framework-project" xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - 3.2.0 + 3.3.0 diff --git a/maven/archetypes/bennu-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/archetypes/bennu-webapp-archetype/src/main/resources/archetype-resources/pom.xml index 5538e985d..a1b9f9e54 100644 --- a/maven/archetypes/bennu-webapp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven/archetypes/bennu-webapp-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,7 +5,7 @@ org.fenixedu web-app-project - 1.3.2 + 2.1.0 diff --git a/maven/archetypes/pom.xml b/maven/archetypes/pom.xml index d50f76a92..4e343e43a 100644 --- a/maven/archetypes/pom.xml +++ b/maven/archetypes/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-maven - 3.2.0 + 3.3.0 bennu-archetypes diff --git a/maven/bennu-maven-plugin/pom.xml b/maven/bennu-maven-plugin/pom.xml index 8ce0b6802..9857762b1 100644 --- a/maven/bennu-maven-plugin/pom.xml +++ b/maven/bennu-maven-plugin/pom.xml @@ -4,7 +4,7 @@ org.fenixedu bennu-maven - 3.2.0 + 3.3.0 bennu-maven-plugin diff --git a/maven/pom.xml b/maven/pom.xml index 3f6c62893..5570af858 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -5,12 +5,12 @@ org.fenixedu fenixedu-project - 1.3.2 + 2.1.0 bennu-maven - 3.2.0 + 3.3.0 pom Bennu Maven Tools diff --git a/pom.xml b/pom.xml index be65e71ad..d4dc12a07 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.fenixedu fenix-framework-project - 1.3.2 + 2.1.0 bennu Bennu Framework - 3.2.0 + 3.3.0 pom @@ -42,7 +42,7 @@ scm:git:git@github.com:fenixedu/bennu.git scm:git:git@github.com:fenixedu/bennu.git http://fenixedu.github.io/bennu - v3.2.0 + v3.3.0 diff --git a/server/bennu-core-test/pom.xml b/server/bennu-core-test/pom.xml index aab258e41..a5e2bd9dd 100644 --- a/server/bennu-core-test/pom.xml +++ b/server/bennu-core-test/pom.xml @@ -4,16 +4,16 @@ org.fenixedu fenixedu-project - 1.3.2 + 2.1.0 bennu-core-test - 3.2.0 + 3.3.0 pt.ist.fenixframework.backend.jvstm.JVSTMCodeGenerator - 2.4.0 + 2.5.0 diff --git a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/domain/NashornTest.java b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/domain/NashornTest.java new file mode 100644 index 000000000..c0614fb8a --- /dev/null +++ b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/domain/NashornTest.java @@ -0,0 +1,52 @@ +package org.fenixedu.bennu.core.domain; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.concurrent.Callable; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +@RunWith(JUnit4.class) +public class NashornTest { + + @Test + public void testCallable() throws Exception { + NashornStrategy> strategy = + new NashornStrategy<>(Callable.class, "function call() { return 'Hello world'; }"); + Callable callable = strategy.getStrategy(); + assertNotNull(callable); + assertEquals("Hello world", callable.call()); + } + + @Test + public void testMyInterface() throws Exception { + NashornStrategy strategy = + new NashornStrategy<>(MyCalculator.class, "function calc(one, other) { return one + other; }"); + MyCalculator calc = strategy.getStrategy(); + assertNotNull(calc); + assertEquals(3, calc.calc(1, 2)); + } + + public static interface MyCalculator { + public int calc(int one, int other); + } + + @Test(expected = IllegalArgumentException.class) + public void testInterfaceRequired() { + new NashornStrategy<>(Object.class, ""); + } + + @Test(expected = IllegalArgumentException.class) + public void testInvalidCode() { + new NashornStrategy<>(Callable.class, "funct xpto() {}"); + } + + @Test(expected = IllegalArgumentException.class) + public void testCodeDoesNotImplementInterface() { + new NashornStrategy<>(Callable.class, "function xpto() {}"); + } + +} diff --git a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/domain/groups/UsersCreatedAfterGroup.java b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/domain/groups/UsersCreatedAfterGroup.java index 29810e987..0d3723059 100644 --- a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/domain/groups/UsersCreatedAfterGroup.java +++ b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/domain/groups/UsersCreatedAfterGroup.java @@ -71,7 +71,7 @@ public Set getMembers(DateTime when) { @Override public boolean isMember(User user) { - return user.getCreated().isAfter(date); + return user != null && user.getCreated().isAfter(date); } @Override diff --git a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnonymous.java b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnonymous.java index fa2ece989..efde306a1 100644 --- a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnonymous.java +++ b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnonymous.java @@ -45,13 +45,14 @@ public void membership() { @Test @Atomic(mode = TxMode.WRITE) public void createPersistent() { - assertEquals(AnonymousGroup.get().toPersistentGroup(), BennuGroupIndex.getGroupConstant(PersistentAnonymousGroup.class)); + assertEquals(AnonymousGroup.get().toPersistentGroup(), BennuGroupIndex.groupConstant(PersistentAnonymousGroup.class) + .findAny().orElse(null)); } @Test @Atomic(mode = TxMode.WRITE) public void gcDoesNotDelete() { PersistentGroup.garbageCollect(); - assertTrue(BennuGroupIndex.getGroupConstant(PersistentAnonymousGroup.class) != null); + assertTrue(BennuGroupIndex.groupConstant(PersistentAnonymousGroup.class).findAny().isPresent()); } } diff --git a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnyone.java b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnyone.java index 6c56ee839..f28b6399f 100644 --- a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnyone.java +++ b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestAnyone.java @@ -46,13 +46,14 @@ public void membership() { @Test @Atomic(mode = TxMode.WRITE) public void createPersistent() { - assertEquals(AnyoneGroup.get().toPersistentGroup(), BennuGroupIndex.getGroupConstant(PersistentAnyoneGroup.class)); + assertEquals(AnyoneGroup.get().toPersistentGroup(), BennuGroupIndex.groupConstant(PersistentAnyoneGroup.class).findAny() + .orElse(null)); } @Test @Atomic(mode = TxMode.WRITE) public void gcDoesNotDelete() { PersistentGroup.garbageCollect(); - assertTrue(BennuGroupIndex.getGroupConstant(PersistentAnyoneGroup.class) != null); + assertTrue(BennuGroupIndex.groupConstant(PersistentAnyoneGroup.class).findAny().isPresent()); } } diff --git a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestLogged.java b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestLogged.java index 6b9d15203..7efed5506 100644 --- a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestLogged.java +++ b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestLogged.java @@ -47,13 +47,14 @@ public void membership() { @Test @Atomic(mode = TxMode.WRITE) public void createPersistent() { - assertEquals(LoggedGroup.get().toPersistentGroup(), BennuGroupIndex.getGroupConstant(PersistentLoggedGroup.class)); + assertEquals(LoggedGroup.get().toPersistentGroup(), BennuGroupIndex.groupConstant(PersistentLoggedGroup.class).findAny() + .orElse(null)); } @Test @Atomic(mode = TxMode.WRITE) public void gcDoesNotDelete() { PersistentGroup.garbageCollect(); - assertTrue(BennuGroupIndex.getGroupConstant(PersistentLoggedGroup.class) != null); + assertTrue(BennuGroupIndex.groupConstant(PersistentLoggedGroup.class).findAny().isPresent()); } } diff --git a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestNobody.java b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestNobody.java index c7dff824a..842d30f08 100644 --- a/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestNobody.java +++ b/server/bennu-core-test/src/test/java/org/fenixedu/bennu/core/example/groups/TestNobody.java @@ -46,13 +46,15 @@ public void membership() { @Test @Atomic(mode = TxMode.WRITE) public void createPersistent() { - assertEquals(NobodyGroup.get().toPersistentGroup(), BennuGroupIndex.getGroupConstant(PersistentNobodyGroup.class)); + assertEquals(NobodyGroup.get().toPersistentGroup(), BennuGroupIndex.groupConstant(PersistentNobodyGroup.class).findAny() + .orElse(null)); } @Test @Atomic(mode = TxMode.WRITE) public void gcDoesNotDelete() { PersistentGroup.garbageCollect(); - assertTrue(BennuGroupIndex.getGroupConstant(PersistentNobodyGroup.class) != null); + assertTrue(BennuGroupIndex.groupConstant(PersistentNobodyGroup.class).findAny().isPresent()); } + } diff --git a/server/bennu-core/pom.xml b/server/bennu-core/pom.xml index b5dfa5198..139f808f1 100644 --- a/server/bennu-core/pom.xml +++ b/server/bennu-core/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-server-aggregator - 3.2.0 + 3.3.0 bennu-core diff --git a/server/bennu-core/src/main/dml/bennu-core.dml b/server/bennu-core/src/main/dml/bennu-core.dml index 42af63690..b9f5d085d 100644 --- a/server/bennu-core/src/main/dml/bennu-core.dml +++ b/server/bennu-core/src/main/dml/bennu-core.dml @@ -46,6 +46,20 @@ valueType java.util.Locale as Locale { internalizeWith forLanguageTag(); } +valueType org.fenixedu.bennu.core.groups.GroupStrategy as GroupStrategyValueType { + externalizeWith { + String externalize(); + } + internalizeWith strategyForType(); +} + +valueType org.fenixedu.bennu.core.domain.NashornStrategy as NashornStrategy { + externalizeWith { + Class getType(); + String getCode(); + } +} + public class Bennu { } @@ -87,6 +101,10 @@ class Avatar { protected String mimeType; } +class NameIndex { + protected String keyword; +} + relation SystemUsers { protected Bennu playsRole bennu { multiplicity 1..1; @@ -105,9 +123,18 @@ relation UserLoginPeriods { } } +relation SystemProfiles { + protected Bennu playsRole bennu { + multiplicity 1..1; + } + protected UserProfile playsRole profile { + multiplicity *; + } +} + relation UserProfileUser { protected User playsRole user { - multiplicity 1..1; + multiplicity 0..1; } public UserProfile playsRole profile { multiplicity 0..1; // make required in the next major @@ -116,13 +143,31 @@ relation UserProfileUser { relation UserProfileAvatar { protected UserProfile playsRole profile { - multiplicity 1..1; + multiplicity 0..1; } protected Avatar playsRole localAvatar { multiplicity 0..1; } } +relation BennuNameIndexes { + protected Bennu playsRole bennu { + multiplicity 1..1; + } + protected NameIndex playsRole nameIndex { + multiplicity *; + } +} + +relation UserProfileNameIndexes { + public UserProfile playsRole profile { + multiplicity *; + } + protected NameIndex playsRole nameIndex { + multiplicity *; + } +} + /* Authorization Groups */ public class groups.PersistentGroup { @@ -139,6 +184,10 @@ relation PersistentGroups { public class groups.GroupConstant extends groups.PersistentGroup; +public class groups.PersistentGroupStrategy extends groups.GroupConstant { + protected GroupStrategyValueType strategy; +} + public class groups.PersistentNobodyGroup extends groups.GroupConstant; public class groups.PersistentAnyoneGroup extends groups.GroupConstant; diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/annotation/GroupOperator.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/annotation/GroupOperator.java index 26a8cf2ef..135683b1c 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/annotation/GroupOperator.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/annotation/GroupOperator.java @@ -20,7 +20,7 @@ * Unique name (system wide) for the group. Must be a proper identifier: only alphanumeric characters, no spaces. The * {@code _} character is also allowed. * - * @return + * @return the {@link String} value */ String value(); } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/BootstrapFilter.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/BootstrapFilter.java index c2577828d..40f8f818d 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/BootstrapFilter.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/BootstrapFilter.java @@ -5,10 +5,12 @@ import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; +import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.fenixedu.bennu.core.domain.Bennu; @@ -30,7 +32,12 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha || path.startsWith(req.getContextPath() + "/api/")) { chain.doFilter(request, response); } else { - request.getRequestDispatcher("/bennu-core/bootstrap.jsp").forward(request, response); + RequestDispatcher requestDispatcher = request.getRequestDispatcher("/bennu-core/bootstrap.jsp"); + if (requestDispatcher != null) { + requestDispatcher.forward(request, response); + } else { + ((HttpServletResponse) response).sendError(HttpServletResponse.SC_NOT_FOUND, "No forward url could be processed"); + } } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionInvocationHandler.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionInvocationHandler.java index da2121365..e012dd1e0 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionInvocationHandler.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionInvocationHandler.java @@ -3,6 +3,8 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import org.fenixedu.bennu.core.bootstrap.annotations.Field; + import com.google.common.reflect.AbstractInvocationHandler; import com.google.gson.JsonObject; diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionsBootstrapper.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionsBootstrapper.java index a4478ce9a..c1f399e3a 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionsBootstrapper.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/bootstrap/SectionsBootstrapper.java @@ -8,6 +8,7 @@ import java.util.List; import org.fenixedu.bennu.core.bootstrap.annotations.Bootstrap; +import org.fenixedu.bennu.core.bootstrap.annotations.Field; import pt.ist.fenixframework.Atomic; import pt.ist.fenixframework.Atomic.TxMode; @@ -22,7 +23,7 @@ public class SectionsBootstrapper { * @param json * the json that for each declared {@link Field} maps its key on its value. * - * @throws BootstrapException + * @throws Throwable * If errors ocurred during the bootstrap */ @Atomic(mode = TxMode.WRITE) diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/Avatar.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/Avatar.java index 1af158cec..7ed83661f 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/Avatar.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/Avatar.java @@ -30,13 +30,16 @@ public static Avatar create(byte[] src, String mimeType) { public static Avatar crop(byte[] src, String mimeType, int x1, int y1, int x2, int y2) { try { BufferedImage img = ImageIO.read(new ByteArrayInputStream(src)); - BufferedImage crop = img.getSubimage(x1, y1, x2 - x1, y2 - y1); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ImageWriter writer = ImageIO.getImageWritersByMIMEType(mimeType).next(); - ImageOutputStream outstream = ImageIO.createImageOutputStream(out); - writer.setOutput(outstream); - writer.write(crop); - return new Avatar(out.toByteArray(), mimeType); + if (img != null) { + BufferedImage crop = img.getSubimage(x1, y1, x2 - x1, y2 - y1); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ImageWriter writer = ImageIO.getImageWritersByMIMEType(mimeType).next(); + ImageOutputStream outstream = ImageIO.createImageOutputStream(out); + writer.setOutput(outstream); + writer.write(crop); + return new Avatar(out.toByteArray(), mimeType); + } + throw BennuCoreDomainException.errorProcessingImage(); } catch (IOException e) { throw BennuCoreDomainException.errorProcessingImage(); } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/BennuGroupIndex.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/BennuGroupIndex.java index 79fefa6c0..34e174a35 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/BennuGroupIndex.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/BennuGroupIndex.java @@ -1,23 +1,29 @@ package org.fenixedu.bennu.core.domain; import java.util.Set; +import java.util.stream.Stream; import org.fenixedu.bennu.core.domain.groups.GroupConstant; import org.fenixedu.bennu.core.domain.groups.PersistentDynamicGroup; import org.fenixedu.bennu.core.domain.groups.PersistentUserGroup; import com.google.common.base.Optional; -import com.google.common.collect.FluentIterable; public class BennuGroupIndex { + @Deprecated public static T getGroupConstant(Class type) { - return FluentIterable.from(Bennu.getInstance().getGroupConstantSet()).filter(type).first().orNull(); + return groupConstant(type).findAny().orElse(null); + } + + public static Stream groupConstant(Class type) { + return (Stream) Bennu.getInstance().getGroupConstantSet().stream().filter(g -> type.isInstance(g)); } public static Set getUserGroups(User user) { return user.getUserGroupSet(); } + @Deprecated public static Optional getDynamic(String name) { for (PersistentDynamicGroup dynamic : Bennu.getInstance().getDynamicSet()) { if (dynamic.getName().equals(name)) { @@ -26,4 +32,8 @@ public static Optional getDynamic(String name) { } return Optional.absent(); } + + public static java.util.Optional dynamic(String name) { + return Bennu.getInstance().getDynamicSet().stream().filter(g -> g.getName().equals(name)).findAny(); + } } \ No newline at end of file diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/NameIndex.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/NameIndex.java new file mode 100644 index 000000000..1b32badee --- /dev/null +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/NameIndex.java @@ -0,0 +1,73 @@ +package org.fenixedu.bennu.core.domain; + +import java.util.Collections; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Stream; + +import org.fenixedu.commons.StringNormalizer; + +import com.google.common.collect.Sets; + +class NameIndex extends NameIndex_Base { + private static Map map = new ConcurrentHashMap<>(); + + protected NameIndex() { + super(); + setBennu(Bennu.getInstance()); + } + + protected NameIndex(String keyword) { + this(); + setKeyword(keyword); + } + + static Stream search(String query, int maxHits) { + String[] queryParts = StringNormalizer.normalizeAndRemoveAccents(query.toLowerCase().trim()).split("\\s+"); + return Stream.of(queryParts).map(NameIndex::find).reduce(Sets::intersection).orElse(Collections.emptySet()).stream() + .limit(maxHits); + } + + static void updateNameIndex(UserProfile profile) { + String normalized = StringNormalizer.normalizeAndRemoveAccents(profile.getFullName().toLowerCase().trim()); + profile.getNameIndexSet().clear(); + for (String term : normalized.split("\\s+")) { + profile.getNameIndexSet().add(create(term)); + } + } + + private static NameIndex create(String keyword) { + return map.computeIfAbsent(keyword, query -> manualFind(keyword).orElseGet(() -> new NameIndex(keyword))); + } + + private static Set find(String keyword) { + NameIndex match = map.computeIfAbsent(keyword, query -> manualFind(keyword).orElse(null)); + return match != null ? match.getProfileSet() : Collections.emptySet(); + } + + private static Optional manualFind(String keyword) { + return Bennu.getInstance().getNameIndexSet().stream().filter(name -> name.getKeyword().equals(keyword)).findAny(); + } + + static void cleanupIndex() { + map.clear(); // cache must be invalidated because we are deleting indexes and cache assumes otherwise + for (NameIndex index : Bennu.getInstance().getNameIndexSet()) { + index.delete(); + } + for (UserProfile profile : Bennu.getInstance().getProfileSet()) { + updateNameIndex(profile); + } + } + + private void delete() { + setBennu(null); + getProfileSet().clear(); + deleteDomainObject(); + } + + static void heatupCache() { + Bennu.getInstance().getNameIndexSet().stream().forEach(index -> map.put(index.getKeyword(), index)); + } +} diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/NashornStrategy.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/NashornStrategy.java new file mode 100644 index 000000000..0a4236b88 --- /dev/null +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/NashornStrategy.java @@ -0,0 +1,103 @@ +package org.fenixedu.bennu.core.domain; + +import java.util.Objects; + +import javax.script.Invocable; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; + +/** + * A {@link NashornStrategy} is a special value-type that allows using JavaScript to store interface implementations. + * + * The implementation is provided by Nashorn. For a reference of Nashorn, see Oracle's + * Nashorn Guide. + * + * + * @author João Carvalho (joao.pedro.carvalho@tecnico.ulisboa.pt) + * + */ +public final class NashornStrategy { + + private final String code; + + private final Class type; + + private final T strategy; + + /** + * Create a new {@link NashornStrategy} of the given type, implemented by the given code. + * + * @param type + * The interface type to implement. + * @param code + * The code that implements the interface. + * + * @throws IllegalArgumentException + * If {@code type} is not an interface, or if the given JavaScript code is invalid, or doesn't implement the given + * interface. + * @throws NullPointerException + * If either argument is null. + */ + public NashornStrategy(Class type, String code) { + this.type = Objects.requireNonNull(type, "type"); + this.code = Objects.requireNonNull(code, "code"); + + if (!type.isInterface()) { + throw new IllegalArgumentException("Type " + type.getName() + " is not an interface!"); + } + + this.strategy = getImplementation(code, type); + + if (this.strategy == null) { + throw new IllegalArgumentException("The given code does not implement the interface!"); + } + + } + + @SuppressWarnings("unchecked") + private T getImplementation(String code, Class type) { + try { + ScriptEngineManager engineManager = new ScriptEngineManager(); + ScriptEngine engine = engineManager.getEngineByName("nashorn"); + Invocable invocable = (Invocable) engine; + engine.eval(code); + return (T) invocable.getInterface(type); + } catch (ScriptException e) { + throw new IllegalArgumentException("Could not compile Javascript code!", e); + } + } + + /** + * Returns the code that implements the interface. + * + * @return + * The JavaScript code that implements the interface + */ + public String getCode() { + return code; + } + + /** + * Returns the implemented interface type. + * + * @return + * The implemented interface type + */ + public Class getType() { + return type; + } + + /** + * Returns the instance of the interface type, implemented by the + * given JavaScript code. + * + * @return + * The instance implemented by the given code + */ + public T getStrategy() { + return strategy; + } + +} diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/User.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/User.java index 16eb23272..a28cc12ff 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/User.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/User.java @@ -21,7 +21,9 @@ import java.security.SecureRandom; import java.util.Comparator; import java.util.Locale; +import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.fenixedu.bennu.core.domain.exceptions.BennuCoreDomainException; @@ -43,6 +45,8 @@ public final class User extends User_Base implements Principal { private static SecureRandom prng = null; + private static Map map = new ConcurrentHashMap<>(); + static { try { prng = SecureRandom.getInstance("SHA1PRNG"); @@ -72,14 +76,7 @@ public String shortPresent(User user) { }; - public static final Comparator COMPARATOR_BY_NAME = new Comparator() { - - @Override - public int compare(final User user1, final User user2) { - return user1.getUsername().compareTo(user2.getUsername()); - } - - }; + public static final Comparator COMPARATOR_BY_NAME = Comparator.comparing(User::getUsername); @Deprecated public static class UserToUsername implements Function { @@ -104,6 +101,7 @@ public static interface UsernameGenerator { } /** + * @param username the unique username * @deprecated Use {@link User#User(String, UserProfile)} instead. */ @Deprecated @@ -251,6 +249,7 @@ public boolean matchesPassword(final String password) { } /** + * @return the user's name * @deprecated Use {@link UserProfile#getFullName() } instead */ @Deprecated @@ -259,7 +258,8 @@ public String getPresentationName() { } /** - * @deprecated Use {@link UserProfile#getNickname() } instead + * @return the short version of the user's name + * @deprecated Use {@link UserProfile#getDisplayName() } instead */ @Deprecated public String getShortPresentationName() { @@ -267,12 +267,12 @@ public String getShortPresentationName() { } public static User findByUsername(final String username) { - for (final User user : Bennu.getInstance().getUserSet()) { - if (user.getUsername().equals(username)) { - return user; - } - } - return null; + return map.computeIfAbsent(username, name -> manualFind(name)); + } + + private static User manualFind(String username) { + return Bennu.getInstance().getUserSet().stream().filter(user -> user.getUsername().equals(username)).findAny() + .orElse(null); } public static void setUsernameGenerator(UsernameGenerator generator) { @@ -280,6 +280,7 @@ public static void setUsernameGenerator(UsernameGenerator generator) { } /** + * @param newStrategy {@link UserPresentationStrategy} instance * @deprecated User now has native name field rendering the need for these strategies obsolete */ @Deprecated diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserLoginPeriod.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserLoginPeriod.java index c5c9b4734..f99d500c1 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserLoginPeriod.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserLoginPeriod.java @@ -21,7 +21,9 @@ public class UserLoginPeriod extends UserLoginPeriod_Base { /** * Creates a {@link UserLoginPeriod} for the given {@link User} with the exact dates. * - * All arguments are required. + * @param user {@link User} instance + * @param beginDate {@link LocalDate} when the period started + * @param endDate {@link LocalDate} when the period ended */ public UserLoginPeriod(User user, LocalDate beginDate, LocalDate endDate) { setUser(Objects.requireNonNull(user)); @@ -50,6 +52,9 @@ public LocalDate getEndDate() { /** * Edits this period. Changing the begin date is only allowed if the period is not already started, and changing the end date * is only allowed if such date is in the future. + * + * @param beginDate {@link LocalDate} when the period started + * @param endDate {@link LocalDate} when the period ended */ public void edit(LocalDate beginDate, LocalDate endDate) { if (isClosed()) { @@ -64,6 +69,8 @@ public void edit(LocalDate beginDate, LocalDate endDate) { /** * Returns whether this period is already closed, i.e. its end date is in the past. + * + * @return true if period is closed (ended), false otherwise */ public boolean isClosed() { return getEndDate() != null && getEndDate().isBefore(new LocalDate()); @@ -71,6 +78,8 @@ public boolean isClosed() { /** * Returns whether this period has already started, i.e. its begin date is not in the future. + * + * @return true if period has started, false otherwise */ public boolean isStarted() { return !getBeginDate().isAfter(new LocalDate()); @@ -78,6 +87,10 @@ public boolean isStarted() { /** * Returns whether this period matches exactly the given dates. + * + * @param beginDate start {@link LocalDate} to test against + * @param endDate end {@link LocalDate} to test against + * @return true if matches, false otherwise */ public boolean matches(LocalDate beginDate, LocalDate endDate) { return getBeginDate().equals(beginDate) && Objects.equals(getEndDate(), endDate); @@ -100,6 +113,9 @@ public void delete() { /** * Returns an open (i.e. without end date) period for the given {@link User}, or creates one with today's start date if * necessary. + * + * @param user the {@link User} to add the period to + * @return a {@link UserLoginPeriod} instance */ public static UserLoginPeriod createOpenPeriod(User user) { UserLoginPeriod period = getOpenPeriod(user); @@ -108,6 +124,8 @@ public static UserLoginPeriod createOpenPeriod(User user) { /** * Closes the open (i.e. without end date) period for the given {@link User} if it exists. + * + * @param user the {@link User} to close the period */ public static void closeOpenPeriod(User user) { UserLoginPeriod period = getOpenPeriod(user); diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserProfile.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserProfile.java index b39760a78..b1b3c29d7 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserProfile.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/UserProfile.java @@ -1,17 +1,41 @@ package org.fenixedu.bennu.core.domain; +import java.util.Arrays; +import java.util.List; import java.util.Locale; +import java.util.stream.Stream; import org.fenixedu.bennu.core.domain.exceptions.BennuCoreDomainException; +import org.fenixedu.commons.StringNormalizer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.google.common.base.CharMatcher; import com.google.common.base.Objects; import com.google.common.base.Strings; +/** + * User account profile information. This information includes names, email, avatar and preferred locale. + * + * @author Pedro Santos (pedro.miguel.santos@tecnico.ulisboa.pt) + */ public class UserProfile extends UserProfile_Base { + private static final Logger logger = LoggerFactory.getLogger(UserProfile.class); + protected UserProfile() { super(); + setBennu(Bennu.getInstance()); } + /** + * New unlinked profile. + * + * @param givenNames person's given names + * @param familyNames person's family names + * @param displayName person's display name + * @param email person's email address for communication + * @param preferredLocale locale used to localize all content when the user is logged. + */ public UserProfile(String givenNames, String familyNames, String displayName, String email, Locale preferredLocale) { this(); changeName(givenNames, familyNames, displayName); @@ -25,23 +49,50 @@ public User getUser() { return super.getUser(); } + /** + * A possibly shorter version of the full name. Used on most places to identify the person. + * + * @return a String with the display name or null. + * @see #getFullName() + */ @Override public String getDisplayName() { return super.getDisplayName() != null ? super.getDisplayName() : getFullName(); } + /** + * The given names of the person. First part of the full name. + * + * @return a String with the given names or null. + * @see #getFamilyNames() + * @see #getFullName() + */ @Override public String getGivenNames() { // FIXME: remove when framework support read-only slots return super.getGivenNames(); } + /** + * The family names (surnames) of the person. Last part of the full name. + * + * @return a String with the family names or null. + * @see #getFamilyNames() + * @see #getFullName() + */ @Override public String getFamilyNames() { // FIXME: remove when framework support read-only slots return super.getFamilyNames(); } + /** + * The full name of the person, composed of given and family names separated by a space. + * + * @return a String with the full name or null. + * @see #getGivenNames() + * @see #getFamilyNames() + */ public String getFullName() { StringBuilder builder = new StringBuilder(); if (getGivenNames() != null) { @@ -54,11 +105,62 @@ public String getFullName() { return builder.toString().trim(); } + /** + * Change the name by changing it's parts validating consistency between them. Namely ensures the display name is a subset of + * the given and family names together. + * + * @param given person's given names + * @param family person's family names + * @param display person's display name + */ public void changeName(String given, String family, String display) { setGivenNames(cleanupName(given)); setFamilyNames(cleanupName(family)); setDisplayName(cleanupName(display)); validateNames(getDisplayName(), getFullName()); + NameIndex.updateNameIndex(this); + } + + /** + * User's primary email. + * + * @return a String with the user's email or null + */ + @Override + public String getEmail() { + return super.getEmail(); + } + + /** + * Change user's primary email. + * + * @param email a String with the user's primary email + */ + @Override + public void setEmail(String email) { + super.setEmail(email); + } + + /** + * The users's preferred locale for internationalized content. If this value is null the system localizes content based on + * global defaults. + * + * @return a Locale instance or null + */ + @Override + public Locale getPreferredLocale() { + return super.getPreferredLocale(); + } + + /** + * Change the user's preferred locale. + * + * @param preferredLocale a Locale instance + * @see #getPreferredLocale() + */ + @Override + public void setPreferredLocale(Locale preferredLocale) { + super.setPreferredLocale(preferredLocale); } /** @@ -79,7 +181,7 @@ public String getAvatarUrl() { /** * Sets the user's base avatar URL. * - * @see UserProfile#getAvatarUrl() + * @see #getAvatarUrl() */ @Override public void setAvatarUrl(String avatarUrl) { @@ -90,8 +192,10 @@ public void setAvatarUrl(String avatarUrl) { } /** - * @param localAvatar - * @see org.fenixedu.bennu.core.domain.UserProfile_Base#setLocalAvatar(org.fenixedu.bennu.core.domain.Avatar) + * Sets this user's avatar to a locally stored avatar and updates the avatar url accordingly. + * + * @param localAvatar a Avatar instance with the image + * @see #getAvatarUrl() */ @Override public void setLocalAvatar(Avatar localAvatar) { @@ -105,6 +209,23 @@ public void setLocalAvatar(Avatar localAvatar) { super.setAvatarUrl(null); } + /** + * Search all profiles matching the given. + * + * @param name the query string + * @param maxHits limit on the result size + * @return all {@link UserProfile}s where the name contains all the terms of the query string + */ + public static Stream searchByName(String name, int maxHits) { + if (logger.isTraceEnabled()) { + long time = System.currentTimeMillis(); + Stream matches = NameIndex.search(name, maxHits); + logger.trace("Profile search for '{}' took {}ms", name, System.currentTimeMillis() - time); + return matches; + } + return NameIndex.search(name, maxHits); + } + private static void validateNames(String displayname, String fullname) { if (displayname == null) { return; @@ -112,18 +233,12 @@ private static void validateNames(String displayname, String fullname) { if (fullname == null) { throw BennuCoreDomainException.displayNameNotContainedInFullName(displayname, fullname); } - String[] fullnameparts = fullname.split(" "); - String[] displayparts = displayname.split(" "); - for (int n = 0, f = 0; n < displayparts.length; n++, f++) { - if (fullnameparts.length == f) { - throw BennuCoreDomainException.displayNameNotContainedInFullName(displayname, fullname); - } - while (!displayparts[n].equalsIgnoreCase(fullnameparts[f])) { - f++; - if (fullnameparts.length == f) { - throw BennuCoreDomainException.displayNameNotContainedInFullName(displayname, fullname); - } - } + List fullnameParts = + Arrays.asList(StringNormalizer.normalizeAndRemoveAccents(fullname).toLowerCase().trim().split("\\s+|-")); + List displaynameParts = + Arrays.asList(StringNormalizer.normalizeAndRemoveAccents(displayname).toLowerCase().trim().split("\\s+|-")); + if (!fullnameParts.containsAll(displaynameParts)) { + throw BennuCoreDomainException.displayNameNotContainedInFullName(displayname, fullname); } } @@ -131,6 +246,6 @@ private static String cleanupName(String name) { if (name == null) { return null; } - return Strings.emptyToNull(name.trim().replaceAll("\\s+", " ")); + return Strings.emptyToNull(CharMatcher.WHITESPACE.trimAndCollapseFrom(name, ' ')); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/exceptions/InvalidJsonException.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/exceptions/InvalidJsonException.java index f3e3b87ac..7ec44008b 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/exceptions/InvalidJsonException.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/exceptions/InvalidJsonException.java @@ -15,7 +15,7 @@ public class InvalidJsonException extends WebApplicationException { public InvalidJsonException(JsonElement jsonElement, String... missingAttributes) { super(Response .status(Status.BAD_REQUEST) - .entity(String.format("Invalid Json Input:%s\nMissing Attributes:%s", jsonElement.toString(), + .entity(String.format("Invalid Json Input:%s%nMissing Attributes:%s", jsonElement.toString(), Arrays.toString(missingAttributes))).build()); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/GroupConstant.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/GroupConstant.java index 50716198a..a0d4cfee0 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/GroupConstant.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/GroupConstant.java @@ -1,5 +1,10 @@ package org.fenixedu.bennu.core.domain.groups; +import java.util.Optional; +import java.util.stream.Stream; + +import org.fenixedu.bennu.core.domain.BennuGroupIndex; + public abstract class GroupConstant extends GroupConstant_Base { protected GroupConstant() { super(); @@ -11,4 +16,12 @@ protected boolean isGarbageCollectable() { // Singleton group, no point in delete return false; } + + protected static Stream filter(Class type) { + return BennuGroupIndex.groupConstant(type); + } + + protected static Optional find(Class type) { + return filter(type).findAny(); + } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnonymousGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnonymousGroup.java index b7e4d1f4b..fedf33d4b 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnonymousGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnonymousGroup.java @@ -1,12 +1,8 @@ package org.fenixedu.bennu.core.domain.groups; -import org.fenixedu.bennu.core.domain.BennuGroupIndex; import org.fenixedu.bennu.core.groups.AnonymousGroup; import org.fenixedu.bennu.core.groups.Group; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - public class PersistentAnonymousGroup extends PersistentAnonymousGroup_Base { protected PersistentAnonymousGroup() { super(); @@ -23,13 +19,6 @@ public Group toGroup() { * @return singleton {@link PersistentAnonymousGroup} instance */ public static PersistentAnonymousGroup getInstance() { - PersistentAnonymousGroup instance = BennuGroupIndex.getGroupConstant(PersistentAnonymousGroup.class); - return instance != null ? instance : create(); - } - - @Atomic(mode = TxMode.WRITE) - private static PersistentAnonymousGroup create() { - PersistentAnonymousGroup instance = BennuGroupIndex.getGroupConstant(PersistentAnonymousGroup.class); - return instance != null ? instance : new PersistentAnonymousGroup(); + return singleton(() -> find(PersistentAnonymousGroup.class), () -> new PersistentAnonymousGroup()); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnyoneGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnyoneGroup.java index 26bd18b21..57f0e0988 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnyoneGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentAnyoneGroup.java @@ -1,12 +1,8 @@ package org.fenixedu.bennu.core.domain.groups; -import org.fenixedu.bennu.core.domain.BennuGroupIndex; import org.fenixedu.bennu.core.groups.AnyoneGroup; import org.fenixedu.bennu.core.groups.Group; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - public class PersistentAnyoneGroup extends PersistentAnyoneGroup_Base { protected PersistentAnyoneGroup() { super(); @@ -23,13 +19,6 @@ public Group toGroup() { * @return singleton {@link PersistentAnyoneGroup} instance */ public static PersistentAnyoneGroup getInstance() { - PersistentAnyoneGroup instance = BennuGroupIndex.getGroupConstant(PersistentAnyoneGroup.class); - return instance != null ? instance : create(); - } - - @Atomic(mode = TxMode.WRITE) - private static PersistentAnyoneGroup create() { - PersistentAnyoneGroup instance = BennuGroupIndex.getGroupConstant(PersistentAnyoneGroup.class); - return instance != null ? instance : new PersistentAnyoneGroup(); + return singleton(() -> find(PersistentAnyoneGroup.class), () -> new PersistentAnyoneGroup()); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDifferenceGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDifferenceGroup.java index e34c78faa..0d785329c 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDifferenceGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDifferenceGroup.java @@ -18,17 +18,13 @@ import java.util.Arrays; import java.util.HashSet; +import java.util.Optional; import java.util.Set; +import java.util.stream.Stream; import org.fenixedu.bennu.core.groups.DifferenceGroup; import org.fenixedu.bennu.core.groups.Group; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; - /** * Difference composition group. Can be read as members of first group except members of the remaining ones. * @@ -43,8 +39,7 @@ protected PersistentDifferenceGroup(PersistentGroup first, Set @Override public Group toGroup() { - Group[] children = FluentIterable.from(getRestSet()).transform(persistentGroupToGroup).toArray(Group.class); - return DifferenceGroup.between(getFirst().toGroup(), children); + return DifferenceGroup.between(getFirst().toGroup(), getRestSet().stream().map(g -> g.toGroup())); } @Override @@ -55,10 +50,15 @@ protected void gc() { } /** - * @see #getInstance(Set) + * Get or create instance of a {@link PersistentDifferenceGroup} between the first group and the rest. + * + * @param first the group from which to subtract + * @param rest the groups to subtract. + * @return singleton {@link PersistentDifferenceGroup} instance + * @see #getInstance(PersistentGroup, Set) */ - public static PersistentDifferenceGroup getInstance(final PersistentGroup first, final PersistentGroup... children) { - return getInstance(first, new HashSet<>(Arrays.asList(children))); + public static PersistentDifferenceGroup getInstance(final PersistentGroup first, final PersistentGroup... rest) { + return getInstance(first, new HashSet<>(Arrays.asList(rest))); } /** @@ -69,39 +69,18 @@ public static PersistentDifferenceGroup getInstance(final PersistentGroup first, * @return singleton {@link PersistentDifferenceGroup} instance */ public static PersistentDifferenceGroup getInstance(final PersistentGroup first, final Set rest) { - PersistentDifferenceGroup instance = select(first, rest); - return instance != null ? instance : create(first, rest); - } - - @Atomic(mode = TxMode.WRITE) - private static PersistentDifferenceGroup create(PersistentGroup first, Set rest) { - PersistentDifferenceGroup instance = select(first, rest); - return instance != null ? instance : new PersistentDifferenceGroup(first, rest); + return singleton(() -> select(first, rest), () -> new PersistentDifferenceGroup(first, rest)); } - public static PersistentDifferenceGroup select(final PersistentGroup first, final Set rest) { + private static Optional select(final PersistentGroup first, final Set rest) { if (first.getDifferenceAtFirstSet().isEmpty()) { - return null; + return Optional.empty(); } - Predicate sizePredicate = new Predicate() { - @Override - public boolean apply(PersistentDifferenceGroup group) { - return group.getRestSet().size() == rest.size(); - } - }; - FluentIterable intersection = - FluentIterable.from(first.getDifferenceAtFirstSet()).filter(sizePredicate); + Stream intersection = + first.getDifferenceAtFirstSet().stream().filter(g -> g.getRestSet().size() == rest.size()); for (final PersistentGroup child : rest) { - intersection = intersection.filter(new Predicate() { - @Override - public boolean apply(PersistentDifferenceGroup group) { - return group.getDifferenceAtRestSet().contains(child); - } - }); - if (intersection.isEmpty()) { - return null; - } + intersection = intersection.filter(g -> g.getDifferenceAtRestSet().contains(child)); } - return intersection.first().orNull(); + return intersection.findAny(); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDynamicGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDynamicGroup.java index 76740d21a..87a3b95d1 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDynamicGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentDynamicGroup.java @@ -29,7 +29,7 @@ /** *

- * Mutable named group. In the group language is referred by {@literal#}name. Keeps history of every change made. + * Mutable named group. In the group language is referred by {@literal #}name. Keeps history of every change made. *

* *

@@ -76,7 +76,7 @@ public PersistentGroup getGroup(DateTime when) { if (getPrevious() != null) { return getPrevious().getGroup(when); } - return null; + return PersistentNobodyGroup.getInstance(); } private void pushHistory() { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentGroup.java index fda1c7529..6d5807be6 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentGroup.java @@ -16,34 +16,32 @@ */ package org.fenixedu.bennu.core.domain.groups; +import java.util.Optional; import java.util.Set; +import java.util.function.Supplier; import org.fenixedu.bennu.core.annotation.GroupOperator; import org.fenixedu.bennu.core.domain.Bennu; import org.fenixedu.bennu.core.domain.User; import org.fenixedu.bennu.core.domain.exceptions.AuthorizationException; -import org.fenixedu.bennu.core.groups.AnonymousGroup; -import org.fenixedu.bennu.core.groups.AnyoneGroup; import org.fenixedu.bennu.core.groups.Group; -import org.fenixedu.bennu.core.groups.LoggedGroup; -import org.fenixedu.bennu.core.groups.NobodyGroup; import org.fenixedu.bennu.core.security.Authenticate; import org.joda.time.DateTime; +import pt.ist.fenixframework.Atomic; +import pt.ist.fenixframework.Atomic.TxMode; + import com.google.common.base.Function; /** *

- * {@code Group}s represent access groups. These groups are domain entities but immutable and unique in semantics (with the sole - * exception of {@link PersistentDynamicGroup}). That means that there is only one instance of a groups representing authenticated users, or - * ('john' & 'mary'). + * {@code PersistentGroup}s represent access groups. These groups are domain entities but immutable and unique in semantics (with + * the sole exception of {@link PersistentDynamicGroup}). That means that there is only one instance of a group representing + * authenticated users, or only one instance of a group for a specific set of users *

* *

- * Groups can be translated to and from a DSL of groups, using methods {@link #expression()} and {@link #parse(String)}, - * respectively. The language supports compositions (|), intersections (&), negations (!) and differences (-) over basic - * constructs like: anonymous ({@link AnonymousGroup}), logged ({@link LoggedGroup}), anyone ({@link AnyoneGroup}), nobody ( - * {@link NobodyGroup}), P(istxxx, istxxxx,...) ({@link PersistentUserGroup}) or #name ({@link PersistentDynamicGroup}). + * This is the persistent counter part of {@link Group}. *

* *

@@ -56,6 +54,7 @@ * @see GroupOperator */ public abstract class PersistentGroup extends PersistentGroup_Base { + @Deprecated public static final Function persistentGroupToGroup = new Function() { @Override public Group apply(PersistentGroup group) { @@ -174,4 +173,13 @@ public static void garbageCollect() { } } } + + protected static T singleton(Supplier> selector, Supplier creator) { + return selector.get().orElseGet(() -> create(selector, creator)); + } + + @Atomic(mode = TxMode.WRITE) + private static T create(Supplier> selector, Supplier creator) { + return selector.get().orElseGet(creator); + } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentGroupStrategy.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentGroupStrategy.java new file mode 100644 index 000000000..99c8924d0 --- /dev/null +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentGroupStrategy.java @@ -0,0 +1,21 @@ +package org.fenixedu.bennu.core.domain.groups; + +import org.fenixedu.bennu.core.groups.Group; +import org.fenixedu.bennu.core.groups.GroupStrategy; + +public class PersistentGroupStrategy extends PersistentGroupStrategy_Base { + private PersistentGroupStrategy(GroupStrategy strategy) { + super(); + setStrategy(strategy); + } + + @Override + public Group toGroup() { + return getStrategy(); + } + + public static PersistentGroupStrategy getInstance(final GroupStrategy strategy) { + return singleton(() -> filter(PersistentGroupStrategy.class).filter(group -> group.getStrategy().equals(strategy)) + .findAny(), () -> new PersistentGroupStrategy(strategy)); + } +} diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentIntersectionGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentIntersectionGroup.java index c798d6751..e2f85249c 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentIntersectionGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentIntersectionGroup.java @@ -18,17 +18,13 @@ import java.util.Arrays; import java.util.HashSet; +import java.util.Optional; import java.util.Set; +import java.util.stream.Stream; import org.fenixedu.bennu.core.groups.Group; import org.fenixedu.bennu.core.groups.IntersectionGroup; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; - /** * Intersection composition group. * @@ -42,8 +38,7 @@ protected PersistentIntersectionGroup(Set children) { @Override public Group toGroup() { - Group[] children = FluentIterable.from(getChildrenSet()).transform(persistentGroupToGroup).toArray(Group.class); - return IntersectionGroup.of(children); + return IntersectionGroup.of(getChildrenSet().stream().map(g -> g.toGroup())); } @Override @@ -53,6 +48,10 @@ protected void gc() { } /** + * Get or create instance of a {@link PersistentIntersectionGroup} between the requested children. + * + * @param children the groups to make a {@link PersistentIntersectionGroup} on. + * @return singleton {@link PersistentIntersectionGroup} instance * @see #getInstance(Set) */ public static PersistentIntersectionGroup getInstance(final PersistentGroup... children) { @@ -62,44 +61,22 @@ public static PersistentIntersectionGroup getInstance(final PersistentGroup... c /** * Get or create instance of a {@link PersistentIntersectionGroup} between the requested children. * - * @param children - * the groups to make a {@link PersistentIntersectionGroup} on. + * @param children the groups to make a {@link PersistentIntersectionGroup} on. * @return singleton {@link PersistentIntersectionGroup} instance */ public static PersistentIntersectionGroup getInstance(final Set children) { - PersistentIntersectionGroup instance = select(children); - return instance != null ? instance : create(children); + return singleton(() -> select(children), () -> new PersistentIntersectionGroup(children)); } - @Atomic(mode = TxMode.WRITE) - private static PersistentIntersectionGroup create(final Set children) { - PersistentIntersectionGroup instance = select(children); - return instance != null ? instance : new PersistentIntersectionGroup(children); - } - - private static PersistentIntersectionGroup select(final Set children) { - FluentIterable intersection = null; - Predicate sizePredicate = new Predicate() { - @Override - public boolean apply(PersistentIntersectionGroup group) { - return group.getChildrenSet().size() == children.size(); - } - }; + private static Optional select(final Set children) { + Stream intersection = null; for (final PersistentGroup child : children) { if (intersection == null) { - intersection = FluentIterable.from(child.getIntersectionsSet()).filter(sizePredicate); + intersection = child.getIntersectionsSet().stream().filter(g -> g.getChildrenSet().size() == children.size()); } else { - intersection = intersection.filter(new Predicate() { - @Override - public boolean apply(PersistentIntersectionGroup group) { - return group.getChildrenSet().contains(child); - } - }); - } - if (intersection.isEmpty()) { - return null; + intersection = intersection.filter(g -> g.getChildrenSet().contains(child)); } } - return intersection.first().orNull(); + return intersection != null ? intersection.findAny() : Optional.empty(); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentLoggedGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentLoggedGroup.java index e30164f92..6f38b8076 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentLoggedGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentLoggedGroup.java @@ -1,12 +1,8 @@ package org.fenixedu.bennu.core.domain.groups; -import org.fenixedu.bennu.core.domain.BennuGroupIndex; import org.fenixedu.bennu.core.groups.Group; import org.fenixedu.bennu.core.groups.LoggedGroup; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - public class PersistentLoggedGroup extends PersistentLoggedGroup_Base { protected PersistentLoggedGroup() { super(); @@ -23,13 +19,6 @@ public Group toGroup() { * @return singleton {@link PersistentLoggedGroup} instance */ public static PersistentLoggedGroup getInstance() { - PersistentLoggedGroup instance = BennuGroupIndex.getGroupConstant(PersistentLoggedGroup.class); - return instance != null ? instance : create(); - } - - @Atomic(mode = TxMode.WRITE) - private static PersistentLoggedGroup create() { - PersistentLoggedGroup instance = BennuGroupIndex.getGroupConstant(PersistentLoggedGroup.class); - return instance != null ? instance : new PersistentLoggedGroup(); + return singleton(() -> find(PersistentLoggedGroup.class), () -> new PersistentLoggedGroup()); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNegationGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNegationGroup.java index 7b2b46d70..298d4da60 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNegationGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNegationGroup.java @@ -16,12 +16,11 @@ */ package org.fenixedu.bennu.core.domain.groups; +import java.util.Optional; + import org.fenixedu.bennu.core.groups.Group; import org.fenixedu.bennu.core.groups.NegationGroup; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - /** * Inverse group of another group. * @@ -51,13 +50,6 @@ protected void gc() { * @return singleton {@link PersistentNegationGroup} instance */ public static PersistentNegationGroup getInstance(final PersistentGroup group) { - PersistentNegationGroup instance = group.getNegation(); - return instance != null ? instance : create(group); - } - - @Atomic(mode = TxMode.WRITE) - private static PersistentNegationGroup create(PersistentGroup group) { - PersistentNegationGroup instance = group.getNegation(); - return instance != null ? instance : new PersistentNegationGroup(group); + return singleton(() -> Optional.ofNullable(group.getNegation()), () -> new PersistentNegationGroup(group)); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNobodyGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNobodyGroup.java index 284dd8c2d..367ac0f32 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNobodyGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentNobodyGroup.java @@ -1,12 +1,8 @@ package org.fenixedu.bennu.core.domain.groups; -import org.fenixedu.bennu.core.domain.BennuGroupIndex; import org.fenixedu.bennu.core.groups.Group; import org.fenixedu.bennu.core.groups.NobodyGroup; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - public class PersistentNobodyGroup extends PersistentNobodyGroup_Base { protected PersistentNobodyGroup() { super(); @@ -23,13 +19,6 @@ public Group toGroup() { * @return singleton {@link PersistentNobodyGroup} instance */ public static PersistentNobodyGroup getInstance() { - PersistentNobodyGroup instance = BennuGroupIndex.getGroupConstant(PersistentNobodyGroup.class); - return instance != null ? instance : create(); - } - - @Atomic(mode = TxMode.WRITE) - private static PersistentNobodyGroup create() { - PersistentNobodyGroup instance = BennuGroupIndex.getGroupConstant(PersistentNobodyGroup.class); - return instance != null ? instance : new PersistentNobodyGroup(); + return singleton(() -> find(PersistentNobodyGroup.class), () -> new PersistentNobodyGroup()); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUnionGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUnionGroup.java index 0e23cf4ce..1b3cd6534 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUnionGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUnionGroup.java @@ -18,17 +18,13 @@ import java.util.Arrays; import java.util.HashSet; +import java.util.Optional; import java.util.Set; +import java.util.stream.Stream; import org.fenixedu.bennu.core.groups.Group; import org.fenixedu.bennu.core.groups.UnionGroup; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; - /** * Union composition group. * @@ -42,8 +38,7 @@ protected PersistentUnionGroup(Set children) { @Override public Group toGroup() { - Group[] children = FluentIterable.from(getChildrenSet()).transform(persistentGroupToGroup).toArray(Group.class); - return UnionGroup.of(children); + return UnionGroup.of(getChildrenSet().stream().map(g -> g.toGroup())); } @Override @@ -53,6 +48,10 @@ protected void gc() { } /** + * Get or create instance of a {@link PersistentUnionGroup} between the requested children. + * + * @param children the groups to make a {@link PersistentUnionGroup} on. + * @return {@link PersistentUnionGroup} instance * @see #getInstance(Set) */ public static PersistentUnionGroup getInstance(final PersistentGroup... children) { @@ -62,44 +61,22 @@ public static PersistentUnionGroup getInstance(final PersistentGroup... children /** * Get or create instance of a {@link PersistentUnionGroup} between the requested children. * - * @param children - * the groups to make a {@link PersistentUnionGroup} on. + * @param children the groups to make a {@link PersistentUnionGroup} on. * @return {@link PersistentUnionGroup} instance */ public static PersistentUnionGroup getInstance(final Set children) { - PersistentUnionGroup instance = select(children); - return instance != null ? instance : create(children); + return singleton(() -> select(children), () -> new PersistentUnionGroup(children)); } - @Atomic(mode = TxMode.WRITE) - private static PersistentUnionGroup create(final Set children) { - PersistentUnionGroup instance = select(children); - return instance != null ? instance : new PersistentUnionGroup(children); - } - - private static PersistentUnionGroup select(final Set children) { - FluentIterable intersection = null; - Predicate sizePredicate = new Predicate() { - @Override - public boolean apply(PersistentUnionGroup group) { - return group.getChildrenSet().size() == children.size(); - } - }; + private static Optional select(final Set children) { + Stream intersection = null; for (final PersistentGroup child : children) { if (intersection == null) { - intersection = FluentIterable.from(child.getUnionsSet()).filter(sizePredicate); + intersection = child.getUnionsSet().stream().filter(g -> g.getChildrenSet().size() == children.size()); } else { - intersection = intersection.filter(new Predicate() { - @Override - public boolean apply(PersistentUnionGroup group) { - return group.getChildrenSet().contains(child); - } - }); - } - if (intersection.isEmpty()) { - return null; + intersection = intersection.filter(g -> g.getChildrenSet().contains(child)); } } - return intersection.first().orNull(); + return intersection != null ? intersection.findAny() : Optional.empty(); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUserGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUserGroup.java index 229f9b6bb..d9070eeb3 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUserGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/domain/groups/PersistentUserGroup.java @@ -18,20 +18,15 @@ import java.util.Arrays; import java.util.HashSet; +import java.util.Optional; import java.util.Set; +import java.util.stream.Stream; import org.fenixedu.bennu.core.domain.BennuGroupIndex; import org.fenixedu.bennu.core.domain.User; -import org.fenixedu.bennu.core.domain.exceptions.BennuCoreDomainException; import org.fenixedu.bennu.core.groups.Group; import org.fenixedu.bennu.core.groups.UserGroup; -import pt.ist.fenixframework.Atomic; -import pt.ist.fenixframework.Atomic.TxMode; - -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; - /** * Groups of specific users. * @@ -55,56 +50,35 @@ protected void gc() { } /** + * Get or create instance of a {@link PersistentUserGroup} for the requested users + * + * @param users the users to be part of the group + * @return {@link PersistentUserGroup} instance * @see #getInstance(Set) */ - public static PersistentUserGroup getInstance(User... members) { - return getInstance(new HashSet<>(Arrays.asList(members))); + public static PersistentUserGroup getInstance(User... users) { + return getInstance(new HashSet<>(Arrays.asList(users))); } /** * Get or create instance of a {@link PersistentUserGroup} for the requested users * - * @param users - * the users to be part of the group + * @param users the users to be part of the group * @return {@link PersistentUserGroup} instance */ public static PersistentUserGroup getInstance(final Set users) { - if (users.isEmpty()) { - throw BennuCoreDomainException.creatingUserGroupsWithoutUsers(); - } - PersistentUserGroup instance = select(users); - return instance != null ? instance : create(users); - } - - @Atomic(mode = TxMode.WRITE) - private static PersistentUserGroup create(final Set users) { - PersistentUserGroup instance = select(users); - return instance != null ? instance : new PersistentUserGroup(users); + return singleton(() -> select(users), () -> new PersistentUserGroup(users)); } - private static PersistentUserGroup select(final Set users) { - FluentIterable intersection = null; - Predicate sizePredicate = new Predicate() { - @Override - public boolean apply(PersistentUserGroup group) { - return group.getMemberSet().size() == users.size(); - } - }; - for (final User user : users) { + private static Optional select(final Set users) { + Stream intersection = null; + for (User user : users) { if (intersection == null) { - intersection = FluentIterable.from(BennuGroupIndex.getUserGroups(user)).filter(sizePredicate); + intersection = BennuGroupIndex.getUserGroups(user).stream().filter(g -> g.getMemberSet().size() == users.size()); } else { - intersection = intersection.filter(new Predicate() { - @Override - public boolean apply(PersistentUserGroup group) { - return group.getMemberSet().contains(user); - } - }); - } - if (intersection.isEmpty()) { - return null; + intersection = intersection.filter(g -> g.getMemberSet().contains(user)); } } - return intersection.first().orNull(); + return intersection != null ? intersection.findAny() : Optional.empty(); } } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ArgumentParser.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ArgumentParser.java index 0b66dad8a..ba409c7ff 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ArgumentParser.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ArgumentParser.java @@ -11,7 +11,7 @@ public interface ArgumentParser { * Parse the value from it's serialized form. The argument is never null or empty. * * @param argument The serialized version of the type. - * @return + * @return the parsed argument */ public T parse(String argument); diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/DifferenceGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/DifferenceGroup.java index 9e4a5bbca..8f6bd7c28 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/DifferenceGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/DifferenceGroup.java @@ -18,18 +18,16 @@ import java.util.HashSet; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.fenixedu.bennu.core.domain.User; import org.fenixedu.bennu.core.domain.groups.PersistentDifferenceGroup; -import org.fenixedu.bennu.core.domain.groups.PersistentGroup; import org.fenixedu.bennu.core.i18n.BundleUtil; import org.joda.time.DateTime; -import com.google.common.base.Joiner; import com.google.common.base.Objects; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; /** * Difference composition group. Can be read as members of first group except members of the remaining ones. @@ -51,29 +49,27 @@ protected DifferenceGroup(Group first, ImmutableSet rest) { } public static Group between(Group first, Set rest) { - return between(first, rest.toArray(new Group[0])); + return between(first, rest.stream()); } public static Group between(Group first, Group... rest) { - if (rest.length == 0) { - return first; - } - Group group = first; - for (Group subtract : rest) { - group = group.minus(subtract); - } - return group; + return between(first, Stream.of(rest)); + } + + public static Group between(Group first, Stream rest) { + return rest.reduce(first, (result, group) -> result.minus(group)); } @Override public String getPresentationName() { String minus = " " + BundleUtil.getString("resources.BennuResources", "label.bennu.minus") + " "; - return first.getPresentationName() + minus + Joiner.on(minus).join(Iterables.transform(rest, groupToGroupName)); + return first.getPresentationName() + minus + + rest.stream().map(g -> g.getPresentationName()).collect(Collectors.joining(minus)); } @Override public String getExpression() { - return first.getExpression() + " - " + Joiner.on(" - ").join(Iterables.transform(rest, groupToExpression)); + return first.getExpression() + " - " + rest.stream().map(g -> g.getExpression()).collect(Collectors.joining(" - ")); } public Group getFirst() { @@ -86,8 +82,8 @@ public Set getRest() { @Override public PersistentDifferenceGroup toPersistentGroup() { - ImmutableSet groups = FluentIterable.from(rest).transform(groupToPersistentGroup).toSet(); - return PersistentDifferenceGroup.getInstance(first.toPersistentGroup(), groups); + return PersistentDifferenceGroup.getInstance(first.toPersistentGroup(), rest.stream().map(g -> g.toPersistentGroup()) + .collect(Collectors.toSet())); } @Override @@ -154,7 +150,7 @@ public Group minus(Group group) { public boolean equals(Object object) { if (object instanceof DifferenceGroup) { DifferenceGroup diff = (DifferenceGroup) object; - return first.equals(diff.rest) && rest.equals(diff.rest); + return first.equals(diff.first) && rest.equals(diff.rest); } return false; } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/Group.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/Group.java index 800689283..7ced77309 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/Group.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/Group.java @@ -60,6 +60,7 @@ public PersistentGroup apply(Group group) { } }; + @Deprecated public static final Function groupToGroupName = new Function() { @Override public String apply(Group group) { @@ -67,6 +68,7 @@ public String apply(Group group) { } }; + @Deprecated public static final Function groupToExpression = new Function() { @Override public String apply(Group group) { @@ -119,7 +121,7 @@ public String apply(Group group) { * Tests if the given user is a member of the group. * * @param user - * the user to test + * the user to test, can be null * @return true if member, false otherwise * * @see #verify() @@ -130,7 +132,7 @@ public String apply(Group group) { * Same as {@link #isMember(User)} but at a given moment in time. This is like a time-machine for the groups domain. * * @param user - * the user to test + * the user to test, can be null * @param when * moment when to test the user. * @return true if member, false otherwise @@ -245,7 +247,7 @@ public Group revoke(User user) { * @param expression * the group in textual form * @return group representing the semantics of the expression. - * @throws GroupException + * @throws BennuCoreDomainException * if a parsing error occurs */ public static Group parse(String expression) { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/GroupStrategy.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/GroupStrategy.java new file mode 100644 index 000000000..06f94773b --- /dev/null +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/GroupStrategy.java @@ -0,0 +1,98 @@ +package org.fenixedu.bennu.core.groups; + +import java.util.Collections; +import java.util.Set; + +import org.fenixedu.bennu.core.domain.User; +import org.fenixedu.bennu.core.domain.groups.PersistentGroup; +import org.fenixedu.bennu.core.domain.groups.PersistentGroupStrategy; +import org.fenixedu.bennu.core.i18n.BundleUtil; +import org.joda.time.DateTime; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link GroupStrategy} is a stateless (pure-logic) {@link CustomGroup}, which is identified solely by its class. + * + * Implementation note: GroupStrategy fails gracefully if the concrete strategy is removed: it issues a warning and returns a + * strategy that behaves the same as {@link NobodyGroup}. + * + * @author João Carvalho (joao.pedro.carvalho@tecnico.ulisboa.pt) + * + */ +public abstract class GroupStrategy extends CustomGroup { + + private static final Logger logger = LoggerFactory.getLogger(GroupStrategy.class); + + private static final long serialVersionUID = -6389394974941030980L; + + /** + * Retrieves a {@link GroupStrategy} by the name of its type. + * + * If the given type is no longer available (or the typeName is invalid), it returns a strategy that behaves the same as + * {@link NobodyGrou}. + */ + public static GroupStrategy strategyForType(String typeName) { + try { + return (GroupStrategy) Class.forName(typeName).newInstance(); + } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | ClassCastException e) { + logger.error("Exception de-serializing GroupStrategy '" + typeName + "'. Returning AnyoneGroup.", e); + return new NobodyGroupStrategy(); + } + } + + private static final class NobodyGroupStrategy extends GroupStrategy { + private static final long serialVersionUID = 584606595093061522L; + + @Override + public String getPresentationName() { + return BundleUtil.getString("resources.BennuResources", "label.bennu.group.nobody"); + } + + @Override + public Set getMembers() { + return Collections.emptySet(); + } + + @Override + public Set getMembers(DateTime when) { + return Collections.emptySet(); + } + + @Override + public boolean isMember(User user) { + return false; + } + + @Override + public boolean isMember(User user, DateTime when) { + return false; + } + } + + @Override + public final PersistentGroup toPersistentGroup() { + return PersistentGroupStrategy.getInstance(this); + } + + /* + * Ensure that equality is based on class identity, not on state. + */ + @Override + public final boolean equals(Object other) { + return other == null ? false : getClass().equals(other.getClass()); + } + + @Override + public final int hashCode() { + return this.getClass().hashCode(); + } + + /* + * Return the className as the externalization. This ensures that no state is ever kept on the ValueType. + */ + public final String externalize() { + return getClass().getName(); + } + +} diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/IntersectionGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/IntersectionGroup.java index 7f13c9e6a..4bc4a1572 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/IntersectionGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/IntersectionGroup.java @@ -19,17 +19,15 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.fenixedu.bennu.core.domain.User; -import org.fenixedu.bennu.core.domain.groups.PersistentGroup; import org.fenixedu.bennu.core.domain.groups.PersistentIntersectionGroup; import org.fenixedu.bennu.core.i18n.BundleUtil; import org.joda.time.DateTime; -import com.google.common.base.Joiner; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; /** * Intersection composition group. @@ -48,29 +46,26 @@ protected IntersectionGroup(ImmutableSet children) { } public static Group of(Set groups) { - return of(groups.toArray(new Group[0])); + return of(groups.stream()); } public static Group of(Group... groups) { - if (groups.length == 0) { - return NobodyGroup.get(); - } - Group group = groups[0]; - for (int i = 1; i < groups.length; i++) { - group = group.and(groups[i]); - } - return group; + return of(Stream.of(groups)); + } + + public static Group of(Stream groups) { + return groups.reduce(NobodyGroup.get(), (result, group) -> result.and(group)); } @Override public String getPresentationName() { String and = " " + BundleUtil.getString("resources.BennuResources", "label.bennu.and") + " "; - return Joiner.on(and).join(Iterables.transform(children, groupToGroupName)); + return children.stream().map(g -> g.getPresentationName()).collect(Collectors.joining(and)); } @Override public String getExpression() { - return Joiner.on(" & ").join(Iterables.transform(children, groupToExpression)); + return children.stream().map(g -> g.getExpression()).collect(Collectors.joining(" & ")); } public Set getChildren() { @@ -79,8 +74,8 @@ public Set getChildren() { @Override public PersistentIntersectionGroup toPersistentGroup() { - ImmutableSet groups = FluentIterable.from(children).transform(groupToPersistentGroup).toSet(); - return PersistentIntersectionGroup.getInstance(groups); + return PersistentIntersectionGroup.getInstance(children.stream().map(g -> g.toPersistentGroup()) + .collect(Collectors.toSet())); } @Override diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ParseContextToGroupTranslator.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ParseContextToGroupTranslator.java index 5a9a81eb0..68344b8b7 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ParseContextToGroupTranslator.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/ParseContextToGroupTranslator.java @@ -91,7 +91,7 @@ private Group atom(AtomContext ctx) { if (expr != null) { return expression(expr); } - return null; + throw new Error("Unrecognized expression: " + ctx.getText()); } private Group link(LinkContext ctx) { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UnionGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UnionGroup.java index c1b3f2893..9d94b78c8 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UnionGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UnionGroup.java @@ -18,17 +18,15 @@ import java.util.HashSet; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.fenixedu.bennu.core.domain.User; -import org.fenixedu.bennu.core.domain.groups.PersistentGroup; import org.fenixedu.bennu.core.domain.groups.PersistentUnionGroup; import org.fenixedu.bennu.core.i18n.BundleUtil; import org.joda.time.DateTime; -import com.google.common.base.Joiner; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; /** * Union composition group. @@ -47,30 +45,26 @@ protected UnionGroup(ImmutableSet children) { } public static Group of(Set groups) { - Group group = NobodyGroup.get(); - for (Group child : groups) { - group = group.or(child); - } - return group; + return of(groups.stream()); } public static Group of(Group... groups) { - Group group = NobodyGroup.get(); - for (int i = 0; i < groups.length; i++) { - group = group.or(groups[i]); - } - return group; + return of(Stream.of(groups)); + } + + public static Group of(Stream groups) { + return groups.reduce(NobodyGroup.get(), (result, group) -> result.or(group)); } @Override public String getPresentationName() { String or = " " + BundleUtil.getString("resources.BennuResources", "label.bennu.or") + " "; - return Joiner.on(or).join(Iterables.transform(children, groupToGroupName)); + return children.stream().map(g -> g.getPresentationName()).collect(Collectors.joining(or)); } @Override public String getExpression() { - return Joiner.on(" | ").join(Iterables.transform(children, groupToExpression)); + return children.stream().map(g -> g.getExpression()).collect(Collectors.joining(" | ")); } public Set getChildren() { @@ -79,8 +73,7 @@ public Set getChildren() { @Override public PersistentUnionGroup toPersistentGroup() { - ImmutableSet groups = FluentIterable.from(children).transform(groupToPersistentGroup).toSet(); - return PersistentUnionGroup.getInstance(groups); + return PersistentUnionGroup.getInstance(children.stream().map(g -> g.toPersistentGroup()).collect(Collectors.toSet())); } @Override diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UserGroup.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UserGroup.java index b2931f836..5a8282b6a 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UserGroup.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/groups/UserGroup.java @@ -17,6 +17,7 @@ package org.fenixedu.bennu.core.groups; import java.util.Set; +import java.util.stream.Collectors; import org.fenixedu.bennu.core.annotation.GroupArgument; import org.fenixedu.bennu.core.annotation.GroupArgumentParser; @@ -25,10 +26,7 @@ import org.fenixedu.bennu.core.domain.groups.PersistentUserGroup; import org.joda.time.DateTime; -import com.google.common.base.Function; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.Sets; /** @@ -94,14 +92,7 @@ public static Group of(User... members) { @Override public String getPresentationName() { - Iterable usernames = Iterables.transform(members, new Function() { - @Override - public String apply(User user) { - return user.getUsername(); - } - }); - - return Joiner.on(", ").join(usernames); + return members.stream().map(u -> u.getUsername()).collect(Collectors.joining(", ")); } @Override diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonBuilder.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonBuilder.java index 5b94e035c..662292947 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonBuilder.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonBuilder.java @@ -3,6 +3,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Stream; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -39,13 +40,23 @@ public JsonElement view(Object obj, Class objectClass, Class stream, Class jsonViewerClass) { + JsonArray array = new JsonArray(); + stream.map(obj -> view(obj, jsonViewerClass)).forEach(array::add); + return array; + } + private JsonArray views(Collection coll, Class jsonViewerClass) { JsonArray json = new JsonArray(); for (final Object el : coll) { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonUtils.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonUtils.java index e943f1bcc..d1b9dea94 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonUtils.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/JsonUtils.java @@ -8,11 +8,13 @@ public class JsonUtils { public static String getString(JsonObject json, String property) { - return getPrimitive(json, property).getAsString(); + JsonPrimitive primitive = getPrimitive(json, property); + return primitive != null ? primitive.getAsString() : null; } public static int getInt(JsonObject json, String property) { - return getPrimitive(json, property).getAsInt(); + JsonPrimitive primitive = getPrimitive(json, property); + return primitive != null ? primitive.getAsInt() : null; } public static JsonPrimitive getPrimitive(JsonObject json, String property) { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/adapters/JarFileViewer.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/adapters/JarFileViewer.java index dd74f31a6..efc49134c 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/adapters/JarFileViewer.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/json/adapters/JarFileViewer.java @@ -40,8 +40,10 @@ public JsonElement view(JarFile file, JsonBuilder ctx) { } } try { - for (Entry entry : file.getManifest().getMainAttributes().entrySet()) { - properties.put(entry.getKey().toString(), entry.getValue()); + if (file.getManifest() != null) { + for (Entry entry : file.getManifest().getMainAttributes().entrySet()) { + properties.put(entry.getKey().toString(), entry.getValue()); + } } } catch (IOException e) { throw new Error(e); diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/Healthcheck.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/Healthcheck.java index c3346c488..73f038f93 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/Healthcheck.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/Healthcheck.java @@ -17,12 +17,14 @@ public abstract class Healthcheck { /** - * The result of a {@link HealthCheck}. It can be healthy or unhealthy (with either an error message or a thrown exception). + * The result of a {@link Healthcheck}. It can be healthy or unhealthy (with either an error message or a thrown exception). */ public static class Result { /** * Returns a healthy {@link Result}. + * + * @return {@link Result} instance with "OK" message */ public static Result healthy() { return new Result(true, "OK", null); @@ -30,6 +32,9 @@ public static Result healthy() { /** * Returns a healthy {@link Result} with the given message. + * + * @param message the message to include in the result + * @return {@link Result} instance */ public static Result healthy(String message) { return new Result(true, message, null); @@ -37,6 +42,9 @@ public static Result healthy(String message) { /** * Returns an unhealthy {@link Result} with the given message. + * + * @param message the message to include in the result + * @return {@link Result} instance */ public static Result unhealthy(String message) { return new Result(false, message, null); @@ -44,6 +52,9 @@ public static Result unhealthy(String message) { /** * Returns an unhealthy {@link Result} with the given error. + * + * @param error an exception to include in the result + * @return {@link Result} instance */ public static Result unhealthy(Throwable error) { return new Result(false, error.getMessage(), error); @@ -51,6 +62,11 @@ public static Result unhealthy(Throwable error) { /** * Returns an unhealthy {@link Result} with the given error and message. + * + * @param message the message to include in the result + * @param error an exception to include in the result + * + * @return {@link Result} instance */ public static Result unhealthy(String message, Throwable error) { return new Result(false, message, error); @@ -84,6 +100,8 @@ public JsonObject toJson() { /** * Returns the presentation name of this healthcheck. + * + * @return the name {@link String} */ public abstract String getName(); @@ -98,6 +116,8 @@ public JsonObject toJson() { /** * Executes the health check. Any exceptions will result in an Unhealthy Result. + * + * @return {@link Result} instance */ public final Result execute() { try { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/JsonAwareResource.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/JsonAwareResource.java index f9ededbc7..ce5eae65e 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/JsonAwareResource.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/JsonAwareResource.java @@ -18,6 +18,7 @@ import com.google.common.base.Strings; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; @@ -86,7 +87,7 @@ public final String viewPaginated(List object, String collectionKey, int skip public final String viewPaginated(List object, String collectionKey, Class> viewerClass, int skip, int pageSize) { if (object == null) { - return viewPaginated(object, (Class) null, collectionKey, viewerClass, skip, pageSize); + return viewPaginated(null, (Class) null, collectionKey, viewerClass, skip, pageSize); } return viewPaginated(object, object.getClass(), collectionKey, viewerClass, skip, pageSize); } @@ -94,10 +95,15 @@ public final String viewPaginated(List object, String collectionKey, Class object, Class objectClass, String collectionKey, Class> viewerClass, int skip, int pageSize) { JsonObject jsonObject = new JsonObject(); - jsonObject.add(collectionKey, - BUILDER.view(object.subList(Math.min(object.size(), skip), Math.min(object.size(), skip + pageSize)), - objectClass, viewerClass)); - jsonObject.addProperty("total", object.size()); + if (object == null) { + jsonObject.add(collectionKey, new JsonArray()); + jsonObject.addProperty("total", 0); + } else { + jsonObject.add(collectionKey, BUILDER.view( + object.subList(Math.min(object.size(), skip), Math.min(object.size(), skip + pageSize)), objectClass, + viewerClass)); + jsonObject.addProperty("total", object.size()); + } return GSON.toJson(jsonObject); } @@ -151,8 +157,8 @@ public static String toJson(JsonElement el) { /** * merges the source within target * - * @param target - * @param source + * @param target json where to merge the source + * @param source the json source to merge */ public void merge(JsonObject target, JsonObject source) { for (final Entry entry : source.entrySet()) { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/UserResource.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/UserResource.java index 9c5e843e4..6d733e65a 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/UserResource.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/rest/UserResource.java @@ -1,25 +1,51 @@ package org.fenixedu.bennu.core.rest; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.fenixedu.bennu.core.domain.Bennu; import org.fenixedu.bennu.core.domain.User; +import org.fenixedu.bennu.core.domain.UserProfile; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; @Path("/bennu-core/users") public class UserResource extends BennuRestResource { @GET @Produces(MediaType.APPLICATION_JSON) + @Deprecated public Response getAllUsers() { verifyAndGetRequestAuthor(); - return Response.ok(view(Bennu.getInstance().getUserSet(), "users")).build(); + JsonObject users = new JsonObject(); + users.add("users", new JsonArray()); + return Response.ok(users.toString()).build(); + } + + @POST + @Path("find") + @Produces(MediaType.APPLICATION_JSON) + public Response findUser(@QueryParam("query") String query, @QueryParam("maxHits") Integer maxHits) { + Set matches = new HashSet<>(); + User user = User.findByUsername(query); + if (user != null) { + matches.add(user); + } + matches.addAll(UserProfile.searchByName(query, maxHits - matches.size()).map(UserProfile::getUser) + .filter(Objects::nonNull).collect(Collectors.toSet())); + return Response.ok(view(matches, "users")).build(); } @GET diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/security/UserAuthenticationListener.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/security/UserAuthenticationListener.java index 58583466d..564e94884 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/security/UserAuthenticationListener.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/security/UserAuthenticationListener.java @@ -7,8 +7,8 @@ /** * Listener of user login/logout events. Runs synchronously with the login. * - * @see {@link Authenticate#addUserAuthenticationListener(UserAuthenticationListener)} and - * {@link Authenticate#removeUserAuthenticationListener(UserAuthenticationListener)} + * @see Authenticate#addUserAuthenticationListener(UserAuthenticationListener) + * @see Authenticate#removeUserAuthenticationListener(UserAuthenticationListener) */ public interface UserAuthenticationListener { public void onLogin(HttpSession session, User user); diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/BennuCoreContextListener.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/BennuCoreContextListener.java index e3eba9c2e..60a0325d8 100755 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/BennuCoreContextListener.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/BennuCoreContextListener.java @@ -43,8 +43,6 @@ public class BennuCoreContextListener implements ServletContextListener { private static final Logger logger = LoggerFactory.getLogger(BennuCoreContextListener.class); - private ClassLoader thisClassLoader; - /** * This methods enables multipart feature in the JAX-RS api. * @@ -94,13 +92,13 @@ protected Result check() throws Exception { @Override public void contextDestroyed(ServletContextEvent event) { FenixFramework.shutdown(); - this.thisClassLoader = this.getClass().getClassLoader(); interruptThreads(); } private void interruptThreads() { for (Thread thread : Thread.getAllStackTraces().keySet()) { - if (thread == null || thread.getContextClassLoader() != thisClassLoader || thread == Thread.currentThread()) { + if (thread == null || thread.getContextClassLoader() != getClass().getClassLoader() + || thread == Thread.currentThread()) { continue; } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/ExceptionHandlerFilter.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/ExceptionHandlerFilter.java index 4aa1b1fc2..356f8a906 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/ExceptionHandlerFilter.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/servlets/ExceptionHandlerFilter.java @@ -47,6 +47,7 @@ public boolean handle(ServletRequest request, ServletResponse response, Throwabl /** * Registers the given {@link ExceptionHandler} as this application's exception handler * + * @param handler the {@link ExceptionHandler} instance to register * @throws NullPointerException if the provided handler is null */ public static void setExceptionHandler(ExceptionHandler handler) { @@ -74,13 +75,6 @@ public void init(FilterConfig filterConfig) throws ServletException { public void destroy() { } - private static ExceptionHandler exceptionHandler = new ExceptionHandler() { - @Override - public boolean handle(ServletRequest request, ServletResponse response, Throwable throwable) throws ServletException, - IOException { - // Don't handle any exceptions, throw them to the container - return false; - } - }; + private static ExceptionHandler exceptionHandler = (req, resp, t) -> false; } diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CookieReaderUtils.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CookieReaderUtils.java index 2b3266357..0eecbc954 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CookieReaderUtils.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CookieReaderUtils.java @@ -10,7 +10,7 @@ public class CookieReaderUtils { * * @param name the name of the cookie. * @param request the HttpServletRequest to find the cookie on. - * @return + * @return the cookie */ public static Cookie getCookieForName(String name, HttpServletRequest request) { if (request.getCookies() == null) { diff --git a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CoreConfiguration.java b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CoreConfiguration.java index 412b89a82..8aa035ef5 100644 --- a/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CoreConfiguration.java +++ b/server/bennu-core/src/main/java/org/fenixedu/bennu/core/util/CoreConfiguration.java @@ -6,6 +6,7 @@ import java.util.Locale; import java.util.Locale.Builder; import java.util.Set; +import java.util.stream.Collectors; import javax.servlet.MultipartConfigElement; import javax.servlet.http.HttpServletRequest; @@ -16,10 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Function; -import com.google.common.base.Joiner; import com.google.common.base.Strings; -import com.google.common.collect.Iterables; public class CoreConfiguration { private static final Logger logger = LoggerFactory.getLogger(CoreConfiguration.class); @@ -171,12 +169,7 @@ public interface ConfigurationProperties { } private static String formatSupportedLocales() { - return Joiner.on(',').join(Iterables.transform(supportedLocales(), new Function() { - @Override - public String apply(Locale locale) { - return locale.toLanguageTag(); - } - })); + return supportedLocales().stream().map(Locale::toLanguageTag).collect(Collectors.joining(",")); } public static CasConfig casConfig() { diff --git a/server/bennu-core/src/main/resources/resources/BennuResources_en.properties b/server/bennu-core/src/main/resources/resources/BennuResources_en.properties index 9c42b091c..af63f7231 100644 --- a/server/bennu-core/src/main/resources/resources/BennuResources_en.properties +++ b/server/bennu-core/src/main/resources/resources/BennuResources_en.properties @@ -26,9 +26,9 @@ error.bennu.core.resourcenotfound = Could not find resource with id: {0} error.bennu.core.unauthorized = Unauthorised Access error.bennu.core.usergroup.creatingWithoutUsers = Could not create user groups without users error.bennu.core.user.duplicateUsername = User with username {0} already exists -error.bennu.core.user.displayNameNotContainedInFullName = Display name {0} is not a subset of the full name {1} +error.bennu.core.user.displayNameNotContainedInFullName = Display name '{0}' is not a subset of the full name '{1}' error.bennu.core.user.passwordCheckDoesNotMatch = Passwords do not match -error.bennu.core.wrongJsonFormat = Wrong json format: given {0} expected {1} +error.bennu.core.wrongJsonFormat = Wrong json format: given '{0}' expected '{1}' error.bennu.core.valueIsNotAnInteger = {0} is not a number error.bennu.core.user.errorProcessingImage = Error processing image label.bennu.group.anonymous = Not authenticated users diff --git a/server/bennu-core/src/main/resources/resources/BennuResources_pt.properties b/server/bennu-core/src/main/resources/resources/BennuResources_pt.properties index 65e26df9b..68b464cf7 100644 --- a/server/bennu-core/src/main/resources/resources/BennuResources_pt.properties +++ b/server/bennu-core/src/main/resources/resources/BennuResources_pt.properties @@ -26,9 +26,9 @@ error.bennu.core.resourcenotfound = N error.bennu.core.unauthorized = Acesso não autorizado error.bennu.core.usergroup.creatingWithoutUsers = Não é possível criar grupos de utilizadores sem utilizadores error.bennu.core.user.duplicateUsername = Já existe um utilizador com o username {0} -error.bennu.core.user.displayNameNotContainedInFullName = O nome de apresentação {0} não é parte do nome completo {1} +error.bennu.core.user.displayNameNotContainedInFullName = O nome de apresentação '{0}' não é parte do nome completo '{1}' error.bennu.core.user.passwordCheckDoesNotMatch = As passwords não são iguais -error.bennu.core.wrongJsonFormat = Formato JSON inválido: obtido {0} esperado {1} +error.bennu.core.wrongJsonFormat = Formato JSON inválido: obtido '{0}' esperado '{1}' error.bennu.core.valueIsNotAnInteger = {0} não é um número error.bennu.core.user.errorProcessingImage = Erro no processamento da imagem label.bennu.group.anonymous = Utilizadores não autenticados diff --git a/server/bennu-core/src/main/webapp/bennu-core/bootstrap.jsp b/server/bennu-core/src/main/webapp/bennu-core/bootstrap.jsp index 9d8496145..cd1e0abec 100644 --- a/server/bennu-core/src/main/webapp/bennu-core/bootstrap.jsp +++ b/server/bennu-core/src/main/webapp/bennu-core/bootstrap.jsp @@ -20,7 +20,7 @@

Bootstrap

-

FenixEdu Logo

+

Bennu Logo

@@ -55,7 +55,7 @@

{{bootstrapper.name[locale.key]}}

-

+

@@ -117,7 +117,7 @@

Bootstrap

-

FenixEdu Logo

+

Bennu Logo

diff --git a/server/bennu-core/src/main/webapp/bennu-core/css/bootstrapWizard.css b/server/bennu-core/src/main/webapp/bennu-core/css/bootstrapWizard.css index 668070eb2..59b2d8a05 100644 --- a/server/bennu-core/src/main/webapp/bennu-core/css/bootstrapWizard.css +++ b/server/bennu-core/src/main/webapp/bennu-core/css/bootstrapWizard.css @@ -1,21 +1,29 @@ .container { padding-top: 20px; padding-bottom: 5px; - background: #f7f7f7; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); - box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); + background: #fff; + border-bottom-right-radius: 10px; + border-bottom-left-radius: 10px; } body { - font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + font-family: 'Roboto', sans-serif; font-size: 14px; - font-weight:300 !important; - background-color: #F6F4ED; - color: #4b565c; + font-weight:100 !important; + background-color: #F1F1F1; + color: #617383; +} + +legend { + color: #617383; +} + +a { + color: #67B6E5; +} + +.form-control:focus { + border-color:#617383; } .alert { diff --git a/server/bennu-core/src/main/webapp/img/logo_bennu.png b/server/bennu-core/src/main/webapp/img/logo_bennu.png deleted file mode 100644 index b87655b8c..000000000 Binary files a/server/bennu-core/src/main/webapp/img/logo_bennu.png and /dev/null differ diff --git a/server/bennu-core/src/main/webapp/img/logo_bennu.svg b/server/bennu-core/src/main/webapp/img/logo_bennu.svg new file mode 100644 index 000000000..e42373739 --- /dev/null +++ b/server/bennu-core/src/main/webapp/img/logo_bennu.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bennu + + Framework + + diff --git a/server/bennu-core/src/main/webapp/img/mysteryman.png b/server/bennu-core/src/main/webapp/img/mysteryman.png index 6da2502f2..66eb40d82 100644 Binary files a/server/bennu-core/src/main/webapp/img/mysteryman.png and b/server/bennu-core/src/main/webapp/img/mysteryman.png differ diff --git a/server/bennu-core/src/main/webapp/img/mysteryman.svg b/server/bennu-core/src/main/webapp/img/mysteryman.svg new file mode 100644 index 000000000..f7cc738e7 --- /dev/null +++ b/server/bennu-core/src/main/webapp/img/mysteryman.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/server/bennu-io/pom.xml b/server/bennu-io/pom.xml index 1be5741da..4c01d63a3 100644 --- a/server/bennu-io/pom.xml +++ b/server/bennu-io/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-server-aggregator - 3.2.0 + 3.3.0 bennu-io diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/DomainStorage.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/DomainStorage.java index 1745a0ca4..73dfc3c3b 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/DomainStorage.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/DomainStorage.java @@ -38,6 +38,7 @@ public byte[] read(String uniqueIdentification) { @Override public InputStream readAsInputStream(String uniqueIdentification) { - return new ByteArrayInputStream(read(uniqueIdentification)); + byte[] read = read(uniqueIdentification); + return read != null ? new ByteArrayInputStream(read) : null; } } \ No newline at end of file diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/FileStorage.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/FileStorage.java index 59c8e8934..a7958a295 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/FileStorage.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/FileStorage.java @@ -54,4 +54,8 @@ public Boolean delete() { public boolean isCanBeDeleted() { return getFileSet().isEmpty(); } + + public boolean isDefault() { + return getFileSupportAsDefault() != null; + } } diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GenericFile.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GenericFile.java index cae98c3e5..d24d49cef 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GenericFile.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GenericFile.java @@ -109,7 +109,9 @@ private void setContent(byte[] content) { } setContentKey(uniqueIdentification); - setContentType(detectContentType(content, getFilename())); + if (content != null) { + setContentType(detectContentType(content, getFilename())); + } } public byte[] getContent() { diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GroupBasedFile.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GroupBasedFile.java index 3f2435ea9..f5fa0bff3 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GroupBasedFile.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/GroupBasedFile.java @@ -25,7 +25,7 @@ public boolean isAccessible(User user) { @Override public void delete() { - setAccessGroup(null); + setGroup(null); super.delete(); } } diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/LocalFileSystemStorage.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/LocalFileSystemStorage.java index 94b7f9c44..4234c51ca 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/LocalFileSystemStorage.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/domain/LocalFileSystemStorage.java @@ -82,10 +82,6 @@ public String store(String uniqueIdentification, byte[] content) { } Map map = getPerTxBox().get(); - if (map == null) { - map = new HashMap<>(); - fileIntentions.put(map); - } if (map.containsKey(uniqueIdentification)) { map.remove(uniqueIdentification); } @@ -147,7 +143,7 @@ private String transformIDInPath(final String uniqueIdentification) { public byte[] read(String uniqueIdentification) { try { Map map = getPerTxBox().get(); - if (map != null && map.containsKey(uniqueIdentification)) { + if (map.containsKey(uniqueIdentification)) { return map.get(uniqueIdentification).contents; } @@ -161,7 +157,7 @@ public byte[] read(String uniqueIdentification) { public InputStream readAsInputStream(String uniqueIdentification) { try { Map map = getPerTxBox().get(); - if (map != null && map.containsKey(uniqueIdentification)) { + if (map.containsKey(uniqueIdentification)) { return new ByteArrayInputStream(map.get(uniqueIdentification).contents); } @@ -174,12 +170,12 @@ public InputStream readAsInputStream(String uniqueIdentification) { private synchronized PerTxBox> getPerTxBox() { if (fileIntentions == null) { - fileIntentions = new PerTxBox>(null) { + fileIntentions = new PerTxBox>(new HashMap()) { @Override public void commit(Map map) { - for (String key : map.keySet()) { + for (FileWriteIntention i : map.values()) { try { - map.get(key).write(); + i.write(); } catch (IOException e) { throw new RuntimeException("error.store.file", e); } diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/FileStorageResource.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/FileStorageResource.java index 3af0ac442..597bcee08 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/FileStorageResource.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/FileStorageResource.java @@ -23,6 +23,19 @@ @Path("/bennu-io/storage") public class FileStorageResource extends BennuRestResource { + @POST + @Path("/default/{storage}") + public String setDefault(@PathParam("storage") String storageId) { + accessControl("#managers"); + innerSetDefault(this. readDomainObject(storageId)); + return all(); + } + + @Atomic + private void innerSetDefault(FileStorage storage) { + FileSupport.getInstance().setDefaultStorage(storage); + } + @POST @Path("/domain/{name}") @Produces(MediaType.APPLICATION_JSON) diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/json/FileStorageAdapter.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/json/FileStorageAdapter.java index 4a3cadbe1..cda2c3fbc 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/json/FileStorageAdapter.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/rest/json/FileStorageAdapter.java @@ -27,6 +27,7 @@ public JsonElement view(FileStorage fs, JsonBuilder arg1) { json.addProperty("id", fs.getExternalId()); json.addProperty("name", fs.getName()); json.addProperty("type", fs.getClass().getSimpleName()); + json.addProperty("default", fs.isDefault()); json.addProperty("filesCount", fs.getFileSet().size()); return json; } diff --git a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/servlets/FileDownloadServlet.java b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/servlets/FileDownloadServlet.java index 748793b4b..4026fcb53 100644 --- a/server/bennu-io/src/main/java/org/fenixedu/bennu/io/servlets/FileDownloadServlet.java +++ b/server/bennu-io/src/main/java/org/fenixedu/bennu/io/servlets/FileDownloadServlet.java @@ -38,11 +38,15 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re } if (file.isAccessible(Authenticate.getUser())) { byte[] content = file.getContent(); - response.setContentType(file.getContentType()); - response.setContentLength(file.getSize().intValue()); - try (OutputStream stream = response.getOutputStream()) { - stream.write(content); - stream.flush(); + if (content != null) { + response.setContentType(file.getContentType()); + response.setContentLength(file.getSize().intValue()); + try (OutputStream stream = response.getOutputStream()) { + stream.write(content); + stream.flush(); + } + } else { + response.sendError(HttpServletResponse.SC_NO_CONTENT, "File empty"); } } else if (file.isPrivate() && !Authenticate.isLogged() && request.getAttribute(CasAuthenticationFilter.AUTHENTICATION_EXCEPTION_KEY) == null) { @@ -64,7 +68,7 @@ private String sendLoginRedirect(final GenericFile file) throws IOException { + URLEncoder.encode(getDownloadUrl(file), Charsets.UTF_8.name()); } - private static GenericFile getFileFromURL(String url) { + public static GenericFile getFileFromURL(String url) { try { // Remove trailing path, and split the tokens String[] parts = url.substring(url.indexOf(SERVLET_PATH)).replace(SERVLET_PATH, "").split("\\/"); diff --git a/server/bennu-scheduler/pom.xml b/server/bennu-scheduler/pom.xml index 5adf3283a..bbac63cc8 100644 --- a/server/bennu-scheduler/pom.xml +++ b/server/bennu-scheduler/pom.xml @@ -4,7 +4,7 @@ org.fenixedu bennu-server-aggregator - 3.2.0 + 3.3.0 bennu-scheduler diff --git a/server/bennu-scheduler/src/main/java/org/fenixedu/bennu/scheduler/domain/SchedulerSystem.java b/server/bennu-scheduler/src/main/java/org/fenixedu/bennu/scheduler/domain/SchedulerSystem.java index c9cc600be..419216c1e 100644 --- a/server/bennu-scheduler/src/main/java/org/fenixedu/bennu/scheduler/domain/SchedulerSystem.java +++ b/server/bennu-scheduler/src/main/java/org/fenixedu/bennu/scheduler/domain/SchedulerSystem.java @@ -198,7 +198,7 @@ public void setShouldRun(Boolean shouldRun) { /** * Initializes the scheduler. */ - private static void bootstrap() { + private synchronized static void bootstrap() { LOG.info("Running Scheduler bootstrap"); if (scheduler == null) { scheduler = new Scheduler(); @@ -417,7 +417,6 @@ public static String getTaskName(String className) { * * @return the physical absolute path of the logging storage. */ - @Atomic(mode = TxMode.READ) public static String getLogsPath() { if (getInstance().getLoggingStorage() == null) { diff --git a/server/bennu-search/pom.xml b/server/bennu-search/pom.xml index 4ee3e633f..3ec350701 100644 --- a/server/bennu-search/pom.xml +++ b/server/bennu-search/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-server-aggregator - 3.2.0 + 3.3.0 bennu-search diff --git a/server/bundle/pom.xml b/server/bundle/pom.xml index eeee8181d..c89ce78ef 100644 --- a/server/bundle/pom.xml +++ b/server/bundle/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu-server-aggregator - 3.2.0 + 3.3.0 bennu-server diff --git a/server/pom.xml b/server/pom.xml index 3976c9626..55b5a7eb1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,7 +5,7 @@ org.fenixedu bennu - 3.2.0 + 3.3.0 bennu-server-aggregator diff --git a/theme/default/pom.xml b/theme/default/pom.xml index 79e667055..e25fbfa92 100644 --- a/theme/default/pom.xml +++ b/theme/default/pom.xml @@ -4,7 +4,7 @@ org.fenixedu bennu-theme-aggregator - 3.2.0 + 3.3.0 default-theme diff --git a/theme/default/src/main/webapp/themes/default/default.html b/theme/default/src/main/webapp/themes/default/default.html index c51384993..308f7f24a 100644 --- a/theme/default/src/main/webapp/themes/default/default.html +++ b/theme/default/src/main/webapp/themes/default/default.html @@ -35,10 +35,10 @@