Fix QueryKeyExtractorTest.testTimeDimensionsOrdered

.gitignore

@@ -15,3 +15,5 @@ dependency-reduced-pom.xml
 .project
 */.project
 */*/.project
+*.factorypath
+*.vscode

.travis.yml

@@ -17,6 +17,7 @@
   branches:
     only:
       - master
+      - elide-5.x
       - "/^[0-9]+\\.[0-9]+(\\.[0-9]+|-(alpha|beta)-[0-9]+)/"
 
   install: true

README.md

@@ -134,8 +134,9 @@ Add Lifecycle hooks to your models to embed custom business logic that execute i
 @Include(rootLevel = true)
 @ReadPermission("Everyone")
 @CreatePermission("Admin OR Publisher")
-@DeletePermission("Noone")
-@UpdatePermission("Noone")
+@DeletePermission("None")
+@UpdatePermission("None")
+@LifeCycleHookBinding(operation = UPDATE, hook = BookCreationHook.class, phase = PRECOMMIT)
 public class Book {
 
     @Id
@@ -146,9 +147,13 @@ public class Book {
 
     @ManyToMany(mappedBy = "books")
     private Set<Author> authors;
+}
+
+public class BookCreationHook implements LifeCycleHook<Book> {
 
-    @OnCreatePreCommit
-    public void onCreate(RequestScope scope) {
+    @Override
+    public void execute(LifeCycleHookBinding.Operation operation, Book book,
+                        RequestScope requestScope, Optional<ChangeSpec> changes) {
        //Do something
     }
 }

checkstyle-suppressions.xml

@@ -10,8 +10,10 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
 <suppressions>
   <!-- Suppress generated sources -->
-  <suppress files="[/\\]src[/\\]test[/\\]" checks="(JavadocType|LineLength|MethodLength)"/>
+  <suppress files="[/\\]src[/\\]test[/\\]" checks="(JavadocType|LineLength|MethodLength|MethodCount)"/>
   <suppress files="[/\\]src[/\\]main[/\\]webapp[/\\]WEB-INF[/\\]api-docs[/\\]" checks=".*"/>
   <suppress files="[/\\]target[/\\]" checks=".*"/>
   <suppress files="\.csv" checks=".*"/>
+  <suppress files="\.json" checks="LineLength"/>
+  <suppress files="\.hbs" checks="LineLength"/>
 </suppressions>

elide-annotations/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yahoo.elide</groupId>
         <artifactId>elide-parent-pom</artifactId>
-        <version>4.6.5-SNAPSHOT</version>
+        <version>5.0.0-pr11-SNAPSHOT</version>
     </parent>
 
     <licenses>
@@ -53,5 +53,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

elide-annotations/src/main/java/com/yahoo/elide/annotation/ApiVersion.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Versions API Models.
+ */
+@Target({PACKAGE})
+@Retention(RUNTIME)
+public @interface ApiVersion {
+
+    /**
+     * Models in this package are tied to this API version.
+     * @return the string (default = "")
+     */
+    String version() default "";
+}

elide-annotations/src/main/java/com/yahoo/elide/annotation/Exclude.java

@@ -11,7 +11,6 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -20,6 +19,5 @@
  */
 @Target({METHOD, FIELD, TYPE, PACKAGE})
 @Retention(RUNTIME)
-@Inherited
 public @interface Exclude {
 }

elide-annotations/src/main/java/com/yahoo/elide/annotation/Include.java

@@ -9,7 +9,6 @@
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -18,7 +17,6 @@
  */
 @Target({TYPE, PACKAGE})
 @Retention(RUNTIME)
-@Inherited
 public @interface Include {
 
     /**

elide-annotations/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBinding.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import com.yahoo.elide.functions.LifeCycleHook;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Executes arbitrary logic (a lifecycle hook) when an Elide model is read or written.
+ */
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(LifeCycleHookBindings.class)
+public @interface LifeCycleHookBinding {
+
+    enum Operation {
+        CREATE,
+        READ,
+        UPDATE,
+        DELETE
+    };
+
+    enum TransactionPhase {
+        PRESECURITY,
+        PRECOMMIT,
+        POSTCOMMIT
+    }
+
+    /**
+     * The function to invoke when this life cycle triggers.
+     * @return the function class.
+     */
+    Class<? extends LifeCycleHook> hook();
+
+    /**
+     * Which CRUD operation to trigger on.
+     * @return CREATE, READ, UPDATE, or DELETE
+     */
+    Operation operation();
+
+    /**
+     * Which transaction phase to trigger on.
+     * @return PRESECURITY, PRECOMMIT, or POSTCOMMIT
+     */
+    TransactionPhase phase() default TransactionPhase.PRECOMMIT;
+
+    /**
+     * Controls how often the hook is invoked:
+     * A hook is invoked once per class per request (when bound to the model).
+     * A hook is invoked once per field per request (when bound to a model field or method).
+     * A hook is invoked one or more times per class per request (when bound to a model and oncePerRequest is false).
+     * @return true or false.
+     */
+    boolean oncePerRequest() default true;
+}

elide-annotations/src/main/java/com/yahoo/elide/annotation/OnDeletePreSecurity.java → elide-annotations/src/main/java/com/yahoo/elide/annotation/LifeCycleHookBindings.java

@@ -1,23 +1,21 @@
 /*
- * Copyright 2016, Yahoo Inc.
+ * Copyright 2020, Yahoo Inc.
  * Licensed under the Apache License, Version 2.0
  * See LICENSE file in project root for terms.
  */
 package com.yahoo.elide.annotation;
 
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * On Delete trigger annotation.
- *
- * The invoked function takes a RequestScope as parameter.
- * @see com.yahoo.elide.security.RequestScope
+ * A group of repeatable LifeCycleHookBinding annotations.
  */
-@Target({ElementType.METHOD})
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
-public @interface OnDeletePreSecurity {
-
+public @interface LifeCycleHookBindings {
+    LifeCycleHookBinding[] value();
 }

elide-annotations/src/main/java/com/yahoo/elide/annotation/NonTransferable.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.annotation;
+
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Marks that the given entity cannot be added to another collection after creation of the entity.
+ */
+@Target({TYPE, PACKAGE})
+@Retention(RUNTIME)
+@Inherited
+public @interface NonTransferable {
+
+    /**
+     * If NonTransferable is used at the package level, it can be disabled for individual entities by setting
+     * this flag to false.
+     * @return true if enabled.
+     */
+    boolean enabled() default true;
+}