From f3512714c0498467d8376ae1050bc3b727d0a84f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 25 Feb 2022 06:07:08 +0100 Subject: [PATCH] Disable old odk approach --- .../argeo/app/odk/BundleResourceOdkForm.java | 1 + .../src/org/argeo/app/odk/OdkForm.java | 1 + .../app/servlet/odk/OdkFormListServlet.java | 172 +++++++++--------- .../argeo/app/servlet/odk/OdkFormServlet.java | 59 +++--- 4 files changed, 112 insertions(+), 121 deletions(-) diff --git a/org.argeo.app.core/src/org/argeo/app/odk/BundleResourceOdkForm.java b/org.argeo.app.core/src/org/argeo/app/odk/BundleResourceOdkForm.java index 97f978b..8195dd4 100644 --- a/org.argeo.app.core/src/org/argeo/app/odk/BundleResourceOdkForm.java +++ b/org.argeo.app.core/src/org/argeo/app/odk/BundleResourceOdkForm.java @@ -13,6 +13,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** {@link OdkForm} implementation based on an OSGi {@link Bundle} resource. */ +@Deprecated public class BundleResourceOdkForm implements OdkForm { private String formId; private String name; diff --git a/org.argeo.app.core/src/org/argeo/app/odk/OdkForm.java b/org.argeo.app.core/src/org/argeo/app/odk/OdkForm.java index ec37a6f..0cee0f8 100644 --- a/org.argeo.app.core/src/org/argeo/app/odk/OdkForm.java +++ b/org.argeo.app.core/src/org/argeo/app/odk/OdkForm.java @@ -3,6 +3,7 @@ package org.argeo.app.odk; import java.io.InputStream; /** Abstraction of a single ODK form. */ +@Deprecated public interface OdkForm { String getFormId(); diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java index c88bf4a..4732e70 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java @@ -2,9 +2,6 @@ package org.argeo.app.servlet.odk; import java.io.IOException; import java.io.Writer; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -22,7 +19,6 @@ import javax.servlet.http.HttpServletResponse; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; import org.argeo.app.api.EntityType; -import org.argeo.app.odk.OdkForm; import org.argeo.app.odk.OrxListName; import org.argeo.app.odk.OrxManifestName; import org.argeo.cms.auth.RemoteAuthUtils; @@ -35,7 +31,7 @@ public class OdkFormListServlet extends HttpServlet { private static final long serialVersionUID = 2706191315048423321L; private final static CmsLog log = CmsLog.getLog(OdkFormListServlet.class); - private Set odkForms = Collections.synchronizedSet(new HashSet<>()); +// private Set odkForms = Collections.synchronizedSet(new HashSet<>()); // private DateTimeFormatter versionFormatter = DateTimeFormatter.ofPattern("YYYY-MM-dd-HHmm") // .withZone(ZoneId.from(ZoneOffset.UTC)); @@ -60,107 +56,107 @@ public class OdkFormListServlet extends HttpServlet { Writer writer = resp.getWriter(); writer.append(""); writer.append(""); - boolean oldApproach = false; - if (!oldApproach) { - try { +// boolean oldApproach = false; +// if (!oldApproach) { + try { - Query query; - if (pathInfo == null) { + Query query; + if (pathInfo == null) { // query = session.getWorkspace().getQueryManager() // .createQuery("SELECT * FROM [nt:unstructured]", Query.JCR_SQL2); - query = session.getWorkspace().getQueryManager() - .createQuery("SELECT * FROM [" + OrxListName.xform.get() + "]", Query.JCR_SQL2); - } else { - query = session.getWorkspace().getQueryManager() - .createQuery( - "SELECT node FROM [" + OrxListName.xform.get() - + "] AS node WHERE ISDESCENDANTNODE (node, '" + pathInfo + "')", - Query.JCR_SQL2); - } - QueryResult queryResult = query.execute(); + query = session.getWorkspace().getQueryManager() + .createQuery("SELECT * FROM [" + OrxListName.xform.get() + "]", Query.JCR_SQL2); + } else { + query = session.getWorkspace().getQueryManager() + .createQuery( + "SELECT node FROM [" + OrxListName.xform.get() + + "] AS node WHERE ISDESCENDANTNODE (node, '" + pathInfo + "')", + Query.JCR_SQL2); + } + QueryResult queryResult = query.execute(); - NodeIterator nit = queryResult.getNodes(); + NodeIterator nit = queryResult.getNodes(); // log.debug(session.getUserID()); // log.debug(session.getWorkspace().getName()); // NodeIterator nit = session.getRootNode().getNodes(); // while (nit.hasNext()) { // log.debug(nit.nextNode()); // } - while (nit.hasNext()) { - StringBuilder sb = new StringBuilder(); - Node node = nit.nextNode(); - if (node.isNodeType(OrxListName.xform.get())) { - sb.append(""); - sb.append("" + node.getProperty(OrxListName.formID.get()).getString() + ""); - sb.append("" + Jcr.getTitle(node) + ""); - sb.append("" + node.getProperty(OrxListName.version.get()).getString() + ""); - sb.append("md5:" + JcrxApi.getChecksum(node, JcrxApi.MD5) + ""); - if (node.hasProperty(Property.JCR_DESCRIPTION)) - sb.append("" + node.getProperty(Property.JCR_DESCRIPTION).getString() + ""); - sb.append("" + protocol + "://" + serverName - + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form" - + node.getPath() + ""); - if (node.hasNode(OrxManifestName.manifest.name())) { - sb.append("" + protocol + "://" + serverName - + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) - + "/api/odk/formManifest" + node.getNode(OrxManifestName.manifest.name()).getPath() - + ""); - } - sb.append(""); - } else if (node.isNodeType(EntityType.formSet.get())) { - sb.append(""); - sb.append("" + node.getPath() + ""); - sb.append("" + node.getProperty(Property.JCR_TITLE).getString() + ""); - sb.append("" + protocol + "://" + serverName - + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/formList" - + node.getPath() + ""); - sb.append(""); - } - String str = sb.toString(); - if (!str.equals("")) { - if (log.isDebugEnabled()) - log.debug(str); - writer.append(str); + while (nit.hasNext()) { + StringBuilder sb = new StringBuilder(); + Node node = nit.nextNode(); + if (node.isNodeType(OrxListName.xform.get())) { + sb.append(""); + sb.append("" + node.getProperty(OrxListName.formID.get()).getString() + ""); + sb.append("" + Jcr.getTitle(node) + ""); + sb.append("" + node.getProperty(OrxListName.version.get()).getString() + ""); + sb.append("md5:" + JcrxApi.getChecksum(node, JcrxApi.MD5) + ""); + if (node.hasProperty(Property.JCR_DESCRIPTION)) + sb.append("" + node.getProperty(Property.JCR_DESCRIPTION).getString() + ""); + sb.append("" + protocol + "://" + serverName + + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form" + + node.getPath() + ""); + if (node.hasNode(OrxManifestName.manifest.name())) { + sb.append("" + protocol + "://" + serverName + + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + + "/api/odk/formManifest" + node.getNode(OrxManifestName.manifest.name()).getPath() + + ""); } + sb.append(""); + } else if (node.isNodeType(EntityType.formSet.get())) { + sb.append(""); + sb.append("" + node.getPath() + ""); + sb.append("" + node.getProperty(Property.JCR_TITLE).getString() + ""); + sb.append("" + protocol + "://" + serverName + + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/formList" + + node.getPath() + ""); + sb.append(""); } - } catch (RepositoryException e) { - e.printStackTrace(); - // TODO error message - // resp.sendError(500); - resp.sendError(503); - } finally { - Jcr.logout(session); - } - - } else { - for (OdkForm form : odkForms) { - StringBuilder sb = new StringBuilder(); - sb.append(""); - sb.append("" + form.getFormId() + ""); - sb.append("" + form.getName() + ""); - sb.append("" + form.getVersion() + ""); - sb.append("" + form.getHash(null) + ""); - sb.append("" + form.getDescription() + ""); - sb.append("" + protocol + "://" + serverName - + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form/" - + form.getFileName() + ""); - sb.append(""); String str = sb.toString(); - if (log.isDebugEnabled()) - log.debug(str); - writer.append(str); + if (!str.equals("")) { + if (log.isDebugEnabled()) + log.debug(str); + writer.append(str); + } } + } catch (RepositoryException e) { + e.printStackTrace(); + // TODO error message + // resp.sendError(500); + resp.sendError(503); + } finally { + Jcr.logout(session); } - writer.append(""); - } - public void addForm(OdkForm odkForm) { - odkForms.add(odkForm); +// } else { +// for (OdkForm form : odkForms) { +// StringBuilder sb = new StringBuilder(); +// sb.append(""); +// sb.append("" + form.getFormId() + ""); +// sb.append("" + form.getName() + ""); +// sb.append("" + form.getVersion() + ""); +// sb.append("" + form.getHash(null) + ""); +// sb.append("" + form.getDescription() + ""); +// sb.append("" + protocol + "://" + serverName +// + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form/" +// + form.getFileName() + ""); +// sb.append(""); +// String str = sb.toString(); +// if (log.isDebugEnabled()) +// log.debug(str); +// writer.append(str); +// } +// } + writer.append(""); } - public void removeForm(OdkForm odkForm) { - odkForms.remove(odkForm); - } +// public void addForm(OdkForm odkForm) { +// odkForms.add(odkForm); +// } +// +// public void removeForm(OdkForm odkForm) { +// odkForms.remove(odkForm); +// } public void setRepository(Repository repository) { this.repository = repository; diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java index 067262e..d236bc5 100644 --- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java +++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java @@ -1,13 +1,8 @@ package org.argeo.app.servlet.odk; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import javax.jcr.Repository; import javax.jcr.RepositoryException; @@ -17,8 +12,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.FilenameUtils; -import org.argeo.app.odk.OdkForm; import org.argeo.app.odk.OdkNames; import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.servlet.ServletHttpRequest; @@ -29,7 +22,7 @@ public class OdkFormServlet extends HttpServlet { private static final long serialVersionUID = 7838305967987687370L; private Repository repository; - private Map odkForms = Collections.synchronizedMap(new HashMap<>()); +// private Map odkForms = Collections.synchronizedMap(new HashMap<>()); @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -41,25 +34,25 @@ public class OdkFormServlet extends HttpServlet { if (pathInfo.startsWith("//")) pathInfo = pathInfo.substring(1); - boolean oldApproach = false; +// boolean oldApproach = false; try { - if (!oldApproach) { - String path = URLDecoder.decode(pathInfo, StandardCharsets.UTF_8); - session.exportDocumentView(path + "/" + OdkNames.H_HTML, resp.getOutputStream(), true, false); - } else { - - String fileName = FilenameUtils.getName(pathInfo); - OdkForm form = odkForms.get(fileName); - if (form == null) - throw new IllegalArgumentException("No form named " + fileName + " was found"); - - byte[] buffer = new byte[1024]; - try (InputStream in = form.openStream(); OutputStream out = resp.getOutputStream();) { - int bytesRead; - while ((bytesRead = in.read(buffer)) != -1) - out.write(buffer, 0, bytesRead); - } - } +// if (!oldApproach) { + String path = URLDecoder.decode(pathInfo, StandardCharsets.UTF_8); + session.exportDocumentView(path + "/" + OdkNames.H_HTML, resp.getOutputStream(), true, false); +// } else { +// +// String fileName = FilenameUtils.getName(pathInfo); +// OdkForm form = odkForms.get(fileName); +// if (form == null) +// throw new IllegalArgumentException("No form named " + fileName + " was found"); +// +// byte[] buffer = new byte[1024]; +// try (InputStream in = form.openStream(); OutputStream out = resp.getOutputStream();) { +// int bytesRead; +// while ((bytesRead = in.read(buffer)) != -1) +// out.write(buffer, 0, bytesRead); +// } +// } } catch (RepositoryException e) { e.printStackTrace(); // TODO error message @@ -69,13 +62,13 @@ public class OdkFormServlet extends HttpServlet { } } - public void addForm(OdkForm odkForm) { - odkForms.put(odkForm.getFileName(), odkForm); - } - - public void removeForm(OdkForm odkForm) { - odkForms.remove(odkForm.getFileName()); - } +// public void addForm(OdkForm odkForm) { +// odkForms.put(odkForm.getFileName(), odkForm); +// } +// +// public void removeForm(OdkForm odkForm) { +// odkForms.remove(odkForm.getFileName()); +// } public void setRepository(Repository repository) { this.repository = repository; -- 2.30.2