Fixed linting issues

TAMULib · Dec 11, 2019 · 2351797 · 2351797
1 parent b966338
commit 2351797
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/src/main/java/edu/tamu/app/service/manager/GitHubService.java b/src/main/java/edu/tamu/app/service/manager/GitHubService.java
@@ -9,7 +9,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.log4j.Logger;
-import org.kohsuke.github.GHBlob;
 import org.kohsuke.github.GHIssue;
 import org.kohsuke.github.GHLabel;
 import org.kohsuke.github.GHOrganization;
@@ -32,11 +31,11 @@ public class GitHubService extends MappingRemoteProjectManagerBean {
 
     private static final Logger logger = Logger.getLogger(GitHubService.class);
 
-    static final String ORGANIZATION = "TAMULib";
-    static final String REQUEST_LABEL = "request";
-    static final String ISSUE_LABEL = "issue";
-    static final String FEATURE_LABEL = "feature";
-    static final String DEFECT_LABEL = "bug";
+    protected static final String ORGANIZATION = "TAMULib";
+    protected static final String REQUEST_LABEL = "request";
+    protected static final String ISSUE_LABEL = "issue";
+    protected static final String FEATURE_LABEL = "feature";
+    protected static final String DEFECT_LABEL = "bug";
 
     private final ManagementService managementService;
 
@@ -235,7 +234,7 @@ private String getCardType(GHIssue content) throws IOException {
         return label == null ? null : label.getName();
     }
 
-    Member getMember(GHUser user) throws IOException {
+    protected Member getMember(GHUser user) throws IOException {
         Member member;
         String memberId = String.valueOf(user.getId());
         Optional<Member> cachedMember = getCachedMember(memberId);

diff --git a/src/main/java/edu/tamu/app/service/registry/ManagementBeanRegistry.java b/src/main/java/edu/tamu/app/service/registry/ManagementBeanRegistry.java
@@ -41,6 +41,7 @@ public void register(ManagementService managementService) {
                 break;
             case GITHUB:
                 service = Optional.of((ManagementBean) new GitHubService(managementService));
+                break;
             default:
                 break;
             }

diff --git a/src/test/java/edu/tamu/app/service/manager/GitHubServiceTest.java b/src/test/java/edu/tamu/app/service/manager/GitHubServiceTest.java
@@ -37,7 +37,6 @@
 import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
 import org.kohsuke.github.GitHubBuilder;
-import org.kohsuke.github.PagedIterable;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -70,7 +69,6 @@ public class GitHubServiceTest extends CacheMockTests {
 	private static final String TEST_USER1_NAME = "User 1 name";
 	private static final String TEST_USER1_AVATAR_PATH = "http://example.com/avatar.jpg";
 	private static final Long TEST_REPOSITORY1_ID = 1L;
-	private static final Long TEST_REPOSITORY2_ID = 2L;
 	private static final Long TEST_USER1_ID = 3L;
 
 	private static final GHLabel TEST_LABEL1 = mock(GHLabel.class);
@@ -84,7 +82,6 @@ public class GitHubServiceTest extends CacheMockTests {
 	private static final GHUser TEST_USER1 = mock(GHUser.class);
 	private static final GHUser TEST_USER2 = mock(GHUser.class);
 	private static final GHUser TEST_USER3 = mock(GHUser.class);
-	private static final GHUser TEST_USER4 = mock(GHUser.class);
 
 	private static final GHProjectCard TEST_CARD1 = mock(GHProjectCard.class, RETURNS_DEEP_STUBS.get());
 	private static final GHProjectCard TEST_CARD2 = mock(GHProjectCard.class, RETURNS_DEEP_STUBS.get());
@@ -141,10 +138,7 @@ public class GitHubServiceTest extends CacheMockTests {
 	private static final List<GHProject> TEST_PROJECTS = new ArrayList<GHProject>(
 			Arrays.asList(new GHProject[] { TEST_PROJECT1, TEST_PROJECT2, TEST_PROJECT3 }));
 
-	private static final List<GHRepository> TEST_REPOSITORIES = new ArrayList<GHRepository>(
-			Arrays.asList(new GHRepository[] { TEST_REPOSITORY1, TEST_REPOSITORY2 }));
-
-	Map<String, GHRepository> TEST_REPOSITORY_MAP = Stream.of(
+	private static final Map<String, GHRepository> TEST_REPOSITORY_MAP = Stream.of(
 			new Object[][] { { TEST_REPOSITORY1_NAME, TEST_REPOSITORY1 }, { TEST_REPOSITORY2_NAME, TEST_REPOSITORY2 } })
 			.collect(Collectors.toMap(data -> (String) data[0], data -> (GHRepository) data[1]));
 
@@ -154,12 +148,8 @@ public class GitHubServiceTest extends CacheMockTests {
 
 	private GitHub github;
 
-	private List<RemoteProject> mockRemoteProjects;
-
-	private List<Sprint> mockActiveSprints;
-
 	@Before
-	public void setup() throws Exception {
+	public void setUp() throws Exception {
 		ManagementService managementService = new RemoteProjectManager("GitHub", ServiceType.GITHUB,
 				new HashMap<String, String>() {
 					private static final long serialVersionUID = 2020874481642498006L;
@@ -307,10 +297,6 @@ public Optional<Estimate> answer(InvocationOnMock invocation) {
 		setField(gitHubService, "estimateMappingService", estimateMappingService);
 		setField(gitHubService, "github", github);
 		setField(gitHubService, "members", new HashMap<String, Member>());
-
-		mockRemoteProjects = getMockRemoteProjects();
-
-		mockActiveSprints = getMockActiveSprints();
 	}
 
 	@Test