summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-06-14 14:41:18 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-06-14 14:41:18 +0200
commit6ff3df19226036b8ee1bb559f9d73cab40e8d2a0 (patch)
tree355a7b0623b58983ba655b868341fe479a22eb3d /config-model
parentb7f9e7ceaef72489d76683537973b639f8895b84 (diff)
Remove carriage return
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/producer/package-info.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/UnprocessingSearchBuilder.java2
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerComponent.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/http/package-info.java2
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java2
-rw-r--r--config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml2
-rw-r--r--config-model/src/test/examples/weightedset-summaryto.sd2
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesModelTest.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java2
17 files changed, 17 insertions, 17 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/package-info.java b/config-model/src/main/java/com/yahoo/config/model/producer/package-info.java
index c58a116b196..e6d1731ddf8 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/package-info.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/package-info.java
@@ -2,4 +2,4 @@
@ExportPackage
package com.yahoo.config.model.producer;
-import com.yahoo.osgi.annotation.ExportPackage; \ No newline at end of file
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java
index b10a8633a3a..7232a2c5299 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/ConstantTensorTransformer.java
@@ -71,4 +71,4 @@ class ConstantTensorTransformer extends ExpressionTransformer {
return new ReferenceNode("constant", Arrays.asList(new NameNode(node.getName())), null);
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/UnprocessingSearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/UnprocessingSearchBuilder.java
index 3df0c1f9953..70a51cfd7ba 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/UnprocessingSearchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/UnprocessingSearchBuilder.java
@@ -37,4 +37,4 @@ public class UnprocessingSearchBuilder extends SearchBuilder {
builder.build();
return builder.getSearch();
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java
index 4e63729ea34..a44c2f45d6f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/package-info.java
@@ -2,4 +2,4 @@
@ExportPackage
package com.yahoo.searchdefinition.derived;
-import com.yahoo.osgi.annotation.ExportPackage; \ No newline at end of file
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerComponent.java
index 8ec1cecf47a..d2dace21b86 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerComponent.java
@@ -17,4 +17,4 @@ public class ClusterControllerComponent extends SimpleComponent
new ComponentSpecification("com.yahoo.vespa.clustercontroller.apps.clustercontroller.ClusterController"),
new ComponentSpecification("clustercontroller-apps"))));
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java
index e692b053de5..02e02cbe20a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/DeploymentFileValidator.java
@@ -37,4 +37,4 @@ public class DeploymentFileValidator extends Validator {
}
}
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
index 7017a5a233c..83d06f470a7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java
@@ -68,4 +68,4 @@ public class RankingConstantsValidator extends Validator {
tensorApplicationFile.createReader());
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/package-info.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/package-info.java
index 304a6cd5052..e1671c78a94 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/package-info.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/package-info.java
@@ -2,4 +2,4 @@
@ExportPackage
package com.yahoo.vespa.model.container.http;
-import com.yahoo.osgi.annotation.ExportPackage; \ No newline at end of file
+import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
index 84685ecef3d..f43f579c26b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
@@ -147,4 +147,4 @@ public class FileSender implements Serializable {
builder.setValue(reference.value());
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml b/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml
index 66af18ed7bc..be6672f415f 100644
--- a/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml
+++ b/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml
@@ -14,4 +14,4 @@
<node hostalias='node1' distribution-key='0'/>
</nodes>
</content>
-</services> \ No newline at end of file
+</services>
diff --git a/config-model/src/test/examples/weightedset-summaryto.sd b/config-model/src/test/examples/weightedset-summaryto.sd
index b72d674e743..adc0ff163ea 100644
--- a/config-model/src/test/examples/weightedset-summaryto.sd
+++ b/config-model/src/test/examples/weightedset-summaryto.sd
@@ -12,4 +12,4 @@ search test {
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
index b790d9e68e8..b7eb1414f6d 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/EmptyRankProfileTestCase.java
@@ -35,4 +35,4 @@ public class EmptyRankProfileTestCase extends SearchDefinitionTestCase {
search = SearchBuilder.buildFromRawSearch(search, rankProfileRegistry);
new DerivedConfiguration(search, rankProfileRegistry);
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java
index 718f4592709..053d2ba87f2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidatorTest.java
@@ -276,4 +276,4 @@ public class ConstantTensorJsonValidatorTest {
"}"));
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java
index c2aee71063d..d126dd0585c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidatorTest.java
@@ -25,4 +25,4 @@ public class RankingConstantsValidatorTest {
new VespaModelCreatorWithFilePkg("src/test/cfg/application/validation/ranking_constants_fail/").create();
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
index 0dea99c7b01..3ad3f2c2fdc 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/IndexingScriptChangeValidatorTest.java
@@ -163,4 +163,4 @@ public class IndexingScriptChangeValidatorTest {
validate());
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesModelTest.java b/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesModelTest.java
index d58e005e2ae..77019689e0a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesModelTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesModelTest.java
@@ -59,4 +59,4 @@ public class GenericServicesModelTest {
assertThat(gsModel.serviceClusters().get(0).services().size(), is(1));
}
-} \ No newline at end of file
+}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
index 40dc134190b..d9f8800ef77 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
@@ -34,4 +34,4 @@ public class PortsMetaTestCase extends junit.framework.TestCase {
assertNull(pm.getHttpStatusOffset());
}
-} \ No newline at end of file
+}