Skip to content

Commit

Permalink
BREAKING CHANGE - additional package renaming
Browse files Browse the repository at this point in the history
i recently learned that package names should also prefer the
singular form, not the plural form
  • Loading branch information
mschoch committed Oct 1, 2016
1 parent 43a4216 commit 6bf9dd5
Show file tree
Hide file tree
Showing 163 changed files with 127 additions and 127 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package keyword

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokenizers/single"
"github.com/blevesearch/bleve/analysis/tokenizer/single"
"github.com/blevesearch/bleve/registry"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ package simple

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokenizers/letter"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/letter"
"github.com/blevesearch/bleve/registry"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ package standard
import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/lang/en"
"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
"github.com/blevesearch/bleve/registry"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ package web
import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/lang/en"
webt "github.com/blevesearch/bleve/analysis/tokenizers/web"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/web"
"github.com/blevesearch/bleve/registry"
)

const Name = "web"

func AnalyzerConstructor(config map[string]interface{}, cache *registry.Cache) (*analysis.Analyzer, error) {
tokenizer, err := cache.TokenizerNamed(webt.Name)
tokenizer, err := cache.TokenizerNamed(web.Name)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion analysis/benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/analyzers/standard"
"github.com/blevesearch/bleve/analysis/analyzer/standard"
"github.com/blevesearch/bleve/registry"
)

Expand Down
6 changes: 3 additions & 3 deletions analysis/lang/ar/analyzer_ar.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/registry"

"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/tokens/unicodenorm"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/token/unicodenorm"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "ar"
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/ar/stop_filter_ar.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package ar

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/bg/stop_filter_bg.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package bg

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/ca/elision_ca.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"fmt"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/elision"
"github.com/blevesearch/bleve/analysis/token/elision"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/ca/stop_filter_ca.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package ca

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
4 changes: 2 additions & 2 deletions analysis/lang/cjk/analyzer_cjk.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/registry"

"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "cjk"
Expand Down
4 changes: 2 additions & 2 deletions analysis/lang/ckb/analyzer_ckb.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ package ckb

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/ckb/sorani_stemmer_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokenizers/single"
"github.com/blevesearch/bleve/analysis/tokenizer/single"
)

func TestSoraniStemmerFilter(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/ckb/stop_filter_ckb.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package ckb

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/cs/stop_filter_cs.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package cs

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/el/stop_filter_el.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package el

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
6 changes: 3 additions & 3 deletions analysis/lang/en/analyzer_en.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/registry"

"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/tokens/porter"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/token/porter"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "en"
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/en/stop_filter_en.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package en

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/eu/stop_filter_eu.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package eu

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
4 changes: 2 additions & 2 deletions analysis/lang/fa/analyzer_fa.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (

"github.com/blevesearch/bleve/analysis/char/zerowidthnonjoiner"
"github.com/blevesearch/bleve/analysis/lang/ar"
"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "fa"
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/fa/stop_filter_fa.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package fa

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
4 changes: 2 additions & 2 deletions analysis/lang/fr/analyzer_fr.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/registry"

"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "fr"
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/fr/elision_fr.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"fmt"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/elision"
"github.com/blevesearch/bleve/analysis/token/elision"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/fr/stop_filter_fr.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package fr

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/ga/elision_ga.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"fmt"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/elision"
"github.com/blevesearch/bleve/analysis/token/elision"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/ga/stop_filter_ga.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package ga

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/gl/stop_filter_gl.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package gl

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
4 changes: 2 additions & 2 deletions analysis/lang/hi/analyzer_hi.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/blevesearch/bleve/registry"

"github.com/blevesearch/bleve/analysis/lang/in"
"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "hi"
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/hi/stop_filter_hi.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package hi

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/hy/stop_filter_hy.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package hy

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/id/stop_filter_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package id

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
4 changes: 2 additions & 2 deletions analysis/lang/it/analyzer_it.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/registry"

"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "it"
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/it/elision_it.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"fmt"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/elision"
"github.com/blevesearch/bleve/analysis/token/elision"
"github.com/blevesearch/bleve/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/it/stop_filter_it.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package it

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
4 changes: 2 additions & 2 deletions analysis/lang/pt/analyzer_pt.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/registry"

"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokens/lowercase"
"github.com/blevesearch/bleve/analysis/token/lowercase"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
)

const AnalyzerName = "pt"
Expand Down
2 changes: 1 addition & 1 deletion analysis/lang/pt/stop_filter_pt.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package pt

import (
"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokens/stop"
"github.com/blevesearch/bleve/analysis/token/stop"
"github.com/blevesearch/bleve/registry"
)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/blevesearch/bleve/analysis"
_ "github.com/blevesearch/bleve/analysis/tokenizers/unicode"
_ "github.com/blevesearch/bleve/analysis/tokenizer/unicode"
"github.com/blevesearch/bleve/registry"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"unicode"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokenizers/character"
"github.com/blevesearch/bleve/analysis/tokenizer/character"
"github.com/blevesearch/bleve/registry"
)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strings"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokenizers/exception"
"github.com/blevesearch/bleve/analysis/tokenizers/unicode"
"github.com/blevesearch/bleve/analysis/tokenizer/exception"
"github.com/blevesearch/bleve/analysis/tokenizer/unicode"
"github.com/blevesearch/bleve/registry"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"unicode"

"github.com/blevesearch/bleve/analysis"
"github.com/blevesearch/bleve/analysis/tokenizers/character"
"github.com/blevesearch/bleve/analysis/tokenizer/character"
"github.com/blevesearch/bleve/registry"
)

Expand Down
Loading

0 comments on commit 6bf9dd5

Please sign in to comment.