Skip to content

Commit d102203

Browse files
update language adaptors to rx.* package
1 parent 7e55d04 commit d102203

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

language-adaptors/rxjava-clojure/src/main/java/org/rx/lang/clojure/ClojureAdaptor.java renamed to language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/ClojureAdaptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.rx.lang.clojure;
16+
package rx.lang.clojure;
1717

1818
import java.util.Arrays;
1919

@@ -100,7 +100,7 @@ public void before() {
100100

101101
@Test
102102
public void testTake() {
103-
runClojureScript("(-> (org.rx.reactive.Observable/toObservable [\"one\" \"two\" \"three\"]) (.take 2) (.subscribe (fn [arg] (println arg))))");
103+
runClojureScript("(-> (rx.observables.Observable/toObservable [\"one\" \"two\" \"three\"]) (.take 2) (.subscribe (fn [arg] (println arg))))");
104104
}
105105

106106
// commented out for now as I can't figure out how to set the var 'a' with the 'assertion' instance when running the code from java

language-adaptors/rxjava-groovy/src/main/java/org/rx/lang/groovy/GroovyAdaptor.java renamed to language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyAdaptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.rx.lang.groovy;
16+
package rx.lang.groovy;
1717

1818
import static org.mockito.Matchers.*;
1919
import static org.mockito.Mockito.*;

language-adaptors/rxjava-jruby/src/main/java/org/rx/lang/jruby/JRubyAdaptor.java renamed to language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyAdaptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.rx.lang.jruby;
16+
package rx.lang.jruby;
1717

1818
import static org.mockito.Matchers.*;
1919
import static org.mockito.Mockito.*;
@@ -163,7 +163,7 @@ private void runGroovyScript(String script) {
163163

164164
StringBuilder b = new StringBuilder();
165165
// force JRuby to always use subscribe(Object)
166-
b.append("import org.rx.reactive.Observable").append("\n");
166+
b.append("import \"rx.observables.Observable\"").append("\n");
167167
b.append("class Observable").append("\n");
168168
b.append(" java_alias :subscribe, :subscribe, [java.lang.Object]").append("\n");
169169
b.append("end").append("\n");

rxjava-core/src/main/java/rx/util/Functions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class Functions {
4444
}
4545

4646
private static void loadLanguageAdaptor(String name) {
47-
String className = "org.rx.lang." + name.toLowerCase() + "." + name + "Adaptor";
47+
String className = "rx.lang." + name.toLowerCase() + "." + name + "Adaptor";
4848
try {
4949
Class<?> c = Class.forName(className);
5050
FunctionLanguageAdaptor a = (FunctionLanguageAdaptor) c.newInstance();

0 commit comments

Comments
 (0)