[Groonga-commit] groonga/gcs [master] Endpoints must be domains, not complete URLs

Zurück zum Archiv-Index

null+****@clear***** null+****@clear*****
2012年 7月 6日 (金) 14:20:42 JST


SHIMODA Hiroshi	2012-07-06 14:20:42 +0900 (Fri, 06 Jul 2012)

  New Revision: 33067fe3718904b655df63eaf51e1a74d9ce125e
  https://github.com/groonga/gcs/commit/33067fe3718904b655df63eaf51e1a74d9ce125e

  Log:
    Endpoints must be domains, not complete URLs

  Modified files:
    lib/api/2011-02-01/configuration.js
    test/api-configuration.test.js

  Modified: lib/api/2011-02-01/configuration.js (+4 -8)
===================================================================
--- lib/api/2011-02-01/configuration.js    2012-07-06 14:18:03 +0900 (5c2edb8)
+++ lib/api/2011-02-01/configuration.js    2012-07-06 14:20:42 +0900 (e1a6d6a)
@@ -89,10 +89,8 @@ handlers.CreateDomain = function(database, request, response) {
       response.send(createCreateDomainResponse({
         domainName: domain.name,
         domainId: FAKE_DOMAIN_ID,
-        searchEndpoint: 'http://search-' + domain.name + '-' + FAKE_DOMAIN_ID +
-                        host + '/' + exports.version + '/search',
-        documentsEndpoint: 'http://doc-' + domain.name + '-' + FAKE_DOMAIN_ID +
-                           host + '/' + exports.version + '/documents',
+        searchEndpoint: 'search-' + domain.name + '-' + FAKE_DOMAIN_ID + host,
+        documentsEndpoint: 'doc-' + domain.name + '-' + FAKE_DOMAIN_ID + host,
         created: true,
         searchableDocumentsCount: 0,
         searchInstanceCount: 0,
@@ -138,10 +136,8 @@ handlers.DeleteDomain = function(database, request, response) {
       response.send(createDeleteDomainResponse({
         domainName: domain.name,
         domainId: FAKE_DOMAIN_ID,
-        searchEndpoint: 'http://search-' + domain.name + '-' + FAKE_DOMAIN_ID +
-                        host + '/' + exports.version + '/search',
-        documentsEndpoint: 'http://doc-' + domain.name + '-' + FAKE_DOMAIN_ID +
-                           host + '/' + exports.version + '/documents',
+        searchEndpoint: 'search-' + domain.name + '-' + FAKE_DOMAIN_ID + host,
+        documentsEndpoint: 'doc-' + domain.name + '-' + FAKE_DOMAIN_ID + host,
         deleted: true,
         searchableDocumentsCount: 0,
         searchInstanceCount: 0,

  Modified: test/api-configuration.test.js (+4 -4)
===================================================================
--- test/api-configuration.test.js    2012-07-06 14:18:03 +0900 (da04bdd)
+++ test/api-configuration.test.js    2012-07-06 14:20:42 +0900 (6f3ce0a)
@@ -56,7 +56,7 @@ suite('Configuration API', function() {
                           '<Created>false</Created>' +
                           '<Deleted>true</Deleted>' +
                           '<DocService>' +
-                            '<Endpoint>http://doc-companies-00000000000000000000000000.localhost/2011-02-01/documents</Endpoint>' +
+                            '<Endpoint>doc-companies-00000000000000000000000000.localhost</Endpoint>' +
                           '</DocService>' +
                           '<DomainId>' + FAKE_DOMAIN_ID + '/companies</DomainId>' +
                           '<DomainName>companies</DomainName>' +
@@ -65,7 +65,7 @@ suite('Configuration API', function() {
                           '<SearchInstanceCount>0</SearchInstanceCount>' +
                           '<SearchPartitionCount>0</SearchPartitionCount>' +
                           '<SearchService>' +
-                            '<Endpoint>http://search-companies-00000000000000000000000000.localhost/2011-02-01/search</Endpoint>' +
+                            '<Endpoint>search-companies-00000000000000000000000000.localhost</Endpoint>' +
                           '</SearchService>' +
                         '</DomainStatus>' +
                       '</DeleteDomainResult>' +
@@ -107,7 +107,7 @@ suite('Configuration API', function() {
                           '<Created>true</Created>' +
                           '<Deleted>false</Deleted>' +
                           '<DocService>' +
-                            '<Endpoint>http://doc-companies-00000000000000000000000000.localhost/2011-02-01/documents</Endpoint>' +
+                            '<Endpoint>doc-companies-00000000000000000000000000.localhost</Endpoint>' +
                           '</DocService>' +
                           '<DomainId>' + FAKE_DOMAIN_ID + '/companies</DomainId>' +
                           '<DomainName>companies</DomainName>' +
@@ -116,7 +116,7 @@ suite('Configuration API', function() {
                           '<SearchInstanceCount>0</SearchInstanceCount>' +
                           '<SearchPartitionCount>0</SearchPartitionCount>' +
                           '<SearchService>' +
-                            '<Endpoint>http://search-companies-00000000000000000000000000.localhost/2011-02-01/search</Endpoint>' +
+                            '<Endpoint>search-companies-00000000000000000000000000.localhost</Endpoint>' +
                           '</SearchService>' +
                         '</DomainStatus>' +
                       '</CreateDomainResult>' +
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
Download 



Groonga-commit メーリングリストの案内
Zurück zum Archiv-Index