Skip to content

Commit

Permalink
Repackage to adhere our domain, so we can release to Sonatype
Browse files Browse the repository at this point in the history
  • Loading branch information
dziesio committed Jan 21, 2017
1 parent c0b88df commit 04eb30f
Show file tree
Hide file tree
Showing 232 changed files with 518 additions and 1,038 deletions.
4 changes: 2 additions & 2 deletions README.adoc
Expand Up @@ -12,7 +12,7 @@ Set up your parent pom.xml:
[source, xml, indent=0, subs="attributes, verbatim"]
----
<parent>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-parent</artifactId>
<version>{neo-starter-version}</version>
</parent>
Expand All @@ -23,7 +23,7 @@ add basic starter as a dependency:
[source, xml, indent=0]
----
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter</artifactId>
</dependency>
----
Expand Down
22 changes: 11 additions & 11 deletions neo-starter-dependencies/pom.xml
Expand Up @@ -3,7 +3,7 @@
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>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-dependencies</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down Expand Up @@ -98,53 +98,53 @@


<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>request-parameters</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-utils</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-utils</artifactId>
<type>test-jar</type>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-metrics</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-mongo</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-mongo-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-rabbitmq</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-quartz</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion neo-starter-metrics/pom.xml
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-dependencies</artifactId>
<version>0.6.0-SNAPSHOT</version>
<relativePath>../neo-starter-dependencies</relativePath>
Expand Down

This file was deleted.

@@ -1,4 +1,4 @@
package com.neoteric.starter.metrics;
package eu.neoteric.starter.metrics;

import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry;
Expand Down
@@ -1,9 +1,8 @@
package com.neoteric.starter.metrics;
package eu.neoteric.starter.metrics;

import com.codahale.metrics.MetricRegistry;
import com.neoteric.starter.metrics.StarterMetricsConstants;
import com.neoteric.starter.metrics.report.elastic.ElasticsearchConnectionException;
import com.neoteric.starter.metrics.report.elastic.ElasticsearchReporter;
import eu.neoteric.starter.metrics.report.elastic.ElasticsearchConnectionException;
import eu.neoteric.starter.metrics.report.elastic.ElasticsearchReporter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.metrics;
package eu.neoteric.starter.metrics;

import org.springframework.boot.context.properties.ConfigurationProperties;

Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.metrics;
package eu.neoteric.starter.metrics;


import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.metrics;
package eu.neoteric.starter.metrics;

public final class StarterMetricsConstants {

Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.metrics.report.elastic;
package eu.neoteric.starter.metrics.report.elastic;

public class ElasticsearchConnectionException extends RuntimeException {

Expand Down
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.neoteric.starter.metrics.report.elastic;
package eu.neoteric.starter.metrics.report.elastic;

import com.codahale.metrics.*;
import com.codahale.metrics.Timer;
Expand All @@ -27,7 +27,7 @@
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import com.neoteric.starter.metrics.report.elastic.percolation.Notifier;
import eu.neoteric.starter.metrics.report.elastic.percolation.Notifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
Expand All @@ -42,7 +42,7 @@
import java.util.concurrent.atomic.AtomicInteger;

import static com.codahale.metrics.MetricRegistry.name;
import static com.neoteric.starter.metrics.report.elastic.JsonMetrics.*;
import static eu.neoteric.starter.metrics.report.elastic.JsonMetrics.*;

@SuppressWarnings({"squid:S00103", // Lines should not be too long
"squid:S1943", // Classes and methods that rely on the default system encoding should not be used
Expand Down Expand Up @@ -146,12 +146,12 @@ public void report(SortedMap<String, Gauge> gauges,
return;
}

List<JsonMetric> percolationMetrics = new ArrayList<>();
List<JsonMetrics.JsonMetric> percolationMetrics = new ArrayList<>();
AtomicInteger entriesWritten = new AtomicInteger(0);

for (Map.Entry<String, Gauge> entry : gauges.entrySet()) {
if (entry.getValue().getValue() != null) {
JsonMetric jsonMetric = new JsonGauge(name(prefix, entry.getKey()), timestamp, entry.getValue());
JsonMetrics.JsonMetric jsonMetric = new JsonMetrics.JsonGauge(name(prefix, entry.getKey()), timestamp, entry.getValue());
connection = writeJsonMetricAndRecreateConnectionIfNeeded(jsonMetric, connection, entriesWritten);
addJsonMetricToPercolationIfMatching(jsonMetric, percolationMetrics);
}
Expand Down
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.neoteric.starter.metrics.report.elastic;
package eu.neoteric.starter.metrics.report.elastic;

import com.codahale.metrics.*;

Expand Down
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.neoteric.starter.metrics.report.elastic;
package eu.neoteric.starter.metrics.report.elastic;

import com.codahale.metrics.Histogram;
import com.codahale.metrics.Meter;
Expand All @@ -38,7 +38,7 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;

import static com.neoteric.starter.metrics.report.elastic.JsonMetrics.*;
import static eu.neoteric.starter.metrics.report.elastic.JsonMetrics.*;

public class MetricsElasticsearchModule extends Module {

Expand Down
Expand Up @@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.neoteric.starter.metrics.report.elastic.percolation;
package eu.neoteric.starter.metrics.report.elastic.percolation;

import com.neoteric.starter.metrics.report.elastic.JsonMetrics;
import eu.neoteric.starter.metrics.report.elastic.JsonMetrics;

/**
* A notifier interface, which is executed, in case a certain metric is matched on the percolation query
Expand Down
@@ -1,3 +1,3 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.neoteric.starter.metrics.DropwizardMetricsAutoConfiguration,\
com.neoteric.starter.metrics.DropwizardMetricsReportAutoConfiguration
eu.neoteric.starter.metrics.DropwizardMetricsAutoConfiguration,\
eu.neoteric.starter.metrics.DropwizardMetricsReportAutoConfiguration
Expand Up @@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.neoteric.starter.metrics.report.elastic;
package eu.neoteric.starter.metrics.report.elastic;

import com.codahale.metrics.*;
import com.neoteric.starter.metrics.report.elastic.percolation.Notifier;
import eu.neoteric.starter.metrics.report.elastic.percolation.Notifier;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
Expand Down
2 changes: 1 addition & 1 deletion neo-starter-metrics/src/test/resources/logback.xml
Expand Up @@ -9,7 +9,7 @@
</layout>
</appender>

<logger name="com.neoteric.starter.metrics.report.elastic.ElasticsearchReporterTest" level="ERROR"/>
<logger name="eu.neoteric.starter.metrics.report.elastic.ElasticsearchReporterTest" level="ERROR"/>
<logger name="node" level="ERROR"/>
<logger name="test" level="ERROR"/>
<logger name="plugins" level="ERROR"/>
Expand Down
4 changes: 2 additions & 2 deletions neo-starter-mongo-test/pom.xml
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-dependencies</artifactId>
<version>0.6.0-SNAPSHOT</version>
<relativePath>../neo-starter-dependencies</relativePath>
Expand Down Expand Up @@ -39,7 +39,7 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-mongo</artifactId>
<scope>test</scope>
</dependency>
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.test.jersey.mongo;
package eu.neoteric.starter.test.jersey.mongo;

import java.lang.annotation.*;

Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.test.jersey.mongo;
package eu.neoteric.starter.test.jersey.mongo;

import com.mongodb.BasicDBObject;
import org.slf4j.Logger;
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.test.jersey.mongo;
package eu.neoteric.starter.test.jersey.mongo;

import com.mongodb.Mongo;
import com.mongodb.MongoClient;
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.test.jersey.mongo;
package eu.neoteric.starter.test.jersey.mongo;

public final class StarterMongoTestConstants {

Expand Down
@@ -1,4 +1,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
com.neoteric.starter.test.jersey.mongo.NeotericEmbeddedMongoAutoConfiguration
eu.neoteric.starter.test.jersey.mongo.NeotericEmbeddedMongoAutoConfiguration
org.springframework.test.context.TestExecutionListener = \
com.neoteric.starter.test.jersey.mongo.MongoCleanUpListener
eu.neoteric.starter.test.jersey.mongo.MongoCleanUpListener
@@ -1,8 +1,8 @@
package com.neoteric.starter.test.jersey.mongo;
package eu.neoteric.starter.test.jersey.mongo;


import com.mongodb.BasicDBObject;
import com.neoteric.starter.mongo.MongoConvertersAutoConfiguration;
import eu.neoteric.starter.mongo.MongoConvertersAutoConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.test.jersey.mongo;
package eu.neoteric.starter.test.jersey.mongo;

import org.springframework.data.mongodb.core.mapping.Document;

Expand Down
4 changes: 2 additions & 2 deletions neo-starter-mongo/pom.xml
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>neo-starter-dependencies</artifactId>
<version>0.6.0-SNAPSHOT</version>
<relativePath>../neo-starter-dependencies</relativePath>
Expand All @@ -22,7 +22,7 @@

<dependencies>
<dependency>
<groupId>com.neoteric.starter</groupId>
<groupId>eu.neoteric.starter</groupId>
<artifactId>request-parameters</artifactId>
</dependency>
<dependency>
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.mongo;
package eu.neoteric.starter.mongo;

import com.github.mongobee.Mongobee;
import com.google.common.base.Strings;
Expand Down
@@ -1,4 +1,4 @@
package com.neoteric.starter.mongo;
package eu.neoteric.starter.mongo;

import lombok.Getter;
import lombok.Setter;
Expand Down

0 comments on commit 04eb30f

Please sign in to comment.