Skip to content

Reformat code according to Google Code Style #279

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 19, 2020
Merged

Reformat code according to Google Code Style #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87f2101
Reformat code according to Google Code Style
oliemansm Nov 19, 2020
5933172
Include SonarLint reference in coding conventions
oliemansm Nov 19, 2020
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
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
java: [8, 11, 15]
os: [ ubuntu-latest, macos-latest, windows-latest ]
java: [ 8, 11, 15 ]
needs: validation
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "Publish release"
on: [workflow_dispatch]
on: [ workflow_dispatch ]

jobs:
validation:
Expand Down
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,10 @@ We use Google Style guides for our projects. See the
description. You can download the
[IntelliJ Java Google Style](https://github.com/google/styleguide/blob/gh-pages/intellij-java-google-style.xml)
to import in these settings in IntelliJ.

### SonarLint

It would also be very helpful to install the SonarLint plugin in your IDE and fix any
relevant SonarLint issues before pushing a PR. We're aware that the current state
of the code raises a lot of SonarLint issues out of the box, but any help in reducing
that is appreciated. More importantly we don't increase that technical debt.
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ subprojects {
it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
dep.name == it.artifactId.text()
}
}.each { it.scope*.value = 'compile'}
}.each { it.scope*.value = 'compile' }
}
}
}
Expand Down
213 changes: 106 additions & 107 deletions examples/osgi/apache-karaf-feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,119 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<parent>
<groupId>com.graphql-java-kickstart</groupId>
<artifactId>graphql-java-servlet-osgi-examples</artifactId>
<version>7.3.4-SNAPSHOT</version>
</parent>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>
<build>
<plugins>
<plugin>
<artifactId>karaf-maven-plugin</artifactId>
<configuration>
<addTransitiveFeatures>true</addTransitiveFeatures>
<includeTransitiveDependency>true</includeTransitiveDependency>
<startLevel>80</startLevel>
</configuration>
<extensions>true</extensions>
<groupId>org.apache.karaf.tooling</groupId>
<version>4.0.8</version>
</plugin>

<artifactId>graphql-java-servlet-osgi-examples-karaf-feature</artifactId>
<packaging>feature</packaging>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.5.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>2.8.2</version>
</plugin>
</plugins>

<properties>
<jackson.version>2.10.0.pr1</jackson.version>
</properties>
</build>

<dependencies>
<dependency>
<artifactId>jackson-core</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<artifactId>jackson-annotations</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<artifactId>jackson-datatype-jdk8</artifactId>
<groupId>com.fasterxml.jackson.datatype</groupId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
<version>[24.1.1,)</version>
</dependency>
<dependency>
<artifactId>commons-fileupload</artifactId>
<groupId>commons-fileupload</groupId>
<version>[1.3.3,)</version>
</dependency>
<dependency>
<artifactId>antlr4-runtime</artifactId>
<groupId>org.antlr</groupId>
<version>4.7.1</version>
</dependency>

<dependency>
<artifactId>graphql-java-servlet</artifactId>
<groupId>com.graphql-java-kickstart</groupId>
<version>${graphql.java.servlet.version}</version>
</dependency>
<dependency>
<artifactId>graphql-java</artifactId>
<groupId>com.graphql-java</groupId>
<version>${graphql.java.version}</version>
</dependency>
<dependency>
<artifactId>graphql-java-annotations</artifactId>
<groupId>com.graphql-java</groupId>
<version>0.13.1</version>
</dependency>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>[24.1.1,)</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>[1.3.3,)</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.7.1</version>
</dependency>
<dependency>
<artifactId>graphql-java-servlet-osgi-examples-providers</artifactId>
<groupId>com.graphql-java-kickstart</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
<version>1.7.25</version>
</dependency>
<dependency>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
<version>1.7.25</version>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>

<dependency>
<groupId>com.graphql-java-kickstart</groupId>
<artifactId>graphql-java-servlet</artifactId>
<version>${graphql.java.servlet.version}</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java</artifactId>
<version>${graphql.java.version}</version>
</dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-annotations</artifactId>
<version>0.13.1</version>
</dependency>
<packaging>feature</packaging>

<dependency>
<groupId>com.graphql-java-kickstart</groupId>
<artifactId>graphql-java-servlet-osgi-examples-providers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>4.0.8</version>
<extensions>true</extensions>
<configuration>
<startLevel>80</startLevel>
<addTransitiveFeatures>true</addTransitiveFeatures>
<includeTransitiveDependency>true</includeTransitiveDependency>
</configuration>
</plugin>
<parent>
<artifactId>graphql-java-servlet-osgi-examples</artifactId>
<groupId>com.graphql-java-kickstart</groupId>
<version>7.3.4-SNAPSHOT</version>
</parent>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
</plugins>

</build>
<properties>
<jackson.version>2.10.0.pr1</jackson.version>
</properties>

</project>
12 changes: 7 additions & 5 deletions examples/osgi/apache-karaf-feature/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="graphql-java-servlet-osgi-examples-karaf-feature">
<feature name="graphql-java-servlet-osgi-examples-karaf-feature" description="graphql-java-servlet-osgi-examples-karaf-feature">
<feature prerequisite="true" dependency="false">scr</feature>
<feature prerequisite="true" dependency="false">war</feature>
</feature>
<features name="graphql-java-servlet-osgi-examples-karaf-feature"
xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
<feature description="graphql-java-servlet-osgi-examples-karaf-feature"
name="graphql-java-servlet-osgi-examples-karaf-feature">
<feature dependency="false" prerequisite="true">scr</feature>
<feature dependency="false" prerequisite="true">war</feature>
</feature>
</features>
Loading