Skip to content

Commit

Permalink
Reftestandstructure (#7067)
Browse files Browse the repository at this point in the history
* ref and cleanup

* remove test

* restore old test
  • Loading branch information
pethers authored Jan 21, 2025
1 parent 8fe8956 commit ed3b350
Show file tree
Hide file tree
Showing 239 changed files with 3,252 additions and 943 deletions.
12 changes: 6 additions & 6 deletions citizen-intelligence-agency/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,34 @@
<exec executable="${maven.binary}" dir="../parent-pom/">
<env key="MAVEN_OPTS" value="-server -Xmx2048m -Xms2048m " />
<arg
line="-B --file pom.xml clean install -pl !cia-dist-deb -Prelease-site,all-modules -DforkMode=once '-Dtest=!**ITest*,!**DocumentationTest*' -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dsurefire.reportNameSuffix=UNIT" />
line="-B --file pom.xml clean install -pl '!cia-dist-deb,!cia-dist-cloudformation' -Prelease-site -DforkMode=once '-Dtest=!**ITest*,!**DocumentationTest*' -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dsurefire.reportNameSuffix=UNIT -Dspdx.skip=true" />
</exec>
</target>

<target name="check-updates" description="cia-check-updates" depends="init">
<exec executable="${maven.binary}" dir="../parent-pom">
<arg
line="versions:display-dependency-updates -Prelease-site,release-sign-artifacts,all-modules -U" />
line="versions:display-dependency-updates -Prelease-site,release-sign-artifacts -U" />
</exec>
</target>
<target name="check-plugin-updates" description="cia-check-plugin-updates" depends="init">
<exec executable="${maven.binary}" dir="../parent-pom">
<arg
line="versions:display-plugin-updates -Prelease-site,release-sign-artifacts,all-modules -U " />
line="versions:display-plugin-updates -Prelease-site,release-sign-artifacts -U " />
</exec>
</target>
<target name="clean-install" description="cia-clean-install" depends="init">
<exec executable="${maven.binary}" dir="../parent-pom/">
<env key="MAVEN_OPTS" value="-server -Xmx2048m -Xms2048m " />
<arg
line="clean install -T 1.5C -pl !cia-dist-deb -Pall-modules -Dhttps.protocols=TLSv1.2 -Dmaven.test.failure.ignore=true" />
line="clean install -pl '!cia-dist-deb,!cia-dist-cloudformation' -Dmaven.test.failure.ignore=true -Dspdx.skip=true" />
</exec>
</target>
<target name="clean-install-notest" description="cia-clean-install-notest" depends="init">
<exec executable="${maven.binary}" dir="../">
<env key="MAVEN_OPTS" value="-server -Xmx2048m -Xms2048m " />
<arg
line="clean install -Pall-modules -DskipTests -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -pl '!cia-dist-deb,!cia-dist-cloudformation'" />
line="clean install -pl '!cia-dist-deb,!cia-dist-cloudformation' -DskipTests -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dspdx.skip=true" />
</exec>
</target>

Expand All @@ -60,7 +60,7 @@
<exec executable="${maven.binary}" dir=".">
<env key="MAVEN_OPTS" value="-server -Xmx6048m -Xms6048m " />
<arg
line="clean install site -Prelease-site -Dmaven.test.failure.ignore=true -DforkMode=once -Dannotation.failOnError=false" />
line="clean install site -Prelease-site -Dmaven.test.failure.ignore=true -DforkMode=once -Dannotation.failOnError=false -Dspdx.skip=true" />
</exec>
</target>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public final class CitizenIntelligenceAgencyUI extends UI {
@Autowired
private transient ApplicationManager applicationManager;

/** The configuration manager. */
@Autowired
private transient ConfigurationManager configurationManager;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ public final class AdminViewConstants {
/** The Constant ADMIN_AGENCY_MANAGEMENT. */
public static final String ADMIN_AGENCY_MANAGEMENT = "Controls for agency-level data and settings.";

public static final String AGENCY_OVERVIEW_HEADER = "Agency Overview";

/** The Constant AGENCY_OVERVIEW. */
public static final String AGENCY_OVERVIEW = "High-level review of agencies and their attributes.";

Expand All @@ -134,6 +136,8 @@ public final class AdminViewConstants {
/** The Constant ADMIN_APPLICATION_EVENT_CHARTS. */
public static final String ADMIN_APPLICATION_EVENT_CHARTS = "Visual analytics of application events for trend analysis.";

public static final String EVENT_ANALYSIS_HEADER = "Event Analysis";

/** The Constant EVENT_ANALYSIS. */
public static final String EVENT_ANALYSIS = "Advanced examination of event data and metrics.";

Expand Down Expand Up @@ -254,11 +258,11 @@ public final class AdminViewConstants {
/** The Constant ADMIN_AGENT_OPERATION_DEPLOY_WORLD_BUTTON. */
public static final String ADMIN_AGENT_OPERATION_DEPLOY_WORLD_BUTTON = "Initiates agent deployment worldwide.";

/** The Constant ADMIN_AGENT_OPERATION_DEPLOY_DESC. */
public static final String ADMIN_AGENT_OPERATION_DEPLOY_DESC = "Starts OSINT gathering for the specified region.";

public static final String MONITORING_ACCESS_DENIED = null;

public static final String ACCESS_DENIED = null;
/** The Constant ACCESS_DENIED. */
public static final String ACCESS_DENIED = "Access denied:";


}
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
@Component
public final class DataSummaryAuthorPageModContentFactoryImpl extends AbstractDataSummaryPageModContentFactoryImpl {

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = { "author", "changes", "firstDate", "lastDate" };

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = { "id" };

/** The Constant NAME. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ public final class DataSummaryOverviewPageModContentFactoryImpl extends Abstract
/** The Constant ADMIN_DATA_SUMMARY. */
private static final String ADMIN_DATA_SUMMARY = "Admin Data Summary";

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = { "dataType", "dataSize" };

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = { "id" };

/** The Constant NAME. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
*/
public abstract class AbstractAdminSystemPageModContentFactoryImpl extends AbstractBasicPageModContentFactoryImpl {

/** The paging util. */
@Autowired
private PagingUtil pagingUtil;

/** The view name. */
private final String viewName;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,25 @@
public final class AdminApplicationConfigurationPageModContentFactoryImpl
extends AbstractAdminSystemPageModContentFactoryImpl {

/** The Constant APPLICATION_CONFIGURATION. */
private static final String APPLICATION_CONFIGURATION = "ApplicationConfiguration";

/** The Constant AS_LIST2. */
private static final List<String> AS_LIST2 = Arrays.asList("configTitle", "configDescription", "componentTitle",
"componentDescription", "propertyValue");

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = { "hjid", "configurationGroup", "component", "componentTitle",
"configTitle", "configDescription", "componentDescription", "propertyId", "propertyValue" };

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", "modelObjectVersion", "createdDate",
"updatedDate", "propertyId", "componentDescription", "componentTitle" };

/** The Constant NAME. */
public static final String NAME = AdminViews.ADMIN_APPLICATIONS_CONFIGURATION_VIEW_NAME;

/** The Constant UPDATE_CONFIGURATION. */
private static final String UPDATE_CONFIGURATION = "Update Configuration";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

getMenuItemFactory().createMainPageMenuBar(menuBar);

CardInfoRowUtil.createPageHeader(panel, content, AdminViewConstants.ADMIN_APPLICATION_EVENT_CHARTS, "Event Analysis", AdminViewConstants.EVENT_ANALYSIS);
CardInfoRowUtil.createPageHeader(panel, content, AdminViewConstants.ADMIN_APPLICATION_EVENT_CHARTS, AdminViewConstants.EVENT_ANALYSIS_HEADER, AdminViewConstants.EVENT_ANALYSIS);

getAdminChartDataManager().createApplicationActionEventPageDailySummaryChart(content);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,24 @@
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;

/**
* The Class AdminApplicationEventsPageModContentFactoryImpl.
*/
@Component
public final class AdminApplicationEventsPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl {

/** The Constant APPLICATION_ACTION_EVENT. */
private static final String APPLICATION_ACTION_EVENT = "ApplicationActionEvent";

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = { "hjid", "createdDate", "userId", "actionName", "errorMessage",
"applicationMessage", "page", "pageMode", "elementId", "modelObjectVersion" };

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", "modelObjectVersion", "sessionId",
"eventGroup", "applicationOperation" };

/** The Constant LISTENER. */
private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(
AdminViews.ADMIN_APPLICATIONS_EVENTS_VIEW_NAME, "hjid");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,13 @@
@Component
public final class AdminApplicationSessionPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl {

/** The Constant APPLICATION_ACTION_EVENT. */
private static final String APPLICATION_ACTION_EVENT = "ApplicationActionEvent";

/** The Constant APPLICATION_SESSION. */
private static final String APPLICATION_SESSION = "ApplicationSession";

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = {
"hjid",
"createdDate",
Expand All @@ -67,6 +71,7 @@ public final class AdminApplicationSessionPageModContentFactoryImpl extends Abst
"sessionId"
};

/** The Constant COLUMN_ORDER2. */
private static final String[] COLUMN_ORDER2 = {
"hjid",
"createdDate",
Expand All @@ -81,6 +86,7 @@ public final class AdminApplicationSessionPageModContentFactoryImpl extends Abst
"modelObjectVersion"
};

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = {
"hjid",
"modelObjectId",
Expand All @@ -90,6 +96,7 @@ public final class AdminApplicationSessionPageModContentFactoryImpl extends Abst
"ipInformation"
};

/** The Constant HIDE_COLUMNS2. */
private static final String[] HIDE_COLUMNS2 = {
"hjid",
"modelObjectId",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
@Component
public final class AdminCountryPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl {

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = {
"hjid",
"id",
Expand All @@ -55,8 +56,10 @@ public final class AdminCountryPageModContentFactoryImpl extends AbstractAdminSy
"latitude"
};

/** The Constant COUNTRY2. */
private static final String COUNTRY2 = "Country";

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = {
"hjid",
"id",
Expand All @@ -68,6 +71,7 @@ public final class AdminCountryPageModContentFactoryImpl extends AbstractAdminSy
"latitude"
};

/** The Constant LISTENER. */
private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(AdminViews.ADMIN_COUNTRY_VIEW_NAME, "hjid");

/** The Constant NAME. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@
@Component
public final class AdminLanguagePageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl {

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = {
"hjid",
"languageName",
"modelObjectVersion"
};

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = {
"hjid",
"modelObjectId",
Expand All @@ -61,8 +63,10 @@ public final class AdminLanguagePageModContentFactoryImpl extends AbstractAdminS
"lastModifiedDate"
};

/** The Constant LANGUAGE_DATA. */
private static final String LANGUAGE_DATA = "LanguageData";

/** The Constant LISTENER. */
private static final PageItemPropertyClickListener LISTENER =
new PageItemPropertyClickListener(AdminViews.ADMIN_LANGUAGE_VIEW_NAME, "hjid");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
@Component
public final class AdminPortalPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl {

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = {
"hjid",
"portalName",
Expand All @@ -54,6 +55,7 @@ public final class AdminPortalPageModContentFactoryImpl extends AbstractAdminSys
"modelObjectVersion"
};

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = {
"hjid",
"modelObjectId",
Expand All @@ -64,6 +66,7 @@ public final class AdminPortalPageModContentFactoryImpl extends AbstractAdminSys
/** The Constant NAME. */
public static final String NAME = AdminViews.ADMIN_PORTAL_VIEW_NAME;

/** The Constant PORTAL2. */
private static final String PORTAL2 = "Portal";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;

/**
* The Class AdminUserAccountPageModContentFactoryImpl.
*/
@Component
public final class AdminUserAccountPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl {

Expand All @@ -58,18 +61,22 @@ public final class AdminUserAccountPageModContentFactoryImpl extends AbstractAdm
/** The Constant BUTTON_PATTERN. */
private static final String BUTTON_PATTERN = "Perform {0}";

/** The Constant COLUMN_ORDER. */
private static final String[] COLUMN_ORDER = { "hjid", "modelObjectId", "modelObjectVersion", "createdDate",
"userId", "username", "userType", "userRole", "userpassword", "email", "country", "numberOfVisits" };

/** The Constant HIDE_COLUMNS. */
private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", "modelObjectVersion", "userId",
"userpassword", "address" };

/** The Constant LISTENER. */
private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(
AdminViews.ADMIN_USERACCOUNT_VIEW_NAME, "hjid");

/** The Constant NAME. */
public static final String NAME = AdminViews.ADMIN_USERACCOUNT_VIEW_NAME;

/** The Constant USER_ACCOUNT. */
private static final String USER_ACCOUNT = "UserAccount";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ public interface StepMapping<T> {
/**
* Gets the to date.
*
* @param t
* @param t the t
* @return the to date
*/
Date getToDate(T t);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public final class ChartUtils {
/** The Constant CHART_LEFT_MARGIN. */
private static final int CHART_LEFT_MARGIN = 2;

/** The Constant CHART_RIGHT_MARGIN = 2; */
/** The Constant CHART_RIGHT_MARGIN = 2;. */
private static final int CHART_RIGHT_MARGIN = 2;

/** The Constant CHART_TOP_MARGIN_SIZE. */
Expand Down
Loading

0 comments on commit ed3b350

Please sign in to comment.