-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
[linky] Yet another website underlaying API modification #17538
Open
clinique
wants to merge
10
commits into
openhab:main
Choose a base branch
from
clinique:linky_17513
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
94cba60
Yet another website underlaying API modification
clinique 5c0c9f9
Correction for current and previous week, month, year
clinique d8b7b5d
Correction of pom
clinique 4fa8450
Code review n°1 corrections, revert jsoup upgrade
clinique 1d1cc21
Forgot feature.xml
clinique 952616a
Ongoing code review
clinique fe8ff60
Reverting
clinique 2b4e55c
Added unitHing and what I hope is the end of the resolve nightmare
clinique 46c6a66
Switch peek power to kVA
clinique 8f59eb2
Some code readability enhancements
clinique File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/dto/PrmDetail.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/** | ||
* Copyright (c) 2010-2024 Contributors to the openHAB project | ||
* | ||
* See the NOTICE file(s) distributed with this work for additional | ||
* information. | ||
* | ||
* This program and the accompanying materials are made available under the | ||
* terms of the Eclipse Public License 2.0 which is available at | ||
* http://www.eclipse.org/legal/epl-2.0 | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
*/ | ||
package org.openhab.binding.linky.internal.dto; | ||
|
||
import java.util.ArrayList; | ||
|
||
/** | ||
* The {@link PrmDetail} holds detailed informations about prm configuration | ||
* | ||
* @author Gaël L'hopital - Initial contribution | ||
*/ | ||
public class PrmDetail { | ||
public record Adresse(String ligne2, String ligne3, String ligne4, String ligne5, String ligne6) { | ||
lolodomo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
public record DicEntry(String code, String libelle) { | ||
} | ||
|
||
public record Measure(String unite, String valeur) { | ||
} | ||
|
||
public record AlimentationPrincipale(Object puissanceRaccordementInjection, | ||
Measure puissanceRaccordementSoutirage) { | ||
} | ||
|
||
public record Compteur(boolean accessibilite, boolean ticActivee, boolean ticStandard) { | ||
} | ||
|
||
public record Contrat(DicEntry typeContrat, String referenceContrat) { | ||
} | ||
|
||
public record Disjoncteur(DicEntry calibre) { | ||
} | ||
|
||
public record DispositifComptage(DicEntry typeComptage) { | ||
} | ||
|
||
public record GrilleFournisseur(DicEntry calendrier, Object classeTemporelle) { | ||
} | ||
|
||
public record InformationsContractuelles(Contrat contrat, DicEntry etatContractuel, SiContractuel siContractuel) { | ||
} | ||
|
||
public record SiContractuel(DicEntry application) { | ||
} | ||
|
||
public record SituationAlimentationDto(AlimentationPrincipale alimentationPrincipale) { | ||
} | ||
|
||
public record SituationComptageDto(ArrayList<Compteur> compteurs, Disjoncteur disjoncteur, | ||
DispositifComptage dispositifComptage) { | ||
} | ||
|
||
public record SituationContractuelleDto(InformationsContractuelles informationsContractuelles, | ||
StructureTarifaire structureTarifaire, String fournisseur, DicEntry segment) { | ||
} | ||
|
||
public record StructureTarifaire(Measure puissanceSouscrite, GrilleFournisseur grilleFournisseur) { | ||
} | ||
|
||
public record SyntheseContractuelleDto(DicEntry niveauOuvertureServices) { | ||
} | ||
|
||
public Adresse adresse; | ||
public String segment; | ||
public SyntheseContractuelleDto syntheseContractuelleDto; | ||
public SituationContractuelleDto[] situationContractuelleDtos; | ||
public SituationAlimentationDto situationAlimentationDto; | ||
public SituationComptageDto situationComptageDto; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you add that? What's the purpose?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's the way I found to solve the dependency resolution issue I faced.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was building fine without that.