devgateway · brianbrix · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023
diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css b/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css
@@ -684,4 +684,14 @@ input[disabled], select[disabled]{
 
 .top-padding-10 {
     padding-top: 10px;
+}
+.save-gray-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5); /* Black background with opacity */
+    z-index: 1000; /* Ensure it's above other elements */
+    display: none; /* Hidden by default */
 }
diff --git a/amp/WEB-INF/applicationContext.xml b/amp/WEB-INF/applicationContext.xml
@@ -15,6 +15,9 @@
 	<beans:import resource="classpath:/applicationContext.xml" />
 
 	<beans:bean id="customHttpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall"/>
+
+
+
 	<http-firewall ref="customHttpFirewall"/>
 
 

diff --git a/amp/WEB-INF/src/hibernate.cfg.xml b/amp/WEB-INF/src/hibernate.cfg.xml
@@ -23,7 +23,7 @@
   <property name="jdbc.use_get_generated_keys">true</property>
   <property name="jdbc.use_streams_for_binary">true</property>
   <property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
-  <property name="hbm2ddl.auto">update</property>
+  <property name="hibernate.hbm2ddl.auto">update</property>
   <property name="hibernate.event.merge.entity_copy_observer" >allow</property>
 
  </session-factory>

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/CachedMachineTranslationService.java b/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/CachedMachineTranslationService.java
@@ -10,6 +10,9 @@
 import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -73,12 +76,14 @@ private Pair<Map<String, String>, List<String>> loadCachedTranslations(
 
             for (int i = 0; i < contents.size(); i += BATCH_SIZE) {
                 List<String> batchContents = contents.subList(i,  Math.min(i + BATCH_SIZE, contents.size()));
-                translations.addAll(PersistenceManager.getSession()
-                        .createCriteria(MachineTranslation.class)
-                        .add(Restrictions.eq("sourceLanguage", srcLang))
-                        .add(Restrictions.eq("targetLanguage", destLang))
-                        .add(Restrictions.in("text", batchContents))
-                        .list());
+                Session session = PersistenceManager.getRequestDBSession();
+                CriteriaBuilder builder = session.getCriteriaBuilder();
+                CriteriaQuery<MachineTranslation> criteriaQuery = builder.createQuery(MachineTranslation.class);
+                Root<MachineTranslation> root = criteriaQuery.from(MachineTranslation.class);
+                criteriaQuery.select(root).where(builder.equal(root.get("sourceLanguage"), srcLang),builder.equal(root.get("targetLanguage"), destLang),
+                        builder.equal(root.get("text"), batchContents));
+
+                translations.addAll(session.createQuery(criteriaQuery).list());
             }
 
             return translations.stream().map(o -> ((MachineTranslation) o))
@@ -124,10 +129,13 @@ private Predicate<? super String> upToCodePoints(int charsAllowed) {
     }
 
     private int getCharactersUsedThisMonth() {
-        MachineTranslationCharactersUsed used = (MachineTranslationCharactersUsed) PersistenceManager.getSession()
-                .createCriteria(MachineTranslationCharactersUsed.class)
-                .add(Restrictions.eq("id", 1L))
-                .uniqueResult();
+        Session session = PersistenceManager.getRequestDBSession();
+        CriteriaBuilder builder = session.getCriteriaBuilder();
+        CriteriaQuery<MachineTranslationCharactersUsed> criteriaQuery = builder.createQuery(MachineTranslationCharactersUsed.class);
+        Root<MachineTranslationCharactersUsed> root = criteriaQuery.from(MachineTranslationCharactersUsed.class);
+        criteriaQuery.select(root).where(builder.equal(root.get("id"),1L));
+
+        MachineTranslationCharactersUsed used = session.createQuery(criteriaQuery).uniqueResult();
         if (used != null && used.getMonth().equals(getCurrentMonth())) {
             return used.getUsed();
         } else {

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ColumnReportDataPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ColumnReportDataPDF.java
@@ -17,7 +17,6 @@
 import org.digijava.kernel.translator.TranslatorWorker;
 import org.digijava.module.aim.action.ExportActivityToPDF;
 
-
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupReportDataPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupReportDataPDF.java
@@ -17,8 +17,6 @@
 import org.dgfoundation.amp.ar.Viewable;
 import org.digijava.module.aim.action.ExportActivityToPDF;
 
-import java.util.Iterator;
-
 /**
  * 
  * @author Mihai Postelnicu - mpostelnicu@dgfoundation.org

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ReportPdfExportState.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ReportPdfExportState.java
@@ -4,7 +4,6 @@
 import com.itextpdf.text.BaseColor;
 import com.itextpdf.text.pdf.PdfPCell;
 
-import java.awt.*;
 import java.util.ArrayList;
 
 /**

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedModelDescription.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedModelDescription.java
@@ -4,6 +4,7 @@
 import org.digijava.module.aim.annotations.translation.TranslatableClass;
 import org.digijava.module.aim.annotations.translation.TranslatableField;
 import org.digijava.module.translation.util.ContentTranslationUtil;
+import org.hibernate.Session;
 import org.hibernate.metamodel.internal.MetamodelImpl;
 import org.hibernate.persister.entity.AbstractEntityPersister;
 import org.slf4j.Logger;
@@ -31,28 +32,16 @@ private InternationalizedModelDescription(Class<?> modelClass) {
         scanClass(modelClass);
     }
 
-    //  public static java.sql.Connection connection = initConnection();
-//  
-//  private static java.sql.Connection initConnection()
-//  {
-//      try
-//      {
-//          return PersistenceManager.getJdbcConnection();
-//      }
-//      catch(Exception e)
-//      {
-//          throw new RuntimeException("Could not get RAW JDBC Connection", e);
-//      }
-//  }
-    public static AbstractEntityPersister getPersister(final Class<?> modelClazz) {
-        EntityManager entityManager = PersistenceManager.getRequestDBSession().getEntityManagerFactory().createEntityManager();
+
+    public static AbstractEntityPersister getPersister(final Class<?> modelClazz, Session session) {
+        EntityManager entityManager = session.getEntityManagerFactory().createEntityManager();
         final MetamodelImpl metamodel = (MetamodelImpl) entityManager.getMetamodel();
         return (AbstractEntityPersister) metamodel.entityPersister(modelClazz);
     }
 
     public static boolean isEntity(final Class<?> modelClazz) {
         try {
-            getPersister(modelClazz);
+            getPersister(modelClazz, PersistenceManager.getRequestDBSession());
             return true;
         } catch (Exception e) {
             logger.error("Seems this is not an entity: " + modelClazz);
@@ -61,9 +50,9 @@ public static boolean isEntity(final Class<?> modelClazz) {
     }
 
     public String getColumnNameByPropertyName(String propertyName, Class<?> modelClazz) {
-        int propertyIndex = getPersister(modelClazz).getEntityMetamodel().getPropertyIndex(propertyName);
+        int propertyIndex = getPersister(modelClazz, PersistenceManager.getRequestDBSession()).getEntityMetamodel().getPropertyIndex(propertyName);
         if (propertyIndex != -1) {
-            String[] columnNames = getPersister(modelClazz).getPropertyColumnNames(propertyIndex);
+            String[] columnNames = getPersister(modelClazz, PersistenceManager.getRequestDBSession()).getPropertyColumnNames(propertyIndex);
             // In a single table inheritance strategy, typically there will be only one column name per property
             if (columnNames.length > 0) {
                 return columnNames[0];
@@ -81,8 +70,8 @@ protected void scanClass(Class<?> modelClass) {
         if (modelClass.getAnnotation(TranslatableClass.class) == null)
             throw new RuntimeException("asked to scan class " + modelClass + ", which is translatable");
 
-        String keyColumnName = Arrays.stream(((AbstractEntityPersister) getPersister(modelClass)).getKeyColumnNames()).iterator().next();
-        String modelTableName = ((AbstractEntityPersister) getPersister(modelClass)).getTableName();
+        String keyColumnName = Arrays.stream(getPersister(modelClass, PersistenceManager.getRequestDBSession()).getKeyColumnNames()).iterator().next();
+        String modelTableName = getPersister(modelClass, PersistenceManager.getRequestDBSession()).getTableName();
         Set<String> existingColumns = SQLUtils.getTableColumns(modelTableName);
         boolean idColumnExists = existingColumns.contains(keyColumnName);
 

diff --git a/...rc/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output1PdfExporter.java b/...rc/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output1PdfExporter.java
@@ -2,7 +2,6 @@
 
 
 import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;

diff --git a/...rc/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output2PdfExporter.java b/...rc/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output2PdfExporter.java
@@ -4,7 +4,6 @@
 import com.itextpdf.text.Element;
 import com.itextpdf.text.Font;
 import com.itextpdf.text.Paragraph;
-import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPTable;
 import org.dgfoundation.amp.gpi.reports.GPIReport;
 import org.dgfoundation.amp.gpi.reports.GPIReportConstants;

diff --git a/...-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5aPdfExporter.java b/...-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5aPdfExporter.java
@@ -2,7 +2,6 @@
 
 
 import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;
 import org.dgfoundation.amp.ar.ColumnConstants;

diff --git a/...-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5bPdfExporter.java b/...-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5bPdfExporter.java
@@ -2,7 +2,6 @@
 
 
 import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;
 import org.dgfoundation.amp.ar.ColumnConstants;

diff --git a/...-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator9bPdfExporter.java b/...-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator9bPdfExporter.java
@@ -5,7 +5,6 @@
 import com.itextpdf.text.Element;
 import com.itextpdf.text.Font;
 import com.itextpdf.text.Paragraph;
-import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPTable;
 import org.dgfoundation.amp.ar.MeasureConstants;
 import org.dgfoundation.amp.gpi.reports.GPIReport;

diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportPdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportPdfExporter.java
@@ -2,7 +2,6 @@
 
 
 import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,6 +15,9 @@
		<beans:import resource="classpath:/applicationContext.xml" />

		<beans:bean id="customHttpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall"/>



		<http-firewall ref="customHttpFirewall"/>


Expand Down