(OFBIZ-8341)
In many Java and Groovy files we have auto generated catch blocks or empty catch
blocks.
To avoid such exception swallowing this should be improved to at least log the
error and also return error in case of service.
Here we use 3 try-with-ressource blocks and log some errors
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866957 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8341)
In many Java and Groovy files we have auto generated catch blocks or empty catch
blocks.
To avoid such exception swallowing this should be improved to at least log the
error and also return error in case of service.
Here we use a try-with-ressource block and log some errors
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866952 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10966)
Currently, we support import/export entity data in XML format.
Nowadays JSON is widely used in industry, we can have support for JSON format
which looks quite similar to XML support.
Here is example of XML data and it's JSON version
<Party partyId="123456" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
{“Party”: {"partyId":"123456","partyTypeId":"PERSON","statusId":"PARTY_ENABLED”}}
Design Proposal
We can write entityImportJson and entityImportDirJson services for importing
JSON from screen and directory respectively.
And the entityExportAllJson service for exporting entity data in JSON.
Import Design
The import service will perform following operations:
1.) Validate the input JSON data
2.) On successful validation, convert JSON to OFBiz's entity model
(GenericValue)
3.) The GenericValue will be inserted in database by some handler class for e.g
we can write JsonDataHandler, it will convert given JSON to
List<GenericValue>, and finally write it to database
(Similar pattern is used in XML import).
Export Design
Based on existing XML pattern the writeXmlText method of GenericEntity class
write the exported data in XML format.
In the similar way, we can implement writeJsonText to export data in JSON format.
jleroux: I fixed 2 trivials things and at my request in last patch Jayansh added
"JSON Data Export All" and "JSON Data Import Dir
Thanks: Jayansh Shinde
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1862206 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-11049)
This problem was similar to what was resolved by r1806237 for OFBIZ-9138.
This fixes it by using the same solution than in r1806237. If the visual theme
is unknown in the the service context get the default theme from
general.properties using ThemeFactory::resolveTheme.
sendPrintFromScreen, createFileFromScreen, sendBirtMail, getXslFo and
printReportPdf (in example) were concerned
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859735 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10939)
The ‘@Override’ annotation helps readers understand that the method at
hand is overriding a super class or implementing an interface.
Additionally it allows the compiler to check if the methods annotated
with ‘@Override’ are actually implementing an abstract method.
Using that annotation makes ‘@see foo.bar.ParentClass#myMethod’
comments useless, so those they have been removed for the newly
annotated methods.
Thanks Jacques Le Roux and Swapnil M Mane for acknowledging the commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858295 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10937)
Since Java 1.7, when defining generic types it is unnecessary to
redefine those types in the constructor when it is done in the
declared type.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1857906 13f79535-47bb-0310-9956-ffa450edef68
Previously the artifact info classes were using the
‘FlexibleLocation#resolveLocation(String, ClassLoader)’ method by
passing ‘null’ as the second argument which is equivalent to calling
the more specific ‘FlexibleLocation#resolveLocation(String)’ method
with the same first argument.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1854667 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10701)
In order to detect potential issues early, the linting compiler option should be
used by default and disabled with {{./gradlew -PXlint:none build}}.
Additionally it is important to reduce the number of warnings otherwise new
warnings will remain unnoticed.
The warning related to the com.googlecode.concurrentlinkedhashmap dependency
should resolves itself once we handle upgrade to Caffeine like proposed in
OFBIZ-6747.
Thanks: Mathieu Lirzin
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848673 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10488)
Since Java 8 it is possible to instantiate functional interfaces
(interfaces with one non-static method) with lambda expressions instead
of anonymous classes.
This replaces the creation of callable objects with lambda expressions.
Thanks: Mathieu Lirzin
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848514 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-1032)
Karl:
Avoids rollback on create error to be able to store the entity instead
(previous mostly-inserts feature).
Matin:
I think, the data load with "mostly inserts" activated should fail on a
create-failure (what it does indeed already), so I see no need for a working
solution of a fallback store attempt. Consistently the Feature should be renamed
in the frontend from "mostly inserts" to "only inserts".
Kyra:
Additional trivial refactoring in the patch: I reduced the full qualified
classname of org.xml.sax.SAXException in method signatures to the simple name.
This incorperates the changes that Martin has mentioned above.
The unnecessary call to store() is removed, simplifying the process of creating
and deleting entities. (These changes were already in Martins old patch but had
the wrong format.) This means that the flag "mostly Inserts?" is not accurately
worded since as long as there is only create fail, all operations are rolled
back. So the second patch renames the flag and all appropriate parameters to
"onlyInserts".
jleroux: I made few no functional changes, apart not swallowing an exception
Thanks: Thanks Karl for the 1st patch, Martin to get further, and Kyra to
complete the whole with a final touch and help to quickly test
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1822310 13f79535-47bb-0310-9956-ffa450edef68
by org.jsoup.parser.Parser.unescapeEntities()
(OFBIZ-10023)
StringEscapeUtils.unescapeHtml() is deprecated or at least not reliable
After few tests using the Parser.unescapeEntities() strict mode seems OK
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816461 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9606)
Currently, label manager for xml search only for fail-property elements in xml
files, it should also search for the property-to-field, default-message element
in xml files.
Thanks: Suraj Khurana
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806269 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9623)
For Java:
Current support is only for occurrences like "UtilProperties.getMessage(",
but there are other occurrences such as "uiLabelMap.get("
in Java as well. Need to add support for same.
For groovy:
After some recent improvements for groovy handling, still, there is a
possibility that someone is using "UtilProperties.getMessage(" in groovy files
as well, so IMO, that must also be handled.
For XML forms:
In XML forms current support in handled for auto-fields-service and
auto-fields-entity but there are some occurrences of tooltip element of
field tag as well, that must also be handled.
For XML Simple Methods:
Doesn't handle case of property-to-field and default-message elements.
(Separate ticket created OFBIZ-9606, just adding it here for reference)
Thanks: Suraj Khurana
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806266 13f79535-47bb-0310-9956-ffa450edef68
Five step these step break all the UI
#2 The MacroScreenRenderer class now resolve the macro ftl library location from the model theme
The widget.properties lost all definition now managed by the theme definition
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806140 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8153)
The logic written needs more use cases to be covered for groovy files, existing
findUiLabelMapInFile is not fit for groovy files.
Following patterns are currently used in groovy files:
1. uiLabelMap.xxxxx
2. uiLabelMap.get("xxxxx")
Thanks: Suraj Khurana
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1805558 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9571)
No functional change.
We read at http://docs.oracle.com/javase/7/docs/api/java/math/BigDecimal.html :
<<Using the integer fields in this class (such as ROUND_HALF_UP) to represent
rounding mode is largely obsolete; the enumeration values of the RoundingMode
enum, (such as RoundingMode.HALF_UP) should be used instead.>>
That's an easy global replacement. But it also needs to import the RoundingMode
class. It was 26 files so I decided to rather clean all the imports in all files
with the help of Eclipse.
This is a 1st step. I will need to closely look at 2 special class: UtilNumber
and Calculate.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1804953 13f79535-47bb-0310-9956-ffa450edef68
ProductShipmentUomAbbreviation_LEN_in
ProductShipmentUomAbbreviation_WT_g
ProductShipmentUomAbbreviation_WT_kg
ProductShipmentUomAbbreviation_WT_lb
These labels should be written in similer pattern as other labels of "Uom" entity are written in CommonEntityLabels.xml, for example :
ProductShipmentUomAbbreviation_LEN_in will be written as
Uom.abbreviation.LEN_in
<entityName>.<fieldName>.<PrimaryKey>
Thanks Renuka for your contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801281 13f79535-47bb-0310-9956-ffa450edef68
Improved: Writer closed but not in case of exception
(OFBIZ-9388)
This is an improvement only because no cases were reported. But obviously in
case of unlucky exception after the Writer creation and before it's closed the
Writer remains in memory.
The solution is to use try-with-ressources when possible.
This also improves the way the EntityListIterator is closed, using
try-with-ressources instead of closing in case of exception
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1797744 13f79535-47bb-0310-9956-ffa450edef68
countries
(OFBIZ-9261)
This is handled in LabelManagerFactory.java
Element valueElem = (Element) valueNode;
// Support old way of specifying xml:lang value.
// Old way: en_AU, new way: en-AU
String localeName = valueElem.getAttribute("xml:lang");
if( localeName.contains("_")) {
localeName = localeName.replace('_', '-');
}
I replaces this snippet by throwing an exception in order to now to
automatically detect issues
Moreover I notices that there are no longer reasons to bypass the
ExampleEntityLabels and ProductPromoUiLabels files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1787047 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-9023) (OFBIZ-9026)(OFBIZ-9027)(OFBIZ-9032)(OFBIZ-9034)(OFBIZ-9036)(OFBIZ-9030)
Thanks: Divesh Dutta, Amit Gadaley and Shubham Agrawal for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768189 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8909)(OFBIZ-8910)(OFBIZ-8911)(OFBIZ-8912)(OFBIZ-8913)(OFBIZ-8914)(OFBIZ-8915)(OFBIZ-8917)(OFBIZ-8918)(OFBIZ-8919)(OFBIZ-8920)(OFBIZ-8921)(OFBIZ-8922)
Thanks: Divesh Dutta for reporting and Amit Gaadaley for providing patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768168 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8337)
This is a major refactoring exercise to simplify the startup sequence in
OFBiz. There are no functional changes, however, both the logic and the
API signatures of the core classes in OFBiz are changed to help simplify
the startup sequence. The changes insofar are summarized as:
- Rename ContainerConfig.Container to ContainerConfig.Configuration, the old
nameing was very confusing as it confuses it with actual containers
- Change the signature of ContainerLoader and Container to accept
List<StartupCommand> instead of String[]. And also migrate the adapter for
converting these args into a standalone class called
StartupCommandsToArgsAdapter
- Remove the LockedBy annotation as it is not used
- Substantially simplify the ContainerLoader load and unload logic and delete
the start logic (merge it with load). The interface StartupLoader was updated
accordingly
- Remove old logic to load containers in hot-deploy components
- Remove printThreadDump output from ContainerLoader which used to exist for
debugging purposes and is no longer necessary
- Cleanup the AdminServer startup logic
- Change the StartupControlPanel logic to use only one StartupLoader instead
of a list. The only implementation is ContainerLoader
- Remove the synchronized blocks in StartupControlPanel due to having only one
loader
- Update the startup .properties files to reflect the changes in the startup
logic
- Update the TestRunContainer to use List<StartupCommand> in its logic
We expect more commits (specifically to the containers) to complete this
refactoring initiative
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1765127 13f79535-47bb-0310-9956-ffa450edef68
code using it, that wraps most of the OFBiz integration with FreeMarker.
This is the list of the main modifications:
* simplified and cleaned up the public methods of FreeMarkerWorker, used to
retrieve and render Freemarker templates and changed client code accordingly to
use them
* removed unused methods in FreeMarkerWorker and made some others private
* improved the integration code in FreeMarkerWorker to better use the Freemarker
API and specifically to leverage the various TemplateLoaders and the Freemarker
caching mechanism; it is now possible to switch the OFBiz legacy template
caching mechanism to use the Freemarker one instead
* improved the implementation of Freemarker template rendering from strings
(used by DataResourceWorker): it now leverages the Freemarker's
StringTemplateLoader that provides the ability to cache the strings, retrieved
from DataResources records, based on the timestamp of the last modification
* moved freemarkerImports.properties from "widget" to "base" component, and
changed its content (and the content of the associated templates
AutoImportTemplate.ftl and HtmlTemplate.ftl) to remove the dependency from base
to widget&common; some resources of "widget" and "common" are still referenced
from AutoImportTemplate.ftl (that is in "base") but even if they are soft
dependencies: if they are missing the system will load properly without any
error or warning; before this change it was impossible to use, or unit test,
FreeMarkerWorker before the "widget" and "common" components were loaded by the
system, now it is possible
* created a new class for unit tests for FreeMarkerWorker, named
FreeMarkerWorkerTests: at the moment it contains just one simple unit test but
more should be implemented
* refactored WebToolsServices.entityImport(...) to leverage the
FreeMarkerWorker.renderTemplate(...) method to run the Freemarker template,
rather than dealing with the Freemarker API directly; this is now possible
thanks to the cleanups and improvements done in the FreeMarkerWorker class; this
same approach should be implemented for a few other similar integration points
(mostly in the "content" component); this is a TODO item
* moved the encodeDoubleQuotes(...) method from FreeMarkerWorker to
MacroFormRenderer and made it private since this is the only calss using it and
its logic is not related to FreeMarker
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762227 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-8154)
It's a pity, because of the translations, but the labels starting by "HumanResServices.", which dates from pre Apache era, are not used OOTB, so I remove them here
.portalPageName. is used by demo data
ProductStoreGroup.productStoreGroupName.NA is used as data by ProductTypeData.xml
FormFieldTitle_timesheetPartyId in ProjectMgrUiLabels.xml seems an error. As it duplicates the same in AccountingUiLabels.xml, which is accurate, I remove it from ProjectMgrUiLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760995 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-8154
FieldDescription. is used in 2 places UtilHelpText.java (widget) WebToolsServices.java
HumanResServices. seems unused and should be removed
.portalPageName. is doubtful to be double checked
ProductShipmentUomAbbreviation_ used in PackOrder.ftl and WeightPackage.ftl
ProductStoreGroup.productStoreGroupName.NA not sure
TemporalExpression_ used in many place: ServiceDemoData.xml, ExpressionUiHelper.java, TempExprMaint.ftl and TemporalExpressions.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760668 13f79535-47bb-0310-9956-ffa450edef68
OFBIZ-8154
Completes a TODO and removes useless tests on label keys replaced by bypass on entire ExampleEntityLabels and ProductPromoUiLabels files, still a WIP
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1760537 13f79535-47bb-0310-9956-ffa450edef68