Cleanup the load order in synchronized object

Author: pitr-ch

Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
 
-require 'concurrent/extension_helper'
+require 'concurrent/native_extensions'
 
 ## load the two gemspec files
 CORE_GEMSPEC = Gem::Specification.load('concurrent-ruby.gemspec')

concurrent-ruby-ext.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
 
   s.files            = Dir['ext/**/*.{h,c,cpp}']
   s.files           += [
-    'lib/concurrent/extension_helper.rb',
     'lib/concurrent/atomic_reference/concurrent_update_error.rb',
     'lib/concurrent/atomic_reference/direct_update.rb',
     'lib/concurrent/atomic_reference/numeric_cas_wrapper.rb',

ext/com/concurrent_ruby/ext/JavaSynchronizedObjectLibrary.java

@@ -20,24 +20,29 @@
 public class JavaSynchronizedObjectLibrary implements Library {
 
     public void load(Ruby runtime, boolean wrap) throws IOException {
-        RubyModule concurrentMod = runtime.defineModule("Concurrent");
-        RubyClass javaSynchronizedObjectClass = concurrentMod.defineClassUnder(
-                "JavaSynchronizedObject",
-                concurrentMod.getClass("AbstractSynchronizedObject"),
-                JRUBYREFERENCE_ALLOCATOR);
-        javaSynchronizedObjectClass.defineAnnotatedMethods(JavaSynchronizedObject.class);
+        RubyModule concurrentModule = runtime.
+                defineModule("Concurrent").
+                defineModuleUnder("SynchronizedObjectImplementations");
+        RubyClass parent = concurrentModule.
+                getClass("Abstract");
+        if (parent == null) throw runtime.newRuntimeError("Concurrent::SynchronizedObject::Abstract is missing");
+
+        RubyClass synchronizedObjectJavaClass = concurrentModule.
+                defineClassUnder("Java", parent, JRUBYREFERENCE_ALLOCATOR);
+
+        synchronizedObjectJavaClass.defineAnnotatedMethods(Java.class);
     }
 
     private static final ObjectAllocator JRUBYREFERENCE_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new JavaSynchronizedObject(runtime, klazz);
+            return new Java(runtime, klazz);
         }
     };
 
-    @JRubyClass(name = "JavaSynchronizedObject", parent = "AbstractSynchronizedObject")
-    public static class JavaSynchronizedObject extends RubyObject {
+    @JRubyClass(name = "Java", parent = "Abstract")
+    public static class Java extends RubyObject {
 
-        public JavaSynchronizedObject(Ruby runtime, RubyClass metaClass) {
+        public Java(Ruby runtime, RubyClass metaClass) {
             super(runtime, metaClass);
         }
 

ext/concurrent/extconf.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 
-require 'concurrent/extension_helper'
+require 'concurrent/native_extensions'
 
 EXTENSION_NAME = 'extension'
 

lib/concurrent/atomic.rb

@@ -12,7 +12,7 @@
 end
 #####################################################################
 
-require 'concurrent/extension_helper'
+require 'concurrent/native_extensions'
 require 'concurrent/utility/engine'
 require 'concurrent/atomic_reference/concurrent_update_error'
 require 'concurrent/atomic_reference/mutex_atomic'

lib/concurrent/atomic/atomic_boolean.rb

@@ -1,4 +1,4 @@
-require 'concurrent/extension_helper'
+require 'concurrent/native_extensions'
 
 module Concurrent
 

lib/concurrent/atomic/atomic_fixnum.rb

@@ -1,4 +1,4 @@
-require 'concurrent/extension_helper'
+require 'concurrent/native_extensions'
 
 module Concurrent
 

lib/concurrent/atomic_reference/jruby.rb

@@ -1,4 +1,4 @@
-require 'concurrent/extension_helper'
+require 'concurrent/native_extensions'
 
 if defined?(Concurrent::JavaAtomic)
   require 'concurrent/atomic_reference/direct_update'

lib/concurrent/atomic_reference/ruby.rb

@@ -1,5 +1,5 @@
 if defined? Concurrent::CAtomic
-  require 'concurrent/extension_helper'
+  require 'concurrent/native_extensions'
   require 'concurrent/atomic_reference/direct_update'
   require 'concurrent/atomic_reference/numeric_cas_wrapper'