From c4c5fed0fa4895cbf97d18b09ac07b3107d0c3df Mon Sep 17 00:00:00 2001 From: hengsin Date: Thu, 28 Oct 2021 17:16:30 +0800 Subject: [PATCH] IDEMPIERE-5012 org.idempiere.ui.zk.annotation.Form annotation (#954) change naming convention to follow other annotation based factory --- ...ebui.factory.DefaultAnnotationBasedFormFactory.xml} | 4 ++-- ...ormFactory.java => AnnotationBasedFormFactory.java} | 6 +++--- ...ory.java => DefaultAnnotationBasedFormFactory.java} | 4 ++-- .../src/org/idempiere/test/model/FormTest.java | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) rename org.adempiere.ui.zk/OSGI-INF/{org.adempiere.webui.factory.DefaultScanBasedFormFactory.xml => org.adempiere.webui.factory.DefaultAnnotationBasedFormFactory.xml} (57%) rename org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/{ScanBasedFormFactory.java => AnnotationBasedFormFactory.java} (96%) rename org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/{DefaultScanBasedFormFactory.java => DefaultAnnotationBasedFormFactory.java} (94%) diff --git a/org.adempiere.ui.zk/OSGI-INF/org.adempiere.webui.factory.DefaultScanBasedFormFactory.xml b/org.adempiere.ui.zk/OSGI-INF/org.adempiere.webui.factory.DefaultAnnotationBasedFormFactory.xml similarity index 57% rename from org.adempiere.ui.zk/OSGI-INF/org.adempiere.webui.factory.DefaultScanBasedFormFactory.xml rename to org.adempiere.ui.zk/OSGI-INF/org.adempiere.webui.factory.DefaultAnnotationBasedFormFactory.xml index 7d16c590d6..8f05749cec 100644 --- a/org.adempiere.ui.zk/OSGI-INF/org.adempiere.webui.factory.DefaultScanBasedFormFactory.xml +++ b/org.adempiere.ui.zk/OSGI-INF/org.adempiere.webui.factory.DefaultAnnotationBasedFormFactory.xml @@ -1,8 +1,8 @@ - + - + \ No newline at end of file diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ScanBasedFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/AnnotationBasedFormFactory.java similarity index 96% rename from org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ScanBasedFormFactory.java rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/AnnotationBasedFormFactory.java index 3d360b57cc..9a3a30e4fd 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/ScanBasedFormFactory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/AnnotationBasedFormFactory.java @@ -50,7 +50,7 @@ import io.github.classgraph.ScanResult; * @author hengsin * */ -public abstract class ScanBasedFormFactory implements IFormFactory { +public abstract class AnnotationBasedFormFactory implements IFormFactory { private final Map classCache = new HashMap<>(); @@ -58,9 +58,9 @@ public abstract class ScanBasedFormFactory implements IFormFactory { private BundleContext bundleContext = null; - private static final CLogger s_log = CLogger.getCLogger(ScanBasedFormFactory.class); + private static final CLogger s_log = CLogger.getCLogger(AnnotationBasedFormFactory.class); - public ScanBasedFormFactory() { + public AnnotationBasedFormFactory() { } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultScanBasedFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultAnnotationBasedFormFactory.java similarity index 94% rename from org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultScanBasedFormFactory.java rename to org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultAnnotationBasedFormFactory.java index 0edbe99e98..42bc998b9a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultScanBasedFormFactory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultAnnotationBasedFormFactory.java @@ -32,9 +32,9 @@ import org.osgi.service.component.annotations.Component; * */ @Component(immediate = true, service = IFormFactory.class, property = {"service.ranking:Integer=0"}) -public final class DefaultScanBasedFormFactory extends ScanBasedFormFactory { +public final class DefaultAnnotationBasedFormFactory extends AnnotationBasedFormFactory { - public DefaultScanBasedFormFactory() { + public DefaultAnnotationBasedFormFactory() { } @Override diff --git a/org.idempiere.test/src/org/idempiere/test/model/FormTest.java b/org.idempiere.test/src/org/idempiere/test/model/FormTest.java index eb6f21964c..28feb327d8 100644 --- a/org.idempiere.test/src/org/idempiere/test/model/FormTest.java +++ b/org.idempiere.test/src/org/idempiere/test/model/FormTest.java @@ -31,7 +31,7 @@ import java.util.List; import org.adempiere.base.IServiceReferenceHolder; import org.adempiere.base.Service; -import org.adempiere.webui.factory.DefaultScanBasedFormFactory; +import org.adempiere.webui.factory.DefaultAnnotationBasedFormFactory; import org.adempiere.webui.factory.IFormFactory; import org.compiere.model.MForm; import org.compiere.model.Query; @@ -51,19 +51,19 @@ public class FormTest extends AbstractTestCase { @Test public void testCoreFormMapping() { - DefaultScanBasedFormFactory formFactory = null; + DefaultAnnotationBasedFormFactory formFactory = null; List> factories = Service.locator().list(IFormFactory.class).getServiceReferences(); if (factories != null) { for(IServiceReferenceHolder factory : factories) { IFormFactory service = factory.getService(); - if (service != null && service instanceof DefaultScanBasedFormFactory) { - formFactory = (DefaultScanBasedFormFactory) service; + if (service != null && service instanceof DefaultAnnotationBasedFormFactory) { + formFactory = (DefaultAnnotationBasedFormFactory) service; break; } } } - assertNotNull(formFactory, "Failed to locate DefaultScanBasedFormFactory"); + assertNotNull(formFactory, "Failed to locate DefaultAnnotationBasedFormFactory"); Query query = new Query(Env.getCtx(), MForm.Table_Name, "AD_Form_ID < 1000000 AND ClassName IS NOT NULL " + " AND EXISTS (select 1 from ad_menu where isactive='Y' and ad_form_id=ad_form.ad_form_id)", getTrxName());