Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename packages under java/main from org.jboss to org.jboss.set #47

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss</groupId>
<groupId>org.jboss.set</groupId>
<artifactId>jira-issue-lottery</artifactId>
<version>1.0.0-SNAPSHOT</version>
<properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss;
package org.jboss.set;

import jakarta.enterprise.context.ApplicationScoped;
import org.apache.camel.component.jira.JiraComponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss;
package org.jboss.set;

import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.ApplicationScoped;
Expand All @@ -7,10 +7,10 @@
import org.apache.camel.component.jira.JiraComponent;
import org.apache.camel.component.jira.JiraConfiguration;
import org.apache.camel.component.jira.JiraEndpoint;
import org.jboss.config.JiraLotteryAppConfig;
import org.jboss.processing.CollectorProducer;
import org.jboss.processing.NewIssueCollector;
import org.jboss.testing.JiraCommand;
import org.jboss.set.config.JiraLotteryAppConfig;
import org.jboss.set.processing.CollectorProducer;
import org.jboss.set.processing.NewIssueCollector;
import org.jboss.set.testing.JiraCommand;
import picocli.CommandLine.Command;

@Command(name = "jira-issue-lottery", mixinStandardHelpOptions = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.config;
package org.jboss.set.config;

import org.eclipse.microprofile.config.spi.Converter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.config;
package org.jboss.set.config;

import io.smallrye.config.ConfigMapping;
import io.smallrye.config.WithDefault;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file is inspired by Quarkus GitHub lottery - https://github.com/quarkusio/quarkus-github-lottery/blob/b0da185b00151eb0c2f2d0f19e91e76b7aedf020/src/main/java/io/quarkus/github/lottery/config/LotteryConfig.java
*/
package org.jboss.config;
package org.jboss.set.config;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.config;
package org.jboss.set.config;

import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.enterprise.context.ApplicationScoped;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.config;
package org.jboss.set.config;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.draw;
package org.jboss.set.draw;

import io.quarkus.arc.Unremovable;
import io.quarkus.mailer.Mail;
Expand All @@ -7,11 +7,11 @@
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.eclipse.microprofile.config.ConfigProvider;
import org.jboss.config.LotteryConfig;
import org.jboss.config.LotteryConfigProducer;
import org.jboss.draw.entities.Issue;
import org.jboss.draw.entities.Participant;
import org.jboss.processing.state.EveryIssueState;
import org.jboss.set.config.LotteryConfig;
import org.jboss.set.config.LotteryConfigProducer;
import org.jboss.set.draw.entities.Issue;
import org.jboss.set.draw.entities.Participant;
import org.jboss.set.processing.state.EveryIssueState;

import java.util.Collections;
import java.util.List;
Expand All @@ -23,7 +23,7 @@

import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.joining;
import static org.jboss.config.GitHubRawUrl.GitHubRepoToRawUrlConverter.RELATIVE_PATH;
import static org.jboss.set.config.GitHubRawUrl.GitHubRepoToRawUrlConverter.RELATIVE_PATH;

@Unremovable
@ApplicationScoped
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.jboss.draw.entities;
package org.jboss.set.draw.entities;

import com.atlassian.jira.rest.client.api.domain.BasicComponent;
import io.quarkus.logging.Log;
import org.jboss.processing.state.SingleIssueState;
import org.jboss.set.processing.state.SingleIssueState;

import java.net.URI;
import java.net.URISyntaxException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.draw.entities;
package org.jboss.set.draw.entities;

import io.smallrye.mutiny.tuples.Tuple2;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.jboss.jql;
package org.jboss.set.jql;

import org.jboss.query.SearchQuery;
import org.jboss.set.query.SearchQuery;

import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.jql;
package org.jboss.set.jql;

import jakarta.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.jboss.processing;
package org.jboss.set.processing;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.component.jira.JiraEndpoint;
import org.jboss.config.LotteryConfig;
import org.jboss.config.LotteryConfigProducer;
import org.jboss.jql.JqlBuilder;
import org.jboss.query.IssueStatus;
import org.jboss.query.SearchQuery;
import org.jboss.set.config.LotteryConfig;
import org.jboss.set.config.LotteryConfigProducer;
import org.jboss.set.jql.JqlBuilder;
import org.jboss.set.query.IssueStatus;
import org.jboss.set.query.SearchQuery;

import java.time.LocalDate;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.processing;
package org.jboss.set.processing;

/**
* Even if it is basically the same as {@code java.lang.Runnable} interface,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.processing;
package org.jboss.set.processing;

import com.atlassian.jira.rest.client.api.domain.Comment;
import io.quarkus.logging.Log;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.jboss.processing;
package org.jboss.set.processing;

import com.atlassian.jira.rest.client.api.domain.Issue;
import io.quarkus.arc.Arc;
import io.quarkus.logging.Log;
import org.apache.camel.component.jira.JiraEndpoint;
import org.apache.camel.component.jira.consumer.NewIssuesConsumer;
import org.jboss.draw.Lottery;
import org.jboss.processing.state.EveryIssueState;
import org.jboss.processing.state.SingleIssueState;
import org.jboss.set.draw.Lottery;
import org.jboss.set.processing.state.EveryIssueState;
import org.jboss.set.processing.state.SingleIssueState;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.jboss.processing;
package org.jboss.set.processing;

import com.atlassian.jira.rest.client.api.domain.Issue;
import io.quarkus.logging.Log;
import org.apache.camel.component.jira.JiraEndpoint;
import org.apache.camel.component.jira.consumer.NewIssuesConsumer;
import org.jboss.processing.state.SingleIssueState;
import org.jboss.set.processing.state.SingleIssueState;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.processing.state;
package org.jboss.set.processing.state;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jboss.processing.state;
package org.jboss.set.processing.state;

import com.atlassian.jira.rest.client.api.domain.BasicComponent;
import com.atlassian.jira.rest.client.api.domain.BasicIssue;
import com.atlassian.jira.rest.client.api.domain.BasicProject;
import com.atlassian.jira.rest.client.api.domain.Issue;
import com.atlassian.jira.rest.client.api.domain.User;
import org.jboss.query.IssueStatus;
import org.jboss.set.query.IssueStatus;

import java.util.ArrayList;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.query;
package org.jboss.set.query;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file is inspired by https://github.com/jboss-set/aphrodite
*/
package org.jboss.query;
package org.jboss.set.query;

import java.time.LocalDate;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.jboss.testing;
package org.jboss.set.testing;

import jakarta.inject.Qualifier;

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.jboss.config.GitHubRawUrl$GitHubRepoToRawUrlConverter
org.jboss.set.config.GitHubRawUrl$GitHubRepoToRawUrlConverter
12 changes: 6 additions & 6 deletions src/test/java/org/jboss/set/draw/AbstractLotteryTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
import org.apache.camel.component.jira.JiraEndpoint;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
import org.apache.camel.spi.Registry;
import org.jboss.JiraEndpointProducer;
import org.jboss.JiraIssueLotteryCommand;
import org.jboss.config.LotteryConfigProducer;
import org.jboss.set.JiraEndpointProducer;
import org.jboss.set.JiraIssueLotteryCommand;
import org.jboss.set.config.LotteryConfigProducer;
import org.jboss.set.helper.MockedSearchRestClientProducer;
import org.jboss.testing.JiraCommand;
import org.jboss.set.testing.JiraCommand;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
Expand Down Expand Up @@ -71,7 +71,7 @@ public abstract class AbstractLotteryTest extends CamelQuarkusTestSupport {
CamelContext camelContext;

protected List<Issue> issues;
protected List<org.jboss.draw.entities.Issue> ourIssues;
protected List<org.jboss.set.draw.entities.Issue> ourIssues;

protected abstract List<Issue> setupIssues();

Expand Down Expand Up @@ -115,7 +115,7 @@ public Promise<SearchResult> answer(InvocationOnMock invocationOnMock) throws Th
@Override
protected CamelContext createCamelContext() throws Exception {
issues = setupIssues();
ourIssues = issues.stream().map(org.jboss.draw.entities.Issue::new).toList();
ourIssues = issues.stream().map(org.jboss.set.draw.entities.Issue::new).toList();
setMocks();
return camelContext;
}
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/jboss/set/draw/LotteryDrawingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import io.quarkus.mailer.Mail;
import io.quarkus.test.junit.QuarkusTest;
import org.jboss.config.LotteryConfig;
import org.jboss.draw.Lottery;
import org.jboss.query.IssueStatus;
import org.jboss.set.config.LotteryConfig;

import org.jboss.set.query.IssueStatus;
import org.jboss.set.wrappers.IssueWrapper;
import org.junit.jupiter.api.Test;
import picocli.CommandLine;
Expand Down Expand Up @@ -241,7 +241,7 @@ public void testAssigningAllIssuesToTwoParticipants() throws Exception {
int exitCode = cmd.execute();
assertEquals(0, exitCode);

for (Map.Entry<String, org.jboss.draw.entities.Issue> userIssue : List.of(
for (Map.Entry<String, org.jboss.set.draw.entities.Issue> userIssue : List.of(
Map.entry("[email protected]", ourIssues.get(0)),
Map.entry("[email protected]", ourIssues.get(1)))) {
List<Mail> sent = mailbox.getMailsSentTo(userIssue.getKey());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
import com.atlassian.jira.rest.client.api.domain.Issue;
import io.quarkus.mailer.Mail;
import io.quarkus.test.junit.QuarkusTest;
import org.jboss.config.LotteryConfig;
import org.jboss.draw.Lottery;
import org.jboss.query.IssueStatus;
import org.jboss.set.config.LotteryConfig;
import org.jboss.set.query.IssueStatus;
import org.jboss.set.wrappers.IssueWrapper;
import org.junit.jupiter.api.Test;
import picocli.CommandLine;
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/org/jboss/set/jql/JqlFromSearchQueryTest.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package org.jboss.set.jql;

import io.quarkus.test.junit.QuarkusTest;
import org.jboss.jql.JqlBuilder;
import org.jboss.query.IssueStatus;
import org.jboss.query.SearchQuery;
import org.jboss.set.query.IssueStatus;
import org.jboss.set.query.SearchQuery;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/jboss/set/jql/SearchQueryTest.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.jboss.set.jql;

import io.quarkus.test.junit.QuarkusTest;
import org.jboss.query.IssueStatus;
import org.jboss.query.SearchQuery;
import org.jboss.set.query.IssueStatus;
import org.jboss.set.query.SearchQuery;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.inject.Inject;
import org.jboss.config.GitHubRawUrl;
import org.jboss.config.LotteryConfig;
import org.jboss.set.config.GitHubRawUrl;
import org.jboss.set.config.LotteryConfig;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/jboss/set/state/IssueStatusTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.jboss.set.state;

import io.quarkus.test.junit.QuarkusTest;
import org.jboss.query.IssueStatus;
import org.jboss.set.query.IssueStatus;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand All @@ -15,7 +15,7 @@ public class IssueStatusTest {

/**
* We check only for number of distinguished entries.
* In the next text we check for identity of {@code org.jboss.query.IssueStatus}.
* In the next text we check for identity of {@code org.jboss.set.query.IssueStatus}.
* So if we have multiple same entries we would count them as a single one.
*/
@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jboss/set/wrappers/IssueWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.atlassian.jira.rest.client.api.domain.User;
import com.atlassian.jira.rest.client.api.domain.Version;
import com.atlassian.jira.rest.client.api.domain.Worklog;
import org.jboss.query.IssueStatus;
import org.jboss.set.query.IssueStatus;
import org.joda.time.DateTime;

import java.net.URI;
Expand Down
Loading