You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2013/06/05 20:54:13 UTC
svn commit: r1490002 - in
/ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model:
Engine.java ServiceEngine.java
Author: adrianc
Date: Wed Jun 5 18:54:13 2013
New Revision: 1490002
URL: http://svn.apache.org/r1490002
Log:
Some convenience methods for the new models - based on a patch from Christoph Neuroth with modifications by me.
https://issues.apache.org/jira/browse/OFBIZ-5204
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/Engine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/Engine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/Engine.java?rev=1490002&r1=1490001&r2=1490002&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/Engine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/Engine.java Wed Jun 5 18:54:13 2013
@@ -20,7 +20,9 @@ package org.ofbiz.service.config.model;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.ofbiz.base.lang.ThreadSafe;
import org.ofbiz.base.util.UtilXml;
@@ -36,6 +38,7 @@ public final class Engine {
private final String className;
private final String name;
private final List<Parameter> parameters;
+ private final Map<String, Parameter> parameterMap;
Engine(Element engineElement) throws ServiceConfigException {
String name = engineElement.getAttribute("name").intern();
@@ -51,12 +54,17 @@ public final class Engine {
List<? extends Element> parameterElementList = UtilXml.childElementList(engineElement, "parameter");
if (parameterElementList.isEmpty()) {
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>();
for (Element parameterElement : parameterElementList) {
- parameters.add(new Parameter(parameterElement));
+ Parameter parameter = new Parameter(parameterElement);
+ parameters.add(parameter);
+ parameterMap.put(parameter.getName(), parameter);
}
this.parameters = Collections.unmodifiableList(parameters);
+ this.parameterMap = Collections.unmodifiableMap(parameterMap);
}
}
@@ -68,7 +76,19 @@ public final class Engine {
return name;
}
+ public Parameter getParameter(String parameterName) {
+ return parameterMap.get(parameterName);
+ }
+
public List<Parameter> getParameters() {
return this.parameters;
}
+
+ public String getParameterValue(String parameterName) {
+ Parameter parameter = parameterMap.get(parameterName);
+ if (parameter != null) {
+ return parameter.getValue();
+ }
+ return null;
+ }
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java?rev=1490002&r1=1490001&r2=1490002&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java Wed Jun 5 18:54:13 2013
@@ -20,7 +20,9 @@ package org.ofbiz.service.config.model;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.ofbiz.base.lang.ThreadSafe;
import org.ofbiz.base.util.UtilXml;
@@ -35,6 +37,7 @@ public final class ServiceEngine {
private final Authorization authorization;
private final List<Engine> engines;
+ private final Map<String, Engine> engineMap;
private final List<GlobalServices> globalServices;
private final List<JmsService> jmsServices;
private final String name;
@@ -65,12 +68,17 @@ public final class ServiceEngine {
List<? extends Element> engineElementList = UtilXml.childElementList(engineElement, "engine");
if (engineElementList.isEmpty()) {
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>();
for (Element childEngineElement : engineElementList) {
- engines.add(new Engine(childEngineElement));
+ Engine engine = new Engine(childEngineElement);
+ engines.add(engine);
+ engineMap.put(engine.getName(), engine);
}
this.engines = Collections.unmodifiableList(engines);
+ this.engineMap = Collections.unmodifiableMap(engineMap);
}
List<? extends Element> serviceLocationElementList = UtilXml.childElementList(engineElement, "service-location");
if (serviceLocationElementList.isEmpty()) {
@@ -158,6 +166,10 @@ public final class ServiceEngine {
return authorization;
}
+ public Engine getEngine(String engineName) {
+ return engineMap.get(engineName);
+ }
+
public List<Engine> getEngines() {
return this.engines;
}
@@ -166,6 +178,15 @@ public final class ServiceEngine {
return this.globalServices;
}
+ public JmsService getJmsServiceByName(String name) {
+ for (JmsService jmsService : jmsServices) {
+ if (name.equals(jmsService.getName())) {
+ return jmsService;
+ }
+ }
+ return null;
+ }
+
public List<JmsService> getJmsServices() {
return this.jmsServices;
}
@@ -185,7 +206,6 @@ public final class ServiceEngine {
public List<ServiceEcas> getServiceEcas() {
return this.serviceEcas;
}
-
public List<ServiceGroups> getServiceGroups() {
return this.serviceGroups;
}
@@ -201,5 +221,4 @@ public final class ServiceEngine {
public ThreadPool getThreadPool() {
return threadPool;
}
-
}