Skip to content

Commit

Permalink
修改package,去掉.example
Browse files Browse the repository at this point in the history
  • Loading branch information
zman committed Nov 15, 2019
1 parent a71c4f7 commit 04e19aa
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 20 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ branches:
dist: trusty

jdk:
- oraclejdk8
- oraclejdk8

after_success:
- mvn clean test jacoco:report coveralls:report
22 changes: 22 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,28 @@
<target>8</target>
</configuration>
</plugin>

<!-- coveralls -->
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.3.0</version>
</plugin>
<!-- coveralls end -->

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zman.scuttlebutt.example;
package com.zman.scuttlebutt;

import java.util.concurrent.locks.ReentrantLock;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zman.scuttlebutt.example;
package com.zman.scuttlebutt;


import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zman.scuttlebutt.example;
package com.zman.scuttlebutt;

import java.util.*;
import java.util.function.Consumer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.zman.scuttlebutt.example;
package com.zman.scuttlebutt;

import com.zman.scuttlebutt.example.Scuttlebutt.Update;
import com.zman.scuttlebutt.Scuttlebutt.Update;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zman.scuttlebutt.example;
package com.zman.scuttlebutt;

import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
Expand All @@ -8,7 +8,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.locks.ReentrantLock;

@Slf4j
public abstract class Scuttlebutt extends EventEmitter{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zman.scuttlebutt.example.basic;
package com.zman.scuttlebutt.basic;

import lombok.AllArgsConstructor;
import lombok.ToString;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.zman.scuttlebutt.example.basic;
package com.zman.scuttlebutt.basic;

import com.zman.scuttlebutt.example.Duplex;
import com.zman.scuttlebutt.example.Scuttlebutt;
import com.zman.scuttlebutt.Duplex;
import com.zman.scuttlebutt.Scuttlebutt;
import lombok.extern.slf4j.Slf4j;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.zman.scuttlebutt.example.basic.async;
package com.zman.scuttlebutt.basic.async;

import com.zman.scuttlebutt.example.AsyncScuttlebutt;
import com.zman.scuttlebutt.example.Duplex;
import com.zman.scuttlebutt.example.basic.BizData;
import com.zman.scuttlebutt.Duplex;
import com.zman.scuttlebutt.basic.BizData;
import com.zman.scuttlebutt.AsyncScuttlebutt;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</encoder>
</appender>

<logger name="com.zman.scuttlebutt.example.Duplex" level="info"/>
<logger name="com.zman.scuttlebutt.Duplex" level="info"/>

<root level="debug">
<appender-ref ref="STDOUT" />
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/RelationshipBetweenInstanceAndClass.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.zman.scuttlebutt.example.AsyncScuttlebutt;
import com.zman.scuttlebutt.example.Scuttlebutt;
import com.zman.scuttlebutt.example.basic.Model;
import com.zman.scuttlebutt.AsyncScuttlebutt;
import com.zman.scuttlebutt.Scuttlebutt;
import com.zman.scuttlebutt.basic.Model;
import org.junit.Test;

import java.util.Map;
Expand Down

0 comments on commit 04e19aa

Please sign in to comment.