getPlatforms() {
return platforms;
}
-
+
public String joinPlatforms() {
if (platforms.isEmpty()) {
return null;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
index 0aeb20e69..790dc7b96 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
@@ -1,6 +1,6 @@
package io.ebeaninternal.server.deploy.parse;
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
import io.ebean.annotation.Formula;
import io.ebean.annotation.Where;
import io.ebean.config.NamingConvention;
@@ -21,28 +21,28 @@ import java.util.concurrent.ConcurrentMap;
/**
* Provides some base methods for processing deployment annotations. All findAnnotation* methods
- * are capable to search for meta-annotations (annotation that has an other annotation)
- *
+ * are capable to search for meta-annotations (annotation that has an other annotation)
+ *
* search algorithm for ONE annotation:
*
* - Check if annotation is direct on the property
- * - if not found: Check all annotations at the annotateElement
+ *
- if not found: Check all annotations at the annotateElement
* if they have the needed annotation as meta annotation
- * - if not found: go up to super class and try again
+ *
- if not found: go up to super class and try again
* (only findAnnotationRecursive)
*
- * DFS (Depth-First-Search) is used. The algorithm is the same as it is used in Spring-Framework,
+ * DFS (Depth-First-Search) is used. The algorithm is the same as it is used in Spring-Framework,
* as the code is taken from there.
- *
- * search algoritm for a Set<Annotation> works a litte bit different, as it does not stop
+ *
+ *
search algoritm for a Set<Annotation> works a litte bit different, as it does not stop
* on the first match, but continues searching down to the last corner to find all annotations.
- *
+ *
* To prevent endless recursion, the search algoritm tracks all visited annotations
- *
+ *
* Supports also "java 1.6 repeatable containers" like{@link JoinColumn} / {@link JoinColumns}.
- *
- * This means, searching for JoinColumn will find them also if they are inside a
- * JoinColumns annotation
+ *
+ * This means, searching for JoinColumn will find them also if they are inside a
+ * JoinColumns annotation
*/
public abstract class AnnotationBase {
@@ -218,10 +218,10 @@ public abstract class AnnotationBase {
while (clazz != null && clazz != Object.class) {
findMetaAnnotations(clazz, annotationType, ret, visited);
clazz = clazz.getSuperclass();
- }
+ }
return ret;
}
-
+
/**
* Perform the search algorithm avoiding endless recursion by tracking which
* annotations have already been visited.
@@ -305,7 +305,7 @@ public abstract class AnnotationBase {
}
private static final ConcurrentMap valueMethods = new ConcurrentHashMap<>();
- // only a non-null-marker the valueMethods - Cache
+ // only a non-null-marker the valueMethods - Cache
private static final Method nullMethod = getNullMethod();
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 718e9cd79..144ab495c 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -1,6 +1,6 @@
package io.ebeaninternal.server.query;
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
import io.ebean.RawSql;
import io.ebean.RawSql.ColumnMapping;
import io.ebean.RawSql.ColumnMapping.Column;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 374ecd2a4..0d0256191 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.transaction;
import io.ebean.TransactionCallback;
import io.ebean.annotation.DocStoreMode;
import io.ebean.bean.PersistenceContext;
-import io.ebean.PersistBatch;
+import io.ebean.annotation.PersistBatch;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
import io.ebean.event.changelog.BeanChange;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 3c38374d2..88606cf99 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.transaction;
import io.ebean.BackgroundExecutor;
import io.ebean.config.CurrentTenantProvider;
-import io.ebean.PersistBatch;
+import io.ebean.annotation.PersistBatch;
import io.ebean.config.dbplatform.DatabasePlatform;
import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
import io.ebean.event.changelog.ChangeLogListener;
diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 597060606..94f7cccc2 100644
--- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -5,7 +5,7 @@ import io.ebean.annotation.DbEnumType;
import io.ebean.annotation.DbEnumValue;
import io.ebean.annotation.EnumValue;
import io.ebean.config.JsonConfig;
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
import io.ebean.config.ScalarTypeConverter;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.DatabasePlatform;