* Used by the agent to detect already enhanced type query beans to skip enhancement processing. - *
*/ @Target({ ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@Retention(RetentionPolicy.CLASS) public @interface AlreadyEnhancedMarker { } diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java b/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java index 918e0d1b4..92036e7eb 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/Generated.java @@ -11,7 +11,7 @@ import java.lang.annotation.Target; * This is code generated by the query bean generator (annotation processor). */ @Target({ ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@Retention(RetentionPolicy.CLASS) public @interface Generated { /** diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java index 3883afe66..e6b2590e8 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseValueEqual.java @@ -247,4 +247,15 @@ public abstract class PBaseValueEqual+ * When set to true all the beans from this query are loaded into the bean cache. */ + @Deprecated public R setLoadBeanCache(boolean loadBeanCache) { query.setLoadBeanCache(loadBeanCache); return root; diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java index d0a538ee5..10a7c7e58 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TypeQueryBean.java @@ -9,10 +9,9 @@ import java.lang.annotation.Target; * Used to denote a type query bean. *
* These are typically generated beans used to build queries using type safe query criteria. - *
*/ @Target({ ElementType.TYPE }) -@Retention(RetentionPolicy.RUNTIME) +@Retention(RetentionPolicy.CLASS) public @interface TypeQueryBean { /** diff --git a/ebean-querybean/src/test/resources/ebean.mf b/ebean-querybean/src/test/resources/ebean.mf index 5c97580de..90beca56f 100644 --- a/ebean-querybean/src/test/resources/ebean.mf +++ b/ebean-querybean/src/test/resources/ebean.mf @@ -1,2 +1,4 @@ entity-packages: org.example.domain querybean-packages: org.example.domain,org.querytest +debug: 0 +synthetic: false diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d469881b0..122d21d26 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -80,7 +80,7 @@
- * Can instead be explicitly specified via ebean.test.dockerHost.
- */
- String defaultDockerHost() {
- String os = System.getProperty("os.name", "generic").toLowerCase(Locale.ENGLISH);
- if (os.contains("mac") || os.contains("darwin") || os.contains("win")) {
- return "host.docker.internal";
- } else {
- return "172.17.0.1";
- }
- }
-
-}
diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java b/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java
index 0fd933d26..5dc46ade5 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java
@@ -1,5 +1,6 @@
package io.ebean.test.config.platform;
+import io.ebean.test.containers.DockerHost;
import io.ebean.test.containers.RedisContainer;
import java.util.Properties;
@@ -10,11 +11,8 @@ class RedisSetup {
String version = properties.getProperty("ebean.test.redis");
version = properties.getProperty("ebean.test.redis.version", version);
if (version != null) {
- DockerHost dockerHost = new DockerHost();
- if (dockerHost.runningInDocker()) {
- String host = dockerHost.dockerHost(properties.getProperty("ebean.test.dockerHost"));
- properties.setProperty("redis.host", host);
- }
+ String host = properties.getProperty("ebean.test.dockerHost", DockerHost.host());
+ properties.setProperty("redis.host", host);
RedisContainer.builder(version)
.properties(properties)
.build()
diff --git a/ebean-test/src/test/java/io/ebean/test/config/platform/DockerHostTest.java b/ebean-test/src/test/java/io/ebean/test/config/platform/DockerHostTest.java
deleted file mode 100644
index 0be8a5d43..000000000
--- a/ebean-test/src/test/java/io/ebean/test/config/platform/DockerHostTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.ebean.test.config.platform;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class DockerHostTest {
-
- @Test
- void runningInDocker_when_false_alwaysUseLocalhost() {
- DockerHost dockerHost = new DockerHost();
- assertFalse(dockerHost.runningInDocker());
- assertEquals("localhost", dockerHost.dockerHost("foo"));
- }
-
- @Test
- void runningInDocker_when_true_useExplicit() {
- TDDockerHost dockerHost = new TDDockerHost();
- assertTrue(dockerHost.runningInDocker());
-
- assertEquals("my-host", dockerHost.dockerHost("my-host"));
- }
-
- @Disabled
- @Test
- void runningInDocker_when_trueAndLinux_useDefault() {
- TDDockerHost dockerHost = new TDDockerHost();
- assertTrue(dockerHost.runningInDocker());
-
- assertEquals("172.17.0.1", dockerHost.dockerHost(null));
- }
-
- @Test
- void runningInDocker_when_windowsDefault() {
- TDDockerHost dockerHost = new TDDockerHost();
- assertTrue(dockerHost.runningInDocker());
-
- String origName = System.getProperty("os.name");
- System.setProperty("os.name", "win");
- try {
- assertEquals("host.docker.internal",dockerHost.defaultDockerHost());
- assertEquals("host.docker.internal", dockerHost.dockerHost(null));
- } finally {
- System.setProperty("os.name", origName);
- }
- }
-
- @Test
- void runningInDocker_when_macDefault() {
- TDDockerHost dockerHost = new TDDockerHost();
- assertTrue(dockerHost.runningInDocker());
-
- String origName = System.getProperty("os.name");
- System.setProperty("os.name", "mac");
- try {
- assertEquals("host.docker.internal",dockerHost.defaultDockerHost());
- assertEquals("host.docker.internal", dockerHost.dockerHost(null));
- } finally {
- System.setProperty("os.name", origName);
- }
- }
-
-
- @Test
- void runningInDocker_when_linuxDefault() {
- TDDockerHost dockerHost = new TDDockerHost();
- assertTrue(dockerHost.runningInDocker());
-
- String origName = System.getProperty("os.name");
- System.setProperty("os.name", "linux");
- try {
- assertEquals("172.17.0.1",dockerHost.defaultDockerHost());
- assertEquals("172.17.0.1", dockerHost.dockerHost(null));
- } finally {
- System.setProperty("os.name", origName);
- }
- }
-
- static class TDDockerHost extends DockerHost {
-
- @Override
- boolean initInDocker() {
- return true;
- }
- }
-}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java
index 8b86e635c..5c62ac653 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java
@@ -24,12 +24,36 @@ public class DtoQuery2Test extends BaseTestCase {
private static final Logger log = LoggerFactory.getLogger(DtoQuery2Test.class);
@Test
- public void dto_findList_constructorMatch() {
+ void dto_findList_fluidAccessors() {
+ ResetBasicData.reset();
+ List