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 [8/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/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/artifact/ArtifactInfoContext.java Sun Apr 21 12:49:52 2019
@@ -28,9 +28,9 @@ import org.apache.ofbiz.minilang.SimpleM
*/
public final class ArtifactInfoContext {
- private final Set<String> entityNameSet = new HashSet<String>();
- private final Set<String> serviceNameSet = new HashSet<String>();
- private final Set<String> simpleMethodNameSet = new HashSet<String>();
+ private final Set<String> entityNameSet = new HashSet<>();
+ private final Set<String> serviceNameSet = new HashSet<>();
+ private final Set<String> simpleMethodNameSet = new HashSet<>();
/**
* Adds an entity name to this context.
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodContext.java Sun Apr 21 12:49:52 2019
@@ -47,14 +47,14 @@ public final class MethodContext {
private Delegator delegator;
private LocalDispatcher dispatcher;
- private Map<String, Object> env = new HashMap<String, Object>();
+ private Map<String, Object> env = new HashMap<>();
private ClassLoader loader;
private Locale locale;
private int methodType;
private Map<String, Object> parameters;
private HttpServletRequest request = null;
private HttpServletResponse response = null;
- private Map<String, Object> results = new HashMap<String, Object>();
+ private Map<String, Object> results = new HashMap<>();
private Security security;
private TimeZone timeZone;
private int traceCount = 0;
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallClassMethod.java Sun Apr 21 12:49:52 2019
@@ -73,12 +73,12 @@ public final class CallClassMethod exten
this.retFieldFma = FlexibleMapAccessor.getInstance(element.getAttribute("ret-field"));
List<? extends Element> parameterElements = UtilXml.childElementList(element);
if (parameterElements.size() > 0) {
- ArrayList<MethodObject<?>> parameterList = new ArrayList<MethodObject<?>>(parameterElements.size());
+ ArrayList<MethodObject<?>> parameterList = new ArrayList<>(parameterElements.size());
for (Element parameterElement : parameterElements) {
if ("string".equals(parameterElement.getNodeName())) {
parameterList.add(new StringObject(parameterElement, simpleMethod));
} else if ("field".equals(parameterElement.getNodeName())) {
- parameterList.add(new FieldObject<Object>(parameterElement, simpleMethod));
+ parameterList.add(new FieldObject<>(parameterElement, simpleMethod));
}
}
parameterList.trimToSize();
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallObjectMethod.java Sun Apr 21 12:49:52 2019
@@ -64,12 +64,12 @@ public final class CallObjectMethod exte
this.retFieldFma = FlexibleMapAccessor.getInstance(element.getAttribute("ret-field"));
List<? extends Element> parameterElements = UtilXml.childElementList(element);
if (parameterElements.size() > 0) {
- ArrayList<MethodObject<?>> parameterList = new ArrayList<MethodObject<?>>(parameterElements.size());
+ ArrayList<MethodObject<?>> parameterList = new ArrayList<>(parameterElements.size());
for (Element parameterElement : parameterElements) {
if ("string".equals(parameterElement.getNodeName())) {
parameterList.add(new StringObject(parameterElement, simpleMethod));
} else if ("field".equals(parameterElement.getNodeName())) {
- parameterList.add(new FieldObject<Object>(parameterElement, simpleMethod));
+ parameterList.add(new FieldObject<>(parameterElement, simpleMethod));
}
}
parameterList.trimToSize();
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallService.java Sun Apr 21 12:49:52 2019
@@ -113,7 +113,7 @@ public final class CallService extends M
defaultMessage = new FlexibleMessage(UtilXml.firstChildElement(element, "default-message"), null);// "service.default.message"
List<? extends Element> resultsToMapElements = UtilXml.childElementList(element, "results-to-map");
if (UtilValidate.isNotEmpty(resultsToMapElements)) {
- List<String> resultsToMapList = new ArrayList<String>(resultsToMapElements.size());
+ List<String> resultsToMapList = new ArrayList<>(resultsToMapElements.size());
for (Element resultsToMapElement : resultsToMapElements) {
resultsToMapList.add(resultsToMapElement.getAttribute("map-name"));
}
@@ -123,7 +123,7 @@ public final class CallService extends M
}
List<? extends Element> resultToFieldElements = UtilXml.childElementList(element, "result-to-field");
if (UtilValidate.isNotEmpty(resultToFieldElements)) {
- List<ResultToField> resultToFieldList = new ArrayList<ResultToField>(resultToFieldElements.size());
+ List<ResultToField> resultToFieldList = new ArrayList<>(resultToFieldElements.size());
for (Element resultToFieldElement : resultToFieldElements) {
resultToFieldList.add(new ResultToField(resultToFieldElement));
}
@@ -133,7 +133,7 @@ public final class CallService extends M
}
List<? extends Element> resultToRequestElements = UtilXml.childElementList(element, "result-to-request");
if (UtilValidate.isNotEmpty(resultToRequestElements)) {
- List<ResultToRequest> resultToRequestList = new ArrayList<ResultToRequest>(resultToRequestElements.size());
+ List<ResultToRequest> resultToRequestList = new ArrayList<>(resultToRequestElements.size());
for (Element resultToRequestElement : resultToRequestElements) {
resultToRequestList.add(new ResultToRequest(resultToRequestElement));
}
@@ -143,7 +143,7 @@ public final class CallService extends M
}
List<? extends Element> resultToSessionElements = UtilXml.childElementList(element, "result-to-session");
if (UtilValidate.isNotEmpty(resultToSessionElements)) {
- List<ResultToSession> resultToSessionList = new ArrayList<ResultToSession>(resultToSessionElements.size());
+ List<ResultToSession> resultToSessionList = new ArrayList<>(resultToSessionElements.size());
for (Element resultToSessionElement : resultToSessionElements) {
resultToSessionList.add(new ResultToSession(resultToSessionElement));
}
@@ -153,7 +153,7 @@ public final class CallService extends M
}
List<? extends Element> resultToResultElements = UtilXml.childElementList(element, "result-to-result");
if (UtilValidate.isNotEmpty(resultToResultElements)) {
- List<ResultToResult> resultToResultList = new ArrayList<ResultToResult>(resultToResultElements.size());
+ List<ResultToResult> resultToResultList = new ArrayList<>(resultToResultElements.size());
for (Element resultToResultElement : resultToResultElements) {
resultToResultList.add(new ResultToResult(resultToResultElement));
}
@@ -179,7 +179,7 @@ public final class CallService extends M
}
Map<String, Object> inMap = inMapFma.get(methodContext.getEnvMap());
if (inMap == null) {
- inMap = new HashMap<String, Object>();
+ inMap = new HashMap<>();
}
// before invoking the service, clear messages
if (methodContext.getMethodType() == MethodContext.EVENT) {
@@ -419,7 +419,7 @@ public final class CallService extends M
private final FlexibleServletAccessor<Object> requestFsa;
private ResultToRequest(Element element) {
- requestFsa = new FlexibleServletAccessor<Object>(element.getAttribute("request-name"), element.getAttribute("result-name"));
+ requestFsa = new FlexibleServletAccessor<>(element.getAttribute("request-name"), element.getAttribute("result-name"));
resultFma =FlexibleMapAccessor.getInstance(element.getAttribute("result-name"));
}
@@ -452,7 +452,7 @@ public final class CallService extends M
private final FlexibleServletAccessor<Object> requestFsa;
private ResultToSession(Element element) {
- requestFsa = new FlexibleServletAccessor<Object>(element.getAttribute("session-name"), element.getAttribute("result-name"));
+ requestFsa = new FlexibleServletAccessor<>(element.getAttribute("session-name"), element.getAttribute("result-name"));
resultFma =FlexibleMapAccessor.getInstance(element.getAttribute("result-name"));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallServiceAsynch.java Sun Apr 21 12:49:52 2019
@@ -70,7 +70,7 @@ public final class CallServiceAsynch ext
String serviceName = serviceNameFse.expandString(methodContext.getEnvMap());
Map<String, Object> inMap = inMapFma.get(methodContext.getEnvMap());
if (inMap == null) {
- inMap = new HashMap<String, Object>();
+ inMap = new HashMap<>();
}
if (includeUserLogin) {
GenericValue userLogin = methodContext.getUserLogin();
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java Sun Apr 21 12:49:52 2019
@@ -74,16 +74,16 @@ public final class CallSimpleMapProcesso
public boolean exec(MethodContext methodContext) throws MiniLangException {
List<Object> messages = errorListFma.get(methodContext.getEnvMap());
if (messages == null) {
- messages = new LinkedList<Object>();
+ messages = new LinkedList<>();
errorListFma.put(methodContext.getEnvMap(), messages);
}
Map<String, Object> inMap = inMapFma.get(methodContext.getEnvMap());
if (inMap == null) {
- inMap = new HashMap<String, Object>();
+ inMap = new HashMap<>();
}
Map<String, Object> outMap = outMapFma.get(methodContext.getEnvMap());
if (outMap == null) {
- outMap = new HashMap<String, Object>();
+ outMap = new HashMap<>();
outMapFma.put(methodContext.getEnvMap(), outMap);
}
// run external map processor first
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java Sun Apr 21 12:49:52 2019
@@ -82,7 +82,7 @@ public final class CallSimpleMethod exte
if (!"function".equals(this.scope)) {
MiniLangValidate.handleError("Inline scope cannot include <result-to-field> elements.", simpleMethod, element);
}
- List<ResultToField> resultToFieldList = new ArrayList<ResultToField>(resultToFieldElements.size());
+ List<ResultToField> resultToFieldList = new ArrayList<>(resultToFieldElements.size());
for (Element resultToFieldElement : resultToFieldElements) {
resultToFieldList.add(new ResultToField(resultToFieldElement, simpleMethod));
}
@@ -103,7 +103,7 @@ public final class CallSimpleMethod exte
}
MethodContext localContext = methodContext;
if ("function".equals(this.scope)) {
- Map<String, Object> localEnv = new HashMap<String, Object>();
+ Map<String, Object> localEnv = new HashMap<>();
localEnv.putAll(methodContext.getEnvMap());
localEnv.remove(this.simpleMethod.getEventResponseCodeName());
localEnv.remove(this.simpleMethod.getServiceResponseMessageName());
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java Sun Apr 21 12:49:52 2019
@@ -100,10 +100,10 @@ public final class SetServiceFields exte
}
Map<String, Object> toMap = toMapFma.get(methodContext.getEnvMap());
if (toMap == null) {
- toMap = new HashMap<String, Object>();
+ toMap = new HashMap<>();
toMapFma.put(methodContext.getEnvMap(), toMap);
}
- List<Object> errorMessages = new LinkedList<Object>();
+ List<Object> errorMessages = new LinkedList<>();
Map<String, Object> validAttributes = modelService.makeValid(fromMap, mode, true, errorMessages, methodContext.getTimeZone(), methodContext.getLocale());
if (errorMessages.size() > 0) {
for (Object obj : errorMessages) {
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/CombinedCondition.java Sun Apr 21 12:49:52 2019
@@ -45,7 +45,7 @@ public abstract class CombinedCondition
if (MiniLangValidate.validationOn() && childElements.isEmpty()) {
MiniLangValidate.handleError("No conditional elements.", simpleMethod, element);
}
- List<Conditional> conditionalList = new ArrayList<Conditional>(childElements.size());
+ List<Conditional> conditionalList = new ArrayList<>(childElements.size());
for (Element conditionalElement : UtilXml.childElementList(element)) {
conditionalList.add(ConditionalFactory.makeConditional(conditionalElement, simpleMethod));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/Compare.java Sun Apr 21 12:49:52 2019
@@ -48,7 +48,7 @@ public abstract class Compare {
}
private static Map<String, Compare> createInstanceMap() {
- Map<String, Compare> writableMap = new HashMap<String, Compare>(10);
+ Map<String, Compare> writableMap = new HashMap<>(10);
writableMap.put("contains", new CompareContains());
writableMap.put("equals", new CompareEquals());
writableMap.put("greater", new CompareGreater());
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/ConditionalFactory.java Sun Apr 21 12:49:52 2019
@@ -42,7 +42,7 @@ public abstract class ConditionalFactory
private static final Map<String, ConditionalFactory<?>> conditionalFactories;
static {
- Map<String, ConditionalFactory<?>> factories = new HashMap<String, ConditionalFactory<?>>();
+ Map<String, ConditionalFactory<?>> factories = new HashMap<>();
Iterator<ConditionalFactory<?>> it = UtilGenerics.cast(ServiceLoader.load(ConditionalFactory.class, ConditionalFactory.class.getClassLoader()).iterator());
while (it.hasNext()) {
ConditionalFactory<?> factory = it.next();
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/conditional/MasterIf.java Sun Apr 21 12:49:52 2019
@@ -56,7 +56,7 @@ public final class MasterIf extends Meth
if (elseIfElements.isEmpty()) {
this.elseIfs = null;
} else {
- List<ElseIf> elseIfs = new ArrayList<ElseIf>(elseIfElements.size());
+ List<ElseIf> elseIfs = new ArrayList<>(elseIfElements.size());
for (Element elseIfElement : elseIfElements) {
elseIfs.add(new ElseIf(elseIfElement, simpleMethod));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityData.java Sun Apr 21 12:49:52 2019
@@ -81,7 +81,7 @@ public final class EntityData extends En
public boolean exec(MethodContext methodContext) throws MiniLangException {
List<Object> messages = errorListFma.get(methodContext.getEnvMap());
if (messages == null) {
- messages = new LinkedList<Object>();
+ messages = new LinkedList<>();
errorListFma.put(methodContext.getEnvMap(), messages);
}
String location = this.locationFse.expandString(methodContext.getEnvMap());
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/AddError.java Sun Apr 21 12:49:52 2019
@@ -59,7 +59,7 @@ public final class AddError extends Meth
if (message != null) {
List<String> messages = errorListFma.get(methodContext.getEnvMap());
if (messages == null) {
- messages = new LinkedList<String>();
+ messages = new LinkedList<>();
errorListFma.put(methodContext.getEnvMap(), messages);
}
messages.add(message);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Assert.java Sun Apr 21 12:49:52 2019
@@ -60,7 +60,7 @@ public final class Assert extends Method
if (MiniLangValidate.validationOn() && childElements.isEmpty()) {
MiniLangValidate.handleError("No conditional elements.", simpleMethod, element);
}
- List<Conditional> conditionalList = new ArrayList<Conditional>(childElements.size());
+ List<Conditional> conditionalList = new ArrayList<>(childElements.size());
for (Element conditionalElement : UtilXml.childElementList(element)) {
conditionalList.add(ConditionalFactory.makeConditional(conditionalElement, simpleMethod));
}
@@ -85,7 +85,7 @@ public final class Assert extends Method
messageBuffer.append("failed: ");
condition.prettyPrint(messageBuffer, methodContext);
if (messages == null) {
- messages = new LinkedList<Object>();
+ messages = new LinkedList<>();
errorListFma.put(methodContext.getEnvMap(), messages);
}
messages.add(messageBuffer.toString());
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CheckId.java Sun Apr 21 12:49:52 2019
@@ -107,7 +107,7 @@ public final class CheckId extends Metho
if (message != null) {
List<String> messages = errorListFma.get(methodContext.getEnvMap());
if (messages == null) {
- messages = new LinkedList<String>();
+ messages = new LinkedList<>();
}
errorListFma.put(methodContext.getEnvMap(), messages);
messages.add(message.concat(": ").concat(errorMsg));
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/CreateObject.java Sun Apr 21 12:49:52 2019
@@ -72,12 +72,12 @@ public final class CreateObject extends
fieldFma = FlexibleMapAccessor.getInstance(element.getAttribute("field"));
List<? extends Element> parameterElements = UtilXml.childElementList(element);
if (parameterElements.size() > 0) {
- ArrayList<MethodObject<?>> parameterList = new ArrayList<MethodObject<?>>(parameterElements.size());
+ ArrayList<MethodObject<?>> parameterList = new ArrayList<>(parameterElements.size());
for (Element parameterElement : parameterElements) {
if ("string".equals(parameterElement.getNodeName())) {
parameterList.add(new StringObject(parameterElement, simpleMethod));
} else if ("field".equals(parameterElement.getNodeName())) {
- parameterList.add(new FieldObject<Object>(parameterElement, simpleMethod));
+ parameterList.add(new FieldObject<>(parameterElement, simpleMethod));
}
}
parameterList.trimToSize();
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/FieldToList.java Sun Apr 21 12:49:52 2019
@@ -58,7 +58,7 @@ public final class FieldToList extends M
if (fieldVal != null) {
List<Object> toList = listFma.get(methodContext.getEnvMap());
if (toList == null) {
- toList = new LinkedList<Object>();
+ toList = new LinkedList<>();
listFma.put(methodContext.getEnvMap(), toList);
}
toList.add(fieldVal);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/ListToList.java Sun Apr 21 12:49:52 2019
@@ -57,7 +57,7 @@ public final class ListToList extends Me
if (fromList != null) {
List<Object> toList = toListFma.get(methodContext.getEnvMap());
if (toList == null) {
- toList = new LinkedList<Object>();
+ toList = new LinkedList<>();
toListFma.put(methodContext.getEnvMap(), toList);
}
toList.addAll(fromList);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java Sun Apr 21 12:49:52 2019
@@ -58,7 +58,7 @@ public final class MapToMap extends Meth
if (!toMapFma.isEmpty()) {
Map<String, Object> toMap = toMapFma.get(methodContext.getEnvMap());
if (toMap == null) {
- toMap = new HashMap<String, Object>();
+ toMap = new HashMap<>();
toMapFma.put(methodContext.getEnvMap(), toMap);
}
toMap.putAll(fromMap);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java Sun Apr 21 12:49:52 2019
@@ -56,7 +56,7 @@ public final class OrderMapList extends
listFma = FlexibleMapAccessor.getInstance(element.getAttribute("list"));
List<? extends Element> orderByElements = UtilXml.childElementList(element, "order-by");
if (orderByElements.size() > 0) {
- List<FlexibleMapAccessor<String>> orderByList = new ArrayList<FlexibleMapAccessor<String>>(orderByElements.size());
+ List<FlexibleMapAccessor<String>> orderByList = new ArrayList<>(orderByElements.size());
for (Element orderByElement : orderByElements) {
FlexibleMapAccessor<String> fma = FlexibleMapAccessor.getInstance(orderByElement.getAttribute("field"));
orderByList.add(fma);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java Sun Apr 21 12:49:52 2019
@@ -172,7 +172,7 @@ public final class SetOperation extends
if ("NewMap".equals(this.type)) {
newValue = new HashMap<String, Object>();
} else if ("NewList".equals(this.type)) {
- newValue = new LinkedList<Object>();
+ newValue = new LinkedList<>();
} else {
try {
String format = null;
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/StringToList.java Sun Apr 21 12:49:52 2019
@@ -80,7 +80,7 @@ public final class StringToList extends
}
List<Object> toList = listFma.get(methodContext.getEnvMap());
if (toList == null) {
- toList = new LinkedList<Object>();
+ toList = new LinkedList<>();
listFma.put(methodContext.getEnvMap(), toList);
}
toList.add(value);
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/RequestParametersToList.java Sun Apr 21 12:49:52 2019
@@ -83,7 +83,7 @@ public final class RequestParametersToLi
if (parameterValues != null) {
List<String> valueList = listFma.get(methodContext.getEnvMap());
if (valueList == null) {
- valueList = new LinkedList<String>();
+ valueList = new LinkedList<>();
listFma.put(methodContext.getEnvMap(), valueList);
}
for (int i = 0; i < parameterValues.length; i++) {
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/ifops/CheckPermission.java Sun Apr 21 12:49:52 2019
@@ -60,7 +60,7 @@ public final class CheckPermission exten
primaryPermissionInfo = new PermissionInfo(element);
List<? extends Element> altPermElements = UtilXml.childElementList(element, "alt-permission");
if (!altPermElements.isEmpty()) {
- List<PermissionInfo> permissionInfoList = new ArrayList<PermissionInfo>(altPermElements.size());
+ List<PermissionInfo> permissionInfoList = new ArrayList<>(altPermElements.size());
for (Element altPermElement : altPermElements) {
permissionInfoList.add(new PermissionInfo(altPermElement));
}
@@ -90,7 +90,7 @@ public final class CheckPermission exten
if (!hasPermission && messageElement != null) {
List<String> messages = errorListFma.get(methodContext.getEnvMap());
if (messages == null) {
- messages = new LinkedList<String>();
+ messages = new LinkedList<>();
errorListFma.put(methodContext.getEnvMap(), messages);
}
messages.add(messageElement.getMessage(methodContext));
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MakeInString.java Sun Apr 21 12:49:52 2019
@@ -36,7 +36,7 @@ public class MakeInString {
public static final String module = MakeInString.class.getName();
String fieldName;
- List<MakeInStringOperation> operations = new ArrayList<MakeInStringOperation>();
+ List<MakeInStringOperation> operations = new ArrayList<>();
public MakeInString(Element makeInStringElement) {
fieldName = makeInStringElement.getAttribute("field");
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/MapProcessor.java Sun Apr 21 12:49:52 2019
@@ -32,9 +32,9 @@ import org.w3c.dom.Element;
*/
public class MapProcessor {
- List<MakeInString> makeInStrings = new ArrayList<MakeInString>();
+ List<MakeInString> makeInStrings = new ArrayList<>();
String name;
- List<SimpleMapProcess> simpleMapProcesses = new ArrayList<SimpleMapProcess>();
+ List<SimpleMapProcess> simpleMapProcesses = new ArrayList<>();
public MapProcessor(Element simpleMapProcessorElement) {
name = simpleMapProcessorElement.getAttribute("name");
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/SimpleMapProcess.java Sun Apr 21 12:49:52 2019
@@ -36,7 +36,7 @@ public class SimpleMapProcess {
public static final String module = SimpleMapProcess.class.getName();
String field = "";
- List<SimpleMapOperation> simpleMapOperations = new ArrayList<SimpleMapOperation>();
+ List<SimpleMapOperation> simpleMapOperations = new ArrayList<>();
public SimpleMapProcess(Element simpleMapProcessElement) {
this.field = simpleMapProcessElement.getAttribute("field");
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/ServiceConfigUtil.java Sun Apr 21 12:49:52 2019
@@ -50,7 +50,7 @@ public final class ServiceConfigUtil {
private static final String SERVICE_ENGINE_XML_FILENAME = "serviceengine.xml";
// Keep the ServiceConfig instance in a cache - so the configuration can be reloaded at run-time. There will be only one ServiceConfig instance in the cache.
private static final UtilCache<String, ServiceConfig> serviceConfigCache = UtilCache.createUtilCache("service.ServiceConfig", 0, 0, false);
- private static final List<ServiceConfigListener> configListeners = new CopyOnWriteArrayList<ServiceConfigListener>();
+ private static final List<ServiceConfigListener> configListeners = new CopyOnWriteArrayList<>();
private ServiceConfigUtil() {}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/Engine.java Sun Apr 21 12:49:52 2019
@@ -56,8 +56,8 @@ public final class Engine {
this.parameters = Collections.emptyList();
this.parameterMap = Collections.emptyMap();
} else {
- List<Parameter> parameters = new ArrayList<Parameter>(parameterElementList.size());
- Map<String, Parameter> parameterMap = new HashMap<String, Parameter>();
+ List<Parameter> parameters = new ArrayList<>(parameterElementList.size());
+ Map<String, Parameter> parameterMap = new HashMap<>();
for (Element parameterElement : parameterElementList) {
Parameter parameter = new Parameter(parameterElement);
parameters.add(parameter);
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/JmsService.java Sun Apr 21 12:49:52 2019
@@ -52,7 +52,7 @@ public final class JmsService {
if (serverElementList.isEmpty()) {
this.servers = Collections.emptyList();
} else {
- List<Server> servers = new ArrayList<Server>(serverElementList.size());
+ List<Server> servers = new ArrayList<>(serverElementList.size());
for (Element serverElement : serverElementList) {
servers.add(new Server(serverElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/NotificationGroup.java Sun Apr 21 12:49:52 2019
@@ -52,7 +52,7 @@ public final class NotificationGroup {
if (notifyElementList.size() < 2) {
throw new ServiceConfigException("<notify> element(s) missing");
} else {
- List<Notify> notifyList = new ArrayList<Notify>(notifyElementList.size());
+ List<Notify> notifyList = new ArrayList<>(notifyElementList.size());
for (Element notifyElement : notifyElementList) {
notifyList.add(new Notify(notifyElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceConfig.java Sun Apr 21 12:49:52 2019
@@ -36,7 +36,7 @@ import org.w3c.dom.Element;
public final class ServiceConfig {
public static ServiceConfig create(Element serviceConfigElement) throws ServiceConfigException {
- Map<String, ServiceEngine> serviceEngineMap = new HashMap<String, ServiceEngine>();
+ Map<String, ServiceEngine> serviceEngineMap = new HashMap<>();
List<? extends Element> engineElementList = UtilXml.childElementList(serviceConfigElement, "service-engine");
for (Element engineElement : engineElementList) {
ServiceEngine engineModel = new ServiceEngine(engineElement);
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ServiceEngine.java Sun Apr 21 12:49:52 2019
@@ -71,8 +71,8 @@ public final class ServiceEngine {
this.engines = Collections.emptyList();
this.engineMap = Collections.emptyMap();
} else {
- List<Engine> engines = new ArrayList<Engine>(engineElementList.size());
- Map<String, Engine> engineMap = new HashMap<String, Engine>();
+ List<Engine> engines = new ArrayList<>(engineElementList.size());
+ Map<String, Engine> engineMap = new HashMap<>();
for (Element childEngineElement : engineElementList) {
Engine engine = new Engine(childEngineElement);
engines.add(engine);
@@ -85,7 +85,7 @@ public final class ServiceEngine {
if (serviceLocationElementList.isEmpty()) {
this.serviceLocations = Collections.emptyList();
} else {
- List<ServiceLocation> serviceLocations = new ArrayList<ServiceLocation>(serviceLocationElementList.size());
+ List<ServiceLocation> serviceLocations = new ArrayList<>(serviceLocationElementList.size());
for (Element serviceLocationElement : serviceLocationElementList) {
String location = serviceLocationElement.getAttribute("location").intern();
if (location.contains("localhost") && Start.getInstance().getConfig().portOffset != 0) {
@@ -102,7 +102,7 @@ public final class ServiceEngine {
if (notificationGroupElementList.isEmpty()) {
this.notificationGroups = Collections.emptyList();
} else {
- List<NotificationGroup> notificationGroups = new ArrayList<NotificationGroup>(notificationGroupElementList.size());
+ List<NotificationGroup> notificationGroups = new ArrayList<>(notificationGroupElementList.size());
for (Element notificationGroupElement : notificationGroupElementList) {
notificationGroups.add(new NotificationGroup(notificationGroupElement));
}
@@ -112,7 +112,7 @@ public final class ServiceEngine {
if (startupServiceElementList.isEmpty()) {
this.startupServices = Collections.emptyList();
} else {
- List<StartupService> startupServices = new ArrayList<StartupService>(startupServiceElementList.size());
+ List<StartupService> startupServices = new ArrayList<>(startupServiceElementList.size());
for (Element startupServiceElement : startupServiceElementList) {
startupServices.add(new StartupService(startupServiceElement));
}
@@ -122,7 +122,7 @@ public final class ServiceEngine {
if (resourceLoaderElementList.isEmpty()) {
this.resourceLoaders = Collections.emptyList();
} else {
- List<ResourceLoader> resourceLoaders = new ArrayList<ResourceLoader>(resourceLoaderElementList.size());
+ List<ResourceLoader> resourceLoaders = new ArrayList<>(resourceLoaderElementList.size());
for (Element resourceLoaderElement : resourceLoaderElementList) {
resourceLoaders.add(new ResourceLoader(resourceLoaderElement));
}
@@ -132,7 +132,7 @@ public final class ServiceEngine {
if (globalServicesElementList.isEmpty()) {
this.globalServices = Collections.emptyList();
} else {
- List<GlobalServices> globalServices = new ArrayList<GlobalServices>(globalServicesElementList.size());
+ List<GlobalServices> globalServices = new ArrayList<>(globalServicesElementList.size());
for (Element globalServicesElement : globalServicesElementList) {
globalServices.add(new GlobalServices(globalServicesElement));
}
@@ -142,7 +142,7 @@ public final class ServiceEngine {
if (serviceGroupsElementList.isEmpty()) {
this.serviceGroups = Collections.emptyList();
} else {
- List<ServiceGroups> serviceGroups = new ArrayList<ServiceGroups>(serviceGroupsElementList.size());
+ List<ServiceGroups> serviceGroups = new ArrayList<>(serviceGroupsElementList.size());
for (Element serviceGroupsElement : serviceGroupsElementList) {
serviceGroups.add(new ServiceGroups(serviceGroupsElement));
}
@@ -152,7 +152,7 @@ public final class ServiceEngine {
if (serviceEcasElementList.isEmpty()) {
this.serviceEcas = Collections.emptyList();
} else {
- List<ServiceEcas> serviceEcas = new ArrayList<ServiceEcas>(serviceEcasElementList.size());
+ List<ServiceEcas> serviceEcas = new ArrayList<>(serviceEcasElementList.size());
for (Element serviceEcasElement : serviceEcasElementList) {
serviceEcas.add(new ServiceEcas(serviceEcasElement));
}
@@ -162,7 +162,7 @@ public final class ServiceEngine {
if (jmsServiceElementList.isEmpty()) {
this.jmsServices = Collections.emptyList();
} else {
- List<JmsService> jmsServices = new ArrayList<JmsService>(jmsServiceElementList.size());
+ List<JmsService> jmsServices = new ArrayList<>(jmsServiceElementList.size());
for (Element jmsServiceElement : jmsServiceElementList) {
jmsServices.add(new JmsService(jmsServiceElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/config/model/ThreadPool.java Sun Apr 21 12:49:52 2019
@@ -163,7 +163,7 @@ public final class ThreadPool {
if (runFromPoolElementList.isEmpty()) {
this.runFromPools = Collections.emptyList();
} else {
- List<RunFromPool> runFromPools = new ArrayList<RunFromPool>(runFromPoolElementList.size());
+ List<RunFromPool> runFromPools = new ArrayList<>(runFromPoolElementList.size());
for (Element runFromPoolElement : runFromPoolElementList) {
runFromPools.add(new RunFromPool(runFromPoolElement));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaAction.java Sun Apr 21 12:49:52 2019
@@ -136,7 +136,7 @@ public class ServiceEcaAction implements
if (UtilValidate.isNotEmpty(resultMapName)) {
Map<String, Object> resultMap = UtilGenerics.checkMap(context.get(resultMapName));
if (resultMap == null) {
- resultMap = new HashMap<String, Object>();
+ resultMap = new HashMap<>();
}
resultMap.putAll(dctx.getModelService(this.serviceName).makeValid(actionResult, ModelService.OUT_PARAM, false, null));
context.put(resultMapName, resultMap);
@@ -194,7 +194,7 @@ public class ServiceEcaAction implements
} else {
List<Object> origErrorMessageList = UtilGenerics.checkList(result.get(ModelService.ERROR_MESSAGE_LIST));
if (origErrorMessageList == null) {
- origErrorMessageList = new LinkedList<Object>();
+ origErrorMessageList = new LinkedList<>();
result.put(ModelService.ERROR_MESSAGE_LIST, origErrorMessageList);
}
origErrorMessageList.add(0, errorMessage);
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaCondition.java Sun Apr 21 12:49:52 2019
@@ -175,7 +175,7 @@ public class ServiceEcaCondition impleme
if (Debug.verboseOn()) Debug.logVerbose("Comparing : " + lhsValue + " " + operator + " " + rhsValue, module);
// evaluate the condition & invoke the action(s)
- List<Object> messages = new LinkedList<Object>();
+ List<Object> messages = new LinkedList<>();
Boolean cond = ObjectType.doRealCompare(lhsValue, rhsValue, operator, compareType, format, messages, null, dctx.getClassLoader(), isConstant);
// if any messages were returned send them out
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java Sun Apr 21 12:49:52 2019
@@ -44,8 +44,8 @@ public final class ServiceEcaRule implem
public final String eventName;
public final boolean runOnFailure;
public final boolean runOnError;
- public final List<ServiceEcaCondition> conditions = new ArrayList<ServiceEcaCondition>();
- public final List<Object> actionsAndSets = new ArrayList<Object>();
+ public final List<ServiceEcaCondition> conditions = new ArrayList<>();
+ public final List<Object> actionsAndSets = new ArrayList<>();
public boolean enabled = true;
public final String definitionLocation;
@@ -104,7 +104,7 @@ public final class ServiceEcaRule implem
}
public List<ServiceEcaAction> getEcaActionList() {
- List<ServiceEcaAction> actionList = new LinkedList<ServiceEcaAction>();
+ List<ServiceEcaAction> actionList = new LinkedList<>();
for (Object actionOrSet: this.actionsAndSets) {
if (actionOrSet instanceof ServiceEcaAction) {
actionList.add((ServiceEcaAction) actionOrSet);
@@ -114,7 +114,7 @@ public final class ServiceEcaRule implem
}
public List<ServiceEcaCondition> getEcaConditionList() {
- List<ServiceEcaCondition> condList = new LinkedList<ServiceEcaCondition>();
+ List<ServiceEcaCondition> condList = new LinkedList<>();
condList.addAll(this.conditions);
return condList;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaSetField.java Sun Apr 21 12:49:52 2019
@@ -71,7 +71,7 @@ public class ServiceEcaSetField {
if (UtilValidate.isNotEmpty(this.mapName) && context.containsKey(this.mapName)) {
valueMap = UtilGenerics.checkMap(context.get(mapName));
} else {
- valueMap = new HashMap<String, Object>();
+ valueMap = new HashMap<>();
}
// process the context changes
Object newValue = null;
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaUtil.java Sun Apr 21 12:49:52 2019
@@ -51,7 +51,7 @@ public final class ServiceEcaUtil {
public static final String module = ServiceEcaUtil.class.getName();
// using a cache is dangerous here because if someone clears it the ECAs won't run: public static UtilCache ecaCache = new UtilCache("service.ServiceECAs", 0, 0, false);
- private static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = new ConcurrentHashMap<String, Map<String, List<ServiceEcaRule>>>();
+ private static Map<String, Map<String, List<ServiceEcaRule>>> ecaCache = new ConcurrentHashMap<>();
private ServiceEcaUtil() {}
@@ -66,7 +66,7 @@ public final class ServiceEcaUtil {
return;
}
- List<Future<List<ServiceEcaRule>>> futures = new LinkedList<Future<List<ServiceEcaRule>>>();
+ List<Future<List<ServiceEcaRule>>> futures = new LinkedList<>();
List<ServiceEcas> serviceEcasList = null;
try {
serviceEcasList = ServiceConfigUtil.getServiceEngine().getServiceEcas();
@@ -100,7 +100,7 @@ public final class ServiceEcaUtil {
}
private static List<ServiceEcaRule> getEcaDefinitions(ResourceHandler handler) {
- List<ServiceEcaRule> handlerRules = new LinkedList<ServiceEcaRule>();
+ List<ServiceEcaRule> handlerRules = new LinkedList<>();
Element rootElement = null;
try {
rootElement = handler.getDocument().getDocumentElement();
@@ -132,14 +132,14 @@ public final class ServiceEcaUtil {
List<ServiceEcaRule> rules = null;
if (eventMap == null) {
- eventMap = new HashMap<String, List<ServiceEcaRule>>();
- rules = new LinkedList<ServiceEcaRule>();
+ eventMap = new HashMap<>();
+ rules = new LinkedList<>();
ecaCache.put(serviceName, eventMap);
eventMap.put(eventName, rules);
} else {
rules = eventMap.get(eventName);
if (rules == null) {
- rules = new LinkedList<ServiceEcaRule>();
+ rules = new LinkedList<>();
eventMap.put(eventName, rules);
}
}
@@ -163,7 +163,7 @@ public final class ServiceEcaUtil {
if (event != null) {
return eventMap.get(event);
} else {
- List<ServiceEcaRule> rules = new LinkedList<ServiceEcaRule>();
+ List<ServiceEcaRule> rules = new LinkedList<>();
for (Collection<ServiceEcaRule> col: eventMap.values()) {
rules.addAll(col);
}
@@ -186,7 +186,7 @@ public final class ServiceEcaUtil {
}
if (Debug.verboseOn()) Debug.logVerbose("Running ECA (" + event + ").", module);
- Set<String> actionsRun = new TreeSet<String>();
+ Set<String> actionsRun = new TreeSet<>();
for (ServiceEcaRule eca: rules) {
eca.eval(serviceName, dctx, context, result, isError, isFailure, actionsRun);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java Sun Apr 21 12:49:52 2019
@@ -46,10 +46,10 @@ public class JmsListenerFactory implemen
public static final String TOPIC_LISTENER_CLASS = "org.apache.ofbiz.service.jms.JmsTopicListener";
public static final String QUEUE_LISTENER_CLASS = "org.apache.ofbiz.service.jms.JmsQueueListener";
- protected static Map<String, GenericMessageListener> listeners = new ConcurrentHashMap<String, GenericMessageListener>();
- protected static Map<String, Server> servers = new ConcurrentHashMap<String, Server>();
+ protected static Map<String, GenericMessageListener> listeners = new ConcurrentHashMap<>();
+ protected static Map<String, Server> servers = new ConcurrentHashMap<>();
- private static final AtomicReference<JmsListenerFactory> jlFactoryRef = new AtomicReference<JmsListenerFactory>(null);
+ private static final AtomicReference<JmsListenerFactory> jlFactoryRef = new AtomicReference<>(null);
protected Delegator delegator;
protected boolean firstPass = true;
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java Sun Apr 21 12:49:52 2019
@@ -111,7 +111,7 @@ public class JmsServiceEngine extends Ab
List<? extends Element> serverList = UtilXml.childElementList(serviceElement, "server");
if ("none".equals(sendMode)) {
- return new ArrayList<Element>();
+ return new ArrayList<>();
} else if ("all".equals(sendMode)) {
return serverList;
} else {
@@ -311,7 +311,7 @@ public class JmsServiceEngine extends Ab
JmsService serviceElement = getServiceElement(modelService);
List<Server> serverList = serviceElement.getServers();
- Map<String, Object> result = new HashMap<String, Object>();
+ Map<String, Object> result = new HashMap<>();
for (Server server: serverList) {
String serverType = server.getType();
if ("topic".equals(serverType))
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/ExampleRemoteClient.java Sun Apr 21 12:49:52 2019
@@ -65,7 +65,7 @@ public class ExampleRemoteClient {
}
public Map<String, Object> runTestService() throws RemoteException, GenericServiceException {
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
context.put("message", "Remote Service Test");
return rd.runSync("testScv", context);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/EntityXmlAssertTest.java Sun Apr 21 12:49:52 2019
@@ -71,7 +71,7 @@ public class EntityXmlAssertTest extends
try {
URL entityXmlURL = FlexibleLocation.resolveLocation(entityXmlUrlString);
- List<Object> errorMessages = new LinkedList<Object>();
+ List<Object> errorMessages = new LinkedList<>();
if ("assert".equals(this.action)) {
EntityDataAssert.assertData(entityXmlURL, delegator, errorMessages);
Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/JunitSuiteWrapper.java Sun Apr 21 12:49:52 2019
@@ -38,7 +38,7 @@ public class JunitSuiteWrapper {
public static final String module = JunitSuiteWrapper.class.getName();
- protected List<ModelTestSuite> modelTestSuiteList = new LinkedList<ModelTestSuite>();
+ protected List<ModelTestSuite> modelTestSuiteList = new LinkedList<>();
public JunitSuiteWrapper(String componentName, String suiteName, String testCase) {
for (ComponentConfig.TestSuiteInfo testSuiteInfo: ComponentConfig.getAllTestSuiteInfos(componentName)) {
@@ -79,7 +79,7 @@ public class JunitSuiteWrapper {
}
public List<Test> getAllTestList() {
- List<Test> allTestList = new LinkedList<Test>();
+ List<Test> allTestList = new LinkedList<>();
for (ModelTestSuite modelTestSuite: this.modelTestSuiteList) {
for (Test tst: modelTestSuite.getTestList()) {
Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java Sun Apr 21 12:49:52 2019
@@ -170,7 +170,7 @@ public class TestRunContainer implements
class JunitXmlListener extends XMLJUnitResultFormatter {
- Map<String, Long> startTimes = new HashMap<String, Long>();
+ Map<String, Long> startTimes = new HashMap<>();
public JunitXmlListener(OutputStream out) {
this.setOutput(out);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java Sun Apr 21 12:49:52 2019
@@ -66,7 +66,7 @@ public class ConfigXMLReader {
public static final RequestResponse emptyNoneRequestResponse = RequestResponse.createEmptyNoneRequestResponse();
public static Set<String> findControllerFilesWithRequest(String requestUri, String controllerPartialPath) throws GeneralException {
- Set<String> allControllerRequestSet = new HashSet<String>();
+ Set<String> allControllerRequestSet = new HashSet<>();
if (UtilValidate.isEmpty(requestUri)) {
return allControllerRequestSet;
}
@@ -76,7 +76,7 @@ public class ConfigXMLReader {
try {
// find controller.xml file with webappMountPoint + "/WEB-INF" in the path
List<File> controllerFiles = FileUtil.findXmlFiles(null, controllerPartialPath, "site-conf", "site-conf.xsd");
- controllerConfigs = new LinkedList<ControllerConfig>();
+ controllerConfigs = new LinkedList<>();
for (File controllerFile : controllerFiles) {
URL controllerUrl = null;
try {
@@ -131,7 +131,7 @@ public class ConfigXMLReader {
// if (controllerLocAndRequestSet.size() > 0) Debug.logInfo("============== In findRequestNamesLinkedtoInWidget, controllerLocAndRequestSet: " + controllerLocAndRequestSet, module);
return controllerLocAndRequestSet;
} else {
- return new HashSet<String>();
+ return new HashSet<>();
}
}
@@ -186,16 +186,16 @@ public class ConfigXMLReader {
private String securityClass;
private String defaultRequest;
private String statusCode;
- private List<URL> includes = new ArrayList<URL>();
- private Map<String, Event> firstVisitEventList = new LinkedHashMap<String, Event>();
- private Map<String, Event> preprocessorEventList = new LinkedHashMap<String, Event>();
- private Map<String, Event> postprocessorEventList = new LinkedHashMap<String, Event>();
- private Map<String, Event> afterLoginEventList = new LinkedHashMap<String, Event>();
- private Map<String, Event> beforeLogoutEventList = new LinkedHashMap<String, Event>();
- private Map<String, String> eventHandlerMap = new HashMap<String, String>();
- private Map<String, String> viewHandlerMap = new HashMap<String, String>();
+ private List<URL> includes = new ArrayList<>();
+ private Map<String, Event> firstVisitEventList = new LinkedHashMap<>();
+ private Map<String, Event> preprocessorEventList = new LinkedHashMap<>();
+ private Map<String, Event> postprocessorEventList = new LinkedHashMap<>();
+ private Map<String, Event> afterLoginEventList = new LinkedHashMap<>();
+ private Map<String, Event> beforeLogoutEventList = new LinkedHashMap<>();
+ private Map<String, String> eventHandlerMap = new HashMap<>();
+ private Map<String, String> viewHandlerMap = new HashMap<>();
private MultivaluedMapContext<String, RequestMap> requestMapMap = new MultivaluedMapContext<>();
- private Map<String, ViewMap> viewMapMap = new HashMap<String, ViewMap>();
+ private Map<String, ViewMap> viewMapMap = new HashMap<>();
public ControllerConfig(URL url) throws WebAppConfigurationException {
this.url = url;
@@ -468,7 +468,7 @@ public class ConfigXMLReader {
public boolean securityCert = false;
public boolean securityExternalView = true;
public boolean securityDirectRequest = true;
- public Map<String, RequestResponse> requestResponseMap = new HashMap<String, RequestResponse>();
+ public Map<String, RequestResponse> requestResponseMap = new HashMap<>();
public Metrics metrics = null;
public RequestMap(Element requestMapElement) {
@@ -534,8 +534,8 @@ public class ConfigXMLReader {
public boolean saveLastView = false;
public boolean saveCurrentView = false;
public boolean saveHomeView = false;
- public Map<String, String> redirectParameterMap = new HashMap<String, String>();
- public Map<String, String> redirectParameterValueMap = new HashMap<String, String>();
+ public Map<String, String> redirectParameterMap = new HashMap<>();
+ public Map<String, String> redirectParameterValueMap = new HashMap<>();
public RequestResponse() {
}
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java Sun Apr 21 12:49:52 2019
@@ -209,7 +209,7 @@ public class JWTManager {
* @return Map of the claims contained in the token
*/
public static Map<String, Object> validateToken(String jwtToken, String key) {
- Map<String, Object> result = new HashMap<String, Object>();
+ Map<String, Object> result = new HashMap<>();
if (UtilValidate.isEmpty(jwtToken) || UtilValidate.isEmpty(key)) {
String msg = "JWT token or key can not be empty.";
Debug.logError(msg, module);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Sun Apr 21 12:49:52 2019
@@ -205,7 +205,7 @@ public class LoginWorker {
List<Object> errorMessageList = UtilGenerics.checkList(request.getAttribute("_ERROR_MESSAGE_LIST"));
if (!hasBasePermission(userLogin, request) || isFlaggedLoggedOut(userLogin, userLogin.getDelegator())) {
if (errorMessageList == null) {
- errorMessageList = new LinkedList<Object>();
+ errorMessageList = new LinkedList<>();
request.setAttribute("_ERROR_MESSAGE_LIST", errorMessageList);
}
errorMessageList.add("User does not have permission or is flagged as logged out");
@@ -427,7 +427,7 @@ public class LoginWorker {
password = (String) request.getAttribute("PASSWORD");
}
- List<String> unpwErrMsgList = new LinkedList<String>();
+ List<String> unpwErrMsgList = new LinkedList<>();
if (UtilValidate.isEmpty(username)) {
unpwErrMsgList.add(UtilProperties.getMessage(resourceWebapp, "loginevents.username_was_empty_reenter", UtilHttp.getLocale(request)));
}
@@ -1257,7 +1257,7 @@ public class LoginWorker {
}
protected static boolean checkValidIssuer(Delegator delegator, Map<String, String> x500Map, BigInteger serialNumber) throws GeneralException {
- List<EntityCondition> conds = new LinkedList<EntityCondition>();
+ List<EntityCondition> conds = new LinkedList<>();
conds.add(EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeConditionMap("commonName", x500Map.get("CN")),
EntityCondition.makeConditionMap("commonName", null),
EntityCondition.makeConditionMap("commonName", "")));
@@ -1372,7 +1372,7 @@ public class LoginWorker {
*/
public static Collection<ComponentConfig.WebappInfo> getAppBarWebInfos(Security security, GenericValue userLogin, String serverName, String menuName) {
Collection<ComponentConfig.WebappInfo> allInfos = webapps.getAppBarWebInfos(serverName, menuName);
- Collection<ComponentConfig.WebappInfo> allowedInfos = new ArrayList<ComponentConfig.WebappInfo>(allInfos.size());
+ Collection<ComponentConfig.WebappInfo> allowedInfos = new ArrayList<>(allInfos.size());
for (ComponentConfig.WebappInfo info : allInfos) {
if (hasApplicationPermission(info, security, userLogin)) {
allowedInfos.add(info);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ProtectViewWorker.java Sun Apr 21 12:49:52 2019
@@ -43,8 +43,8 @@ public final class ProtectViewWorker {
private final static String module = ProtectViewWorker.class.getName();
private static final String resourceWebapp = "WebappUiLabels";
- private static final Map<String, Long> hitsByViewAccessed = new ConcurrentHashMap<String, Long>();
- private static final Map<String, Long> durationByViewAccessed = new ConcurrentHashMap<String, Long>();
+ private static final Map<String, Long> hitsByViewAccessed = new ConcurrentHashMap<>();
+ private static final Map<String, Long> durationByViewAccessed = new ConcurrentHashMap<>();
private static final Long one = 1L;
private ProtectViewWorker () {}
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java Sun Apr 21 12:49:52 2019
@@ -851,7 +851,7 @@ public class RequestHandler {
if (Debug.infoOn()) Debug.logInfo("Sending redirect to: [" + url + "]. " + showSessionId(req), module);
// set the attributes in the session so we can access it.
Enumeration<String> attributeNameEnum = UtilGenerics.cast(req.getAttributeNames());
- Map<String, Object> reqAttrMap = new HashMap<String, Object>();
+ Map<String, Object> reqAttrMap = new HashMap<>();
Integer statusCode;
try {
statusCode = Integer.valueOf(statusCodeString);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java?rev=1857906&r1=1857905&r2=1857906&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/CoreEvents.java Sun Apr 21 12:49:52 2019
@@ -128,7 +128,7 @@ public class CoreEvents {
String runAsSystemUser = (String) params.remove("SERVICE_RUN_AS_SYSTEM");
// the frequency map
- Map<String, Integer> freqMap = new HashMap<String, Integer>();
+ Map<String, Integer> freqMap = new HashMap<>();
freqMap.put("SECONDLY", 1);
freqMap.put("MINUTELY", 2);
@@ -172,7 +172,7 @@ public class CoreEvents {
}
// make the context valid; using the makeValid method from ModelService
- Map<String, Object> serviceContext = new HashMap<String, Object>();
+ Map<String, Object> serviceContext = new HashMap<>();
Iterator<String> ci = modelService.getInParamNames().iterator();
while (ci.hasNext()) {
String name = ci.next();
@@ -361,7 +361,7 @@ public class CoreEvents {
session.removeAttribute("_SAVED_SYNC_RESULT_");
Map<String, String[]> serviceFieldsToSave = checkMap(request.getParameterMap(), String.class, String[].class);
- Map<String, Object> savedFields = new HashMap<String, Object>();
+ Map<String, Object> savedFields = new HashMap<>();
for (Map.Entry<String, String[]> entry : serviceFieldsToSave.entrySet()) {
String key = entry.getKey();
@@ -398,14 +398,14 @@ public class CoreEvents {
servicePathMap = checkMap(servicePathObject);
} else if (servicePathObject instanceof GenericEntity) {
GenericEntity servicePathEntity = (GenericEntity)servicePathObject;
- servicePathMap = new HashMap<String, Object>();
+ servicePathMap = new HashMap<>();
for (Map.Entry<String, Object> entry: servicePathEntity.entrySet()) {
servicePathMap.put(entry.getKey(), entry.getValue());
}
} else if (servicePathObject instanceof Collection<?>) {
Collection<?> servicePathColl = checkCollection(servicePathObject);
int count=0;
- servicePathMap = new HashMap<String, Object>();
+ servicePathMap = new HashMap<>();
for (Object value: servicePathColl) {
servicePathMap.put("_"+count+"_", value);
count++;