androidannotations · WonderCsabo · Nov 20, 2014 · Nov 17, 2014 · Nov 17, 2014 · Nov 18, 2014
diff --git a/...tations/androidannotations/src/main/java/org/androidannotations/helper/OrmLiteHelper.java b/...tations/androidannotations/src/main/java/org/androidannotations/helper/OrmLiteHelper.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (C) 2010-2014 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.helper;
+
+import static com.sun.codemodel.JExpr._null;
+
+import org.androidannotations.holder.HasLifecycleMethods;
+import org.androidannotations.process.ProcessHolder;
+
+import com.sun.codemodel.JBlock;
+import com.sun.codemodel.JFieldVar;
+
+public class OrmLiteHelper {
+
+	public static void injectReleaseInDestroy(JFieldVar databaseHelperRef, HasLifecycleMethods holder, ProcessHolder.Classes classes) {
+		JBlock destroyBody = holder.getOnDestroyBeforeSuperBlock();
+
+		destroyBody.staticInvoke(classes.OPEN_HELPER_MANAGER, "releaseHelper");
+		destroyBody.assign(databaseHelperRef, _null());
+	}
+}
diff --git a/...tions/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java b/...tions/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
@@ -27,23 +27,27 @@
 import com.sun.codemodel.JMod;
 import com.sun.codemodel.JType;
 import com.sun.codemodel.JVar;
+
 import org.androidannotations.api.SdkVersionHelper;
 import org.androidannotations.helper.ActionBarSherlockHelper;
 import org.androidannotations.helper.ActivityIntentBuilder;
 import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.AnnotationHelper;
 import org.androidannotations.helper.CanonicalNameConstants;
 import org.androidannotations.helper.IntentBuilder;
+import org.androidannotations.helper.OrmLiteHelper;
 import org.androidannotations.process.ProcessHolder;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
-import java.util.ArrayList;
-import java.util.List;
 
 import static com.sun.codemodel.JExpr.FALSE;
 import static com.sun.codemodel.JExpr.TRUE;
@@ -757,4 +761,11 @@ public JFieldVar getIntentFilterField(String[] actions, String[] dataSchemes) {
 		return receiverRegistrationHolder.getIntentFilterField(actions, dataSchemes);
 	}
 
+	@Override
+	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
+		JFieldVar databaseHelperRef = super.setDatabaseHelperRef(databaseHelperTypeMirror);
+		OrmLiteHelper.injectReleaseInDestroy(databaseHelperRef, this, classes());
+
+		return databaseHelperRef;
+	}
 }
diff --git a/...ions/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java b/...ions/androidannotations/src/main/java/org/androidannotations/holder/EComponentHolder.java
@@ -111,7 +111,7 @@ public JFieldVar getDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
 		return databaseHelperRef;
 	}
 
-	private JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
+	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
 		JClass databaseHelperClass = refClass(databaseHelperTypeMirror.toString());
 		String fieldName = CaseHelper.lowerCaseFirst(databaseHelperClass.name()) + ModelConstants.GENERATION_SUFFIX;
 		JFieldVar databaseHelperRef = generatedClass.field(PRIVATE, databaseHelperClass, fieldName);

diff --git a/...tions/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java b/...tions/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
@@ -27,15 +27,19 @@
 import com.sun.codemodel.JMod;
 import com.sun.codemodel.JTypeVar;
 import com.sun.codemodel.JVar;
+
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.helper.ActionBarSherlockHelper;
 import org.androidannotations.helper.AnnotationHelper;
+import org.androidannotations.helper.OrmLiteHelper;
 import org.androidannotations.process.ProcessHolder;
 
-import javax.lang.model.element.TypeElement;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
 import static com.sun.codemodel.JExpr.FALSE;
 import static com.sun.codemodel.JExpr.TRUE;
 import static com.sun.codemodel.JExpr._new;
@@ -540,4 +544,12 @@ public JBlock getOnDetachBeforeSuperBlock() {
 		}
 		return onDetachBeforeSuperBlock;
 	}
+
+	@Override
+	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
+		JFieldVar databaseHelperRef = super.setDatabaseHelperRef(databaseHelperTypeMirror);
+		OrmLiteHelper.injectReleaseInDestroy(databaseHelperRef, this, classes());
+
+		return databaseHelperRef;
+	}
 }
diff --git a/...ations/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java b/...ations/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java
@@ -18,10 +18,12 @@
 import com.sun.codemodel.*;
 import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.IntentBuilder;
+import org.androidannotations.helper.OrmLiteHelper;
 import org.androidannotations.helper.ServiceIntentBuilder;
 import org.androidannotations.process.ProcessHolder;
 
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
 
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JMod.PRIVATE;
@@ -130,4 +132,12 @@ public JBlock getOnAttachAfterSuperBlock() {
 	public JBlock getOnDetachBeforeSuperBlock() {
 		return receiverRegistrationHolder.getOnDetachBeforeSuperBlock();
 	}
+
+	@Override
+	protected JFieldVar setDatabaseHelperRef(TypeMirror databaseHelperTypeMirror) {
+		JFieldVar databaseHelperRef = super.setDatabaseHelperRef(databaseHelperTypeMirror);
+		OrmLiteHelper.injectReleaseInDestroy(databaseHelperRef, this, classes());
+
+		return databaseHelperRef;
+	}
 }
diff --git a/...s/androidannotations/src/main/java/org/androidannotations/holder/HasLifecycleMethods.java b/...s/androidannotations/src/main/java/org/androidannotations/holder/HasLifecycleMethods.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (C) 2010-2014 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.holder;
+
+import com.sun.codemodel.JBlock;
+
+public interface HasLifecycleMethods extends GeneratedClassHolder {
+
+	JBlock getOnCreateAfterSuperBlock();
+	JBlock getOnDestroyBeforeSuperBlock();
+
+	JBlock getOnStartAfterSuperBlock();
+	JBlock getOnStopBeforeSuperBlock();
+
+	JBlock getOnResumeAfterSuperBlock();
+	JBlock getOnPauseBeforeSuperBlock();
+
+	JBlock getOnAttachAfterSuperBlock();
+	JBlock getOnDetachBeforeSuperBlock();
+}
diff --git a/...droidannotations/src/main/java/org/androidannotations/holder/HasReceiverRegistration.java b/...droidannotations/src/main/java/org/androidannotations/holder/HasReceiverRegistration.java
@@ -15,25 +15,12 @@
  */
 package org.androidannotations.holder;
 
-import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JExpression;
 import com.sun.codemodel.JFieldVar;
 
-public interface HasReceiverRegistration extends GeneratedClassHolder {
+public interface HasReceiverRegistration extends HasLifecycleMethods {
 
 	JExpression getContextRef();
 
 	JFieldVar getIntentFilterField(String[] actions, String[] dataSchemas);
-
-	JBlock getOnCreateAfterSuperBlock();
-	JBlock getOnDestroyBeforeSuperBlock();
-
-	JBlock getOnStartAfterSuperBlock();
-	JBlock getOnStopBeforeSuperBlock();
-
-	JBlock getOnResumeAfterSuperBlock();
-	JBlock getOnPauseBeforeSuperBlock();
-
-	JBlock getOnAttachAfterSuperBlock();
-	JBlock getOnDetachBeforeSuperBlock();
 }
diff --git a/...est-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyActivity.java b/...est-1-5/src/main/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyActivity.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (C) 2010-2014 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.test15.ormlite;
+
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.OrmLiteDao;
+
+import android.app.Activity;
+
+@EActivity
+public class OrmLiteOnDestroyActivity extends Activity {
+
+	@OrmLiteDao(helper = DatabaseHelper.class)
+	UserDao userDao;
+}
diff --git a/...al-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyTest.java b/...al-test-1-5/src/test/java/org/androidannotations/test15/ormlite/OrmLiteOnDestroyTest.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (C) 2010-2014 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.test15.ormlite;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+import static org.fest.reflect.core.Reflection.field;
+import static org.fest.reflect.core.Reflection.staticField;
+
+import org.fest.reflect.field.Invoker;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.util.ActivityController;
+
+import com.j256.ormlite.android.apptools.OpenHelperManager;
+import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
+
+@RunWith(RobolectricTestRunner.class)
+public class OrmLiteOnDestroyTest {
+
+	private ActivityController<OrmLiteOnDestroyActivity_> controller;
+	private Invoker<Integer> instanceCountInvoker;
+
+	@Before
+	public void setup() throws NoSuchFieldException, IllegalAccessException {
+		staticField("helper").ofType(OrmLiteSqliteOpenHelper.class).in(OpenHelperManager.class).set(null);
+		staticField("helperClass").ofType(Class.class).in(OpenHelperManager.class).set(null);
+		staticField("wasClosed").ofType(boolean.class).in(OpenHelperManager.class).set(false);
+
+		instanceCountInvoker = staticField("instanceCount").ofType(int.class).in(OpenHelperManager.class);
+		instanceCountInvoker.set(0);
+
+		controller = Robolectric.buildActivity(OrmLiteOnDestroyActivity_.class).create();
+	}
+
+	@Test
+	public void helper_is_destroyed() throws Exception {
+		controller.destroy();
+
+		Object databaseHelper_ = field("databaseHelper_").ofType(OrmLiteSqliteOpenHelper.class).in(controller.get()).get();
+		assertThat(databaseHelper_).isNull();
+		assertThat(instanceCountInvoker.get()).isEqualTo(0);
+	}
+}