Author: sshafroi
Date: 2008-08-21 14:07:11 +0200 (Thu, 21 Aug 2008)
New Revision: 6788
Removed:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfiguration.java
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfigurationDeserializer.java
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
Log:
Rename interfacte to ModesW3cDomDeserialiser, return this so chaining pattern
can be used.
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/EspFastCommandConfig.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -291,7 +291,7 @@
}
@Override
- public void readSearchConfiguration(final Element element, final
SearchConfiguration inherit) {
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
super.readSearchConfiguration(element, inherit);
final EspFastCommandConfig efscInherit = inherit instanceof
EspFastCommandConfig ? (EspFastCommandConfig) inherit
: null;
@@ -309,5 +309,7 @@
addNavigator(navigator, navigator.getId());
}
}
+
+ return this;
}
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/FastCommandConfig.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -595,7 +595,7 @@
}
@Override
- public void readSearchConfiguration(final Element element, final
SearchConfiguration inherit) {
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
super.readSearchConfiguration(element, inherit);
final FastCommandConfig fscInherit = inherit instanceof
FastCommandConfig ? (FastCommandConfig) inherit : null;
@@ -616,5 +616,6 @@
addNavigator(navigator, navigator.getId());
}
}
+ return this;
}
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/NewsEspCommandConfig.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -313,12 +313,13 @@
}
@Override
- public void readSearchConfiguration(final Element element, final
SearchConfiguration inherit) {
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
super.readSearchConfiguration(element, inherit);
// maxAge is of the format 10h (for 10 hours).
if (maxAge != null) {
ageSymbol = maxAge.charAt(maxAge.length() - 1);
maxAgeAmount = Integer.parseInt(maxAge.substring(0,
maxAge.length() - 1));
}
+ return this;
}
}
Modified:
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
===================================================================
---
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/YahooWebCommandConfig.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -201,8 +201,9 @@
}
@Override
- public void readSearchConfiguration(final Element element, final
SearchConfiguration inherit) {
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
super.readSearchConfiguration(element, inherit);
setPartnerId(getAppid());
+ return this;
}
}
Modified:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -22,6 +22,7 @@
import no.sesat.search.run.transform.RunTransformerConfig;
import no.sesat.search.site.config.AbstractConfigFactory;
import no.schibstedsok.commons.ioc.ContextWrapper;
+import no.sesat.search.mode.config.CommandConfig;
import no.sesat.search.mode.config.SearchConfiguration;
import no.sesat.search.query.transform.QueryTransformerConfig;
import no.sesat.search.result.handler.ResultHandlerConfig;
@@ -419,7 +420,7 @@
};
}
- private static final class SearchCommandFactory extends
AbstractConfigFactory<SearchConfiguration> {
+ private static final class SearchCommandFactory extends
AbstractConfigFactory<CommandConfig> {
SearchCommandFactory() {}
@@ -533,7 +534,7 @@
final SearchConfiguration inherit,
final SearchModeFactory.Context context) {
- SearchConfiguration sc = construct(element, context);
+ CommandConfig sc = construct(element, context);
assert null == inherit ||
inherit.getClass().isAssignableFrom(sc.getClass())
: "Can only inherit from same or superclass configuration.
"
@@ -550,7 +551,7 @@
return sc;
}
- protected Class<SearchConfiguration> findClass(final String xmlName,
final Context context)
+ protected Class<CommandConfig> findClass(final String xmlName, final
Context context)
throws ClassNotFoundException {
final String bName = xmlToBeanName(xmlName);
@@ -558,7 +559,7 @@
LOG.debug("findClass (SearchConfiguration) " + className);
final String classNameFQ = "no.sesat.search.mode.config."+
className+ "Config";
- final Class<SearchConfiguration> clazz = loadClass(context,
classNameFQ, Spi.SEARCH_COMMAND_CONFIG);
+ final Class<CommandConfig> clazz = loadClass(context, classNameFQ,
Spi.SEARCH_COMMAND_CONFIG);
LOG.debug("Found class " + clazz.getName());
return clazz;
Modified:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/CommandConfig.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -33,7 +33,6 @@
import java.util.Collection;
import java.util.List;
import no.sesat.search.mode.SearchModeFactory.Context;
-import no.sesat.search.mode.SearchModeFactory;
import no.sesat.search.result.Navigator;
import no.sesat.search.site.config.AbstractDocumentFactory;
import no.sesat.search.site.config.AbstractDocumentFactory.ParseType;
@@ -49,7 +48,7 @@
*
* @version <tt>$Id$</tt>
*/
-public class CommandConfig implements SearchConfiguration,
ModesSearchConfiguration {
+public class CommandConfig implements
SearchConfiguration.ModesW3cDomDeserialiser {
// Constants -----------------------------------------------------
@@ -301,7 +300,7 @@
fieldFilters.clear();
}
- public void readSearchConfiguration(final Element element, final
SearchConfiguration inherit) {
+ public SearchConfiguration readSearchConfiguration(final Element element,
final SearchConfiguration inherit) {
if(null!=inherit){
fieldFilters.putAll(inherit.getFieldFilterMap());
}
@@ -316,6 +315,8 @@
clearFieldFilters();
}
}
+
+ return this;
}
/** [EMAIL PROTECTED]
Deleted:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfiguration.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfiguration.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfiguration.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -1,33 +0,0 @@
-/**
- * Copyright (2008) Schibsted Søk AS
- * This file is part of SESAT.
- *
- * SESAT is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * SESAT is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with SESAT. If not, see <http://www.gnu.org/licenses/>.
- */
-package no.sesat.search.mode.config;
-
-import org.w3c.dom.Element;
-
-public interface ModesSearchConfiguration {
-
- /**
- * This method will apply the attributes found in element.
- *
- * @param element
- * The xml element where the attribues are found.
- * @param inherit
- * The configuration that we inherit from.
- */
- public void readSearchConfiguration(final Element element, final
SearchConfiguration inherit);
-}
Modified:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfigurationDeserializer.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfigurationDeserializer.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/ModesSearchConfigurationDeserializer.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -35,12 +35,12 @@
public class ModesSearchConfigurationDeserializer {
private static final Logger LOG =
Logger.getLogger(ModesSearchConfigurationDeserializer.class);
- private final static Map<Class<ModesSearchConfiguration>, Map<String,
MethodWrapper>> ClassMethodMap = new HashMap<Class<ModesSearchConfiguration>,
Map<String, MethodWrapper>>();
+ private final static
Map<Class<SearchConfiguration.ModesW3cDomDeserialiser>, Map<String,
MethodWrapper>> ClassMethodMap = new
HashMap<Class<SearchConfiguration.ModesW3cDomDeserialiser>, Map<String,
MethodWrapper>>();
private static final String[] getters = {"get", "is"};
private static final String[] setters = {"set", "add"};
- public static void readSearchConfiguration(final ModesSearchConfiguration
config, final Element element, final SearchConfiguration inherit) {
+ public static void readSearchConfiguration(final
SearchConfiguration.ModesW3cDomDeserialiser config, final Element element,
final SearchConfiguration inherit) {
Set<String> methods = getMethodNames(config.getClass(), setters);
NamedNodeMap attribs = element.getAttributes();
@@ -161,7 +161,7 @@
return result;
}
- private static void setAttribute(ModesSearchConfiguration config, final
String name, final Object value) {
+ private static void
setAttribute(SearchConfiguration.ModesW3cDomDeserialiser config, final String
name, final Object value) {
MethodWrapper method = getMethodWrapper(config.getClass(), name,
setters);
if (method != null) {
@@ -196,7 +196,7 @@
return null;
}
- public static String toString(ModesSearchConfiguration config) {
+ public static String toString(SearchConfiguration.ModesW3cDomDeserialiser
config) {
String res = config.getClass().getSimpleName() + " ";
Set<String> methods = getMethodNames(config.getClass(), getters);
for (String s : methods) {
Modified:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
2008-08-20 14:20:16 UTC (rev 6787)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/config/SearchConfiguration.java
2008-08-21 12:07:11 UTC (rev 6788)
@@ -146,13 +146,24 @@
boolean isAsynchronous();
/**
- * Apply the attributes found in element to 'this'. If some attributes are
not found
- * in element then try to fetch them from inherit and set them on 'this'.
+ * Interface for SearchConfigurations that uses W3cDomDeserialiser.
*
- * @param element
- * @param inherit
*/
- void readSearchConfiguration(Element element, SearchConfiguration inherit);
+ public interface ModesW3cDomDeserialiser extends SearchConfiguration{
+ /**
+ * Apply the attributes found in element to 'this'. If some attributes
are not found
+ * in element then try to fetch them from inherit and set them on
'this'.
+ *
+ * @param element
+ * @param inherit
+ *
+ * @return The newly read configuration (Done to keep the chaining
pattern)
+ */
+ SearchConfiguration readSearchConfiguration(Element element,
SearchConfiguration inherit);
+ }
+ // TODO: remove
SearchConfiguration readSearchConfiguration(Element element,
SearchConfiguration inherit, Context context);
}
+
+
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
