summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/pagetemplates
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-06-16 15:08:49 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-06-16 15:08:49 +0200
commit38ff012425e1d65a5016ff090c5163892ebecc89 (patch)
tree593af280350a1c2b7f34bc79f37584ad256a93e7 /container-search/src/main/java/com/yahoo/search/pagetemplates
parent72231250ed81e10d66bfe70701e64fa5fe50f712 (diff)
Use github name in @author
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/pagetemplates')
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java2
23 files changed, 23 insertions, 23 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
index 2d61d17ade8..de19e8ab747 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderMappingVisitor.java
@@ -15,7 +15,7 @@ import java.util.Map;
* This visitor will throw an IllegalArgumentException if the same placeholder id
* is referenced by two choices.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
class PlaceholderMappingVisitor extends PageTemplateVisitor {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java
index 2e22ad7291e..c464dd3dedc 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/PlaceholderReferenceCreatingVisitor.java
@@ -10,7 +10,7 @@ import java.util.Map;
* Creates references from all placeholders to the choices which resolves them.
* If a placeholder is encountered which is not resolved by any choice, an IllegalArgumentException is thrown.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
class PlaceholderReferenceCreatingVisitor extends PageTemplateVisitor {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java
index bf2685da56f..22cc2dc0d7c 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/SourceVisitor.java
@@ -10,7 +10,7 @@ import java.util.Set;
/**
* Visits a page template object structure and records the sources mentioned.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
class SourceVisitor extends PageTemplateVisitor {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java
index 5d106a6df8e..e3c16853591 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateConfigurer.java
@@ -14,7 +14,7 @@ import java.util.List;
* Provides a static method to convert a page template config into a PageTemplateRegistry.
* In addition, instances of this can be created to subscribe to config and keep an up to date registry reference.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PageTemplateConfigurer {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
index 46823f30cf2..451efb851d5 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/config/PageTemplateXMLReader.java
@@ -20,7 +20,7 @@ import java.util.logging.Logger;
* Reads all page template XML files from a given directory (or list of readers).
* Instances of this are for single-thread usage only.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PageTemplateXMLReader {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
index 00e154d460b..8d3edab876e 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Organizer.java
@@ -17,7 +17,7 @@ import java.util.Map;
* Reorganizes and prunes a result as prescribed by a resolved template.
* This class is multithread safe.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Organizer {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java
index 7489768b5a3..5349d9f2aaa 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/RelevanceComparator.java
@@ -7,7 +7,7 @@ import com.yahoo.search.result.Hit;
import java.util.Comparator;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
class RelevanceComparator extends ChainableComparator {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java
index d67faf805ad..3ee3e3aeef0 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolution.java
@@ -12,7 +12,7 @@ import java.util.Map;
/**
* A resolution of choices within a template.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Resolution {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
index 4972b0e4689..6415dad37ec 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/Resolver.java
@@ -19,7 +19,7 @@ import com.yahoo.search.pagetemplates.model.PageTemplateVisitor;
* All subclasses of this must be multithread safe. I.e multiple calls may be made
* to resolve at the same time from different threads.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public abstract class Resolver extends AbstractComponent {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java
index b4cd01f0c36..e0185554066 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/SourceOrderComparator.java
@@ -8,7 +8,7 @@ import java.util.Comparator;
import java.util.List;
/**
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
class SourceOrderComparator extends ChainableComparator {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java
index 32ed54a6775..32ce65bf563 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/DeterministicResolver.java
@@ -23,7 +23,7 @@ import java.util.Map;
* <p>
* The id of this if <code>native.deterministic</code>
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class DeterministicResolver extends Resolver {
public static final String nativeId = "native.deterministic";
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java
index 5f06c66795d..be357245146 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/engine/resolvers/RandomResolver.java
@@ -15,7 +15,7 @@ import java.util.*;
* A resolver which makes all choices by random.
* The id of this is <code>native.random</code>.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class RandomResolver extends Resolver {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java
index 069598b2e02..5a8abb76a5c 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/AbstractChoice.java
@@ -6,7 +6,7 @@ import com.yahoo.component.provider.FreezableClass;
/**
* Abstract superclass of various kinds of choices.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public abstract class AbstractChoice extends FreezableClass implements PageElement {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
index a1932012236..3e956d510e7 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Choice.java
@@ -6,7 +6,7 @@ import java.util.*;
/**
* A choice between some alternative lists of page elements.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class Choice extends AbstractChoice {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java
index f8e00b78787..4100ca5504c 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Layout.java
@@ -4,7 +4,7 @@ package com.yahoo.search.pagetemplates.model;
/**
* The layout of a section
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
// This is not made an enum, to allow the value set to be extendible.
// It is not explicitly made immutable
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java
index 33c3bba9a77..ccfad1673aa 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/MapChoice.java
@@ -13,7 +13,7 @@ import java.util.List;
* Each unique set of mappings (pairs) from values to placeholder ids is a separate possible
* alternative of this choice. The alternatives are not listed explicitly but are generated as needed.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class MapChoice extends AbstractChoice {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java
index fba58f069ec..4cbabcf871f 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageElement.java
@@ -6,7 +6,7 @@ import com.yahoo.component.provider.Freezable;
/**
* Implemented by all page template model classes
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public interface PageElement extends Freezable {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java
index d7ebd3d1169..e4f6f12e47e 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/PageTemplateVisitor.java
@@ -6,7 +6,7 @@ import com.yahoo.search.pagetemplates.PageTemplate;
/**
* Superclass of visitors over the page template object structure
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class PageTemplateVisitor {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java
index cf7a85fc779..0eb98f329cb 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Placeholder.java
@@ -6,7 +6,7 @@ package com.yahoo.search.pagetemplates.model;
* Source placeholders may not have any content themselves - attempting to call any setter on this
* results in a IllegalStateException.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Placeholder implements PageElement {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java
index 4564ceeef3c..c3a46dbee8b 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Renderer.java
@@ -14,7 +14,7 @@ import java.util.Map;
* All data items has a default renderer. This can be overridden or parametrized by
* an explicit renderer.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public final class Renderer extends FreezableClass implements PageElement {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
index 0a980419853..67f67cb8538 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Section.java
@@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* Pages are freezable - once frozen calling a setter will cause an IllegalStateException, and returned
* live collection references are unmodifiable
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Section extends FreezableClass implements PageElement {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java
index 91c403eae84..de1cadff5db 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/model/Source.java
@@ -11,7 +11,7 @@ import java.util.*;
* <p>
* Two sources are equal if they have the same name and parameters.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class Source extends FreezableClass implements PageElement {
diff --git a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java
index 00f6c6350fc..c9c482781a4 100644
--- a/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/pagetemplates/result/SectionHitGroup.java
@@ -12,7 +12,7 @@ import java.util.List;
* A hit group corresponding to a section - contains some additional information
* in proper getters and setters which is used during rendering.
*
- * @author <a href="mailto:bratseth@yahoo-inc.com">Jon Bratseth</a>
+ * @author bratseth
*/
public class SectionHitGroup extends HitGroup {