refactor: update groupId to com.github.lokic

lokic · lokic · commit 099a65b56f42 · 2021-04-02T22:26:06.000+08:00
diff --git a/dataloader-plus-core/pom.xml b/dataloader-plus-core/pom.xml
@@ -3,9 +3,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>me.lokic</groupId>
+        <groupId>com.github.lokic</groupId>
         <artifactId>dataloader-plus</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/DataLoaderExecutor.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/DataLoaderExecutor.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
 
 @FunctionalInterface
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/DataLoaderFactory.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/DataLoaderFactory.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderOptions;
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/DataLoaderTemplate.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/DataLoaderTemplate.java
@@ -1,6 +1,6 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
-import me.lokic.dataloaderplus.core.kits.CompletableFutures;
+import com.github.lokic.dataloaderplus.core.kits.CompletableFutures;
 import org.dataloader.DataLoaderOptions;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/ExDataLoaderRegistry.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/ExDataLoaderRegistry.java
@@ -1,7 +1,8 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
+import com.github.lokic.dataloaderplus.core.annotation.DataLoaderService;
+import com.github.lokic.dataloaderplus.core.proxy.InterfaceProxy;
 import lombok.extern.slf4j.Slf4j;
-import me.lokic.dataloaderplus.core.proxy.InterfaceProxy;
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderOptions;
 import org.dataloader.DataLoaderRegistry;
@@ -20,7 +21,7 @@ public class ExDataLoaderRegistry extends DataLoaderRegistry {
     private final DataLoaderFactory factory;
 
     /**
-     * 使用 @{@link me.lokic.dataloaderplus.core.annotation.DataLoaderService} 注释接口的实现类的缓存，避免重复创建
+     * 使用 @{@link DataLoaderService} 注释接口的实现类的缓存，避免重复创建
      */
     private static final Map<Class<?>, Object> SERVICE_CACHE = new ConcurrentHashMap<>();
 
@@ -42,7 +43,7 @@ public <K, V> DataLoader<K, V> getDataLoader(Class<? extends MappedBatchLoaderWi
     }
 
     /**
-     * 获取 {@link me.lokic.dataloaderplus.core.annotation.DataLoaderService} 对应的 {@code serviceClazz} 的实现
+     * 获取 {@link DataLoaderService} 对应的 {@code serviceClazz} 的实现
      *
      * @param serviceClazz
      * @param <S>
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/MultiKey2MappedBatchLoader.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/MultiKey2MappedBatchLoader.java
@@ -1,7 +1,7 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
 
-import me.lokic.dataloaderplus.core.tuples.Tuple2;
+import com.github.lokic.dataloaderplus.core.tuples.Tuple2;
 
 public interface MultiKey2MappedBatchLoader<K1, K2, V> extends MultiKeyMappedBatchLoader<Tuple2<K1, K2>, V> {
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/MultiKey3MappedBatchLoader.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/MultiKey3MappedBatchLoader.java
@@ -1,7 +1,7 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
 
-import me.lokic.dataloaderplus.core.tuples.Tuple3;
+import com.github.lokic.dataloaderplus.core.tuples.Tuple3;
 
 public interface MultiKey3MappedBatchLoader<K1, K2, K3, V> extends MultiKeyMappedBatchLoader<Tuple3<K1, K2, K3>, V> {
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/MultiKeyMappedBatchLoader.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/MultiKeyMappedBatchLoader.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
 import org.dataloader.MappedBatchLoaderWithContext;
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/RegistryHolder.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/RegistryHolder.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
 
 /**
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/TemplateConfig.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/TemplateConfig.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
 import lombok.Builder;
 import org.dataloader.DataLoaderOptions;
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/annotation/DataLoaderMethod.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/annotation/DataLoaderMethod.java
@@ -1,6 +1,7 @@
-package me.lokic.dataloaderplus.core.annotation;
+package com.github.lokic.dataloaderplus.core.annotation;
 
-import me.lokic.dataloaderplus.core.MultiKeyMappedBatchLoader;
+import com.github.lokic.dataloaderplus.core.DataLoaderFactory;
+import com.github.lokic.dataloaderplus.core.MultiKeyMappedBatchLoader;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -18,7 +19,7 @@
 public @interface DataLoaderMethod {
 
     /**
-     * 对应的 MultiKeyMappedBatchLoader 的实现类，实际会通过 {@link me.lokic.dataloaderplus.core.DataLoaderFactory} 进行注册，
+     * 对应的 MultiKeyMappedBatchLoader 的实现类，实际会通过 {@link DataLoaderFactory} 进行注册，
      * 然后创建对应的 {@link org.dataloader.DataLoader}
      *
      * @return
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/annotation/DataLoaderService.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/annotation/DataLoaderService.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.annotation;
+package com.github.lokic.dataloaderplus.core.annotation;
 
 import java.lang.annotation.*;
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/annotation/KeyContext.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/annotation/KeyContext.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.annotation;
+package com.github.lokic.dataloaderplus.core.annotation;
 
 import org.dataloader.BatchLoaderEnvironment;
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/kits/Arrays.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/kits/Arrays.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.kits;
+package com.github.lokic.dataloaderplus.core.kits;
 
 public class Arrays {
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/kits/CompletableFutures.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/kits/CompletableFutures.java
@@ -1,7 +1,7 @@
-package me.lokic.dataloaderplus.core.kits;
+package com.github.lokic.dataloaderplus.core.kits;
 
+import com.github.lokic.dataloaderplus.core.RegistryHolder;
 import lombok.extern.slf4j.Slf4j;
-import me.lokic.dataloaderplus.core.RegistryHolder;
 
 import java.util.List;
 import java.util.Map;
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/kits/Types.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/kits/Types.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.kits;
+package com.github.lokic.dataloaderplus.core.kits;
 
 public class Types {
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/proxy/InterfaceProxy.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/proxy/InterfaceProxy.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.proxy;
+package com.github.lokic.dataloaderplus.core.proxy;
 
 import java.lang.reflect.Proxy;
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/proxy/ServiceInvocationHandler.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/proxy/ServiceInvocationHandler.java
@@ -1,12 +1,12 @@
-package me.lokic.dataloaderplus.core.proxy;
-
+package com.github.lokic.dataloaderplus.core.proxy;
+
+import com.github.lokic.dataloaderplus.core.ExDataLoaderRegistry;
+import com.github.lokic.dataloaderplus.core.RegistryHolder;
+import com.github.lokic.dataloaderplus.core.annotation.DataLoaderMethod;
+import com.github.lokic.dataloaderplus.core.annotation.KeyContext;
+import com.github.lokic.dataloaderplus.core.kits.Arrays;
+import com.github.lokic.dataloaderplus.core.tuples.Tuple;
 import lombok.extern.slf4j.Slf4j;
-import me.lokic.dataloaderplus.core.ExDataLoaderRegistry;
-import me.lokic.dataloaderplus.core.RegistryHolder;
-import me.lokic.dataloaderplus.core.annotation.DataLoaderMethod;
-import me.lokic.dataloaderplus.core.annotation.KeyContext;
-import me.lokic.dataloaderplus.core.kits.Arrays;
-import me.lokic.dataloaderplus.core.tuples.Tuple;
 import org.dataloader.DataLoader;
 import org.dataloader.MappedBatchLoaderWithContext;
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/tuples/Tuple.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/tuples/Tuple.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.tuples;
+package com.github.lokic.dataloaderplus.core.tuples;
 
 public interface Tuple {
 
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/tuples/Tuple2.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/tuples/Tuple2.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.tuples;
+package com.github.lokic.dataloaderplus.core.tuples;
 
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/tuples/Tuple3.java b/dataloader-plus-core/src/main/java/com/github/lokic/dataloaderplus/core/tuples/Tuple3.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.core.tuples;
+package com.github.lokic.dataloaderplus.core.tuples;
 
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
diff --git a/dataloader-plus-core/src/test/java/com/github/lokic/dataloaderplus/core/DataLoaderTemplateTest.java b/dataloader-plus-core/src/test/java/com/github/lokic/dataloaderplus/core/DataLoaderTemplateTest.java
@@ -1,8 +1,8 @@
-package me.lokic.dataloaderplus.core;
+package com.github.lokic.dataloaderplus.core;
 
-import me.lokic.dataloaderplus.core.kits.CompletableFutures;
-import me.lokic.dataloaderplus.core.service.UserNameBatchLoader;
-import me.lokic.dataloaderplus.core.service.UserService;
+import com.github.lokic.dataloaderplus.core.kits.CompletableFutures;
+import com.github.lokic.dataloaderplus.core.service.UserNameBatchLoader;
+import com.github.lokic.dataloaderplus.core.service.UserService;
 import org.dataloader.BatchLoaderEnvironment;
 import org.dataloader.DataLoader;
 import org.junit.Assert;
diff --git a/dataloader-plus-core/src/test/java/com/github/lokic/dataloaderplus/core/service/UserNameBatchLoader.java b/dataloader-plus-core/src/test/java/com/github/lokic/dataloaderplus/core/service/UserNameBatchLoader.java
@@ -1,8 +1,8 @@
-package me.lokic.dataloaderplus.core.service;
+package com.github.lokic.dataloaderplus.core.service;
 
+import com.github.lokic.dataloaderplus.core.MultiKeyMappedBatchLoader;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import me.lokic.dataloaderplus.core.MultiKeyMappedBatchLoader;
 import org.dataloader.BatchLoaderEnvironment;
 
 import java.util.Map;
diff --git a/dataloader-plus-core/src/test/java/com/github/lokic/dataloaderplus/core/service/UserService.java b/dataloader-plus-core/src/test/java/com/github/lokic/dataloaderplus/core/service/UserService.java
@@ -1,7 +1,7 @@
-package me.lokic.dataloaderplus.core.service;
+package com.github.lokic.dataloaderplus.core.service;
 
-import me.lokic.dataloaderplus.core.annotation.DataLoaderMethod;
-import me.lokic.dataloaderplus.core.annotation.DataLoaderService;
+import com.github.lokic.dataloaderplus.core.annotation.DataLoaderMethod;
+import com.github.lokic.dataloaderplus.core.annotation.DataLoaderService;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/dataloader-plus-spring-boot-starter/pom.xml b/dataloader-plus-spring-boot-starter/pom.xml
@@ -3,9 +3,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>me.lokic</groupId>
+        <groupId>com.github.lokic</groupId>
         <artifactId>dataloader-plus</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,7 +28,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>me.lokic</groupId>
+            <groupId>com.github.lokic</groupId>
             <artifactId>dataloader-plus-core</artifactId>
         </dependency>
     </dependencies>
diff --git a/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/DataLoaderServiceFactoryBean.java b/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/DataLoaderServiceFactoryBean.java
@@ -1,11 +1,11 @@
-package me.lokic.dataloaderplus.spring;
+package com.github.lokic.dataloaderplus.spring;
 
+import com.github.lokic.dataloaderplus.core.ExDataLoaderRegistry;
 import lombok.extern.slf4j.Slf4j;
-import me.lokic.dataloaderplus.core.ExDataLoaderRegistry;
 import org.springframework.beans.factory.FactoryBean;
 
 /**
- * 基于 @{@link me.lokic.dataloaderplus.core.annotation.DataLoaderService} 注解的接口的实现类工厂
+ * 基于 @{@link com.github.lokic.dataloaderplus.core.annotation.DataLoaderService} 注解的接口的实现类工厂
  *
  * @param <T>
  */
diff --git a/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/DataLoaderServiceRegistrar.java b/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/DataLoaderServiceRegistrar.java
@@ -1,6 +1,6 @@
-package me.lokic.dataloaderplus.spring;
+package com.github.lokic.dataloaderplus.spring;
 
-import me.lokic.dataloaderplus.core.kits.Types;
+import com.github.lokic.dataloaderplus.core.kits.Types;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
diff --git a/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/DataLoaderServiceScanner.java b/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/DataLoaderServiceScanner.java
@@ -1,6 +1,6 @@
-package me.lokic.dataloaderplus.spring;
+package com.github.lokic.dataloaderplus.spring;
 
-import me.lokic.dataloaderplus.core.annotation.DataLoaderService;
+import com.github.lokic.dataloaderplus.core.annotation.DataLoaderService;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
diff --git a/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/EnableDataLoader.java b/dataloader-plus-spring-boot-starter/src/main/java/com/github/lokic/dataloaderplus/spring/EnableDataLoader.java
@@ -1,4 +1,4 @@
-package me.lokic.dataloaderplus.spring;
+package com.github.lokic.dataloaderplus.spring;
 
 import org.springframework.context.annotation.Import;
 
diff --git a/pom.xml b/pom.xml
@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>me.lokic</groupId>
+    <groupId>com.github.lokic</groupId>
     <artifactId>dataloader-plus</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <modules>
         <module>dataloader-plus-core</module>
         <module>dataloader-plus-spring-boot-starter</module>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package me.lokic.dataloaderplus.core;`
	`1`	`+package com.github.lokic.dataloaderplus.core;`
`2`	`2`
`3`	`3`
`4`	`4`	`@FunctionalInterface`