You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mt...@apache.org on 2019/04/21 12:49:55 UTC
svn commit: r1857906 [6/9] - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/
applications/accounting/src/main/java/org/apache/ofbiz/accounting/test/
applications/accounting/src/main/java/org...
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageServices.java Sun Apr 21 12:49:52 2019
@@ -147,7 +147,7 @@ public class WeightPackageServices {
weightPackageSession.setEstimatedShipCost(estimatedShippingCost);
weightPackageSession.setActualShipCost(newEstimatedShippingCost);
- Map<String, Object> response = new HashMap<String, Object>();
+ Map<String, Object> response = new HashMap<>();
try {
String getActualShippingQuoteFromUps = EntityUtilProperties.getPropertyValue("shipment", "shipment.ups.shipping", "N", delegator);
String result = weightPackageSession.complete(orderId, locale, getActualShippingQuoteFromUps);
@@ -172,7 +172,7 @@ public class WeightPackageServices {
String shipmentId = (String) context.get("shipmentId");
String orderId = (String) context.get("orderId");
- Map<String, Object> response = new HashMap<String, Object>();
+ Map<String, Object> response = new HashMap<>();
try {
String getActualShippingQuoteFromUps = EntityUtilProperties.getPropertyValue("shipment", "shipment.ups.shipping", "N", delegator);
if (weightPackageSession.completeShipment(orderId, getActualShippingQuoteFromUps)) {
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSession.java Sun Apr 21 12:49:52 2019
@@ -84,7 +84,7 @@ public class WeightPackageSession implem
this.picklistBinId = picklistBinId;
this.userLogin = userLogin;
this.facilityId = facilityId;
- this.weightPackageLines = new LinkedList<WeightPackageSessionLine>();
+ this.weightPackageLines = new LinkedList<>();
}
public WeightPackageSession(LocalDispatcher dispatcher, GenericValue userLogin, String facilityId) {
@@ -215,7 +215,7 @@ public class WeightPackageSession implem
}
public List<WeightPackageSessionLine> getPackedLines(String orderId) {
- List<WeightPackageSessionLine> packedLines = new LinkedList<WeightPackageSessionLine>();
+ List<WeightPackageSessionLine> packedLines = new LinkedList<>();
if (UtilValidate.isNotEmpty(orderId)) {
for (WeightPackageSessionLine packedLine: this.getPackedLines()) {
if (orderId.equals(packedLine.getOrderId()))
@@ -355,7 +355,7 @@ public class WeightPackageSession implem
List<GenericValue> shipmentRouteSegments = EntityQuery.use(delegator).from("ShipmentRouteSegment").where("shipmentId", shipmentId).queryList();
if (UtilValidate.isNotEmpty(shipmentRouteSegments)) {
for (GenericValue shipmentRouteSegment : shipmentRouteSegments) {
- Map<String, Object> shipmentRouteSegmentMap = new HashMap<String, Object>();
+ Map<String, Object> shipmentRouteSegmentMap = new HashMap<>();
shipmentRouteSegmentMap.put("shipmentId", shipmentId);
shipmentRouteSegmentMap.put("shipmentRouteSegmentId", shipmentRouteSegment.getString("shipmentRouteSegmentId"));
shipmentRouteSegmentMap.put("userLogin", userLogin);
@@ -374,7 +374,7 @@ public class WeightPackageSession implem
List<GenericValue> shipmentRouteSegments = this.getDelegator().findByAnd("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId), null, false);
if (UtilValidate.isNotEmpty(shipmentRouteSegments)) {
for (GenericValue shipmentRouteSegment : shipmentRouteSegments) {
- Map<String, Object> shipmentRouteSegmentMap = new HashMap<String, Object>();
+ Map<String, Object> shipmentRouteSegmentMap = new HashMap<>();
shipmentRouteSegmentMap.put("shipmentId", shipmentId);
shipmentRouteSegmentMap.put("shipmentRouteSegmentId", shipmentRouteSegment.getString("shipmentRouteSegmentId"));
shipmentRouteSegmentMap.put("userLogin", userLogin);
@@ -403,7 +403,7 @@ public class WeightPackageSession implem
for (WeightPackageSessionLine packedLine : this.getPackedLines(orderId)) {
String shipmentPackageSeqId = UtilFormatOut.formatPaddedNumber(++shipPackSeqId, 5);
- Map<String, Object> shipmentPackageMap = new HashMap<String, Object>();
+ Map<String, Object> shipmentPackageMap = new HashMap<>();
shipmentPackageMap.put("shipmentId", shipmentId);
shipmentPackageMap.put("shipmentPackageSeqId", shipmentPackageSeqId);
shipmentPackageMap.put("weight", packedLine.getPackageWeight());
@@ -439,7 +439,7 @@ public class WeightPackageSession implem
for (GenericValue orderItem : orderItems) {
List<GenericValue> orderItemShipGrpInvReserves = orderItem.getRelated("OrderItemShipGrpInvRes", null, null, false);
if (UtilValidate.isEmpty(orderItemShipGrpInvReserves)) {
- Map<String, Object> orderItemStatusMap = new HashMap<String, Object>();
+ Map<String, Object> orderItemStatusMap = new HashMap<>();
orderItemStatusMap.put("orderId", orderId);
orderItemStatusMap.put("orderItemSeqId", orderItem.getString("orderItemSeqId"));
orderItemStatusMap.put("userLogin", userLogin);
@@ -477,7 +477,7 @@ public class WeightPackageSession implem
}
protected void setShipmentToPacked() throws GeneralException {
- Map<String, Object> shipmentMap = new HashMap<String, Object>();
+ Map<String, Object> shipmentMap = new HashMap<>();
shipmentMap.put("shipmentId", shipmentId);
shipmentMap.put("statusId", "SHIPMENT_PACKED");
shipmentMap.put("userLogin", userLogin);
@@ -497,7 +497,7 @@ public class WeightPackageSession implem
BigDecimal shipmentCostEstimate = BigDecimal.ZERO;
Map<String, Object> shipCostEstimateResult = null;
try {
- Map<String, Object> shipCostEstimateMap = new HashMap<String, Object>();
+ Map<String, Object> shipCostEstimateMap = new HashMap<>();
shipCostEstimateMap.put("shippingContactMechId", shippingContactMechId);
shipCostEstimateMap.put("shipmentMethodTypeId", shipmentMethodTypeId);
shipCostEstimateMap.put("carrierPartyId", carrierPartyId);
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java Sun Apr 21 12:49:52 2019
@@ -117,7 +117,7 @@ public class WeightPackageSessionLine im
protected void applyLineToPackage(String shipmentId, GenericValue userLogin, LocalDispatcher dispatcher, int shipPackSeqId) throws GeneralException {
String shipmentPackageSeqId = UtilFormatOut.formatPaddedNumber(shipPackSeqId, 5);
- Map<String, Object> packageMap = new HashMap<String, Object>();
+ Map<String, Object> packageMap = new HashMap<>();
packageMap.put("shipmentId", shipmentId);
packageMap.put("shipmentItemSeqId", this.getShipmentItemSeqId());
// quanity given, by defult one because it is a required field
Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java Sun Apr 21 12:49:52 2019
@@ -302,7 +302,7 @@ public class WorkEffortContentWrapper im
}
if (workEffortContent != null) {
// when rendering the product content, always include the Product and ProductContent records that this comes from
- Map<String, Object> inContext = new HashMap<String, Object>();
+ Map<String, Object> inContext = new HashMap<>();
inContext.put("workEffort", workEffort);
inContext.put("workEffortContent", workEffortContent);
ContentWorker.renderContentAsText(dispatcher, workEffortContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, false);
@@ -334,11 +334,11 @@ public class WorkEffortContentWrapper im
.filterByDate()
.queryList();
- List<String> contentList = new LinkedList<String>();
+ List<String> contentList = new LinkedList<>();
if (partyContentList != null) {
for (GenericValue workEffortContent: partyContentList) {
StringWriter outWriter = new StringWriter();
- Map<String, Object> inContext = new HashMap<String, Object>();
+ Map<String, Object> inContext = new HashMap<>();
inContext.put("workEffort", workEffort);
inContext.put("workEffortContent", workEffortContent);
ContentWorker.renderContentAsText(dispatcher, workEffortContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, false);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java Sun Apr 21 12:49:52 2019
@@ -74,10 +74,10 @@ public class MiscTests extends GenericTe
BigDecimal bigDecimal = new BigDecimal("1.234");
URL url = new URL("http://ofbiz.apache.org");
List<String> baseList = UtilMisc.toList("a", "1", "b", "2", "c", "3");
- List<String> arrayList = new ArrayList<String>();
+ List<String> arrayList = new ArrayList<>();
arrayList.addAll(baseList);
Map<String, String> baseMap = UtilMisc.toMap("a", "1", "b", "2", "c", "3");
- Map<String, String> hashMap = new HashMap<String, String>();
+ Map<String, String> hashMap = new HashMap<>();
hashMap.putAll(baseMap);
Object[] testObjects = new Object[] {
string,
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java Sun Apr 21 12:49:52 2019
@@ -44,7 +44,7 @@ public class TestJSONConverters extends
public void testJSONToMap() throws Exception {
Converter<JSON, Map<String,String>> converter = UtilGenerics.cast(Converters.getConverter(JSON.class, Map.class));
Map<String,String> map, convertedMap;
- map = new HashMap<String,String>();
+ map = new HashMap<>();
map.put("field1", "value1");
JSON json = JSON.from(map);
convertedMap = UtilGenerics.toMap(converter.convert(json));
@@ -54,7 +54,7 @@ public class TestJSONConverters extends
public void testJSONToList() throws Exception {
Converter<JSON, List<Object>> converter = UtilGenerics.cast(Converters.getConverter(JSON.class, List.class));
List<Object> list, convertedList;
- list = new ArrayList<Object>();
+ list = new ArrayList<>();
list.add("field1");
list.add("field2");
JSON json = JSON.from(list);
@@ -65,7 +65,7 @@ public class TestJSONConverters extends
public void testMapToJSON() throws Exception {
Converter<Map<String,Object>, JSON> converter = UtilGenerics.cast(Converters.getConverter(Map.class, JSON.class));
JSON json;
- Map<String,Object> map = new LinkedHashMap<String,Object>();
+ Map<String,Object> map = new LinkedHashMap<>();
map.put("field1", "value1");
map.put("field2", new BigDecimal("3.7"));
json = converter.convert(map);
@@ -75,7 +75,7 @@ public class TestJSONConverters extends
public void testListToJSON() throws Exception {
Converter<List<String>, JSON> converter = UtilGenerics.cast(Converters.getConverter(List.class, JSON.class));
JSON json;
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add("field1");
list.add("field2");
json = converter.convert(list);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/FlexibleLocation.java Sun Apr 21 12:49:52 2019
@@ -40,7 +40,7 @@ public final class FlexibleLocation {
private static final Map<String, LocationResolver> locationResolvers;
static {
- Map<String, LocationResolver> resolverMap = new HashMap<String, LocationResolver>(8);
+ Map<String, LocationResolver> resolverMap = new HashMap<>(8);
LocationResolver standardUrlResolver = new StandardUrlLocationResolver();
resolverMap.put("http", standardUrlResolver);
resolverMap.put("https", standardUrlResolver);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java Sun Apr 21 12:49:52 2019
@@ -177,7 +177,7 @@ public final class UtilHttp {
}
public static Map<String, Object> getMultiPartParameterMap(HttpServletRequest request) {
- Map<String, Object> multiPartMap = new HashMap<String, Object>();
+ Map<String, Object> multiPartMap = new HashMap<>();
Delegator delegator = (Delegator) request.getAttribute("delegator");
HttpSession session = request.getSession();
boolean isMultiPart = ServletFileUpload.isMultipartContent(request);
@@ -238,7 +238,7 @@ public final class UtilHttp {
if (mapValue instanceof List<?>) {
checkList(mapValue, Object.class).add(item.getString());
} else if (mapValue instanceof String) {
- List<String> newList = new LinkedList<String>();
+ List<String> newList = new LinkedList<>();
newList.add((String) mapValue);
newList.add(item.getString());
multiPartMap.put(fieldName, newList);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java Sun Apr 21 12:49:52 2019
@@ -46,7 +46,7 @@ public class FlexibleMapAccessorTests ex
}
private static <T> void fmaTest(String label, String getText, String putText, String fseText, Locale locale, T var, String value) {
- Map<String, Object> testMap = new HashMap<String, Object>();
+ Map<String, Object> testMap = new HashMap<>();
FlexibleMapAccessor<T> fmaGet = FlexibleMapAccessor.getInstance(getText);
assertEquals(label + ":get-original-name", getText, fmaGet.getOriginalName());
assertEquals(label + ":get-isEmpty", false, fmaGet.isEmpty());
@@ -105,7 +105,7 @@ public class FlexibleMapAccessorTests ex
assertNotNull(label + ":put-null-map", caught);
assertTrue(label + ":put-null-map-isEmpty", testMap.isEmpty());
}
- Set<FlexibleMapAccessor<?>> set = new HashSet<FlexibleMapAccessor<?>>();
+ Set<FlexibleMapAccessor<?>> set = new HashSet<>();
assertFalse(label + ":not-in-set", set.contains(fmaGet));
set.add(fmaGet);
assertTrue(label + ":in-set", set.contains(fmaGet));
@@ -114,7 +114,7 @@ public class FlexibleMapAccessorTests ex
private static void fmaEmptyTest(String label, String text) {
FlexibleMapAccessor<Class<?>> fma = FlexibleMapAccessor.getInstance(text);
assertTrue(label + ":isEmpty", fma.isEmpty());
- Map<String, Object> testMap = new HashMap<String, Object>();
+ Map<String, Object> testMap = new HashMap<>();
assertNull(label + ":get", fma.get(null));
assertNull(label + ":get", fma.get(testMap));
assertTrue(label + ":map-isEmpty-initial", testMap.isEmpty());
@@ -173,7 +173,7 @@ public class FlexibleMapAccessorTests ex
boolean isVerbose = Debug.isOn(Debug.VERBOSE);
try {
Debug.set(Debug.VERBOSE, true);
- Map<String, Object> testMap = new CantRemoveMap<String, Object>();
+ Map<String, Object> testMap = new CantRemoveMap<>();
testMap.put("throwException", new ThrowException());
assertNull("no var", FlexibleMapAccessor.getInstance("var").get(testMap));
Object result = FlexibleMapAccessor.getInstance("throwException.value").get(testMap);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java Sun Apr 21 12:49:52 2019
@@ -50,7 +50,7 @@ public class GenericMapTest extends Gene
"removeInternal-false",
"size",
};
- protected final Map<String, Integer> counts = new HashMap<String, Integer>();
+ protected final Map<String, Integer> counts = new HashMap<>();
protected final Map<K, V> proxyMap;
protected TestGenericMap() {
@@ -62,9 +62,9 @@ public class GenericMapTest extends Gene
counts.put(countName, 0);
}
if (srcMap != null) {
- proxyMap = new HashMap<K, V>(srcMap);
+ proxyMap = new HashMap<>(srcMap);
} else {
- proxyMap = new HashMap<K, V>();
+ proxyMap = new HashMap<>();
}
}
@@ -73,7 +73,7 @@ public class GenericMapTest extends Gene
}
public List<Integer> getCounts() {
- List<Integer> result = new ArrayList<Integer>();
+ List<Integer> result = new ArrayList<>();
for (String countName: countNames) {
result.add(counts.get(countName));
}
@@ -108,7 +108,7 @@ public class GenericMapTest extends Gene
return new IteratorWrapper<Map.Entry<K, V>, Map.Entry<K, V>>(proxyMap.entrySet().iterator()) {
@Override
protected Map.Entry<K, V> convert(Map.Entry<K, V> src) {
- return new GenericMapEntry<K, V>(TestGenericMap.this, src.getKey(), noteAccess);
+ return new GenericMapEntry<>(TestGenericMap.this, src.getKey(), noteAccess);
}
@Override
protected void noteRemoval(Map.Entry<K, V> dest, Map.Entry<K, V> src) {
@@ -150,7 +150,7 @@ public class GenericMapTest extends Gene
}
public void testFoo() throws Exception {
- TestGenericMap<String, Integer> map = new TestGenericMap<String, Integer>();
+ TestGenericMap<String, Integer> map = new TestGenericMap<>();
map.put("a", 0); Debug.logInfo("put a\t\tcounts=" + map.getCounts() + ", modCount=" + map.getModCount(), module);
assertEquals("get a", Integer.valueOf(0), map.get("a"));
map.put("b", 1); Debug.logInfo("put b\t\tcounts=" + map.getCounts() + ", modCount=" + map.getModCount(), module);
@@ -167,7 +167,7 @@ public class GenericMapTest extends Gene
Debug.logInfo("map=" + map, module);
Debug.logInfo("counts=" + map.getCounts() + ", modCount=" + map.getModCount(), module);
// this seems to call size()
- new HashMap<String, Integer>(map);
+ new HashMap<>(map);
Debug.logInfo("counts=" + map.getCounts() + ", modCount=" + map.getModCount(), module);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java Sun Apr 21 12:49:52 2019
@@ -298,7 +298,7 @@ public abstract class FlexibleStringExpa
return new FlexibleStringExpander[] { new ConstOffsetElem(chars, offset, length) };
}
int origLen = length;
- ArrayList<FlexibleStringExpander> strElems = new ArrayList<FlexibleStringExpander>();
+ ArrayList<FlexibleStringExpander> strElems = new ArrayList<>();
int currentInd = offset;
int end = -1;
while (start != -1) {
@@ -652,7 +652,7 @@ public abstract class FlexibleStringExpa
@Override
protected Object get(Map<String, ? extends Object> context, TimeZone timeZone, Locale locale) {
try {
- Map <String, Object> contextCopy = new HashMap<String, Object>(context);
+ Map <String, Object> contextCopy = new HashMap<>(context);
Object obj = ScriptUtil.evaluate(this.language, this.script, this.parsedScript, contextCopy);
if (obj != null) {
return obj;
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java Sun Apr 21 12:49:52 2019
@@ -102,7 +102,7 @@ public class NodeELResolver extends ELRe
} else if (nodeList.getLength() == 1) {
result = nodeList.item(0);
} else {
- List<Node> newList = new ArrayList<Node>(nodeList.getLength());
+ List<Node> newList = new ArrayList<>(nodeList.getLength());
for (int i = 0; i < nodeList.getLength(); i++) {
newList.add(nodeList.item(i));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java Sun Apr 21 12:49:52 2019
@@ -84,7 +84,7 @@ public class AssertTests extends TestCas
} catch (IllegalArgumentException e) {}
//-----------------------------------------------------------------------
- List<String> strList = new ArrayList<String>();
+ List<String> strList = new ArrayList<>();
try {
Assert.notEmpty("foo", strList);
fail("notEmpty(Collection) - IllegalArgumentException not thrown");
@@ -97,7 +97,7 @@ public class AssertTests extends TestCas
}
//-----------------------------------------------------------------------
- Map<String,String> strMap = new HashMap<String, String>();
+ Map<String,String> strMap = new HashMap<>();
try {
Assert.notEmpty("foo", strMap);
fail("notEmpty(Map) - IllegalArgumentException not thrown");
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ObjectTypeTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ObjectTypeTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ObjectTypeTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ObjectTypeTests.java Sun Apr 21 12:49:52 2019
@@ -66,15 +66,15 @@ public class ObjectTypeTests extends Gen
super(name);
ntstmp = new Timestamp(781L);
ntstmp.setNanos(123000000);
- list = new ArrayList<Object>();
+ list = new ArrayList<>();
list.add("one");
list.add("two");
list.add("three");
- map = new LinkedHashMap<String, Object>();
+ map = new LinkedHashMap<>();
map.put("one", "1");
map.put("two", "2");
map.put("three", "3");
- set = new LinkedHashSet<Object>(list);
+ set = new LinkedHashSet<>(list);
Calendar cal = UtilDateTime.getCalendarInstance(localeData.goodTimeZone, localeData.goodLocale);
cal.set(1969, Calendar.DECEMBER, 31, 0, 0, 0);
cal.set(Calendar.MILLISECOND, 0);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java Sun Apr 21 12:49:52 2019
@@ -34,7 +34,7 @@ public class ReferenceCleanerTests exten
public void testReferenceCleaner() throws Exception {
assertStaticHelperClass(ReferenceCleaner.class);
- final SynchronousQueue<String> queue = new SynchronousQueue<String>();
+ final SynchronousQueue<String> queue = new SynchronousQueue<>();
Object obj = new Object();
ReferenceCleaner.Soft<Object> soft = new ReferenceCleaner.Soft<Object>(obj) {
public void remove() throws Exception {
@@ -53,7 +53,7 @@ public class ReferenceCleanerTests exten
queue.put("phantom");
}
};
- HashSet<String> foundEvents = new HashSet<String>();
+ HashSet<String> foundEvents = new HashSet<>();
useAllMemory();
assertSame("still-soft", obj, soft.get());
assertSame("still-weak", obj, weak.get());
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java Sun Apr 21 12:49:52 2019
@@ -200,7 +200,7 @@ public class StringUtilTests extends Gen
}
public void testConvertChar() {
- Map<Character, Integer> conversions = new HashMap<Character, Integer>();
+ Map<Character, Integer> conversions = new HashMap<>();
conversions.put('0', 0); conversions.put('1', 1); conversions.put('2', 2); conversions.put('3', 3);
conversions.put('4', 4); conversions.put('5', 5); conversions.put('6', 6); conversions.put('7', 7);
conversions.put('8', 8); conversions.put('9', 9);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java Sun Apr 21 12:49:52 2019
@@ -77,7 +77,7 @@ public class UtilCodecTests {
assertEquals(label + "(encoder):encode", wanted, encoder.encode(toEncode));
}
private static void checkStringForHtmlStrictNone_test(String label, String fixed, String input, String... wantedMessages) {
- List<String> gottenMessages = new ArrayList<String>();
+ List<String> gottenMessages = new ArrayList<>();
assertEquals(label, fixed, UtilCodec.checkStringForHtmlStrictNone(label, input, gottenMessages));
assertEquals(label, Arrays.asList(wantedMessages), gottenMessages);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java Sun Apr 21 12:49:52 2019
@@ -31,7 +31,7 @@ public final class JsLanguageFilesMappin
public static class datejs {
- private static Map<String, String> localeFiles = new HashMap<String, String>();
+ private static Map<String, String> localeFiles = new HashMap<>();
private static String defaultDateJs = "/common/js/jquery/plugins/datejs/date-en-US.js";
static {
@@ -206,7 +206,7 @@ public final class JsLanguageFilesMappin
}
public static class jquery {
- private static Map<String, String> localeFiles = new HashMap<String, String>();
+ private static Map<String, String> localeFiles = new HashMap<>();
private static String defaultDateJs = "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
static {
@@ -381,7 +381,7 @@ public final class JsLanguageFilesMappin
}
public static class validation {
- private static Map<String, String> localeFiles = new HashMap<String, String>();
+ private static Map<String, String> localeFiles = new HashMap<>();
private static String defaultValidation = "/common/js/jquery/plugins/validate/localization/messages_en.js";
static {
@@ -555,7 +555,7 @@ public final class JsLanguageFilesMappin
}
public static class dateTime {
- private static Map<String, String> localeFiles = new HashMap<String, String>();
+ private static Map<String, String> localeFiles = new HashMap<>();
private static String defaultDateTime = "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
static {
@@ -729,7 +729,7 @@ public final class JsLanguageFilesMappin
}
public static class select2 {
- private static Map<String, String> localeFiles = new HashMap<String, String>();
+ private static Map<String, String> localeFiles = new HashMap<>();
private static String defaultSelect2 = "/common/js/jquery/plugins/select2/js/i18n/en.js";
static {
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java Sun Apr 21 12:49:52 2019
@@ -519,7 +519,7 @@ public class EmailServices {
// check if attachment screen location passed in
if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationList)) {
- List<Map<String, ? extends Object>> bodyParts = new LinkedList<Map<String, ? extends Object>>();
+ List<Map<String, ? extends Object>> bodyParts = new LinkedList<>();
if (bodyText != null) {
bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale);
bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyText, "type", UtilValidate.isNotEmpty(contentType) ? contentType : "text/html"));
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/geo/GeoWorker.java Sun Apr 21 12:49:52 2019
@@ -53,13 +53,13 @@ public final class GeoWorker {
public static List<GenericValue> expandGeoGroup(GenericValue geo) {
if (geo == null) {
- return new LinkedList<GenericValue>();
+ return new LinkedList<>();
}
if (!"GROUP".equals(geo.getString("geoTypeId"))) {
return UtilMisc.toList(geo);
}
- List<GenericValue> geoList = new LinkedList<GenericValue>();
+ List<GenericValue> geoList = new LinkedList<>();
List<GenericValue> thisGeoAssoc = null;
try {
thisGeoAssoc = geo.getRelated("AssocGeoAssoc", UtilMisc.toMap("geoAssocTypeId", "GROUP_MEMBER"), null, false);
@@ -84,7 +84,7 @@ public final class GeoWorker {
if (UtilValidate.isEmpty(geoIdByTypeMapOrig)) {
return geoIdByTypeMapOrig;
}
- Map<String, String> geoIdByTypeMapTemp = new LinkedHashMap<String, String>();
+ Map<String, String> geoIdByTypeMapTemp = new LinkedHashMap<>();
for (Map.Entry<String, String> geoIdByTypeEntry: geoIdByTypeMapOrig.entrySet()) {
List<GenericValue> geoAssocList = EntityQuery.use(delegator)
.from("GeoAssoc")
@@ -97,7 +97,7 @@ public final class GeoWorker {
}
}
geoIdByTypeMapTemp = expandGeoRegionDeep(geoIdByTypeMapTemp, delegator);
- Map<String, String> geoIdByTypeMapNew = new LinkedHashMap<String, String>();
+ Map<String, String> geoIdByTypeMapNew = new LinkedHashMap<>();
// add the temp Map first, then the original over top of it, ie give the original priority over the sub/expanded values
geoIdByTypeMapNew.putAll(geoIdByTypeMapTemp);
geoIdByTypeMapNew.putAll(geoIdByTypeMapOrig);
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java Sun Apr 21 12:49:52 2019
@@ -115,13 +115,13 @@ public final class ContextHelper {
if (isService()) {
errorMessages = UtilGenerics.checkList(getResults().get(ModelService.ERROR_MESSAGE_LIST));
if (errorMessages == null) {
- errorMessages = new LinkedList<String>();
+ errorMessages = new LinkedList<>();
getResults().put(ModelService.ERROR_MESSAGE_LIST, errorMessages);
}
} else {
errorMessages = UtilGenerics.checkList(getResults().get("_error_message_list_"));
if (errorMessages == null) {
- errorMessages = new LinkedList<String>();
+ errorMessages = new LinkedList<>();
getResults().put("_error_message_list_", errorMessages);
}
}
@@ -147,7 +147,7 @@ public final class ContextHelper {
public Map<String, Object> getParameters() {
Map<String, Object> parameters = UtilGenerics.checkMap(this.context.getAttribute(ScriptUtil.PARAMETERS_KEY));
if (parameters == null) {
- parameters = new LinkedHashMap<String, Object>();
+ parameters = new LinkedHashMap<>();
this.context.setAttribute(ScriptUtil.PARAMETERS_KEY, parameters, ScriptContext.ENGINE_SCOPE);
}
return parameters;
@@ -168,7 +168,7 @@ public final class ContextHelper {
public Map<String, Object> getResults() {
Map<String, Object> results = UtilGenerics.checkMap(this.context.getAttribute(ScriptUtil.RESULT_KEY));
if (results == null) {
- results = new LinkedHashMap<String, Object>();
+ results = new LinkedHashMap<>();
this.context.setAttribute(ScriptUtil.RESULT_KEY, results, ScriptContext.ENGINE_SCOPE);
}
return results;
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java Sun Apr 21 12:49:52 2019
@@ -53,7 +53,7 @@ public final class ScriptHelperImpl impl
private static GenericValue runFindByPrimaryKey(ModelEntity modelEntity, ContextHelper ctxHelper, boolean useCache, boolean autoFieldMap,
Map<String, ? extends Object> fieldMap, List<String> selectFieldList) throws ScriptException {
- Map<String, Object> entityContext = new HashMap<String, Object>();
+ Map<String, Object> entityContext = new HashMap<>();
Delegator delegator = ctxHelper.getDelegator();
Map<String, Object> context = ctxHelper.getBindings();
if (autoFieldMap) {
@@ -75,7 +75,7 @@ public final class ScriptHelperImpl impl
entityContext.remove("timeZone");
Set<String> fieldsToSelect = null;
if (selectFieldList != null) {
- fieldsToSelect = new HashSet<String>(selectFieldList);
+ fieldsToSelect = new HashSet<>(selectFieldList);
}
if (fieldsToSelect != null && useCache) {
String errMsg = "Error running script " + ctxHelper.getScriptName() + ": Problem invoking the findOne method: Cannot specify selectFieldList argument when useCache is set to true ";
@@ -116,7 +116,7 @@ public final class ScriptHelperImpl impl
public Map<String, ? extends Object> createServiceMap(String serviceName, Map<String, ? extends Object> inputMap) throws ScriptException {
Assert.notNull("serviceName", serviceName, "inputMap", inputMap);
- Map<String, Object> toMap = new HashMap<String, Object>();
+ Map<String, Object> toMap = new HashMap<>();
ModelService modelService = null;
try {
modelService = ctxHelper.getDispatcher().getDispatchContext().getModelService(serviceName);
@@ -226,7 +226,7 @@ public final class ScriptHelperImpl impl
}
}
}
- Map<String, Object> inMap = new HashMap<String, Object>(inputMap);
+ Map<String, Object> inMap = new HashMap<>(inputMap);
if (includeUserLogin && !inMap.containsKey("userLogin")) {
GenericValue userLogin = ctxHelper.getUserLogin();
if (userLogin != null) {
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java Sun Apr 21 12:49:52 2019
@@ -52,7 +52,7 @@ public class StatusServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonStatusMandatory", locale));
}
- List<GenericValue> statusItems = new LinkedList<GenericValue>();
+ List<GenericValue> statusItems = new LinkedList<>();
for (String statusTypeId: statusTypes) {
try {
List<GenericValue> myStatusItems = EntityQuery.use(delegator)
@@ -66,7 +66,7 @@ public class StatusServices {
Debug.logError(e, module);
}
}
- Map<String, Object> ret = new LinkedHashMap<String, Object>();
+ Map<String, Object> ret = new LinkedHashMap<>();
ret.put("statusItems",statusItems);
return ret;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java Sun Apr 21 12:49:52 2019
@@ -57,7 +57,7 @@ public final class StatusWorker {
public static void getStatusItems(PageContext pageContext, String attributeName, String statusTypeIdOne, String statusTypeIdTwo) {
Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator");
- List<GenericValue> statusItems = new LinkedList<GenericValue>();
+ List<GenericValue> statusItems = new LinkedList<>();
try {
List<GenericValue> calItems = EntityQuery.use(delegator)
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/telecom/TelecomServices.java Sun Apr 21 12:49:52 2019
@@ -68,7 +68,7 @@ public class TelecomServices {
try {
- Map<String, Object> createCommEventCtx = new HashMap<String, Object>();
+ Map<String, Object> createCommEventCtx = new HashMap<>();
createCommEventCtx = ctx.makeValidContext("createCommunicationEvent", ModelService.IN_PARAM, context);
createCommEventCtx.put("content", message);
createCommEventCtx.put("communicationEventTypeId", "PHONE_COMMUNICATION");
@@ -82,7 +82,7 @@ public class TelecomServices {
}
String communicationEventId = (String) createCommEventResult.get("communicationEventId");
- Map<String, Object> conditions = new HashMap<String, Object>();
+ Map<String, Object> conditions = new HashMap<>();
conditions.put("productStoreId", productStoreId);
conditions.put("telecomMsgTypeEnumId", telecomMsgTypeEnumId);
conditions.put("telecomMethodTypeId", telecomMethodTypeId);
@@ -90,7 +90,7 @@ public class TelecomServices {
if (productStoreTelecomSetting != null) {
GenericValue customMethod = productStoreTelecomSetting.getRelatedOne("CustomMethod", false);
if (UtilValidate.isNotEmpty(customMethod.getString("customMethodName"))) {
- Map<String, Object> serviceCtx = new HashMap<String, Object>();
+ Map<String, Object> serviceCtx = new HashMap<>();
serviceCtx.put("numbers", numbers);
serviceCtx.put("message", message);
if (telecomGatewayConfigId != null) {
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/test/PerformFindTests.java Sun Apr 21 12:49:52 2019
@@ -43,7 +43,7 @@ public class PerformFindTests extends OF
}
private List<GenericValue> getCompleteList(Map<String, Object> context) {
- List<GenericValue> foundElements = new LinkedList<GenericValue>();
+ List<GenericValue> foundElements = new LinkedList<>();
try (EntityListIterator listIt = (EntityListIterator) context.get("listIt")) {
if (listIt != null) {
foundElements = listIt.getCompleteList();
@@ -115,7 +115,7 @@ public class PerformFindTests extends OF
GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").cache().queryOne();
prepareData();
- Map<String, Object> inputFields = new HashMap<String, Object>();
+ Map<String, Object> inputFields = new HashMap<>();
//first test without condition
Map<String, Object> performFindMap = UtilMisc.toMap("userLogin", userLogin, "entityName", "Testing", "inputFields", inputFields);
Map<String, Object> result = dispatcher.runSync("performFind", performFindMap);
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java Sun Apr 21 12:49:52 2019
@@ -79,6 +79,6 @@ public class GetLocaleListTests {
params.put("localeString", "fr");
List<Map<String, String>> res = runScript();
assertThat(localeStrings(res), hasItems("en_ZA", "fr", "fr_BE", "fr_CA", "fr_FR", "fr_LU", "fr_CH"));
- assertEquals(new HashSet<String>(localeStrings(res)).size(), localeStrings(res).size());
+ assertEquals(new HashSet<>(localeStrings(res)).size(), localeStrings(res).size());
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/RecordIterator.java Sun Apr 21 12:49:52 2019
@@ -166,7 +166,7 @@ public class RecordIterator {
// if this record has children, put it on the parentStack and get/check the children now
if (this.curRecord.getModelRecord().childRecords.size() > 0) {
- Stack<Record> parentStack = new Stack<Record>();
+ Stack<Record> parentStack = new Stack<>();
parentStack.push(curRecord);
while (this.nextRecord != null && this.nextRecord.getModelRecord().parentRecord != null) {
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/Datasource.java Sun Apr 21 12:49:52 2019
@@ -181,7 +181,7 @@ public final class Datasource {
if (sqlLoadPathElementList.isEmpty()) {
this.sqlLoadPathList = Collections.emptyList();
} else {
- List<SqlLoadPath> sqlLoadPathList = new ArrayList<SqlLoadPath>(sqlLoadPathElementList.size());
+ List<SqlLoadPath> sqlLoadPathList = new ArrayList<>(sqlLoadPathElementList.size());
for (Element sqlLoadPathElement : sqlLoadPathElementList) {
sqlLoadPathList.add(new SqlLoadPath(sqlLoadPathElement));
}
@@ -191,7 +191,7 @@ public final class Datasource {
if (readDataElementList.isEmpty()) {
this.readDataList = Collections.emptyList();
} else {
- List<ReadData> readDataList = new ArrayList<ReadData>(readDataElementList.size());
+ List<ReadData> readDataList = new ArrayList<>(readDataElementList.size());
for (Element readDataElement : readDataElementList) {
readDataList.add(new ReadData(readDataElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java Sun Apr 21 12:49:52 2019
@@ -98,8 +98,8 @@ public final class DelegatorElement {
if (groupMapElementList.isEmpty()) {
throw new GenericEntityConfException("<delegator> element child elements <group-map> are missing" + lineNumberText);
} else {
- List<GroupMap> groupMapList = new ArrayList<GroupMap>(groupMapElementList.size());
- Map<String, String> groupMapMap = new HashMap<String, String>();
+ List<GroupMap> groupMapList = new ArrayList<>(groupMapElementList.size());
+ Map<String, String> groupMapMap = new HashMap<>();
for (Element groupMapElement : groupMapElementList) {
GroupMap groupMap = new GroupMap(groupMapElement);
groupMapList.add(groupMap);
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java Sun Apr 21 12:49:52 2019
@@ -81,8 +81,8 @@ public final class EntityConfig {
if (resourceLoaderElementList.isEmpty()) {
throw new GenericEntityConfException("<entity-config> element child elements <resource-loader> are missing");
} else {
- List<ResourceLoader> resourceLoaderList = new ArrayList<ResourceLoader>(resourceLoaderElementList.size());
- Map<String, ResourceLoader> resourceLoaderMap = new HashMap<String, ResourceLoader>();
+ List<ResourceLoader> resourceLoaderList = new ArrayList<>(resourceLoaderElementList.size());
+ Map<String, ResourceLoader> resourceLoaderMap = new HashMap<>();
for (Element resourceLoaderElement : resourceLoaderElementList) {
ResourceLoader resourceLoader = new ResourceLoader(resourceLoaderElement);
resourceLoaderList.add(resourceLoader);
@@ -113,8 +113,8 @@ public final class EntityConfig {
if (delegatorElementList.isEmpty()) {
throw new GenericEntityConfException("<entity-config> element child elements <delegator> are missing");
} else {
- List<DelegatorElement> delegatorList = new ArrayList<DelegatorElement>(delegatorElementList.size());
- Map<String, DelegatorElement> delegatorMap = new HashMap<String, DelegatorElement>();
+ List<DelegatorElement> delegatorList = new ArrayList<>(delegatorElementList.size());
+ Map<String, DelegatorElement> delegatorMap = new HashMap<>();
for (Element delegatorElement : delegatorElementList) {
DelegatorElement delegator = new DelegatorElement(delegatorElement);
delegatorList.add(delegator);
@@ -127,8 +127,8 @@ public final class EntityConfig {
if (entityModelReaderElementList.isEmpty()) {
throw new GenericEntityConfException("<entity-config> element child elements <entity-model-reader> are missing");
} else {
- List<EntityModelReader> entityModelReaderList = new ArrayList<EntityModelReader>(entityModelReaderElementList.size());
- Map<String, EntityModelReader> entityModelReaderMap = new HashMap<String, EntityModelReader>();
+ List<EntityModelReader> entityModelReaderList = new ArrayList<>(entityModelReaderElementList.size());
+ Map<String, EntityModelReader> entityModelReaderMap = new HashMap<>();
for (Element entityModelReaderElement : entityModelReaderElementList) {
EntityModelReader entityModelReader = new EntityModelReader(entityModelReaderElement);
entityModelReaderList.add(entityModelReader);
@@ -141,8 +141,8 @@ public final class EntityConfig {
if (entityGroupReaderElementList.isEmpty()) {
throw new GenericEntityConfException("<entity-config> element child elements <entity-group-reader> are missing");
} else {
- List<EntityGroupReader> entityGroupReaderList = new ArrayList<EntityGroupReader>(entityGroupReaderElementList.size());
- Map<String, EntityGroupReader> entityGroupReaderMap = new HashMap<String, EntityGroupReader>();
+ List<EntityGroupReader> entityGroupReaderList = new ArrayList<>(entityGroupReaderElementList.size());
+ Map<String, EntityGroupReader> entityGroupReaderMap = new HashMap<>();
for (Element entityGroupReaderElement : entityGroupReaderElementList) {
EntityGroupReader entityGroupReader = new EntityGroupReader(entityGroupReaderElement);
entityGroupReaderList.add(entityGroupReader);
@@ -156,8 +156,8 @@ public final class EntityConfig {
this.entityEcaReaderList = Collections.emptyList();
this.entityEcaReaderMap = Collections.emptyMap();
} else {
- List<EntityEcaReader> entityEcaReaderList = new ArrayList<EntityEcaReader>(entityEcaReaderElementList.size());
- Map<String, EntityEcaReader> entityEcaReaderMap = new HashMap<String, EntityEcaReader>();
+ List<EntityEcaReader> entityEcaReaderList = new ArrayList<>(entityEcaReaderElementList.size());
+ Map<String, EntityEcaReader> entityEcaReaderMap = new HashMap<>();
for (Element entityEcaReaderElement : entityEcaReaderElementList) {
EntityEcaReader entityEcaReader = new EntityEcaReader(entityEcaReaderElement);
entityEcaReaderList.add(new EntityEcaReader(entityEcaReaderElement));
@@ -171,8 +171,8 @@ public final class EntityConfig {
this.entityDataReaderList = Collections.emptyList();
this.entityDataReaderMap = Collections.emptyMap();
} else {
- List<EntityDataReader> entityDataReaderList = new ArrayList<EntityDataReader>(entityDataReaderElementList.size());
- Map<String, EntityDataReader> entityDataReaderMap = new HashMap<String, EntityDataReader>();
+ List<EntityDataReader> entityDataReaderList = new ArrayList<>(entityDataReaderElementList.size());
+ Map<String, EntityDataReader> entityDataReaderMap = new HashMap<>();
for (Element entityDataReaderElement : entityDataReaderElementList) {
EntityDataReader entityDataReader = new EntityDataReader(entityDataReaderElement);
entityDataReaderList.add(entityDataReader);
@@ -185,8 +185,8 @@ public final class EntityConfig {
if (fieldTypeElementList.isEmpty()) {
throw new GenericEntityConfException("<entity-config> element child elements <field-type> are missing");
} else {
- List<FieldType> fieldTypeList = new ArrayList<FieldType>(fieldTypeElementList.size());
- Map<String, FieldType> fieldTypeMap = new HashMap<String, FieldType>();
+ List<FieldType> fieldTypeList = new ArrayList<>(fieldTypeElementList.size());
+ Map<String, FieldType> fieldTypeMap = new HashMap<>();
for (Element fieldTypeElement : fieldTypeElementList) {
FieldType fieldType = new FieldType(fieldTypeElement);
fieldTypeList.add(fieldType);
@@ -199,8 +199,8 @@ public final class EntityConfig {
if (datasourceElementList.isEmpty()) {
throw new GenericEntityConfException("<entity-config> element child elements <datasource> are missing");
} else {
- List<Datasource> datasourceList = new ArrayList<Datasource>(datasourceElementList.size());
- Map<String, Datasource> datasourceMap = new HashMap<String, Datasource>();
+ List<Datasource> datasourceList = new ArrayList<>(datasourceElementList.size());
+ Map<String, Datasource> datasourceMap = new HashMap<>();
for (Element datasourceElement : datasourceElementList) {
Datasource datasource = new Datasource(datasourceElement);
datasourceList.add(datasource);
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityDataReader.java Sun Apr 21 12:49:52 2019
@@ -57,7 +57,7 @@ public final class EntityDataReader {
if (resourceElementList.isEmpty()) {
this.resourceList = Collections.emptyList();
} else {
- List<Resource> resourceList = new ArrayList<Resource>(resourceElementList.size());
+ List<Resource> resourceList = new ArrayList<>(resourceElementList.size());
for (Element resourceElement : resourceElementList) {
resourceList.add(new Resource(resourceElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityEcaReader.java Sun Apr 21 12:49:52 2019
@@ -49,7 +49,7 @@ public final class EntityEcaReader {
if (resourceElementList.isEmpty()) {
this.resourceList = Collections.emptyList();
} else {
- List<Resource> resourceList = new ArrayList<Resource>(resourceElementList.size());
+ List<Resource> resourceList = new ArrayList<>(resourceElementList.size());
for (Element resourceElement : resourceElementList) {
resourceList.add(new Resource(resourceElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityGroupReader.java Sun Apr 21 12:49:52 2019
@@ -53,7 +53,7 @@ public final class EntityGroupReader {
if (resourceElementList.isEmpty()) {
this.resourceList = Collections.emptyList();
} else {
- List<Resource> resourceList = new ArrayList<Resource>(resourceElementList.size());
+ List<Resource> resourceList = new ArrayList<>(resourceElementList.size());
for (Element resourceElement : resourceElementList) {
resourceList.add(new Resource(resourceElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityModelReader.java Sun Apr 21 12:49:52 2019
@@ -49,7 +49,7 @@ public final class EntityModelReader {
if (resourceElementList.isEmpty()) {
this.resourceList = Collections.emptyList();
} else {
- List<Resource> resourceList = new ArrayList<Resource>(resourceElementList.size());
+ List<Resource> resourceList = new ArrayList<>(resourceElementList.size());
for (Element resourceElement : resourceElementList) {
resourceList.add(new Resource(resourceElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DBCPConnectionFactory.java Sun Apr 21 12:49:52 2019
@@ -146,7 +146,7 @@ public class DBCPConnectionFactory imple
poolConfig.setTestOnReturn(jdbcElement.getTestOnReturn());
poolConfig.setTestWhileIdle(jdbcElement.getTestWhileIdle());
- GenericObjectPool<PoolableConnection> pool = new GenericObjectPool<PoolableConnection>(factory, poolConfig);
+ GenericObjectPool<PoolableConnection> pool = new GenericObjectPool<>(factory, poolConfig);
factory.setPool(pool);
mds = new DebugManagedDataSource<>(pool, xacf.getTransactionRegistry());
@@ -165,7 +165,7 @@ public class DBCPConnectionFactory imple
}
public static Map<String, Object> getDataSourceInfo(String helperName) {
- Map<String, Object> dataSourceInfo = new HashMap<String, Object>();
+ Map<String, Object> dataSourceInfo = new HashMap<>();
DebugManagedDataSource<? extends Connection> mds = dsCache.get(helperName);
if (mds != null) {
dataSourceInfo = mds.getInfo();
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java Sun Apr 21 12:49:52 2019
@@ -52,7 +52,7 @@ public class DebugManagedDataSource<C ex
}
public Map<String, Object> getInfo() {
- Map<String, Object> dataSourceInfo = new HashMap<String, Object>();
+ Map<String, Object> dataSourceInfo = new HashMap<>();
dataSourceInfo.put("poolNumActive", super.getPool().getNumActive());
dataSourceInfo.put("poolNumIdle", super.getPool().getNumIdle());
dataSourceInfo.put("poolNumTotal", (super.getPool().getNumIdle() + super.getPool().getNumActive()));
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java Sun Apr 21 12:49:52 2019
@@ -71,7 +71,7 @@ public class GenericDAO {
public static final String module = GenericDAO.class.getName();
- private static final ConcurrentHashMap<String, GenericDAO> genericDAOs = new ConcurrentHashMap<String, GenericDAO>();
+ private static final ConcurrentHashMap<String, GenericDAO> genericDAOs = new ConcurrentHashMap<>();
private final GenericHelperInfo helperInfo;
private final ModelFieldTypeReader modelFieldTypeReader;
private final Datasource datasource;
@@ -183,7 +183,7 @@ public class GenericDAO {
ModelEntity modelEntity = entity.getModelEntity();
// we don't want to update ALL fields, just the nonpk fields that are in the passed GenericEntity
- List<ModelField> partialFields = new LinkedList<ModelField>();
+ List<ModelField> partialFields = new LinkedList<>();
Collection<String> keys = entity.getAllKeys();
Iterator<ModelField> nopkIter = modelEntity.getNopksIterator();
@@ -293,7 +293,7 @@ public class GenericDAO {
StringBuilder sql = new StringBuilder("UPDATE ").append(modelEntity.getTableName(datasource));
sql.append(" SET ");
- List<EntityConditionParam> params = new LinkedList<EntityConditionParam>();
+ List<EntityConditionParam> params = new LinkedList<>();
for (Map.Entry<String, ? extends Object> entry: fieldsToSet.entrySet()) {
String name = entry.getKey();
ModelField field = modelEntity.getField(name);
@@ -350,7 +350,7 @@ public class GenericDAO {
throw new GenericEntityException("Failed to get model entity for " + meName, e);
}
- Map<String, Object> findByMap = new HashMap<String, Object>();
+ Map<String, Object> findByMap = new HashMap<>();
// Now iterate the ModelViewLinks to construct the "WHERE" part for update/insert
Iterator<ModelViewEntity.ModelViewLink> linkIter = modelViewEntity.getViewLinksIterator();
@@ -420,7 +420,7 @@ public class GenericDAO {
}
// Construct fieldsToSave list for this member entity
- List<ModelField> meFieldsToSave = new LinkedList<ModelField>();
+ List<ModelField> meFieldsToSave = new LinkedList<>();
for (ModelField modelField: fieldsToSave) {
if (memberModelEntity.isField(modelField.getName())) {
ModelField meModelField = memberModelEntity.getField(modelField.getName());
@@ -513,9 +513,9 @@ public class GenericDAO {
}
// we don't want to select ALL fields, just the nonpk fields that are in the passed GenericEntity
- List<ModelField> partialFields = new LinkedList<ModelField>();
+ List<ModelField> partialFields = new LinkedList<>();
- Set<String> tempKeys = new TreeSet<String>(keys);
+ Set<String> tempKeys = new TreeSet<>(keys);
Iterator<ModelField> entityFieldIter = modelEntity.getFieldsIterator();
while (entityFieldIter.hasNext()) {
@@ -595,12 +595,12 @@ public class GenericDAO {
}
// make two ArrayLists of fields, one for fields to select and the other for where clause fields (to find by)
- List<ModelField> selectFields = new LinkedList<ModelField>();
+ List<ModelField> selectFields = new LinkedList<>();
if (UtilValidate.isNotEmpty(fieldsToSelect)) {
- Set<String> tempKeys = new HashSet<String>();
+ Set<String> tempKeys = new HashSet<>();
tempKeys.addAll(fieldsToSelect);
- Set<String> fieldSetsToInclude = new HashSet<String>();
- Set<String> addedFields = new HashSet<String>();
+ Set<String> fieldSetsToInclude = new HashSet<>();
+ Set<String> addedFields = new HashSet<>();
for (String fieldToSelect : fieldsToSelect) {
if (tempKeys.contains(fieldToSelect)) {
ModelField curField = modelEntity.getField(fieldToSelect);
@@ -622,8 +622,8 @@ public class GenericDAO {
}
if (UtilValidate.isNotEmpty(fieldSetsToInclude)) {
Iterator<ModelField> fieldIter = modelEntity.getFieldsIterator();
- Set<String> extraFields = new HashSet<String>();
- Set<String> reasonSets = new HashSet<String>();
+ Set<String> extraFields = new HashSet<>();
+ Set<String> reasonSets = new HashSet<>();
while (fieldIter.hasNext()) {
ModelField curField = fieldIter.next();
String fieldSet = curField.getFieldSet();
@@ -668,9 +668,9 @@ public class GenericDAO {
List<EntityCondition> viewHavingConditions = null;
List<String> viewOrderByList = null;
if (modelViewEntity != null) {
- viewWhereConditions = new LinkedList<EntityCondition>();
- viewHavingConditions = new LinkedList<EntityCondition>();
- viewOrderByList = new LinkedList<String>();
+ viewWhereConditions = new LinkedList<>();
+ viewHavingConditions = new LinkedList<>();
+ viewOrderByList = new LinkedList<>();
modelViewEntity.populateViewEntityConditionInformation(modelFieldTypeReader, viewWhereConditions, viewHavingConditions, viewOrderByList, null);
}
@@ -678,7 +678,7 @@ public class GenericDAO {
sqlBuffer.append(SqlJdbcUtil.makeFromClause(modelEntity, modelFieldTypeReader, datasource));
// WHERE clause
- List<EntityConditionParam> whereEntityConditionParams = new LinkedList<EntityConditionParam>();
+ List<EntityConditionParam> whereEntityConditionParams = new LinkedList<>();
makeConditionWhereString(sqlBuffer, " WHERE ", modelEntity, whereEntityCondition, viewWhereConditions, whereEntityConditionParams);
// GROUP BY clause for view-entity
@@ -687,11 +687,11 @@ public class GenericDAO {
}
// HAVING clause
- List<EntityConditionParam> havingEntityConditionParams = new LinkedList<EntityConditionParam>();
+ List<EntityConditionParam> havingEntityConditionParams = new LinkedList<>();
makeConditionHavingString(sqlBuffer, " HAVING ", modelEntity, havingEntityCondition, viewHavingConditions, havingEntityConditionParams);
// ORDER BY clause
- List<String> orderByExpanded = new LinkedList<String>();
+ List<String> orderByExpanded = new LinkedList<>();
// add the manually specified ones, then the ones in the view entity's entity-condition
if (orderBy != null) {
orderByExpanded.addAll(orderBy);
@@ -755,7 +755,7 @@ public class GenericDAO {
modelViewEntity = (ModelViewEntity) modelEntity;
}
- List<EntityCondition> conditions = new LinkedList<EntityCondition>();
+ List<EntityCondition> conditions = new LinkedList<>();
if (UtilValidate.isNotEmpty(whereEntityCondition)) {
conditions.add(whereEntityCondition);
}
@@ -857,7 +857,7 @@ public class GenericDAO {
// get the column name string to select
StringBuilder selsb = new StringBuilder();
- List<String> fldlist = new LinkedList<String>();
+ List<String> fldlist = new LinkedList<>();
for (Iterator<ModelField> iterator = modelEntityTwo.getFieldsIterator(); iterator.hasNext();) {
ModelField mf = iterator.next();
@@ -885,7 +885,7 @@ public class GenericDAO {
// construct the source entity qualifier
// get the fields from relation description
- Map<ModelField, Object> bindMap = new HashMap<ModelField, Object>();
+ Map<ModelField, Object> bindMap = new HashMap<>();
for (ModelKeyMap mkm : modelRelationOne.getKeyMaps()) {
// get the equivalent column names in the relation
String sfldname = mkm.getFieldName();
@@ -914,7 +914,7 @@ public class GenericDAO {
sqlsb.append(SqlJdbcUtil.makeOrderByClause(modelEntityTwo, orderBy, true, datasource));
// now execute the query
- List<GenericValue> retlist = new LinkedList<GenericValue>();
+ List<GenericValue> retlist = new LinkedList<>();
Delegator gd = value.getDelegator();
try (SQLProcessor sqlP = new SQLProcessor(value.getDelegator(), helperInfo)) {
@@ -1016,9 +1016,9 @@ public class GenericDAO {
List<EntityCondition> viewHavingConditions = null;
List<String> viewOrderByList = null;
if (modelViewEntity != null) {
- viewWhereConditions = new LinkedList<EntityCondition>();
- viewHavingConditions = new LinkedList<EntityCondition>();
- viewOrderByList = new LinkedList<String>();
+ viewWhereConditions = new LinkedList<>();
+ viewHavingConditions = new LinkedList<>();
+ viewOrderByList = new LinkedList<>();
modelViewEntity.populateViewEntityConditionInformation(modelFieldTypeReader, viewWhereConditions, viewHavingConditions, viewOrderByList, null);
}
@@ -1026,7 +1026,7 @@ public class GenericDAO {
sqlBuffer.append(SqlJdbcUtil.makeFromClause(modelEntity, modelFieldTypeReader, datasource));
// WHERE clause
- List<EntityConditionParam> whereEntityConditionParams = new LinkedList<EntityConditionParam>();
+ List<EntityConditionParam> whereEntityConditionParams = new LinkedList<>();
makeConditionWhereString(sqlBuffer, " WHERE ", modelEntity, whereEntityCondition, viewWhereConditions, whereEntityConditionParams);
// GROUP BY clause for view-entity
@@ -1035,7 +1035,7 @@ public class GenericDAO {
}
// HAVING clause
- List<EntityConditionParam> havingEntityConditionParams = new LinkedList<EntityConditionParam>();
+ List<EntityConditionParam> havingEntityConditionParams = new LinkedList<>();
makeConditionHavingString(sqlBuffer, " HAVING ", modelEntity, havingEntityCondition, viewHavingConditions, havingEntityConditionParams);
if (isGroupBy) {
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperDAO.java Sun Apr 21 12:49:52 2019
@@ -104,7 +104,7 @@ public class GenericHelperDAO implements
*/
public List<GenericValue> findAllByPrimaryKeys(List<GenericPK> primaryKeys) throws GenericEntityException {
if (primaryKeys == null) return null;
- List<GenericValue> results = new LinkedList<GenericValue>();
+ List<GenericValue> results = new LinkedList<>();
for (GenericPK primaryKey: primaryKeys) {
GenericValue result = this.findByPrimaryKey(primaryKey);
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericHelperFactory.java Sun Apr 21 12:49:52 2019
@@ -36,7 +36,7 @@ public class GenericHelperFactory {
public static final String module = GenericHelperFactory.class.getName();
// protected static UtilCache helperCache = new UtilCache("entity.GenericHelpers", 0, 0);
- protected static final Map<String, GenericHelper> helperCache = new HashMap<String, GenericHelper>();
+ protected static final Map<String, GenericHelper> helperCache = new HashMap<>();
public static GenericHelper getHelper(GenericHelperInfo helperInfo) {
GenericHelper helper = helperCache.get(helperInfo.getHelperFullName());
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java Sun Apr 21 12:49:52 2019
@@ -98,7 +98,7 @@ public class ReadOnlyHelperDAO implement
*/
public List<GenericValue> findAllByPrimaryKeys(List<GenericPK> primaryKeys) throws GenericEntityException {
if (primaryKeys == null) return null;
- List<GenericValue> results = new LinkedList<GenericValue>();
+ List<GenericValue> results = new LinkedList<>();
for (GenericPK primaryKey: primaryKeys) {
GenericValue result = this.findByPrimaryKey(primaryKey);