[maven-release-plugin] prepare release ebean-11.15.9

Restore mapping.

pom.xml

@@ -9,15 +9,20 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.15.5</version>
+  <version>11.15.9</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
   <url>http://ebean-orm.github.io/</url>
 
+  <properties>
+    <jackson-core.version>2.9.5</jackson-core.version>
+    <snakeyaml.version>1.21</snakeyaml.version>
+  </properties>
+
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.15.5</tag>
+    <tag>ebean-11.15.9</tag>
   </scm>
 
   <profiles>
@@ -89,7 +94,7 @@
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.19</version>
+      <version>${snakeyaml.version}</version>
     </dependency>
 
     <!--
@@ -143,14 +148,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.0</version>
+      <version>${jackson-core.version}</version>
     </dependency>
 
     <!-- provided scope for JsonNode support -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.0</version>
+      <version>${jackson-core.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -169,13 +174,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>

src/main/java/io/ebeaninternal/server/core/ServletContextListener.java

@@ -1,32 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebeaninternal.server.lib.ShutdownManager;
-
-import javax.servlet.ServletContextEvent;
-
-/**
- * Listens for webserver server starting and stopping events.
- * <p>
- * Register this listener in the web.xml configuration file. This will listen
- * for startup and shutdown events.
- * </p>
- */
-public class ServletContextListener implements javax.servlet.ServletContextListener {
-
-  /**
-   * The servlet container is stopping.
-   */
-  @Override
-  public void contextDestroyed(ServletContextEvent event) {
-    ShutdownManager.shutdown();
-  }
-
-  /**
-   * Do nothing on startup.
-   */
-  @Override
-  public void contextInitialized(ServletContextEvent event) {
-
-  }
-
-}

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -71,6 +71,7 @@ import io.ebeaninternal.server.query.STreePropertyAssocMany;
 import io.ebeaninternal.server.query.STreePropertyAssocOne;
 import io.ebeaninternal.server.query.STreeType;
 import io.ebeaninternal.server.query.SqlBeanLoad;
+import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.type.DataBind;
@@ -1878,6 +1879,9 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * on first access (lazy load) or immediately (eager load)
    */
   public EntityBean createEntityBean(boolean isNew) {
+    if (prototypeEntityBean == null) {
+      throw new UnsupportedOperationException("cannot create entity bean for abstract entity " + getName());
+    }
     try {
       EntityBean bean = (EntityBean) prototypeEntityBean._ebean_newInstance();
 
@@ -1969,6 +1973,13 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   public T createReference(Object id, PersistenceContext pc) {
 
     try {
+      if (inheritInfo != null && !inheritInfo.isConcrete()) {
+        // we actually need to do a query because we don't know the type without the discriminator
+        // value, just select the id property and discriminator column (auto added)
+        DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
+        return query.select(getIdProperty().getName()).setId(id).findOne();
+      }
+
       EntityBean eb = createEntityBean();
       id = convertSetId(id, eb);
       EntityBeanIntercept ebi = eb._ebean_getIntercept();

src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -310,6 +310,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
         String discProperty = prefix + "." + discriminatorColumn;
         selectChain.add(discProperty);
       }
+      if (targetIdBinder == null) {
+        throw new IllegalStateException("No Id binding property for " + getFullBeanName()
+          + ". Probably a missing @OneToOne mapping annotation on this relationship?");
+      }
       targetIdBinder.buildRawSqlSelectChain(prefix, selectChain);
 
     } else {

src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java

@@ -123,13 +123,14 @@ public class DeployInherit {
       info.setColumnDefn(da.columnDefinition());
     }
 
-    DiscriminatorValue dv = AnnotationUtil.findAnnotation(cls, DiscriminatorValue.class); // do not search recursive
-    if (dv != null) {
-      info.setDiscriminatorValue(dv.value());
-    } else {
-      info.setDiscriminatorValue(cls.getSimpleName());
+    if (!info.isAbstract()) {
+      DiscriminatorValue dv = AnnotationUtil.findAnnotation(cls, DiscriminatorValue.class); // do not search recursive
+      if (dv != null) {
+        info.setDiscriminatorValue(dv.value());
+      } else {
+        info.setDiscriminatorValue(cls.getSimpleName());
+      }
     }
-
     return info;
   }
 

src/main/java/io/ebeaninternal/server/rawsql/DRawSqlParser.java

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.rawsql;
 
-import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
 import io.ebeaninternal.server.querydefn.SimpleTextParser;
+import io.ebeaninternal.server.rawsql.SpiRawSql.Sql;
 
 /**
  * Parses sql-select queries to try and determine the location where WHERE and
@@ -55,11 +55,7 @@ class DRawSqlParser {
 
   private Sql parse() {
 
-    if (!hasPlaceHolders()) {
-      // parse the sql for the keywords...
-      // select, from, where, having, group by, order by
-      parseSqlFindKeywords(true);
-    }
+    parseSqlFindKeywords(true);
 
     whereExprPos = findWhereExprPosition();
     havingExprPos = findHavingExprPosition();

src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java

@@ -58,9 +58,9 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -564,7 +564,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     boolean integerType = true;
 
-    Map<String, String> nameValueMap = new HashMap<>();
+    Map<String, String> nameValueMap = new LinkedHashMap<>();
 
     Field[] fields = enumType.getDeclaredFields();
     for (Field field : fields) {
@@ -657,7 +657,7 @@ public final class DefaultTypeManager implements TypeManager {
    */
   private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType) {
 
-    Map<String, String> nameValueMap = new HashMap<>();
+    Map<String, String> nameValueMap = new LinkedHashMap<>();
 
     Enum<?>[] enumConstants = enumType.getEnumConstants();
     for (Enum<?> enumConstant : enumConstants) {

src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java

@@ -57,4 +57,19 @@ public class TestRawSqlParsing extends BaseTestCase {
 
     assertThat(list).isNotEmpty();
   }
+
+  @Test
+  public void testWhere() {
+
+    ResetBasicData.reset();
+
+    RawSql sql = RawSqlBuilder.parse("SELECT id, name FROM o_customer ${where}").create();
+
+    List<Customer> customers = Ebean.createQuery(Customer.class)
+      .setRawSql(sql)
+      .where().gt("id", 1)
+      .findList();
+
+    assertThat(customers).isNotEmpty();
+  }
 }

src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java

@@ -0,0 +1,48 @@
+package org.tests.inheritance.abstrakt;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.Table;
+import javax.persistence.Version;
+
+@Entity
+@Table(name = "block")
+@Inheritance
+@DiscriminatorColumn(name = "case_type", discriminatorType = DiscriminatorType.INTEGER)
+public abstract class AbstractBaseBlock {
+
+  @Id
+  long id;
+
+  String name;
+
+  @Version
+  long version;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}

src/test/java/org/tests/inheritance/abstrakt/Block.java

@@ -0,0 +1,19 @@
+package org.tests.inheritance.abstrakt;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue(value = "2")
+public class Block extends AbstractBaseBlock {
+
+  String notes;
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+}

src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java

@@ -0,0 +1,18 @@
+package org.tests.inheritance.abstrakt;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.junit.Test;
+
+public class TestInheritanceNum extends BaseTestCase {
+
+  @Test
+  public void basicIUD() {
+
+    Block block = new Block();
+    block.setName("ibe");
+    block.setNotes("try it");
+
+    Ebean.save(block);
+  }
+}

src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java

@@ -0,0 +1,64 @@
+package org.tests.inheritance.cache;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.tests.model.basic.cache.CInhOne;
+import org.tests.model.basic.cache.CInhRef;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.ebeantest.LoggedSqlCollector;
+
+public class TestInheritanceRefCache extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    CInhOne one = new CInhOne();
+    one.setLicenseNumber("O12");
+    one.setDriver("Jimmy");
+    one.setNotes("Hello");
+
+    Ebean.save(one);
+
+    CInhRef ref = new CInhRef();
+    ref.setRef(one);
+
+    Ebean.save(ref);
+
+    Integer id = ref.getId();
+
+    LoggedSqlCollector.start();
+    CInhRef gotRef = Ebean.find(CInhRef.class).setId(id).findOne();
+
+    assertThat(gotRef).isInstanceOf(CInhRef.class);
+    assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("from cinh_ref").contains("left join cinh_root");
+
+    // fetch again - from cache (but fetch second bean from cache)
+    LoggedSqlCollector.start();
+    gotRef = Ebean.find(CInhRef.class).setId(id).findOne();
+
+    assertThat(gotRef).isInstanceOf(CInhRef.class);
+    assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("from cinh_root");
+
+
+    // fetch again - both from cache
+    LoggedSqlCollector.start();
+    gotRef = Ebean.find(CInhRef.class).setId(id).findOne();
+
+    assertThat(gotRef).isInstanceOf(CInhRef.class);
+    assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(0);
+
+  }
+}

src/test/java/org/tests/model/basic/cache/CInhRef.java

@@ -0,0 +1,25 @@
+package org.tests.model.basic.cache;
+
+import org.tests.model.basic.BasicDomain;
+
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Cache(enableQueryCache = true)
+public class CInhRef extends BasicDomain {
+  private static final long serialVersionUID = -4673953370819311120L;
+
+  @ManyToOne(cascade = {})
+  private CInhRoot ref;
+
+  public CInhRoot getRef() {
+    return ref;
+  }
+
+  public void setRef(CInhRoot ref) {
+    this.ref = ref;
+  }
+}